Merge branch 'main' into locks

Author: Chriztiaan

.changeset/fluffy-rockets-breathe.md

@@ -0,0 +1,5 @@
+---
+'@powersync/common': patch
+---
+
+Changed priorityStatusEntries() to no longer depend on toSorted(), which isn't natively available in React-Native.

.changeset/loud-mangos-kick.md

@@ -0,0 +1,6 @@
+---
+'@powersync/common': patch
+'@powersync/web': patch
+---
+
+Fixed race condition in async closing of databases

demos/django-react-native-todolist/package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "@azure/core-asynciterator-polyfill": "^1.0.2",
     "@expo/vector-icons": "^14.0.0",
-    "@journeyapps/react-native-quick-sqlite": "^2.3.0",
+    "@journeyapps/react-native-quick-sqlite": "^2.4.1",
     "@powersync/common": "workspace:*",
     "@powersync/react": "workspace:*",
     "@powersync/react-native": "workspace:*",

demos/react-native-supabase-group-chat/package.json

@@ -21,7 +21,7 @@
   "dependencies": {
     "@azure/core-asynciterator-polyfill": "^1.0.2",
     "@faker-js/faker": "8.3.1",
-    "@journeyapps/react-native-quick-sqlite": "^2.3.0",
+    "@journeyapps/react-native-quick-sqlite": "^2.4.1",
     "@powersync/common": "workspace:*",
     "@powersync/react": "workspace:*",
     "@powersync/react-native": "workspace:*",

demos/react-native-supabase-todolist/package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "@azure/core-asynciterator-polyfill": "^1.0.2",
     "@expo/vector-icons": "^14.0.3",
-    "@journeyapps/react-native-quick-sqlite": "^2.3.0",
+    "@journeyapps/react-native-quick-sqlite": "^2.4.1",
     "@powersync/attachments": "workspace:*",
     "@powersync/common": "workspace:*",
     "@powersync/react": "workspace:*",

demos/react-native-web-supabase-todolist/package.json

@@ -13,7 +13,7 @@
     "@azure/core-asynciterator-polyfill": "^1.0.2",
     "@expo/metro-runtime": "^3.2.1",
     "@expo/vector-icons": "^14.0.0",
-    "@journeyapps/react-native-quick-sqlite": "^2.3.0",
+    "@journeyapps/react-native-quick-sqlite": "^2.4.1",
     "@powersync/attachments": "workspace:*",
     "@powersync/common": "workspace:*",
     "@powersync/react": "workspace:*",

package.json

@@ -33,12 +33,12 @@
     "@actions/core": "^1.10.1",
     "@changesets/cli": "2.27.2",
     "@pnpm/workspace.find-packages": "^4.0.2",
-    "@vitest/browser": "^3.0.5",
+    "@vitest/browser": "^3.0.8",
     "husky": "^9.0.11",
     "lint-staged": "^15.2.2",
-    "playwright": "^1.50.1",
+    "playwright": "^1.51.0",
     "prettier": "^3.2.5",
     "typescript": "^5.7.2",
-    "vitest": "^3.0.5"  
+    "vitest": "^3.0.8"
   }
 }

packages/common/src/client/AbstractPowerSyncDatabase.ts

@@ -18,20 +18,20 @@ import { mutexRunExclusive } from '../utils/mutex.js';
 import { throttleTrailing } from '../utils/throttle.js';
 import { SQLOpenFactory, SQLOpenOptions, isDBAdapter, isSQLOpenFactory, isSQLOpenOptions } from './SQLOpenFactory.js';
 import { PowerSyncBackendConnector } from './connection/PowerSyncBackendConnector.js';
+import { runOnSchemaChange } from './runOnSchemaChange.js';
 import { BucketStorageAdapter, PSInternalTable } from './sync/bucket/BucketStorageAdapter.js';
 import { CrudBatch } from './sync/bucket/CrudBatch.js';
 import { CrudEntry, CrudEntryJSON } from './sync/bucket/CrudEntry.js';
 import { CrudTransaction } from './sync/bucket/CrudTransaction.js';
 import {
   DEFAULT_CRUD_UPLOAD_THROTTLE_MS,
-  type AdditionalConnectionOptions,
-  type PowerSyncConnectionOptions,
+  DEFAULT_RETRY_DELAY_MS,
   StreamingSyncImplementation,
   StreamingSyncImplementationListener,
-  DEFAULT_RETRY_DELAY_MS,
+  type AdditionalConnectionOptions,
+  type PowerSyncConnectionOptions,
   type RequiredAdditionalConnectionOptions
 } from './sync/stream/AbstractStreamingSyncImplementation.js';
-import { runOnSchemaChange } from './runOnSchemaChange.js';
 
 export interface DisconnectAndClearOptions {
   /** When set to false, data in local-only tables is preserved. */
@@ -505,13 +505,17 @@ export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDB
   async close(options: PowerSyncCloseOptions = DEFAULT_POWERSYNC_CLOSE_OPTIONS) {
     await this.waitForReady();
 
+    if (this.closed) {
+      return;
+    }
+
     const { disconnect } = options;
     if (disconnect) {
       await this.disconnect();
     }
 
     await this.syncStreamImplementation?.dispose();
-    this.database.close();
+    await this.database.close();
     this.closed = true;
   }
 

packages/common/src/db/DBAdapter.ts

@@ -93,7 +93,7 @@ export interface DBLockOptions {
 }
 
 export interface DBAdapter extends BaseObserverInterface<DBAdapterListener>, DBGetUtils {
-  close: () => void;
+  close: () => void | Promise<void>;
   execute: (query: string, params?: any[]) => Promise<QueryResult>;
   executeBatch: (query: string, params?: any[][]) => Promise<QueryResult>;
   name: string;

packages/common/src/db/crud/SyncStatus.ts

@@ -71,7 +71,7 @@ export class SyncStatus {
    * Partial sync status for involved bucket priorities.
    */
   get priorityStatusEntries() {
-    return (this.options.priorityStatusEntries ?? []).toSorted(SyncStatus.comparePriorities);
+    return (this.options.priorityStatusEntries ?? []).slice().sort(SyncStatus.comparePriorities);
   }
 
   /**