koishi-plugin-smmcat-gptimage2 0.0.2 → 0.0.3

package/lib/index.d.ts

@@ -5,6 +5,8 @@ export interface Config {
     useMd: boolean;
     token: string;
     onlyUse: string[];
+    timeoutTime: number;
+    openNotice: boolean;
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -31,7 +31,9 @@ var Config = import_koishi.Schema.object({
   deBug: import_koishi.Schema.boolean().default(false).description("日志查看更多信息"),
   useMd: import_koishi.Schema.boolean().default(false).description("使用qqbot的md发送（未实装）"),
   token: import_koishi.Schema.string().default("").description("[万象灵算](https://wxls.bbroot.com/sign-up?aff=8FJR) 提供的 API 密钥"),
-  onlyUse: import_koishi.Schema.array(String).role("table").default([]).description("仅指定userId用户可用（为空则所有）")
+  onlyUse: import_koishi.Schema.array(String).role("table").default([]).description("仅指定userId用户可用（为空则所有）"),
+  timeoutTime: import_koishi.Schema.number().default(5).description("请求生图超时时间。（单位/分钟）"),
+  openNotice: import_koishi.Schema.boolean().default(true).description("开启进度播报（每隔一分钟，播报一次进度）")
 });
 function apply(ctx, config) {
   function sleep(ms = 1e3) {
@@ -45,7 +47,9 @@ function apply(ctx, config) {
       if (!ImgGpt.userCache[userId]) {
         ImgGpt.userCache[userId] = {
           progress: null,
-          lastResult: null
+          lastResult: null,
+          status: "未启动",
+          prompt: ""
         };
       }
       try {
@@ -65,11 +69,13 @@ function apply(ctx, config) {
         let progress = 0;
         let url = null;
         let prompt = null;
-        while (true) {
+        let status = null;
+        while (time < 60 * config.timeoutTime / 5) {
           const data = await ctx.http.post(`https://easy-tools.mgtv100.com/external/v1/pear/imageTaskShow`, { task_id: respose.id });
           config.deBug && console.log(data);
           progress = data.data?.progress || 0;
           prompt = data.data?.input?.prompt;
+          status = data.data?.status;
           if (data.data?.api_file_url) {
             if (Array.isArray(data.data?.api_file_url)) {
               url = data.data?.api_file_url[0];
@@ -80,15 +86,22 @@ function apply(ctx, config) {
           if (progress == 100) {
             ImgGpt.userCache[userId].progress = null;
             ImgGpt.userCache[userId].lastResult = url;
+            ImgGpt.userCache[userId].status = "已完成";
+            ImgGpt.userCache[userId].prompt = prompt;
             break;
+          } else {
+            ImgGpt.userCache[userId].progress = progress;
+            ImgGpt.userCache[userId].lastResult = null;
+            ImgGpt.userCache[userId].status = status;
+            ImgGpt.userCache[userId].prompt = prompt;
           }
-          if (time % 6 == 0) {
-            fn && await fn({ progress, url });
+          if (time % 12 == 0) {
+            fn && await fn({ progress, url, prompt, status });
           }
-          await sleep(1e4);
+          await sleep(5e3);
           time++;
         }
-        return { progress, url, prompt };
+        return { progress, url, prompt, status };
       } catch (error) {
         console.log(error.message);
         return null;
@@ -98,14 +111,51 @@ function apply(ctx, config) {
   ctx.command("获取标识").action(async ({ session }) => {
     return session.userId;
   });
+  ctx.command("当前进度").action(async ({ session }) => {
+    const temp = ImgGpt.userCache[session.userId] || null;
+    if (!temp) return `您暂未进行任何生图操作...`;
+    const max = temp?.progress && Math.floor(temp.progress / 10);
+    let i = 0;
+    await session.send(
+      `需求：${temp.prompt ? temp.prompt.length > 10 ? temp.prompt.slice(0, 10) + "..." : temp.prompt : "无"}
+状态：${temp.status || "未知"}
+当前进度：${temp.progress ? Array.from({ length: 10 }, () => {
+        i++;
+        if (i > max) {
+          return "□";
+        } else {
+          return "■";
+        }
+      }).join("") : "-"}`
+    );
+  });
   ctx.command("生图 <prompt:text>").action(async ({ session }, prompt) => {
     if (!config.onlyUse.includes(session.userId)) return `该功能暂不对外支持`;
     const text = import_koishi.h.select(prompt, "text")[0]?.attrs.content || null;
     const img = import_koishi.h.select(prompt, "img").map((item) => item.attrs.src) || null;
     if (!text) return `请携带需求发送，例如 /生图 生成一只猫娘`;
     await session.send("稍等，正在给你生...");
+    let messageId = null;
     const result = await ImgGpt.startGetImage(session, text, img, async (val) => {
-      await session.send(`当前进度：${val.progress}%`);
+      if (config.openNotice) {
+        if (messageId) {
+          await session.bot.deleteMessage(session.channelId, messageId);
+        }
+        const max = Math.floor(val.progress / 10);
+        let i = 0;
+        messageId = await session.send(
+          `需求：${val.prompt.length > 10 ? val.prompt.slice(0, 10) + "..." : val.prompt}
+状态：${val.status}
+当前进度：${Array.from({ length: 10 }, () => {
+            i++;
+            if (i > max) {
+              return "□";
+            } else {
+              return "■";
+            }
+          }).join("")}`
+        );
+      }
     });
     console.log(result);
     if (!result) return `生成失败！`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-smmcat-gptimage2",
   "description": "简单去使用云接口 GPT-Image2",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [