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

package/lib/index.js

@@ -631,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",
@@ -644,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
@@ -686,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) {
@@ -771,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}`
@@ -788,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 {

package/package.json

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