happy-imou-cloud 1.1.5 → 1.1.7

package/dist/{config-cUle3acO.cjs → config-BQNrtwRY.cjs}

@@ -4,7 +4,7 @@ var fs = require('fs');
 var path = require('path');
 var os = require('os');
 var child_process = require('child_process');
-var api = require('./types-DswSykEM.cjs');
+var api = require('./types-BSTmyv9d.cjs');
 
 const GEMINI_API_KEY_ENV = "GEMINI_API_KEY";
 const GOOGLE_API_KEY_ENV = "GOOGLE_API_KEY";

package/dist/{config-CW_20tNC.mjs → config-Dn99YH37.mjs}

@@ -2,7 +2,7 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import { join } from 'path';
 import { homedir } from 'os';
 import { execSync } from 'child_process';
-import { l as logger } from './types-DB-rfqhR.mjs';
+import { l as logger } from './types-BXyraW9R.mjs';
 
 const GEMINI_API_KEY_ENV = "GEMINI_API_KEY";
 const GOOGLE_API_KEY_ENV = "GOOGLE_API_KEY";

package/dist/{index-CKUiwwxb.mjs → index-CUmYqKWt.mjs}

@@ -1,7 +1,7 @@
 import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import chalk from 'chalk';
 import os$1, { homedir, tmpdir } from 'node:os';
 import { randomUUID, randomBytes } from 'node:crypto';
-import { l as logger, f as backoff, d as delay, R as RawJSONLinesSchema, g as AsyncLock, c as configuration, p as packageJson, e as encodeBase64, h as encodeBase64Url, i as decodeBase64, H as HAPPY_CLOUD_DAEMON_PORT, A as ApiClient, b as connectionState, s as startOfflineReconnection, j as getLatestDaemonLog } from './types-DB-rfqhR.mjs';
+import { l as logger, f as backoff, d as delay, R as RawJSONLinesSchema, g as AsyncLock, c as configuration, H as HAPPY_CLOUD_DAEMON_PORT, p as packageJson, e as encodeBase64, h as buildAuthenticatedHeaders, i as encodeBase64Url, j as buildClientHeaders, k as decodeBase64, A as ApiClient, b as connectionState, s as startOfflineReconnection, m as getLatestDaemonLog } from './types-BXyraW9R.mjs';
 import { spawn, execSync, execFileSync } from 'node:child_process';
 import { resolve, isAbsolute, join } from 'node:path';
 import { createInterface } from 'node:readline';
@@ -19,7 +19,7 @@ import 'socket.io-client';
 import tweetnacl from 'tweetnacl';
 import 'expo-server-sdk';
 import { isDeepStrictEqual } from 'node:util';
-import { readDaemonState, clearDaemonState, readSettings, readCredentials, updateSettings, writeCredentialsLegacy, writeCredentialsDataKey, acquireDaemonLock, writeDaemonState, releaseDaemonLock, validateProfileForAgent, getProfileEnvironmentVariables, clearCredentials, clearMachineId } from './persistence-BXxnODRE.mjs';
+import { readDaemonState, clearDaemonState, readSettings, readCredentials, updateSettings, writeCredentialsLegacy, writeCredentialsDataKey, acquireDaemonLock, writeDaemonState, releaseDaemonLock, validateProfileForAgent, getProfileEnvironmentVariables, clearCredentials, clearMachineId } from './persistence-BGsuPqaO.mjs';
 import { createHash, randomBytes as randomBytes$1 } from 'crypto';
 import { spawn as spawn$1, execSync as execSync$1, exec } from 'child_process';
 import { readFileSync as readFileSync$1, existsSync as existsSync$1, writeFileSync as writeFileSync$1, chmodSync, unlinkSync as unlinkSync$1, mkdirSync as mkdirSync$1 } from 'fs';
@@ -3673,150 +3673,6 @@ function extractSDKMetadataAsync(onComplete) {
   });
 }
 
