siluzan-tso-cli 1.1.29-beta.16 → 1.1.29-beta.17

package/README.md

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

package/dist/index.js

@@ -4278,6 +4278,65 @@ var init_balance = __esm({
   }
 });
 
+// src/utils/media-account-batch.ts
+function mediaAccountDataBatchSize(media) {
+  switch (media) {
+    case "BingV2":
+    case "TikTok":
+    case "Yandex":
+      return 10;
+    case "Kwai":
+      return 20;
+    default:
+      return 100;
+  }
+}
+async function fetchBalanceAndOverviewSequential(opts) {
+  const { media, accountIds, config, startDate, endDate, verbose } = opts;
+  const balanceMap = /* @__PURE__ */ new Map();
+  const overviewMap = /* @__PURE__ */ new Map();
+  if (accountIds.length === 0) {
+    return { balanceMap, overviewMap, chunkSize: mediaAccountDataBatchSize(media), chunkCount: 0 };
+  }
+  const chunkSize = mediaAccountDataBatchSize(media);
+  const chunks = [];
+  for (let i = 0; i < accountIds.length; i += chunkSize) {
+    chunks.push(accountIds.slice(i, i + chunkSize));
+  }
+  for (let chunkIdx = 0; chunkIdx < chunks.length; chunkIdx++) {
+    const ids = chunks[chunkIdx];
+    const oneBased = chunkIdx + 1;
+    opts.onChunkStart?.(oneBased, chunks.length, ids);
+    const overviewChunk = await fetchOverviewMap(
+      media,
+      ids,
+      config,
+      startDate,
+      endDate,
+      verbose
+    );
+    opts.onOverviewDone?.(oneBased, chunks.length, ids, overviewChunk.size);
+    for (const [k, v] of overviewChunk) overviewMap.set(k, v);
+    const balanceChunk = await fetchBalanceMap(
+      media,
+      ids,
+      config,
+      startDate,
+      endDate,
+      verbose
+    );
+    opts.onBalanceDone?.(oneBased, chunks.length, ids, balanceChunk.size);
+    for (const [k, v] of balanceChunk) balanceMap.set(k, v);
+  }
+  return { balanceMap, overviewMap, chunkSize, chunkCount: chunks.length };
+}
+var init_media_account_batch = __esm({
+  "src/utils/media-account-batch.ts"() {
+    "use strict";
+    init_balance();
+  }
+});
+
 // src/commands/accounts-digest/list-fetch.ts
 async function fetchAccountsByMedia(media, config, opts) {
   const cfg = DIGEST_PLATFORM_CONFIG[media];
@@ -4426,30 +4485,47 @@ async function runAccountsDigest(opts) {
     }
   }
   const validIds = accountsList.filter((it) => it.ma?.mediaCustomerId && !it.ma?.invalidOAuthToken).map((it) => String(it.ma.mediaCustomerId));
