tokmon 0.20.3 → 0.20.5

package/dist/{bootstrap-ink-F3JFQ3ON.js → bootstrap-ink-MVH5QEVR.js}

@@ -18,7 +18,7 @@ import {
   systemTimezone,
   time,
   tokens
-} from "./chunk-ANCKHLJV.js";
+} from "./chunk-EHIQHGJL.js";
 import {
   COLOR_PALETTE,
   DEFAULTS,
@@ -1670,12 +1670,11 @@ async function socketLayerFor(url, transport) {
   );
 }
 function retryPolicy(options) {
-  const attempts = options.reconnectAttempts ?? 5;
   const baseDelay = options.reconnectBaseDelayMs ?? 250;
-  return Schedule.addDelay(
-    Schedule.recurs(attempts),
-    (retryCount) => Effect.succeed(Duration.millis(Math.min(baseDelay * (retryCount + 1), 2500)))
+  const policy = Schedule.exponential(Duration.millis(baseDelay), 1.5).pipe(
+    Schedule.either(Schedule.spaced(Duration.millis(2500)))
   );
+  return typeof options.reconnectAttempts === "number" ? policy.pipe(Schedule.both(Schedule.recurs(options.reconnectAttempts))) : policy;
 }
 function createDaemonRpcClient(baseUrl, options = {}) {
   const url = toWsUrl(baseUrl, options.wsToken);
@@ -1686,6 +1685,13 @@ function createDaemonRpcClient(baseUrl, options = {}) {
   const setConn = (state, error) => {
     options.onConn?.(state, error);
   };
+  const resetSession = (active) => {
+    const dead = active ?? session;
+    if (active === void 0 || active === session) session = null;
+    sessionPromise = null;
+    if (dead) void dead.runtime.dispose().catch(() => {
+    });
+  };
   const makeProtocolLayer = async () => {
     const socketLayer = await socketLayerFor(url, options.transport);
     const connectionHooksLayer = Layer.succeed(
@@ -1695,7 +1701,10 @@ function createDaemonRpcClient(baseUrl, options = {}) {
           setConn("live");
         }),
         onDisconnect: Effect.sync(() => {
-          if (!closed) setConn("reconnecting");
+          if (!closed) {
+            setConn("reconnecting");
+            resetSession();
+          }
         })
       })
     );
@@ -1749,7 +1758,10 @@ function createDaemonRpcClient(baseUrl, options = {}) {
         TokmonRpcClient.use((client) => effectFor(client))
       );
     } catch (error) {
-      if (!closed) setConn("error", error);
+      if (!closed) {
+        resetSession(active);
+        setConn("error", error);
+      }
       throw error;
     }
   };
@@ -1758,42 +1770,71 @@ function createDaemonRpcClient(baseUrl, options = {}) {
     };
     let fiber = null;
     let unsubscribed = false;
-    void (async () => {
-      try {
-        const active = await ensureSession();
-        if (closed || unsubscribed) return;
-        fiber = active.runtime.runFork(
-          TokmonRpcClient.use(
-            (client) => streamFor(client).pipe(
-              Stream.runForEach(
-                (value) => Effect.sync(() => {
-                  try {
-                    onValue(value);
-                  } catch {
-                  }
-                })
+    let retryTimer = null;
+    const stopFiber = () => {
+      if (!fiber) return;
+      const current = fiber;
+      fiber = null;
+      fibers.delete(current);
+      void (session?.runtime.runPromise(Fiber.interrupt(current)) ?? Effect.runPromise(Fiber.interrupt(current))).catch(() => {
+      });
+    };
+    const scheduleRetry = () => {
+      if (closed || unsubscribed || retryTimer) return;
+      retryTimer = setTimeout(() => {
+        retryTimer = null;
+        start();
+      }, options.reconnectBaseDelayMs ?? 250);
+      retryTimer.unref?.();
+    };
+    const start = () => {
+      void (async () => {
+        try {
+          const active = await ensureSession();
+          if (closed || unsubscribed) return;
+          fiber = active.runtime.runFork(
+            TokmonRpcClient.use(
+              (client) => streamFor(client).pipe(
+                Stream.runForEach(
+                  (value) => Effect.sync(() => {
+                    try {
+                      onValue(value);
+                    } catch {
+                    }
+                  })
+                )
               )
-            )
-          ).pipe(Effect.catchCause(
-            (cause) => Effect.sync(() => {
-              if (!closed && !unsubscribed) setConn("error", Cause.squash(cause));
-            })
-          ))
-        );
-        fibers.add(fiber);
-        fiber.addObserver(() => {
-          if (fiber) fibers.delete(fiber);
-        });
-      } catch (error) {
-        if (!closed && !unsubscribed) setConn("error", error);
-      }
-    })();
+            ).pipe(Effect.catchCause(
+              (cause) => Effect.sync(() => {
+                if (!closed && !unsubscribed) {
+                  resetSession(active);
+                  setConn("error", Cause.squash(cause));
+                  scheduleRetry();
+                }
+              })
+            ))
+          );
+          fibers.add(fiber);
+          fiber.addObserver(() => {
+            if (fiber) fibers.delete(fiber);
+          });
+        } catch (error) {
+          if (!closed && !unsubscribed) {
+            resetSession();
+            setConn("error", error);
+            scheduleRetry();
+          }
+        }
+      })();
+    };
+    start();
     return () => {
       unsubscribed = true;
-      if (!fiber) return;
-      fibers.delete(fiber);
-      void (session?.runtime.runPromise(Fiber.interrupt(fiber)) ?? Effect.runPromise(Fiber.interrupt(fiber))).catch(() => {
-      });
+      if (retryTimer) {
+        clearTimeout(retryTimer);
+        retryTimer = null;
+      }
+      stopFiber();
     };
   };
   return {
@@ -3194,7 +3235,7 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, wsToken = n
     if (webStartingRef.current) return;
     webStartingRef.current = true;
     try {
-      const { startWebServer } = await import("./server-R6Z6W4CN.js");
+      const { startWebServer } = await import("./server-RM4ZXN6C.js");
       const ctrl = await startWebServer({ config: cfg, log: false });
       webRef.current = ctrl;
       openUrl(ctrl.url);