beervid-app-cli 0.2.2 → 0.2.3

package/dist/cli.mjs

@@ -169,11 +169,11 @@ function register(cli2) {
       if (type === "tt") {
         const data = await openApiGet("/api/v1/open/thirdparty-auth/tt-url");
         console.log("TT OAuth \u6388\u6743\u94FE\u63A5:");
-        printResult({ type: "tt", url: data });
+        printResult(data);
       } else {
         const data = await openApiGet("/api/v1/open/thirdparty-auth/tts-url");
         console.log("TTS OAuth \u6388\u6743\u94FE\u63A5:");
-        printResult({ type: "tts", url: data.crossBorderUrl });
+        printResult(data);
       }
     } catch (err) {
       rethrowIfProcessExit(err);
@@ -451,7 +451,7 @@ function register5(cli2) {
 
 // src/commands/query-video.ts
 function register6(cli2) {
-  cli2.command("query-video", "\u67E5\u8BE2\u89C6\u9891\u7EDF\u8BA1\u6570\u636E").option("--business-id <id>", "TT \u8D26\u53F7 businessId\uFF08\u5FC5\u586B\uFF09").option("--item-ids <ids>", "\u89C6\u9891 ID\uFF0C\u591A\u4E2A\u7528\u9017\u53F7\u5206\u9694\uFF08\u5FC5\u586B\uFF09").action(
+  cli2.command("query-video", "\u67E5\u8BE2\u89C6\u9891\u7EDF\u8BA1\u6570\u636E").option("--business-id <id>", "TT \u8D26\u53F7 businessId\uFF08\u5FC5\u586B\uFF09").option("--item-ids <ids>", "\u89C6\u9891 ID\uFF0C\u652F\u6301\u91CD\u590D\u4F20\u53C2\u6216\u9017\u53F7\u5206\u9694\uFF08\u5FC5\u586B\uFF09").action(
     async (options) => {
       if (!options.businessId || !options.itemIds) {
         const missing = [
@@ -465,7 +465,7 @@ function register6(cli2) {
         );
         process.exit(1);
       }
-      const itemIds = options.itemIds.split(",").map((id) => id.trim()).filter(Boolean);
+      const itemIds = (Array.isArray(options.itemIds) ? options.itemIds : [options.itemIds]).flatMap((value) => value.split(",")).map((id) => id.trim()).filter(Boolean);
       if (itemIds.length === 0) {
         console.error("\u9519\u8BEF: --item-ids \u4E0D\u80FD\u4E3A\u7A7A");
         process.exit(1);
@@ -501,7 +501,7 @@ function register6(cli2) {
           if (v.shareUrl) console.log(`    \u94FE\u63A5: ${v.shareUrl}`);
           console.log("");
         }
-        printResult({ videos: normalized, _raw: data });
+        printResult(data);
       } catch (err) {
         rethrowIfProcessExit(err);
         console.error("\u67E5\u8BE2\u89C6\u9891\u6570\u636E\u5931\u8D25:", err.message);
@@ -581,23 +581,6 @@ async function pollNormalVideoStatus(businessId, shareId, intervalSec, maxPolls)
     raw: lastData
   };
 }
-function normalizeVideoQuery(data) {
-  const list = data.videoList ?? data.videos ?? [];
-  const videos = list.map((video) => ({
-    itemId: video.itemId ?? video.item_id,
-    videoViews: video.videoViews ?? video.video_views ?? 0,
-    likes: video.likes ?? 0,
-    comments: video.comments ?? 0,
-    shares: video.shares ?? 0,
-    thumbnailUrl: video.thumbnailUrl ?? video.thumbnail_url ?? "",
-    shareUrl: video.shareUrl ?? video.share_url ?? ""
-  }));
-  return {
-    attempts: 1,
-    videos,
-    raw: data
-  };
-}
 async function queryVideoWithRetry(businessId, itemId, intervalSec, maxAttempts) {
   const warnings = [];
   for (let attempt = 1; attempt <= maxAttempts; attempt++) {
@@ -605,10 +588,9 @@ async function queryVideoWithRetry(businessId, itemId, intervalSec, maxAttempts)
       businessId,
       itemIds: [itemId]
     });
-    const normalized = normalizeVideoQuery(data);
-    normalized.attempts = attempt;
-    if (normalized.videos.length > 0) {
-      return { query: normalized, warnings };
+    const list = data.videoList ?? data.videos ?? [];
+    if (list.length > 0) {
+      return { query: data, warnings };
     }
     if (attempt < maxAttempts) {
       await sleep2(intervalSec * 1e3);
@@ -642,6 +624,7 @@ async function queryProductsPage(creatorId, productType, pageSize, cursor) {
     return token !== null;
   });
   const allProducts = /* @__PURE__ */ new Map();
+  const rawGroups = [];
   let nextShopToken = cursor.shopToken;
   let nextShowcaseToken = cursor.showcaseToken;
   let successCount = 0;
@@ -669,6 +652,7 @@ async function queryProductsPage(creatorId, productType, pageSize, cursor) {
     successCount += 1;
     const { data } = result.value;
     const groups = Array.isArray(data) ? data : [data];
+    rawGroups.push(...groups);
     for (const group of groups) {
       const token = group.nextPageToken === void 0 ? null : group.nextPageToken;
       if (type === "shop") nextShopToken = token;
@@ -694,6 +678,7 @@ async function queryProductsPage(creatorId, productType, pageSize, cursor) {
   const nextCursor = encodeCursor({ shopToken: nextShopToken, showcaseToken: nextShowcaseToken });
   return {
     products: Array.from(allProducts.values()),
+    rawGroups,
     nextCursor,
     successCount,
     failedSources
@@ -701,6 +686,7 @@ async function queryProductsPage(creatorId, productType, pageSize, cursor) {
 }
 async function fetchProductPool(creatorId, productType, pageSize, maxPages) {
   const allProducts = /* @__PURE__ */ new Map();
+  const rawGroups = [];
   let cursor = { shopToken: "", showcaseToken: "" };
   let nextCursor = null;
   let pagesScanned = 0;
@@ -714,6 +700,7 @@ async function fetchProductPool(creatorId, productType, pageSize, maxPages) {
       failedSourcesSet.add(src);
     }
     pagesScanned = page;
+    rawGroups.push(...pageResult.rawGroups);
     for (const product of pageResult.products) {
       if (!allProducts.has(product.id)) {
         allProducts.set(product.id, product);
@@ -727,6 +714,7 @@ async function fetchProductPool(creatorId, productType, pageSize, maxPages) {
   }
   return {
     products: Array.from(allProducts.values()),
+    rawGroups,
     summary: {
       productType,
       pageSize,
@@ -738,17 +726,6 @@ async function fetchProductPool(creatorId, productType, pageSize, maxPages) {
     }
   };
 }
-function buildSkippedProductQuerySummary(productType, pageSize) {
-  return {
-    productType,
-    pageSize,
-    pagesScanned: 0,
-    productCount: 0,
-    nextCursor: null,
-    reachedPageLimit: false,
-    failedSources: []
-  };
-}
 function isProductPublishable(product) {
   if (product.reviewStatus && product.reviewStatus.toUpperCase() !== "APPROVED") return false;
   if (product.inventoryStatus && product.inventoryStatus.toUpperCase() !== "IN_STOCK") return false;
@@ -757,18 +734,6 @@ function isProductPublishable(product) {
 function sortProductsForSelection(products) {
   return products.filter(isProductPublishable).sort((a, b) => b.salesCount - a.salesCount);
 }
-function buildSelectedProductSummary(product, selectionMode) {
-  return {
-    selectionMode,
-    id: product.id,
-    title: product.title,
-    salesCount: product.salesCount,
-    source: product.source,
-    price: product.price,
-    brandName: product.brandName,
-    shopName: product.shopName
-  };
-}
 async function promptForProductSelection(products) {
   if (!process.stdin.isTTY || !process.stdout.isTTY) {
     throw new Error("\u4EA4\u4E92\u6A21\u5F0F\u9700\u8981\u5728 TTY \u7EC8\u7AEF\u4E2D\u8FD0\u884C");
@@ -858,7 +823,7 @@ function register7(cli2) {
         } else {
           console.log("\u5DF2\u5230\u6700\u540E\u4E00\u9875");
         }
-        printResult({ products: productList, nextCursor: pageResult.nextCursor });
+        printResult(pageResult.rawGroups);
       } catch (err) {
         rethrowIfProcessExit(err);
         console.error("\u67E5\u8BE2\u5546\u54C1\u5931\u8D25:", err.message);
@@ -917,7 +882,6 @@ function register8(cli2) {
           intervalSec,
           maxPolls
         );
-        const warnings = [];
         const videoId = status.postIds[0] ?? null;
         let query = null;
         if (status.finalStatus === "PUBLISH_COMPLETE" && videoId) {
@@ -929,18 +893,16 @@ function register8(cli2) {
             queryMaxAttempts
           );
           query = queryResult.query;
-          warnings.push(...queryResult.warnings);
+          for (const warning of queryResult.warnings) {
+            console.warn(warning.message);
+          }
         }
-        const result = {
-          flowType: "tt",
+        printResult({
           upload,
           publish,
-          status,
-          videoId,
-          query,
-          warnings
-        };
-        printResult(result);
+          status: status.raw,
+          query
+        });
         if (status.finalStatus === "FAILED") {
           process.exit(1);
         }
@@ -1023,12 +985,9 @@ function register9(cli2) {
       );
       try {
         console.log("\u5F00\u59CB\u6267\u884C TTS \u5B8C\u6574\u53D1\u5E03\u6D41\u7A0B...");
-        const warnings = [];
-        let selectionMode = "automatic";
         let selectedProduct;
-        let productPoolSummary;
+        let queriedProducts = null;
         if (options.productId && options.productTitle) {
-          selectionMode = "manual";
           console.log("1/4 \u5DF2\u624B\u52A8\u6307\u5B9A\u5546\u54C1\uFF0C\u8DF3\u8FC7\u5546\u54C1\u67E5\u8BE2...");
           selectedProduct = buildManualProduct(options.productId, options.productTitle);
         } else {
@@ -1039,21 +998,16 @@ function register9(cli2) {
             pageSize,
             maxProductPages
           );
-          productPoolSummary = productPool.summary;
+          queriedProducts = productPool.rawGroups;
           if (productPool.summary.reachedPageLimit && productPool.summary.nextCursor) {
-            warnings.push({
-              code: "PRODUCT_SCAN_LIMIT_REACHED",
-              message: `\u5546\u54C1\u626B\u63CF\u5DF2\u8FBE\u5230\u9875\u6570\u4E0A\u9650 ${maxProductPages}\uFF0C\u4ECD\u5B58\u5728\u672A\u62C9\u53D6\u5206\u9875`
-            });
+            console.warn(`\u5546\u54C1\u626B\u63CF\u5DF2\u8FBE\u5230\u9875\u6570\u4E0A\u9650 ${maxProductPages}\uFF0C\u4ECD\u5B58\u5728\u672A\u62C9\u53D6\u5206\u9875`);
           }
           if (productPool.summary.failedSources.length > 0) {
-            warnings.push({
-              code: "PRODUCT_SOURCE_PARTIAL_FAILURE",
-              message: `\u4EE5\u4E0B\u5546\u54C1\u6E90\u8BF7\u6C42\u5931\u8D25: ${productPool.summary.failedSources.join(", ")}\uFF0C\u5546\u54C1\u6C60\u53EF\u80FD\u4E0D\u5B8C\u6574`
-            });
+            console.warn(
+              `\u4EE5\u4E0B\u5546\u54C1\u6E90\u8BF7\u6C42\u5931\u8D25: ${productPool.summary.failedSources.join(", ")}\uFF0C\u5546\u54C1\u6C60\u53EF\u80FD\u4E0D\u5B8C\u6574`
+            );
           }
           if (options.productId) {
-            selectionMode = "manual";
             const matchedProduct = productPool.products.find(
               (product) => product.id === options.productId
             );
@@ -1070,7 +1024,6 @@ function register9(cli2) {
               console.error("TTS \u5B8C\u6574\u53D1\u5E03\u6D41\u7A0B\u5931\u8D25: \u5F53\u524D\u5546\u54C1\u6C60\u4E3A\u7A7A\uFF0C\u65E0\u6CD5\u9009\u62E9\u5546\u54C1");
               process.exit(1);
             }
-            selectionMode = "interactive";
             console.log("2/4 \u8BF7\u9009\u62E9\u8981\u6302\u8F66\u7684\u5546\u54C1...");
             selectedProduct = await promptForProductSelection(productPool.products);
           } else {
@@ -1100,20 +1053,14 @@ function register9(cli2) {
           options.caption
         );
         if (publishResult.productTitle !== selectedProduct.title) {
-          warnings.push({
-            code: "PRODUCT_TITLE_TRUNCATED",
-            message: "\u5546\u54C1\u6807\u9898\u8D85\u8FC7 29 \u5B57\u7B26\uFF0C\u53D1\u5E03\u65F6\u5DF2\u81EA\u52A8\u622A\u65AD"
-          });
+          console.warn("\u5546\u54C1\u6807\u9898\u8D85\u8FC7 29 \u5B57\u7B26\uFF0C\u53D1\u5E03\u65F6\u5DF2\u81EA\u52A8\u622A\u65AD");
         }
-        const result = {
-          flowType: "tts",
-          productQuery: productPoolSummary ?? buildSkippedProductQuerySummary(productType, pageSize),
-          selectedProduct: buildSelectedProductSummary(selectedProduct, selectionMode),
+        printResult({
+          products: queriedProducts,
+          selectedProduct,
           upload,
-          publish: publishResult.publish,
-          warnings
-        };
-        printResult(result);
+          publish: publishResult.publish
+        });
       } catch (err) {
         rethrowIfProcessExit(err);
         console.error("TTS \u5B8C\u6574\u53D1\u5E03\u6D41\u7A0B\u5931\u8D25:", err.message);
@@ -1164,7 +1111,7 @@ function register10(cli2) {
 
 // src/cli.ts
 var cli = cac("beervid");
-var cliVersion = true ? "0.2.2" : pkg.version;
+var cliVersion = true ? "0.2.3" : pkg.version;
 register10(cli);
 register(cli);
 register2(cli);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beervid-app-cli",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "BEERVID App CLI — TikTok video publish, account auth, and data query",
   "type": "module",
   "engines": {