Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust
Rust ai-agentsai-toolsbrowserbrowser-automationcloud-browserheadlessheadless-browserkitesurfplaywrightpuppeteerrustservoweb-crawlerweb-crawlingweb-scraperweb-scraping
refactor: make transient identity allocation checked
ldm0ca91a5ed5d48
diff --git a/moli-protocol-server/src/cdp_scheduler/actor.rs b/moli-protocol-server/src/cdp_scheduler/actor.rsindex c27b56a0e..73f4bbc41 100644--- a/moli-protocol-server/src/cdp_scheduler/actor.rs+++ b/moli-protocol-server/src/cdp_scheduler/actor.rs@@ -1341,7 +1341,9 @@ fn command_metadata(command: &ParsedCdpCommand) -> InFlightCommandMetadata {fn take_next_in_flight_command_token(next_token: &mut u64) -> u64 {let token = *next_token;- *next_token = next_token.wrapping_add(1);+ *next_token = next_token+ .checked_add(1)+ .expect("in-flight CDP command token space exhausted");token}@@ -2077,6 +2079,13 @@ mod tests {use super::*;+ #[test]+ #[should_panic(expected = "in-flight CDP command token space exhausted")]+ fn in_flight_command_tokens_never_wrap() {+ let mut next = u64::MAX;+ let _ = take_next_in_flight_command_token(&mut next);+ }+#[tokio::test]async fn ready_background_events_precede_runtime_response_without_starving_it() {let (background_event_tx, background_event_rx) = mpsc::unbounded_channel();diff --git a/moli-protocol-server/src/cdp_scheduler/frontend_control.rs b/moli-protocol-server/src/cdp_scheduler/frontend_control.rsindex 0e0f989be..a2a142c09 100644--- a/moli-protocol-server/src/cdp_scheduler/frontend_control.rs+++ b/moli-protocol-server/src/cdp_scheduler/frontend_control.rs@@ -207,10 +207,10 @@ impl CdpFrontendControlState {}fn allocate_frontend_id(&mut self) -> u64 {- self.next_frontend_id = self.next_frontend_id.wrapping_add(1);- if self.next_frontend_id == 0 {- self.next_frontend_id = 1;- }+ self.next_frontend_id = self+ .next_frontend_id+ .checked_add(1)+ .expect("CDP frontend id space exhausted");self.next_frontend_id}}@@ -226,3 +226,19 @@ fn send_cookie_checkpoint(CdpCookieSnapshot::from_profile_backed_cookies(scheduler.snapshot_profile_backed_cookies());let _ = owner_lifecycle.checkpoint_tx.send(snapshot);}++#[cfg(test)]+mod tests {+ use super::CdpFrontendControlState;++ #[test]+ #[should_panic(expected = "CDP frontend id space exhausted")]+ fn frontend_ids_never_wrap() {+ let mut state = CdpFrontendControlState {+ next_frontend_id: u64::MAX,+ ..CdpFrontendControlState::default()+ };++ let _ = state.allocate_frontend_id();+ }+}diff --git a/moli-protocol/src/conn.rs b/moli-protocol/src/conn.rsindex 809f6276b..48a9118a9 100644--- a/moli-protocol/src/conn.rs+++ b/moli-protocol/src/conn.rs@@ -3294,13 +3294,19 @@ impl CdpConnection {// ── ID generators ────────────────────────────────────────────────────────pub fn gen_bc_id(&mut self) -> String {- self.next_bc_id += 1;+ self.next_bc_id = self+ .next_bc_id+ .checked_add(1)+ .expect("browser context id space exhausted");format!("BID-{}", self.next_bc_id)}pub fn gen_user_browser_context_id(&mut self) -> String {loop {- self.next_bc_id += 1;+ self.next_bc_id = self+ .next_bc_id+ .checked_add(1)+ .expect("browser context id space exhausted");let id = format!("user-context-{}", self.next_bc_id);if !self.has_browser_context_id(&id) {return id;@@ -3828,9 +3834,17 @@ impl CdpConnection {pub fn gen_target_id(&mut self) -> String {loop {let id = if let Some(allocator) = self.shared_target_id_allocator.as_ref() {- allocator.fetch_add(1, Ordering::Relaxed) + 1+ allocator+ .fetch_update(Ordering::Relaxed, Ordering::Relaxed, |current| {+ current.checked_add(1)+ })+ .expect("shared target id space exhausted")+ + 1} else {- self.next_target_id += 1;+ self.next_target_id = self+ .next_target_id+ .checked_add(1)+ .expect("target id space exhausted");u64::from(self.next_target_id)};let target_id = format!("TID-{id}");@@ -3853,7 +3867,10 @@ impl CdpConnection {pub fn gen_session_id(&mut self) -> String {loop {- self.next_session_id += 1;+ self.next_session_id = self+ .next_session_id+ .checked_add(1)+ .expect("DevTools session id space exhausted");let session_id = format!("SID-{}", self.next_session_id);// Embedded callers and test/protocol bootstrap paths may install a// caller-supplied session id without advancing this allocator.@@ -3870,7 +3887,10 @@ impl CdpConnection {}pub(crate) fn open_global_io_stream(&mut self, bytes: Vec<u8>) -> String {- self.next_global_io_stream_id = self.next_global_io_stream_id.wrapping_add(1);+ self.next_global_io_stream_id = self+ .next_global_io_stream_id+ .checked_add(1)+ .expect("global IO stream id space exhausted");let handle = format!("BROWSER-STREAM-{}", self.next_global_io_stream_id);self.global_io_streams.insert(handle.clone(), IoStreamState::from_bytes(bytes, 0));diff --git a/moli-protocol/src/conn/runtime_eval.rs b/moli-protocol/src/conn/runtime_eval.rsindex 2477b8b6a..e146844ce 100644--- a/moli-protocol/src/conn/runtime_eval.rs+++ b/moli-protocol/src/conn/runtime_eval.rs@@ -1201,8 +1201,8 @@ impl CdpConnection {let id = self.next_internal_runtime_command_id;self.next_internal_runtime_command_id = self.next_internal_runtime_command_id- .saturating_add(1)- .max(902_000_000);+ .checked_add(1)+ .expect("internal Runtime command id space exhausted");id}diff --git a/moli-protocol/src/conn/tests/mod.rs b/moli-protocol/src/conn/tests/mod.rsindex 0fec8ea14..1b8ec9056 100644--- a/moli-protocol/src/conn/tests/mod.rs+++ b/moli-protocol/src/conn/tests/mod.rs@@ -101,14 +101,21 @@ fn global_io_stream_ids_cross_u32_max_without_reuse() {}#[test]-fn global_io_stream_id_allocator_wraps_at_u64_exhaustion() {+#[should_panic(expected = "global IO stream id space exhausted")]+fn global_io_stream_id_allocator_rejects_u64_exhaustion() {let mut conn = CdpConnection::new();conn.next_global_io_stream_id = u64::MAX;- let handle = conn.open_global_io_stream(Vec::new());+ let _ = conn.open_global_io_stream(Vec::new());+}- assert_eq!(handle, "BROWSER-STREAM-0");- assert!(conn.global_io_streams.contains_key(&handle));+#[test]+#[should_panic(expected = "internal Runtime command id space exhausted")]+fn internal_runtime_command_id_allocator_rejects_u64_exhaustion() {+ let mut conn = CdpConnection::new();+ conn.next_internal_runtime_command_id = u64::MAX;++ let _ = conn.next_internal_runtime_command_id();}#[test]diff --git a/moli-renderer-v8/src/context_bootstrap/indexed_db/typed_state.rs b/moli-renderer-v8/src/context_bootstrap/indexed_db/typed_state.rsindex 5867977e4..c50655119 100644--- a/moli-renderer-v8/src/context_bootstrap/indexed_db/typed_state.rs+++ b/moli-renderer-v8/src/context_bootstrap/indexed_db/typed_state.rs@@ -555,7 +555,10 @@ impl IndexedDbRuntimeStateTable {state: IndexedDbWrapperState,) -> IndexedDbObjectId {let id = id.unwrap_or_else(|| {- self.next_id = self.next_id.saturating_add(1).max(1);+ self.next_id = self+ .next_id+ .checked_add(1)+ .expect("IndexedDB runtime object id space exhausted");IndexedDbObjectId(self.next_id)});self.wrappers.insert(id, state);@@ -572,7 +575,10 @@ impl IndexedDbRuntimeStateTable {state: IndexedDbTaskState,) -> IndexedDbTaskId {let id = id.unwrap_or_else(|| {- self.next_id = self.next_id.saturating_add(1).max(1);+ self.next_id = self+ .next_id+ .checked_add(1)+ .expect("IndexedDB runtime task id space exhausted");IndexedDbTaskId(self.next_id)});self.tasks.insert(id, state);@@ -2002,6 +2008,26 @@ fn set_indexed_db_typed_task_id<'s>(mod tests {use super::*;+ #[test]+ #[should_panic(expected = "IndexedDB runtime task id space exhausted")]+ fn runtime_task_ids_never_saturate() {+ let mut table = IndexedDbRuntimeStateTable {+ next_id: u64::MAX,+ ..IndexedDbRuntimeStateTable::default()+ };++ let _ = table.upsert_task(+ None,+ IndexedDbTaskState::new(+ IndexedDbTaskKind::OpenBlocked,+ IndexedDbExecutionOwner::without_execution_context(+ crate::native_bridge::OwnerDispatchScope::Top,+ ),+ None,+ ),+ );+ }+#[test]fn runtime_state_table_updates_existing_wrapper_record() {let mut table = IndexedDbRuntimeStateTable::default();diff --git a/moli-renderer-v8/src/dynamic_script_owner.rs b/moli-renderer-v8/src/dynamic_script_owner.rsindex 9545f5cb3..fa30168f3 100644--- a/moli-renderer-v8/src/dynamic_script_owner.rs+++ b/moli-renderer-v8/src/dynamic_script_owner.rs@@ -1605,7 +1605,10 @@ impl DynamicScriptOwner {fn reserve_script_id(&mut self) -> DynamicScriptOwnerId {let id = DynamicScriptOwnerId::new(self.next_id);- self.next_id += 1;+ self.next_id = self+ .next_id+ .checked_add(1)+ .expect("dynamic script owner id space exhausted");id}@@ -2185,6 +2188,17 @@ mod tests {};use url::Url;+ #[test]+ #[should_panic(expected = "dynamic script owner id space exhausted")]+ fn dynamic_script_owner_ids_never_wrap() {+ let mut owner = DynamicScriptOwner {+ next_id: u64::MAX,+ ..DynamicScriptOwner::default()+ };++ let _ = owner.reserve_script_id();+ }+fn prepared_script(position: usize, mode: ScriptMode) -> PreparedScript {PreparedScript {position,diff --git a/moli-renderer-v8/src/frame_owner_model/ids.rs b/moli-renderer-v8/src/frame_owner_model/ids.rsindex 00182934f..4f3d5d2b5 100644--- a/moli-renderer-v8/src/frame_owner_model/ids.rs+++ b/moli-renderer-v8/src/frame_owner_model/ids.rs@@ -36,59 +36,95 @@ impl Default for FrameOwnerIdAllocator {impl FrameOwnerIdAllocator {pub(super) fn window_proxy(&mut self) -> WindowProxyId {- let id = WindowProxyId(self.next_window_proxy_id);- self.next_window_proxy_id += 1;- id+ WindowProxyId(take_next_u64(+ &mut self.next_window_proxy_id,+ "WindowProxy id space exhausted",+ ))}pub(super) fn local_window(&mut self) -> LocalWindowId {- let id = LocalWindowId(self.next_local_window_id);- self.next_local_window_id += 1;- id+ LocalWindowId(take_next_u64(+ &mut self.next_local_window_id,+ "LocalWindow id space exhausted",+ ))}pub(super) fn document(&mut self) -> DocumentId {- let id = DocumentId(self.next_document_id);- self.next_document_id += 1;- id+ DocumentId(take_next_u64(+ &mut self.next_document_id,+ "Document id space exhausted",+ ))}pub(super) fn document_load_delay_token(&mut self) -> DocumentLoadDelayTokenId {- let id = DocumentLoadDelayTokenId(self.next_document_load_delay_token_id);- self.next_document_load_delay_token_id += 1;- id+ DocumentLoadDelayTokenId(take_next_u64(+ &mut self.next_document_load_delay_token_id,+ "Document load-delay token id space exhausted",+ ))}pub(super) fn document_load_delivery_admission(&mut self,) -> FrameDocumentLoadDeliveryAdmissionId {- let id =- FrameDocumentLoadDeliveryAdmissionId(self.next_document_load_delivery_admission_id);- self.next_document_load_delivery_admission_id += 1;- id+ FrameDocumentLoadDeliveryAdmissionId(take_next_u64(+ &mut self.next_document_load_delivery_admission_id,+ "Document load-delivery admission id space exhausted",+ ))}pub(super) fn frame_navigation(&mut self) -> FrameNavigationId {- let id = FrameNavigationId(self.next_frame_navigation_id);- self.next_frame_navigation_id += 1;- id+ FrameNavigationId(take_next_u64(+ &mut self.next_frame_navigation_id,+ "frame navigation id space exhausted",+ ))}pub(super) fn frame_realm(&mut self) -> FrameRealmId {- let id = FrameRealmId(self.next_frame_realm_id);- self.next_frame_realm_id += 1;- id+ FrameRealmId(take_next_i64(+ &mut self.next_frame_realm_id,+ "frame realm id space exhausted",+ ))}pub(super) fn frame_request(&mut self) -> FrameRequestId {- let id = FrameRequestId(self.next_frame_request_id);- self.next_frame_request_id += 1;- id+ FrameRequestId(take_next_u64(+ &mut self.next_frame_request_id,+ "frame request id space exhausted",+ ))}pub(super) fn scheduler_lane(&mut self) -> FrameSchedulerLaneId {- let id = FrameSchedulerLaneId(self.next_scheduler_lane_id);- self.next_scheduler_lane_id += 1;- id+ FrameSchedulerLaneId(take_next_u64(+ &mut self.next_scheduler_lane_id,+ "frame scheduler-lane id space exhausted",+ ))+ }+}++fn take_next_u64(next: &mut u64, exhausted: &'static str) -> u64 {+ let id = *next;+ *next = next.checked_add(1).expect(exhausted);+ id+}++fn take_next_i64(next: &mut i64, exhausted: &'static str) -> i64 {+ let id = *next;+ *next = next.checked_add(1).expect(exhausted);+ id+}++#[cfg(test)]+mod tests {+ use super::FrameOwnerIdAllocator;++ #[test]+ #[should_panic(expected = "Document id space exhausted")]+ fn document_ids_never_wrap() {+ let mut ids = FrameOwnerIdAllocator {+ next_document_id: u64::MAX,+ ..FrameOwnerIdAllocator::default()+ };++ let _ = ids.document();}}diff --git a/moli-renderer-v8/src/live_document_parser.rs b/moli-renderer-v8/src/live_document_parser.rsindex eed26201c..1160c660d 100644--- a/moli-renderer-v8/src/live_document_parser.rs+++ b/moli-renderer-v8/src/live_document_parser.rs@@ -293,7 +293,10 @@ impl DocumentParserSessionControlHandle {"only a ready live parser session can enter a persistent suspension");let suspension_id = ParserSuspensionId(control.next_suspension_id);- control.next_suspension_id = control.next_suspension_id.wrapping_add(1).max(1);+ control.next_suspension_id = control+ .next_suspension_id+ .checked_add(1)+ .expect("live parser suspension id space exhausted");let suspension = ParserSuspension {id: suspension_id,cause,diff --git a/moli-renderer-v8/src/live_stylesheet/registry.rs b/moli-renderer-v8/src/live_stylesheet/registry.rsindex 96803636c..9dda57213 100644--- a/moli-renderer-v8/src/live_stylesheet/registry.rs+++ b/moli-renderer-v8/src/live_stylesheet/registry.rs@@ -448,7 +448,11 @@ impl LiveStylesheetRegistry {fn allocate_id(&self) -> StylesheetId {loop {- let id = self.next_id.get().saturating_add(1).max(1);+ let id = self+ .next_id+ .get()+ .checked_add(1)+ .expect("live stylesheet id space exhausted");self.next_id.set(if id == u64::MAX { 0 } else { id });let id = StylesheetId(id);if !self.entries.borrow().contains_key(&id) {@@ -492,7 +496,11 @@ impl LiveStylesheetRegistry {fn allocate_wrapper_lease_id(&self) -> StylesheetWrapperLeaseId {loop {- let id = self.next_wrapper_lease_id.get().saturating_add(1).max(1);+ let id = self+ .next_wrapper_lease_id+ .get()+ .checked_add(1)+ .expect("live stylesheet wrapper-lease id space exhausted");self.next_wrapper_lease_id.set(if id == u64::MAX { 0 } else { id });let id = StylesheetWrapperLeaseId(id);diff --git a/moli-renderer-v8/src/native_bridge/abort.rs b/moli-renderer-v8/src/native_bridge/abort.rsindex a597d3efb..3c2abb2fa 100644--- a/moli-renderer-v8/src/native_bridge/abort.rs+++ b/moli-renderer-v8/src/native_bridge/abort.rs@@ -103,12 +103,18 @@ struct AbortSignalObjectDeclaration<'scope> {impl AbortStore {fn alloc_signal_id(&mut self) -> u32 {- self.next_signal_id = self.next_signal_id.saturating_add(1).max(1);+ self.next_signal_id = self+ .next_signal_id+ .checked_add(1)+ .expect("AbortSignal id space exhausted");self.next_signal_id}fn alloc_controller_id(&mut self) -> u32 {- self.next_controller_id = self.next_controller_id.saturating_add(1).max(1);+ self.next_controller_id = self+ .next_controller_id+ .checked_add(1)+ .expect("AbortController id space exhausted");self.next_controller_id}diff --git a/moli-renderer-v8/src/native_bridge/context_host/core.rs b/moli-renderer-v8/src/native_bridge/context_host/core.rsindex b5d2fb2dc..4397969a5 100644--- a/moli-renderer-v8/src/native_bridge/context_host/core.rs+++ b/moli-renderer-v8/src/native_bridge/context_host/core.rs@@ -272,7 +272,7 @@ impl JsContextHost {blocked_url_patterns: Vec::new(),service_worker_client_id,service_worker_control: None,- next_service_worker_register_request_id: 1,+ next_service_worker_request_id: 1,pending_service_worker_registers: HashMap::new(),pending_service_worker_unregisters: HashMap::new(),pending_service_worker_ready: HashMap::new(),@@ -1499,7 +1499,10 @@ impl JsContextHost {pub(crate) fn next_image_load_event_id(&mut self) -> super::ImageLoadEventId {let id = super::ImageLoadEventId::new(self.next_image_load_event_id);- self.next_image_load_event_id = self.next_image_load_event_id.wrapping_add(1).max(1);+ self.next_image_load_event_id = self+ .next_image_load_event_id+ .checked_add(1)+ .expect("image load-event id space exhausted");id}@@ -1548,7 +1551,10 @@ impl JsContextHost {pub(crate) fn next_media_load_sequence_id(&mut self) -> super::MediaLoadSequenceId {let id = super::MediaLoadSequenceId::new(self.next_media_load_sequence_id);- self.next_media_load_sequence_id = self.next_media_load_sequence_id.wrapping_add(1).max(1);+ self.next_media_load_sequence_id = self+ .next_media_load_sequence_id+ .checked_add(1)+ .expect("media load-sequence id space exhausted");id}@@ -1597,8 +1603,10 @@ impl JsContextHost {pub(crate) fn next_text_track_load_sequence_id(&mut self) -> super::TextTrackLoadSequenceId {let id = super::TextTrackLoadSequenceId::new(self.next_text_track_load_sequence_id);- self.next_text_track_load_sequence_id =- self.next_text_track_load_sequence_id.wrapping_add(1).max(1);+ self.next_text_track_load_sequence_id = self+ .next_text_track_load_sequence_id+ .checked_add(1)+ .expect("text-track load-sequence id space exhausted");id}diff --git a/moli-renderer-v8/src/native_bridge/context_host/mod.rs b/moli-renderer-v8/src/native_bridge/context_host/mod.rsindex efc919779..d34a009c3 100644--- a/moli-renderer-v8/src/native_bridge/context_host/mod.rs+++ b/moli-renderer-v8/src/native_bridge/context_host/mod.rs@@ -876,7 +876,7 @@ pub(crate) struct JsContextHost {blocked_url_patterns: Vec<String>,service_worker_client_id: ServiceWorkerClientId,service_worker_control: Option<ServiceWorkerControlState>,- next_service_worker_register_request_id: u64,+ next_service_worker_request_id: u64,pending_service_worker_registers: HashMap<u64, service_workers::PendingServiceWorkerRegister>,pending_service_worker_unregisters:HashMap<u64, service_workers::PendingServiceWorkerUnregister>,diff --git a/moli-renderer-v8/src/native_bridge/context_host/popups.rs b/moli-renderer-v8/src/native_bridge/context_host/popups.rsindex 78445490f..975ed2afe 100644--- a/moli-renderer-v8/src/native_bridge/context_host/popups.rs+++ b/moli-renderer-v8/src/native_bridge/context_host/popups.rs@@ -582,8 +582,13 @@ impl JsContextHost {let LightweightPopupLifecycle::Open(open) = lifecycle else {return None;};- record.navigation_id =- LightweightPopupNavigationId::new(record.navigation_id.as_u64().wrapping_add(1).max(1));+ record.navigation_id = LightweightPopupNavigationId::new(+ record+ .navigation_id+ .as_u64()+ .checked_add(1)+ .expect("lightweight popup navigation id space exhausted"),+ );record.opener = None;Some(LightweightPopupCloseTransition {retired_owner: open.document.owner,@@ -692,7 +697,10 @@ impl JsContextHost {.then(|| trackable_lightweight_popup_window_name(target_name)).flatten();let popup_id = self.next_lightweight_popup_id;- self.next_lightweight_popup_id = self.next_lightweight_popup_id.wrapping_add(1).max(1);+ self.next_lightweight_popup_id = self+ .next_lightweight_popup_id+ .checked_add(1)+ .expect("lightweight popup id space exhausted");let window = self.bridge.bindings@@ -1979,8 +1987,13 @@ impl JsContextHost {let record = self.lightweight_popup_record_mut(popup_id).expect("current popup document owner must belong to an open browsing context");- record.navigation_id =- LightweightPopupNavigationId::new(record.navigation_id.as_u64().wrapping_add(1).max(1));+ record.navigation_id = LightweightPopupNavigationId::new(+ record+ .navigation_id+ .as_u64()+ .checked_add(1)+ .expect("lightweight popup navigation id space exhausted"),+ );record.location_url = target_url;Some(LightweightPopupNavigationTaskToken::from_parts(document_owner,diff --git a/moli-renderer-v8/src/native_bridge/context_host/resource_timing.rs b/moli-renderer-v8/src/native_bridge/context_host/resource_timing.rsindex d48c3d122..3103c3d59 100644--- a/moli-renderer-v8/src/native_bridge/context_host/resource_timing.rs+++ b/moli-renderer-v8/src/native_bridge/context_host/resource_timing.rs@@ -53,7 +53,10 @@ struct ResourceTimingBufferRegistry {impl ResourceTimingBufferRegistry {fn insert(&mut self, size_limit: u32) -> ResourceTimingBufferId {loop {- self.next_id = self.next_id.wrapping_add(1).max(1);+ self.next_id = self+ .next_id+ .checked_add(1)+ .expect("resource timing entry id space exhausted");let id = ResourceTimingBufferId(self.next_id);if let std::collections::hash_map::Entry::Vacant(entry) = self.buffers.entry(id) {entry.insert(ResourceTimingBufferState::new(size_limit));diff --git a/moli-renderer-v8/src/native_bridge/context_host/service_workers.rs b/moli-renderer-v8/src/native_bridge/context_host/service_workers.rsindex 1b7678396..4ce8bd03a 100644--- a/moli-renderer-v8/src/native_bridge/context_host/service_workers.rs+++ b/moli-renderer-v8/src/native_bridge/context_host/service_workers.rs@@ -103,6 +103,14 @@ pub(crate) struct PendingServiceWorkerClientsOpenWindowPopup {}impl JsContextHost {+ fn allocate_service_worker_request_id(&mut self) -> u64 {+ let request_id = self.next_service_worker_request_id;+ self.next_service_worker_request_id = request_id+ .checked_add(1)+ .expect("Window Service Worker request id space exhausted");+ request_id+ }+fn service_worker_task_sender(&self,) -> crate::page_task_queue::RendererPageServiceWorkerTaskSender {@@ -383,11 +391,7 @@ impl JsContextHost {WindowDocumentOwner,crate::page_task_queue::RendererPageServiceWorkerTaskSender,) {- let request_id = self.next_service_worker_register_request_id;- self.next_service_worker_register_request_id = self- .next_service_worker_register_request_id- .wrapping_add(1)- .max(1);+ let request_id = self.allocate_service_worker_request_id();self.pending_service_worker_registers.insert(request_id,PendingServiceWorkerRegister {@@ -441,11 +445,7 @@ impl JsContextHost {WindowDocumentOwner,crate::page_task_queue::RendererPageServiceWorkerTaskSender,) {- let request_id = self.next_service_worker_register_request_id;- self.next_service_worker_register_request_id = self- .next_service_worker_register_request_id- .wrapping_add(1)- .max(1);+ let request_id = self.allocate_service_worker_request_id();self.pending_service_worker_unregisters.insert(request_id,PendingServiceWorkerUnregister {@@ -482,11 +482,7 @@ impl JsContextHost {resolver: v8::Local<'_, v8::PromiseResolver>,request_context: ServiceWorkerWindowRequestContext,) -> u64 {- let request_id = self.next_service_worker_register_request_id;- self.next_service_worker_register_request_id = self- .next_service_worker_register_request_id- .wrapping_add(1)- .max(1);+ let request_id = self.allocate_service_worker_request_id();let owner = request_context.owner();self.pending_service_worker_ready.insert(request_id,diff --git a/moli-renderer-v8/src/native_bridge/history_queue.rs b/moli-renderer-v8/src/native_bridge/history_queue.rsindex 39818d3f3..c77bce53e 100644--- a/moli-renderer-v8/src/native_bridge/history_queue.rs+++ b/moli-renderer-v8/src/native_bridge/history_queue.rs@@ -330,7 +330,9 @@ impl JsContextHost {kind: &'static str,) -> NavigationAttemptId {let raw = self.next_navigation_attempt_id.max(1);- self.next_navigation_attempt_id = raw.wrapping_add(1).max(1);+ self.next_navigation_attempt_id = raw+ .checked_add(1)+ .expect("history navigation-attempt id space exhausted");self.active_navigation_attempts.insert(raw, kind);let attempt_id = NavigationAttemptId(raw);self.trace_navigation_lifecycle_attempt(attempt_id, kind, "begin");diff --git a/moli-renderer-v8/src/native_bridge/traversal/state.rs b/moli-renderer-v8/src/native_bridge/traversal/state.rsindex 1119f7803..f19172fc1 100644--- a/moli-renderer-v8/src/native_bridge/traversal/state.rs+++ b/moli-renderer-v8/src/native_bridge/traversal/state.rs@@ -47,7 +47,10 @@ pub(in crate::native_bridge) struct TreeWalkerSnapshot {impl TraversalStore {fn next_id(&mut self) -> u32 {- self.next_id = self.next_id.saturating_add(1).max(1);+ self.next_id = self+ .next_id+ .checked_add(1)+ .expect("tree traversal id space exhausted");self.next_id}@@ -309,20 +312,15 @@ mod tests {}#[test]- fn next_id_saturates_without_resetting_and_keeps_returning_u32_max() {- // Defensive: the counter uses saturating_add, so 2^32-1 is the- // terminal id. Subsequent registers all reuse u32::MAX, which means- // any new entry overwrites the previous one but the counter itself- // never wraps to 0 (avoiding id collisions with already-active- // entries).+ #[should_panic(expected = "tree traversal id space exhausted")]+ fn next_id_exhaustion_never_reuses_u32_max() {let mut store = TraversalStore {next_id: u32::MAX - 1,..Default::default()};let id1 = store.register_node_iterator(handle(0), 0, None);- let id2 = store.register_node_iterator(handle(0), 0, None);assert_eq!(id1, u32::MAX);- assert_eq!(id2, u32::MAX);+ let _ = store.register_node_iterator(handle(0), 0, None);}#[test]diff --git a/moli-renderer-v8/src/observer_runtime/callback.rs b/moli-renderer-v8/src/observer_runtime/callback.rsindex 04cfe4c6a..9655634af 100644--- a/moli-renderer-v8/src/observer_runtime/callback.rs+++ b/moli-renderer-v8/src/observer_runtime/callback.rs@@ -172,7 +172,10 @@ impl ObserverCallbackRegistry {pub(super) fn register(&self, binding: ObserverCallbackBinding) -> ObserverCallbackId {let mut state = self.state.borrow_mut();- state.next_id = state.next_id.saturating_add(1).max(1);+ state.next_id = state+ .next_id+ .checked_add(1)+ .expect("observer callback id space exhausted");let id = ObserverCallbackId(state.next_id);let replaced = state.bindings.insert(id, binding);assert!(diff --git a/moli-renderer-v8/src/observer_runtime/mod.rs b/moli-renderer-v8/src/observer_runtime/mod.rsindex 0ab916fbb..d4300c632 100644--- a/moli-renderer-v8/src/observer_runtime/mod.rs+++ b/moli-renderer-v8/src/observer_runtime/mod.rs@@ -735,13 +735,18 @@ impl ObserverStore {}fn alloc_mutation_observer_id(&mut self) -> u32 {- self.next_mutation_observer_id = self.next_mutation_observer_id.saturating_add(1).max(1);+ self.next_mutation_observer_id = self+ .next_mutation_observer_id+ .checked_add(1)+ .expect("MutationObserver id space exhausted");self.next_mutation_observer_id}fn alloc_intersection_observer_id(&mut self) -> u32 {- self.next_intersection_observer_id =- self.next_intersection_observer_id.saturating_add(1).max(1);+ self.next_intersection_observer_id = self+ .next_intersection_observer_id+ .checked_add(1)+ .expect("IntersectionObserver id space exhausted");self.next_intersection_observer_id}diff --git a/moli-renderer-v8/src/parser_module_evaluation.rs b/moli-renderer-v8/src/parser_module_evaluation.rsindex 2f391c23c..63efffa21 100644--- a/moli-renderer-v8/src/parser_module_evaluation.rs+++ b/moli-renderer-v8/src/parser_module_evaluation.rs@@ -109,7 +109,10 @@ impl<Work> ParserModuleEvaluationStore<Work> {pub(crate) fn reserve_pending(&mut self, work: Work, root_entry: ModuleEntryId) -> u64 {let reaction_id = self.next_reaction_id;- self.next_reaction_id = self.next_reaction_id.wrapping_add(1).max(1);+ self.next_reaction_id = self+ .next_reaction_id+ .checked_add(1)+ .expect("parser module reaction id space exhausted");self.push_pending_with_reaction_id(work, root_entry, reaction_id);reaction_id}diff --git a/moli-renderer-v8/src/text_codec.rs b/moli-renderer-v8/src/text_codec.rsindex b3f26e15e..d226dd1c2 100644--- a/moli-renderer-v8/src/text_codec.rs+++ b/moli-renderer-v8/src/text_codec.rs@@ -135,7 +135,10 @@ impl TextCodecStore {impl TextCodecStoreState {fn alloc_decoder_id(&mut self) -> u32 {- self.next_decoder_id = self.next_decoder_id.saturating_add(1).max(1);+ self.next_decoder_id = self+ .next_decoder_id+ .checked_add(1)+ .expect("TextDecoder id space exhausted");self.next_decoder_id}}diff --git a/moli-renderer-v8/src/worker/abort.rs b/moli-renderer-v8/src/worker/abort.rsindex e869cf67c..a929e392a 100644--- a/moli-renderer-v8/src/worker/abort.rs+++ b/moli-renderer-v8/src/worker/abort.rs@@ -60,12 +60,18 @@ struct WorkerAbortSignalObjectDeclaration<'scope> {impl WorkerAbortStore {fn alloc_signal_id(&mut self) -> u32 {- self.next_signal_id = self.next_signal_id.saturating_add(1).max(1);+ self.next_signal_id = self+ .next_signal_id+ .checked_add(1)+ .expect("worker AbortSignal id space exhausted");self.next_signal_id}fn alloc_controller_id(&mut self) -> u32 {- self.next_controller_id = self.next_controller_id.saturating_add(1).max(1);+ self.next_controller_id = self+ .next_controller_id+ .checked_add(1)+ .expect("worker AbortController id space exhausted");self.next_controller_id}diff --git a/moli-renderer-v8/src/worker/global_scope/mod.rs b/moli-renderer-v8/src/worker/global_scope/mod.rsindex bfd0095d5..f95fa177e 100644--- a/moli-renderer-v8/src/worker/global_scope/mod.rs+++ b/moli-renderer-v8/src/worker/global_scope/mod.rs@@ -1601,71 +1601,63 @@ pub(crate) struct WorkerGlobalState {HashMap<ServiceWorkerEventId, PendingServiceWorkerPeriodicSyncEvent>,/// In-flight Service Worker `clients.get()` / `clients.matchAll()` queries keyed by request id.pub(super) pending_service_worker_client_queries: HashMap<u64, PendingServiceWorkerClientQuery>,- /// Worker-local Service Worker client query id counter.- pub(super) next_service_worker_client_query_id: u64,/// In-flight Service Worker `WindowClient.navigate()` requests keyed by request id.pub(super) pending_service_worker_client_navigates:HashMap<u64, PendingServiceWorkerClientNavigate>,- /// Worker-local Service Worker WindowClient navigation request id counter.- pub(super) next_service_worker_client_navigate_id: u64,/// In-flight Service Worker `WindowClient.focus()` requests keyed by request id.pub(super) pending_service_worker_client_focuses: HashMap<u64, PendingServiceWorkerClientFocus>,- /// Worker-local Service Worker WindowClient focus request id counter.- pub(super) next_service_worker_client_focus_id: u64,/// In-flight Service Worker `clients.openWindow()` requests keyed by request id.pub(super) pending_service_worker_clients_open_windows:HashMap<u64, PendingServiceWorkerClientsOpenWindow>,- /// Worker-local Service Worker clients.openWindow request id counter.- pub(super) next_service_worker_clients_open_window_id: u64,/// In-flight Service Worker `registration.showNotification()` requests keyed by request id.pub(super) pending_service_worker_show_notifications:HashMap<u64, PendingServiceWorkerShowNotification>,- /// Worker-local Service Worker showNotification request id counter.- pub(super) next_service_worker_show_notification_id: u64,/// In-flight Service Worker `registration.getNotifications()` requests keyed by request id.pub(super) pending_service_worker_get_notifications:HashMap<u64, PendingServiceWorkerGetNotifications>,- /// Worker-local Service Worker getNotifications request id counter.- pub(super) next_service_worker_get_notifications_id: u64,/// In-flight Service Worker `registration.sync.register()` requests keyed by request id.pub(super) pending_service_worker_sync_registrations:HashMap<u64, PendingServiceWorkerSyncRegistration>,- /// Worker-local Service Worker sync register request id counter.- pub(super) next_service_worker_sync_registration_id: u64,/// In-flight Service Worker `registration.sync.getTags()` requests keyed by request id.pub(super) pending_service_worker_sync_get_tags: HashMap<u64, PendingServiceWorkerSyncGetTags>,- /// Worker-local Service Worker sync getTags request id counter.- pub(super) next_service_worker_sync_get_tags_id: u64,/// In-flight Service Worker `registration.periodicSync.register()` requests keyed by request id.pub(super) pending_service_worker_periodic_sync_registrations:HashMap<u64, PendingServiceWorkerPeriodicSyncRegistration>,- /// Worker-local Service Worker periodic sync register request id counter.- pub(super) next_service_worker_periodic_sync_registration_id: u64,/// In-flight Service Worker `registration.periodicSync.getTags()` requests keyed by request id.pub(super) pending_service_worker_periodic_sync_get_tags:HashMap<u64, PendingServiceWorkerPeriodicSyncGetTags>,- /// Worker-local Service Worker periodic sync getTags request id counter.- pub(super) next_service_worker_periodic_sync_get_tags_id: u64,/// In-flight Service Worker `registration.periodicSync.unregister()` requests keyed by request id.pub(super) pending_service_worker_periodic_sync_unregistrations:HashMap<u64, PendingServiceWorkerPeriodicSyncUnregistration>,- /// Worker-local Service Worker periodic sync unregister request id counter.- pub(super) next_service_worker_periodic_sync_unregistration_id: u64,/// In-flight Service Worker `registration.pushManager.subscribe()` requests keyed by request id.pub(super) pending_service_worker_push_subscriptions:HashMap<u64, PendingServiceWorkerPushSubscribe>,- /// Worker-local Service Worker push subscribe request id counter.- pub(super) next_service_worker_push_subscription_id: u64,/// In-flight Service Worker `registration.pushManager.getSubscription()` requests keyed by request id.pub(super) pending_service_worker_push_get_subscriptions:HashMap<u64, PendingServiceWorkerPushGetSubscription>,- /// Worker-local Service Worker push getSubscription request id counter.- pub(super) next_service_worker_push_get_subscription_id: u64,/// In-flight Service Worker `PushSubscription.unsubscribe()` requests keyed by request id.pub(super) pending_service_worker_push_unsubscriptions:HashMap<u64, PendingServiceWorkerPushUnsubscribe>,- /// Worker-local Service Worker push unsubscribe request id counter.- pub(super) next_service_worker_push_unsubscription_id: u64,+ pub(super) service_worker_client_query_request_ids: WorkerServiceWorkerRequestIdAllocator,+ pub(super) service_worker_client_navigate_request_ids: WorkerServiceWorkerRequestIdAllocator,+ pub(super) service_worker_client_focus_request_ids: WorkerServiceWorkerRequestIdAllocator,+ pub(super) service_worker_clients_open_window_request_ids:+ WorkerServiceWorkerRequestIdAllocator,+ pub(super) service_worker_show_notification_request_ids: WorkerServiceWorkerRequestIdAllocator,+ pub(super) service_worker_get_notifications_request_ids: WorkerServiceWorkerRequestIdAllocator,+ pub(super) service_worker_sync_registration_request_ids: WorkerServiceWorkerRequestIdAllocator,+ pub(super) service_worker_sync_get_tags_request_ids: WorkerServiceWorkerRequestIdAllocator,+ pub(super) service_worker_periodic_sync_registration_request_ids:+ WorkerServiceWorkerRequestIdAllocator,+ pub(super) service_worker_periodic_sync_get_tags_request_ids:+ WorkerServiceWorkerRequestIdAllocator,+ pub(super) service_worker_periodic_sync_unregistration_request_ids:+ WorkerServiceWorkerRequestIdAllocator,+ pub(super) service_worker_push_subscription_request_ids: WorkerServiceWorkerRequestIdAllocator,+ pub(super) service_worker_push_get_subscription_request_ids:+ WorkerServiceWorkerRequestIdAllocator,+ pub(super) service_worker_push_unsubscription_request_ids:+ WorkerServiceWorkerRequestIdAllocator,/// Count of active Service Worker events that allow window interaction.pub(super) service_worker_window_interaction_allowed_count: usize,/// Service Worker lifecycle events currently waiting for dispatch and@@ -1697,6 +1689,44 @@ pub(crate) struct WorkerGlobalState {HashMap<ServiceWorkerEventId, PendingServiceWorkerSyncEvent>,}+/// Checked allocator for one operation-local Service Worker request namespace.+///+/// The parent/worker protocol intentionally gives each operation its own+/// namespace. Keeping that shape avoids coupling unrelated APIs while making+/// exhaustion fail instead of overwriting a live pending resolver.+#[derive(Debug)]+pub(super) struct WorkerServiceWorkerRequestIdAllocator {+ next: u64,+}++impl Default for WorkerServiceWorkerRequestIdAllocator {+ fn default() -> Self {+ Self { next: 1 }+ }+}++impl WorkerServiceWorkerRequestIdAllocator {+ fn allocate(&mut self) -> u64 {+ let request_id = self.next;+ self.next = request_id+ .checked_add(1)+ .expect("worker Service Worker request id space exhausted");+ request_id+ }+}++#[cfg(test)]+mod service_worker_request_id_allocator_tests {+ use super::WorkerServiceWorkerRequestIdAllocator;++ #[test]+ #[should_panic(expected = "worker Service Worker request id space exhausted")]+ fn operation_local_request_ids_never_wrap() {+ let mut ids = WorkerServiceWorkerRequestIdAllocator { next: u64::MAX };+ let _ = ids.allocate();+ }+}+impl WorkerGlobalState {/// Register a pending worker WebCrypto task and return the routing tuple the/// blocking task needs to report completion. Runs synchronously inside the@@ -1757,11 +1787,7 @@ impl WorkerGlobalState {resolver: v8::Global<v8::PromiseResolver>,query_type: PendingServiceWorkerClientQueryType,) -> u64 {- let request_id = self.next_service_worker_client_query_id;- self.next_service_worker_client_query_id = self- .next_service_worker_client_query_id- .wrapping_add(1)- .max(1);+ let request_id = self.service_worker_client_query_request_ids.allocate();self.pending_service_worker_client_queries.insert(request_id,PendingServiceWorkerClientQuery {@@ -1784,11 +1810,7 @@ impl WorkerGlobalState {&mut self,resolver: v8::Global<v8::PromiseResolver>,) -> u64 {- let request_id = self.next_service_worker_client_navigate_id;- self.next_service_worker_client_navigate_id = self- .next_service_worker_client_navigate_id- .wrapping_add(1)- .max(1);+ let request_id = self.service_worker_client_navigate_request_ids.allocate();self.pending_service_worker_client_navigates.insert(request_id, PendingServiceWorkerClientNavigate { resolver });request_id@@ -1806,11 +1828,7 @@ impl WorkerGlobalState {&mut self,resolver: v8::Global<v8::PromiseResolver>,) -> u64 {- let request_id = self.next_service_worker_client_focus_id;- self.next_service_worker_client_focus_id = self- .next_service_worker_client_focus_id- .wrapping_add(1)- .max(1);+ let request_id = self.service_worker_client_focus_request_ids.allocate();self.pending_service_worker_client_focuses.insert(request_id, PendingServiceWorkerClientFocus { resolver });request_id@@ -1828,11 +1846,9 @@ impl WorkerGlobalState {&mut self,resolver: v8::Global<v8::PromiseResolver>,) -> u64 {- let request_id = self.next_service_worker_clients_open_window_id;- self.next_service_worker_clients_open_window_id = self- .next_service_worker_clients_open_window_id- .wrapping_add(1)- .max(1);+ let request_id = self+ .service_worker_clients_open_window_request_ids+ .allocate();self.pending_service_worker_clients_open_windows.insert(request_id,PendingServiceWorkerClientsOpenWindow { resolver },@@ -1852,11 +1868,7 @@ impl WorkerGlobalState {&mut self,resolver: v8::Global<v8::PromiseResolver>,) -> u64 {- let request_id = self.next_service_worker_show_notification_id;- self.next_service_worker_show_notification_id = self- .next_service_worker_show_notification_id- .wrapping_add(1)- .max(1);+ let request_id = self.service_worker_show_notification_request_ids.allocate();self.pending_service_worker_show_notifications.insert(request_id,PendingServiceWorkerShowNotification { resolver },@@ -1876,11 +1888,7 @@ impl WorkerGlobalState {&mut self,resolver: v8::Global<v8::PromiseResolver>,) -> u64 {- let request_id = self.next_service_worker_get_notifications_id;- self.next_service_worker_get_notifications_id = self- .next_service_worker_get_notifications_id- .wrapping_add(1)- .max(1);+ let request_id = self.service_worker_get_notifications_request_ids.allocate();self.pending_service_worker_get_notifications.insert(request_id,PendingServiceWorkerGetNotifications { resolver },@@ -1900,11 +1908,7 @@ impl WorkerGlobalState {&mut self,resolver: v8::Global<v8::PromiseResolver>,) -> u64 {- let request_id = self.next_service_worker_sync_registration_id;- self.next_service_worker_sync_registration_id = self- .next_service_worker_sync_registration_id- .wrapping_add(1)- .max(1);+ let request_id = self.service_worker_sync_registration_request_ids.allocate();self.pending_service_worker_sync_registrations.insert(request_id,PendingServiceWorkerSyncRegistration { resolver },@@ -1924,11 +1928,7 @@ impl WorkerGlobalState {&mut self,resolver: v8::Global<v8::PromiseResolver>,) -> u64 {- let request_id = self.next_service_worker_sync_get_tags_id;- self.next_service_worker_sync_get_tags_id = self- .next_service_worker_sync_get_tags_id- .wrapping_add(1)- .max(1);+ let request_id = self.service_worker_sync_get_tags_request_ids.allocate();self.pending_service_worker_sync_get_tags.insert(request_id, PendingServiceWorkerSyncGetTags { resolver });request_id@@ -1946,11 +1946,9 @@ impl WorkerGlobalState {&mut self,resolver: v8::Global<v8::PromiseResolver>,) -> u64 {- let request_id = self.next_service_worker_periodic_sync_registration_id;- self.next_service_worker_periodic_sync_registration_id = self- .next_service_worker_periodic_sync_registration_id- .wrapping_add(1)- .max(1);+ let request_id = self+ .service_worker_periodic_sync_registration_request_ids+ .allocate();self.pending_service_worker_periodic_sync_registrations.insert(request_id,@@ -1971,11 +1969,9 @@ impl WorkerGlobalState {&mut self,resolver: v8::Global<v8::PromiseResolver>,) -> u64 {- let request_id = self.next_service_worker_periodic_sync_get_tags_id;- self.next_service_worker_periodic_sync_get_tags_id = self- .next_service_worker_periodic_sync_get_tags_id- .wrapping_add(1)- .max(1);+ let request_id = self+ .service_worker_periodic_sync_get_tags_request_ids+ .allocate();self.pending_service_worker_periodic_sync_get_tags.insert(request_id,PendingServiceWorkerPeriodicSyncGetTags { resolver },@@ -1995,11 +1991,9 @@ impl WorkerGlobalState {&mut self,resolver: v8::Global<v8::PromiseResolver>,) -> u64 {- let request_id = self.next_service_worker_periodic_sync_unregistration_id;- self.next_service_worker_periodic_sync_unregistration_id = self- .next_service_worker_periodic_sync_unregistration_id- .wrapping_add(1)- .max(1);+ let request_id = self+ .service_worker_periodic_sync_unregistration_request_ids+ .allocate();self.pending_service_worker_periodic_sync_unregistrations.insert(request_id,@@ -2020,11 +2014,7 @@ impl WorkerGlobalState {&mut self,resolver: v8::Global<v8::PromiseResolver>,) -> u64 {- let request_id = self.next_service_worker_push_subscription_id;- self.next_service_worker_push_subscription_id = self- .next_service_worker_push_subscription_id- .wrapping_add(1)- .max(1);+ let request_id = self.service_worker_push_subscription_request_ids.allocate();self.pending_service_worker_push_subscriptions.insert(request_id, PendingServiceWorkerPushSubscribe { resolver });request_id@@ -2042,11 +2032,9 @@ impl WorkerGlobalState {&mut self,resolver: v8::Global<v8::PromiseResolver>,) -> u64 {- let request_id = self.next_service_worker_push_get_subscription_id;- self.next_service_worker_push_get_subscription_id = self- .next_service_worker_push_get_subscription_id- .wrapping_add(1)- .max(1);+ let request_id = self+ .service_worker_push_get_subscription_request_ids+ .allocate();self.pending_service_worker_push_get_subscriptions.insert(request_id,PendingServiceWorkerPushGetSubscription { resolver },@@ -2066,11 +2054,9 @@ impl WorkerGlobalState {&mut self,resolver: v8::Global<v8::PromiseResolver>,) -> u64 {- let request_id = self.next_service_worker_push_unsubscription_id;- self.next_service_worker_push_unsubscription_id = self- .next_service_worker_push_unsubscription_id- .wrapping_add(1)- .max(1);+ let request_id = self+ .service_worker_push_unsubscription_request_ids+ .allocate();self.pending_service_worker_push_unsubscriptions.insert(request_id, PendingServiceWorkerPushUnsubscribe { resolver });request_id@@ -2841,7 +2827,10 @@ pub(crate) fn reserve_nested_worker_context(let mut state = state.borrow_mut();let base_url = state.current_script_url.clone()?;let worker_id = DedicatedWorkerId::new(state.next_nested_worker_id);- state.next_nested_worker_id = state.next_nested_worker_id.saturating_add(1);+ state.next_nested_worker_id = state+ .next_nested_worker_id+ .checked_add(1)+ .expect("nested worker id space exhausted");state.nested_worker_wrappers.insert(worker_id, v8::Global::new(scope, worker));@@ -6524,17 +6513,26 @@ pub(super) fn close_worker_owned_broadcast_channels(state: &Rc<RefCell<WorkerGlo}fn next_fetch_id(state: &mut WorkerGlobalState) -> u32 {- state.next_fetch_id = state.next_fetch_id.saturating_add(1).max(1);+ state.next_fetch_id = state+ .next_fetch_id+ .checked_add(1)+ .expect("worker fetch id space exhausted");state.next_fetch_id}fn next_xhr_id(state: &mut WorkerGlobalState) -> u32 {- state.next_xhr_id = state.next_xhr_id.saturating_add(1).max(1);+ state.next_xhr_id = state+ .next_xhr_id+ .checked_add(1)+ .expect("worker XHR id space exhausted");state.next_xhr_id}fn next_websocket_id(state: &mut WorkerGlobalState) -> u64 {- state.next_websocket_id = state.next_websocket_id.saturating_add(1).max(1);+ state.next_websocket_id = state+ .next_websocket_id+ .checked_add(1)+ .expect("worker WebSocket id space exhausted");state.next_websocket_id}diff --git a/moli-renderer-v8/src/worker/module_runtime.rs b/moli-renderer-v8/src/worker/module_runtime.rsindex a1a58f46e..3c0a547da 100644--- a/moli-renderer-v8/src/worker/module_runtime.rs+++ b/moli-renderer-v8/src/worker/module_runtime.rs@@ -2271,7 +2271,9 @@ fn reserve_worker_module_graph_fetch_id(.expect("worker module runtime fetch id slot should be installed");let mut next_fetch_id = slot.next_fetch_id.borrow_mut();let fetch_id = *next_fetch_id;- *next_fetch_id += 1;+ *next_fetch_id = next_fetch_id+ .checked_add(1)+ .expect("worker module graph fetch id space exhausted");fetch_id}diff --git a/moli-renderer-v8/src/worker/thread/mod.rs b/moli-renderer-v8/src/worker/thread/mod.rsindex 84cdaf745..9a89c645a 100644--- a/moli-renderer-v8/src/worker/thread/mod.rs+++ b/moli-renderer-v8/src/worker/thread/mod.rs@@ -1694,33 +1694,33 @@ async fn worker_main(opfs_owner_state: None,pending_service_worker_periodic_sync_events: std::collections::HashMap::new(),pending_service_worker_client_queries: std::collections::HashMap::new(),- next_service_worker_client_query_id: 1,pending_service_worker_client_navigates: std::collections::HashMap::new(),- next_service_worker_client_navigate_id: 1,pending_service_worker_client_focuses: std::collections::HashMap::new(),- next_service_worker_client_focus_id: 1,pending_service_worker_clients_open_windows: std::collections::HashMap::new(),- next_service_worker_clients_open_window_id: 1,pending_service_worker_show_notifications: std::collections::HashMap::new(),- next_service_worker_show_notification_id: 1,pending_service_worker_get_notifications: std::collections::HashMap::new(),- next_service_worker_get_notifications_id: 1,pending_service_worker_sync_registrations: std::collections::HashMap::new(),- next_service_worker_sync_registration_id: 1,pending_service_worker_sync_get_tags: std::collections::HashMap::new(),- next_service_worker_sync_get_tags_id: 1,pending_service_worker_periodic_sync_registrations: std::collections::HashMap::new(),- next_service_worker_periodic_sync_registration_id: 1,pending_service_worker_periodic_sync_get_tags: std::collections::HashMap::new(),- next_service_worker_periodic_sync_get_tags_id: 1,pending_service_worker_periodic_sync_unregistrations: std::collections::HashMap::new(),- next_service_worker_periodic_sync_unregistration_id: 1,pending_service_worker_push_subscriptions: std::collections::HashMap::new(),- next_service_worker_push_subscription_id: 1,pending_service_worker_push_get_subscriptions: std::collections::HashMap::new(),- next_service_worker_push_get_subscription_id: 1,pending_service_worker_push_unsubscriptions: std::collections::HashMap::new(),- next_service_worker_push_unsubscription_id: 1,+ service_worker_client_query_request_ids: Default::default(),+ service_worker_client_navigate_request_ids: Default::default(),+ service_worker_client_focus_request_ids: Default::default(),+ service_worker_clients_open_window_request_ids: Default::default(),+ service_worker_show_notification_request_ids: Default::default(),+ service_worker_get_notifications_request_ids: Default::default(),+ service_worker_sync_registration_request_ids: Default::default(),+ service_worker_sync_get_tags_request_ids: Default::default(),+ service_worker_periodic_sync_registration_request_ids: Default::default(),+ service_worker_periodic_sync_get_tags_request_ids: Default::default(),+ service_worker_periodic_sync_unregistration_request_ids: Default::default(),+ service_worker_push_subscription_request_ids: Default::default(),+ service_worker_push_get_subscription_request_ids: Default::default(),+ service_worker_push_unsubscription_request_ids: Default::default(),service_worker_window_interaction_allowed_count: 0,pending_service_worker_lifecycle_events: std::collections::HashMap::new(),pending_service_worker_fetch_events: std::collections::HashMap::new(),