Fix tests

Author: simolus3

packages/web/src/db/adapters/LockedAsyncDatabaseAdapter.ts

@@ -203,8 +203,6 @@ export class LockedAsyncDatabaseAdapter
     );
   }
 
-  static dbLockRequestId = 0;
-
   protected async acquireLock(callback: () => Promise<any>, options?: { timeoutMs?: number }): Promise<any> {
     await this.waitForInitialized();
 
@@ -223,7 +221,6 @@ export class LockedAsyncDatabaseAdapter
         }, timeoutMs)
       : null;
 
-    const id = LockedAsyncDatabaseAdapter.dbLockRequestId++;
     return getNavigatorLocks().request(`db-lock-${this._dbIdentifier}`, { signal: abortController.signal }, () => {
       this.pendingAbortControllers.delete(abortController);
       if (timoutId) {

packages/web/src/db/adapters/WorkerWrappedAsyncDatabaseConnection.ts

@@ -149,9 +149,12 @@ export class WorkerWrappedAsyncDatabaseConnection<Config extends ResolvedWebSQLO
   async close(): Promise<void> {
     // Abort any pending lock requests.
     this.lockAbortController.abort();
-    this.options.remote[Comlink.releaseProxy]();
-    this.options.onClose?.();
-    await this.baseConnection.close();
+    try {
+      await this.withRemote(() => this.baseConnection.close());
+    } finally {
+      this.options.remote[Comlink.releaseProxy]();
+      this.options.onClose?.();
+    }
   }
 
   execute(sql: string, params?: any[]): Promise<ProxiedQueryResult> {