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

package/dist/error.html

@@ -108,6 +108,7 @@
 
   <script>
     // 全局错误对象
+    let clientBasePath = '{{.clientBasePath}}';
     let errorData = {
       message: `{{.errorData.message}}`,
     };
@@ -159,35 +160,62 @@
     // 探测服务是否恢复
     async function probeService() {
       try {
-        // 获取当前 URL
-        const currentUrl = window.location.pathname + window.location.search;
-
-        console.log('[Probe] 探测服务状态:', currentUrl);
+        console.log('[Probe] 探测服务状态: /dev/health');
 
         // 使用 AbortController 实现超时控制
         const controller = new AbortController();
         const timeoutId = setTimeout(() => controller.abort(), PROBE_TIMEOUT);
 
-        const response = await fetch(currentUrl, {
-          method: 'HEAD', // 使用 HEAD 方法，只检查状态不下载内容
+        const response = await fetch(`${clientBasePath}/dev/health`, {
+          method: 'GET',
           cache: 'no-cache',
+          redirect: 'manual', // 不自动跟随重定向
           signal: controller.signal
         });
 
         clearTimeout(timeoutId);
 
-        // 检查响应状态
-        if (response.ok && response.status === 200) {
-          console.log('[Probe] 服务已恢复，准备刷新页面');
-          stopServiceProbe();
+        console.log('[Probe] 状态码:', response.status);
+
+        // 如果收到 302/303 重定向，说明代理层正在恢复中，继续探测
+        if (response.status === 302 || response.status === 303) {
+          console.log('[Probe] 收到重定向响应，服务可能正在恢复，继续探测');
+          return;
+        }
+
+        // 如果是 502，说明代理遇到错误，继续探测
+        if (response.status === 502) {
+          console.log('[Probe] 服务未恢复（502），继续探测');
+          return;
+        }
 
-          // 延迟一小段时间后刷新，让日志输出完整
-          setTimeout(() => {
-            console.log('[Probe] 刷新页面...');
-            window.location.href = currentUrl;
-          }, 300);
+        // 如果是 200，解析健康检查结果
+        if (response.status === 200) {
+          try {
+            const data = await response.json();
+
+            // 检查健康状态
+            if (data.status === 'healthy') {
+              console.log('[Probe] 服务已恢复，响应时间:', data.responseTime, 'ms');
+              stopServiceProbe();
+
+              // 延迟一小段时间后刷新，让日志输出完整
+              setTimeout(() => {
+                console.log('[Probe] 刷新页面...');
+                const currentUrl = window.location.pathname + window.location.search;
+                window.location.href = currentUrl;
+              }, 300);
+            } else {
+              console.log('[Probe] 服务状态:', data.status, '错误:', data.error);
+            }
+          } catch (e) {
+            console.log('[Probe] 解析响应失败:', e.message, '继续探测');
+          }
+        } else if (response.status === 503) {
+          // 503 表示服务不健康，继续探测
+          console.log('[Probe] 服务不健康（503），继续探测');
         } else {
-          console.log('[Probe] 服务未恢复，状态码:', response.status);
+          console.log('[Probe] 收到非预期状态码:', response.status, '继续探测');
         }
       } catch (error) {
         // 网络错误、超时或服务未恢复

package/dist/index.cjs

@@ -22320,10 +22320,10 @@ var require_layer = __commonJS({
 var require_methods = __commonJS({
   "../../../node_modules/methods/index.js"(exports2, module2) {
     "use strict";
-    var http = require("http");
+    var http3 = require("http");
     module2.exports = getCurrentNodeMethods() || getBasicNodeMethods();
     function getCurrentNodeMethods() {
-      return http.METHODS && http.METHODS.map(/* @__PURE__ */ __name(function lowerCaseMethod(method) {
+      return http3.METHODS && http3.METHODS.map(/* @__PURE__ */ __name(function lowerCaseMethod(method) {
         return method.toLowerCase();
       }, "lowerCaseMethod"));
     }
@@ -25995,13 +25995,13 @@ var require_application = __commonJS({
   "../../../node_modules/express/lib/application.js"(exports2, module2) {
     "use strict";
     var finalhandler = require_finalhandler();
-    var Router = require_router();
+    var Router2 = require_router();
     var methods = require_methods();
     var middleware = require_init();
     var query = require_query();
     var debug = require_src3()("express:application");
     var View = require_view();
-    var http = require("http");
+    var http3 = require("http");
     var compileETag = require_utils2().compileETag;
     var compileQueryParser = require_utils2().compileQueryParser;
     var compileTrust = require_utils2().compileTrust;
@@ -26060,7 +26060,7 @@ var require_application = __commonJS({
     }, "defaultConfiguration");
     app.lazyrouter = /* @__PURE__ */ __name(function lazyrouter() {
       if (!this._router) {
-        this._router = new Router({
+        this._router = new Router2({
           caseSensitive: this.enabled("case sensitive routing"),
           strict: this.enabled("strict routing")
         });
@@ -26250,7 +26250,7 @@ var require_application = __commonJS({
       tryRender(view, renderOptions, done);
     }, "render");
     app.listen = /* @__PURE__ */ __name(function listen() {
-      var server = http.createServer(this);
+      var server = http3.createServer(this);
       return server.listen.apply(server, arguments);
     }, "listen");
     function logerror(err) {
@@ -26913,12 +26913,12 @@ var require_request = __commonJS({
     var deprecate = require_depd()("express");
     var isIP = require("net").isIP;
     var typeis = require_type_is();
-    var http = require("http");
+    var http3 = require("http");
     var fresh = require_fresh();
     var parseRange = require_range_parser();
     var parse = require_parseurl();
     var proxyaddr = require_proxy_addr();
-    var req = Object.create(http.IncomingMessage.prototype);
+    var req = Object.create(http3.IncomingMessage.prototype);
     module2.exports = req;
     req.get = req.header = /* @__PURE__ */ __name(function header(name) {
       if (!name) {
@@ -27344,7 +27344,7 @@ var require_response = __commonJS({
     var deprecate = require_depd()("express");
     var encodeUrl = require_encodeurl();
     var escapeHtml = require_escape_html();
-    var http = require("http");
+    var http3 = require("http");
     var isAbsolute3 = require_utils2().isAbsolute;
     var onFinished = require_on_finished();
     var path6 = require("path");
@@ -27360,7 +27360,7 @@ var require_response = __commonJS({
     var mime = send.mime;
     var resolve = path6.resolve;
     var vary = require_vary();
-    var res = Object.create(http.ServerResponse.prototype);
+    var res = Object.create(http3.ServerResponse.prototype);
     module2.exports = res;
     var charsetRegExp = /;\s*charset\s*=/;
     res.status = /* @__PURE__ */ __name(function status(code) {
@@ -28009,7 +28009,7 @@ var require_express = __commonJS({
     var mixin = require_merge_descriptors();
     var proto = require_application();
     var Route = require_route();
-    var Router = require_router();
+    var Router2 = require_router();
     var req = require_request();
     var res = require_response();
     exports2 = module2.exports = createApplication;
@@ -28043,7 +28043,7 @@ var require_express = __commonJS({
     exports2.request = req;
     exports2.response = res;
     exports2.Route = Route;
-    exports2.Router = Router;
+    exports2.Router = Router2;
     exports2.json = bodyParser.json;
     exports2.query = require_query();
     exports2.raw = bodyParser.raw;
@@ -28093,6 +28093,7 @@ var index_exports = {};
 __export(index_exports, {
   createCollectLogsMiddleware: () => createCollectLogsMiddleware,
   createDevLogsMiddleware: () => createDevLogsMiddleware,
+  createHealthCheckMiddleware: () => createHealthCheckMiddleware,
   createOpenapiMiddleware: () => createOpenapiMiddleware,
   handleDevProxyError: () => handleDevProxyError,
   normalizeBasePath: () => normalizeBasePath,
@@ -28407,7 +28408,8 @@ var import_node_fs2 = __toESM(require("fs"), 1);
 var import_node_path2 = __toESM(require("path"), 1);
 var import_node_fs3 = require("fs");
 var import_node_readline = require("readline");
-var import_node_net = require("net");
+var import_node_http = __toESM(require("http"), 1);
+var import_node_https = __toESM(require("https"), 1);
 var errorHtmlTemplate = null;
 function isConnectionError(err) {
   const code = err.code;
@@ -28421,30 +28423,40 @@ function isConnectionError(err) {
   return connectionErrorCodes.includes(code || "");
 }
 __name(isConnectionError, "isConnectionError");
-function checkServiceAvailable(host, port, timeout = 1e3) {
+function checkServiceAvailable(targetUrl, timeout = 1e3) {
   return new Promise((resolve) => {
-    const socket = (0, import_node_net.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();
+    try {
+      const url = new URL(targetUrl);
+      const isHttps = url.protocol === "https:";
+      const httpModule = isHttps ? import_node_https.default : import_node_http.default;
+      const req = httpModule.request({
+        hostname: url.hostname,
+        port: url.port || (isHttps ? 443 : 80),
+        path: "/",
+        method: "HEAD",
+        timeout
+      }, (res) => {
+        const available = res.statusCode !== 502 && !res.headers["x-proxy-error-page"];
+        resolve(available);
+      });
+      req.on("timeout", () => {
+        req.destroy();
+        resolve(false);
+      });
+      req.on("error", () => {
+        resolve(false);
+      });
+      req.end();
+    } catch (e) {
       resolve(false);
-    });
+    }
   });
 }
 __name(checkServiceAvailable, "checkServiceAvailable");
-async function waitForServiceRecovery(host, port, timeout, interval) {
+async function waitForServiceRecovery(targetUrl, timeout, interval) {
   const startTime = Date.now();
   while (Date.now() - startTime < timeout) {
-    const isAvailable = await checkServiceAvailable(host, port);
+    const isAvailable = await checkServiceAvailable(targetUrl, 2e3);
     if (isAvailable) {
       return true;
     }
@@ -28535,7 +28547,7 @@ async function readRecentErrorLogs(logDir, maxLogs, fileName) {
   };
 }
 __name(readRecentErrorLogs, "readRecentErrorLogs");
-function injectErrorData(template, errorLogs) {
+function injectErrorData(template, errorLogs, clientBasePath) {
   let logsText = "";
   if (errorLogs.length > 0) {
     logsText = errorLogs.join("\n");
@@ -28543,11 +28555,12 @@ function injectErrorData(template, errorLogs) {
     logsText = "\u672A\u627E\u5230\u76F8\u5173\u9519\u8BEF\u65E5\u5FD7";
   }
   return template.replace("{{.errorData.message}}", `\u670D\u52A1\u542F\u52A8\u5F02\u5E38\uFF0C\u8BF7\u6839\u636E\u65E5\u5FD7\u4FEE\u590D\u76F8\u5173\u95EE\u9898
- ${JSON.stringify(logsText)}`);
+ ${JSON.stringify(logsText)}`).replace("{{.clientBasePath}}", clientBasePath);
 }
 __name(injectErrorData, "injectErrorData");
 function handleDevProxyError(err, req, res, options) {
-  const { logDir = import_node_path2.default.join(process.cwd(), "logs"), maxErrorLogs = 100, logFileName = "server.log", retryTimeout = 5e3, retryInterval = 500, target } = options || {};
+  const { logDir = import_node_path2.default.join(process.cwd(), "logs"), maxErrorLogs = 100, logFileName = "server.log", retryTimeout = 5e3, retryInterval = 500, target, clientBasePath = process.env.CLIENT_BASE_PATH || "/" } = options || {};
+  const clientBasePathWithoutSlash = normalizeBasePath(clientBasePath);
   console.error("[Proxy Error]:", err.message);
   if (res.headersSent) {
     console.error("[Proxy Error]: Headers already sent, cannot send error page");
@@ -28559,32 +28572,32 @@ function handleDevProxyError(err, req, res, options) {
       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);
+          new URL(target);
         } catch (e) {
           console.error("[Proxy Error]: Invalid target URL:", target);
+          console.log("[Proxy Error]: Showing error page due to invalid 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]: Waiting for service recovery at ${target} (timeout: ${retryTimeout}ms)...`);
+        const recovered = await waitForServiceRecovery(target, retryTimeout, retryInterval);
+        if (recovered) {
+          console.log("[Proxy Error]: Service recovered within timeout, sending 302 redirect");
+          sendSimpleRedirect(req, res);
+          return;
         }
-        console.log("[Proxy Error]: Falling back to scenario 2 (detailed error page with probe)");
+        console.log("[Proxy Error]: Service did not recover within timeout, showing error page with probe");
+      }
+      if (isConnError && !hasCompileError) {
+        console.log("[Proxy Error]: Showing error page with auto-refresh probe");
+      } else {
+        console.log("[Proxy Error]: Compile error or non-connection error, showing error page");
       }
-      console.log("[Proxy Error]: Compile error or non-connection error, showing error page");
       const template = getErrorHtmlTemplate();
-      const html = injectErrorData(template, errorLogs);
+      const html = injectErrorData(template, errorLogs, clientBasePathWithoutSlash);
       res.writeHead(502, {
         "Content-Type": "text/html; charset=utf-8",
-        "Cache-Control": "no-cache, no-store, must-revalidate"
+        "Cache-Control": "no-cache, no-store, must-revalidate",
+        "X-Proxy-Error-Page": "true"
       });
       res.end(html);
     } catch (error) {
@@ -28614,8 +28627,99 @@ __name(sendSimpleRedirect, "sendSimpleRedirect");
 // src/middlewares/index.ts
 var import_node_path8 = __toESM(require("path"), 1);
 
-// src/middlewares/openapi/router.ts
+// src/middlewares/health-check/router.ts
 var import_express = __toESM(require_express2(), 1);
+var import_node_http2 = __toESM(require("http"), 1);
+function checkServiceHealth(host, port, timeout) {
+  return new Promise((resolve) => {
+    const startTime = Date.now();
+    const req = import_node_http2.default.request({
+      hostname: host,
+      port,
+      path: "/",
+      method: "HEAD",
+      timeout
+    }, (_res) => {
+      const responseTime = Date.now() - startTime;
+      resolve({
+        available: true,
+        responseTime
+      });
+    });
+    req.on("timeout", () => {
+      req.destroy();
+      resolve({
+        available: false,
+        error: "Request timeout"
+      });
+    });
+    req.on("error", (err) => {
+      resolve({
+        available: false,
+        error: err.message
+      });
+    });
+    req.end();
+  });
+}
+__name(checkServiceHealth, "checkServiceHealth");
+function createHealthCheckRouter(options = {}) {
+  const { targetPort = Number(process.env.SERVER_PORT) || 3e3, targetHost = "localhost", timeout = 2e3 } = options;
+  const router = (0, import_express.Router)();
+  router.get("/", async (_req, res) => {
+    try {
+      const result = await checkServiceHealth(targetHost, targetPort, timeout);
+      if (result.available) {
+        res.status(200).json({
+          status: "healthy",
+          service: `${targetHost}:${targetPort}`,
+          responseTime: result.responseTime,
+          timestamp: (/* @__PURE__ */ new Date()).toISOString()
+        });
+      } else {
+        res.status(503).json({
+          status: "unhealthy",
+          service: `${targetHost}:${targetPort}`,
+          error: result.error,
+          timestamp: (/* @__PURE__ */ new Date()).toISOString()
+        });
+      }
+    } catch (error) {
+      res.status(500).json({
+        status: "error",
+        service: `${targetHost}:${targetPort}`,
+        error: error instanceof Error ? error.message : "Unknown error",
+        timestamp: (/* @__PURE__ */ new Date()).toISOString()
+      });
+    }
+  });
+  return router;
+}
+__name(createHealthCheckRouter, "createHealthCheckRouter");
+
+// src/middlewares/health-check/index.ts
+var HEALTH_CHECK_ROUTES = [
+  {
+    method: "GET",
+    path: "/",
+    description: "Check if target service is healthy and available"
+  }
+];
+function createHealthCheckMiddleware(options = {}) {
+  return {
+    name: "health-check",
+    mountPath: "/dev/health",
+    routes: HEALTH_CHECK_ROUTES,
+    enabled: /* @__PURE__ */ __name((context) => context.isDev, "enabled"),
+    createRouter: /* @__PURE__ */ __name((_context) => {
+      return createHealthCheckRouter(options);
+    }, "createRouter")
+  };
+}
+__name(createHealthCheckMiddleware, "createHealthCheckMiddleware");
+
+// src/middlewares/openapi/router.ts
+var import_express2 = __toESM(require_express2(), 1);
 
 // src/middlewares/openapi/controller.ts
 var import_promises = __toESM(require("fs/promises"), 1);
@@ -28862,7 +28966,7 @@ __name(createOpenapiHandler, "createOpenapiHandler");
 // src/middlewares/openapi/router.ts
 function createOpenapiRouter(options, context) {
   const { openapiFilePath, enableEnhancement, serverDir } = options;
-  const router = import_express.default.Router();
+  const router = import_express2.default.Router();
   const handler = createOpenapiHandler(openapiFilePath, enableEnhancement, serverDir);
   router.get("/openapi.json", (req, res) => handler(req, res, context));
   return router;
@@ -28896,7 +29000,7 @@ function createOpenapiMiddleware(options) {
 __name(createOpenapiMiddleware, "createOpenapiMiddleware");
 
 // src/middlewares/dev-logs/router.ts
-var import_express2 = __toESM(require_express2(), 1);
+var import_express3 = __toESM(require_express2(), 1);
 
 // src/middlewares/dev-logs/utils.ts
 var import_node_fs6 = require("fs");
@@ -29341,7 +29445,7 @@ __name(createGetLogFileHandler, "createGetLogFileHandler");
 // src/middlewares/dev-logs/router.ts
 function createDevLogRouter(options = {}) {
   const logDir = resolveLogDir(options.logDir);
-  const router = import_express2.default.Router();
+  const router = import_express3.default.Router();
   router.get("/app/trace/:traceId", createGetTraceEntriesHandler(logDir));
   router.get("/trace/recent", createGetRecentTracesHandler(logDir));
   router.get("/files/:fileName", createGetLogFileHandler(logDir));
@@ -29384,7 +29488,7 @@ function createDevLogsMiddleware(options = {}) {
 __name(createDevLogsMiddleware, "createDevLogsMiddleware");
 
 // src/middlewares/collect-logs/router.ts
-var import_express3 = __toESM(require_express2(), 1);
+var import_express4 = __toESM(require_express2(), 1);
 
 // src/middlewares/collect-logs/controller.ts
 var import_path = require("path");
@@ -29483,9 +29587,9 @@ __name(handleError2, "handleError");
 // src/middlewares/collect-logs/router.ts
 function createDevLogRouter2(options = {}) {
   const logDir = resolveLogDir2(options.logDir);
-  const router = import_express3.default.Router();
-  router.post("/collect", import_express3.default.json(), collectLogsHandler(logDir, options.fileName || "client.log"));
-  router.post("/collect-batch", import_express3.default.json(), collectLogsBatchHandler(logDir, options.fileName || "client.log"));
+  const router = import_express4.default.Router();
+  router.post("/collect", import_express4.default.json(), collectLogsHandler(logDir, options.fileName || "client.log"));
+  router.post("/collect-batch", import_express4.default.json(), collectLogsBatchHandler(logDir, options.fileName || "client.log"));
   return router;
 }
 __name(createDevLogRouter2, "createDevLogRouter");
@@ -29568,7 +29672,15 @@ async function registerMiddlewares(server, middlewares, options) {
     rootDir: process.cwd(),
     ...options
   };
-  for (const middleware of middlewares) {
+  const defaultMiddlewares = [];
+  if (context.isDev) {
+    defaultMiddlewares.push(createHealthCheckMiddleware());
+  }
+  const allMiddlewares = [
+    ...defaultMiddlewares,
+    ...middlewares
+  ];
+  for (const middleware of allMiddlewares) {
     if (middleware.enabled && !middleware.enabled(context)) {
       continue;
     }
@@ -29595,6 +29707,7 @@ __name(registerMiddlewares, "registerMiddlewares");
 0 && (module.exports = {
   createCollectLogsMiddleware,
   createDevLogsMiddleware,
+  createHealthCheckMiddleware,
   createOpenapiMiddleware,
   handleDevProxyError,
   normalizeBasePath,