siluzan-tso-cli 1.0.0-beta.32 → 1.0.0-beta.33

package/README.md

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

package/dist/index.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import * as fs9 from "fs";
-import * as path10 from "path";
+import * as fs8 from "fs";
+import * as path9 from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { Command } from "commander";
 
@@ -804,15 +804,13 @@ function findDpByUrl(nodes, targetUrl) {
 }
 async function fetchDataPermission(mainApiUrl, auth) {
   const url = `${mainApiUrl}/command/menu/GetUserPermissions`;
-  const authHeaders = auth.apiKey ? { "x-api-key": auth.apiKey } : { Authorization: `Bearer ${auth.authToken}` };
+  const headers = {
+    "Content-Type": "application/json",
+    "Accept-Language": "zh-CN",
+    ...auth.apiKey ? { "x-api-key": auth.apiKey } : { Authorization: `Bearer ${auth.authToken}` }
+  };
   try {
-    const res = await fetch(url, {
-      headers: {
-        "Content-Type": "application/json",
-        "Accept-Language": "zh-CN",
-        ...authHeaders
-      }
-    });
+    const res = await fetch(url, { headers });
     if (!res.ok) return "";
     const json = await res.json();
     const dp = findDpByUrl(json.data ?? [], TSO_KNOWN_ROUTE);
@@ -821,6 +819,17 @@ async function fetchDataPermission(mainApiUrl, auth) {
     return "";
   }
 }
+async function ensureDataPermission(config) {
+  if (config.dataPermission?.trim()) return config;
+  if (!config.mainApiUrl) return config;
+  const dp = await fetchDataPermission(config.mainApiUrl, config);
+  if (!dp) return config;
+  try {
+    writeSharedConfig({ dataPermission: dp });
+  } catch {
+  }
+  return { ...config, dataPermission: dp };
+}
 function loadConfig(tokenArg) {
   const shared = readSharedConfig();
   const apiKey = process.env.SILUZAN_API_KEY ?? (shared.apiKey ? shared.apiKey : void 0);
@@ -2821,9 +2830,9 @@ async function runOneSection(def, opts) {
   if (def.audienceFilterOption && opts.audienceType) {
     extras.audienceTypeFilter = opts.audienceType;
   }
-  const path11 = def.path(id);
+  const path10 = def.path(id);
   const query = buildSearchParams(def, opts.start, opts.end, extras);
-  const fullPath = `${path11}${query}`;
+  const fullPath = `${path10}${query}`;
   try {
     if (def.name === "materials") {
       const { startDate, endDate } = resolveDateRange(opts.start, opts.end);
@@ -3738,23 +3747,6 @@ async function runTransferList(opts) {
 }
 
 // src/commands/invoice.ts
-import * as fs7 from "fs";
-import * as path7 from "path";
-import * as os6 from "os";
-async function ensureDataPermission(config) {
-  if (config.dataPermission) return config;
-  if (!config.mainApiUrl) return config;
-  const dp = await fetchDataPermission(config.mainApiUrl, config);
-  if (!dp) return config;
-  const configPath = path7.join(os6.homedir(), ".siluzan", "config.json");
-  try {
-    const raw = fs7.existsSync(configPath) ? JSON.parse(fs7.readFileSync(configPath, "utf8")) : {};
-    raw.dataPermission = dp;
-    fs7.writeFileSync(configPath, JSON.stringify(raw, null, 2), "utf8");
-  } catch {
-  }
-  return { ...config, dataPermission: dp };
-}
 function formatDate(d) {
   return d.toISOString().slice(0, 10);
 }
@@ -5472,8 +5464,8 @@ async function runOptimizeChildren(opts) {
 }
 
 // src/commands/forewarning.ts
-import os7 from "os";
-import path8 from "path";
+import os6 from "os";
+import path7 from "path";
 import QRCode from "qrcode";
 import open from "open";
 var VALID_MEDIA_TYPES7 = ["Google", "TikTok"];
@@ -5681,7 +5673,7 @@ async function runForewarningNotifyAccounts(opts) {
   console.log("  \u901A\u77E5\u6E20\u9053\uFF1A\u4E1D\u8DEF\u8D5E\u5E73\u53F0\u5FAE\u4FE1\u670D\u52A1\u53F7\uFF08\u9700\u626B\u7801\u5173\u6CE8\u540E\u624D\u80FD\u6536\u5230\u9884\u8B66\u901A\u77E5\uFF09\n");
   if (qrLink) {
     try {
-      const imgPath = path8.join(os7.tmpdir(), "siluzan-wechat-qr.png");
+      const imgPath = path7.join(os6.tmpdir(), "siluzan-wechat-qr.png");
       await QRCode.toFile(imgPath, qrLink, { width: 300 });
       await open(imgPath);
       console.log(`  \u{1F4F7} \u4E8C\u7EF4\u7801\u5DF2\u5728\u6D4F\u89C8\u5668\u4E2D\u6253\u5F00\uFF0C\u8BF7\u7528\u624B\u673A\u5FAE\u4FE1\u626B\u7801\u5173\u6CE8"\u4E1D\u8DEF\u8D5E\u5E73\u53F0"\u670D\u52A1\u53F7
@@ -8127,7 +8119,7 @@ function printEmailDeauthHintToStderr() {
   );
 }
 async function runAccountEmailAuthList(opts) {
-  const config = loadConfig(opts.token);
+  const config = await ensureDataPermission(loadConfig(opts.token));
   let items;
   try {
     items = await fetchCustomerUserAccessInvitationList(
@@ -8174,7 +8166,7 @@ async function runAccountEmailAuthList(opts) {
   console.log("\n\u63D0\u793A\uFF1A\u4F7F\u7528 account email-deauth \u89E3\u9664\u6388\u6743\uFF0C--invitation-id \u6765\u81EA\u4E0A\u65B9\u9080\u8BF7 ID\u3002\n");
 }
 async function runAccountEmailAuth(opts) {
-  const config = loadConfig(opts.token);
+  const config = await ensureDataPermission(loadConfig(opts.token));
   const base = googleGatewayBase(config);
   const url = `${base}/command/media-account/MutateCustomerUserAccessInvitation`;
   const body = {
@@ -8205,7 +8197,16 @@ async function runAccountEmailAuth(opts) {
   }
   let result;
   try {
-    result = await apiFetch2(url, config, { method: "POST", body: JSON.stringify(body) }, opts.verbose);
+    result = await apiFetch2(
+      url,
+      config,
+      {
+        method: "POST",
+        body: JSON.stringify(body),
+        headers: { isqs: "true" }
+      },
+      opts.verbose
+    );
   } catch (err) {
     console.error(`
 \u274C \u90AE\u7BB1\u6388\u6743\u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}
@@ -8237,27 +8238,53 @@ async function runAccountEmailAuth(opts) {
     console.log(JSON.stringify(result, null, 2));
     return;
   }
+  const tail = typeof result === "string" && result.trim() ? `
+   \u63A5\u53E3\u8FD4\u56DE\uFF1A${result.trim()}` : "";
   console.log(
     `
-\u2705 \u5DF2\u5411 ${opts.email} \u53D1\u9001 Google \u5E7F\u544A\u8D26\u6237\uFF08${opts.customerId}\uFF09\u6388\u6743\u9080\u8BF7\uFF08\u6743\u9650\uFF1A${opts.accessRole ?? "Standard"}\uFF09\u3002
+\u2705 \u5DF2\u5411 ${opts.email} \u53D1\u9001 Google \u5E7F\u544A\u8D26\u6237\uFF08${opts.customerId}\uFF09\u6388\u6743\u9080\u8BF7\uFF08\u6743\u9650\uFF1A${opts.accessRole ?? "Standard"}\uFF09\u3002${tail}
 `
   );
 }
 async function runAccountEmailDeauth(opts) {
-  const config = loadConfig(opts.token);
+  const config = await ensureDataPermission(loadConfig(opts.token));
   const base = googleGatewayBase(config);
   const endpoint = opts.accepted !== false ? "RemoveCustomerUserAccess" : "RemoveCustomerUserAccessInvitation";
   const url = `${base}/command/media-account/${endpoint}`;
+  const resourceName = opts.resourceName?.trim() || `customers/${opts.customerId}/customerUserAccessInvitations/${opts.invitationId}`;
   const body = {
     CustomerId: opts.customerId,
     // 接口字段为 invitationld（小写 L），非 invitationId，与前端保持一致
     invitationld: opts.invitationId,
     AgentType: opts.agentType,
-    resourceName: opts.resourceName
+    resourceName
+  };
+  const bodyStr = JSON.stringify(body);
+  const headers = {
+    "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}` },
+    Datapermission: config.dataPermission ?? "",
+    "Content-Length": String(Buffer.byteLength(bodyStr, "utf8"))
   };
   let result;
   try {
-    result = await apiFetch2(url, config, { method: "DELETE", body: JSON.stringify(body) }, opts.verbose);
+    const res = await rawRequest(url, { method: "DELETE", headers, body: bodyStr });
+    const text = res.text;
+    if (res.status < 200 || res.status >= 300) {
+      const detail = opts.verbose ? `\uFF1A${text.slice(0, 300)}` : "";
+      throw new Error(`HTTP ${res.status}${detail}`);
+    }
+    if (!text.trim()) {
+      result = null;
+    } else {
+      try {
+        result = JSON.parse(text);
+      } catch {
+        result = text;
+      }
+    }
   } catch (err) {
     console.error(`
 \u274C \u89E3\u9664\u90AE\u7BB1\u6388\u6743\u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}
@@ -8268,8 +8295,10 @@ async function runAccountEmailDeauth(opts) {
     console.log(JSON.stringify(result, null, 2));
     return;
   }
+  const tail = typeof result === "string" && result.trim() ? `
+   \u63A5\u53E3\u8FD4\u56DE\uFF1A${result.trim()}` : "";
   console.log(`
-\u2705 \u5DF2\u89E3\u9664\u9080\u8BF7 ${opts.invitationId} \u7684\u90AE\u7BB1\u6388\u6743\u3002
+\u2705 \u5DF2\u89E3\u9664\u9080\u8BF7 ${opts.invitationId} \u7684\u90AE\u7BB1\u6388\u6743\u3002${tail}
 `);
 }
 async function runAccountBmBind(opts) {
@@ -8304,8 +8333,8 @@ async function runAccountBmBind(opts) {
 }
 
 // src/commands/open-account.ts
-import * as fs8 from "fs";
-import * as path9 from "path";
+import * as fs7 from "fs";
+import * as path8 from "path";
 import * as readline from "readline/promises";
 import { stdin as stdinStream, stdout as stdoutStream } from "process";
 async function runListAdvertiserGroups(opts) {
@@ -8553,8 +8582,8 @@ async function runOpenAccountYandex(opts) {
   }
 }
 async function uploadAttachment(filePath, apiBaseUrl, config, verbose) {
-  const fileName = path9.basename(filePath);
-  const fileBuffer = fs8.readFileSync(filePath);
+  const fileName = path8.basename(filePath);
+  const fileBuffer = fs7.readFileSync(filePath);
   const mimeType = guessContentType(fileName);
   const form = new FormData();
   form.append("file", new Blob([fileBuffer], { type: mimeType }), fileName);
@@ -8581,7 +8610,7 @@ async function uploadAttachment(filePath, apiBaseUrl, config, verbose) {
   return { id: data.id, fileName, storageProvider: data.storageProvider ?? "StorageAccount" };
 }
 function guessContentType(fileName) {
-  const ext = path9.extname(fileName).toLowerCase();
+  const ext = path8.extname(fileName).toLowerCase();
   const map = {
     ".jpg": "image/jpeg",
     ".jpeg": "image/jpeg",
@@ -8594,7 +8623,7 @@ function guessContentType(fileName) {
 }
 async function runOpenAccountBing(opts) {
   const config = loadConfig(opts.token);
-  if (!fs8.existsSync(opts.licenseFile)) {
+  if (!fs7.existsSync(opts.licenseFile)) {
     console.error(`
 \u274C \u8425\u4E1A\u6267\u7167\u6587\u4EF6\u4E0D\u5B58\u5728\uFF1A${opts.licenseFile}
 `);
@@ -8675,9 +8704,9 @@ async function runOpenAccountBing(opts) {
   }
 }
 async function uploadToKwai(filePath, apiBaseUrl, config, verbose) {
-  const ext = path9.extname(filePath).toLowerCase().replace(".", "").replace("jpg", "jpeg");
+  const ext = path8.extname(filePath).toLowerCase().replace(".", "").replace("jpg", "jpeg");
   const imageType = ext || "jpeg";
-  const fileBuffer = fs8.readFileSync(filePath);
+  const fileBuffer = fs7.readFileSync(filePath);
   const base64Image = fileBuffer.toString("base64");
   const res = await apiFetch2(
     `${apiBaseUrl}/KwaiAccount/Management/Upload`,
@@ -8696,7 +8725,7 @@ async function uploadToKwai(filePath, apiBaseUrl, config, verbose) {
 }
 async function runOpenAccountKwai(opts) {
   const config = loadConfig(opts.token);
-  if (!fs8.existsSync(opts.licenseFile)) {
+  if (!fs7.existsSync(opts.licenseFile)) {
     console.error(`
 \u274C \u8425\u4E1A\u6267\u7167\u6587\u4EF6\u4E0D\u5B58\u5728\uFF1A${opts.licenseFile}
 `);
@@ -9019,8 +9048,8 @@ async function runOpenAccountGoogle(opts) {
   }
 }
 async function uploadLicenseToTikTok(filePath, businessCentreType, config, verbose) {
-  const fileName = path9.basename(filePath);
-  const fileBuffer = fs8.readFileSync(filePath);
+  const fileName = path8.basename(filePath);
+  const fileBuffer = fs7.readFileSync(filePath);
   const base64Image = fileBuffer.toString("base64");
   const res = await apiFetch2(
     `${config.apiBaseUrl}/command/media-account/tiktok/Upload`,
@@ -9045,7 +9074,7 @@ async function uploadLicenseToTikTok(filePath, businessCentreType, config, verbo
 async function runOpenAccountTikTok(opts) {
   const config = loadConfig(opts.token);
   const bcType = opts.businessCentreType ?? "Shop";
-  if (!fs8.existsSync(opts.licenseFile)) {
+  if (!fs7.existsSync(opts.licenseFile)) {
     console.error(`
 \u274C \u8425\u4E1A\u6267\u7167\u6587\u4EF6\u4E0D\u5B58\u5728\uFF1A${opts.licenseFile}
 `);
@@ -9420,9 +9449,9 @@ async function runLogin(opts = {}) {
 // src/index.ts
 function getVersion() {
   try {
-    const __dirname2 = path10.dirname(fileURLToPath3(import.meta.url));
-    const pkgPath = path10.join(__dirname2, "..", "package.json");
-    const pkg = JSON.parse(fs9.readFileSync(pkgPath, "utf8"));
+    const __dirname2 = path9.dirname(fileURLToPath3(import.meta.url));
+    const pkgPath = path9.join(__dirname2, "..", "package.json");
+    const pkg = JSON.parse(fs8.readFileSync(pkgPath, "utf8"));
     return pkg.version ?? "0.0.0";
   } catch {
     return "0.0.0";
@@ -10645,14 +10674,17 @@ accountCmd.command("email-auth").description(
     verbose: opts.verbose
   });
 });
-accountCmd.command("email-deauth").description("Google\uFF1A\u89E3\u9664\u90AE\u7BB1\u6388\u6743\uFF08\u64A4\u9500\u5DF2\u53D1\u51FA\u7684\u6388\u6743\u9080\u8BF7\uFF09").requiredOption("-c, --customer-id <id>", "Google \u5E7F\u544A\u8D26\u6237 mediaCustomerId").requiredOption("--invitation-id <id>", "\u9080\u8BF7 ID\uFF08\u6765\u81EA account email-auth-list\uFF09").requiredOption("--agent-type <type>", "\u8D26\u6237\u4EE3\u7406\u7C7B\u578B").requiredOption("--resource-name <name>", "\u8D44\u6E90\u540D\u79F0\uFF08\u6765\u81EA account email-auth-list --json \u7684 resourceName \u5B57\u6BB5\uFF09").option("--pending", "\u9080\u8BF7\u5C1A\u672A\u88AB\u63A5\u53D7\uFF08\u5F85\u63A5\u53D7\u72B6\u6001\uFF09\uFF0C\u52A0\u6B64\u53C2\u6570\u4F7F\u7528\u4E0D\u540C\u89E3\u9664\u63A5\u53E3", false).option("-t, --token <token>", "Auth Token").option("--json", "\u8F93\u51FA\u539F\u59CB JSON", false).option("--verbose", "\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F", false).action(async (opts) => {
+accountCmd.command("email-deauth").description("Google\uFF1A\u89E3\u9664\u90AE\u7BB1\u6388\u6743\uFF08\u64A4\u9500\u5DF2\u53D1\u51FA\u7684\u6388\u6743\u9080\u8BF7\uFF09").requiredOption("-c, --customer-id <id>", "Google \u5E7F\u544A\u8D26\u6237 mediaCustomerId").requiredOption("--invitation-id <id>", "\u9080\u8BF7 ID\uFF08\u6765\u81EA account email-auth-list\uFF09").requiredOption("--agent-type <type>", "\u8D26\u6237\u4EE3\u7406\u7C7B\u578B").requiredOption("--resource-name <name>", "\u8D44\u6E90\u540D\u79F0\uFF08\u6765\u81EA account email-auth-list --json \u7684 resourceName \u5B57\u6BB5\uFF09").option(
+  "--pending",
+  "\u9080\u8BF7\u4E3A\u5F85\u63A5\u53D7\uFF08Pending\uFF09\u65F6\u5FC5\u52A0\uFF1A\u8D70 RemoveCustomerUserAccessInvitation\uFF1B\u5DF2\u63A5\u53D7\uFF08Invited\uFF09\u65F6\u4E0D\u8981\u52A0",
+  false
+).option("-t, --token <token>", "Auth Token").option("--json", "\u8F93\u51FA\u539F\u59CB JSON", false).option("--verbose", "\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F", false).action(async (opts) => {
   await runAccountEmailDeauth({
     token: opts.token,
     customerId: opts.customerId,
     invitationId: opts.invitationId,
     agentType: opts.agentType,
     resourceName: opts.resourceName,
-    // --pending 表示邀请待接受，accepted 为 false；否则默认已接受（accepted=true）
     accepted: !opts.pending,
     json: opts.json,
     verbose: opts.verbose

package/dist/skill/_meta.json

@@ -1,5 +1,5 @@
 {
   "slug": "siluzan-tso",
-  "version": "1.0.0-beta.32",
-  "publishedAt": 1774516818975
+  "version": "1.0.0-beta.33",
+  "publishedAt": 1774518784168
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "siluzan-tso-cli",
-  "version": "1.0.0-beta.32",
+  "version": "1.0.0-beta.33",
   "description": "Siluzan 广告账户管理 CLI — 查询账户、余额、消耗数据，管理绑定关系与充值。",
   "type": "module",
   "bin": {