@powersync/op-sqlite 0.5.5 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@powersync/op-sqlite",
-  "version": "0.5.5",
+  "version": "0.6.0",
   "description": "PowerSync - sync Postgres or MongoDB with SQLite in your React Native app for offline-first and real-time data",
   "source": "./src/index.ts",
   "main": "./lib/commonjs/index.js",
@@ -59,13 +59,13 @@
   },
   "peerDependencies": {
     "@op-engineering/op-sqlite": "^11.2.13",
-    "@powersync/common": "^1.30.0",
+    "@powersync/common": "^1.31.0",
     "react": "*",
     "react-native": "*"
   },
   "dependencies": {
     "async-lock": "^1.4.0",
-    "@powersync/common": "1.30.0"
+    "@powersync/common": "1.31.0"
   },
   "devDependencies": {
     "@op-engineering/op-sqlite": "^11.2.13",

package/src/db/OPSqliteAdapter.ts

@@ -1,8 +1,8 @@
-import { BaseObserver, DBAdapter, DBAdapterListener, DBLockOptions, QueryResult, Transaction } from '@powersync/common';
 import { ANDROID_DATABASE_PATH, getDylibPath, IOS_LIBRARY_PATH, open, type DB } from '@op-engineering/op-sqlite';
+import { BaseObserver, DBAdapter, DBAdapterListener, DBLockOptions, QueryResult, Transaction } from '@powersync/common';
 import Lock from 'async-lock';
-import { OPSQLiteConnection } from './OPSQLiteConnection';
 import { Platform } from 'react-native';
+import { OPSQLiteConnection } from './OPSQLiteConnection';
 import { SqliteOptions } from './SqliteOptions';
 
 /**
@@ -32,6 +32,7 @@ export class OPSQLiteDBAdapter extends BaseObserver<DBAdapterListener> implement
   protected writeConnection: OPSQLiteConnection | null;
 
   private readQueue: Array<() => void> = [];
+  private abortController: AbortController;
 
   constructor(protected options: OPSQLiteAdapterOptions) {
     super();
@@ -40,6 +41,7 @@ export class OPSQLiteDBAdapter extends BaseObserver<DBAdapterListener> implement
     this.locks = new Lock();
     this.readConnections = null;
     this.writeConnection = null;
+    this.abortController = new AbortController();
     this.initialized = this.init();
   }
 
@@ -153,11 +155,14 @@ export class OPSQLiteDBAdapter extends BaseObserver<DBAdapterListener> implement
     }
   }
 
-  close() {
-    this.initialized.then(() => {
-      this.writeConnection!.close();
-      this.readConnections!.forEach((c) => c.connection.close());
-    });
+  async close() {
+    await this.initialized;
+    // Abort any pending operations
+    this.abortController.abort();
+    this.readQueue = [];
+
+    this.writeConnection!.close();
+    this.readConnections!.forEach((c) => c.connection.close());
   }
 
   async readLock<T>(fn: (tx: OPSQLiteConnection) => Promise<T>, options?: DBLockOptions): Promise<T> {
@@ -203,10 +208,20 @@ export class OPSQLiteDBAdapter extends BaseObserver<DBAdapterListener> implement
 
     return new Promise(async (resolve, reject) => {
       try {
+        // Set up abort signal listener
+        const abortListener = () => {
+          reject(new Error('Database connection was closed'));
+        };
+        this.abortController.signal.addEventListener('abort', abortListener);
+
         await this.locks
           .acquire(
             LockType.WRITE,
             async () => {
+              // Check if operation was aborted before executing
+              if (this.abortController.signal.aborted) {
+                reject(new Error('Database connection was closed'));
+              }
               resolve(await fn(this.writeConnection!));
             },
             { timeout: options?.timeoutMs }
@@ -214,6 +229,9 @@ export class OPSQLiteDBAdapter extends BaseObserver<DBAdapterListener> implement
           .then(() => {
             // flush updates once a write lock has been released
             this.writeConnection!.flushUpdates();
+          })
+          .finally(() => {
+            this.abortController.signal.removeEventListener('abort', abortListener);
           });
       } catch (ex) {
         reject(ex);