@powersync/common 0.0.0-dev-20240920103931 → 0.0.0-dev-20241107150304

package/lib/client/AbstractPowerSyncDatabase.d.ts

@@ -56,6 +56,8 @@ export interface SQLWatchOptions {
     /** The minimum interval between queries. */
     throttleMs?: number;
     /**
+     * @deprecated All tables specified in {@link tables} will be watched, including PowerSync tables with prefixes.
+     *
      * Allows for watching any SQL table
      * by not removing PowerSync table name prefixes
      */
@@ -90,6 +92,7 @@ export declare const DEFAULT_POWERSYNC_DB_OPTIONS: {
     logger: Logger.ILogger;
     crudUploadThrottleMs: number;
 };
+export declare const DEFAULT_CRUD_BATCH_LIMIT = 100;
 /**
  * Requesting nested or recursive locks can block the application in some circumstances.
  * This default lock timeout will act as a failsafe to throw an error if a lock cannot
@@ -230,7 +233,7 @@ export declare abstract class AbstractPowerSyncDatabase extends BaseObserver<Pow
      * data by transaction. One batch may contain data from multiple transactions,
      * and a single transaction may be split over multiple batches.
      */
-    getCrudBatch(limit: number): Promise<CrudBatch | null>;
+    getCrudBatch(limit?: number): Promise<CrudBatch | null>;
     /**
      * Get the next recorded transaction to upload.
      *

package/lib/client/AbstractPowerSyncDatabase.js

@@ -27,6 +27,7 @@ export const DEFAULT_POWERSYNC_DB_OPTIONS = {
     logger: Logger.get('PowerSyncDatabase'),
     crudUploadThrottleMs: DEFAULT_CRUD_UPLOAD_THROTTLE_MS
 };
+export const DEFAULT_CRUD_BATCH_LIMIT = 100;
 /**
  * Requesting nested or recursive locks can block the application in some circumstances.
  * This default lock timeout will act as a failsafe to throw an error if a lock cannot
@@ -172,11 +173,11 @@ export class AbstractPowerSyncDatabase extends BaseObserver {
                 .map((n) => parseInt(n));
         }
         catch (e) {
-            throw new Error(`Unsupported powersync extension version. Need ^0.2.0, got: ${this.sdkVersion}. Details: ${e.message}`);
+            throw new Error(`Unsupported powersync extension version. Need >=0.2.0 <1.0.0, got: ${this.sdkVersion}. Details: ${e.message}`);
         }
-        // Validate ^0.2.0
-        if (versionInts[0] != 0 || versionInts[1] != 2 || versionInts[2] < 0) {
-            throw new Error(`Unsupported powersync extension version. Need ^0.2.0, got: ${this.sdkVersion}`);
+        // Validate >=0.2.0 <1.0.0
+        if (versionInts[0] != 0 || versionInts[1] < 2 || versionInts[2] < 0) {
+            throw new Error(`Unsupported powersync extension version. Need >=0.2.0 <1.0.0, got: ${this.sdkVersion}`);
         }
     }
     async updateHasSynced() {
@@ -326,7 +327,7 @@ export class AbstractPowerSyncDatabase extends BaseObserver {
      * data by transaction. One batch may contain data from multiple transactions,
      * and a single transaction may be split over multiple batches.
      */
-    async getCrudBatch(limit) {
+    async getCrudBatch(limit = DEFAULT_CRUD_BATCH_LIMIT) {
         const result = await this.getAll(`SELECT id, tx_id, data FROM ${PSInternalTable.CRUD} ORDER BY id ASC LIMIT ?`, [limit + 1]);
         const all = result.map((row) => CrudEntry.fromRow(row)) ?? [];
         let haveMore = false;
@@ -588,7 +589,7 @@ export class AbstractPowerSyncDatabase extends BaseObserver {
             throw new Error('onChange is required');
         }
         const resolvedOptions = options ?? {};
-        const watchedTables = new Set(resolvedOptions.tables ?? []);
+        const watchedTables = new Set((resolvedOptions?.tables ?? []).flatMap((table) => [table, `ps_data__${table}`, `ps_data_local__${table}`]));
         const changedTables = new Set();
         const throttleMs = resolvedOptions.throttleMs ?? DEFAULT_WATCH_THROTTLE_MS;
         const executor = new ControlledExecutor(async (e) => {
@@ -602,8 +603,7 @@ export class AbstractPowerSyncDatabase extends BaseObserver {
         const dispose = this.database.registerListener({
             tablesUpdated: async (update) => {
                 try {
-                    const { rawTableNames } = resolvedOptions;
-                    this.processTableUpdates(update, rawTableNames, changedTables);
+                    this.processTableUpdates(update, changedTables);
                     flushTableUpdates();
                 }
                 catch (error) {
@@ -652,19 +652,11 @@ export class AbstractPowerSyncDatabase extends BaseObserver {
         }
         changedTables.clear();
     }
-    processTableUpdates(updateNotification, rawTableNames, changedTables) {
+    processTableUpdates(updateNotification, changedTables) {
         const tables = isBatchedUpdateNotification(updateNotification)
             ? updateNotification.tables
             : [updateNotification.table];
-        const filteredTables = rawTableNames ? tables : tables.filter((t) => !!t.match(POWERSYNC_TABLE_MATCH));
-        if (!filteredTables.length) {
-            return;
-        }
-        // Remove any PowerSync table prefixes if necessary
-        const mappedTableNames = rawTableNames
-            ? filteredTables
-            : filteredTables.map((t) => t.replace(POWERSYNC_TABLE_MATCH, ''));
-        for (const table of mappedTableNames) {
+        for (const table of tables) {
             changedTables.add(table);
         }
     }

package/lib/client/sync/stream/AbstractRemote.js

@@ -6,6 +6,7 @@ import { WebsocketClientTransport } from 'rsocket-websocket-client';
 import { AbortOperation } from '../../../utils/AbortOperation.js';
 import { DataStream } from '../../../utils/DataStream.js';
 import { version as POWERSYNC_JS_VERSION } from '../../../../package.json';
+const POWERSYNC_TRAILING_SLASH_MATCH = /\/+$/;
 // Refresh at least 30 sec before it expires
 const REFRESH_CREDENTIALS_SAFETY_PERIOD_MS = 30_000;
 const SYNC_QUEUE_REQUEST_N = 10;
@@ -61,6 +62,9 @@ export class AbstractRemote {
             return this.credentials;
         }
         this.credentials = await this.connector.fetchCredentials();
+        if (this.credentials?.endpoint.match(POWERSYNC_TRAILING_SLASH_MATCH)) {
+            throw new Error(`A trailing forward slash "/" was found in the fetchCredentials endpoint: "${this.credentials.endpoint}". Remove the trailing forward slash "/" to fix this error.`);
+        }
         return this.credentials;
     }
     getUserAgent() {

package/lib/client/sync/stream/AbstractStreamingSyncImplementation.js

@@ -2,9 +2,9 @@ import Logger from 'js-logger';
 import { SyncStatus } from '../../../db/crud/SyncStatus.js';
 import { AbortOperation } from '../../../utils/AbortOperation.js';
 import { BaseObserver } from '../../../utils/BaseObserver.js';
+import { throttleLeadingTrailing } from '../../../utils/throttle.js';
 import { SyncDataBucket } from '../bucket/SyncDataBucket.js';
 import { isStreamingKeepalive, isStreamingSyncCheckpoint, isStreamingSyncCheckpointComplete, isStreamingSyncCheckpointDiff, isStreamingSyncData } from './streaming-sync-types.js';
-import { throttleLeadingTrailing } from '../../../utils/throttle.js';
 export var LockType;
 (function (LockType) {
     LockType["CRUD"] = "crud";
@@ -121,7 +121,7 @@ export class AbstractStreamingSyncImplementation extends BaseObserver {
                          */
                         const nextCrudItem = await this.options.adapter.nextCrudItem();
                         if (nextCrudItem) {
-                            if (nextCrudItem.id == checkedCrudItem?.id) {
+                            if (nextCrudItem.clientId == checkedCrudItem?.clientId) {
                                 // This will force a higher log level than exceptions which are caught here.
                                 this.logger.warn(`Potentially previously uploaded CRUD entries are still present in the upload queue.
 Make sure to handle uploads and complete CRUD transactions or batches by calling and awaiting their [.complete()] method.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@powersync/common",
-  "version": "0.0.0-dev-20240920103931",
+  "version": "0.0.0-dev-20241107150304",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"