@okx_ai/okx-trade-cli 1.2.8-beta.1 → 1.2.8-beta.3

package/dist/index.js

@@ -4,7 +4,7 @@
 import { createRequire as createRequire3 } from "module";
 
 // ../core/dist/index.js
-import { Agent, ProxyAgent } from "undici";
+import { ProxyAgent } from "undici";
 import { createHmac } from "crypto";
 import fs from "fs";
 import path from "path";
@@ -847,13 +847,6 @@ import * as fs3 from "fs";
 import * as path3 from "path";
 import * as os3 from "os";
 import { execFileSync } from "child_process";
-async function resolveDoh(_domain) {
-  return {
-    ip: "47.242.161.22",
-    host: "okexweb.qqhrss.com",
-    ttl: 120
-  };
-}
 function getNow() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
@@ -1072,61 +1065,12 @@ var OkxRestClient = class {
   config;
   rateLimiter;
   dispatcher;
-  // DoH proxy state (lazy-resolved on first request)
-  dohResolverFn;
-  dohResolved = false;
-  dohNode = null;
-  dohAgent = null;
-  dohBaseUrl = null;
-  /**
-   * @param config - OKX API client configuration
-   * @param options - Optional overrides (e.g. custom DoH resolver for testing).
-   *                  Pass `{ resolveDoh: null }` to disable DoH entirely.
-   */
-  constructor(config, options) {
+  constructor(config) {
     this.config = config;
     this.rateLimiter = new RateLimiter(3e4, config.verbose);
     if (config.proxyUrl) {
       this.dispatcher = new ProxyAgent(config.proxyUrl);
     }
-    this.dohResolverFn = options?.resolveDoh !== void 0 ? options.resolveDoh : resolveDoh;
-  }
-  /**
-   * Lazily resolve the DoH proxy node on the first request.
-   * Skipped entirely when the user has configured proxy_url or DoH is disabled.
-   * On failure, silently falls back to direct connection.
-   */
-  async ensureDoh() {
-    if (this.dohResolved || this.dispatcher || !this.dohResolverFn) return;
-    this.dohResolved = true;
-    try {
-      const { hostname, protocol } = new URL(this.config.baseUrl);
-      const node = await this.dohResolverFn(hostname);
-      if (node) {
-        this.dohNode = node;
-        this.dohBaseUrl = `${protocol}//${node.host}`;
-        this.dohAgent = new Agent({
-          connect: {
-            lookup: (_hostname, options, callback) => {
-              if (options?.all) {
-                callback(null, [{ address: node.ip, family: 4 }]);
-              } else {
-                callback(null, node.ip, 4);
-              }
-            }
-          }
-        });
-        if (this.config.verbose) {
-          vlog(`DoH proxy active: ${hostname} \u2192 ${node.host} (${node.ip}), ttl=${node.ttl}s`);
-        }
-      }
-    } catch (err) {
-      if (this.config.verbose) {
-        const cause = err instanceof Error ? err.message : String(err);
-        vlog(`DoH resolution failed, falling back to direct: ${cause}`);
-      }
-      this.dohNode = null;
-    }
   }
   logRequest(method, url, auth) {
     if (!this.config.verbose) return;
@@ -1270,11 +1214,9 @@ var OkxRestClient = class {
     };
   }
   async request(reqConfig) {
-    await this.ensureDoh();
     const queryString = buildQueryString(reqConfig.query);
     const requestPath = queryString.length > 0 ? `${reqConfig.path}?${queryString}` : reqConfig.path;
-    const baseUrl = this.dohNode ? this.dohBaseUrl : this.config.baseUrl;
-    const url = `${baseUrl}${requestPath}`;
+    const url = `${this.config.baseUrl}${requestPath}`;
     const bodyJson = reqConfig.body ? JSON.stringify(reqConfig.body) : "";
     const timestamp = getNow();
     this.logRequest(reqConfig.method, url, reqConfig.auth);
@@ -1285,9 +1227,7 @@ var OkxRestClient = class {
       "Content-Type": "application/json",
       Accept: "application/json"
     });
-    if (this.dohNode) {
-      headers.set("User-Agent", "OKX/2.7.2");
-    } else if (this.config.userAgent) {
+    if (this.config.userAgent) {
       headers.set("User-Agent", this.config.userAgent);
     }
     if (reqConfig.auth === "private") {
@@ -1307,8 +1247,6 @@ var OkxRestClient = class {
       };
       if (this.dispatcher) {
         fetchOptions.dispatcher = this.dispatcher;
-      } else if (this.dohAgent) {
-        fetchOptions.dispatcher = this.dohAgent;
       }
       response = await fetch(url, fetchOptions);
     } catch (error) {
@@ -7037,6 +6975,22 @@ function isNewerVersion(current, latest) {
   if (lMin !== cMin) return lMin > cMin;
   return lPat > cPat;
 }
+async function fetchDistTags(packageName) {
+  try {
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), 3e3);
+    const res = await fetch(`https://registry.npmjs.org/${encodeURIComponent(packageName)}`, {
+      signal: controller.signal,
+      headers: { accept: "application/json" }
+    });
+    clearTimeout(timeout);
+    if (!res.ok) return null;
+    const data = await res.json();
+    return data["dist-tags"] ?? null;
+  } catch {
+    return null;
+  }
+}
 async function fetchLatestVersion(packageName) {
   try {
     const controller = new AbortController();
@@ -7838,7 +7792,7 @@ async function cmdDiagnoseMcp(options = {}) {
 
 // src/commands/diagnose.ts
 var CLI_VERSION = readCliVersion();
-var GIT_HASH = true ? "b691d23" : "dev";
+var GIT_HASH = true ? "43f321d" : "dev";
 function maskKey2(key) {
   if (!key) return "(not set)";
   if (key.length <= 8) return "****";
@@ -8133,6 +8087,109 @@ async function runCliChecks(config, profile, outputPath) {
   writeReportIfRequested(report, outputPath);
 }
 
+// src/commands/upgrade.ts
+import { spawnSync as spawnSync2 } from "child_process";
+import { readFileSync as readFileSync4, writeFileSync as writeFileSync4, mkdirSync as mkdirSync4 } from "fs";
+import { dirname as dirname3, join as join4 } from "path";
+import { homedir as homedir4 } from "os";
+var PACKAGES = ["@okx_ai/okx-trade-mcp", "@okx_ai/okx-trade-cli"];
+var CACHE_FILE2 = join4(homedir4(), ".okx", "last_check");
+var THROTTLE_MS = 12 * 60 * 60 * 1e3;
+var NPM_BIN = join4(dirname3(process.execPath), process.platform === "win32" ? "npm.cmd" : "npm");
+function readLastCheck() {
+  try {
+    return parseInt(readFileSync4(CACHE_FILE2, "utf-8").trim(), 10) || 0;
+  } catch {
+    return 0;
+  }
+}
+function writeLastCheck() {
+  try {
+    mkdirSync4(join4(homedir4(), ".okx"), { recursive: true });
+    writeFileSync4(CACHE_FILE2, String(Math.floor(Date.now() / 1e3)), "utf-8");
+  } catch {
+  }
+}
+function printResult(result, json) {
+  if (json) {
+    process.stdout.write(JSON.stringify(result) + "\n");
+  } else {
+    switch (result.status) {
+      case "up-to-date":
+        process.stderr.write(`[ok]    Already up to date: ${result.currentVersion}
+`);
+        break;
+      case "update-available":
+        process.stderr.write(
+          `[info]  Update available: ${result.currentVersion} \u2192 ${result.latestVersion}
+        Run: okx upgrade
+`
+        );
+        break;
+      case "updated":
+        process.stderr.write(`[ok]    Upgraded: ${result.currentVersion} \u2192 ${result.latestVersion}
+`);
+        break;
+      case "error":
+        process.stderr.write(`[error] Failed to fetch latest version from npm registry
+`);
+        break;
+    }
+  }
+}
+function isThrottled(options) {
+  if (options.force || options.check) return false;
+  return Date.now() - readLastCheck() * 1e3 < THROTTLE_MS;
+}
+async function resolveLatestVersion(beta) {
+  if (beta) {
+    const tags = await fetchDistTags("@okx_ai/okx-trade-cli");
+    return tags?.["next"] ?? tags?.["latest"] ?? null;
+  }
+  return fetchLatestVersion("@okx_ai/okx-trade-cli");
+}
+function runNpmInstall(json) {
+  const result = spawnSync2(NPM_BIN, ["install", "-g", ...PACKAGES], {
+    stdio: json ? ["inherit", "ignore", process.stderr] : "inherit",
+    shell: false
+  });
+  return result.status === 0;
+}
+async function cmdUpgrade(currentVersion, options, json) {
+  if (isThrottled(options)) {
+    if (json) {
+      process.stdout.write(
+        JSON.stringify({ currentVersion, latestVersion: currentVersion, status: "up-to-date", updated: false }) + "\n"
+      );
+    }
+    return;
+  }
+  const latestVersion = await resolveLatestVersion(options.beta ?? false);
+  if (!latestVersion) {
+    printResult({ currentVersion, latestVersion: "unknown", status: "error", updated: false }, json);
+    process.exitCode = 1;
+    return;
+  }
+  const stableCurrentVersion = currentVersion.split(/[-+]/)[0] ?? currentVersion;
+  const needsUpdate = options.force || isNewerVersion(stableCurrentVersion, latestVersion);
+  if (!needsUpdate) {
+    if (!options.check) writeLastCheck();
+    printResult({ currentVersion, latestVersion, status: "up-to-date", updated: false }, json);
+    return;
+  }
+  if (options.check) {
+    printResult({ currentVersion, latestVersion, status: "update-available", updated: false }, json);
+    return;
+  }
+  if (runNpmInstall(json)) {
+    writeLastCheck();
+    printResult({ currentVersion, latestVersion, status: "updated", updated: true }, json);
+  } else {
+    printResult({ currentVersion, latestVersion, status: "error", updated: false }, json);
+    process.exitCode = 1;
+  }
+}
+
 // src/config/loader.ts
 function loadProfileConfig(opts) {
   return loadConfig({
@@ -8735,6 +8792,10 @@ var HELP_TREE = {
   diagnose: {
     description: "Run network / MCP server diagnostics",
     usage: "okx diagnose [--cli | --mcp | --all] [--profile <name>] [--demo] [--output <file>]"
+  },
+  upgrade: {
+    description: "Upgrade okx CLI and MCP server to the latest stable version",
+    usage: "okx upgrade [--check] [--beta] [--force] [--json]"
   }
 };
 function printGlobalHelp() {
@@ -8984,6 +9045,9 @@ var CLI_OPTIONS = {
   // audit
   since: { type: "string" },
   tool: { type: "string" },
+  // upgrade
+  beta: { type: "boolean", default: false },
+  check: { type: "boolean", default: false },
   // config profile
   force: { type: "boolean", default: false },
   // onchain-earn
@@ -9325,14 +9389,17 @@ async function cmdAccountBalance(run, ccy, json) {
   const data = getData2(result);
   if (json) return printJson(data);
   const details = data?.[0]?.["details"] ?? [];
-  printTable(
-    details.filter((d) => Number(d["eq"]) > 0).map((d) => ({
-      currency: d["ccy"],
-      equity: d["eq"],
-      available: d["availEq"],
-      frozen: d["frozenBal"]
-    }))
-  );
+  const rows = details.filter((d) => Number(d["eq"]) > 0).map((d) => ({
+    currency: d["ccy"],
+    equity: d["eq"],
+    available: d["availEq"],
+    frozen: d["frozenBal"]
+  }));
+  if (rows.length === 0 && data?.[0]) {
+    printTable([{ currency: "Total", equity: data[0]["totalEq"] ?? "0", available: data[0]["adjEq"] ?? "0", frozen: "-" }]);
+    return;
+  }
+  printTable(rows);
 }
 async function cmdAccountAssetBalance(run, ccy, json, showValuation) {
   const result = await run("account_get_asset_balance", {
@@ -9341,14 +9408,17 @@ async function cmdAccountAssetBalance(run, ccy, json, showValuation) {
   });
   const data = result.data ?? [];
   if (json) return printJson(showValuation ? { data, valuation: result.valuation } : data);
-  printTable(
-    data.filter((r) => Number(r["bal"]) > 0).map((r) => ({
-      ccy: r["ccy"],
-      bal: r["bal"],
-      availBal: r["availBal"],
-      frozenBal: r["frozenBal"]
-    }))
-  );
+  const assetRows = data.filter((r) => Number(r["bal"]) > 0).map((r) => ({
+    ccy: r["ccy"],
+    bal: r["bal"],
+    availBal: r["availBal"],
+    frozenBal: r["frozenBal"]
+  }));
+  if (assetRows.length === 0 && data.length > 0) {
+    outputLine("Total balance: 0");
+  } else {
+    printTable(assetRows);
+  }
   if (showValuation && result.valuation) {
     const valuationData = result.valuation ?? [];
     outputLine("");
@@ -10653,7 +10723,7 @@ function writeCliConfig(config) {
 
 // src/commands/config.ts
 import { createInterface } from "readline";
-import { spawnSync as spawnSync2 } from "child_process";
+import { spawnSync as spawnSync3 } from "child_process";
 var messages = {
   en: {
     title: "OKX Trade CLI \u2014 Configuration Wizard",
@@ -10795,7 +10865,7 @@ function tryOpenUrl(url) {
     } else {
       opener = "xdg-open";
     }
-    spawnSync2(opener, [url], { stdio: "ignore", shell: process.platform === "win32" });
+    spawnSync3(opener, [url], { stdio: "ignore", shell: process.platform === "win32" });
   } catch {
   }
 }
@@ -11693,7 +11763,7 @@ async function cmdDcdQuoteAndBuy(run, opts) {
 // src/index.ts
 var _require3 = createRequire3(import.meta.url);
 var CLI_VERSION2 = _require3("../package.json").version;
-var GIT_HASH2 = true ? "b691d23" : "dev";
+var GIT_HASH2 = true ? "43f321d" : "dev";
 function handleConfigCommand(action, rest, json, lang, force) {
   if (action === "init") return cmdConfigInit(lang === "zh" ? "zh" : "en");
   if (action === "show") return cmdConfigShow(json);
@@ -12485,6 +12555,7 @@ async function main() {
   const json = v.json ?? false;
   if (module === "config") return handleConfigCommand(action, rest, json, v.lang, v.force);
   if (module === "setup") return handleSetupCommand(v);
+  if (module === "upgrade") return cmdUpgrade(CLI_VERSION2, { beta: v.beta, check: v.check, force: v.force }, json);
   if (module === "diagnose") {
     let config2;
     try {