koishi-plugin-aka-ai-generator 0.7.8 → 0.7.11

package/lib/index.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -28,6 +38,7 @@ module.exports = __toCommonJS(src_exports);
 var import_koishi2 = require("koishi");
 
 // src/providers/utils.ts
+var import_jimp = __toESM(require("jimp"));
 function sanitizeError(error) {
   if (!error) return error;
   if (typeof error === "string") {
@@ -92,6 +103,21 @@ async function downloadImageAsBase64(ctx, url, timeout, logger, maxSize = 10 * 1
         mimeType = "image/gif";
       }
     }
+    if (mimeType === "image/gif") {
+      try {
+        logger.debug("检测到 GIF 图片，正在转换为 JPEG", { url });
+        const image = await import_jimp.default.read(buffer);
+        const jpegBuffer = await image.getBufferAsync(import_jimp.default.MIME_JPEG);
+        const jpegBase64 = jpegBuffer.toString("base64");
+        logger.info("GIF 已转换为 JPEG", {
+          originalSize: buffer.length,
+          newSize: jpegBuffer.length
+        });
+        return { data: jpegBase64, mimeType: "image/jpeg" };
+      } catch (conversionError) {
+        logger.warn("GIF 转换失败，尝试原样发送", { error: conversionError?.message });
+      }
+    }
     logger.debug("图片下载并转换为Base64", { url, mimeType, size: base64.length });
     return { data: base64, mimeType };
   } catch (error) {
@@ -2459,6 +2485,45 @@ ${infoParts.join("\n")}`;
           return addResult.message || "队列已满，请先查询已有任务";
         }
         await session.send("开始生成视频...");
+        await new Promise((resolve) => setTimeout(resolve, 1e4));
+        try {
+          const firstStatus = await videoProvider.queryTaskStatus(taskId);
+          if (firstStatus.status === "failed") {
+            const errorMsg = firstStatus.error || "视频生成失败";
+            await userManager.deletePendingVideoTask(taskId);
+            return `视频生成失败：${sanitizeString(errorMsg)}`;
+          }
+          if (firstStatus.status === "completed" && firstStatus.videoUrl) {
+            await session.send(import_koishi2.h.video(firstStatus.videoUrl));
+            await recordUserUsage(session, "图生视频", videoCredits, false);
+            await userManager.markPendingVideoTaskCharged(taskId);
+            await userManager.deletePendingVideoTask(taskId);
+            return "视频生成完成！";
+          }
+          await session.send("视频正在生成中，请稍候...");
+        } catch (error) {
+          logger.error("第一次查询视频状态失败", { taskId, error: sanitizeError(error) });
+        }
+        await new Promise((resolve) => setTimeout(resolve, config.videoMaxWaitTime * 1e3));
+        try {
+          const secondStatus = await videoProvider.queryTaskStatus(taskId);
+          if (secondStatus.status === "completed" && secondStatus.videoUrl) {
+            await session.send(import_koishi2.h.video(secondStatus.videoUrl));
+            await recordUserUsage(session, "图生视频", videoCredits, false);
+            await userManager.markPendingVideoTaskCharged(taskId);
+            await userManager.deletePendingVideoTask(taskId);
+            return "视频生成完成！";
+          } else if (secondStatus.status === "failed") {
+            const errorMsg = secondStatus.error || "视频生成失败";
+            await userManager.deletePendingVideoTask(taskId);
+            return `视频生成失败：${sanitizeString(errorMsg)}`;
+          } else {
+            return '视频仍在生成中，请稍后使用"查询视频"指令获取结果';
+          }
+        } catch (error) {
+          logger.error("第二次查询视频状态失败", { taskId, error: sanitizeError(error) });
+          return '视频生成中，请稍后使用"查询视频"指令获取结果';
+        }
       } catch (error) {
         logger.error("视频生成任务提交失败", { userId, error: sanitizeError(error) });
         if (createdTaskId) {
@@ -2627,6 +2692,45 @@ ${messages.join("\n")}`;
             return addResult.message || "队列已满，请先查询已有任务";
           }
           await session.send(`开始生成视频（${style.commandName}）...`);
+          await new Promise((resolve) => setTimeout(resolve, 1e4));
+          try {
+            const firstStatus = await videoProvider.queryTaskStatus(taskId);
+            if (firstStatus.status === "failed") {
+              const errorMsg = firstStatus.error || "视频生成失败";
+              await userManager.deletePendingVideoTask(taskId);
+              return `视频生成失败：${sanitizeString(errorMsg)}`;
+            }
+            if (firstStatus.status === "completed" && firstStatus.videoUrl) {
+              await session.send(import_koishi2.h.video(firstStatus.videoUrl));
+              await recordUserUsage(session, style.commandName, videoCredits, false);
+              await userManager.markPendingVideoTaskCharged(taskId);
+              await userManager.deletePendingVideoTask(taskId);
+              return "视频生成完成！";
+            }
+            await session.send("视频正在生成中，请稍候...");
+          } catch (error) {
+            logger.error("第一次查询视频状态失败", { taskId, error: sanitizeError(error) });
+          }
+          await new Promise((resolve) => setTimeout(resolve, config.videoMaxWaitTime * 1e3));
+          try {
+            const secondStatus = await videoProvider.queryTaskStatus(taskId);
+            if (secondStatus.status === "completed" && secondStatus.videoUrl) {
+              await session.send(import_koishi2.h.video(secondStatus.videoUrl));
+              await recordUserUsage(session, style.commandName, videoCredits, false);
+              await userManager.markPendingVideoTaskCharged(taskId);
+              await userManager.deletePendingVideoTask(taskId);
+              return "视频生成完成！";
+            } else if (secondStatus.status === "failed") {
+              const errorMsg = secondStatus.error || "视频生成失败";
+              await userManager.deletePendingVideoTask(taskId);
+              return `视频生成失败：${sanitizeString(errorMsg)}`;
+            } else {
+              return '视频仍在生成中，请稍后使用"查询视频"指令获取结果';
+            }
+          } catch (error) {
+            logger.error("第二次查询视频状态失败", { taskId, error: sanitizeError(error) });
+            return '视频生成中，请稍后使用"查询视频"指令获取结果';
+          }
         } catch (error) {
           logger.error("视频风格转换任务提交失败", { userId, style: style.commandName, error: sanitizeError(error) });
           if (createdTaskId) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-aka-ai-generator",
   "description": "自用AI生成插件(GPTGod & Yunwu)",
-  "version": "0.7.8",
+  "version": "0.7.11",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -24,5 +24,8 @@
   },
   "peerDependencies": {
     "koishi": "^4.18.9"
+  },
+  "dependencies": {
+    "jimp": "^0.22.10"
   }
-}
+}