@powersync/react-native 0.0.0-dev-20260311081226 → 0.0.0-dev-20260414110516

package/lib/db/adapters/react-native-quick-sqlite/RNQSDBAdapter.d.ts

@@ -1,41 +1,55 @@
-import { BaseObserver, DBAdapter, DBAdapterListener, LockContext as PowerSyncLockContext, Transaction as PowerSyncTransaction, DBLockOptions, QueryResult } from '@powersync/common';
+import { BaseObserver, DBAdapter, DBAdapterListener, LockContext as PowerSyncLockContext, DBLockOptions, ConnectionPool, LockContext, Transaction } from '@powersync/common';
 import type { QuickSQLiteConnection, LockContext as RNQSLockContext } from '@journeyapps/react-native-quick-sqlite';
-/**
- * Adapter for React Native Quick SQLite
- */
-export declare class RNQSDBAdapter extends BaseObserver<DBAdapterListener> implements DBAdapter {
+import { QueryResult, SqlExecutor } from '@powersync/common/dist/index.cjs';
+declare class RNQSConnectionPool extends BaseObserver<DBAdapterListener> implements ConnectionPool {
     protected baseDB: QuickSQLiteConnection;
     name: string;
-    getAll: <T>(sql: string, parameters?: any[]) => Promise<T[]>;
-    getOptional: <T>(sql: string, parameters?: any[]) => Promise<T | null>;
-    get: <T>(sql: string, parameters?: any[]) => Promise<T>;
     constructor(baseDB: QuickSQLiteConnection, name: string);
     close(): void;
     readLock<T>(fn: (tx: PowerSyncLockContext) => Promise<T>, options?: DBLockOptions): Promise<T>;
-    readTransaction<T>(fn: (tx: PowerSyncTransaction) => Promise<T>, options?: DBLockOptions): Promise<T>;
     writeLock<T>(fn: (tx: PowerSyncLockContext) => Promise<T>, options?: DBLockOptions): Promise<T>;
-    writeTransaction<T>(fn: (tx: PowerSyncTransaction) => Promise<T>, options?: DBLockOptions): Promise<T>;
+    generateContext<T extends RNQSLockContext>(ctx: T): QuickSqliteContext;
+    refreshSchema(): Promise<void>;
+}
+declare class QuickSqliteExecutor implements Omit<SqlExecutor, 'executeBatch'> {
+    readonly context: RNQSLockContext;
+    constructor(context: RNQSLockContext);
     execute(query: string, params?: any[]): Promise<import("@journeyapps/react-native-quick-sqlite").QueryResult>;
     /**
      * 'executeRaw' is not implemented in RNQS, this falls back to 'execute'.
      */
     executeRaw(query: string, params?: any[]): Promise<any[][]>;
+}
+declare const QuickSqliteContext_base: (new (...args: any[]) => {
+    getAll<T>(sql: string, parameters?: any[]): Promise<T[]>;
+    getOptional<T>(sql: string, parameters?: any[]): Promise<T | null>;
+    get<T>(sql: string, parameters?: any[]): Promise<T>;
+    executeBatch(query: string, params?: any[][]): Promise<import("@powersync/common").QueryResult>;
+    execute: (query: string, params?: any[] | undefined) => Promise<import("@powersync/common").QueryResult>;
+    executeRaw: (query: string, params?: any[] | undefined) => Promise<any[][]>;
+}) & typeof QuickSqliteExecutor;
+declare class QuickSqliteContext extends QuickSqliteContext_base implements LockContext {
+}
+declare const RNQSDBAdapter_base: (new (...args: any[]) => {
+    readTransaction<T>(fn: (tx: Transaction) => Promise<T>, options?: DBLockOptions): Promise<T>;
+    writeTransaction<T>(fn: (tx: Transaction) => Promise<T>, options?: DBLockOptions): Promise<T>;
+    getAll<T>(sql: string, parameters?: any[]): Promise<T[]>;
+    getOptional<T>(sql: string, parameters?: any[]): Promise<T | null>;
+    get<T>(sql: string, parameters?: any[]): Promise<T>;
+    execute(query: string, params?: any[]): Promise<import("@powersync/common").QueryResult>;
+    executeRaw(query: string, params?: any[]): Promise<any[][]>;
+    executeBatch(query: string, params?: any[][]): Promise<import("@powersync/common").QueryResult>;
+    name: string;
+    close: () => void | Promise<void>;
+    readLock: <T>(fn: (tx: LockContext) => Promise<T>, options?: DBLockOptions) => Promise<T>;
+    writeLock: <T>(fn: (tx: LockContext) => Promise<T>, options?: DBLockOptions) => Promise<T>;
+    refreshSchema: () => Promise<void>;
+    registerListener(listener: Partial<DBAdapterListener>): () => void;
+}) & typeof RNQSConnectionPool;
+/**
+ * Adapter for React Native Quick SQLite
+ */
+export declare class RNQSDBAdapter extends RNQSDBAdapter_base implements DBAdapter {
     executeBatch(query: string, params?: any[][]): Promise<QueryResult>;
-    generateContext<T extends RNQSLockContext>(ctx: T): T & {
-        executeRaw: (sql: string, params?: any[]) => Promise<unknown[][]>;
-    };
-    /**
-     * This provides a top-level read only execute method which is executed inside a read-lock.
-     * This is necessary since the high level `execute` method uses a write-lock under
-     * the hood. Helper methods such as `get`, `getAll` and `getOptional` are read only,
-     * and should use this method.
-     */
-    private readOnlyExecute;
-    /**
-     * Adds DB get utils to lock contexts and transaction contexts
-     * @param tx
-     * @returns
-     */
-    private generateDBHelpers;
-    refreshSchema(): Promise<void>;
 }
+export {};

package/lib/db/adapters/react-native-quick-sqlite/RNQSDBAdapter.js

@@ -1,13 +1,7 @@
-import { BaseObserver } from '@powersync/common';
-/**
- * Adapter for React Native Quick SQLite
- */
-export class RNQSDBAdapter extends BaseObserver {
+import { BaseObserver, DBGetUtilsDefaultMixin, DBAdapterDefaultMixin } from '@powersync/common';
+class RNQSConnectionPool extends BaseObserver {
     baseDB;
     name;
-    getAll;
-    getOptional;
-    get;
     constructor(baseDB, name) {
         super();
         this.baseDB = baseDB;
@@ -16,41 +10,48 @@ export class RNQSDBAdapter extends BaseObserver {
         baseDB.registerTablesChangedHook((update) => {
             this.iterateListeners((cb) => cb.tablesUpdated?.(update));
         });
-        const topLevelUtils = this.generateDBHelpers({
-            // Arrow function binds `this` for use in readOnlyExecute
-            execute: (sql, params) => this.readOnlyExecute(sql, params)
-        });
-        // Only assigning get helpers
-        this.getAll = topLevelUtils.getAll;
-        this.getOptional = topLevelUtils.getOptional;
-        this.get = topLevelUtils.get;
     }
     close() {
         return this.baseDB.close();
     }
     readLock(fn, options) {
-        return this.baseDB.readLock((dbTx) => fn(this.generateDBHelpers(this.generateContext(dbTx))), options);
-    }
-    readTransaction(fn, options) {
-        return this.baseDB.readTransaction((dbTx) => fn(this.generateDBHelpers(this.generateContext(dbTx))), options);
+        return this.baseDB.readLock((dbTx) => fn(this.generateContext(dbTx)), options);
     }
     writeLock(fn, options) {
-        return this.baseDB.writeLock((dbTx) => fn(this.generateDBHelpers(this.generateContext(dbTx))), options);
+        return this.baseDB.writeLock((dbTx) => fn(this.generateContext(dbTx)), options);
+    }
+    generateContext(ctx) {
+        return new QuickSqliteContext(ctx);
+    }
+    async refreshSchema() {
+        await this.baseDB.refreshSchema();
     }
-    writeTransaction(fn, options) {
-        return this.baseDB.writeTransaction((dbTx) => fn(this.generateDBHelpers(this.generateContext(dbTx))), options);
+}
+class QuickSqliteExecutor {
+    context;
+    constructor(context) {
+        this.context = context;
     }
     execute(query, params) {
-        return this.baseDB.execute(query, params);
+        return this.context.execute(query, params);
     }
     /**
      * 'executeRaw' is not implemented in RNQS, this falls back to 'execute'.
      */
     async executeRaw(query, params) {
-        const result = await this.baseDB.execute(query, params);
+        const result = await this.context.execute(query, params);
         const rows = result.rows?._array ?? [];
         return rows.map((row) => Object.values(row));
     }
+}
+class QuickSqliteContext extends DBGetUtilsDefaultMixin(QuickSqliteExecutor) {
+}
+/**
+ * Adapter for React Native Quick SQLite
+ */
+export class RNQSDBAdapter extends DBAdapterDefaultMixin(RNQSConnectionPool) {
+    // We don't want the default implementation here, RNQS does not support executeBatch for lock contexts so that would
+    // be less efficient.
     async executeBatch(query, params = []) {
         const commands = [];
         for (let i = 0; i < params.length; i++) {
@@ -61,63 +62,5 @@ export class RNQSDBAdapter extends BaseObserver {
             rowsAffected: result.rowsAffected ? result.rowsAffected : 0
         };
     }
-    generateContext(ctx) {
-        return {
-            ...ctx,
-            // 'executeRaw' is not implemented in RNQS, this falls back to 'execute'.
-            executeRaw: async (sql, params) => {
-                const result = await ctx.execute(sql, params);
-                const rows = result.rows?._array ?? [];
-                return rows.map((row) => Object.values(row));
-            }
-        };
-    }
-    /**
-     * This provides a top-level read only execute method which is executed inside a read-lock.
-     * This is necessary since the high level `execute` method uses a write-lock under
-     * the hood. Helper methods such as `get`, `getAll` and `getOptional` are read only,
-     * and should use this method.
-     */
-    readOnlyExecute(sql, params) {
-        return this.baseDB.readLock((ctx) => ctx.execute(sql, params));
-    }
-    /**
-     * Adds DB get utils to lock contexts and transaction contexts
-     * @param tx
-     * @returns
-     */
-    generateDBHelpers(tx) {
-        return {
-            ...tx,
-            /**
-             *  Execute a read-only query and return results
-             */
-            getAll: async (sql, parameters) => {
-                const res = await tx.execute(sql, parameters);
-                return res.rows?._array ?? [];
-            },
-            /**
-             * Execute a read-only query and return the first result, or null if the ResultSet is empty.
-             */
-            getOptional: async (sql, parameters) => {
-                const res = await tx.execute(sql, parameters);
-                return res.rows?.item(0) ?? null;
-            },
-            /**
-             * Execute a read-only query and return the first result, error if the ResultSet is empty.
-             */
-            get: async (sql, parameters) => {
-                const res = await tx.execute(sql, parameters);
-                const first = res.rows?.item(0);
-                if (!first) {
-                    throw new Error('Result set is empty');
-                }
-                return first;
-            }
-        };
-    }
-    async refreshSchema() {
-        await this.baseDB.refreshSchema();
-    }
 }
 //# sourceMappingURL=RNQSDBAdapter.js.map

package/lib/db/adapters/react-native-quick-sqlite/RNQSDBAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"RNQSDBAdapter.js","sourceRoot":"","sources":["../../../../src/db/adapters/react-native-quick-sqlite/RNQSDBAdapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RNQSDBAdapter.js","sourceRoot":"","sources":["../../../../src/db/adapters/react-native-quick-sqlite/RNQSDBAdapter.ts"],"names":[],"mappings":"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"}

package/lib/sync/stream/ReactNativeRemote.d.ts

@@ -1,4 +1,4 @@
-import { AbstractRemote, AbstractRemoteOptions, BSONImplementation, DataStream, ILogger, RemoteConnector, SyncStreamOptions } from '@powersync/common';
+import { AbstractRemote, AbstractRemoteOptions, BSONImplementation, ILogger, RemoteConnector, SyncStreamOptions } from '@powersync/common';
 import { TextDecoder } from 'text-encoding';
 export declare const STREAMING_POST_TIMEOUT_MS = 30000;
 export declare class ReactNativeRemote extends AbstractRemote {
@@ -7,6 +7,10 @@ export declare class ReactNativeRemote extends AbstractRemote {
     constructor(connector: RemoteConnector, logger?: ILogger, options?: Partial<AbstractRemoteOptions>);
     getUserAgent(): string;
     getBSON(): Promise<BSONImplementation>;
-    protected createTextDecoder(): TextDecoder;
-    postStreamRaw<T>(options: SyncStreamOptions, mapLine: (line: string) => T): Promise<DataStream<T>>;
+    createTextDecoder(): TextDecoder;
+    protected get supportsStreamingBinaryResponses(): boolean;
+    protected fetchStreamRaw(options: SyncStreamOptions): Promise<{
+        isBson: boolean;
+        stream: import("@powersync/common").SimpleAsyncIterator<Uint8Array>;
+    }>;
 }

package/lib/sync/stream/ReactNativeRemote.js

@@ -40,14 +40,18 @@ export class ReactNativeRemote extends AbstractRemote {
     createTextDecoder() {
         return new TextDecoder();
     }
-    async postStreamRaw(options, mapLine) {
+    get supportsStreamingBinaryResponses() {
+        // We have to pass textStreaming: true to get streamed responses at all, and those don't support binary data.
+        return false;
+    }
+    async fetchStreamRaw(options) {
         const timeout = Platform.OS == 'android'
             ? setTimeout(() => {
                 this.logger.warn(`HTTP Streaming POST is taking longer than ${Math.ceil(STREAMING_POST_TIMEOUT_MS / 1000)} seconds to resolve. If using a debug build, please ensure Flipper Network plugin is disabled.`);
             }, STREAMING_POST_TIMEOUT_MS)
             : null;
         try {
-            return await super.postStreamRaw({
+            return await super.fetchStreamRaw({
                 ...options,
                 fetchOptions: {
                     ...options.fetchOptions,
@@ -59,7 +63,7 @@ export class ReactNativeRemote extends AbstractRemote {
                     // @ts-expect-error https://github.com/react-native-community/fetch#enable-text-streaming
                     reactNative: { textStreaming: true }
                 }
-            }, mapLine);
+            });
         }
         finally {
             if (timeout) {

package/lib/sync/stream/ReactNativeRemote.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReactNativeRemote.js","sourceRoot":"","sources":["../../../src/sync/stream/ReactNativeRemote.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAGd,qBAAqB,EAGrB,2BAA2B,EAI5B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,gGAAgG;AAChG,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAE/C,MAAM,CAAC,MAAM,yBAAyB,GAAG,MAAM,CAAC;AAEhD;;;;GAIG;AACH,MAAM,wBAAyB,SAAQ,2BAA2B;IAChE,QAAQ;QACN,OAAO,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;CACF;AAED,MAAM,OAAO,iBAAkB,SAAQ,cAAc;IAEvC;IACA;IAFZ,YACY,SAA0B,EAC1B,SAAkB,qBAAqB,EACjD,OAAwC;QAExC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE;YACvB,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;YAClB,mBAAmB,EAAE,OAAO,EAAE,mBAAmB,IAAI,IAAI,wBAAwB,EAAE;SACpF,CAAC,CAAC;QAPO,cAAS,GAAT,SAAS,CAAiB;QAC1B,WAAM,GAAN,MAAM,CAAiC;IAOnD,CAAC;IAED,YAAY;QACV,OAAO;YACL,KAAK,CAAC,YAAY,EAAE;YACpB,wBAAwB;YACxB,gBAAgB,QAAQ,CAAC,SAAS,CAAC,kBAAkB,CAAC,KAAK,IAAI,QAAQ,CAAC,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE;YAC5G,GAAG,QAAQ,CAAC,EAAE,IAAI,QAAQ,CAAC,OAAO,EAAE;SACrC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACd,CAAC;IAED,KAAK,CAAC,OAAO;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IAES,iBAAiB;QACzB,OAAO,IAAI,WAAW,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,aAAa,CAAI,OAA0B,EAAE,OAA4B;QAC7E,MAAM,OAAO,GACX,QAAQ,CAAC,EAAE,IAAI,SAAS;YACtB,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,6CAA6C,IAAI,CAAC,IAAI,CACpD,yBAAyB,GAAG,IAAI,CACjC,gGAAgG,CAClG,CAAC;YACJ,CAAC,EAAE,yBAAyB,CAAC;YAC/B,CAAC,CAAC,IAAI,CAAC;QAEX,IAAI,CAAC;YACH,OAAO,MAAM,KAAK,CAAC,aAAa,CAC9B;gBACE,GAAG,OAAO;gBACV,YAAY,EAAE;oBACZ,GAAG,OAAO,CAAC,YAAY;oBACvB;;;;uBAIG;oBACH,yFAAyF;oBACzF,WAAW,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE;iBACrC;aACF,EACD,OAAO,CACR,CAAC;QACJ,CAAC;gBAAS,CAAC;YACT,IAAI,OAAO,EAAE,CAAC;gBACZ,YAAY,CAAC,OAAO,CAAC,CAAC;YACxB,CAAC;QACH,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"ReactNativeRemote.js","sourceRoot":"","sources":["../../../src/sync/stream/ReactNativeRemote.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAGd,qBAAqB,EAErB,2BAA2B,EAI5B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,gGAAgG;AAChG,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAE/C,MAAM,CAAC,MAAM,yBAAyB,GAAG,MAAM,CAAC;AAEhD;;;;GAIG;AACH,MAAM,wBAAyB,SAAQ,2BAA2B;IAChE,QAAQ;QACN,OAAO,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;CACF;AAED,MAAM,OAAO,iBAAkB,SAAQ,cAAc;IAEvC;IACA;IAFZ,YACY,SAA0B,EAC1B,SAAkB,qBAAqB,EACjD,OAAwC;QAExC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE;YACvB,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;YAClB,mBAAmB,EAAE,OAAO,EAAE,mBAAmB,IAAI,IAAI,wBAAwB,EAAE;SACpF,CAAC,CAAC;QAPO,cAAS,GAAT,SAAS,CAAiB;QAC1B,WAAM,GAAN,MAAM,CAAiC;IAOnD,CAAC;IAED,YAAY;QACV,OAAO;YACL,KAAK,CAAC,YAAY,EAAE;YACpB,wBAAwB;YACxB,gBAAgB,QAAQ,CAAC,SAAS,CAAC,kBAAkB,CAAC,KAAK,IAAI,QAAQ,CAAC,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE;YAC5G,GAAG,QAAQ,CAAC,EAAE,IAAI,QAAQ,CAAC,OAAO,EAAE;SACrC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACd,CAAC;IAED,KAAK,CAAC,OAAO;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,WAAW,EAAE,CAAC;IAC3B,CAAC;IAED,IAAc,gCAAgC;QAC5C,6GAA6G;QAC7G,OAAO,KAAK,CAAC;IACf,CAAC;IAES,KAAK,CAAC,cAAc,CAAC,OAA0B;QACvD,MAAM,OAAO,GACX,QAAQ,CAAC,EAAE,IAAI,SAAS;YACtB,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,6CAA6C,IAAI,CAAC,IAAI,CACpD,yBAAyB,GAAG,IAAI,CACjC,gGAAgG,CAClG,CAAC;YACJ,CAAC,EAAE,yBAAyB,CAAC;YAC/B,CAAC,CAAC,IAAI,CAAC;QAEX,IAAI,CAAC;YACH,OAAO,MAAM,KAAK,CAAC,cAAc,CAAC;gBAChC,GAAG,OAAO;gBACV,YAAY,EAAE;oBACZ,GAAG,OAAO,CAAC,YAAY;oBACvB;;;;uBAIG;oBACH,yFAAyF;oBACzF,WAAW,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE;iBACrC;aACF,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,IAAI,OAAO,EAAE,CAAC;gBACZ,YAAY,CAAC,OAAO,CAAC,CAAC;YACxB,CAAC;QACH,CAAC;IACH,CAAC;CACF"}

package/lib/sync/stream/ReactNativeStreamingSyncImplementation.d.ts

@@ -1,5 +1,4 @@
-import { AbstractStreamingSyncImplementation, AbstractStreamingSyncImplementationOptions, LockOptions, LockType } from '@powersync/common';
-import { Mutex } from 'async-mutex';
+import { AbstractStreamingSyncImplementation, AbstractStreamingSyncImplementationOptions, LockOptions, LockType, Mutex } from '@powersync/common';
 export declare class ReactNativeStreamingSyncImplementation extends AbstractStreamingSyncImplementation {
     locks: Map<LockType, Mutex>;
     constructor(options: AbstractStreamingSyncImplementationOptions);

package/lib/sync/stream/ReactNativeStreamingSyncImplementation.js

@@ -1,5 +1,4 @@
-import { AbstractStreamingSyncImplementation, LockType } from '@powersync/common';
-import { Mutex } from 'async-mutex';
+import { AbstractStreamingSyncImplementation, LockType, Mutex } from '@powersync/common';
 /**
  * Global locks which prevent multiple instances from syncing
  * concurrently.
@@ -33,11 +32,8 @@ export class ReactNativeStreamingSyncImplementation extends AbstractStreamingSyn
             throw new Error(`Lock type ${lockOptions.type} not found`);
         }
         return lock.runExclusive(async () => {
-            if (lockOptions.signal?.aborted) {
-                throw new Error('Aborted');
-            }
             return lockOptions.callback();
-        });
+        }, lockOptions.signal);
     }
 }
 //# sourceMappingURL=ReactNativeStreamingSyncImplementation.js.map

package/lib/sync/stream/ReactNativeStreamingSyncImplementation.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReactNativeStreamingSyncImplementation.js","sourceRoot":"","sources":["../../../src/sync/stream/ReactNativeStreamingSyncImplementation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mCAAmC,EAGnC,QAAQ,EACT,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC;;;GAGG;AACH,MAAM,KAAK,GAAG,IAAI,GAAG,EAAgC,CAAC;AAEtD,MAAM,OAAO,sCAAuC,SAAQ,mCAAmC;IAC7F,KAAK,CAAuB;IAE5B,YAAY,OAAmD;QAC7D,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,SAAS;QACP,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QACpC,IAAI,UAAU,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC;YACpC,OAAO;QACT,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,EAAmB,CAAC;QACxC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;QAE3C,IAAI,UAAU,EAAE,CAAC;YACf,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED,UAAU,CAAI,WAA2B;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,aAAa,WAAW,CAAC,IAAI,YAAY,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE;YAClC,IAAI,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;gBAChC,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;YAC7B,CAAC;YAED,OAAO,WAAW,CAAC,QAAQ,EAAE,CAAC;QAChC,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"ReactNativeStreamingSyncImplementation.js","sourceRoot":"","sources":["../../../src/sync/stream/ReactNativeStreamingSyncImplementation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mCAAmC,EAGnC,QAAQ,EACR,KAAK,EACN,MAAM,mBAAmB,CAAC;AAE3B;;;GAGG;AACH,MAAM,KAAK,GAAG,IAAI,GAAG,EAAgC,CAAC;AAEtD,MAAM,OAAO,sCAAuC,SAAQ,mCAAmC;IAC7F,KAAK,CAAuB;IAE5B,YAAY,OAAmD;QAC7D,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,SAAS;QACP,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QACpC,IAAI,UAAU,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC;YACpC,OAAO;QACT,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,EAAmB,CAAC;QACxC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;QAE3C,IAAI,UAAU,EAAE,CAAC;YACf,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED,UAAU,CAAI,WAA2B;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,aAAa,WAAW,CAAC,IAAI,YAAY,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE;YAClC,OAAO,WAAW,CAAC,QAAQ,EAAE,CAAC;QAChC,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACzB,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@powersync/react-native",
-  "version": "0.0.0-dev-20260311081226",
+  "version": "0.0.0-dev-20260414110516",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -18,7 +18,7 @@
     "type": "git",
     "url": "git+https://github.com/powersync-ja/powersync-js.git"
   },
-  "author": "JOURNEYAPPS",
+  "author": "PowerSync",
   "license": "Apache-2.0",
   "bugs": {
     "url": "https://github.com/powersync-ja/powersync-js/issues"
@@ -26,7 +26,7 @@
   "homepage": "https://docs.powersync.com/",
   "peerDependencies": {
     "@journeyapps/react-native-quick-sqlite": "^2.5.1",
-    "@powersync/common": "0.0.0-dev-20260311081226",
+    "@powersync/common": "0.0.0-dev-20260414110516",
     "react": "*",
     "react-native": "*"
   },
@@ -36,9 +36,8 @@
     }
   },
   "dependencies": {
-    "async-mutex": "^0.5.0",
-    "@powersync/common": "0.0.0-dev-20260311081226",
-    "@powersync/react": "1.9.0"
+    "@powersync/common": "0.0.0-dev-20260414110516",
+    "@powersync/react": "1.10.0"
   },
   "devDependencies": {
     "@craftzdog/react-native-buffer": "^6.0.5",

package/src/db/adapters/react-native-quick-sqlite/RNQSDBAdapter.ts

@@ -3,25 +3,17 @@ import {
   DBAdapter,
   DBAdapterListener,
   LockContext as PowerSyncLockContext,
-  Transaction as PowerSyncTransaction,
   DBLockOptions,
-  DBGetUtils,
-  QueryResult
+  ConnectionPool,
+  DBGetUtilsDefaultMixin,
+  LockContext,
+  DBAdapterDefaultMixin,
+  Transaction
 } from '@powersync/common';
-import type {
-  QuickSQLiteConnection,
-  LockContext as RNQSLockContext,
-  TransactionContext as RNQSTransactionContext
-} from '@journeyapps/react-native-quick-sqlite';
-
-/**
- * Adapter for React Native Quick SQLite
- */
-export class RNQSDBAdapter extends BaseObserver<DBAdapterListener> implements DBAdapter {
-  getAll: <T>(sql: string, parameters?: any[]) => Promise<T[]>;
-  getOptional: <T>(sql: string, parameters?: any[]) => Promise<T | null>;
-  get: <T>(sql: string, parameters?: any[]) => Promise<T>;
+import type { QuickSQLiteConnection, LockContext as RNQSLockContext } from '@journeyapps/react-native-quick-sqlite';
+import { QueryResult, SqlExecutor } from '@powersync/common/dist/index.cjs';
 
+class RNQSConnectionPool extends BaseObserver<DBAdapterListener> implements ConnectionPool {
   constructor(
     protected baseDB: QuickSQLiteConnection,
     public name: string
@@ -31,15 +23,6 @@ export class RNQSDBAdapter extends BaseObserver<DBAdapterListener> implements DB
     baseDB.registerTablesChangedHook((update) => {
       this.iterateListeners((cb) => cb.tablesUpdated?.(update));
     });
-
-    const topLevelUtils = this.generateDBHelpers({
-      // Arrow function binds `this` for use in readOnlyExecute
-      execute: (sql: string, params?: any[]) => this.readOnlyExecute(sql, params)
-    });
-    // Only assigning get helpers
-    this.getAll = topLevelUtils.getAll;
-    this.getOptional = topLevelUtils.getOptional;
-    this.get = topLevelUtils.get;
   }
 
   close() {
@@ -47,34 +30,46 @@ export class RNQSDBAdapter extends BaseObserver<DBAdapterListener> implements DB
   }
 
   readLock<T>(fn: (tx: PowerSyncLockContext) => Promise<T>, options?: DBLockOptions): Promise<T> {
-    return this.baseDB.readLock((dbTx) => fn(this.generateDBHelpers(this.generateContext(dbTx))), options);
+    return this.baseDB.readLock((dbTx) => fn(this.generateContext(dbTx)), options);
   }
 
-  readTransaction<T>(fn: (tx: PowerSyncTransaction) => Promise<T>, options?: DBLockOptions): Promise<T> {
-    return this.baseDB.readTransaction((dbTx) => fn(this.generateDBHelpers(this.generateContext(dbTx))), options);
+  writeLock<T>(fn: (tx: PowerSyncLockContext) => Promise<T>, options?: DBLockOptions): Promise<T> {
+    return this.baseDB.writeLock((dbTx) => fn(this.generateContext(dbTx)), options);
   }
 
-  writeLock<T>(fn: (tx: PowerSyncLockContext) => Promise<T>, options?: DBLockOptions): Promise<T> {
-    return this.baseDB.writeLock((dbTx) => fn(this.generateDBHelpers(this.generateContext(dbTx))), options);
+  generateContext<T extends RNQSLockContext>(ctx: T) {
+    return new QuickSqliteContext(ctx);
   }
 
-  writeTransaction<T>(fn: (tx: PowerSyncTransaction) => Promise<T>, options?: DBLockOptions): Promise<T> {
-    return this.baseDB.writeTransaction((dbTx) => fn(this.generateDBHelpers(this.generateContext(dbTx))), options);
+  async refreshSchema() {
+    await this.baseDB.refreshSchema();
   }
+}
+
+class QuickSqliteExecutor implements Omit<SqlExecutor, 'executeBatch'> {
+  constructor(readonly context: RNQSLockContext) {}
 
   execute(query: string, params?: any[]) {
-    return this.baseDB.execute(query, params);
+    return this.context.execute(query, params);
   }
-
   /**
    * 'executeRaw' is not implemented in RNQS, this falls back to 'execute'.
    */
   async executeRaw(query: string, params?: any[]): Promise<any[][]> {
-    const result = await this.baseDB.execute(query, params);
+    const result = await this.context.execute(query, params);
     const rows = result.rows?._array ?? [];
     return rows.map((row) => Object.values(row));
   }
+}
 
+class QuickSqliteContext extends DBGetUtilsDefaultMixin(QuickSqliteExecutor) implements LockContext {}
+
+/**
+ * Adapter for React Native Quick SQLite
+ */
+export class RNQSDBAdapter extends DBAdapterDefaultMixin(RNQSConnectionPool) implements DBAdapter {
+  // We don't want the default implementation here, RNQS does not support executeBatch for lock contexts so that would
+  // be less efficient.
   async executeBatch(query: string, params: any[][] = []): Promise<QueryResult> {
     const commands: any[] = [];
 
@@ -87,70 +82,4 @@ export class RNQSDBAdapter extends BaseObserver<DBAdapterListener> implements DB
       rowsAffected: result.rowsAffected ? result.rowsAffected : 0
     };
   }
-
-  generateContext<T extends RNQSLockContext>(ctx: T) {
-    return {
-      ...ctx,
-      // 'executeRaw' is not implemented in RNQS, this falls back to 'execute'.
-      executeRaw: async (sql: string, params?: any[]) => {
-        const result = await ctx.execute(sql, params);
-        const rows = result.rows?._array ?? [];
-        return rows.map((row) => Object.values(row));
-      }
-    };
-  }
-
-  /**
-   * This provides a top-level read only execute method which is executed inside a read-lock.
-   * This is necessary since the high level `execute` method uses a write-lock under
-   * the hood. Helper methods such as `get`, `getAll` and `getOptional` are read only,
-   * and should use this method.
-   */
-  private readOnlyExecute(sql: string, params?: any[]) {
-    return this.baseDB.readLock((ctx) => ctx.execute(sql, params));
-  }
-
-  /**
-   * Adds DB get utils to lock contexts and transaction contexts
-   * @param tx
-   * @returns
-   */
-  private generateDBHelpers<T extends { execute: (sql: string, params?: any[]) => Promise<QueryResult> }>(
-    tx: T
-  ): T & DBGetUtils {
-    return {
-      ...tx,
-      /**
-       *  Execute a read-only query and return results
-       */
-      getAll: async <T>(sql: string, parameters?: any[]): Promise<T[]> => {
-        const res = await tx.execute(sql, parameters);
-        return res.rows?._array ?? [];
-      },
-
-      /**
-       * Execute a read-only query and return the first result, or null if the ResultSet is empty.
-       */
-      getOptional: async <T>(sql: string, parameters?: any[]): Promise<T | null> => {
-        const res = await tx.execute(sql, parameters);
-        return res.rows?.item(0) ?? null;
-      },
-
-      /**
-       * Execute a read-only query and return the first result, error if the ResultSet is empty.
-       */
-      get: async <T>(sql: string, parameters?: any[]): Promise<T> => {
-        const res = await tx.execute(sql, parameters);
-        const first = res.rows?.item(0);
-        if (!first) {
-          throw new Error('Result set is empty');
-        }
-        return first;
-      }
-    };
-  }
-
-  async refreshSchema() {
-    await this.baseDB.refreshSchema();
-  }
 }

package/src/sync/stream/ReactNativeRemote.ts

@@ -3,7 +3,6 @@ import {
   AbstractRemoteOptions,
   BSONImplementation,
   DEFAULT_REMOTE_LOGGER,
-  DataStream,
   FetchImplementation,
   FetchImplementationProvider,
   ILogger,
@@ -55,11 +54,16 @@ export class ReactNativeRemote extends AbstractRemote {
     return BSON;
   }
 
-  protected createTextDecoder(): TextDecoder {
+  createTextDecoder(): TextDecoder {
     return new TextDecoder();
   }
 
-  async postStreamRaw<T>(options: SyncStreamOptions, mapLine: (line: string) => T): Promise<DataStream<T>> {
+  protected get supportsStreamingBinaryResponses(): boolean {
+    // We have to pass textStreaming: true to get streamed responses at all, and those don't support binary data.
+    return false;
+  }
+
+  protected async fetchStreamRaw(options: SyncStreamOptions) {
     const timeout =
       Platform.OS == 'android'
         ? setTimeout(() => {
@@ -72,22 +76,19 @@ export class ReactNativeRemote extends AbstractRemote {
         : null;
 
     try {
-      return await super.postStreamRaw(
-        {
-          ...options,
-          fetchOptions: {
-            ...options.fetchOptions,
-            /**
-             * The `react-native-fetch-api` polyfill provides streaming support via
-             * this non-standard flag
-             * https://github.com/react-native-community/fetch#enable-text-streaming
-             */
-            // @ts-expect-error https://github.com/react-native-community/fetch#enable-text-streaming
-            reactNative: { textStreaming: true }
-          }
-        },
-        mapLine
-      );
+      return await super.fetchStreamRaw({
+        ...options,
+        fetchOptions: {
+          ...options.fetchOptions,
+          /**
+           * The `react-native-fetch-api` polyfill provides streaming support via
+           * this non-standard flag
+           * https://github.com/react-native-community/fetch#enable-text-streaming
+           */
+          // @ts-expect-error https://github.com/react-native-community/fetch#enable-text-streaming
+          reactNative: { textStreaming: true }
+        }
+      });
     } finally {
       if (timeout) {
         clearTimeout(timeout);

package/src/sync/stream/ReactNativeStreamingSyncImplementation.ts

@@ -2,9 +2,9 @@ import {
   AbstractStreamingSyncImplementation,
   AbstractStreamingSyncImplementationOptions,
   LockOptions,
-  LockType
+  LockType,
+  Mutex
 } from '@powersync/common';
-import { Mutex } from 'async-mutex';
 
 /**
  * Global locks which prevent multiple instances from syncing
@@ -45,11 +45,7 @@ export class ReactNativeStreamingSyncImplementation extends AbstractStreamingSyn
       throw new Error(`Lock type ${lockOptions.type} not found`);
     }
     return lock.runExclusive(async () => {
-      if (lockOptions.signal?.aborted) {
-        throw new Error('Aborted');
-      }
-
       return lockOptions.callback();
-    });
+    }, lockOptions.signal);
   }
 }