Cleanup

Author: simolus3

demos/react-supabase-todolist/src/components/providers/SystemProvider.tsx

@@ -3,7 +3,15 @@ import { AppSchema, ListRecord, LISTS_TABLE, TODOS_TABLE } from '@/library/power
 import { SupabaseConnector } from '@/library/powersync/SupabaseConnector';
 import { CircularProgress } from '@mui/material';
 import { PowerSyncContext } from '@powersync/react';
-import { createBaseLogger, DifferentialWatchedQuery, LogLevel, PowerSyncDatabase } from '@powersync/web';
+import {
+  createBaseLogger,
+  DifferentialWatchedQuery,
+  LogLevel,
+  PowerSyncDatabase,
+  SyncClientImplementation,
+  WASQLiteOpenFactory,
+  WASQLiteVFS
+} from '@powersync/web';
 import React, { Suspense } from 'react';
 import { NavigationPanelContextProvider } from '../navigation/NavigationPanelContext';
 
@@ -12,9 +20,13 @@ export const useSupabase = () => React.useContext(SupabaseContext);
 
 export const db = new PowerSyncDatabase({
   schema: AppSchema,
-  database: {
-    dbFilename: 'example.db'
-  }
+  database: new WASQLiteOpenFactory({
+    dbFilename: 'example.db',
+    vfs: WASQLiteVFS.OPFSCoopSyncVFS,
+    flags: {
+      enableMultiTabs: typeof SharedWorker !== 'undefined'
+    }
+  })
 });
 
 export type EnhancedListRecord = ListRecord & { total_tasks: number; completed_tasks: number };
@@ -68,7 +80,7 @@ export const SystemProvider = ({ children }: { children: React.ReactNode }) => {
     const l = connector.registerListener({
       initialized: () => {},
       sessionStarted: () => {
-        powerSync.connect(connector);
+        powerSync.connect(connector, { clientImplementation: SyncClientImplementation.RUST });
       }
     });
 

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

@@ -224,16 +224,13 @@ export class LockedAsyncDatabaseAdapter
       : null;
 
     const id = LockedAsyncDatabaseAdapter.dbLockRequestId++;
-    console.trace('Requesting database lock', this._dbIdentifier, id);
-    return getNavigatorLocks()
-      .request(`db-lock-${this._dbIdentifier}`, { signal: abortController.signal }, () => {
-        this.pendingAbortControllers.delete(abortController);
-        if (timoutId) {
-          clearTimeout(timoutId);
-        }
-        return callback();
-      })
-      .finally(() => console.log('returning database lock', id));
+    return getNavigatorLocks().request(`db-lock-${this._dbIdentifier}`, { signal: abortController.signal }, () => {
+      this.pendingAbortControllers.delete(abortController);
+      if (timoutId) {
+        clearTimeout(timoutId);
+      }
+      return callback();
+    });
   }
 
   async readTransaction<T>(fn: (tx: Transaction) => Promise<T>, options?: DBLockOptions | undefined): Promise<T> {

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

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

packages/web/src/worker/sync/SharedSyncImplementation.ts

@@ -349,10 +349,6 @@ export class SharedSyncImplementation extends BaseObserver<SharedSyncImplementat
       }
     }
 
-    if (trackedPort.db) {
-      await trackedPort.db.close();
-    }
-
     // Re-index subscriptions, the subscriptions of the removed port would no longer be considered.
     this.collectActiveSubscriptions();
 
@@ -488,6 +484,7 @@ export class SharedSyncImplementation extends BaseObserver<SharedSyncImplementat
         });
         lastClient.closeListeners.push(() => {
           this.logger.info('Aborting open connection because associated tab closed.');
+          wrapped.close();
           wrapped.markRemoteClosed();
         });