tokmon 0.20.2 → 0.20.4

package/dist/{bootstrap-ink-KWHXVQYS.js → bootstrap-ink-3VQODLRG.js}

@@ -18,7 +18,7 @@ import {
   systemTimezone,
   time,
   tokens
-} from "./chunk-7HJIP4U6.js";
+} from "./chunk-HSUYWU4V.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-BXMRN774.js");
+      const { startWebServer } = await import("./server-6DGQI25X.js");
       const ctrl = await startWebServer({ config: cfg, log: false });
       webRef.current = ctrl;
       openUrl(ctrl.url);

package/dist/{chunk-5IHAR2RZ.js → chunk-F7RJIR3Z.js}

@@ -8,7 +8,7 @@ import {
   detectProviders,
   fetchPeak,
   resolveTimezone
-} from "./chunk-7HJIP4U6.js";
+} from "./chunk-HSUYWU4V.js";
 import {
   cacheDir,
   expandHome,
@@ -319,6 +319,14 @@ var PEAK_INTERVAL_MS = 3e5;
 var IDLE_PAUSE_MS = 6e4;
 var SNAPSHOT_CACHE_THROTTLE_MS = 2e4;
 var REVEAL_THROTTLE_MS = 500;
+var FETCH_TIMEOUT_MS = 3e4;
+var withTimeout = (p, ms) => Promise.race([
+  p,
+  new Promise((_, reject) => {
+    const t = setTimeout(() => reject(new Error("fetch timeout")), ms);
+    t.unref?.();
+  })
+]);
 function createDataEngine(opts) {
   const { version } = opts;
   let tz = opts.tz;
@@ -438,7 +446,7 @@ function createDataEngine(opts) {
         let dashboard = null;
         let ok = true;
         try {
-          dashboard = await fetchAccountSummary(r.account, tz);
+          dashboard = await withTimeout(fetchAccountSummary(r.account, tz), FETCH_TIMEOUT_MS);
         } catch {
           ok = false;
         }
@@ -475,7 +483,7 @@ function createDataEngine(opts) {
         let table = null;
         let ok = true;
         try {
-          table = await fetchAccountTable(r.account, tz);
+          table = await withTimeout(fetchAccountTable(r.account, tz), FETCH_TIMEOUT_MS);
         } catch {
           ok = false;
         }
@@ -512,7 +520,7 @@ function createDataEngine(opts) {
         let result = null;
         let ok = true;
         try {
-          result = await fetchAccountBilling(r.account);
+          result = await withTimeout(fetchAccountBilling(r.account), FETCH_TIMEOUT_MS);
         } catch {
           ok = false;
         }
@@ -702,6 +710,10 @@ import { join as join3, resolve as resolvePath, isAbsolute, sep as sep2 } from "
 function isContained(root, target) {
   return target === root || target.startsWith(root + sep2);
 }
+function parentFor(root, abs) {
+  const parentResolved = resolvePath(abs, "..");
+  return abs === root || !isContained(root, parentResolved) ? null : parentResolved;
+}
 async function listHomeDirectory(rawPath) {
   const root = resolvePath(homedir());
   const expanded = expandHome(rawPath || "~");
@@ -714,9 +726,19 @@ async function listHomeDirectory(rawPath) {
     real = lexical;
   }
   const abs = isContained(root, real) ? real : root;
-  const st = await stat2(abs);
-  if (!st.isDirectory()) throw new Error("not a directory");
-  const dirents = await readdir(abs, { withFileTypes: true });
+  let st;
+  try {
+    st = await stat2(abs);
+  } catch {
+    return { path: abs, parent: parentFor(root, abs), entries: [] };
+  }
+  if (!st.isDirectory()) return { path: abs, parent: parentFor(root, abs), entries: [] };
+  let dirents;
+  try {
+    dirents = await readdir(abs, { withFileTypes: true });
+  } catch {
+    return { path: abs, parent: parentFor(root, abs), entries: [] };
+  }
   const entries = [];
   for (const d of dirents) {
     if (d.name.startsWith(".")) continue;
@@ -739,9 +761,7 @@ async function listHomeDirectory(rawPath) {
     entries.push({ name: d.name, path: full, dir });
   }
   entries.sort((a, b) => a.dir === b.dir ? a.name.localeCompare(b.name) : a.dir ? -1 : 1);
-  const parentResolved = resolvePath(abs, "..");
-  const parent = abs === root || !isContained(root, parentResolved) ? null : parentResolved;
-  return { path: abs, parent, entries };
+  return { path: abs, parent: parentFor(root, abs), entries };
 }
 
 // src/web/ws.ts
@@ -841,12 +861,12 @@ async function mountWsRpc(server, deps) {
   const wss = new NodeWS.WebSocketServer({ noServer: true });
   const handlersLayer = TokmonRpcGroup.toLayer(
     TokmonRpcGroup.of({
-      [TOKMON_WS_METHODS.getConfig]: () => Effect.promise(async () => deps.state.config ?? await loadConfig()),
-      [TOKMON_WS_METHODS.setConfig]: (config) => Effect.promise(() => applyConfigUpdate(deps.engine, deps.state, config)),
+      [TOKMON_WS_METHODS.getConfig]: () => Effect.tryPromise(() => Promise.resolve(deps.state.config ?? loadConfig())),
+      [TOKMON_WS_METHODS.setConfig]: (config) => Effect.tryPromise(() => applyConfigUpdate(deps.engine, deps.state, config)),
       [TOKMON_WS_METHODS.refresh]: ({ scope: scope2 }) => Effect.sync(() => {
         deps.engine.refresh(scope2);
       }),
-      [TOKMON_WS_METHODS.browseFs]: ({ path }) => Effect.promise(() => listHomeDirectory(path)),
+      [TOKMON_WS_METHODS.browseFs]: ({ path }) => Effect.tryPromise(() => listHomeDirectory(path)),
       [TOKMON_WS_METHODS.snapshot]: () => snapshotStream(deps.engine),
       [TOKMON_WS_METHODS.config]: () => configStream(deps.engine)
     })