@chidchanun/bcp 0.2.13 → 0.2.14

package/packages/client/src/realtime.mjs

@@ -686,32 +686,62 @@ function createRealtimeSseResponse(hub, rawChannel, options = {}) {
     options.keepAliveMs ?? 15e3,
     "SSE keepAliveMs"
   );
+  let closed = false;
+  let controller;
+  let timer;
+  let unsubscribe = () => void 0;
+  let abortListener;
+  const cleanup = () => {
+    if (closed) {
+      return false;
+    }
+    closed = true;
+    if (timer) {
+      clearTimeout(timer);
+      timer = void 0;
+    }
+    unsubscribe();
+    unsubscribe = () => void 0;
+    if (options.signal && abortListener) {
+      options.signal.removeEventListener(
+        "abort",
+        abortListener
+      );
+      abortListener = void 0;
+    }
+    return true;
+  };
+  const close = () => {
+    if (!cleanup()) {
+      return;
+    }
+    const currentController = controller;
+    controller = void 0;
+    if (!currentController) {
+      return;
+    }
+    try {
+      currentController.close();
+    } catch {
+    }
+  };
+  const write = (value) => {
+    const currentController = controller;
+    if (closed || !currentController) {
+      return;
+    }
+    try {
+      currentController.enqueue(
+        encoder.encode(value)
+      );
+    } catch {
+      cleanup();
+      controller = void 0;
+    }
+  };
   const stream = new ReadableStream({
-    start(controller) {
-      let closed = false;
-      let timer;
-      let unsubscribe = () => void 0;
-      const close = () => {
-        if (closed) {
-          return;
-        }
-        closed = true;
-        if (timer) {
-          clearTimeout(timer);
-        }
-        unsubscribe();
-        try {
-          controller.close();
-        } catch {
-        }
-      };
-      const write = (value) => {
-        if (!closed) {
-          controller.enqueue(
-            encoder.encode(value)
-          );
-        }
-      };
+    start(streamController) {
+      controller = streamController;
       if (retryMs !== void 0) {
         write(
           `retry: ${retryMs}
@@ -744,28 +774,35 @@ function createRealtimeSseResponse(hub, rawChannel, options = {}) {
 
 `
         );
-        timer = setTimeout(
-          keepAlive,
-          keepAliveMs
-        );
+        if (!closed) {
+          timer = setTimeout(
+            keepAlive,
+            keepAliveMs
+          );
+        }
       };
       timer = setTimeout(
         keepAlive,
         keepAliveMs
       );
       if (options.signal) {
+        abortListener = close;
         if (options.signal.aborted) {
           close();
           return;
         }
         options.signal.addEventListener(
           "abort",
-          close,
+          abortListener,
           {
             once: true
           }
         );
       }
+    },
+    cancel() {
+      cleanup();
+      controller = void 0;
     }
   });
   const headers = new Headers(