happy-imou-cloud 2.0.0 → 2.0.2

package/dist/{api-BGXYX0yH.mjs → api-MYhAGPLn.mjs}

@@ -17,7 +17,7 @@ import { resolve, join as join$1 } from 'path';
 import { Expo } from 'expo-server-sdk';
 
 var name = "happy-imou-cloud";
-var version = "2.0.0";
+var version = "2.0.2";
 var description = "hicloud - Imou 企业定制版。关键是 happy！移动端远程 AI 编程工具，支持 Claude Code、Codex 和 Gemini CLI";
 var author = "long.zhu";
 var license = "MIT";
@@ -100,8 +100,7 @@ var scripts = {
 	"unlink:dev": "node scripts/link-dev.cjs unlink"
 };
 var dependencies = {
-	"@agentclientprotocol/sdk": "^0.8.0",
-	"@modelcontextprotocol/sdk": "^1.25.3",
+	"@agentclientprotocol/sdk": "^0.14.1",
 	"@stablelib/base64": "^2.0.1",
 	"@stablelib/hex": "^2.0.1",
 	"@types/cross-spawn": "^6.0.6",
@@ -431,7 +430,7 @@ async function listDaemonLogFiles(limit = 50) {
       return { file, path: fullPath, modified: stats.mtime };
     }).sort((a, b) => b.modified.getTime() - a.modified.getTime());
     try {
-      const { readDaemonState } = await import('./persistence-BA_unuca.mjs');
+      const { readDaemonState } = await import('./persistence-Dkm7rm8k.mjs');
       const state = await readDaemonState();
       if (!state) {
         return logs;
@@ -1360,6 +1359,8 @@ class ApiSessionClient extends EventEmitter {
   encryptionKey;
   encryptionVariant;
   pendingReliableCodexMessages = [];
+  reconnectAfterServerDisconnectTimer = null;
+  lastSocketServerError = null;
   constructor(credentials, session) {
     super();
     this.credentials = credentials;
@@ -1394,6 +1395,8 @@ class ApiSessionClient extends EventEmitter {
     });
     this.socket.on("connect", () => {
       logger.debug("Socket connected successfully");
+      this.clearReconnectAfterServerDisconnectTimer();
+      this.lastSocketServerError = null;
       this.rpcHandlerManager.onSocketConnect(this.socket);
       this.flushReliableCodexMessages();
     });
@@ -1403,6 +1406,7 @@ class ApiSessionClient extends EventEmitter {
     this.socket.on("disconnect", (reason) => {
       logger.debug("[API] Socket disconnected:", reason);
       this.rpcHandlerManager.onSocketDisconnect();
+      this.retryAfterServerDisconnect(reason);
     });
     this.socket.on("connect_error", (error) => {
       logger.debug("[API] Socket connection error:", error);
@@ -1450,6 +1454,7 @@ class ApiSessionClient extends EventEmitter {
     });
     this.socket.on("error", (error) => {
       logger.debug("[API] Socket error:", error);
+      this.lastSocketServerError = this.normalizeSocketError(error);
     });
     this.socket.connect();
   }
@@ -1721,6 +1726,7 @@ class ApiSessionClient extends EventEmitter {
   }
   async close() {
     logger.debug("[API] socket.close() called");
+    this.clearReconnectAfterServerDisconnectTimer();
     this.socket.close();
   }
   emitEncryptedSessionMessage(encrypted) {
@@ -1756,6 +1762,53 @@ class ApiSessionClient extends EventEmitter {
         return false;
     }
   }
+  retryAfterServerDisconnect(reason) {
+    if (reason !== "io server disconnect") {
+      return;
+    }
+    const errorCode = this.lastSocketServerError?.error;
+    if (errorCode !== "REQUEST_EXPIRED" && errorCode !== "REQUEST_REPLAYED") {
+      return;
+    }
+    if (this.reconnectAfterServerDisconnectTimer || this.socket.connected) {
+      return;
+    }
+    logger.debug("[API] Scheduling manual reconnect after retryable server disconnect", {
+      reason,
+      errorCode,
+      message: this.lastSocketServerError?.message
+    });
+    this.reconnectAfterServerDisconnectTimer = setTimeout(() => {
+      this.reconnectAfterServerDisconnectTimer = null;
+      if (this.socket.connected) {
+        return;
+      }
+      logger.debug("[API] Retrying socket connection after server disconnect", {
+        errorCode,
+        message: this.lastSocketServerError?.message
+      });
+      this.socket.connect();
+    }, 1e3);
+  }
+  clearReconnectAfterServerDisconnectTimer() {
+    if (!this.reconnectAfterServerDisconnectTimer) {
+      return;
+    }
+    clearTimeout(this.reconnectAfterServerDisconnectTimer);
+    this.reconnectAfterServerDisconnectTimer = null;
+  }
+  normalizeSocketError(error) {
+    if (!error || typeof error !== "object") {
+      return null;
+    }
+    const candidate = error;
+    const errorCode = typeof candidate.error === "string" ? candidate.error : void 0;
+    const message = typeof candidate.message === "string" ? candidate.message : void 0;
+    if (!errorCode && !message) {
+      return null;
+    }
+    return { error: errorCode, message };
+  }
 }
 function createAbortError() {
   const error = new Error("The operation was aborted");
@@ -2097,6 +2150,42 @@ class PushNotificationClient {
   }
 }
 
+const AUTHENTICATION_REQUIRED_MESSAGE = 'Happy authentication failed. Run "hicloud auth login --force" to re-authenticate.';
+const SIGNING_BOOTSTRAP_REQUIRED_MESSAGE = 'Happy request signing initialization failed. Run "hicloud auth login --force" to retry. If it still fails, inspect the server response and local credentials state.';
+let authenticationWarningShown = false;
+class AuthenticationRequiredError extends Error {
+  constructor(message = AUTHENTICATION_REQUIRED_MESSAGE) {
+    super(message);
+    this.name = "AuthenticationRequiredError";
+  }
+}
+function isAuthenticationRequiredError(error) {
+  return error instanceof AuthenticationRequiredError;
+}
+class SigningBootstrapRequiredError extends AuthenticationRequiredError {
+  constructor(message = SIGNING_BOOTSTRAP_REQUIRED_MESSAGE) {
+    super(message);
+    this.name = "SigningBootstrapRequiredError";
+  }
+}
+function isSigningBootstrapRequiredError(error) {
+  return error instanceof SigningBootstrapRequiredError;
+}
+function printAuthenticationRequiredWarning(error) {
+  if (authenticationWarningShown) {
+    return;
+  }
+  authenticationWarningShown = true;
+  if (isSigningBootstrapRequiredError(error)) {
+    console.log(chalk.yellow("\u26A0\uFE0F  Happy request signing initialization failed"));
+    console.log(chalk.gray('  Run "hicloud auth login --force" to retry signing initialization.'));
+    console.log(chalk.gray("  If it still fails, inspect the server response and local credentials state."));
+    return;
+  }
+  console.log(chalk.yellow("\u26A0\uFE0F  Happy authentication failed"));
+  console.log(chalk.gray('  Run "hicloud auth login --force" to re-authenticate.'));
+}
+
 function startOfflineReconnection(config) {
   let reconnected = false;
   let session = null;
@@ -2123,9 +2212,19 @@ function startOfflineReconnection(config) {
       config.onNotify("\u2705 Reconnected! Session syncing in background.");
       logger.debug("[OfflineReconnection] Successfully reconnected");
     } catch (e) {
+      if (isSigningBootstrapRequiredError(e)) {
+        logger.debug("[OfflineReconnection] Signing bootstrap incomplete, stopping retries");
+        config.onNotify("\u274C Request signing initialization failed. Re-run `hicloud auth login --force`; if it still fails, inspect the server response and local credentials state.");
+        return;
+      }
       if (axios.isAxiosError(e) && e.response?.status === 401) {
         logger.debug("[OfflineReconnection] Authentication error, stopping retries");
-        config.onNotify("\u274C Authentication failed. Please re-authenticate with `happy-cloud auth`.");
+        config.onNotify("\u274C Authentication failed. Please re-authenticate with `hicloud auth`.");
+        return;
+      }
+      if (isAuthenticationRequiredError(e)) {
+        logger.debug("[OfflineReconnection] Authentication error, stopping retries");
+        config.onNotify("\u274C Authentication failed. Please re-authenticate with `hicloud auth`.");
         return;
       }
       failureCount++;
@@ -2170,7 +2269,7 @@ const ERROR_DESCRIPTIONS = {
   EHOSTUNREACH: "server host unreachable",
   ENETUNREACH: "network unreachable",
   // HTTP errors
-  "401": "authentication failed - run `happy-cloud auth`",
+  "401": "authentication failed - run `hicloud auth`",
   "403": "access forbidden",
   "404": "endpoint not found, check server deployment",
   "500": "server internal error",
@@ -2232,6 +2331,12 @@ class ApiClient {
     this.credential = credential;
     this.pushClient = new PushNotificationClient(credential, configuration.serverUrl);
   }
+  createAuthenticationError() {
+    if (!this.credential.signing) {
+      return new SigningBootstrapRequiredError(SIGNING_BOOTSTRAP_REQUIRED_MESSAGE);
+    }
+    return new AuthenticationRequiredError(AUTHENTICATION_REQUIRED_MESSAGE);
+  }
   async request(opts) {
     return axios.request({
       method: opts.method,
@@ -2316,6 +2421,11 @@ class ApiClient {
         });
         return null;
       }
+      if (axios.isAxiosError(error) && error.response?.status === 401) {
+        const authError = this.createAuthenticationError();
+        printAuthenticationRequiredWarning(authError);
+        throw authError;
+      }
       if (axios.isAxiosError(error) && error.response?.status) {
         const status = error.response.status;
         if (status >= 500) {
@@ -2395,6 +2505,11 @@ class ApiClient {
       }
       if (axios.isAxiosError(error) && error.response?.status) {
         const status = error.response.status;
+        if (status === 401) {
+          const authError = this.createAuthenticationError();
+          printAuthenticationRequiredWarning(authError);
+          throw authError;
+        }
         if (status === 403 || status === 409) {
           console.log(chalk.yellow(
             `\u26A0\uFE0F  Machine registration rejected by the server with status ${status}`
@@ -2537,4 +2652,4 @@ var api = /*#__PURE__*/Object.freeze({
   ApiClient: ApiClient
 });
 
-export { ApiClient as A, HAPPY_CLOUD_DAEMON_PORT as H, ApiSessionClient as a, connectionState as b, configuration as c, backoff as d, encodeBase64 as e, delay as f, AsyncLock as g, buildAuthenticatedHeaders as h, encodeBase64Url as i, buildClientHeaders as j, decodeBase64 as k, logger as l, getLatestDaemonLog as m, api as n, packageJson as p, startOfflineReconnection as s };
+export { ApiClient as A, HAPPY_CLOUD_DAEMON_PORT as H, SigningBootstrapRequiredError as S, ApiSessionClient as a, connectionState as b, configuration as c, backoff as d, encodeBase64 as e, delay as f, AsyncLock as g, buildAuthenticatedHeaders as h, isAuthenticationRequiredError as i, SIGNING_BOOTSTRAP_REQUIRED_MESSAGE as j, encodeBase64Url as k, logger as l, buildClientHeaders as m, decodeBase64 as n, getLatestDaemonLog as o, packageJson as p, api as q, startOfflineReconnection as s };

package/dist/{command-G85giEAF.cjs → command-CVldr51S.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var index = require('./index-B_wlQBy2.cjs');
+var index = require('./index-Bg-YziG2.cjs');
 require('chalk');
-require('./api-D7OK-mML.cjs');
+require('./api-D2Njw9Im.cjs');
 require('axios');
 require('fs');
 require('node:fs');
@@ -19,7 +19,7 @@ require('fs/promises');
 require('crypto');
 require('path');
 require('expo-server-sdk');
-require('./persistence-DHgf1CTG.cjs');
+require('./persistence-D_2GkJAO.cjs');
 require('node:fs/promises');
 require('os');
 require('tmp');

package/dist/{command-CnLtKtP-.mjs → command-nmK6O-ab.mjs}

@@ -1,6 +1,6 @@
-import { c as createDefaultRuntimeShell } from './index-C7Y0R-MI.mjs';
+import { c as createDefaultRuntimeShell } from './index-B97L7qLD.mjs';
 import 'chalk';
-import './api-BGXYX0yH.mjs';
+import './api-MYhAGPLn.mjs';
 import 'axios';
 import 'fs';
 import 'node:fs';
@@ -17,7 +17,7 @@ import 'fs/promises';
 import 'crypto';
 import 'path';
 import 'expo-server-sdk';
-import './persistence-BA_unuca.mjs';
+import './persistence-Dkm7rm8k.mjs';
 import 'node:fs/promises';
 import 'os';
 import 'tmp';