idk 2

a-type · Nov 30, 2024 · e0a6a91 · e0a6a91
1 parent 78e0de8
commit e0a6a91
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/.changeset/twelve-readers-arrive.md b/.changeset/twelve-readers-arrive.md
@@ -0,0 +1,6 @@
+---
+'@verdant-web/persistence-sqlite': patch
+'@verdant-web/store': patch
+---
+
+Sometimes you think you know javascript, but
diff --git a/packages/persistence-sqlite/src/SqliteService.ts b/packages/persistence-sqlite/src/SqliteService.ts
@@ -8,16 +8,9 @@ export class SqliteService extends Disposable {
 	constructor(protected db: Database) {
 		super();
 		const abortController = new AbortController();
-		this.globalAbortController = abortController;
 		const abort = abortController.abort.bind(abortController);
-		this.addDispose(function () {
-			if (abortController.signal.aborted) return;
-			try {
-				abort();
-			} catch (err) {
-				console.error('Error aborting global controller', err);
-			}
-		});
+		this.globalAbortController = abortController;
+		this.addDispose(abort);
 	}
 
 	transaction = async <T>(

diff --git a/packages/store/src/persistence/idb/IdbService.ts b/packages/store/src/persistence/idb/IdbService.ts
@@ -17,16 +17,9 @@ export class IdbService extends Disposable {
 		super();
 		this.log = log;
 		const abortController = new AbortController();
-		this.globalAbortController = abortController;
 		const abort = abortController.abort.bind(abortController);
-		this.addDispose(function () {
-			if (abortController.signal.aborted) return;
-			try {
-				abort();
-			} catch (err) {
-				console.error('Error aborting global controller', err);
-			}
-		});
+		this.globalAbortController = abortController;
+		this.addDispose(abort);
 		this.db.addEventListener('versionchange', this.onVersionChange);
 		this.addDispose(() => {
 			this.db.removeEventListener('versionchange', this.onVersionChange);

diff --git a/packages/store/src/utils/Disposable.ts b/packages/store/src/utils/Disposable.ts
@@ -4,7 +4,15 @@ export class Disposable {
 
 	dispose = async () => {
 		this.disposed = true;
-		await Promise.all(this._disposes.map((dispose) => dispose()));
+		await Promise.all(
+			this._disposes.map(async (dispose) => {
+				try {
+					await dispose();
+				} catch (err) {
+					console.error('Error disposing', err);
+				}
+			}),
+		);
 		this._disposes = [];
 	};