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

package/dist/index.js

@@ -4,25 +4,30 @@
 import { createRequire as createRequire3 } from "module";
 
 // ../core/dist/index.js
-import { ProxyAgent } from "undici";
+import { Agent, ProxyAgent } from "undici";
+import { unlink } from "fs/promises";
+import { execFile } from "child_process";
+import { access, constants } from "fs/promises";
+import { homedir } from "os";
+import { join } from "path";
 import { createHmac } from "crypto";
 import fs from "fs";
 import path from "path";
 import os from "os";
 import { writeFileSync, renameSync, unlinkSync, mkdirSync } from "fs";
-import { join, resolve, basename, sep } from "path";
+import { join as join2, resolve, basename, sep } from "path";
 import { randomUUID } from "crypto";
 import yauzl from "yauzl";
 import { createWriteStream, mkdirSync as mkdirSync2 } from "fs";
 import { resolve as resolve2, dirname } from "path";
 import { readFileSync, existsSync } from "fs";
-import { join as join2 } from "path";
+import { join as join3 } from "path";
 import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync as mkdirSync3, existsSync as existsSync2 } from "fs";
-import { join as join3, dirname as dirname2 } from "path";
-import { homedir } from "os";
-import { readFileSync as readFileSync3, writeFileSync as writeFileSync3, mkdirSync as mkdirSync4, existsSync as existsSync3 } from "fs";
-import { join as join4, dirname as dirname3 } from "path";
+import { join as join4, dirname as dirname2 } from "path";
 import { homedir as homedir2 } from "os";
