Merge remote-tracking branch 'origin/main' into watches

Author: stevensJourney

.changeset/chilled-birds-cheer.md

@@ -0,0 +1,5 @@
+---
+'@powersync/web': patch
+---
+
+Use `BEGIN EXCLUSIVE` to open write transactions

.changeset/tall-dolphins-sleep.md

@@ -0,0 +1,8 @@
+---
+'@powersync/common': patch
+'@powersync/node': patch
+'@powersync/web': patch
+'@powersync/react-native': patch
+---
+
+Rust sync client: Fix reported `lastSyncedAt` values in sync status.

packages/common/src/client/sync/stream/AbstractStreamingSyncImplementation.ts

@@ -941,7 +941,7 @@ The next upload iteration will be delayed.`);
           return {
             priority: status.priority,
             hasSynced: status.has_synced ?? undefined,
-            lastSyncedAt: status?.last_synced_at != null ? new Date(status!.last_synced_at!) : undefined
+            lastSyncedAt: status?.last_synced_at != null ? new Date(status!.last_synced_at! * 1000) : undefined
           };
         }
 

packages/node/tests/sync.test.ts

@@ -112,6 +112,29 @@ function defineSyncTests(impl: SyncClientImplementation) {
     connectionMethod: SyncStreamConnectionMethod.HTTP
   };
 
+  mockSyncServiceTest('sets last sync time', async ({ syncService }) => {
+    const db = await syncService.createDatabase();
+    db.connect(new TestConnector(), options);
+    await vi.waitFor(() => expect(syncService.connectedListeners).toHaveLength(1));
+
+    syncService.pushLine({
+      checkpoint: {
+        last_op_id: '0',
+        buckets: []
+      }
+    });
+    syncService.pushLine({ checkpoint_complete: { last_op_id: '0' } });
+    const now = Date.now();
+
+    await db.waitForFirstSync();
+    const status = db.currentStatus;
+    const lastSyncedAt = status.lastSyncedAt!.getTime();
+
+    // The reported time of the last sync should be close to the current time (5s is very generous already, but we've
+    // had an issue where dates weren't parsed correctly and we were off by decades).
+    expect(Math.abs(lastSyncedAt - now)).toBeLessThan(5000);
+  });
+
   describe('reports progress', () => {
     let lastOpId = 0;
 

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

@@ -235,7 +235,7 @@ export class LockedAsyncDatabaseAdapter
   }
 
   writeTransaction<T>(fn: (tx: Transaction) => Promise<T>, options?: DBLockOptions | undefined): Promise<T> {
-    return this.writeLock(this.wrapTransaction(fn));
+    return this.writeLock(this.wrapTransaction(fn, true));
   }
 
   private generateDBHelpers<
@@ -279,9 +279,9 @@ export class LockedAsyncDatabaseAdapter
   /**
    * Wraps a lock context into a transaction context
    */
-  private wrapTransaction<T>(cb: (tx: Transaction) => Promise<T>) {
+  private wrapTransaction<T>(cb: (tx: Transaction) => Promise<T>, write = false) {
     return async (tx: LockContext): Promise<T> => {
-      await this._execute('BEGIN TRANSACTION');
+      await this._execute(write ? 'BEGIN EXCLUSIVE' : 'BEGIN');
       let finalized = false;
       const commit = async (): Promise<QueryResult> => {
         if (finalized) {