-async function daemonPost(path, body) {
-  const state = await readDaemonState();
-  if (!state?.httpPort) {
-    const errorMessage = "No daemon running, no state file found";
-    logger.debug(`[CONTROL CLIENT] ${errorMessage}`);
-    return {
-      error: errorMessage
-    };
-  }
-  try {
-    process.kill(state.pid, 0);
-  } catch (error) {
-    const errorMessage = "Daemon is not running, file is stale";
-    logger.debug(`[CONTROL CLIENT] ${errorMessage}`);
-    return {
-      error: errorMessage
-    };
-  }
-  try {
-    const timeout = process.env.HAPPY_DAEMON_HTTP_TIMEOUT ? parseInt(process.env.HAPPY_DAEMON_HTTP_TIMEOUT) : 1e4;
-    const response = await fetch(`http://127.0.0.1:${state.httpPort}${path}`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(body || {}),
-      // Mostly increased for stress test
-      signal: AbortSignal.timeout(timeout)
-    });
-    if (!response.ok) {
-      const errorMessage = `Request failed: ${path}, HTTP ${response.status}`;
-      logger.debug(`[CONTROL CLIENT] ${errorMessage}`);
-      return {
-        error: errorMessage
-      };
-    }
-    return await response.json();
-  } catch (error) {
-    const errorMessage = `Request failed: ${path}, ${error instanceof Error ? error.message : "Unknown error"}`;
-    logger.debug(`[CONTROL CLIENT] ${errorMessage}`);
-    return {
-      error: errorMessage
-    };
-  }
-}
-async function notifyDaemonSessionStarted(sessionId, metadata) {
-  return await daemonPost("/session-started", {
-    sessionId,
-    metadata
-  });
-}
-async function listDaemonSessions() {
-  const result = await daemonPost("/list");
-  return result.children || [];
-}
-async function stopDaemonSession(sessionId) {
-  const result = await daemonPost("/stop-session", { sessionId });
-  return result.success || false;
-}
-async function stopDaemonHttp() {
-  await daemonPost("/stop");
-}
-async function checkIfDaemonRunningAndCleanupStaleState() {
-  const state = await readDaemonState();
-  if (!state) {
-    return false;
-  }
-  try {
-    process.kill(state.pid, 0);
-    return true;
-  } catch {
-    logger.debug("[DAEMON RUN] Daemon PID not running, cleaning up state");
-    await cleanupDaemonState();
-    return false;
-  }
-}
-async function isDaemonRunningCurrentlyInstalledHappyVersion() {
-  logger.debug("[DAEMON CONTROL] Checking if daemon is running same version");
-  const runningDaemon = await checkIfDaemonRunningAndCleanupStaleState();
-  if (!runningDaemon) {
-    logger.debug("[DAEMON CONTROL] No daemon running, returning false");
-    return false;
-  }
-  const state = await readDaemonState();
-  if (!state) {
-    logger.debug("[DAEMON CONTROL] No daemon state found, returning false");
-    return false;
-  }
-  try {
-    const packageJsonPath = join$1(projectPath(), "package.json");
-    const packageJson = JSON.parse(readFileSync$1(packageJsonPath, "utf-8"));
-    const currentCliVersion = packageJson.version;
-    logger.debug(`[DAEMON CONTROL] Current CLI version: ${currentCliVersion}, Daemon started with version: ${state.startedWithCliVersion}`);
-    return currentCliVersion === state.startedWithCliVersion;
-  } catch (error) {
-    logger.debug("[DAEMON CONTROL] Error checking daemon version", error);
-    return false;
-  }
-}
-async function cleanupDaemonState() {
-  try {
-    await clearDaemonState();
-    logger.debug("[DAEMON RUN] Daemon state file removed");
-  } catch (error) {
-    logger.debug("[DAEMON RUN] Error cleaning up daemon metadata", error);
-  }
-}
-async function stopDaemon() {
-  try {
-    const state = await readDaemonState();
-    if (!state) {
-      logger.debug("No daemon state found");
-      return;
-    }
-    logger.debug(`Stopping daemon with PID ${state.pid}`);
-    try {
-      await stopDaemonHttp();
-      await waitForProcessDeath(state.pid, 2e3);
-      logger.debug("Daemon stopped gracefully via HTTP");
-      return;
-    } catch (error) {
-      logger.debug("HTTP stop failed, will force kill", error);
-    }
-    try {
-      process.kill(state.pid, "SIGKILL");
-      logger.debug("Force killed daemon");
-    } catch (error) {
-      logger.debug("Daemon already dead");
-    }
-  } catch (error) {
-    logger.debug("Error stopping daemon", error);
-  }
-}
-async function waitForProcessDeath(pid, timeout) {
-  const start = Date.now();
-  while (Date.now() - start < timeout) {
-    try {
-      process.kill(pid, 0);
-      await new Promise((resolve) => setTimeout(resolve, 100));
-    } catch {
-      return;
-    }
-  }
-  throw new Error("Process did not die within timeout");
-}
-
 function getDaemonPid() {
   try {
     if (!existsSync(configuration.daemonStateFile)) {
@@ -3984,6 +3840,210 @@ async function killRunawayHappyProcesses() {
   return { killed, errors };
 }
 
+async function daemonPost(path, body) {
+  const state = await readDaemonState();
+  if (!state?.httpPort) {
+    const errorMessage = "No daemon running, no state file found";
+    logger.debug(`[CONTROL CLIENT] ${errorMessage}`);
+    return {
+      error: errorMessage
+    };
+  }
+  try {
+    process.kill(state.pid, 0);
+  } catch (error) {
+    const errorMessage = "Daemon is not running, file is stale";
+    logger.debug(`[CONTROL CLIENT] ${errorMessage}`);
+    return {
+      error: errorMessage
+    };
+  }
+  try {
+    const timeout = process.env.HAPPY_DAEMON_HTTP_TIMEOUT ? parseInt(process.env.HAPPY_DAEMON_HTTP_TIMEOUT) : 1e4;
+    const response = await fetch(`http://127.0.0.1:${state.httpPort}${path}`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(body || {}),
+      // Mostly increased for stress test
+      signal: AbortSignal.timeout(timeout)
+    });
+    if (!response.ok) {
+      const errorMessage = `Request failed: ${path}, HTTP ${response.status}`;
+      logger.debug(`[CONTROL CLIENT] ${errorMessage}`);
+      return {
+        error: errorMessage
+      };
+    }
+    return await response.json();
+  } catch (error) {
+    const errorMessage = `Request failed: ${path}, ${error instanceof Error ? error.message : "Unknown error"}`;
+    logger.debug(`[CONTROL CLIENT] ${errorMessage}`);
+    return {
+      error: errorMessage
+    };
+  }
+}
+async function stopDaemonOnKnownPort() {
+  try {
+    const timeout = process.env.HAPPY_DAEMON_HTTP_TIMEOUT ? parseInt(process.env.HAPPY_DAEMON_HTTP_TIMEOUT) : 2e3;
+    const response = await fetch(`http://127.0.0.1:${HAPPY_CLOUD_DAEMON_PORT}/stop`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({}),
+      signal: AbortSignal.timeout(timeout)
+    });
+    if (!response.ok) {
+      logger.debug(`[CONTROL CLIENT] Known daemon port stop failed with HTTP ${response.status}`);
+      return false;
+    }
+    return true;
+  } catch (error) {
+    logger.debug("[CONTROL CLIENT] No reachable daemon on known control port", error);
+    return false;
+  }
+}
+async function killOrphanDaemonProcesses() {
+  const daemonTypes = /* @__PURE__ */ new Set([
+    "daemon",
+    "dev-daemon",
+    "daemon-version-check",
+    "dev-daemon-version-check"
+  ]);
+  const orphanDaemons = (await findAllHappyProcesses()).filter(
+    (proc) => proc.pid !== process.pid && daemonTypes.has(proc.type)
+  );
+  if (orphanDaemons.length === 0) {
+    logger.debug("[CONTROL CLIENT] No orphan daemon processes found");
+    return false;
+  }
+  let killed = false;
+  for (const proc of orphanDaemons) {
+    try {
+      if (process.platform === "win32") {
+        execFileSync("taskkill", ["/F", "/PID", proc.pid.toString()], { stdio: "ignore" });
+      } else {
+        process.kill(proc.pid, "SIGKILL");
+      }
+      logger.debug(`[CONTROL CLIENT] Killed orphan daemon PID ${proc.pid}: ${proc.command}`);
+      killed = true;
+    } catch (error) {
+      logger.debug(`[CONTROL CLIENT] Failed to kill orphan daemon PID ${proc.pid}`, error);
+    }
+  }
+  return killed;
+}
+async function notifyDaemonSessionStarted(sessionId, metadata) {
+  return await daemonPost("/session-started", {
+    sessionId,
+    metadata
+  });
+}
+async function listDaemonSessions() {
+  const result = await daemonPost("/list");
+  return result.children || [];
+}
+async function stopDaemonSession(sessionId) {
+  const result = await daemonPost("/stop-session", { sessionId });
+  return result.success || false;
+}
+async function stopDaemonHttp() {
+  await daemonPost("/stop");
+}
+async function checkIfDaemonRunningAndCleanupStaleState() {
+  const state = await readDaemonState();
+  if (!state) {
+    return false;
+  }
+  try {
+    process.kill(state.pid, 0);
+    return true;
+  } catch {
+    logger.debug("[DAEMON RUN] Daemon PID not running, cleaning up state");
+    await cleanupDaemonState();
+    return false;
+  }
+}
+async function isDaemonRunningCurrentlyInstalledHappyVersion() {
+  logger.debug("[DAEMON CONTROL] Checking if daemon is running same version");
+  const runningDaemon = await checkIfDaemonRunningAndCleanupStaleState();
+  if (!runningDaemon) {
+    logger.debug("[DAEMON CONTROL] No daemon running, returning false");
+    return false;
+  }
+  const state = await readDaemonState();
+  if (!state) {
+    logger.debug("[DAEMON CONTROL] No daemon state found, returning false");
+    return false;
+  }
+  try {
+    const packageJsonPath = join$1(projectPath(), "package.json");
+    const packageJson = JSON.parse(readFileSync$1(packageJsonPath, "utf-8"));
+    const currentCliVersion = packageJson.version;
+    logger.debug(`[DAEMON CONTROL] Current CLI version: ${currentCliVersion}, Daemon started with version: ${state.startedWithCliVersion}`);
+    return currentCliVersion === state.startedWithCliVersion;
+  } catch (error) {
+    logger.debug("[DAEMON CONTROL] Error checking daemon version", error);
+    return false;
+  }
+}
+async function cleanupDaemonState() {
+  try {
+    await clearDaemonState();
+    logger.debug("[DAEMON RUN] Daemon state file removed");
+  } catch (error) {
+    logger.debug("[DAEMON RUN] Error cleaning up daemon metadata", error);
+  }
+}
+async function stopDaemon() {
+  try {
+    const state = await readDaemonState();
+    if (!state) {
+      logger.debug("No daemon state found, trying known control port");
+      const stoppedByKnownPort = await stopDaemonOnKnownPort();
+      if (stoppedByKnownPort) {
+        logger.debug(`Requested daemon stop via known control port ${HAPPY_CLOUD_DAEMON_PORT}`);
+        return;
+      }
+      const killedOrphans = await killOrphanDaemonProcesses();
+      if (killedOrphans) {
+        logger.debug("Killed orphan daemon processes without state file");
+        return;
+      }
+      logger.debug("No daemon state found");
+      return;
+    }
+    logger.debug(`Stopping daemon with PID ${state.pid}`);
+    try {
+      await stopDaemonHttp();
+      await waitForProcessDeath(state.pid, 2e3);
+      logger.debug("Daemon stopped gracefully via HTTP");
+      return;
+    } catch (error) {
+      logger.debug("HTTP stop failed, will force kill", error);
+    }
+    try {
+      process.kill(state.pid, "SIGKILL");
+      logger.debug("Force killed daemon");
+    } catch (error) {
+      logger.debug("Daemon already dead");
+    }
+  } catch (error) {
+    logger.debug("Error stopping daemon", error);
+  }
+}
+async function waitForProcessDeath(pid, timeout) {
+  const start = Date.now();
+  while (Date.now() - start < timeout) {
+    try {
+      process.kill(pid, 0);
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    } catch {
+      return;
+    }
+  }
+  throw new Error("Process did not die within timeout");
+}
+
 function getEnvironmentInfo() {
   return {
     PWD: process.env.PWD,
@@ -4067,6 +4127,7 @@ async function runDoctorCommand(filter) {
       const credentials = await readCredentials();
       if (credentials) {
         console.log(chalk.green("\u2713 Authenticated (credentials found)"));
+        console.log(`Request signing: ${credentials.signing ? chalk.green("ready") : chalk.yellow("legacy credentials")}`);
       } else {
         console.log(chalk.yellow("\u26A0\uFE0F  Not authenticated (no credentials)"));
       }
@@ -4394,6 +4455,8 @@ async function createTerminalAuthRequest(keypair) {
   const response = await axios.post(`${configuration.serverUrl}/v1/auth/request`, {
     publicKey: encodeBase64(keypair.publicKey),
     supportsV2: true
+  }, {
+    headers: buildClientHeaders()
   });
   if (process.env.DEBUG) {
     console.log("[AUTH DEBUG] Auth request sent successfully");
@@ -4662,6 +4725,7 @@ async function authAndSetupMachineIfNeeded() {
   } else {
     logger.debug("[AUTH] Using existing credentials");
   }
+  credentials = await ensureSigningCredentials(credentials);
   const settings = await updateSettings(async (s) => {
     if (newAuth || !s.machineId) {
       return {
@@ -4674,6 +4738,53 @@ async function authAndSetupMachineIfNeeded() {
   logger.debug(`[AUTH] Machine ID: ${settings.machineId}`);
   return { credentials, machineId: settings.machineId };
 }
+async function ensureSigningCredentials(credentials) {
+  if (credentials.signing) {
+    return credentials;
+  }
+  try {
+    const response = await axios.post(`${configuration.serverUrl}/v1/auth/refresh`, {}, {
+      headers: buildAuthenticatedHeaders({
+        credentials,
+        method: "POST",
+        url: `${configuration.serverUrl}/v1/auth/refresh`,
+        body: {},
+        headers: {
+          "Content-Type": "application/json"
+        },
+        signRequest: false
+      })
+    });
+    if (!response.data?.success || !response.data?.token || !response.data?.signing) {
+      logger.debug("[AUTH] Signing bootstrap returned incomplete payload");
+      return credentials;
+    }
+    const upgradedCredentials = {
+      ...credentials,
+      token: response.data.token,
+      signing: response.data.signing
+    };
+    if (upgradedCredentials.encryption.type === "legacy") {
+      await writeCredentialsLegacy({
+        secret: upgradedCredentials.encryption.secret,
+        token: upgradedCredentials.token,
+        signing: upgradedCredentials.signing
+      });
+    } else {
+      await writeCredentialsDataKey({
+        publicKey: upgradedCredentials.encryption.publicKey,
+        machineKey: upgradedCredentials.encryption.machineKey,
+        token: upgradedCredentials.token,
+        signing: upgradedCredentials.signing
+      });
+    }
+    logger.debug("[AUTH] Signing credentials bootstrapped successfully");
+    return upgradedCredentials;
+  } catch (error) {
+    logger.debug("[AUTH] Failed to bootstrap signing credentials", error);
+    return credentials;
+  }
+}
 
 function spawnHappyCLI(args, options = {}) {
   const projectRoot = projectPath();
@@ -6780,6 +6891,7 @@ async function handleAuthStatus() {
   console.log(chalk.green("\u2713 Authenticated"));
   const tokenPreview = credentials.token.substring(0, 30) + "...";
   console.log(chalk.gray(`  Token: ${tokenPreview}`));
+  console.log(chalk.gray(`  Request signing: ${credentials.signing ? "ready" : "legacy credentials (will auto-upgrade on use)"}`));
   if (settings?.machineId) {
     console.log(chalk.green("\u2713 Machine registered"));
     console.log(chalk.gray(`  Machine ID: ${settings.machineId}`));
@@ -7523,7 +7635,7 @@ function getVersionString() {
     return;
   } else if (subcommand === "codex") {
     try {
-      const { runCodex } = await import('./runCodex-DYoCy0rl.mjs');
+      const { runCodex } = await import('./runCodex-X0BfjcZH.mjs');
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -7553,7 +7665,7 @@ function getVersionString() {
         process.exit(1);
       }
       try {
-        const { existsSync, readFileSync, writeFileSync, mkdirSync } = require("fs");
+        const { existsSync, readFileSync: readFileSync2, writeFileSync, mkdirSync } = require("fs");
         const { join } = require("path");
         const { homedir } = require("os");
         const configDir = join(homedir(), ".gemini");
@@ -7564,7 +7676,7 @@ function getVersionString() {
         let config = {};
         if (existsSync(configPath)) {
           try {
-            config = JSON.parse(readFileSync(configPath, "utf-8"));
+            config = JSON.parse(readFileSync2(configPath, "utf-8"));
           } catch (error) {
             config = {};
           }
@@ -7582,7 +7694,7 @@ function getVersionString() {
     }
     if (geminiSubcommand === "model" && args[2] === "get") {
       try {
-        const { existsSync, readFileSync } = require("fs");
+        const { existsSync, readFileSync: readFileSync2 } = require("fs");
         const { join } = require("path");
         const { homedir } = require("os");
         const configPaths = [
@@ -7593,7 +7705,7 @@ function getVersionString() {
         for (const configPath of configPaths) {
           if (existsSync(configPath)) {
             try {
-              const config = JSON.parse(readFileSync(configPath, "utf-8"));
+              const config = JSON.parse(readFileSync2(configPath, "utf-8"));
               model = config.model || config.GEMINI_MODEL || null;
               if (model) break;
             } catch (error) {
@@ -7616,9 +7728,9 @@ function getVersionString() {
     if (geminiSubcommand === "project" && args[2] === "set" && args[3]) {
       const projectId = args[3];
       try {
-        const { saveGoogleCloudProjectToConfig } = await import('./config-CW_20tNC.mjs').then(function (n) { return n.e; });
-        const { readCredentials: readCredentials2 } = await import('./persistence-BXxnODRE.mjs');
-        const { ApiClient: ApiClient2 } = await import('./types-DB-rfqhR.mjs').then(function (n) { return n.k; });
+        const { saveGoogleCloudProjectToConfig } = await import('./config-Dn99YH37.mjs').then(function (n) { return n.e; });
+        const { readCredentials: readCredentials2 } = await import('./persistence-BGsuPqaO.mjs');
+        const { ApiClient: ApiClient2 } = await import('./types-BXyraW9R.mjs').then(function (n) { return n.n; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentials2();
@@ -7649,7 +7761,7 @@ function getVersionString() {
     }
     if (geminiSubcommand === "project" && args[2] === "get") {
       try {
-        const { readGeminiLocalConfig } = await import('./config-CW_20tNC.mjs').then(function (n) { return n.e; });
+        const { readGeminiLocalConfig } = await import('./config-Dn99YH37.mjs').then(function (n) { return n.e; });
         const config = readGeminiLocalConfig();
         if (config.googleCloudProject) {
           console.log(`Current Google Cloud Project: ${config.googleCloudProject}`);
@@ -7689,7 +7801,7 @@ function getVersionString() {
       process.exit(0);
     }
     try {
-      const { runGemini } = await import('./runGemini-DPGUQNvu.mjs');
+      const { runGemini } = await import('./runGemini-B-EK_BJQ.mjs');
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -7789,6 +7901,17 @@ function getVersionString() {
         console.log("Daemon started successfully");
       } else {
         console.error("Failed to start daemon");
+        const latest = await getLatestDaemonLog();
+        if (latest) {
+          console.error(`Latest daemon log: ${latest.path}`);
+          try {
+            const logContent = readFileSync(latest.path, "utf-8");
+            if (logContent.includes("EADDRINUSE")) {
+              console.error("Daemon control port is already in use. Retry after stopping the stale daemon or run `hicloud doctor clean`.");
+            }
+          } catch {
+          }
+        }
         process.exit(1);
       }
       process.exit(0);