openzca 0.1.55 → 0.1.56

package/dist/cli.js

@@ -2824,6 +2824,72 @@ import fs5 from "fs/promises";
 import os3 from "os";
 import path5 from "path";
 import { promisify } from "util";
+
+// src/lib/send-retry.ts
+var DEFAULT_SEND_RETRY_COUNT = 1;
+var DEFAULT_SEND_RETRY_DELAY_MS = 750;
+var RETRYABLE_SEND_ERROR_PATTERNS = [
+  /retry limit/i,
+  /\btimeout\b/i,
+  /\btimed out\b/i,
+  /\betimedout\b/i,
+  /\beconnreset\b/i,
+  /\besockettimedout\b/i,
+  /\bsocket hang up\b/i,
+  /\btemporar(?:y|ily)\b/i
+];
+function sleep(ms) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+}
+function parsePositiveIntEnv(value, fallback) {
+  const raw = value?.trim();
+  if (!raw) return fallback;
+  if (raw === "0") return 0;
+  const parsed = Number.parseInt(raw, 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
+}
+function getSendRetryConfigFromEnv(env = process.env) {
+  return {
+    number: parsePositiveIntEnv(env.OPENZCA_SEND_RETRY_COUNT, DEFAULT_SEND_RETRY_COUNT),
+    delayMs: parsePositiveIntEnv(env.OPENZCA_SEND_RETRY_DELAY_MS, DEFAULT_SEND_RETRY_DELAY_MS)
+  };
+}
+function isRetryableSendError(error) {
+  const message = error instanceof Error ? error.message : String(error ?? "");
+  return RETRYABLE_SEND_ERROR_PATTERNS.some((pattern) => pattern.test(message));
+}
+function retryable(operation, options) {
+  const maxRetries = Math.max(0, options?.number ?? DEFAULT_SEND_RETRY_COUNT);
+  const delayMs = Math.max(0, options?.delayMs ?? DEFAULT_SEND_RETRY_DELAY_MS);
+  const shouldRetry = options?.on ?? isRetryableSendError;
+  return async (...args) => {
+    let attempt = 0;
+    while (true) {
+      try {
+        return await operation(...args);
+      } catch (error) {
+        attempt += 1;
+        if (attempt > maxRetries || !shouldRetry(error)) {
+          throw error;
+        }
+        await options?.onRetry?.({
+          attempt,
+          maxRetries,
+          delayMs,
+          error,
+          args
+        });
+        if (delayMs > 0) {
+          await sleep(delayMs);
+        }
+      }
+    }
+  };
+}
+
+// src/lib/video-send.ts
 var execFileAsync = promisify(execFile);
 function planVideoSendMode(params) {
   const { files, ffmpegAvailable } = params;
@@ -2982,7 +3048,8 @@ async function sendNativeVideo(params) {
   try {
     const uploadedVideo = await params.api.uploadAttachment([params.videoPath], params.threadId, params.threadType);
     const uploadedThumbnail = await params.api.uploadAttachment([thumbnailPath], params.threadId, params.threadType);
-    return await params.api.sendVideo(
+    const sendVideo = retryable(params.api.sendVideo.bind(params.api), getSendRetryConfigFromEnv());
+    return await sendVideo(
       {
         msg: params.message ?? "",
         videoUrl: pickUploadedVideoUrl(uploadedVideo[0]),
@@ -3446,6 +3513,25 @@ function parsePositiveIntFromUnknown(value) {
   }
   return null;
 }
+function retrySendMethod(operation, command, metaBuilder) {
+  const config = getSendRetryConfigFromEnv();
+  return retryable(operation, {
+    ...config,
+    onRetry: ({ attempt, maxRetries, delayMs, error, args }) => {
+      writeDebugLine(
+        "send.retry",
+        {
+          ...metaBuilder(...args),
+          attempt,
+          maxRetries,
+          delayMs,
+          message: error instanceof Error ? error.message : String(error)
+        },
+        command
+      );
+    }
+  });
+}
 function isProcessAlive(pid) {
   if (!Number.isInteger(pid) || pid <= 0) return false;
   try {
@@ -3598,6 +3684,15 @@ async function startListenerIpcServer(api, profile, sessionId, command) {
       }
       const threadType = parsed.threadType === "group" ? ThreadType3.Group : ThreadType3.User;
       const requestTimeoutMs = parsePositiveIntFromUnknown(parsed.uploadTimeoutMs) ?? uploadTimeoutMs;
+      const sendMessage = retrySendMethod(
+        api.sendMessage.bind(api),
+        command,
+        (_payload, threadId, threadTypeArg) => ({
+          kind: "listen.ipc.upload",
+          threadId,
+          threadType: threadTypeArg === ThreadType3.Group ? "group" : "user"
+        })
+      );
       writeDebugLine(
         "listen.ipc.upload.start",
         {
@@ -3613,7 +3708,7 @@ async function startListenerIpcServer(api, profile, sessionId, command) {
       );
       try {
         const response = await withTimeout(
-          api.sendMessage(
+          sendMessage(
             {
               msg: "",
               attachments: parsed.attachments
@@ -5713,7 +5808,7 @@ async function parseCredentialFile(filePath) {
     language: parsed.language
   };
 }
-function sleep(ms) {
+function sleep2(ms) {
   return new Promise((resolve) => {
     setTimeout(resolve, ms);
   });
@@ -5728,7 +5823,7 @@ async function waitForFileContent(filePath, timeoutMs) {
       }
     } catch {
     }
-    await sleep(150);
+    await sleep2(150);
   }
   throw new Error(`Timed out waiting for QR image file: ${filePath}`);
 }
@@ -7081,6 +7176,15 @@ msg.command("send <threadId> <message>").option("-g, --group", "Send to group").
       )
     });
     const payloadChunks = deliveryPlan.chunks;
+    const sendMessage = retrySendMethod(
+      api.sendMessage.bind(api),
+      command,
+      (_payload, targetThreadId, targetThreadType) => ({
+        kind: "msg.send",
+        threadId: targetThreadId,
+        threadType: targetThreadType === ThreadType3.Group ? "group" : "user"
+      })
+    );
     const responses = [];
     const sentPayloads = [];
     for (let index = 0; index < payloadChunks.length; index += 1) {
@@ -7090,7 +7194,7 @@ msg.command("send <threadId> <message>").option("-g, --group", "Send to group").
         quote
       } : chunk;
       sentPayloads.push(chunkPayload);
-      responses.push(await api.sendMessage(chunkPayload, threadId, threadType));
+      responses.push(await sendMessage(chunkPayload, threadId, threadType));
     }
     const response = responses.length === 1 ? responses[0] : {
       chunked: true,
@@ -7155,6 +7259,16 @@ msg.command("image <threadId> [file]").option("-u, --url <url>", "Image URL (rep
   wrapAction(
     async (threadId, file, opts, command) => {
       const { api, profile } = await requireApi(command);
+      const sendMessage = retrySendMethod(
+        api.sendMessage.bind(api),
+        command,
+        (payload, targetThreadId, targetThreadType) => ({
+          kind: "msg.image",
+          threadId: targetThreadId,
+          threadType: targetThreadType === ThreadType3.Group ? "group" : "user",
+          attachmentCount: payload && typeof payload === "object" && Array.isArray(payload.attachments) ? payload.attachments.length : void 0
+        })
+      );
       const normalizedFile = file ? normalizeMediaInput(file) : void 0;
       const files = [normalizedFile, ...normalizeInputList(opts.url)].filter(Boolean);
       const urlInputs = files.filter((entry) => isHttpUrl(entry));
@@ -7176,7 +7290,7 @@ msg.command("image <threadId> [file]").option("-u, --url <url>", "Image URL (rep
           throw new Error("Provide at least one image file or --url.");
         }
         await assertFilesExist(attachments);
-        const response = await api.sendMessage(
+        const response = await sendMessage(
           {
             msg: opts.message ?? "",
             attachments
@@ -7218,6 +7332,16 @@ msg.command("video <threadId> [file]").option("-u, --url <url>", "Video URL (rep
     async (threadId, file, opts, command) => {
       const { api, profile } = await requireApi(command);
       const threadType = asThreadType(opts.group);
+      const sendMessage = retrySendMethod(
+        api.sendMessage.bind(api),
+        command,
+        (payload, targetThreadId, targetThreadType) => ({
+          kind: "msg.video.fallback",
+          threadId: targetThreadId,
+          threadType: targetThreadType === ThreadType3.Group ? "group" : "user",
+          attachmentCount: payload && typeof payload === "object" && Array.isArray(payload.attachments) ? payload.attachments.length : void 0
+        })
+      );
       const normalizedFile = file ? normalizeMediaInput(file) : void 0;
       const files = [normalizedFile, ...normalizeInputList(opts.url)].filter(Boolean);
       const urlInputs = files.filter((entry) => isHttpUrl(entry));
@@ -7339,7 +7463,7 @@ msg.command("video <threadId> [file]").option("-u, --url <url>", "Video URL (rep
         const response = await withUploadListener(
           api,
           command,
-          async () => api.sendMessage(
+          async () => sendMessage(
             {
               msg: opts.message ?? "",
               attachments
@@ -7383,6 +7507,15 @@ msg.command("voice <threadId> [file]").option("-u, --url <url>", "Voice URL (rep
     async (threadId, file, opts, command) => {
       const { api, profile } = await requireApi(command);
       const type = asThreadType(opts.group);
+      const sendVoice = retrySendMethod(
+        api.sendVoice.bind(api),
+        command,
+        (_payload, targetThreadId, targetThreadType) => ({
+          kind: "msg.voice",
+          threadId: targetThreadId,
+          threadType: targetThreadType === ThreadType3.Group ? "group" : "user"
+        })
+      );
       const normalizedFile = file ? normalizeMediaInput(file) : void 0;
       const files = [normalizedFile, ...normalizeInputList(opts.url)].filter(Boolean);
       if (files.length === 0) {
@@ -7408,7 +7541,7 @@ msg.command("voice <threadId> [file]").option("-u, --url <url>", "Voice URL (rep
         const uploaded = await api.uploadAttachment(attachments, threadId, type);
         for (const item of uploaded) {
           if (item.fileType === "others" || item.fileType === "video") {
-            results.push(await api.sendVoice({ voiceUrl: item.fileUrl }, threadId, type));
+            results.push(await sendVoice({ voiceUrl: item.fileUrl }, threadId, type));
           }
         }
         if (results.length === 0) {
@@ -7466,7 +7599,16 @@ msg.command("sticker <threadId> <stickerId>").option("-g, --group", "Send to gro
 msg.command("link <threadId> <url>").option("-g, --group", "Send to group").description("Send link").action(
   wrapAction(async (threadId, url, opts, command) => {
     const { api, profile } = await requireApi(command);
-    const response = await api.sendLink({ link: url }, threadId, asThreadType(opts.group));
+    const sendLink = retrySendMethod(
+      api.sendLink.bind(api),
+      command,
+      (_payload, targetThreadId, targetThreadType) => ({
+        kind: "msg.link",
+        threadId: targetThreadId,
+        threadType: targetThreadType === ThreadType3.Group ? "group" : "user"
+      })
+    );
+    const response = await sendLink({ link: url }, threadId, asThreadType(opts.group));
     output(response, false);
     if (await shouldWriteToDb(profile)) {
       scheduleDbWrite(profile, command, "msg.link.db.persist_error", async () => {
@@ -7578,6 +7720,15 @@ msg.command("edit <msgId> <cliMsgId> <threadId> <message>").option("-g, --group"
     async (msgId, cliMsgId, threadId, message, opts, command) => {
       const { api } = await requireApi(command);
       const type = asThreadType(opts.group);
+      const sendMessage = retrySendMethod(
+        api.sendMessage.bind(api),
+        command,
+        (_payload, targetThreadId, targetThreadType) => ({
+          kind: "msg.edit.resend",
+          threadId: targetThreadId,
+          threadType: targetThreadType === ThreadType3.Group ? "group" : "user"
+        })
+      );
       const undoResponse = await api.undo(
         {
           msgId,
@@ -7586,7 +7737,7 @@ msg.command("edit <msgId> <cliMsgId> <threadId> <message>").option("-g, --group"
         threadId,
         type
       );
-      const sendResponse = await api.sendMessage(message, threadId, type);
+      const sendResponse = await sendMessage(message, threadId, type);
       output(
         {
           mode: "undo+send",
@@ -7603,6 +7754,16 @@ msg.command("upload <arg1> [arg2]").option("-u, --url <url>", "File URL (repeata
   wrapAction(
     async (arg1, arg2, opts, command) => {
       const { api, profile } = await requireApi(command);
+      const sendMessage = retrySendMethod(
+        api.sendMessage.bind(api),
+        command,
+        (payload, targetThreadId, targetThreadType) => ({
+          kind: "msg.upload",
+          threadId: targetThreadId,
+          threadType: targetThreadType === ThreadType3.Group ? "group" : "user",
+          attachmentCount: payload && typeof payload === "object" && Array.isArray(payload.attachments) ? payload.attachments.length : void 0
+        })
+      );
       const inputs = normalizeInputList(opts.url);
       const urlInputs = inputs.filter((entry) => isHttpUrl(entry));
       const localInputs = inputs.filter((entry) => !isHttpUrl(entry));
@@ -7678,7 +7839,7 @@ msg.command("upload <arg1> [arg2]").option("-u, --url <url>", "File URL (repeata
         const response = await withUploadListener(
           api,
           command,
-          async () => api.sendMessage(
+          async () => sendMessage(
             {
               msg: "",
               attachments
@@ -8775,12 +8936,17 @@ ${replyContextText}` : replyContextText;
           }
           await emitWebhook(payload);
           if (opts.echo && rawText.trim().length > 0) {
+            const sendMessage = retrySendMethod(
+              api.sendMessage.bind(api),
+              command,
+              (_sendPayload, targetThreadId, targetThreadType) => ({
+                kind: "listen.echo",
+                threadId: targetThreadId,
+                threadType: targetThreadType === ThreadType3.Group ? "group" : "user"
+              })
+            );
             try {
-              await api.sendMessage(
-                { msg: processedText },
-                message.threadId,
-                message.type
-              );
+              await sendMessage({ msg: processedText }, message.threadId, message.type);
             } catch (error) {
               console.error(
                 `Echo failed: ${error instanceof Error ? error.message : String(error)}`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzca",
-  "version": "0.1.55",
+  "version": "0.1.56",
   "description": "Open-source zca-compatible CLI to integrate Zalo with OpenClaw",
   "type": "module",
   "bin": {