@appchy/jarvis 0.1.19 → 0.1.20

package/dist/bin.js

@@ -2825,7 +2825,11 @@ function createUpstreamClient(config) {
   }
   function getTokenExpiry(token) {
     try {
-      const payload = JSON.parse(Buffer.from(token.split(".")[1], "base64").toString());
+      const parts = token.split(".");
+      if (parts.length === 5) {
+        return Math.floor(Date.now() / 1e3) + 3600;
+      }
+      const payload = JSON.parse(Buffer.from(parts[1], "base64").toString());
       return payload.exp ?? null;
     } catch {
       return null;
@@ -2871,6 +2875,29 @@ function createUpstreamClient(config) {
       return false;
     }
   }
+  function attemptReauth() {
+    if (!config.onAuthExhausted) {
+      logger.sys.error("[Upstream] Auth failed after max retries, giving up");
+      return;
+    }
+    logger.sys.info("[Upstream] Auth exhausted, attempting re-authentication...");
+    config.onAuthExhausted().then((result) => {
+      if (!result) {
+        logger.sys.error("[Upstream] Re-authentication failed, giving up");
+        return;
+      }
+      currentToken = result.token;
+      if (result.refreshToken) config.refreshToken = result.refreshToken;
+      authFailures = 0;
+      retries = 0;
+      logger.sys.info("[Upstream] Re-authenticated, reconnecting...");
+      reconnectTimer = setTimeout(connect, 1e3);
+    }).catch((err) => {
+      logger.sys.error("[Upstream] Re-authentication error", {
+        error: err instanceof Error ? err.message : String(err)
+      });
+    });
+  }
   function connect() {
     if (closed) return;
     ws = new WebSocket2(config.apiUrl, {
@@ -2904,10 +2931,7 @@ function createUpstreamClient(config) {
             } else {
               authFailures++;
               if (authFailures >= MAX_AUTH_RETRIES) {
-                logger.sys.error("[Upstream] Auth failed after max retries, giving up", {
-                  code,
-                  attempts: authFailures
-                });
+                attemptReauth();
                 return;
               }
               reconnectTimer = setTimeout(connect, 3e3);
@@ -2917,10 +2941,7 @@ function createUpstreamClient(config) {
         }
         authFailures++;
         if (authFailures >= MAX_AUTH_RETRIES) {
-          logger.sys.error("[Upstream] Auth failed after max retries, giving up", {
-            code,
-            attempts: authFailures
-          });
+          attemptReauth();
           return;
         }
         logger.sys.warn("[Upstream] Auth failed, retrying...", {
@@ -5722,7 +5743,20 @@ function createCli() {
             const apiUrl = process.env.JARVIS_UPSTREAM_URL ?? config?.apiUrl;
             const token = process.env.JARVIS_UPSTREAM_TOKEN ?? config?.token;
             if (opts.upstream && apiUrl && token) {
-              return { apiUrl, token, refreshToken: config?.refreshToken };
+              const appUrl = getAppUrl();
+              return {
+                apiUrl,
+                token,
+                refreshToken: config?.refreshToken,
+                onAuthExhausted: async () => {
+                  console.log("\n[Auth] Token expired \u2014 re-authenticating...");
+                  const ok = await browserAuth(appUrl);
+                  if (!ok) return null;
+                  const fresh = loadConfig();
+                  if (!fresh?.token) return null;
+                  return { token: fresh.token, refreshToken: fresh.refreshToken };
+                }
+              };
             }
             return void 0;
           })()