maoda-commander-tt 0.0.16 → 0.0.17

package/dist/main.js

@@ -3238,6 +3238,7 @@ var POLL_INTERVAL_MS = 3e3;
 var POLL_STATUS_LOG_INTERVAL_MS = 1e4;
 var POLL_TIMEOUT_MS = 5 * 60 * 1e3;
 var SUBMIT_TIMEOUT_MS = 3e4;
+var DOWNLOAD_TIMEOUT_MS = 5 * 60 * 1e3;
 var AiVidCommand = class extends AiBaseCommand {
   _meta() {
     return {
@@ -3262,9 +3263,10 @@ var AiVidCommand = class extends AiBaseCommand {
       )
     );
     cmd.addOption(
-      new Option10("--duration <seconds>", "\u89C6\u9891\u65F6\u957F\uFF08\u79D2\uFF09\uFF0C\u7F3A\u7701\u4E0D\u6307\u5B9A").argParser(
-        parseDuration
-      )
+      new Option10(
+        "--duration <seconds>",
+        "\u89C6\u9891\u65F6\u957F\uFF08\u79D2\uFF09\uFF0C\u7F3A\u7701\u4E0D\u6307\u5B9A"
+      ).argParser(parseDuration)
     );
     cmd.addOption(
       new Option10(
@@ -3288,6 +3290,11 @@ var AiVidCommand = class extends AiBaseCommand {
       this._outputJsonError(1, "\u8BF7\u8F93\u5165\u89C6\u9891\u751F\u6210\u63D0\u793A\u8BCD");
       return this._makeOk();
     }
+    const token = resolveOpenRouterToken();
+    if (!token) {
+      this._outputJsonError(1, "\u7F3A\u5C11 OPENROUTER_AK\uFF0C\u8BF7\u5148\u914D\u7F6E\u53EF\u7528\u7684 API Key");
+      return this._makeOk();
+    }
     const referenceResult = await prepareReferenceImages(ctx.options.reference);
     if (!referenceResult.ok) {
       this._outputJsonError(referenceResult.code, referenceResult.msg);
@@ -3310,7 +3317,7 @@ var AiVidCommand = class extends AiBaseCommand {
         image_url: { url: item.dataUrl }
       }));
     }
-    const submitResult = await this._submitGeneration(requestBody);
+    const submitResult = await this._submitGeneration(requestBody, token);
     if (!submitResult.ok) {
       this._outputJsonError(submitResult.code, submitResult.msg);
       return this._makeOk();
@@ -3334,7 +3341,7 @@ var AiVidCommand = class extends AiBaseCommand {
       });
       return this._makeOk();
     }
-    const pollResult = await this._pollUntilComplete(pollingUrl);
+    const pollResult = await this._pollUntilComplete(pollingUrl, token);
     if (!pollResult.ok) {
       this._outputJsonError(pollResult.code, pollResult.msg);
       return this._makeOk();
@@ -3351,7 +3358,8 @@ var AiVidCommand = class extends AiBaseCommand {
     }
     const downloadResult = await downloadVideoToFile(
       videoUrl,
-      outputTargetResult.value
+      outputTargetResult.value,
+      token
     );
     if (!downloadResult.ok) {
       this._outputJsonError(downloadResult.code, downloadResult.msg);
@@ -3366,11 +3374,7 @@ var AiVidCommand = class extends AiBaseCommand {
     });
     return this._makeOk();
   }
-  async _submitGeneration(requestBody) {
-    const token = process.env.OPENROUTER_AK?.trim() || OPENROUTER_AK;
-    if (!token) {
-      return makeError(1, "\u7F3A\u5C11 OPENROUTER_AK\uFF0C\u8BF7\u5148\u914D\u7F6E\u53EF\u7528\u7684 API Key");
-    }
+  async _submitGeneration(requestBody, token) {
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), SUBMIT_TIMEOUT_MS);
     let response;
@@ -3414,8 +3418,7 @@ var AiVidCommand = class extends AiBaseCommand {
     }
     return makeOkWith(payload);
   }
-  async _pollUntilComplete(pollingUrl) {
-    const token = process.env.OPENROUTER_AK?.trim() || OPENROUTER_AK;
+  async _pollUntilComplete(pollingUrl, token) {
     const startedAt = Date.now();
     let lastStatusLogAt = 0;
     while (true) {
@@ -3470,6 +3473,9 @@ var AiVidCommand = class extends AiBaseCommand {
     }
   }
 };
+function resolveOpenRouterToken() {
+  return process.env.OPENROUTER_AK?.trim() || OPENROUTER_AK;
+}
 function parseReferencePaths3(value, previous) {
   return previous.concat(
     value.split(",").map((item) => item.trim()).filter((item) => item.length > 0)
@@ -3578,7 +3584,7 @@ async function resolveOutputTarget2(outputPath) {
     });
   }
 }
-async function downloadVideoToFile(remoteUrl, target) {
+async function downloadVideoToFile(remoteUrl, target, token) {
   try {
     await fs7.mkdir(target.directoryPath, { recursive: true });
   } catch (error) {
@@ -3588,18 +3594,33 @@ async function downloadVideoToFile(remoteUrl, target) {
       `\u521B\u5EFA\u8F93\u51FA\u76EE\u5F55\u5931\u8D25: ${target.directoryPath}: ${message}`
     );
   }
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), DOWNLOAD_TIMEOUT_MS);
   let response;
   try {
-    response = await fetch(remoteUrl);
+    response = await fetch(remoteUrl, {
+      headers: { Authorization: `Bearer ${token}` },
+      signal: controller.signal
+    });
   } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
+    const message = error instanceof Error && error.name === "AbortError" ? "\u4E0B\u8F7D\u8D85\u65F6" : error instanceof Error ? error.message : String(error);
     return makeError(1, `\u4E0B\u8F7D\u89C6\u9891\u5931\u8D25: ${message}`);
+  } finally {
+    clearTimeout(timer);
   }
   if (!response.ok) {
-    return makeError(response.status, `\u4E0B\u8F7D\u89C6\u9891\u5931\u8D25: HTTP ${response.status}`);
+    const detail = await response.text().catch(() => "");
+    const suffix = detail.trim() ? `: ${detail.trim().slice(0, 500)}` : "";
+    return makeError(
+      response.status,
+      `\u4E0B\u8F7D\u89C6\u9891\u5931\u8D25: HTTP ${response.status}${suffix}`
+    );
   }
   const bytes = Buffer.from(await response.arrayBuffer());
-  const targetPath = target.autoNamed ? replaceFileExtension2(target.filePath, inferVideoExtension(remoteUrl, response)) : target.filePath;
+  const targetPath = target.autoNamed ? replaceFileExtension2(
+    target.filePath,
+    inferVideoExtension(remoteUrl, response)
+  ) : target.filePath;
   try {
     await fs7.writeFile(targetPath, bytes);
   } catch (error) {