Skip to content

armgit / moli

Public Imported from GitHub
0

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

refactor(indexeddb): centralize connection retirement completion

ldm0605ce23de377
diff --git a/moli-renderer-v8/src/native_bridge/context_host/indexed_db_tasks.rs b/moli-renderer-v8/src/native_bridge/context_host/indexed_db_tasks.rs
index 7862c3b1e..7edc384e9 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/indexed_db_tasks.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/indexed_db_tasks.rs
@@ -28,6 +28,14 @@ pub(super) struct IndexedDbContextRetirement {
scheduled_drains: Vec<WindowExecutionContextIdentity>,
}
+impl IndexedDbContextRetirement {
+ pub(super) fn finish(self, manager: Option<&crate::WeakIndexedDbManager>) {
+ if let Some(manager) = manager {
+ let _ = manager.close_database_handles(self.retired_connections);
+ }
+ }
+}
+
#[derive(Default)]
pub(super) struct IndexedDbContextState {
open_connections: RefCell<BTreeMap<DatabaseHandle, IndexedDbOpenConnection>>,
@@ -327,6 +335,27 @@ impl JsContextHost {
mod tests {
use super::*;
+ #[test]
+ fn retirement_completion_closes_owned_connections() {
+ let manager = crate::new_indexed_db_manager(None).unwrap();
+ let weak = crate::downgrade_indexed_db_manager(&manager);
+ let opened = manager
+ .lock()
+ .open(moli_indexeddb::OpenOptions {
+ origin: "retirement".to_owned(),
+ name: "owned".into(),
+ version: None,
+ })
+ .unwrap();
+ IndexedDbContextRetirement {
+ retired_connections: vec![opened.database],
+ ..Default::default()
+ }
+ .finish(Some(&weak));
+ assert!(manager.lock().close_database(opened.database).is_err());
+ IndexedDbContextRetirement::default().finish(None);
+ }
+
fn identity(raw: u64) -> WindowExecutionContextIdentity {
WindowExecutionContextIdentity::new(
super::super::WindowExecutionContextOwner::Frame(
diff --git a/moli-renderer-v8/src/native_bridge/context_host/runtime_observable.rs b/moli-renderer-v8/src/native_bridge/context_host/runtime_observable.rs
index f42a208a7..1d78a27bc 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/runtime_observable.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/runtime_observable.rs
@@ -496,14 +496,10 @@ impl JsContextHost {
OwnerDispatchScope::LightweightPopup(_)
) {
let retirement = self.retire_indexed_db_owner(owner);
- if let Some(manager) = self.indexed_db_manager.as_ref() {
- let _ = manager.close_database_handles(retirement.retired_connections);
- }
+ retirement.finish(self.indexed_db_manager.as_ref());
} else {
let retirement = self.retire_indexed_db_context(binding.realm_token());
- if let Some(manager) = self.indexed_db_manager.as_ref() {
- let _ = manager.close_database_handles(retirement.retired_connections);
- }
+ retirement.finish(self.indexed_db_manager.as_ref());
self.bridge
.retire_default_world_wrappers_for_realm(binding.realm_token());
}
@@ -522,9 +518,7 @@ impl JsContextHost {
crate::observer_runtime::retire_context_token(self, context_token);
let indexed_db_retirement = self.retire_indexed_db_context(context_token);
let retired_indexed_db_connections = indexed_db_retirement.retired_connections.len();
- if let Some(manager) = self.indexed_db_manager.as_ref() {
- let _ = manager.close_database_handles(indexed_db_retirement.retired_connections);
- }
+ indexed_db_retirement.finish(self.indexed_db_manager.as_ref());
let owners = self
.window_execution_contexts
.iter()
@@ -572,9 +566,7 @@ impl JsContextHost {
) -> usize {
crate::observer_runtime::retire_context_token(self, context_token);
let indexed_db_retirement = self.retire_indexed_db_context(context_token);
- if let Some(manager) = self.indexed_db_manager.as_ref() {
- let _ = manager.close_database_handles(indexed_db_retirement.retired_connections);
- }
+ indexed_db_retirement.finish(self.indexed_db_manager.as_ref());
let retired_realm_count = self
.window_execution_context_realms
.remove_token(context_token);