Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

refactor(protocol): remove speculative cookie subscription state

ldm0b1275af7f460
diff --git a/moli-protocol/src/conn.rs b/moli-protocol/src/conn.rs
index de9780a62..06a928d04 100644
--- a/moli-protocol/src/conn.rs
+++ b/moli-protocol/src/conn.rs
@@ -79,10 +79,9 @@ pub use command_view::Cmd;
pub(crate) use cookie_manager_surface::BrowserContextCookieManagerSurfaceSnapshot;
#[cfg(test)]
pub(crate) use cookie_manager_surface::{
- BrowserContextCookieBackendConnectionState, BrowserContextCookieSubscriptionOwnerState,
- BrowserContextDefaultCookieWriteUrlSource, BrowserContextDocumentCookieCacheLookupResult,
- BrowserContextFirstCookieRequest, BrowserContextStructuredCookieCommandVerdict,
- BrowserContextStructuredCookieWriteBackendStatus,
+ BrowserContextCookieBackendConnectionState, BrowserContextDefaultCookieWriteUrlSource,
+ BrowserContextDocumentCookieCacheLookupResult, BrowserContextFirstCookieRequest,
+ BrowserContextStructuredCookieCommandVerdict, BrowserContextStructuredCookieWriteBackendStatus,
BrowserContextStructuredCookieWriteReadinessStatus,
};
#[cfg(test)]
diff --git a/moli-protocol/src/conn/cookie_manager_surface.rs b/moli-protocol/src/conn/cookie_manager_surface.rs
index 051954cc3..ca308b69e 100644
--- a/moli-protocol/src/conn/cookie_manager_surface.rs
+++ b/moli-protocol/src/conn/cookie_manager_surface.rs
@@ -874,19 +874,6 @@ pub(crate) struct BrowserContextCookieManagerActivitySnapshot {
pub(crate) telemetry: Option<BrowserContextDocumentCookieTelemetrySnapshot>,
}
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
-pub(crate) enum BrowserContextCookieSubscriptionOwnerState {
- #[default]
- Reserved,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
-pub(crate) struct BrowserContextCookieSubscriptionSurfaceSnapshot {
- pub(crate) owner_state: BrowserContextCookieSubscriptionOwnerState,
- pub(crate) subscription_count: usize,
- pub(crate) generation: u64,
-}
-
#[derive(Debug, Clone, PartialEq, Eq)]
pub(crate) struct BrowserContextCookieManagerSurfaceSnapshot {
// Manager-owned browser policy state for document-facing cookie access.
@@ -914,9 +901,6 @@ pub(crate) struct BrowserContextCookieManagerSurfaceSnapshot {
// keeps browser-facing request probes and telemetry shape attached to the
// same manager contract as policy and capability.
pub(crate) activity: BrowserContextCookieManagerActivitySnapshot,
- // Reserved manager-owned shape for future CookieStoreManager-style change
- // subscriptions. This is intentionally scaffold state today.
- pub(crate) subscriptions: BrowserContextCookieSubscriptionSurfaceSnapshot,
}
impl Default for BrowserContextCookieManagerSurfaceSnapshot {
@@ -928,8 +912,6 @@ impl Default for BrowserContextCookieManagerSurfaceSnapshot {
#[derive(Debug, Clone, PartialEq, Eq, Default)]
pub(crate) struct BrowserContextCookieManagerSurface {
policy_surface: BrowserContextDocumentCookiePolicySurface,
- subscription_count: usize,
- subscription_generation: u64,
}
impl BrowserContextCookieManagerSurface {
@@ -943,8 +925,6 @@ impl BrowserContextCookieManagerSurface {
generation: snapshot.policy.generation,
},
),
- subscription_count: snapshot.subscriptions.subscription_count,
- subscription_generation: snapshot.subscriptions.generation,
}
}
@@ -978,14 +958,6 @@ impl BrowserContextCookieManagerSurface {
effective_context: None,
capability: BrowserContextCookieManagerCapabilitySnapshot::default(),
activity: BrowserContextCookieManagerActivitySnapshot::default(),
- // Reserve a stable owner seam for future CookieStoreManager-style
- // change subscriptions without forcing BrowserContext callers to
- // learn a new snapshot shape later.
- subscriptions: BrowserContextCookieSubscriptionSurfaceSnapshot {
- owner_state: BrowserContextCookieSubscriptionOwnerState::Reserved,
- subscription_count: self.subscription_count,
- generation: self.subscription_generation,
- },
}
}
diff --git a/moli-protocol/src/conn/tests/cookie_surfaces/policy.rs b/moli-protocol/src/conn/tests/cookie_surfaces/policy.rs
index 1b74c8b8a..3479fa088 100644
--- a/moli-protocol/src/conn/tests/cookie_surfaces/policy.rs
+++ b/moli-protocol/src/conn/tests/cookie_surfaces/policy.rs
@@ -280,8 +280,7 @@ async fn browser_context_document_cookie_policy_surface_tracks_split_overrides()
}
#[tokio::test]
-async fn browser_context_cookie_manager_surface_keeps_policy_and_subscription_owner_shape_separate()
-{
+async fn browser_context_cookie_manager_surface_tracks_policy_without_a_live_page() {
let mut bc = BrowserContext::new("BID-cookie-manager".into());
let initial = bc.cookie_manager_surface_snapshot();
assert_eq!(initial.policy.generation, 0);
@@ -289,13 +288,6 @@ async fn browser_context_cookie_manager_surface_keeps_policy_and_subscription_ow
initial.backend_connection_state,
BrowserContextCookieBackendConnectionState::NoLivePage
);
- assert_eq!(
- initial.subscriptions.owner_state,
- BrowserContextCookieSubscriptionOwnerState::Reserved
- );
- assert_eq!(initial.subscriptions.subscription_count, 0);
- assert_eq!(initial.subscriptions.generation, 0);
-
bc.apply_cookie_manager_policy_overrides_async(
&BrowserCookieFacadeOverrides::default().with_cookies_enabled(false),
)
@@ -306,12 +298,6 @@ async fn browser_context_cookie_manager_surface_keeps_policy_and_subscription_ow
after_policy_change.backend_connection_state,
BrowserContextCookieBackendConnectionState::NoLivePage
);
- assert_eq!(
- after_policy_change.subscriptions.owner_state,
- BrowserContextCookieSubscriptionOwnerState::Reserved
- );
- assert_eq!(after_policy_change.subscriptions.subscription_count, 0);
- assert_eq!(after_policy_change.subscriptions.generation, 0);
}
#[tokio::test]
diff --git a/moli-protocol/src/conn/tests/mod.rs b/moli-protocol/src/conn/tests/mod.rs
index 5e7d3762e..0fec8ea14 100644
--- a/moli-protocol/src/conn/tests/mod.rs
+++ b/moli-protocol/src/conn/tests/mod.rs
@@ -3,10 +3,10 @@ use super::state::TargetPageAbsenceReason;
use super::{
BackgroundProtocolEvent, BrowserContext, BrowserContextCookieBackendConnectionState,
BrowserContextCookieGetFreshnessStatus, BrowserContextCookieSetReadinessStatus,
- BrowserContextCookieSubscriptionOwnerState, BrowserContextDefaultCookieWriteUrlSource,
- BrowserContextDocumentCookieCacheLookupResult, BrowserContextFirstCookieRequest,
- BrowserContextReservedSiteDataOwnerState, BrowserContextSiteDataManagerOwnerState,
- BrowserContextStructuredCookieCommandVerdict, BrowserContextStructuredCookieWriteBackendStatus,
+ BrowserContextDefaultCookieWriteUrlSource, BrowserContextDocumentCookieCacheLookupResult,
+ BrowserContextFirstCookieRequest, BrowserContextReservedSiteDataOwnerState,
+ BrowserContextSiteDataManagerOwnerState, BrowserContextStructuredCookieCommandVerdict,
+ BrowserContextStructuredCookieWriteBackendStatus,
BrowserContextStructuredCookieWriteReadinessStatus, CdpConnection, CdpSessionRoute,
CommandDispatchContext, CommandResponseFlushContext, NavigationBackgroundEvent,
NavigationDispatchState, NavigationResultProjection, ServiceWorkerTargetState,