@ynhcj/xiaoyi-channel 0.0.195-next → 0.0.196-next

package/dist/src/cspl/call_api.js

@@ -4,6 +4,7 @@
 import https from 'https';
 import { URL } from 'url';
 import { getConfig } from './config.js';
+import { logger } from '../utils/logger.js';
 import { DEFAULT_HTTPS_PORT, DEFAULT_HTTP_PORT, HTTP_STATUS_BAD_REQUEST } from './constants.js';
 function buildHeadersForCelia(config, sessionId) {
     if (!config.uid || !config.apiKey || !config.skillId || !config.requestFrom) {
@@ -69,6 +70,7 @@ function handleResponse(res, resolve, reject) {
         data += chunk;
     });
     res.on('end', () => {
+        logger.log(`[SENTINEL HOOK] callApi response body: ${data}`);
         try {
             const result = parseResponseData(data);
             resolve(result);
@@ -84,6 +86,8 @@ export async function callApi(payload, api, sessionId) {
     // 确保 uid 存在于消息体中（从 config 注入）
     const payloadWithUid = { ...payload, uid: config.uid };
     const httpBody = JSON.stringify(payloadWithUid);
+    logger.log(`[SENTINEL HOOK] callApi request URL: ${config.api.url}`);
+    logger.log(`[SENTINEL HOOK] callApi request body: ${httpBody}`);
     return new Promise((resolve, reject) => {
         const options = buildRequestOptions(config.api.url, headersForCelia, config.api.timeout);
         const req = https.request(options, (res) => {

package/dist/src/log-reporter/reporter.d.ts

@@ -1,5 +1,6 @@
 import type { ReportPayload, LogReporterEnv } from "./types.js";
 /**
- * Send a log report to the sync API.
+ * Send a log report to the sync API with retry on failure.
+ * Retries up to 3 times with delays of 10s, 20s, 30s.
  */
 export declare function sendReport(payload: ReportPayload, env: LogReporterEnv): Promise<void>;

package/dist/src/log-reporter/reporter.js

@@ -2,8 +2,16 @@
 import fetch from "node-fetch";
 import { calculateSHA256String } from "../utils/crypto.js";
 import { logger } from "../utils/logger.js";
+/** Retry delays in milliseconds: 10s, 20s, 30s */
+const RETRY_DELAYS_MS = [10000, 20000, 30000];
+const MAX_RETRIES = RETRY_DELAYS_MS.length;
+/** Sleep for a given duration in milliseconds */
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
 /**
- * Send a log report to the sync API.
+ * Send a log report to the sync API with retry on failure.
+ * Retries up to 3 times with delays of 10s, 20s, 30s.
  */
 export async function sendReport(payload, env) {
     if (payload.logFiles.length === 0) {
@@ -19,14 +27,30 @@ export async function sendReport(payload, env) {
         "x-request-from": "openclaw",
     };
     logger.log(`[log-reporter] Sending report to ${url}, ${payload.logFiles.length} log file(s)`);
-    const resp = await fetch(url, {
-        method: "POST",
-        headers,
-        body: JSON.stringify(payload),
-    });
-    if (!resp.ok) {
-        const body = await resp.text().catch(() => "");
-        throw new Error(`Report API returned HTTP ${resp.status}: ${body}`);
+    let lastError;
+    for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
+        try {
+            const resp = await fetch(url, {
+                method: "POST",
+                headers,
+                body: JSON.stringify(payload),
+            });
+            if (!resp.ok) {
+                const body = await resp.text().catch(() => "");
+                throw new Error(`Report API returned HTTP ${resp.status}: ${body}`);
+            }
+            logger.log(`[log-reporter] Report sent successfully, status: ${resp.status}`);
+            return; // success, exit
+        }
+        catch (err) {
+            lastError = err instanceof Error ? err : new Error(String(err));
+            if (attempt < MAX_RETRIES) {
+                const delay = RETRY_DELAYS_MS[attempt];
+                logger.warn(`[log-reporter] Report failed (attempt ${attempt + 1}/${MAX_RETRIES + 1}): ${lastError.message}. Retrying in ${delay / 1000}s...`);
+                await sleep(delay);
+            }
+        }
     }
-    logger.log(`[log-reporter] Report sent successfully, status: ${resp.status}`);
+    // All retries exhausted
+    throw lastError;
 }

package/dist/src/log-reporter/uploader.d.ts

@@ -1,6 +1,7 @@
 import type { UploadService } from "./types.js";
 /**
  * Write content to a .bak file, upload, and return the URL.
+ * Retries upload up to 3 times with delays of 10s, 20s, 30s.
  * Cleans up .bak file regardless of success/failure.
  */
 export declare function uploadContent(content: string, name: string, bakDir: string, uploadService: UploadService): Promise<string>;

package/dist/src/log-reporter/uploader.js

@@ -2,8 +2,17 @@
 import { writeFileSync, unlinkSync } from "fs";
 import { join } from "path";
 import { mkdirSync } from "fs";
+import { logger } from "../utils/logger.js";
+/** Retry delays in milliseconds: 10s, 20s, 30s */
+const RETRY_DELAYS_MS = [10000, 20000, 30000];
+const MAX_RETRIES = RETRY_DELAYS_MS.length;
+/** Sleep for a given duration in milliseconds */
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
 /**
  * Write content to a .bak file, upload, and return the URL.
+ * Retries upload up to 3 times with delays of 10s, 20s, 30s.
  * Cleans up .bak file regardless of success/failure.
  */
 export async function uploadContent(content, name, bakDir, uploadService) {
@@ -15,12 +24,26 @@ export async function uploadContent(content, name, bakDir, uploadService) {
         mkdirSync(bakDir, { recursive: true });
     }
     catch { }
+    // Write incremental content to .bak file (only once)
+    writeFileSync(bakPath, content, "utf-8");
+    let lastError;
     try {
-        // Write incremental content to .bak file
-        writeFileSync(bakPath, content, "utf-8");
-        // Upload and get URL
-        const url = await uploadService.uploadFileAndGetUrl(bakPath);
-        return url;
+        for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
+            try {
+                const url = await uploadService.uploadFileAndGetUrl(bakPath);
+                return url; // success
+            }
+            catch (err) {
+                lastError = err instanceof Error ? err : new Error(String(err));
+                if (attempt < MAX_RETRIES) {
+                    const delay = RETRY_DELAYS_MS[attempt];
+                    logger.warn(`[log-reporter] Upload failed for "${name}" (attempt ${attempt + 1}/${MAX_RETRIES + 1}): ${lastError.message}. Retrying in ${delay / 1000}s...`);
+                    await sleep(delay);
+                }
+            }
+        }
+        // All retries exhausted
+        throw lastError;
     }
     finally {
         // Always clean up the .bak file

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ynhcj/xiaoyi-channel",
-  "version": "0.0.195-next",
+  "version": "0.0.196-next",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",