@lark-apaas/devtool-kits 1.0.4 → 1.0.5-alpha.2

package/dist/index.d.cts

@@ -24,6 +24,12 @@ interface ProxyErrorOptions {
     maxErrorLogs?: number;
     /** 日志文件名（默认为 server.log） */
     logFileName?: string;
+    /** 等待服务重启的超时时间（毫秒），默认 5000ms */
+    retryTimeout?: number;
+    /** 轮询检查服务的间隔时间（毫秒），默认 500ms */
+    retryInterval?: number;
+    /** 目标服务器地址，用于检查服务是否恢复，格式：http://localhost:3000 */
+    target?: string;
 }
 /**
  * HTTP Proxy 错误处理器
@@ -53,7 +59,7 @@ interface ProxyErrorOptions {
  * });
  * ```
  */
-declare function handleDevProxyError(err: Error, _req: IncomingMessage, res: ServerResponse, options?: ProxyErrorOptions): void;
+declare function handleDevProxyError(err: Error, req: IncomingMessage, res: ServerResponse, options?: ProxyErrorOptions): void;
 
 /**
  * Shared context passed to all middlewares

package/dist/index.d.ts

@@ -24,6 +24,12 @@ interface ProxyErrorOptions {
     maxErrorLogs?: number;
     /** 日志文件名（默认为 server.log） */
     logFileName?: string;
+    /** 等待服务重启的超时时间（毫秒），默认 5000ms */
+    retryTimeout?: number;
+    /** 轮询检查服务的间隔时间（毫秒），默认 500ms */
+    retryInterval?: number;
+    /** 目标服务器地址，用于检查服务是否恢复，格式：http://localhost:3000 */
+    target?: string;
 }
 /**
  * HTTP Proxy 错误处理器
@@ -53,7 +59,7 @@ interface ProxyErrorOptions {
  * });
  * ```
  */
