memeloop 0.2.0 → 0.2.1

package/dist/device-network.cjs

@@ -124,8 +124,12 @@ var DeviceCloudConnectionCoordinator = class {
   async stop() {
     this.started = false;
     this.clearTimer();
-    this.controller.abort(new Error("device cloud coordinator stopped"));
+    const stoppedController = this.controller;
+    stoppedController.abort(new Error("device cloud coordinator stopped"));
     await this.inFlight?.catch(() => void 0);
+    if (this.controller === stoppedController) {
+      this.controller = new AbortController();
+    }
   }
   async setConfiguration(configuration) {
     this.configuration = configuration;
@@ -696,39 +700,92 @@ async function readSingleRequest(stream, maxFrameBytes) {
 }
 async function* withWatchBookmarks(source, request, signal) {
   const iterator = source[Symbol.asyncIterator]();
-  let pending = iterator.next();
+  let activity;
+  let activityWaiter;
+  let bookmarkTimer;
+  let readInFlight = false;
+  let lastResourceVersion = watchResourceVersion(request.payload.options) ?? "0";
+  const clearBookmarkTimer = () => {
+    if (bookmarkTimer !== void 0) clearTimeout(bookmarkTimer);
+    bookmarkTimer = void 0;
+  };
+  const publishActivity = (value) => {
+    if (activityWaiter) {
+      const resolve = activityWaiter;
+      activityWaiter = void 0;
+      clearBookmarkTimer();
+      resolve(value);
+      return;
+    }
+    activity = value;
+  };
+  const readNext = () => {
+    if (readInFlight) return;
+    readInFlight = true;
+    void iterator.next().then(
+      (value) => {
+        readInFlight = false;
+        publishActivity({ kind: "value", value });
+      },
+      (error) => {
+        readInFlight = false;
+        publishActivity({ kind: "error", error });
+      }
+    );
+  };
+  const waitForActivity = () => {
+    if (activity) {
+      const value = activity;
+      activity = void 0;
+      return Promise.resolve(value);
+    }
+    if (signal.aborted) return Promise.resolve({ kind: "aborted" });
+    return new Promise((resolve) => {
+      activityWaiter = resolve;
+      bookmarkTimer = setTimeout(() => {
+        bookmarkTimer = void 0;
+        activityWaiter = void 0;
+        resolve({ kind: "bookmark" });
+      }, WATCH_BOOKMARK_INTERVAL_MS);
+    });
+  };
+  const onAbort = () => {
+    publishActivity({ kind: "aborted" });
+  };
+  signal.addEventListener("abort", onAbort, { once: true });
+  readNext();
   try {
     for (; ; ) {
-      const result = await Promise.race([
-        pending.then((value) => ({ kind: "value", value })),
-        new Promise((resolve) => {
-          const timer = setTimeout(() => {
-            resolve({ kind: "bookmark" });
-          }, WATCH_BOOKMARK_INTERVAL_MS);
-          signal.addEventListener("abort", () => {
-            clearTimeout(timer);
-            resolve({ kind: "bookmark" });
-          }, { once: true });
-        })
-      ]);
-      if (signal.aborted) return;
+      const result = await waitForActivity();
+      if (result.kind === "aborted") return;
       if (result.kind === "bookmark") {
         yield {
           protocol: request.protocol,
           requestId: request.requestId,
           ok: true,
-          result: { type: "BOOKMARK", resourceVersion: String(Date.now()) }
+          result: { type: "BOOKMARK", resourceVersion: lastResourceVersion }
         };
         continue;
       }
+      if (result.kind === "error") throw result.error;
       if (result.value.done) return;
-      yield result.value.value;
-      pending = iterator.next();
+      const response = result.value.value;
+      lastResourceVersion = response.ok ? watchResourceVersion(response.result) ?? lastResourceVersion : lastResourceVersion;
+      yield response;
+      readNext();
     }
   } finally {
+    clearBookmarkTimer();
+    activityWaiter = void 0;
+    signal.removeEventListener("abort", onAbort);
     void iterator.return?.();
   }
 }
+function watchResourceVersion(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return void 0;
+  const resourceVersion = value.resourceVersion;
+  return typeof resourceVersion === "string" && resourceVersion.length > 0 ? resourceVersion : void 0;
+}
 function createDeviceOrchestrationStreamHandler(options) {
   const maxFrameBytes = options.maxFrameBytes ?? DEFAULT_MAX_FRAME_BYTES;
   assertFrameLimit(maxFrameBytes);