Merge branch 'main' into chore/tanstack-bump-5-70

Author: Chriztiaan

.changeset/sour-spiders-rhyme.md

@@ -29,7 +29,7 @@
     "test": "pnpm build && vitest"
   },
   "peerDependencies": {
-    "@powersync/common": "workspace:^1.26.0"
+    "@powersync/common": "workspace:^1.27.0"
   },
   "devDependencies": {
     "@powersync/common": "workspace:*",

packages/attachments/package.json

@@ -1,5 +1,11 @@
 # @powersync/common
 
+## 1.27.0
+
+### Minor Changes
+
+- b722378: Added `downloadError` and `uploadError` members to `SyncDataFlowStatus` of `SyncStatus`.
+
 ## 1.26.0
 
 ### Minor Changes

packages/common/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@powersync/common",
-  "version": "1.26.0",
+  "version": "1.27.0",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"

packages/common/package.json

@@ -290,6 +290,11 @@ The next upload iteration will be delayed.`);
 
               checkedCrudItem = nextCrudItem;
               await this.options.uploadCrud();
+              this.updateSyncStatus({
+                dataFlow: {
+                  uploadError: undefined
+                }
+              });
             } else {
               // Uploading is completed
               await this.options.adapter.updateLocalTarget(() => this.getWriteCheckpoint());
@@ -299,7 +304,8 @@ The next upload iteration will be delayed.`);
             checkedCrudItem = undefined;
             this.updateSyncStatus({
               dataFlow: {
-                uploading: false
+                uploading: false,
+                uploadError: ex
               }
             });
             await this.delayRetry();
@@ -453,6 +459,12 @@ The next upload iteration will be delayed.`);
           this.logger.error(ex);
         }
 
+        this.updateSyncStatus({
+          dataFlow: {
+            downloadError: ex
+          }
+        });
+
         // On error, wait a little before retrying
         await this.delayRetry();
       } finally {
@@ -588,7 +600,8 @@ The next upload iteration will be delayed.`);
                 connected: true,
                 lastSyncedAt: new Date(),
                 dataFlow: {
-                  downloading: false
+                  downloading: false,
+                  downloadError: undefined
                 }
               });
             }
@@ -688,7 +701,10 @@ The next upload iteration will be delayed.`);
               this.updateSyncStatus({
                 connected: true,
                 lastSyncedAt: new Date(),
-                priorityStatusEntries: []
+                priorityStatusEntries: [],
+                dataFlow: {
+                  downloadError: undefined
+                }
               });
             } else if (validatedCheckpoint === targetCheckpoint) {
               const result = await this.options.adapter.syncLocalDatabase(targetCheckpoint!);
@@ -707,7 +723,8 @@ The next upload iteration will be delayed.`);
                   lastSyncedAt: new Date(),
                   priorityStatusEntries: [],
                   dataFlow: {
-                    downloading: false
+                    downloading: false,
+                    downloadError: undefined
                   }
                 });
               }

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

@@ -1,6 +1,17 @@
 export type SyncDataFlowStatus = Partial<{
   downloading: boolean;
   uploading: boolean;
+  /**
+   * Error during downloading (including connecting).
+   *
+   * Cleared on the next successful data download.
+   */
+  downloadError?: Error;
+  /**
+   * Error during uploading.
+   * Cleared on the next successful upload.
+   */
+  uploadError?: Error;
 }>;
 
 export interface SyncPriorityStatus {
@@ -112,7 +123,7 @@ export class SyncStatus {
 
   getMessage() {
     const dataFlow = this.dataFlowStatus;
-    return `SyncStatus<connected: ${this.connected} connecting: ${this.connecting} lastSyncedAt: ${this.lastSyncedAt} hasSynced: ${this.hasSynced}. Downloading: ${dataFlow.downloading}. Uploading: ${dataFlow.uploading}`;
+    return `SyncStatus<connected: ${this.connected} connecting: ${this.connecting} lastSyncedAt: ${this.lastSyncedAt} hasSynced: ${this.hasSynced}. Downloading: ${dataFlow.downloading}. Uploading: ${dataFlow.uploading}. UploadError: ${dataFlow.uploadError}, DownloadError?: ${dataFlow.downloadError}>`;
   }
 
   toJSON(): SyncStatusOptions {

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

@@ -26,7 +26,7 @@
     "test": "vitest"
   },
   "peerDependencies": {
-    "@powersync/common": "workspace:^1.26.0",
+    "@powersync/common": "workspace:^1.27.0",
     "drizzle-orm": "<1.0.0"
   },
   "devDependencies": {

packages/drizzle-driver/package.json

@@ -26,7 +26,7 @@
     "test": "pnpm build && vitest"
   },
   "peerDependencies": {
-    "@powersync/common": "workspace:^1.26.0"
+    "@powersync/common": "workspace:^1.27.0"
   },
   "dependencies": {
     "kysely": "^0.27.4"

packages/kysely-driver/package.json

@@ -1,5 +1,13 @@
 # @powersync/node
 
+## 0.2.1
+
+### Patch Changes
+
+- 1c2ee86: Update README with common installation issues section
+- Updated dependencies [b722378]
+  - @powersync/common@1.27.0
+
 ## 0.2.0
 
 ### Minor Changes

packages/node/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@powersync/node",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -44,7 +44,7 @@
   },
   "homepage": "https://docs.powersync.com/",
   "peerDependencies": {
-    "@powersync/common": "workspace:^1.26.0"
+    "@powersync/common": "workspace:^1.27.0"
   },
   "dependencies": {
     "@powersync/better-sqlite3": "^0.1.1",