-  const CHUNK = 100;
-  const chunks = [];
-  for (let i = 0; i < validIds.length; i += CHUNK) chunks.push(validIds.slice(i, i + CHUNK));
-  const balanceMap = /* @__PURE__ */ new Map();
-  const overviewMap = /* @__PURE__ */ new Map();
-  if (chunks.length > 0) {
+  let balanceMap = /* @__PURE__ */ new Map();
+  let overviewMap = /* @__PURE__ */ new Map();
+  let batchChunkSize = null;
+  if (validIds.length > 0) {
     process.stderr.write(
-      `\u23F3 \u62C9\u53D6\u4F59\u989D\u4E0E\u6D88\u8017\u6570\u636E\uFF08${validIds.length} \u4E2A\u8D26\u6237\uFF0C\u5206 ${chunks.length} \u6279\uFF09...
+      `\u23F3 [accounts-digest] \u6709\u6548\u8D26\u6237 ${validIds.length} \u4E2A\uFF1B\u4E32\u884C\u62C9\u53D6\u6D88\u8017 \u2192 \u4F59\u989D\uFF08\u4E0E Web \u8D26\u6237\u5217\u8868\u5206\u6279\u53E3\u5F84\u4E00\u81F4\uFF09\u3002
 `
     );
-    const [bMaps, oMaps] = await Promise.all([
-      Promise.all(
-        chunks.map(
-          (ids) => fetchBalanceMap(media, ids, config, opts.startDate, opts.endDate, opts.verbose)
-        )
-      ),
-      Promise.all(
-        chunks.map(
-          (ids) => fetchOverviewMap(media, ids, config, opts.startDate, opts.endDate, opts.verbose)
-        )
-      )
-    ]);
-    for (const m of bMaps) for (const [k, v] of m) balanceMap.set(k, v);
-    for (const m of oMaps) for (const [k, v] of m) overviewMap.set(k, v);
+    const fetched = await fetchBalanceAndOverviewSequential({
+      media,
+      accountIds: validIds,
+      config,
+      startDate: opts.startDate,
+      endDate: opts.endDate,
+      verbose: opts.verbose,
+      onChunkStart: (chunkIdx, totalChunks, ids) => {
+        process.stderr.write(
+          `   \u2192 [\u6D88\u8017] \u7B2C ${chunkIdx}/${totalChunks} \u6279\uFF08${ids.length} \u6237\uFF09\u2026
+`
+        );
+      },
+      onOverviewDone: (chunkIdx, totalChunks, ids, size) => {
+        process.stderr.write(
+          `   \u2713 [\u6D88\u8017] \u7B2C ${chunkIdx}/${totalChunks} \u6279\u5B8C\u6210\uFF08${ids.length} \u6237 \u2192 ${size} \u6761\uFF09
+`
+        );
+        process.stderr.write(
+          `   \u2192 [\u4F59\u989D] \u7B2C ${chunkIdx}/${totalChunks} \u6279\uFF08${ids.length} \u6237\uFF09\u2026
+`
+        );
+      },
+      onBalanceDone: (chunkIdx, totalChunks, ids, size) => {
+        process.stderr.write(
+          `   \u2713 [\u4F59\u989D] \u7B2C ${chunkIdx}/${totalChunks} \u6279\u5B8C\u6210\uFF08${ids.length} \u6237 \u2192 ${size} \u6761\uFF09
+`
+        );
+      }
+    });
+    balanceMap = fetched.balanceMap;
+    overviewMap = fetched.overviewMap;
+    batchChunkSize = fetched.chunkSize;
   }
   const rows = [];
   for (const item of accountsList) {
@@ -4505,6 +4581,7 @@ async function runAccountsDigest(opts) {
     /** 取数策略：list = 全量翻清单后过滤，subset = 跳过翻页直接对 -a 指定的 ID 拉数据 */
     source: scannedFromList ? "list" : "subset",
     returned: rows.length,
+    batchChunkSize: validIds.length > 0 ? batchChunkSize : null,
     totals: {
       spend: +totals.spend.toFixed(2),
       clicks: totals.clicks,
@@ -4581,6 +4658,7 @@ var init_run = __esm({
     init_balance();
     init_cli_table();
     init_currency_display();
+    init_media_account_batch();
     init_list_fetch();
   }
 });
@@ -105251,6 +105329,7 @@ init_cli_json_snapshot();
 init_balance();
 init_cli_table();
 init_currency_display();
+init_media_account_batch();
 
 // src/commands/balance-scan/list-fetch.ts
 init_auth();
@@ -105394,18 +105473,6 @@ async function fetchAllAccountPages(media, pageSize, maxPages, config, verbose)
 }
 
 // src/commands/balance-scan/run.ts
-function balanceScanChunkSize(media) {
-  switch (media) {
-    case "BingV2":
-    case "TikTok":
-    case "Yandex":
-      return 10;
-    case "Kwai":
-      return 20;
-    default:
-      return 100;
-  }
-}
 async function runBalanceScan(opts) {
   let config = loadConfig(opts.token);
   if (opts.refreshDp) {
@@ -105463,53 +105530,44 @@ async function runBalanceScan(opts) {
   }
   let balanceMap = /* @__PURE__ */ new Map();
   let overviewMap = /* @__PURE__ */ new Map();
+  let batchChunkSize = null;
   if (validIds.length > 0) {
-    const chunkSize = balanceScanChunkSize(media);
-    const chunks = [];
-    for (let i = 0; i < validIds.length; i += chunkSize) {
-      chunks.push(validIds.slice(i, i + chunkSize));
-    }
+    const chunkSize = mediaAccountDataBatchSize(media);
     process.stderr.write(
-      `\u23F3 [balance-scan] \u6709\u6548\u8D26\u6237 ${validIds.length} \u4E2A\uFF0C\u5206 ${chunks.length} \u6279\uFF08\u6BCF\u6279 \u2264${chunkSize} \u6237\uFF09\uFF1B\u6309 Web \u8D26\u6237\u5217\u8868\u53E3\u5F84\u4E32\u884C\u62C9\u53D6\u6D88\u8017 \u2192 \u4F59\u989D\uFF08\u5355\u8BF7\u6C42\u6700\u957F\u7EA6 10 \u5206\u949F\uFF09\u3002
+      `\u23F3 [balance-scan] \u6709\u6548\u8D26\u6237 ${validIds.length} \u4E2A\uFF1B\u6309 Web \u8D26\u6237\u5217\u8868\u53E3\u5F84\u4E32\u884C\u62C9\u53D6\u6D88\u8017 \u2192 \u4F59\u989D\uFF08\u6BCF\u6279 \u2264${chunkSize} \u6237\uFF0C\u5355\u8BF7\u6C42\u6700\u957F\u7EA6 10 \u5206\u949F\uFF09\u3002
 `
     );
-    for (let chunkIdx = 0; chunkIdx < chunks.length; chunkIdx++) {
-      const ids = chunks[chunkIdx];
-      process.stderr.write(
-        `   \u2192 [\u8FD17\u65E5\u6D88\u8017] \u7B2C ${chunkIdx + 1}/${chunks.length} \u6279\u8BF7\u6C42\u4E2D\uFF08${ids.length} \u6237\uFF09\u2026
+    const fetched = await fetchBalanceAndOverviewSequential({
+      media,
+      accountIds: validIds,
+      config,
+      verbose: opts.verbose,
+      onChunkStart: (chunkIdx, totalChunks, ids) => {
+        process.stderr.write(
+          `   \u2192 [\u8FD17\u65E5\u6D88\u8017] \u7B2C ${chunkIdx}/${totalChunks} \u6279\u8BF7\u6C42\u4E2D\uFF08${ids.length} \u6237\uFF09\u2026
 `
-      );
-      const overviewChunk = await fetchOverviewMap(
-        media,
-        ids,
-        config,
-        void 0,
-        void 0,
-        opts.verbose
-      );
-      process.stderr.write(
-        `   \u2713 [\u8FD17\u65E5\u6D88\u8017] \u7B2C ${chunkIdx + 1}/${chunks.length} \u6279\u5B8C\u6210\uFF08${ids.length} \u6237 \u2192 ${overviewChunk.size} \u6761\uFF09
+        );
+      },
+      onOverviewDone: (chunkIdx, totalChunks, ids, size) => {
+        process.stderr.write(
+          `   \u2713 [\u8FD17\u65E5\u6D88\u8017] \u7B2C ${chunkIdx}/${totalChunks} \u6279\u5B8C\u6210\uFF08${ids.length} \u6237 \u2192 ${size} \u6761\uFF09
 `
-      );
-      for (const [k, v] of overviewChunk) overviewMap.set(k, v);
-      process.stderr.write(
-        `   \u2192 [\u4F59\u989D] \u7B2C ${chunkIdx + 1}/${chunks.length} \u6279\u8BF7\u6C42\u4E2D\uFF08${ids.length} \u6237\uFF09\u2026
+        );
+        process.stderr.write(
+          `   \u2192 [\u4F59\u989D] \u7B2C ${chunkIdx}/${totalChunks} \u6279\u8BF7\u6C42\u4E2D\uFF08${ids.length} \u6237\uFF09\u2026
 `
-      );
-      const balanceChunk = await fetchBalanceMap(
-        media,
-        ids,
-        config,
-        void 0,
-        void 0,
-        opts.verbose
-      );
-      process.stderr.write(
-        `   \u2713 [\u4F59\u989D] \u7B2C ${chunkIdx + 1}/${chunks.length} \u6279\u5B8C\u6210\uFF08${ids.length} \u6237 \u2192 ${balanceChunk.size} \u6761\uFF09
+        );
+      },
+      onBalanceDone: (chunkIdx, totalChunks, ids, size) => {
+        process.stderr.write(
+          `   \u2713 [\u4F59\u989D] \u7B2C ${chunkIdx}/${totalChunks} \u6279\u5B8C\u6210\uFF08${ids.length} \u6237 \u2192 ${size} \u6761\uFF09
 `
-      );
-      for (const [k, v] of balanceChunk) balanceMap.set(k, v);
-    }
+        );
+      }
+    });
+    balanceMap = fetched.balanceMap;
+    overviewMap = fetched.overviewMap;
+    batchChunkSize = fetched.chunkSize;
     process.stderr.write(`\u23F3 [balance-scan] \u4F59\u989D\u4E0E\u6D88\u8017\u5DF2\u9F50\uFF0C\u6B63\u5728\u6309\u9608\u503C\u7B5B\u9009\u2026
 `);
   }
@@ -105568,7 +105626,7 @@ async function runBalanceScan(opts) {
     },
     pageSize,
     maxPages,
-    batchChunkSize: validIds.length > 0 ? balanceScanChunkSize(media) : null,
+    batchChunkSize: validIds.length > 0 ? batchChunkSize : null,
     totalReported: total ?? null,
     generatedAt: (/* @__PURE__ */ new Date()).toISOString()
   };

package/dist/skill/_meta.json

@@ -1,5 +1,5 @@
 {
   "slug": "siluzan-tso",
-  "version": "1.1.29-beta.16",
-  "publishedAt": 1781686919463
+  "version": "1.1.29-beta.17",
+  "publishedAt": 1781748956615
 }

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.29-beta.16'
+$PKG_VERSION = '1.1.29-beta.17'
 $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.29-beta.16"
+readonly PKG_VERSION="1.1.29-beta.17"
 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.29-beta.16",
+  "version": "1.1.29-beta.17",
   "description": "Siluzan 广告账户管理 CLI — 查询账户、余额、消耗数据，管理绑定关系与充值。",
   "keywords": [
     "ad-account",