jimeng-cli 0.3.1 → 0.3.2

package/README.md

@@ -2,7 +2,7 @@
 
 [![npm version](https://img.shields.io/npm/v/jimeng-cli.svg)](https://www.npmjs.com/package/jimeng-cli)
 
-即梦/CapCut 图像与视频生成工具集，提供 CLI 与 MCP Server（stdio）。
+即梦/CapCut 图像与视频生成工具集，提供 CLI 与 MCP Server. 不需要VIP账号，普通账号即可
 
 ## 要求
 

package/dist/{chunk-2IIK4X7C.js → chunk-FAXTAAQO.js}

@@ -5621,6 +5621,17 @@ import mime from "mime";
 import axios from "axios";
 import { v4 as uuidv4 } from "uuid";
 import { format as dateFormat } from "date-fns";
+var CRC32_TABLE = (() => {
+  const table = [];
+  for (let i = 0; i < 256; i++) {
+    let crc = i;
+    for (let j = 0; j < 8; j++) {
+      crc = crc & 1 ? 3988292384 ^ crc >>> 1 : crc >>> 1;
+    }
+    table[i] = crc;
+  }
+  return table;
+})();
 var util = {
   uuid: (separator = true) => separator ? uuidv4() : uuidv4().replace(/-/g, ""),
   getDateString(format = "yyyy-MM-dd", date = /* @__PURE__ */ new Date()) {
@@ -5666,18 +5677,10 @@ var util = {
    * @returns CRC32 十六进制字符串
    */
   calculateCRC32(buffer) {
-    const crcTable = [];
-    for (let i = 0; i < 256; i++) {
-      let crc2 = i;
-      for (let j = 0; j < 8; j++) {
-        crc2 = crc2 & 1 ? 3988292384 ^ crc2 >>> 1 : crc2 >>> 1;
-      }
-      crcTable[i] = crc2;
-    }
     let crc = 0 ^ -1;
     const bytes = buffer instanceof ArrayBuffer ? new Uint8Array(buffer) : new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
     for (let i = 0; i < bytes.length; i++) {
-      crc = crc >>> 8 ^ crcTable[(crc ^ bytes[i]) & 255];
+      crc = crc >>> 8 ^ CRC32_TABLE[(crc ^ bytes[i]) & 255];
     }
     return ((crc ^ -1) >>> 0).toString(16).padStart(8, "0");
   }
@@ -5986,16 +5989,18 @@ var JimengErrorHandler = class {
    * 处理轮询超时错误
    * @returns 如果有部分结果，返回 void 而不抛出异常
    */
-  static handlePollingTimeout(pollCount, maxPollCount, elapsedTime, status, itemCount, historyId) {
-    const message = `\u8F6E\u8BE2\u8D85\u65F6: \u5DF2\u8F6E\u8BE2 ${pollCount} \u6B21\uFF0C\u8017\u65F6 ${elapsedTime} \u79D2\uFF0C\u6700\u7EC8\u72B6\u6001: ${status}\uFF0C\u56FE\u7247\u6570\u91CF: ${itemCount}`;
+  static handlePollingTimeout(pollCount, maxPollCount, elapsedTime, status, itemCount, historyId, type = "image") {
+    const typeText = type === "image" ? "\u56FE\u7247" : "\u89C6\u9891";
+    const message = `\u8F6E\u8BE2\u8D85\u65F6: \u5DF2\u8F6E\u8BE2 ${pollCount} \u6B21\uFF0C\u8017\u65F6 ${elapsedTime} \u79D2\uFF0C\u6700\u7EC8\u72B6\u6001: ${status}\uFF0C${typeText}\u6570\u91CF: ${itemCount}`;
     logger_default.warn(message + (historyId ? `\uFF0C\u5386\u53F2ID: ${historyId}` : ""));
     if (itemCount === 0) {
+      const exception = type === "image" ? exceptions_default.API_IMAGE_GENERATION_FAILED : exceptions_default.API_VIDEO_GENERATION_FAILED;
       throw new APIException(
-        exceptions_default.API_IMAGE_GENERATION_FAILED,
-        `\u751F\u6210\u8D85\u65F6\u4E14\u65E0\u7ED3\u679C\uFF0C\u72B6\u6001\u7801: ${status}${historyId ? `\uFF0C\u5386\u53F2ID: ${historyId}` : ""}`
+        exception,
+        `${typeText}\u751F\u6210\u8D85\u65F6\u4E14\u65E0\u7ED3\u679C\uFF0C\u72B6\u6001\u7801: ${status}${historyId ? `\uFF0C\u5386\u53F2ID: ${historyId}` : ""}`
       );
     }
-    logger_default.info(`\u8F6E\u8BE2\u8D85\u65F6\u4F46\u5DF2\u83B7\u5F97 ${itemCount} \u5F20\u56FE\u7247\uFF0C\u5C06\u8FD4\u56DE\u73B0\u6709\u7ED3\u679C`);
+    logger_default.info(`\u8F6E\u8BE2\u8D85\u65F6\u4F46\u5DF2\u83B7\u5F97 ${itemCount} \u4E2A${typeText}\uFF0C\u5C06\u8FD4\u56DE\u73B0\u6709\u7ED3\u679C`);
   }
   /**
    * 处理生成失败错误
@@ -6060,7 +6065,7 @@ var BASE_URL_IMAGEX_US = "https://imagex16-normal-us-ttp.capcutapi.us";
 var BASE_URL_DREAMINA_HK = "https://mweb-api-sg.capcut.com";
 var BASE_URL_IMAGEX_HK = "https://imagex-normal-sg.capcutapi.com";
 var WEB_VERSION = "7.5.0";
-var DA_VERSION = "3.3.8";
+var DA_VERSION = "3.3.12";
 
 // src/api/consts/common.ts
 var BASE_URL_CN = "https://jimeng.jianying.com";
@@ -6081,7 +6086,7 @@ var VERSION_CODE = "8.4.0";
 var DEFAULT_IMAGE_MODEL = "jimeng-4.5";
 var DEFAULT_IMAGE_MODEL_US = "jimeng-4.5";
 var DEFAULT_VIDEO_MODEL = "jimeng-video-3.5-pro";
-var DRAFT_VERSION = "3.3.8";
+var DRAFT_VERSION = "3.3.9";
 var DRAFT_MIN_VERSION = "3.0.2";
 var DRAFT_VERSION_OMNI = "3.3.9";
 var OMNI_BENEFIT_TYPE = "dreamina_video_seedance_20_video_add";
@@ -6594,6 +6599,9 @@ function checkResult(result) {
 }
 async function getTokenLiveStatus(refreshToken, regionInfo) {
   try {
+    if (regionInfo.isInternational) {
+      return await checkInternationalTokenLive(refreshToken, regionInfo);
+    }
     const result = await request(
       "POST",
       "/passport/account/info/v2",
@@ -6612,6 +6620,44 @@ async function getTokenLiveStatus(refreshToken, regionInfo) {
     return false;
   }
 }
+async function checkInternationalTokenLive(refreshToken, regionInfo) {
+  const aid = getAssistantId(regionInfo);
+  const countryCode = regionInfo.isUS ? "us" : regionInfo.isJP ? "jp" : regionInfo.isHK ? "hk" : "sg";
+  const cookie = generateCookie(refreshToken);
+  try {
+    const response = await axios2.get(
+      "https://dreamina.capcut.com/passport/web/account/info/",
+      {
+        params: {
+          aid,
+          account_sdk_source: "web",
+          sdk_version: "2.1.10-tiktok",
+          language: countryCode === "jp" ? "ja" : "en"
+        },
+        headers: {
+          ...FAKE_HEADERS,
+          Cookie: cookie,
+          Referer: "https://dreamina.capcut.com/ai-tool/home/",
+          Origin: "https://dreamina.capcut.com",
+          Appid: String(aid),
+          "store-country-code": countryCode,
+          "store-country-code-src": "uid"
+        },
+        timeout: 15e3
+      }
+    );
+    const data = response.data;
+    if (data && typeof data === "object") {
+      const obj = data;
+      if (obj.user_id || obj.email || obj.data) {
+        return true;
+      }
+    }
+    return false;
+  } catch {
+    return false;
+  }
+}
 
 // src/lib/session-pool.ts
 import path4 from "path";
@@ -7428,7 +7474,7 @@ var SmartPoller = class {
   /**
    * 根据状态码计算智能轮询间隔
    */
-  getSmartInterval(status, itemCount) {
+  getSmartInterval(status, _itemCount) {
     const baseInterval = this.options.pollInterval;
     switch (status) {
       case 20:
@@ -7465,9 +7511,6 @@ var SmartPoller = class {
     if (status === 30) {
       return { shouldExit: true, reason: "\u4EFB\u52A1\u5931\u8D25" };
     }
-    if (itemCount >= this.options.expectedItemCount && (status === 10 || status === 50)) {
-      return { shouldExit: true, reason: `\u5DF2\u83B7\u5F97\u5B8C\u6574\u7ED3\u679C\u96C6(${itemCount}/${this.options.expectedItemCount})` };
-    }
     if (this.pollCount >= this.options.maxPollCount) {
       return { shouldExit: true, reason: "\u8F6E\u8BE2\u6B21\u6570\u8D85\u9650" };
     }
@@ -7484,6 +7527,7 @@ var SmartPoller = class {
     logger_default.info(`\u5F00\u59CB\u667A\u80FD\u8F6E\u8BE2: historyId=${historyId || "N/A"}, \u6700\u5927\u8F6E\u8BE2\u6B21\u6570=${this.options.maxPollCount}, \u671F\u671B\u7ED3\u679C\u6570=${this.options.expectedItemCount}`);
     let lastData;
     let lastStatus = { status: 20, itemCount: 0 };
+    let exitReason = "";
     while (true) {
       this.pollCount++;
       const elapsedTime = Math.round((Date.now() - this.startTime) / 1e3);
@@ -7497,6 +7541,7 @@ var SmartPoller = class {
         }
         const { shouldExit, reason } = this.shouldExitPolling(status);
         if (shouldExit) {
+          exitReason = reason;
           logger_default.info(`\u9000\u51FA\u8F6E\u8BE2: ${reason}, \u6700\u7EC8${this.options.type === "image" ? "\u56FE\u7247" : "\u89C6\u9891"}\u6570\u91CF=${status.itemCount}`);
           if (status.status === 30) {
             handleGenerationFailure(status.status, status.failCode, historyId, this.options.type, status.itemCount);
@@ -7508,7 +7553,8 @@ var SmartPoller = class {
               elapsedTime,
               status.status,
               status.itemCount,
-              historyId
+              historyId,
+              this.options.type
             );
           }
           break;
@@ -7552,7 +7598,7 @@ var SmartPoller = class {
       itemCount: lastStatus.itemCount,
       elapsedTime: finalElapsedTime,
       pollCount: this.pollCount,
-      exitReason: this.shouldExitPolling(lastStatus).reason
+      exitReason
     };
     logger_default.info(`${this.options.type === "image" ? "\u56FE\u50CF" : "\u89C6\u9891"}\u751F\u6210\u5B8C\u6210: \u6210\u529F\u751F\u6210 ${lastStatus.itemCount} \u4E2A\u7ED3\u679C\uFF0C\u603B\u8017\u65F6 ${finalElapsedTime} \u79D2\uFF0C\u6700\u7EC8\u72B6\u6001: ${this.getStatusName(lastStatus.status)}`);
     return { result, data: lastData };
@@ -7598,17 +7644,20 @@ function extractImageUrls(itemList) {
   return itemList.map((item, index) => extractImageUrl(item, index)).filter((url) => url !== null);
 }
 function extractVideoUrl(item) {
-  var _a, _b, _c, _d, _e, _f;
-  if ((_c = (_b = (_a = item == null ? void 0 : item.video) == null ? void 0 : _a.transcoded_video) == null ? void 0 : _b.origin) == null ? void 0 : _c.video_url) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  if ((_c = (_b = (_a = item == null ? void 0 : item.common_attr) == null ? void 0 : _a.transcoded_video) == null ? void 0 : _b.origin) == null ? void 0 : _c.video_url) {
+    return item.common_attr.transcoded_video.origin.video_url;
+  }
+  if ((_f = (_e = (_d = item == null ? void 0 : item.video) == null ? void 0 : _d.transcoded_video) == null ? void 0 : _e.origin) == null ? void 0 : _f.video_url) {
     return item.video.transcoded_video.origin.video_url;
   }
-  if ((_d = item == null ? void 0 : item.video) == null ? void 0 : _d.play_url) {
+  if ((_g = item == null ? void 0 : item.video) == null ? void 0 : _g.play_url) {
     return item.video.play_url;
   }
-  if ((_e = item == null ? void 0 : item.video) == null ? void 0 : _e.download_url) {
+  if ((_h = item == null ? void 0 : item.video) == null ? void 0 : _h.download_url) {
     return item.video.download_url;
   }
-  if ((_f = item == null ? void 0 : item.video) == null ? void 0 : _f.url) {
+  if ((_i = item == null ? void 0 : item.video) == null ? void 0 : _i.url) {
     return item.video.url;
   }
   return null;
@@ -7638,20 +7687,15 @@ async function fetchHighQualityVideoUrl(itemId, refreshToken, regionInfo) {
         return videoUrl;
       }
     }
-    const hqUrlMatch = responseStr.match(/https:\/\/v[0-9]+-dreamnia\.jimeng\.com\/[^"\s\\]+/);
-    if (hqUrlMatch && hqUrlMatch[0]) {
-      logger_default.info(`\u6B63\u5219\u63D0\u53D6\u5230\u9AD8\u8D28\u91CF\u89C6\u9891URL (dreamnia): ${hqUrlMatch[0]}`);
-      return hqUrlMatch[0];
+    const cdnUrlMatch = responseStr.match(/https:\/\/v[0-9]+-[^"\\]*\.(jimeng|capcut|dreamina)\.com\/[^"\s\\]+/);
+    if (cdnUrlMatch && cdnUrlMatch[0]) {
+      logger_default.info(`\u6B63\u5219\u63D0\u53D6\u5230\u89C6\u9891URL: ${cdnUrlMatch[0]}`);
+      return cdnUrlMatch[0];
     }
-    const jimengUrlMatch = responseStr.match(/https:\/\/v[0-9]+-[^"\\]*\.jimeng\.com\/[^"\s\\]+/);
-    if (jimengUrlMatch && jimengUrlMatch[0]) {
-      logger_default.info(`\u6B63\u5219\u63D0\u53D6\u5230jimeng\u89C6\u9891URL: ${jimengUrlMatch[0]}`);
-      return jimengUrlMatch[0];
-    }
-    const anyVideoUrlMatch = responseStr.match(/https:\/\/v[0-9]+-[^"\\]*\.(vlabvod|jimeng)\.com\/[^"\s\\]+/);
-    if (anyVideoUrlMatch && anyVideoUrlMatch[0]) {
-      logger_default.info(`\u4ECEget_local_item_list\u63D0\u53D6\u5230\u89C6\u9891URL: ${anyVideoUrlMatch[0]}`);
-      return anyVideoUrlMatch[0];
+    const vlabUrlMatch = responseStr.match(/https:\/\/v[0-9]+-[^"\\]*\.vlabvod\.com\/[^"\s\\]+/);
+    if (vlabUrlMatch && vlabUrlMatch[0]) {
+      logger_default.info(`\u6B63\u5219\u63D0\u53D6\u5230\u89C6\u9891URL: ${vlabUrlMatch[0]}`);
+      return vlabUrlMatch[0];
     }
     logger_default.warn(`\u672A\u80FD\u4ECEget_local_item_list\u54CD\u5E94\u4E2D\u63D0\u53D6\u5230\u89C6\u9891URL`);
     return null;
@@ -8052,7 +8096,7 @@ async function uploadImageBuffer(imageBuffer, refreshToken, regionInfo) {
           "Authorization": auth,
           "Connection": "keep-alive",
           "Content-CRC32": crc32,
-          "Content-Disposition": 'attachment; filename="undefined"',
+          "Content-Disposition": 'attachment; filename="upload.bin"',
           "Content-Type": "application/octet-stream",
           "Origin": origin,
           "Referer": RegionUtils.getRefererPath(regionInfo),
@@ -10000,7 +10044,8 @@ async function generateVideo(_model, prompt, {
       isDefaultSeed: 1,
       originSubmitId,
       isRegenerate: false,
-      enterFrom: "click",
+      enterFrom: "use_bgimage_prompt",
+      position: "page_bottom_box",
       functionMode: flFunctionMode,
       sceneOptions: JSON.stringify([sceneOption])
     });
@@ -10125,7 +10170,7 @@ async function generateVideo(_model, prompt, {
     timeoutSeconds: pollerOptions.timeoutSeconds
   });
   const { result: pollingResult, data: finalHistoryData } = await poller.poll(async () => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l, _m, _n, _o;
     pollAttempts++;
     const result = await request("post", "/mweb/v1/get_history_by_ids", refreshToken, regionInfo, {
       data: {
@@ -10150,7 +10195,7 @@ async function generateVideo(_model, prompt, {
     const currentItemList = historyData.item_list || [];
     const finishTime = ((_a2 = historyData.task) == null ? void 0 : _a2.finish_time) || 0;
     if (currentItemList.length > 0) {
-      const tempVideoUrl = ((_e2 = (_d2 = (_c2 = (_b2 = currentItemList[0]) == null ? void 0 : _b2.video) == null ? void 0 : _c2.transcoded_video) == null ? void 0 : _d2.origin) == null ? void 0 : _e2.video_url) || ((_g2 = (_f2 = currentItemList[0]) == null ? void 0 : _f2.video) == null ? void 0 : _g2.play_url) || ((_i2 = (_h2 = currentItemList[0]) == null ? void 0 : _h2.video) == null ? void 0 : _i2.download_url) || ((_k2 = (_j2 = currentItemList[0]) == null ? void 0 : _j2.video) == null ? void 0 : _k2.url);
+      const tempVideoUrl = ((_e2 = (_d2 = (_c2 = (_b2 = currentItemList[0]) == null ? void 0 : _b2.common_attr) == null ? void 0 : _c2.transcoded_video) == null ? void 0 : _d2.origin) == null ? void 0 : _e2.video_url) || ((_i2 = (_h2 = (_g2 = (_f2 = currentItemList[0]) == null ? void 0 : _f2.video) == null ? void 0 : _g2.transcoded_video) == null ? void 0 : _h2.origin) == null ? void 0 : _i2.video_url) || ((_k2 = (_j2 = currentItemList[0]) == null ? void 0 : _j2.video) == null ? void 0 : _k2.play_url) || ((_m = (_l = currentItemList[0]) == null ? void 0 : _l.video) == null ? void 0 : _m.download_url) || ((_o = (_n = currentItemList[0]) == null ? void 0 : _n.video) == null ? void 0 : _o.url);
       if (tempVideoUrl) {
         logger_default.info(`\u68C0\u6D4B\u5230\u89C6\u9891URL: ${tempVideoUrl}`);
       }
@@ -10225,4 +10270,4 @@ lodash/lodash.js:
    * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
    *)
 */
-//# sourceMappingURL=chunk-2IIK4X7C.js.map
+//# sourceMappingURL=chunk-FAXTAAQO.js.map