Fix ddc errors, more logs around crud uploads

powersync-ja · Feb 27, 2025 · ce8e290 · ce8e290
1 parent def0f53
commit ce8e290
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/demos/supabase-todolist/lib/widgets/todo_list_page.dart b/demos/supabase-todolist/lib/widgets/todo_list_page.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:powersync_flutter_demo/models/todo_item.dart';
+import 'package:powersync_flutter_demo/powersync.dart';
 
 import './status_app_bar.dart';
 import './todo_item_dialog.dart';
@@ -81,8 +82,9 @@ class TodoListWidgetState extends State<TodoListWidget> {
   Widget build(BuildContext context) {
     return StreamBuilder(
       stream: TodoList.watchSyncStatus().map((e) => e.hasSynced),
+      initialData: db.currentStatus.hasSynced,
       builder: (context, snapshot) {
-        if (snapshot.data ?? false) {
+        if (snapshot.data != true) {
           return const Text('Busy with sync');
         }
 

diff --git a/packages/powersync_core/lib/src/sync_status.dart b/packages/powersync_core/lib/src/sync_status.dart
@@ -151,7 +151,7 @@ final class SyncStatus {
     return "SyncStatus<connected: $connected connecting: $connecting downloading: $downloading uploading: $uploading lastSyncedAt: $lastSyncedAt, hasSynced: $hasSynced, error: $anyError>";
   }
 
-  static const _statusEquality = ListEquality<SyncPriorityStatus>();
+  static const _statusEquality = ListEquality<Object?>();
 }
 
 /// The priority of a PowerSync bucket.

diff --git a/packages/powersync_core/lib/src/web/sync_worker.dart b/packages/powersync_core/lib/src/web/sync_worker.dart
@@ -65,6 +65,7 @@ class _ConnectedClient {
   _ConnectedClient(MessagePort port, this._worker) {
     channel = WorkerCommunicationChannel(
       port: port,
+      logger: _logger,
       requestHandler: (type, payload) async {
         switch (type) {
           case SyncWorkerMessageType.startSynchronization:
@@ -251,7 +252,11 @@ class _SyncRunner {
         filteredStream,
         crudThrottleTime,
         addOne: UpdateNotification.empty(),
-      );
+      ).map((event) {
+        _logger.fine('Saw update events: $event, triggering upload');
+
+        return event;
+      });
     } else {
       _logger.warning(
           'Database is missing updates stream, sync worker will not upload '

diff --git a/packages/powersync_core/lib/src/web/sync_worker_protocol.dart b/packages/powersync_core/lib/src/web/sync_worker_protocol.dart
@@ -203,7 +203,9 @@ extension type SerializedSyncStatus._(JSObject _) implements JSObject {
       hasSynced: hasSynced,
       uploadError: uploadError,
       downloadError: downloadError,
-      priorityStatusEntries: priorityStatusEntries?.toDart.map((e) {
+      priorityStatusEntries: <SyncPriorityStatus>[
+        if (priorityStatusEntries case final jsEntries?)
+          ...jsEntries.toDart.map((e) {
             final [rawPriority, rawSynced, rawHasSynced, ...] =
                 (e as JSArray).toDart;
             final syncedMillis = (rawSynced as JSNumber?)?.toDartInt;
@@ -215,8 +217,8 @@ extension type SerializedSyncStatus._(JSObject _) implements JSObject {
                   : null,
               hasSynced: (rawHasSynced as JSBoolean?)?.toDart,
             );
-          }).toList() ??
-          const [],
+          })
+      ],
     );
   }
 }
@@ -385,7 +387,14 @@ final class WorkerCommunicationChannel {
   }
 
   Future<void> uploadCrud() async {
-    await _numericRequest(SyncWorkerMessageType.uploadCrud);
+    _logger.info('uploadCrud: Requesting upload from client');
+    try {
+      await _numericRequest(SyncWorkerMessageType.uploadCrud);
+      _logger.info('uploadCrud: Client done');
+    } catch (e, s) {
+      _logger.warning('uploadCrud: failed on client side', e, s);
+      rethrow;
+    }
   }
 
   Future<void> close() async {