+import { readFileSync as readFileSync3, writeFileSync as writeFileSync3, mkdirSync as mkdirSync4, existsSync as existsSync3 } from "fs";
+import { join as join5, dirname as dirname3 } from "path";
+import { homedir as homedir3 } from "os";
 
 // ../../node_modules/.pnpm/smol-toml@1.6.0/node_modules/smol-toml/dist/error.js
 function getLineColFromPtr(string, ptr) {
@@ -852,12 +857,66 @@ function stringify(obj, { maxDepth = 1e3, numbersAsFloat = false } = {}) {
 
 // ../core/dist/index.js
 import { readFileSync as readFileSync4, writeFileSync as writeFileSync4, mkdirSync as mkdirSync5, existsSync as existsSync4 } from "fs";
-import { join as join5 } from "path";
-import { homedir as homedir3 } from "os";
+import { join as join6 } from "path";
+import { homedir as homedir4 } from "os";
 import * as fs3 from "fs";
 import * as path3 from "path";
 import * as os3 from "os";
 import { execFileSync } from "child_process";
+var EXEC_TIMEOUT_MS = 15e3;
+var DOH_BIN_DIR = join(homedir(), ".okx", "bin");
+var DOH_CACHE_FILE = join(homedir(), ".okx", ".doh-cache.json");
+function getDohBinaryPath() {
+  if (process.env.OKX_DOH_BINARY_PATH) {
+    return process.env.OKX_DOH_BINARY_PATH;
+  }
+  const ext = process.platform === "win32" ? ".exe" : "";
+  return join(DOH_BIN_DIR, `okx-doh-resolver${ext}`);
+}
+function getDohCachePath() {
+  return DOH_CACHE_FILE;
+}
+async function dohBinaryExists() {
+  try {
+    const flag = process.platform === "win32" ? constants.F_OK : constants.X_OK;
+    await access(getDohBinaryPath(), flag);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function execDohBinary(domain) {
+  const binPath = getDohBinaryPath();
+  return new Promise((resolve3) => {
+    execFile(
+      binPath,
+      ["--domain", domain],
+      { timeout: EXEC_TIMEOUT_MS, encoding: "utf-8" },
+      (error, stdout) => {
+        if (error) {
+          resolve3(null);
+          return;
+        }
+        try {
+          const result = JSON.parse(stdout);
+          if (result.code === 0 && result.data) {
+            resolve3(result.data);
+          } else {
+            resolve3(null);
+          }
+        } catch {
+          resolve3(null);
+        }
+      }
+    );
+  });
+}
+async function resolveDoh(domain) {
+  if (!await dohBinaryExists()) {
+    return null;
+  }
+  return execDohBinary(domain);
+}
 function getNow() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
@@ -1076,12 +1135,80 @@ var OkxRestClient = class _OkxRestClient {
   config;
   rateLimiter;
   dispatcher;
-  constructor(config) {
+  // 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) {
     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) return;
+      if (node.ip === hostname) {
+        if (this.config.verbose) {
+          vlog(`DoH: resolved ip matches hostname (${hostname}), using direct connection`);
+        }
+        return;
+      }
+      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}`);
+      }
+    }
+  }
+  /**
+   * Invalidate DoH state and delete the binary's cache file so the next
+   * resolution performs a fresh lookup.  Called on network-level failures
+   * when a DoH proxy node was in use.
+   */
+  async invalidateDoh() {
+    this.dohNode = null;
+    this.dohAgent = null;
+    this.dohBaseUrl = null;
+    this.dohResolved = false;
+    try {
+      await unlink(getDohCachePath());
+    } catch {
+    }
   }
   logRequest(method, url, auth) {
     if (!this.config.verbose) return;
@@ -1252,13 +1379,18 @@ var OkxRestClient = class _OkxRestClient {
    * Security: validates Content-Type and enforces maxBytes limit.
    */
   async privatePostBinary(path42, body, opts) {
+    await this.ensureDoh();
     const maxBytes = opts?.maxBytes ?? _OkxRestClient.DEFAULT_MAX_BYTES;
     const expectedCT = opts?.expectedContentType ?? "application/octet-stream";
     const bodyJson = body ? JSON.stringify(body) : "";
     const endpoint = `POST ${path42}`;
-    this.logRequest("POST", `${this.config.baseUrl}${path42}`, "private");
+    const baseUrl = this.dohNode ? this.dohBaseUrl : this.config.baseUrl;
+    this.logRequest("POST", `${baseUrl}${path42}`, "private");
     const reqConfig = { method: "POST", path: path42, auth: "private" };
     const headers = this.buildHeaders(reqConfig, path42, bodyJson, getNow());
+    if (this.dohNode) {
+      headers.set("User-Agent", "OKX/2.7.2");
+    }
     const t0 = Date.now();
     const response = await this.fetchBinary(path42, endpoint, headers, bodyJson, t0);
     const elapsed = Date.now() - t0;
@@ -1288,14 +1420,19 @@ var OkxRestClient = class _OkxRestClient {
   /** Execute fetch for binary endpoint, wrapping network errors. */
   async fetchBinary(path42, endpoint, headers, bodyJson, t0) {
     try {
+      const baseUrl = this.dohNode ? this.dohBaseUrl : this.config.baseUrl;
       const fetchOptions = {
         method: "POST",
         headers,
         body: bodyJson || void 0,
         signal: AbortSignal.timeout(this.config.timeoutMs)
       };
-      if (this.dispatcher) fetchOptions.dispatcher = this.dispatcher;
-      return await fetch(`${this.config.baseUrl}${path42}`, fetchOptions);
+      if (this.dispatcher) {
+        fetchOptions.dispatcher = this.dispatcher;
+      } else if (this.dohAgent) {
+        fetchOptions.dispatcher = this.dohAgent;
+      }
+      return await fetch(`${baseUrl}${path42}`, fetchOptions);
     } catch (error) {
       if (this.config.verbose) {
         vlog(`\u2717 NetworkError after ${Date.now() - t0}ms: ${error instanceof Error ? error.message : String(error)}`);
@@ -1326,9 +1463,11 @@ var OkxRestClient = class _OkxRestClient {
   // JSON request
   // ---------------------------------------------------------------------------
   async request(reqConfig) {
+    await this.ensureDoh();
     const queryString = buildQueryString(reqConfig.query);
     const requestPath = queryString.length > 0 ? `${reqConfig.path}?${queryString}` : reqConfig.path;
-    const url = `${this.config.baseUrl}${requestPath}`;
+    const baseUrl = this.dohNode ? this.dohBaseUrl : this.config.baseUrl;
+    const url = `${baseUrl}${requestPath}`;
     const bodyJson = reqConfig.body ? JSON.stringify(reqConfig.body) : "";
     const timestamp = getNow();
     this.logRequest(reqConfig.method, url, reqConfig.auth);
@@ -1336,6 +1475,9 @@ var OkxRestClient = class _OkxRestClient {
       await this.rateLimiter.consume(reqConfig.rateLimit);
     }
     const headers = this.buildHeaders(reqConfig, requestPath, bodyJson, timestamp);
+    if (this.dohNode) {
+      headers.set("User-Agent", "OKX/2.7.2");
+    }
     const t0 = Date.now();
     let response;
     try {
@@ -1347,9 +1489,18 @@ var OkxRestClient = class _OkxRestClient {
       };
       if (this.dispatcher) {
         fetchOptions.dispatcher = this.dispatcher;
+      } else if (this.dohAgent) {
+        fetchOptions.dispatcher = this.dohAgent;
       }
       response = await fetch(url, fetchOptions);
     } catch (error) {
+      if (this.dohNode) {
+        if (this.config.verbose) {
+          vlog(`DoH request failed, invalidating cache and retrying: ${error instanceof Error ? error.message : String(error)}`);
+        }
+        await this.invalidateDoh();
+        return this.request(reqConfig);
+      }
       if (this.config.verbose) {
         const elapsed2 = Date.now() - t0;
         const cause = error instanceof Error ? error.message : String(error);
@@ -2975,7 +3126,7 @@ function safeWriteFile(targetDir, fileName, data) {
     throw new Error(`Invalid file name: "${fileName}"`);
   }
   const resolvedDir = resolve(targetDir);
-  const filePath = join(resolvedDir, safeName);
+  const filePath = join2(resolvedDir, safeName);
   const resolvedPath = resolve(filePath);
   if (!resolvedPath.startsWith(resolvedDir + sep)) {
     throw new Error(`Path traversal detected: "${fileName}" resolves outside target directory`);
@@ -3091,7 +3242,7 @@ async function extractSkillZip(zipPath, targetDir, limits) {
   });
 }
 function readMetaJson(contentDir) {
-  const metaPath = join2(contentDir, "_meta.json");
+  const metaPath = join3(contentDir, "_meta.json");
   if (!existsSync(metaPath)) {
     throw new Error(`_meta.json not found in ${contentDir}. Invalid skill package.`);
   }
@@ -3117,12 +3268,12 @@ function readMetaJson(contentDir) {
   };
 }
 function validateSkillMdExists(contentDir) {
-  const skillMdPath = join2(contentDir, "SKILL.md");
+  const skillMdPath = join3(contentDir, "SKILL.md");
   if (!existsSync(skillMdPath)) {
     throw new Error(`SKILL.md not found in ${contentDir}. Invalid skill package.`);
   }
 }
-var DEFAULT_REGISTRY_PATH = join3(homedir(), ".okx", "skills", "registry.json");
+var DEFAULT_REGISTRY_PATH = join4(homedir2(), ".okx", "skills", "registry.json");
 function readRegistry(registryPath = DEFAULT_REGISTRY_PATH) {
   if (!existsSync2(registryPath)) {
     return { version: 1, skills: {} };
@@ -7254,7 +7405,7 @@ function createToolRunner(client, config) {
   };
 }
 function configFilePath() {
-  return join4(homedir2(), ".okx", "config.toml");
+  return join5(homedir3(), ".okx", "config.toml");
 }
 function readFullConfig() {
   const path42 = configFilePath();
@@ -7405,7 +7556,7 @@ function loadConfig(cli) {
     verbose: cli.verbose ?? false
   };
 }
-var CACHE_FILE = join5(homedir3(), ".okx", "update-check.json");
+var CACHE_FILE = join6(homedir4(), ".okx", "update-check.json");
 var CHECK_INTERVAL_MS = 24 * 60 * 60 * 1e3;
 function readCache() {
   try {
@@ -7418,7 +7569,7 @@ function readCache() {
 }
 function writeCache(cache) {
   try {
-    mkdirSync5(join5(homedir3(), ".okx"), { recursive: true });
+    mkdirSync5(join6(homedir4(), ".okx"), { recursive: true });
     writeFileSync4(CACHE_FILE, JSON.stringify(cache, null, 2), "utf-8");
   } catch {
   }
@@ -8248,7 +8399,7 @@ async function cmdDiagnoseMcp(options = {}) {
 
 // src/commands/diagnose.ts
 var CLI_VERSION = readCliVersion();
-var GIT_HASH = true ? "e46af2f" : "dev";
+var GIT_HASH = true ? "53b8eb6" : "dev";
 function maskKey2(key) {
   if (!key) return "(not set)";
   if (key.length <= 8) return "****";
@@ -8546,12 +8697,12 @@ async function runCliChecks(config, profile, outputPath) {
 // src/commands/upgrade.ts
 import { spawnSync as spawnSync2 } from "child_process";
 import { readFileSync as readFileSync6, writeFileSync as writeFileSync6, mkdirSync as mkdirSync7 } from "fs";
-import { dirname as dirname5, join as join7 } from "path";
-import { homedir as homedir5 } from "os";
+import { dirname as dirname5, join as join8 } from "path";
+import { homedir as homedir6 } from "os";
 var PACKAGES = ["@okx_ai/okx-trade-mcp", "@okx_ai/okx-trade-cli"];
-var CACHE_FILE2 = join7(homedir5(), ".okx", "last_check");
+var CACHE_FILE2 = join8(homedir6(), ".okx", "last_check");
 var THROTTLE_MS = 12 * 60 * 60 * 1e3;
-var NPM_BIN = join7(dirname5(process.execPath), process.platform === "win32" ? "npm.cmd" : "npm");
+var NPM_BIN = join8(dirname5(process.execPath), process.platform === "win32" ? "npm.cmd" : "npm");
 function readLastCheck() {
   try {
     return parseInt(readFileSync6(CACHE_FILE2, "utf-8").trim(), 10) || 0;
@@ -8561,7 +8712,7 @@ function readLastCheck() {
 }
 function writeLastCheck() {
   try {
-    mkdirSync7(join7(homedir5(), ".okx"), { recursive: true });
+    mkdirSync7(join8(homedir6(), ".okx"), { recursive: true });
     writeFileSync6(CACHE_FILE2, String(Math.floor(Date.now() / 1e3)), "utf-8");
   } catch {
   }
@@ -12260,13 +12411,13 @@ async function cmdDcdQuoteAndBuy(run, opts) {
 }
 
 // src/commands/skill.ts
-import { tmpdir, homedir as homedir7 } from "os";
-import { join as join9, dirname as dirname6 } from "path";
+import { tmpdir, homedir as homedir8 } from "os";
+import { join as join10, dirname as dirname6 } from "path";
 import { mkdirSync as mkdirSync8, rmSync, existsSync as existsSync7, copyFileSync as copyFileSync2 } from "fs";
 import { execFileSync as execFileSync2 } from "child_process";
 import { randomUUID as randomUUID2 } from "crypto";
 function resolveNpx() {
-  const sibling = join9(dirname6(process.execPath), "npx");
+  const sibling = join10(dirname6(process.execPath), "npx");
   if (existsSync7(sibling)) return sibling;
   return "npx";
 }
@@ -12319,13 +12470,13 @@ async function cmdSkillCategories(run, json) {
   outputLine("");
 }
 async function cmdSkillAdd(name, config, json) {
-  const tmpBase = join9(tmpdir(), `okx-skill-${randomUUID2()}`);
+  const tmpBase = join10(tmpdir(), `okx-skill-${randomUUID2()}`);
   mkdirSync8(tmpBase, { recursive: true });
   try {
     outputLine(`Downloading ${name}...`);
     const client = new OkxRestClient(config);
     const zipPath = await downloadSkillZip(client, name, tmpBase);
-    const contentDir = await extractSkillZip(zipPath, join9(tmpBase, "content"));
+    const contentDir = await extractSkillZip(zipPath, join10(tmpBase, "content"));
     const meta = readMetaJson(contentDir);
     validateSkillMdExists(contentDir);
     outputLine("Installing to detected agents...");
@@ -12335,7 +12486,7 @@ async function cmdSkillAdd(name, config, json) {
         timeout: 6e4
       });
     } catch (e) {
-      const savedZip = join9(process.cwd(), `${name}.zip`);
+      const savedZip = join10(process.cwd(), `${name}.zip`);
       try {
         copyFileSync2(zipPath, savedZip);
       } catch {
@@ -12378,7 +12529,7 @@ function cmdSkillRemove(name, json) {
       timeout: 6e4
     });
   } catch {
-    const agentsPath = join9(homedir7(), ".agents", "skills", name);
+    const agentsPath = join10(homedir8(), ".agents", "skills", name);
     try {
       rmSync(agentsPath, { recursive: true, force: true });
     } catch {
@@ -12446,7 +12597,7 @@ function cmdSkillList(json) {
 // src/index.ts
 var _require3 = createRequire3(import.meta.url);
 var CLI_VERSION2 = _require3("../package.json").version;
-var GIT_HASH2 = true ? "e46af2f" : "dev";
+var GIT_HASH2 = true ? "53b8eb6" : "dev";
 function handleConfigCommand(action, rest, json, lang, force) {
   if (action === "init") return cmdConfigInit(lang === "zh" ? "zh" : "en");
   if (action === "show") return cmdConfigShow(json);