ignore illegal abort invocation

a-type · Nov 30, 2024 · 87aa284 · 87aa284
1 parent 63e392f
commit 87aa284
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/.changeset/many-roses-dance.md b/.changeset/many-roses-dance.md
@@ -0,0 +1,6 @@
+---
+'@verdant-web/persistence-sqlite': patch
+'@verdant-web/store': patch
+---
+
+Ignore illegal invocation error from abort controller
diff --git a/packages/persistence-sqlite/src/SqliteService.ts b/packages/persistence-sqlite/src/SqliteService.ts
@@ -1,15 +1,22 @@
-import { Database, Tables } from './kysely.js';
 import { QueryMode } from '@verdant-web/store';
-import { Transaction } from './kysely.js';
 import { Disposable } from '@verdant-web/store/internal';
+import { Database, Tables, Transaction } from './kysely.js';
 
 export class SqliteService extends Disposable {
 	private globalAbortController = new AbortController();
 
 	constructor(protected db: Database) {
 		super();
 		this.addDispose(() => {
-			this.globalAbortController.abort();
+			try {
+				this.globalAbortController.abort();
+			} catch (err) {
+				if (err instanceof Error && err.message.includes('invocation')) {
+					// Ignore
+					return;
+				}
+				console.error('Error aborting global controller', err);
+			}
 		});
 	}
 

diff --git a/packages/store/src/persistence/idb/IdbService.ts b/packages/store/src/persistence/idb/IdbService.ts
@@ -1,10 +1,10 @@
 import { Context } from '../../context/context.js';
+import { Disposable } from '../../utils/Disposable.js';
 import {
 	createAbortableTransaction,
 	isAbortError,
 	storeRequestPromise,
 } from './util.js';
-import { Disposable } from '../../utils/Disposable.js';
 
 export class IdbService extends Disposable {
 	protected log?: Context['log'];
@@ -17,7 +17,15 @@ export class IdbService extends Disposable {
 		super();
 		this.log = log;
 		this.addDispose(() => {
-			this.globalAbortController.abort();
+			try {
+				this.globalAbortController.abort();
+			} catch (err) {
+				if (err instanceof Error && err.message.includes('invocation')) {
+					// Ignore
+					return;
+				}
+				console.error('Error aborting global controller', err);
+			}
 		});
 		this.db.addEventListener('versionchange', this.onVersionChange);
 		this.addDispose(() => {