koishi-plugin-aka-ai-generator 0.7.3 → 0.7.5

package/lib/index.js

@@ -954,12 +954,12 @@ var YunwuVideoProvider = class {
         logger?.error("API 返回错误状态", { status: response.status, error: errorMsg, response: response.data });
         throw new Error(sanitizeString(errorMsg));
       }
-      const taskId = response.id || response.data?.id;
+      const taskId = response.id;
       if (!taskId) {
         logger?.error("未能获取任务ID", { response });
         throw new Error("未能获取任务ID，请检查 API 响应格式");
       }
-      logger?.info("视频任务已创建", { taskId });
+      logger?.info("视频任务已创建", { taskId, status: response.status });
       return taskId;
     } catch (error) {
       logger?.error("创建视频任务失败", { error: sanitizeError(error) });
@@ -979,54 +979,31 @@ var YunwuVideoProvider = class {
   }
   /**
    * 查询任务状态
-   * API: GET /v1/video/{taskId} (根据创建端点的模式推断)
+   * API: GET /v1/video/query?id={taskId}
    */
   async queryTaskStatus(taskId) {
     const { logger, ctx } = this.config;
     try {
-      const possibleEndpoints = [
-        `/v1/video/${taskId}`,
-        `/v1/video/status/${taskId}`,
-        `/v1/videos/generations/${taskId}`
-      ];
-      let response = null;
-      let lastError = null;
-      for (const endpoint of possibleEndpoints) {
-        try {
-          response = await ctx.http.get(
-            `${this.config.apiBase}${endpoint}`,
-            {
-              headers: {
-                "Authorization": `Bearer ${this.config.apiKey}`,
-                "Accept": "application/json"
-              },
-              timeout: this.config.apiTimeout * 1e3
-            }
-          );
-          if (response && !response.error) {
-            logger?.debug("查询任务状态成功", { taskId, endpoint });
-            break;
-          }
-        } catch (err) {
-          lastError = err;
-          if (err.response?.status === 404 && possibleEndpoints.indexOf(endpoint) < possibleEndpoints.length - 1) {
-            logger?.debug("尝试下一个查询端点", { taskId, endpoint, nextEndpoint: possibleEndpoints[possibleEndpoints.indexOf(endpoint) + 1] });
-            continue;
-          }
-          throw err;
+      const endpoint = `/v1/video/query?id=${encodeURIComponent(taskId)}`;
+      logger?.debug("查询任务状态", { taskId, endpoint });
+      const response = await ctx.http.get(
+        `${this.config.apiBase}${endpoint}`,
+        {
+          headers: {
+            "Authorization": `Bearer ${this.config.apiKey}`,
+            "Accept": "application/json"
+          },
+          timeout: this.config.apiTimeout * 1e3
         }
-      }
-      if (!response) {
-        throw lastError || new Error("所有查询端点都失败");
-      }
-      const status = response.status || response.data?.status || "pending";
-      const videoUrl = response.video_url || response.url || response.data?.video_url || response.data?.url;
+      );
+      const status = response.status || "pending";
+      const videoUrl = response.video_url || null;
       return {
         status,
-        taskId,
-        videoUrl,
-        error: response.error || response.data?.error,
-        progress: response.progress || response.data?.progress
+        taskId: response.id || taskId,
+        videoUrl: videoUrl || void 0,
+        error: response.error,
+        progress: response.progress
       };
     } catch (error) {
       logger?.error("查询任务状态失败", { taskId, error: sanitizeError(error) });
@@ -1043,6 +1020,8 @@ var YunwuVideoProvider = class {
   async pollTaskCompletion(taskId, maxWaitTime = 300, pollInterval = 3, onProgress) {
     const { logger } = this.config;
     const startTime = Date.now();
+    let consecutiveFailures = 0;
+    const maxConsecutiveFailures = 5;
     while (true) {
       const elapsed = (Date.now() - startTime) / 1e3;
       if (elapsed > maxWaitTime) {
@@ -1050,17 +1029,40 @@ var YunwuVideoProvider = class {
         throw new Error(`视频生成超时（已等待${Math.floor(elapsed)}秒），任务ID: ${taskId}
 请使用"查询视频 ${taskId}"命令稍后查询结果`);
       }
-      const status = await this.queryTaskStatus(taskId);
-      logger?.debug("任务状态", { taskId, status: status.status, elapsed: Math.floor(elapsed) });
-      if (onProgress) {
-        await onProgress(status);
-      }
-      if (status.status === "completed" && status.videoUrl) {
-        logger?.info("视频生成完成", { taskId, elapsed: Math.floor(elapsed) });
-        return status.videoUrl;
-      }
-      if (status.status === "failed") {
-        throw new Error(status.error || "视频生成失败");
+      try {
+        const status = await this.queryTaskStatus(taskId);
+        consecutiveFailures = 0;
+        logger?.debug("任务状态", { taskId, status: status.status, elapsed: Math.floor(elapsed) });
+        if (onProgress) {
+          await onProgress(status);
+        }
+        if (status.status === "completed" && status.videoUrl) {
+          logger?.info("视频生成完成", { taskId, elapsed: Math.floor(elapsed) });
+          return status.videoUrl;
+        }
+        if (status.status === "failed") {
+          throw new Error(status.error || "视频生成失败");
+        }
+      } catch (error) {
+        consecutiveFailures++;
+        logger?.warn("查询任务状态失败，继续重试", {
+          taskId,
+          consecutiveFailures,
+          maxConsecutiveFailures,
+          error: sanitizeError(error),
+          elapsed: Math.floor(elapsed)
+        });
+        if (consecutiveFailures >= maxConsecutiveFailures) {
+          logger?.error("连续查询失败次数过多，终止轮询", {
+            taskId,
+            consecutiveFailures,
+            elapsed: Math.floor(elapsed)
+          });
+          throw new Error(`查询任务状态连续失败 ${consecutiveFailures} 次，任务ID: ${taskId}
+请稍后使用"查询视频 ${taskId}"命令手动查询结果`);
+        }
+        await new Promise((resolve) => setTimeout(resolve, pollInterval * 1e3 * 2));
+        continue;
       }
       await new Promise((resolve) => setTimeout(resolve, pollInterval * 1e3));
     }
@@ -1073,6 +1075,8 @@ var YunwuVideoProvider = class {
     try {
       logger?.info("开始生成视频", { prompt, imageUrl, options });
       const taskId = await this.createVideoTask(prompt, imageUrl, options);
+      logger?.debug("任务已创建，等待 3 秒后开始查询", { taskId });
+      await new Promise((resolve) => setTimeout(resolve, 3e3));
       const videoUrl = await this.pollTaskCompletion(taskId, maxWaitTime);
       logger?.info("视频生成完成", { taskId, videoUrl });
       return videoUrl;

package/lib/providers/yunwu-video.d.ts

@@ -14,7 +14,7 @@ export declare class YunwuVideoProvider implements VideoProvider {
     createVideoTask(prompt: string, imageUrl: string, options?: VideoGenerationOptions): Promise<string>;
     /**
      * 查询任务状态
-     * API: GET /v1/video/{taskId} (根据创建端点的模式推断)
+     * API: GET /v1/video/query?id={taskId}
      */
     queryTaskStatus(taskId: string): Promise<VideoTaskStatus>;
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-aka-ai-generator",
   "description": "自用AI生成插件(GPTGod & Yunwu)",
-  "version": "0.7.3",
+  "version": "0.7.5",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [