koishi-plugin-forward-hime 1.4.2-alpha.1 → 1.4.3

package/lib/decorator.d.ts

@@ -1,10 +1,10 @@
-import { Session, Element } from "koishi";
+import { Context, Session, Element } from "koishi";
 import { ConfigSet, ForwardNode } from "./config";
 interface ForwardMsg {
     head: Element[];
     content: Element[];
 }
-export declare function decoratorInit(cfg: ConfigSet): void;
+export declare function decoratorInit(ctx: Context, cfg: ConfigSet): void;
 export declare function defaultDecorator({ head, content }: ForwardMsg): Element[];
 export declare function defaultMiddleware(session: Session): ForwardMsg;
 export declare function MsgMiddlewareCache(session: Session): Promise<void>;

package/lib/index.js

@@ -362,8 +362,21 @@ var MediaRelayError = class extends Error {
     this.userMessage = userMessage;
   }
 };
-function relayInit(cfg) {
+function relayInit(ctx2, cfg) {
   relayConfig = cfg.MediaRelay;
+  ctx2.on("http/file", (url, options) => {
+    const { filename, file } = options;
+    if (typeof filename !== "string" || file !== filename) return;
+    const match = /^data:([\w.+/-]+);base64,(.*)$/.exec(url);
+    if (match) {
+      return {
+        data: Buffer.from(match[2], "base64"),
+        type: match[1],
+        mime: match[1],
+        filename
+      };
+    }
+  });
 }
 function cleanupExpiredRelayCache() {
   const now = Date.now();
@@ -425,16 +438,26 @@ function getCacheKey(element) {
   const src = mediaUrlFromElement(element);
   return `${mediaType}:${src}`;
 }
-function relayElementFromCache(item) {
-  return createRelayElement(item.kind, item.mime, item.buffer, item.filename);
+function relayElementFromCache(item, targetPlatform) {
+  return createRelayElement(
+    item.kind,
+    item.mime,
+    item.buffer,
+    item.filename,
+    targetPlatform
+  );
 }
-function createRelayElement(kind, mime, buffer, filename) {
+function createRelayElement(kind, mime, buffer, filename, targetPlatform) {
   const helperMap = import_koishi5.h;
   if (kind === "img") {
     return import_koishi5.h.image(buffer, mime);
   }
+  if (kind === "audio") {
+    return import_koishi5.h.audio(buffer, mime, { file: filename });
+  }
   if (kind === "file") {
-    return helperMap.file(buffer, mime, { filename });
+    const attrs = { file: filename, filename, title: filename };
+    return targetPlatform === "discord" ? import_koishi5.h.image(buffer, mime, attrs) : helperMap.file(buffer, mime, attrs);
   }
   if (helperMap[kind]) {
     return helperMap[kind](buffer, mime);
@@ -495,7 +518,7 @@ async function downloadAndRelay(element, traceId, session, node) {
         ...context
       });
     }
-    return relayElementFromCache(cacheItem);
+    return relayElementFromCache(cacheItem, node?.Platform);
   }
   const timeoutSignal = typeof AbortSignal.timeout === "function" ? AbortSignal.timeout(relayConfig.RequestTimeoutSec * 1e3) : void 0;
   const response = await fetch(src, { signal: timeoutSignal });
@@ -546,9 +569,9 @@ async function downloadAndRelay(element, traceId, session, node) {
       `\u5A92\u4F53\u6587\u4EF6\u8FC7\u5927\uFF08>${relayConfig.MaxFileSizeMB} MB\uFF09\uFF0C\u65E0\u6CD5\u4E2D\u8F6C\u53D1\u9001\u3002`
     );
   }
-  const mime = response.headers.get("content-type") || pickDefaultMime(kind);
-  const filename = kind === "file" ? pickFilename(element, src) : void 0;
-  const relayed = createRelayElement(kind, mime, buffer, filename);
+  const mime = response.headers.get("content-type")?.split(";")[0].trim() || pickDefaultMime(kind);
+  const filename = kind === "file" || kind === "audio" ? pickFilename(element, src) : void 0;
+  const relayed = createRelayElement(kind, mime, buffer, filename, node?.Platform);
   relayCache.set(cacheKey, {
     expiresAt: Date.now() + relayConfig.CacheMinutes * 60 * 1e3,
     kind,
@@ -608,9 +631,15 @@ async function relayForwardContent(content, traceId, session, node) {
 }
 
 // src/message.ts
+var DeliveryUncertainError = class extends Error {
+  constructor(cause) {
+    super("message delivery status unknown", { cause });
+  }
+};
 async function MessageSendWithDecorator(ctx2, node, session, Deco, traceId, attempt) {
   const startedAt = Date.now();
   const uuid = session.channelId + ":" + session.messageId;
+  let submitted = false;
   writeDiagnostic({
     traceId,
     phase: "send-attempt",
@@ -621,6 +650,7 @@ async function MessageSendWithDecorator(ctx2, node, session, Deco, traceId, atte
   });
   try {
     const content = await Deco(session, node, traceId);
+    submitted = true;
     const res = await ctx2.bots[`${node.Platform}:${node.BotID}`].sendMessage(
       node.Guild,
       content
@@ -663,7 +693,7 @@ async function MessageSendWithDecorator(ctx2, node, session, Deco, traceId, atte
     logger.error(
       `ERROR:<MessageSendWithDecorator ${node.Platform}> ctx=${ctx2} ${error}`
     );
-    throw error;
+    throw submitted ? new DeliveryUncertainError(error) : error;
   }
 }
 function sessionTypeArray(session) {
@@ -748,6 +778,10 @@ async function MessageForward(ctx2, node, session, timeoutSec, relayEnabled) {
     logger.error(
       `ERROR:<MessageSend ${node.Platform}> ctx=${ctx2} ${sessionTypeArray(session)} ${firstError}`
     );
+    if (firstError instanceof DeliveryUncertainError) {
+      writeDiagnostic({ traceId, phase: "forward-uncertain", source, target });
+      return;
+    }
     if (relayEnabled !== false && firstError instanceof MediaRelayError) {
       logger.info(
         `[MessageForward] relay failed, retrying without relay: ${node.Platform}`
@@ -765,6 +799,15 @@ async function MessageForward(ctx2, node, session, timeoutSec, relayEnabled) {
         logger.error(
           `ERROR:<MessageSendDirect ${node.Platform}> ctx=${ctx2} ${sessionTypeArray(session)} ${secondError}`
         );
+        if (secondError instanceof DeliveryUncertainError) {
+          writeDiagnostic({
+            traceId,
+            phase: "forward-uncertain",
+            source,
+            target
+          });
+          return;
+        }
         sendDegraded(reasonFromError(secondError));
       });
     } else {
@@ -795,11 +838,11 @@ function MsgUUIDFromSession(session) {
 var defaultPrefix = "";
 var defaultFallback = "";
 var defaultPrefixNewline = true;
-function decoratorInit(cfg) {
+function decoratorInit(ctx2, cfg) {
   defaultPrefix = cfg.DefaultDecorator.Prefix;
   defaultPrefixNewline = cfg.DefaultDecorator.Newline;
   defaultFallback = cfg.DefaultFallbackMsgPrefix;
-  relayInit(cfg);
+  relayInit(ctx2, cfg);
 }
 function renderTemplate(template, data) {
   return template.replace(/\$\{(\w+)\}/g, (_, key) => {
@@ -816,7 +859,10 @@ function defaultMiddleware(session) {
   if (defaultPrefixNewline) {
     head.push((0, import_koishi6.h)("br"));
   }
-  return { head, content: session.elements };
+  const content = session.platform === "discord" ? session.elements.map(
+    (element) => element.type === "record" ? (0, import_koishi6.h)("audio", element.attrs, element.children) : element
+  ) : session.elements;
+  return { head, content };
 }
 var localDecorators = [atTranslator, quoteTranslator];
 var msgMiddleCache = [];
@@ -842,6 +888,19 @@ function MsgToMiddleware(session) {
   }
   return defaultMiddleware(session);
 }
+function discordAudioAttachments(session, node, content) {
+  if (session.platform !== "onebot" || node.Platform !== "discord") {
+    return content;
+  }
+  return content.map((element) => {
+    if (element.type !== "audio") return element;
+    const src = element.attrs.src || element.attrs.url;
+    if (typeof src !== "string") return element;
+    const name2 = element.attrs.filename || element.attrs.file;
+    const filename = typeof name2 === "string" && /^[^/\\:]+\.[a-z\d]+$/i.test(name2) ? name2 : "voice.bin";
+    return import_koishi6.h.image(src, { file: filename, mode: "download" });
+  });
+}
 async function MsgMiddlewareCache(session) {
   const elems = MsgToMiddleware(session);
   msgMiddleCacheAppend({ UUID: MsgUUIDFromSession(session), msg: elems });
@@ -863,7 +922,11 @@ async function MsgDecorator(session, node, traceId) {
   }
   elems = {
     head: elems.head,
-    content: await relayForwardContent(elems.content, traceId, session, node)
+    content: discordAudioAttachments(
+      session,
+      node,
+      await relayForwardContent(elems.content, traceId, session, node)
+    )
   };
   if (_platform_out && typeof _platform_out.Decorator === "function") {
     return _platform_out.Decorator(elems);
@@ -884,6 +947,10 @@ async function MsgDecoratorNoRelay(session, node) {
     elems = await fn(session, node, elems);
   }
   logger.debug(`[MsgDecoratorNoRelay] fallback to direct forward`);
+  elems = {
+    head: elems.head,
+    content: discordAudioAttachments(session, node, elems.content)
+  };
   if (_platform_out && typeof _platform_out.Decorator === "function") {
     return _platform_out.Decorator(elems);
   } else {
@@ -993,7 +1060,7 @@ function apply(ctx2, cfg) {
   diagnosticsInit(ctx2);
   consoleInit(ctx2);
   msgCacheInit(ctx2, cfg);
-  decoratorInit(cfg);
+  decoratorInit(ctx2, cfg);
   ctx2.on("message-created", async (session) => {
     const hitGroup = [];
     for (const g in cfg.ForwardGroups) {

package/lib/relay.d.ts

@@ -1,4 +1,4 @@
-import { Element } from "koishi";
+import { Context, Element } from "koishi";
 import { ConfigSet } from "./config";
 import { Session } from "koishi";
 import { ForwardNode } from "./config";
@@ -6,5 +6,5 @@ export declare class MediaRelayError extends Error {
     userMessage: string;
     constructor(message: string, userMessage: string);
 }
-export declare function relayInit(cfg: ConfigSet): void;
+export declare function relayInit(ctx: Context, cfg: ConfigSet): void;
 export declare function relayForwardContent(content: Element[], traceId?: string, session?: Session, node?: ForwardNode): Promise<Element[]>;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "koishi-plugin-forward-hime",
 	"description": "多群组消息互通",
-	"version": "1.4.2-alpha.1",
+	"version": "1.4.3",
 	"author": {
 		"name": "xianii",
 		"email": "jiyucheng007@gmail.com"