koishi-plugin-forward-hime 1.4.0 → 1.4.1-alpha.0

package/lib/config.d.ts

@@ -17,6 +17,7 @@ export interface ConfigSet {
         RequestTimeoutSec: number;
         MaxFileSizeMB: number;
     };
+    ForwardTimeoutSec: number;
     CacheTimeout: number;
     ForwardGroups: {
         Nodes: ForwardNode[];

package/lib/decorator.d.ts

@@ -9,6 +9,7 @@ export declare function defaultDecorator({ head, content }: ForwardMsg): Element
 export declare function defaultMiddleware(session: Session): ForwardMsg;
 export declare function MsgMiddlewareCache(session: Session): Promise<void>;
 export declare function MsgDecorator(session: Session, node: ForwardNode): Promise<any>;
+export declare function MsgDecoratorNoRelay(session: Session, node: ForwardNode): Promise<any>;
 export declare function MsgDecoratorFallback(session: Session, node: ForwardNode): Promise<Element[]>;
 export declare function MsgDecoratorFallbackReason(session: Session, node: ForwardNode, reason: string): Promise<Element[]>;
 export {};

package/lib/index.js

@@ -70,8 +70,8 @@ async function msgCacheFindByUUID(uuid) {
   if (cacheNotEnabled()) {
     return;
   }
-  let caches = await ctx.cache.entries("msgCache");
-  let result = [];
+  const caches = await ctx.cache.entries("msgCache");
+  const result = [];
   for await (const item of caches) {
     if (item[1].uuid === uuid) {
       result.push(item);
@@ -83,7 +83,7 @@ async function msgCacheGetLocalIDByUUID(node, uuid) {
   if (cacheNotEnabled()) {
     return;
   }
-  let caches = await ctx.cache.entries("msgCache");
+  const caches = await ctx.cache.entries("msgCache");
   for await (const item of caches) {
     if (item[1].uuid === uuid && item[1].platform === node.Platform && item[1].guild === node.Guild && item[1].bot === node.BotID) {
       return item[1].msgid;
@@ -103,6 +103,7 @@ var createConfig = () => import_koishi2.Schema.intersect([
       Newline: import_koishi2.Schema.boolean().description("\u662F\u5426\u6362\u884C").default(true)
     }).description("\u9ED8\u8BA4\u88C5\u9970\u5668"),
     DefaultFallbackMsgPrefix: import_koishi2.Schema.string().description("\u9ED8\u8BA4Fallback\u6D88\u606F\u524D\u7F00").default("[\u6D88\u606F\u964D\u7EA7] "),
+    ForwardTimeoutSec: import_koishi2.Schema.number().description("\u8F6C\u53D1\u603B\u8D85\u65F6\u65F6\u95F4\uFF08\u79D2\uFF09- \u542B\u5A92\u4F53\u4E0B\u8F7D\u4E0E\u53D1\u9001\uFF0C\u8D85\u65F6\u5219\u964D\u7EA7").default(30).min(5).max(120),
     MediaRelay: import_koishi2.Schema.object({
       Enabled: import_koishi2.Schema.boolean().description("\u542F\u7528\u5A92\u4F53\u4E2D\u8F6C\uFF08\u4E0B\u8F7D\u540E\u518D\u8F6C\u53D1\uFF09").default(true),
       CacheMinutes: import_koishi2.Schema.number().description("\u5A92\u4F53\u6682\u5B58\u65F6\u95F4\uFF08\u5206\u949F\uFF09").default(10).min(1).max(180),
@@ -164,7 +165,7 @@ var kook_default = {
 // src/decorators/onebot.ts
 var import_koishi4 = require("koishi");
 function cqJsonTranslator(content, elem) {
-  let json = JSON.parse(elem.attrs.data);
+  const json = JSON.parse(elem.attrs.data);
   let hit = 0;
   if (json) {
     if (json.prompt) {
@@ -201,10 +202,10 @@ function getNameFromQQat(elem) {
 }
 function Middleware(session) {
   const platform = guessPlatform(session);
-  let sessionTemp = session;
+  const sessionTemp = session;
   sessionTemp.platform = platform;
-  let head = defaultMiddleware(sessionTemp).head;
-  let newContent = [];
+  const head = defaultMiddleware(sessionTemp).head;
+  const newContent = [];
   if (platform === "QQ") {
     IdNameCache.set(session.userId, session.username);
     for (const key in session.elements) {
@@ -460,7 +461,7 @@ async function MessageSendWithDecorator(ctx2, node, session, Deco) {
   const uuid = session.channelId + ":" + session.messageId;
   const content = await Deco(session, node);
   await ctx2.bots[`${node.Platform}:${node.BotID}`].sendMessage(node.Guild, content).then((res) => {
-    let mc = {
+    const mc = {
       platform: node.Platform,
       bot: node.BotID,
       guild: node.Guild,
@@ -487,26 +488,57 @@ function sessionTypeArray(session) {
   });
   return contentTypes;
 }
-async function MessageForward(ctx2, node, session) {
+async function MessageForward(ctx2, node, session, timeoutSec, relayEnabled) {
   if (!botExistsCheck(ctx2, node)) {
     return;
   }
-  MessageSendWithDecorator(ctx2, node, session, MsgDecorator).catch((error) => {
-    logger.error(
-      `ERROR:<MessageSend ${node.Platform}> ctx=${ctx2} ${sessionTypeArray(session)} ${error}`
+  const timeoutMs = (timeoutSec ?? 30) * 1e3;
+  const deco = relayEnabled !== false ? MsgDecorator : MsgDecoratorNoRelay;
+  function withTimeout(promise) {
+    const timeoutPromise = new Promise(
+      (_, reject) => setTimeout(() => reject(new Error("forward total timeout")), timeoutMs)
     );
-    const readableReason = error instanceof MediaRelayError ? `[\u8F6C\u53D1\u5931\u8D25] ${error.userMessage} ` : void 0;
-    const fallbackDeco = readableReason ? (fallbackSession, fallbackNode) => MsgDecoratorFallbackReason(
-      fallbackSession,
-      fallbackNode,
-      readableReason
-    ) : MsgDecoratorFallback;
-    MessageSendWithDecorator(ctx2, node, session, fallbackDeco).catch((error2) => {
+    return Promise.race([promise, timeoutPromise]);
+  }
+  function sendDegraded(reason) {
+    const fallbackDeco = reason ? (fallbackSession, fallbackNode) => MsgDecoratorFallbackReason(fallbackSession, fallbackNode, reason) : MsgDecoratorFallback;
+    MessageSendWithDecorator(ctx2, node, session, fallbackDeco).catch((error) => {
       logger.error(
-        `ERROR:<MessageSendFallback ${node.Platform}> ctx=${ctx2} ${sessionTypeArray(session)} ${error2}`
+        `ERROR:<MessageSendFallback ${node.Platform}> ctx=${ctx2} ${sessionTypeArray(session)} ${error}`
       );
     });
-  });
+  }
+  function reasonFromError(error) {
+    if (error instanceof MediaRelayError) {
+      return `[\u8F6C\u53D1\u5931\u8D25] ${error.userMessage} `;
+    }
+    if (error instanceof Error && error.message === "forward total timeout") {
+      return "[\u8F6C\u53D1\u8D85\u65F6] ";
+    }
+    return void 0;
+  }
+  withTimeout(MessageSendWithDecorator(ctx2, node, session, deco)).catch(
+    (firstError) => {
+      logger.error(
+        `ERROR:<MessageSend ${node.Platform}> ctx=${ctx2} ${sessionTypeArray(session)} ${firstError}`
+      );
+      if (relayEnabled !== false && firstError instanceof MediaRelayError) {
+        logger.info(
+          `[MessageForward] relay failed, retrying without relay: ${node.Platform}`
+        );
+        withTimeout(
+          MessageSendWithDecorator(ctx2, node, session, MsgDecoratorNoRelay)
+        ).catch((secondError) => {
+          logger.error(
+            `ERROR:<MessageSendDirect ${node.Platform}> ctx=${ctx2} ${sessionTypeArray(session)} ${secondError}`
+          );
+          sendDegraded(reasonFromError(secondError));
+        });
+      } else {
+        sendDegraded(reasonFromError(firstError));
+      }
+    }
+  );
 }
 async function MessageDelete(ctx2, msg) {
   if (!botExistsCheck(ctx2, { Platform: msg.platform, BotID: msg.bot, Guild: msg.guild })) {
@@ -548,7 +580,7 @@ function defaultDecorator({ head, content }) {
   return msg;
 }
 function defaultMiddleware(session) {
-  let head = [(0, import_koishi6.h)("span", renderTemplate(defaultPrefix, session))];
+  const head = [(0, import_koishi6.h)("span", renderTemplate(defaultPrefix, session))];
   if (defaultPrefixNewline) {
     head.push((0, import_koishi6.h)("br"));
   }
@@ -572,24 +604,21 @@ function msgMiddleCacheFind(uuid) {
   return null;
 }
 function MsgToMiddleware(session) {
-  let elems = { head: [], content: [] };
-  let _platform_in = decorators_exports[session.platform];
+  const _platform_in = decorators_exports[session.platform];
   if (_platform_in && typeof _platform_in.Middleware === "function") {
-    elems = _platform_in.Middleware(session);
-  } else {
-    elems = defaultMiddleware(session);
+    return _platform_in.Middleware(session);
   }
-  return elems;
+  return defaultMiddleware(session);
 }
 async function MsgMiddlewareCache(session) {
-  let elems = MsgToMiddleware(session);
+  const elems = MsgToMiddleware(session);
   msgMiddleCacheAppend({ UUID: MsgUUIDFromSession(session), msg: elems });
   logger.debug(`[msgMiddleCache] CACHED`);
 }
 async function MsgDecorator(session, node) {
   let elems;
-  let _platform_out = decorators_exports[node.Platform];
-  let elemCache = msgMiddleCacheFind(MsgUUIDFromSession(session));
+  const _platform_out = decorators_exports[node.Platform];
+  const elemCache = msgMiddleCacheFind(MsgUUIDFromSession(session));
   if (elemCache) {
     logger.debug(`[msgMiddleCache] HIT`);
     elems = elemCache;
@@ -610,9 +639,28 @@ async function MsgDecorator(session, node) {
     return defaultDecorator(elems);
   }
 }
+async function MsgDecoratorNoRelay(session, node) {
+  let elems;
+  const _platform_out = decorators_exports[node.Platform];
+  const elemCache = msgMiddleCacheFind(MsgUUIDFromSession(session));
+  if (elemCache) {
+    elems = elemCache;
+  } else {
+    elems = MsgToMiddleware(session);
+  }
+  for (const fn of localDecorators) {
+    elems = await fn(session, node, elems);
+  }
+  logger.debug(`[MsgDecoratorNoRelay] fallback to direct forward`);
+  if (_platform_out && typeof _platform_out.Decorator === "function") {
+    return _platform_out.Decorator(elems);
+  } else {
+    return defaultDecorator(elems);
+  }
+}
 function defaultDecoratorFallback({ head, content }, reason) {
   let msg = [];
-  let newContent = [];
+  const newContent = [];
   newContent.push((0, import_koishi6.h)("span", reason || defaultFallback));
   for (const key in content) {
     if (["img", "audio", "video", "file"].includes(content[key].type)) {
@@ -625,16 +673,14 @@ function defaultDecoratorFallback({ head, content }, reason) {
   return msg;
 }
 async function MsgDecoratorFallback(session, node) {
-  let elems = { head: [], content: [] };
-  elems = defaultMiddleware(session);
+  let elems = defaultMiddleware(session);
   for (const fn of localDecorators) {
     elems = await fn(session, node, elems);
   }
   return defaultDecoratorFallback(elems);
 }
 async function MsgDecoratorFallbackReason(session, node, reason) {
-  let elems = { head: [], content: [] };
-  elems = defaultMiddleware(session);
+  let elems = defaultMiddleware(session);
   for (const fn of localDecorators) {
     elems = await fn(session, node, elems);
   }
@@ -642,7 +688,7 @@ async function MsgDecoratorFallbackReason(session, node, reason) {
 }
 async function atTranslator(session, _, { head, content }) {
   const newMsg = await new Promise((resolve) => {
-    let newContent = [];
+    const newContent = [];
     for (const key in content) {
       const element = content[key];
       if (element.type === "at") {
@@ -666,9 +712,9 @@ async function quoteTranslator(session, node, { head, content }) {
   const key = session.channelId + ":" + session.quote.id;
   const cache = await msgCacheFindByKey(key);
   if (cache) {
-    let msgid = await msgCacheGetLocalIDByUUID(node, cache.uuid);
+    const msgid = await msgCacheGetLocalIDByUUID(node, cache.uuid);
     if (msgid) {
-      let newHead = [(0, import_koishi6.h)("quote", { id: msgid })].concat(head);
+      const newHead = [(0, import_koishi6.h)("quote", { id: msgid })].concat(head);
       return { head: newHead, content };
     } else {
       logger.error(`[msgCacheGetLocalIDByUUID] ${cache.uuid} not found`);
@@ -712,7 +758,7 @@ function apply(ctx2, cfg) {
             session.platform,
             session.channelId + ":" + session.messageId
           );
-          let uuid = MsgUUIDFromSession(session);
+          const uuid = MsgUUIDFromSession(session);
           msgCache({
             platform: session.platform,
             bot: group.Nodes[k].BotID,
@@ -732,7 +778,13 @@ function apply(ctx2, cfg) {
       const group = cfg.ForwardGroups[hitGroup[g]];
       for (const k in group.Nodes) {
         if (group.Nodes[k].Guild !== session.channelId) {
-          MessageForward(ctx2, group.Nodes[k], session);
+          MessageForward(
+            ctx2,
+            group.Nodes[k],
+            session,
+            cfg.ForwardTimeoutSec,
+            cfg.MediaRelay.Enabled
+          );
         }
       }
     }

package/lib/message.d.ts

@@ -1,7 +1,7 @@
 import { Context, Session } from "koishi";
 import { ForwardNode } from "./config";
 import { MsgCache } from "./cache";
-export declare function MessageForward(ctx: Context, node: ForwardNode, session: Session): Promise<void>;
+export declare function MessageForward(ctx: Context, node: ForwardNode, session: Session, timeoutSec?: number, relayEnabled?: boolean): Promise<void>;
 export declare function MessageDelete(ctx: Context, msg: MsgCache): Promise<void>;
 export declare function MessageEdit(ctx: Context, node: ForwardNode, _session: Session): Promise<void>;
 export declare function MsgUUIDFromSession(session: Session): string;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "koishi-plugin-forward-hime",
 	"description": "多群组消息互通",
-	"version": "1.4.0",
+	"version": "1.4.1-alpha.0",
 	"author": {
 		"name": "xianii",
 		"email": "jiyucheng007@gmail.com"
@@ -35,22 +35,25 @@
 		"koishi": "^4.18.7"
 	},
 	"devDependencies": {
+		"@eslint/compat": "^2.1.0",
+		"@eslint/js": "^10.0.1",
 		"@koishijs/cache": "^2.0.0",
 		"@types/node": "^22.15.0",
 		"@typescript-eslint/eslint-plugin": "^7.13.0",
 		"@typescript-eslint/parser": "^7.13.0",
+		"esbuild": "^0.25.9",
 		"eslint": "^9.4.0",
+		"eslint-config-prettier": "^9.1.0",
 		"eslint-plugin-import": "^2.31.0",
 		"eslint-plugin-jsx-a11y": "^6.10.2",
-		"eslint-config-prettier": "^9.1.0",
 		"eslint-plugin-prettier": "^5.1.3",
 		"eslint-plugin-unused-imports": "^4.0.0",
-		"esbuild": "^0.25.9",
 		"husky": "^9.0.11",
 		"koishi": "^4.18.7",
 		"lint-staged": "^15.2.7",
 		"prettier": "^3.3.2",
-		"typescript": "~5.4.5"
+		"typescript": "~5.4.5",
+		"typescript-eslint": "^8.62.0"
 	},
 	"scripts": {
 		"prepare": "husky",