-declare function handleDevProxyError(err: Error, _req: IncomingMessage, res: ServerResponse, options?: ProxyErrorOptions): void;
+declare function handleDevProxyError(err: Error, req: IncomingMessage, res: ServerResponse, options?: ProxyErrorOptions): void;
 
 /**
  * Shared context passed to all middlewares

package/dist/index.js

@@ -28394,7 +28394,52 @@ import fs2 from "fs";
 import path2 from "path";
 import { createReadStream } from "fs";
 import { createInterface } from "readline";
+import { connect } from "net";
 var errorHtmlTemplate = null;
+function isConnectionError(err) {
+  const code = err.code;
+  const connectionErrorCodes = [
+    "ECONNREFUSED",
+    "ECONNRESET",
+    "ETIMEDOUT",
+    "ENOTFOUND",
+    "ENETUNREACH"
+  ];
+  return connectionErrorCodes.includes(code || "");
+}
+__name(isConnectionError, "isConnectionError");
+function checkServiceAvailable(host, port, timeout = 1e3) {
+  return new Promise((resolve) => {
+    const socket = connect(port, host);
+    const timer = setTimeout(() => {
+      socket.destroy();
+      resolve(false);
+    }, timeout);
+    socket.on("connect", () => {
+      clearTimeout(timer);
+      socket.destroy();
+      resolve(true);
+    });
+    socket.on("error", () => {
+      clearTimeout(timer);
+      socket.destroy();
+      resolve(false);
+    });
+  });
+}
+__name(checkServiceAvailable, "checkServiceAvailable");
+async function waitForServiceRecovery(host, port, timeout, interval) {
+  const startTime = Date.now();
+  while (Date.now() - startTime < timeout) {
+    const isAvailable = await checkServiceAvailable(host, port);
+    if (isAvailable) {
+      return true;
+    }
+    await new Promise((resolve) => setTimeout(resolve, interval));
+  }
+  return false;
+}
+__name(waitForServiceRecovery, "waitForServiceRecovery");
 function getDirname() {
   return __dirname;
 }
@@ -28423,7 +28468,10 @@ async function readRecentErrorLogs(logDir, maxLogs, fileName) {
   try {
     await fs2.promises.access(logFilePath);
   } catch {
-    return [];
+    return {
+      logs: [],
+      hasCompileError: false
+    };
   }
   const allLines = [];
   const stream = createReadStream(logFilePath, {
@@ -28452,20 +28500,26 @@ async function readRecentErrorLogs(logDir, maxLogs, fileName) {
     }
   }
   if (startIndex === -1) {
-    return [];
+    return {
+      logs: [],
+      hasCompileError: false
+    };
   }
   let endIndex = allLines.length;
+  let hasCompileError = false;
   for (let i = startIndex; i < allLines.length; i++) {
     if (/Found \d+ errors?\./.test(allLines[i])) {
       endIndex = i + 1;
+      hasCompileError = true;
       break;
     }
   }
   const errorSection = allLines.slice(startIndex, endIndex);
-  if (errorSection.length > maxLogs) {
-    return errorSection.slice(-maxLogs);
-  }
-  return errorSection;
+  const logs = errorSection.length > maxLogs ? errorSection.slice(-maxLogs) : errorSection;
+  return {
+    logs,
+    hasCompileError
+  };
 }
 __name(readRecentErrorLogs, "readRecentErrorLogs");
 function injectErrorData(template, errorLogs) {
@@ -28479,8 +28533,8 @@ function injectErrorData(template, errorLogs) {
  ${JSON.stringify(logsText)}`);
 }
 __name(injectErrorData, "injectErrorData");
-function handleDevProxyError(err, _req, res, options) {
-  const { logDir = path2.join(process.cwd(), "logs"), maxErrorLogs = 100, logFileName = "server.log" } = options || {};
+function handleDevProxyError(err, req, res, options) {
+  const { logDir = path2.join(process.cwd(), "logs"), maxErrorLogs = 100, logFileName = "server.log", retryTimeout = 5e3, retryInterval = 500, target } = options || {};
   console.error("[Proxy Error]:", err.message);
   if (res.headersSent) {
     console.error("[Proxy Error]: Headers already sent, cannot send error page");
@@ -28488,7 +28542,31 @@ function handleDevProxyError(err, _req, res, options) {
   }
   (async () => {
     try {
-      const errorLogs = await readRecentErrorLogs(logDir, maxErrorLogs, logFileName);
+      const isConnError = isConnectionError(err);
+      const { logs: errorLogs, hasCompileError } = await readRecentErrorLogs(logDir, maxErrorLogs, logFileName);
+      if (isConnError && !hasCompileError && target) {
+        console.log("[Proxy Error]: Connection error without compile errors, possibly server restarting...");
+        let targetUrl = null;
+        try {
+          targetUrl = new URL(target);
+        } catch (e) {
+          console.error("[Proxy Error]: Invalid target URL:", target);
+        }
+        if (targetUrl) {
+          const host = targetUrl.hostname;
+          const port = targetUrl.port ? parseInt(targetUrl.port) : targetUrl.protocol === "https:" ? 443 : 80;
+          console.log(`[Proxy Error]: Waiting for service recovery at ${host}:${port} (timeout: ${retryTimeout}ms)...`);
+          const recovered = await waitForServiceRecovery(host, port, retryTimeout, retryInterval);
+          if (recovered) {
+            console.log("[Proxy Error]: Service recovered, sending redirect");
+            sendSimpleRedirect(req, res);
+            return;
+          }
+          console.log("[Proxy Error]: Service did not recover within timeout, showing error page");
+        }
+        console.log("[Proxy Error]: Falling back to scenario 2 (detailed error page with probe)");
+      }
+      console.log("[Proxy Error]: Compile error or non-connection error, showing error page");
       const template = getErrorHtmlTemplate();
       const html = injectErrorData(template, errorLogs);
       res.writeHead(502, {
@@ -28497,7 +28575,7 @@ function handleDevProxyError(err, _req, res, options) {
       });
       res.end(html);
     } catch (error) {
-      console.error("[Proxy Error]: Failed to send error page:", error);
+      console.error("[Proxy Error]: Failed to handle error:", error);
       if (!res.headersSent) {
         res.writeHead(502, {
           "Content-Type": "text/plain; charset=utf-8"
@@ -28508,6 +28586,17 @@ function handleDevProxyError(err, _req, res, options) {
   })();
 }
 __name(handleDevProxyError, "handleDevProxyError");
+function sendSimpleRedirect(req, res) {
+  if (res.headersSent) return;
+  const originalUrl = req.url || "/";
+  console.log("[Proxy Error]: Sending 302 redirect to", originalUrl);
+  res.writeHead(302, {
+    "Location": originalUrl,
+    "Cache-Control": "no-cache, no-store, must-revalidate"
+  });
+  res.end();
+}
+__name(sendSimpleRedirect, "sendSimpleRedirect");
 
 // src/middlewares/index.ts
 import path5 from "path";