koishi-plugin-forward-hime 1.4.2-alpha.2 → 1.4.4-alpha.0

package/lib/index.js

@@ -411,12 +411,23 @@ function pickDefaultMime(kind) {
       return DEFAULT_IMAGE_MIME;
     case "audio":
       return DEFAULT_AUDIO_MIME;
-    case "video":
-      return DEFAULT_VIDEO_MIME;
     default:
       return DEFAULT_FILE_MIME;
   }
 }
+function detectVideoMime(buffer) {
+  if (buffer.toString("ascii", 4, 8) === "ftyp") {
+    return buffer.toString("ascii", 8, 12) === "qt  " ? "video/quicktime" : DEFAULT_VIDEO_MIME;
+  }
+  if (buffer.subarray(0, 4).equals(Buffer.from([26, 69, 223, 163]))) {
+    const header = buffer.toString("ascii", 0, 64);
+    if (header.includes("webm")) return "video/webm";
+    if (header.includes("matroska")) return "video/x-matroska";
+  }
+  if (buffer.toString("ascii", 0, 4) === "RIFF" && buffer.toString("ascii", 8, 12) === "AVI ") {
+    return "video/x-msvideo";
+  }
+}
 function pickFilename(element, src) {
   const nameAttrs = ["filename", "name", "title", "file"];
   for (const key of nameAttrs) {
@@ -433,6 +444,18 @@ function pickFilename(element, src) {
     return "relay-file";
   }
 }
+function pickVideoFilename(element, src, mime) {
+  const filename = pickFilename(element, src);
+  if (/^[^/\\:]+\.(mp4|mov|webm|mkv|avi)$/i.test(filename)) return filename;
+  const extensions = {
+    "video/mp4": "mp4",
+    "video/quicktime": "mov",
+    "video/webm": "webm",
+    "video/x-matroska": "mkv",
+    "video/x-msvideo": "avi"
+  };
+  return `video.${extensions[mime] || "bin"}`;
+}
 function getCacheKey(element) {
   const mediaType = normalizeMediaType(element.type);
   const src = mediaUrlFromElement(element);
@@ -459,6 +482,13 @@ function createRelayElement(kind, mime, buffer, filename, targetPlatform) {
     const attrs = { file: filename, filename, title: filename };
     return targetPlatform === "discord" ? import_koishi5.h.image(buffer, mime, attrs) : helperMap.file(buffer, mime, attrs);
   }
+  if (kind === "video" && targetPlatform === "discord") {
+    return import_koishi5.h.image(buffer, mime, {
+      file: filename,
+      filename,
+      mode: "download"
+    });
+  }
   if (helperMap[kind]) {
     return helperMap[kind](buffer, mime);
   }
@@ -569,8 +599,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")?.split(";")[0].trim() || pickDefaultMime(kind);
-  const filename = kind === "file" || kind === "audio" ? pickFilename(element, src) : void 0;
+  const responseMime = response.headers.get("content-type")?.split(";")[0].trim();
+  const mime = kind === "video" && (!responseMime || responseMime === DEFAULT_FILE_MIME) ? detectVideoMime(buffer) || DEFAULT_FILE_MIME : responseMime || pickDefaultMime(kind);
+  const filename = kind === "video" ? pickVideoFilename(element, src, mime) : 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,
@@ -631,9 +662,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",
@@ -644,6 +681,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
@@ -686,7 +724,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) {
@@ -771,6 +809,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}`
@@ -788,6 +830,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 {

package/package.json

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