@minato-aqukin/autodl-cli 0.1.1 → 0.2.0

package/dist/{chunk-6QR4ZYQR.js → chunk-GHJVQKKC.js}

@@ -976,6 +976,7 @@ var waitForRunning = (client, uuid, options2) => waitForStatus(client, uuid, ["r
 var waitForShutdown = (client, uuid, options2) => waitForStatus(client, uuid, ["shutdown"], options2);
 
 // src/ssh/credentials.ts
+import { setTimeout as delay } from "timers/promises";
 import { Client } from "ssh2";
 
 // src/output/i18n.ts
@@ -1065,7 +1066,9 @@ function t(key) {
 
 // src/ssh/credentials.ts
 async function getCredentials(client, uuid, options2 = {}) {
+  assertNotAborted(options2.signal);
   let status = await getInstanceStatus(client, uuid);
+  assertNotAborted(options2.signal);
   if (status !== "running") {
     if (!options2.autoStart) {
       throw new SSHError(`\u5B9E\u4F8B ${uuid} \u5F53\u524D\u72B6\u6001\u4E3A "${status}"\uFF0C\u65E0\u6CD5\u5EFA\u7ACB SSH \u8FDE\u63A5`, {
@@ -1082,6 +1085,7 @@ async function getCredentials(client, uuid, options2 = {}) {
       });
     }
     if (status === "shutdown") {
+      assertNotAborted(options2.signal);
       note(t("instance.poweringOn"));
       await powerOnInstance(client, uuid);
     }
@@ -1093,6 +1097,7 @@ async function getCredentials(client, uuid, options2 = {}) {
     });
   }
   const snapshot = await getInstanceSnapshot(client, uuid);
+  assertNotAborted(options2.signal);
   const { host, port, password } = snapshot.ssh;
   if (!host || !port || !password) {
     throw new SSHError(`\u5B9E\u4F8B ${uuid} \u5C1A\u672A\u8FD4\u56DE\u5B8C\u6574\u7684 SSH \u4FE1\u606F`, {
@@ -1103,57 +1108,92 @@ async function getCredentials(client, uuid, options2 = {}) {
   return { uuid, host, port, user: "root", password };
 }
 var RETRY_DELAYS_MS = [2e3, 5e3, 8e3];
-function delay(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-function connectOnce(creds, options2) {
-  return new Promise((resolve, reject) => {
-    const conn = new Client();
-    const settle = (err) => {
-      conn.removeAllListeners("ready");
-      conn.removeAllListeners("error");
-      if (err) reject(err);
-      else resolve(conn);
-    };
-    conn.once("ready", () => settle());
-    conn.once("error", (err) => {
-      conn.end();
-      settle(err);
-    });
+async function connectOnce(creds, options2) {
+  assertNotAborted(options2.signal);
+  const { promise, resolve, reject } = Promise.withResolvers();
+  const conn = new Client();
+  let settled = false;
+  const settle = (err) => {
+    if (settled) return;
+    settled = true;
+    conn.off("ready", onReady);
+    if (err) {
+      conn.once("close", () => conn.off("error", onError));
+    } else {
+      conn.off("error", onError);
+    }
+    conn.off("close", onClose);
+    options2.signal?.removeEventListener("abort", onAbort);
+    if (err) reject(err);
+    else resolve(conn);
+  };
+  const onReady = () => settle();
+  const onError = (err) => {
+    if (settled) return;
+    settle(err);
+    conn.end();
+  };
+  const onClose = () => {
+    settle(new SSHError("SSH \u8FDE\u63A5\u5728\u63E1\u624B\u5B8C\u6210\u524D\u5173\u95ED"));
+    conn.off("error", onError);
+  };
+  const onAbort = () => {
+    settle(new AutoDLError("\u64CD\u4F5C\u5DF2\u53D6\u6D88"));
+    conn.destroy();
+  };
+  conn.once("ready", onReady);
+  conn.on("error", onError);
+  conn.once("close", onClose);
+  options2.signal?.addEventListener("abort", onAbort, { once: true });
+  try {
     conn.connect({
       host: creds.host,
       port: creds.port,
       username: creds.user,
       password: creds.password,
       readyTimeout: options2.connectTimeoutMs ?? 3e4,
-      keepaliveInterval: options2.keepaliveIntervalMs ?? 15e3,
-      // AutoDL's proxy hosts reuse addresses across instances, so a known_hosts
-      // check would fail constantly and teach users to ignore warnings.
-      algorithms: void 0
+      keepaliveInterval: options2.keepaliveIntervalMs ?? 15e3
     });
-  });
+  } catch (err) {
+    onError(err instanceof Error ? err : new Error(String(err)));
+  }
+  return promise;
 }
 async function withSSH(client, uuid, fn, options2 = {}) {
+  const conn = await connectSSH(client, uuid, options2);
+  const creds = conn._creds;
+  try {
+    if (!creds) throw new SSHError("SSH \u8FDE\u63A5\u7F3A\u5C11\u51ED\u8BC1\u4E0A\u4E0B\u6587", { details: { uuid } });
+    return await fn(conn, creds);
+  } finally {
+    delete conn._creds;
+    conn.end();
+  }
+}
+async function connectSSH(client, uuid, options2 = {}) {
   let lastError;
   const attempts = Math.max(1, options2.connectAttempts ?? 3);
   for (let attempt = 0; attempt < attempts; attempt++) {
+    assertNotAborted(options2.signal);
     if (attempt > 0) {
       note(t("ssh.refreshing"));
-      await delay(RETRY_DELAYS_MS[attempt - 1] ?? RETRY_DELAYS_MS.at(-1) ?? 5e3);
+      await delay(RETRY_DELAYS_MS[attempt - 1] ?? RETRY_DELAYS_MS.at(-1) ?? 5e3, void 0, {
+        signal: options2.signal
+      });
     }
     const creds = await getCredentials(client, uuid, options2);
-    let conn;
+    assertNotAborted(options2.signal);
     try {
-      conn = await connectOnce(creds, options2);
+      const conn = await connectOnce(creds, options2);
+      conn._creds = creds;
+      return conn;
     } catch (err) {
+      assertNotAborted(options2.signal);
+      if (err instanceof Error && "level" in err && err.level === "client-authentication") {
+        throw new SSHError("SSH \u8BA4\u8BC1\u5931\u8D25\uFF0C\u8BF7\u91CD\u65B0\u83B7\u53D6\u5B9E\u4F8B\u51ED\u8BC1", { cause: err });
+      }
       lastError = err;
       debug(`SSH \u8FDE\u63A5 ${creds.host}:${creds.port} \u5931\u8D25\uFF1A${err.message}`);
-      continue;
-    }
-    try {
-      return await fn(conn, creds);
-    } finally {
-      conn.end();
     }
   }
   throw new SSHError(`\u65E0\u6CD5\u8FDE\u63A5\u5230\u5B9E\u4F8B ${uuid}\uFF08\u5DF2\u5C1D\u8BD5 ${attempts} \u6B21\uFF09`, {
@@ -1164,6 +1204,9 @@ async function withSSH(client, uuid, fn, options2 = {}) {
 function shellQuote(value) {
   return `'${value.replace(/'/g, `'\\''`)}'`;
 }
+function assertNotAborted(signal) {
+  if (signal?.aborted) throw new AutoDLError("\u64CD\u4F5C\u5DF2\u53D6\u6D88");
+}
 
 // src/ssh/exec.ts
 function buildCommand(command, options2) {
@@ -1362,6 +1405,7 @@ export {
   SSHError,
   toAutoDLError,
   isAuthError,
+  configDir,
   configPath,
   readConfig,
   writeConfig,
@@ -1420,6 +1464,8 @@ export {
   waitForShutdown,
   getCredentials,
   withSSH,
+  connectSSH,
+  assertNotAborted,
   execOnConnection,
   execCommand,
   buildTTLSnippet,
@@ -1429,4 +1475,4 @@ export {
   recordTTL,
   sweepExpired
 };
-//# sourceMappingURL=chunk-6QR4ZYQR.js.map
+//# sourceMappingURL=chunk-GHJVQKKC.js.map

package/dist/{chunk-LHDSN4DL.js → chunk-JOOIUQLJ.js}

@@ -4,7 +4,7 @@ const require = __nodeCreateRequire(import.meta.url);
 import {
   createContext,
   runOpportunisticSweep
-} from "./chunk-NBWWTYSL.js";
+} from "./chunk-VEDMEYCW.js";
 import {
   ExitCode,
   UsageError,
@@ -14,7 +14,7 @@ import {
   resolveLang,
   setLang,
   toAutoDLError
-} from "./chunk-6QR4ZYQR.js";
+} from "./chunk-GHJVQKKC.js";
 
 // src/commands/helpers.ts
 import { confirm, isCancel } from "@clack/prompts";
@@ -70,6 +70,12 @@ function bareAction(handler) {
     const command = args[args.length - 1];
     const globals = globalsOf(command);
     try {
+      configureOutput({
+        json: globals.json ?? false,
+        color: globals.color ?? true,
+        verbose: globals.verbose ?? false
+      });
+      setLang(resolveLang(globals.lang));
       const code = await handler(globals, ...args);
       process.exitCode = typeof code === "number" ? code : ExitCode.OK;
     } catch (err) {
@@ -106,7 +112,7 @@ function assertInteractive(json) {
 }
 async function launchTui(globals) {
   assertInteractive(globals.json === true);
-  const { runTui } = await import("./app-4PY7NE53.js");
+  const { runTui } = await import("./app-V5GCG3MC.js");
   await runTui({
     ...globals.token ? { token: globals.token } : {},
     ...globals.baseUrl ? { baseUrl: globals.baseUrl } : {}
@@ -131,4 +137,4 @@ export {
   launchTui,
   registerTuiCommand
 };
-//# sourceMappingURL=chunk-LHDSN4DL.js.map
+//# sourceMappingURL=chunk-JOOIUQLJ.js.map

package/dist/{chunk-5RZ4Q7T4.js → chunk-MWYYK755.js}

@@ -15,10 +15,10 @@ import {
   parseCudaVersion,
   resolveGpuSpec,
   resolveRegion
-} from "./chunk-CWCG3MOC.js";
+} from "./chunk-WN2CXPD2.js";
 import {
   createContext
-} from "./chunk-NBWWTYSL.js";
+} from "./chunk-VEDMEYCW.js";
 import {
   AutoDLError,
   BudgetError,
@@ -56,7 +56,7 @@ import {
   waitForShutdown,
   warn,
   withSSH
-} from "./chunk-6QR4ZYQR.js";
+} from "./chunk-GHJVQKKC.js";
 
 // src/core/endpoints/image.ts
 async function saveImage(client, instanceUuid, imageName) {
@@ -1455,4 +1455,4 @@ export {
   connectInteractive,
   formatSSHCommand
 };
-//# sourceMappingURL=chunk-5RZ4Q7T4.js.map
+//# sourceMappingURL=chunk-MWYYK755.js.map

package/dist/{chunk-NBWWTYSL.js → chunk-VEDMEYCW.js}

@@ -10,7 +10,7 @@ import {
   resolveToken,
   setLang,
   sweepExpired
-} from "./chunk-6QR4ZYQR.js";
+} from "./chunk-GHJVQKKC.js";
 
 // src/context.ts
 function createContext(options = {}) {
@@ -43,4 +43,4 @@ export {
   createContext,
   runOpportunisticSweep
 };
-//# sourceMappingURL=chunk-NBWWTYSL.js.map
+//# sourceMappingURL=chunk-VEDMEYCW.js.map

package/dist/{chunk-CWCG3MOC.js → chunk-WN2CXPD2.js}

@@ -4,11 +4,12 @@ const require = __nodeCreateRequire(import.meta.url);
 import {
   UsageError,
   debug,
+  isAuthError,
   normalizeBalance,
   note,
   warn,
   yuanToMilli
-} from "./chunk-6QR4ZYQR.js";
+} from "./chunk-GHJVQKKC.js";
 
 // src/core/catalog.ts
 var GPU_SPECS = [
@@ -335,6 +336,10 @@ async function getStockByRegion(client, options = {}) {
   );
   const snapshots = [];
   const failures = [];
+  const authFailure = settled.find(
+    (result) => result.status === "rejected" && isAuthError(result.reason)
+  );
+  if (authFailure?.status === "rejected") throw authFailure.reason;
   settled.forEach((result, index) => {
     const region = targets[index];
     if (!region) return;
@@ -430,4 +435,4 @@ export {
   chooseRegions,
   VERSION
 };
-//# sourceMappingURL=chunk-CWCG3MOC.js.map
+//# sourceMappingURL=chunk-WN2CXPD2.js.map