siluzan-tso-cli 1.1.30-beta.2 → 1.1.30-beta.3

package/README.md

@@ -51,7 +51,7 @@ siluzan-tso init -d /path/to/skills  # 写入自定义目录
 siluzan-tso init --force             # 强制覆盖已存在文件
 ```
 
-> **注意**：当前为测试版（1.1.30-beta.2），供内部测试使用。正式发布后安装命令将改为 `npm install -g siluzan-tso-cli`。
+> **注意**：当前为测试版（1.1.30-beta.3），供内部测试使用。正式发布后安装命令将改为 `npm install -g siluzan-tso-cli`。
 
 | 助手                    | 建议 `--ai`                          |
 | ----------------------- | ------------------------------------ |

package/dist/index.js

@@ -2119,6 +2119,62 @@ function validateBaseUrl(raw) {
   }
   return null;
 }
+function hasSiluzanAgentCredentials() {
+  const apiKey = process.env.SILUZAN_API_KEY?.trim();
+  const authToken = process.env.SILUZAN_AUTH_TOKEN?.trim();
+  return Boolean(apiKey || authToken);
+}
+function isSiluzanAgentEnv() {
+  const raw = process.env.IS_SILUZAN_AGENT_ENV?.trim().toLowerCase();
+  return raw === "true" || raw === "1";
+}
+function skipAuthSetupInAgentEnv(commandLabel) {
+  if (!isSiluzanAgentEnv()) return false;
+  if (hasSiluzanAgentCredentials()) {
+    console.log(
+      `
+\u2139\uFE0F  \u68C0\u6D4B\u5230 Siluzan Agent \u73AF\u5883\uFF08IS_SILUZAN_AGENT_ENV=true\uFF09\uFF0C\u51ED\u636E\u5DF2\u7531\u6C99\u7BB1\u6CE8\u5165\uFF0C\u65E0\u9700\u6267\u884C ${commandLabel}\u3002
+`
+    );
+  } else {
+    console.log(
+      `
+\u2139\uFE0F  \u68C0\u6D4B\u5230 Siluzan Agent \u73AF\u5883\uFF08IS_SILUZAN_AGENT_ENV=true\uFF09\u3002
+   ${commandLabel} \u5DF2\u8DF3\u8FC7\uFF1B\u8BF7\u7531 Agent \u6C99\u7BB1\u6CE8\u5165 SILUZAN_API_KEY \u6216 SILUZAN_AUTH_TOKEN\u3002
+`
+    );
+  }
+  return true;
+}
+function trimOrUndefined(value) {
+  const trimmed = value?.trim();
+  return trimmed ? trimmed : void 0;
+}
+function resolveAgentEnvCredentials() {
+  const envToken = trimOrUndefined(process.env.SILUZAN_AUTH_TOKEN);
+  if (envToken) return { authToken: envToken, apiKey: void 0 };
+  const envApiKey = trimOrUndefined(process.env.SILUZAN_API_KEY);
+  if (envApiKey) return { authToken: "", apiKey: envApiKey };
+  return { authToken: "", apiKey: void 0 };
+}
+function resolveSiluzanCredentials(opts) {
+  if (isSiluzanAgentEnv()) {
+    return resolveAgentEnvCredentials();
+  }
+  const apiKey = trimOrUndefined(process.env.SILUZAN_API_KEY) ?? trimOrUndefined(opts.configApiKey);
+  const authToken = trimOrUndefined(opts.tokenArg) ?? trimOrUndefined(process.env.SILUZAN_AUTH_TOKEN) ?? trimOrUndefined(opts.configAuthToken) ?? "";
+  return { authToken, apiKey };
+}
+function resolveRequestAuth(config) {
+  if (isSiluzanAgentEnv()) {
+    return resolveAgentEnvCredentials();
+  }
+  return { authToken: config.authToken, apiKey: config.apiKey };
+}
+function buildSiluzanAuthHeaders(config) {
+  const auth = resolveRequestAuth(config);
+  return auth.apiKey ? { "x-api-key": auth.apiKey } : { Authorization: `Bearer ${auth.authToken}` };
+}
 function isPerfEnabled() {
   const v = process.env.SILUZAN_HTTP_PERF;
   return v === "1" || v === "true";
@@ -2264,15 +2320,17 @@ function redactSensitive(input) {
   );
   return output;
 }
+function buildAuthHeaders(config) {
+  return buildSiluzanAuthHeaders(config);
+}
 async function apiFetch(url, config, options = {}, verbose = false) {
   const method = options.method ?? "GET";
-  const authHeaders2 = config.apiKey ? { "x-api-key": config.apiKey } : { Authorization: `Bearer ${config.authToken}` };
   const reqHeaders = {
     "Content-Type": "application/json",
     "Accept-Language": "zh-CN",
     // 声明支持 gzip/deflate/br；服务端不支持则按 identity 返回，rawRequest 会原样收取
     "Accept-Encoding": "gzip, deflate, br",
-    ...authHeaders2,
+    ...buildAuthHeaders(config),
     // dataPermission 仅 TSO 使用；CSO 未设置时为空字符串，服务端忽略该头
     Datapermission: config.dataPermission ?? "",
     ...options.headers ?? {}
@@ -2300,12 +2358,11 @@ async function apiFetch(url, config, options = {}, verbose = false) {
 }
 async function apiFetchWithHeaders(url, config, options = {}, verbose = false) {
   const method = options.method ?? "GET";
-  const authHeaders2 = config.apiKey ? { "x-api-key": config.apiKey } : { Authorization: `Bearer ${config.authToken}` };
   const reqHeaders = {
     "Content-Type": "application/json",
     "Accept-Language": "zh-CN",
     "Accept-Encoding": "gzip, deflate, br",
-    ...authHeaders2,
+    ...buildAuthHeaders(config),
     Datapermission: config.dataPermission ?? "",
     ...options.headers ?? {}
   };
@@ -2820,33 +2877,6 @@ function installProcessHandlers() {
     process.exit(1);
   });
 }
-function hasSiluzanAgentCredentials() {
-  const apiKey = process.env.SILUZAN_API_KEY?.trim();
-  const authToken = process.env.SILUZAN_AUTH_TOKEN?.trim();
-  return Boolean(apiKey || authToken);
-}
-function isSiluzanAgentEnv() {
-  const raw = process.env.IS_SILUZAN_AGENT_ENV?.trim().toLowerCase();
-  return raw === "true" || raw === "1";
-}
-function skipAuthSetupInAgentEnv(commandLabel) {
-  if (!isSiluzanAgentEnv()) return false;
-  if (hasSiluzanAgentCredentials()) {
-    console.log(
-      `
-\u2139\uFE0F  \u68C0\u6D4B\u5230 Siluzan Agent \u73AF\u5883\uFF08IS_SILUZAN_AGENT_ENV=true\uFF09\uFF0C\u51ED\u636E\u5DF2\u7531\u6C99\u7BB1\u6CE8\u5165\uFF0C\u65E0\u9700\u6267\u884C ${commandLabel}\u3002
-`
-    );
-  } else {
-    console.log(
-      `
-\u2139\uFE0F  \u68C0\u6D4B\u5230 Siluzan Agent \u73AF\u5883\uFF08IS_SILUZAN_AGENT_ENV=true\uFF09\u3002
-   ${commandLabel} \u5DF2\u8DF3\u8FC7\uFF1B\u8BF7\u7531 Agent \u6C99\u7BB1\u6CE8\u5165 SILUZAN_API_KEY \u6216 SILUZAN_AUTH_TOKEN\u3002
-`
-    );
-  }
-  return true;
-}
 function printAuthMissingHelp(binName) {
   if (isSiluzanAgentEnv()) {
     console.error(
@@ -2923,7 +2953,7 @@ function parseMeResponse(text) {
 async function fetchSiluzanCurrentUser(apiBase, config) {
   const mainOrigin = deriveMainApiOrigin(apiBase);
   const meUrl = `${mainOrigin.replace(/\/$/, "")}/query/account/me`;
-  const authHeaders2 = config.apiKey ? { "x-api-key": config.apiKey } : { Authorization: `Bearer ${config.authToken}` };
+  const authHeaders2 = buildSiluzanAuthHeaders(config);
   try {
     const res = await rawRequest(meUrl, {
       method: "GET",
@@ -3704,7 +3734,7 @@ async function fetchDataPermission(mainApiUrl, auth) {
   const headers = {
     "Content-Type": "application/json",
     "Accept-Language": "zh-CN",
-    ...auth.apiKey ? { "x-api-key": auth.apiKey } : { Authorization: `Bearer ${auth.authToken}` }
+    ...buildSiluzanAuthHeaders(auth)
   };
   try {
     const res = await fetch(url, { headers });
@@ -3985,7 +4015,7 @@ async function apiDeleteRaw(url, config, options = {}) {
         "Content-Type": "application/json; charset=utf-8",
         Accept: "application/json, text/plain, */*",
         "Accept-Language": "zh-CN",
-        ...config.apiKey ? { "x-api-key": config.apiKey } : { Authorization: `Bearer ${config.authToken}` },
+        ...buildSiluzanAuthHeaders(config),
         Datapermission: config.dataPermission ?? "",
         "Content-Length": String(Buffer.byteLength(bodyStr, "utf8"))
       };
@@ -4024,8 +4054,11 @@ var init_fetch_wrapper = __esm({
 // src/utils/auth.ts
 function loadConfig(tokenArg) {
   const shared = readSharedConfig();
-  const apiKey = process.env.SILUZAN_API_KEY ?? (shared.apiKey ? shared.apiKey : void 0);
-  const authToken = tokenArg ?? process.env.SILUZAN_AUTH_TOKEN ?? shared.authToken ?? "";
+  const { authToken, apiKey } = resolveSiluzanCredentials({
+    tokenArg,
+    configApiKey: shared.apiKey,
+    configAuthToken: shared.authToken
+  });
   if (!apiKey && !authToken) {
     printAuthMissingHelp("siluzan-tso");
   }
@@ -103381,10 +103414,13 @@ function buildTsoPageWebUrl(webUrl, tsoSubRoute, extraQuery) {
 }
 function cmdConfigShow() {
   const shared = readSharedConfig();
+  const { authToken: effectiveAuthToken, apiKey: effectiveApiKeyRaw } = resolveSiluzanCredentials({
+    configApiKey: shared.apiKey,
+    configAuthToken: shared.authToken
+  });
+  const effectiveApiKey = effectiveApiKeyRaw ?? "";
   const envApiKey = process.env.SILUZAN_API_KEY;
   const envAuthToken = process.env.SILUZAN_AUTH_TOKEN;
-  const effectiveApiKey = envApiKey ?? shared.apiKey ?? "";
-  const effectiveAuthToken = envAuthToken ?? shared.authToken ?? "";
   const apiBaseUrl = process.env.SILUZAN_TSO_API_BASE ?? DEFAULT_API_BASE;
   const googleApiUrl = process.env.SILUZAN_GOOGLE_API ?? deriveGoogleApiUrl(apiBaseUrl);
   const webUrl = deriveWebUrl(apiBaseUrl);
@@ -103408,12 +103444,12 @@ function cmdConfigShow() {
   console.log(`  googleApiUrl  : ${googleApiUrl}`);
   console.log(`  webUrl        : ${webUrl}`);
   if (effectiveApiKey) {
-    const src = envApiKey ? "env:SILUZAN_API_KEY" : "config.json";
+    const src = isSiluzanAgentEnv() ? "env:SILUZAN_API_KEY (agent)" : envApiKey ? "env:SILUZAN_API_KEY" : "config.json";
     const active = "  \u2190 \u5F53\u524D\u751F\u6548\uFF08X-Api-Key \u9274\u6743\uFF09";
     console.log(`  apiKey        : ${maskSecret(effectiveApiKey)}  [${src}]${active}`);
   }
   if (effectiveAuthToken) {
-    const src = envAuthToken ? "env:SILUZAN_AUTH_TOKEN" : "config.json";
+    const src = isSiluzanAgentEnv() ? "env:SILUZAN_AUTH_TOKEN (agent)" : envAuthToken ? "env:SILUZAN_AUTH_TOKEN" : "config.json";
     const note = effectiveApiKey ? "  \uFF08\u5DF2\u88AB apiKey \u8986\u76D6\uFF09" : "  \u2190 \u5F53\u524D\u751F\u6548\uFF08Bearer \u9274\u6743\uFF09";
     console.log(`  authToken     : ${maskSecret(effectiveAuthToken)}  [${src}]${note}`);
   }

package/dist/skill/_meta.json

@@ -1,5 +1,5 @@
 {
   "slug": "siluzan-tso",
-  "version": "1.1.30-beta.2",
-  "publishedAt": 1782286975360
+  "version": "1.1.30-beta.3",
+  "publishedAt": 1782294259539
 }

package/dist/skill/scripts/install.ps1

@@ -9,7 +9,7 @@ $ErrorActionPreference = 'Stop'
 # -- Package info (injected at build time) ------------------------------------
 $PKG_NAME    = 'siluzan-tso-cli'
 # PKG_VERSION 锁定到与本脚本同批构建产物一致的版本，避免与 dist/skill 错位
-$PKG_VERSION = '1.1.30-beta.2'
+$PKG_VERSION = '1.1.30-beta.3'
 $CLI_BIN     = 'siluzan-tso'
 $SKILL_LABEL = 'Siluzan TSO'
 $INSTALL_CMD = 'npm install -g siluzan-tso-cli@beta'

package/dist/skill/scripts/install.sh

@@ -9,7 +9,7 @@ set -euo pipefail
 # -- Package info (injected at build time) ------------------------------------
 readonly PKG_NAME="siluzan-tso-cli"
 # PKG_VERSION 锁定到与本脚本同批构建产物一致的版本，避免与 dist/skill 错位
-readonly PKG_VERSION="1.1.30-beta.2"
+readonly PKG_VERSION="1.1.30-beta.3"
 readonly CLI_BIN="siluzan-tso"
 readonly SKILL_LABEL="Siluzan TSO"
 readonly INSTALL_CMD="npm install -g siluzan-tso-cli@beta"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "siluzan-tso-cli",
-  "version": "1.1.30-beta.2",
+  "version": "1.1.30-beta.3",
   "description": "Siluzan 广告账户管理 CLI — 查询账户、余额、消耗数据，管理绑定关系与充值。",
   "keywords": [
     "ad-account",