Resove merge conflict (#1884)

Signed-off-by: Matouš Jan Fialka <mjf@mjf.cz>

Author: mjf

client/client.ts

@@ -954,8 +954,9 @@ export class Client {
   public async postServiceWorkerMessage(message: ServiceWorkerTargetMessage) {
     const registration = await navigator.serviceWorker.getRegistration();
     if (!registration?.active) {
-      throw new Error("No active service worker to post message to");
+      console.warn("No active service worker, skipping message:", message.type);
+      return;
     }
-    registration?.active?.postMessage(message);
+    registration.active.postMessage(message);
   }
 }

client/plugos/syscalls/sync.ts

@@ -1,42 +1,37 @@
 import type { SysCallMapping } from "../system.ts";
 import type { Client } from "../../client.ts";
 
-// TODO: Reimplement this
 export function syncSyscalls(client: Client): SysCallMapping {
   return {
     "sync.hasInitialSyncCompleted": (): boolean => {
       return client.fullSyncCompleted;
     },
     "sync.performFileSync": async (_ctx, path: string): Promise<void> => {
-      try {
-        await client.postServiceWorkerMessage({
-          type: "perform-file-sync",
-          path,
-        });
-      } catch (e: any) {
-        console.warn(
-          "No service worker available, so sync is inactive",
-          e.message,
-        );
-        return;
+      await client.postServiceWorkerMessage({
+        type: "perform-file-sync",
+        path,
+      });
+      // postServiceWorkerMessage returns silently if no SW, so only wait if SW is active
+      const registration = await navigator.serviceWorker.getRegistration();
+      if (registration?.active) {
+        return waitForServiceWorkerActivation(client, path);
       }
-      return waitForServiceWorkerActivation(path);
     },
     "sync.performSpaceSync": async (): Promise<number> => {
-      try {
-        await client.postServiceWorkerMessage({
-          type: "perform-space-sync",
-        });
-      } catch (e: any) {
-        console.warn("No service worker available, so sync is inactive", e);
-        return 0;
+      await client.postServiceWorkerMessage({ type: "perform-space-sync" });
+      const registration = await navigator.serviceWorker.getRegistration();
+      if (registration?.active) {
+        return waitForServiceWorkerActivation(client);
       }
-      return waitForServiceWorkerActivation();
+      return 0;
     },
   };
 }
 
-function waitForServiceWorkerActivation(path?: string): Promise<any> {
+function waitForServiceWorkerActivation(
+  client: Client,
+  path?: string,
+): Promise<any> {
   return new Promise<any>((resolve, reject) => {
     client.eventHook.addLocalListener(
       "service-worker:file-sync-complete",
@@ -51,33 +46,17 @@ function waitForServiceWorkerActivation(path?: string): Promise<any> {
       errorHandler,
     );
     function eventHandler(data: any) {
-      // If data.path is set, we are notified about a specific file sync -> all good, even for an individual file sync
-      // If data.path is not set, we are notified about a full space sync
-      // If we were waiting for a specific path, ignore other paths
       if (data.path && path && data.path !== path) {
-        // Event for other file sync
         return;
       }
-      // If we were waiting for a specific path, ignore other paths
       resolve(data);
-
-      // Unsubscribe from all these events
-      client.eventHook.removeLocalListener(
-        "service-worker:file-sync-complete",
-        eventHandler,
-      );
-      client.eventHook.removeLocalListener(
-        "service-worker:space-sync-complete",
-        eventHandler,
-      );
-      client.eventHook.removeLocalListener(
-        "service-worker:sync-error",
-        errorHandler,
-      );
+      cleanup();
     }
     function errorHandler(e: any) {
       reject(e);
-      // Unsubscribe from all these events
+      cleanup();
+    }
+    function cleanup() {
       client.eventHook.removeLocalListener(
         "service-worker:file-sync-complete",
         eventHandler,

plugs/index/task.ts

@@ -218,7 +218,10 @@ export async function updateTaskState(
     taskStateNode.children![1].text = newState;
     text = renderToText(referenceMdTree);
     await space.writePage(pageName, text);
-    void sync.performFileSync(`${pageName}.md`);
+    // Best-effort sync; will catch up on next cycle if SW is unavailable
+    sync.performFileSync(`${pageName}.md`).catch((e) => {
+      console.warn("File sync after task update failed:", e.message);
+    });
   }
 }