@lark-apaas/devtool-kits 1.0.5-alpha.1 → 1.0.5-alpha.3

package/dist/error.html

@@ -159,8 +159,8 @@
     // 探测服务是否恢复
     async function probeService() {
       try {
-        // 获取当前 URL，去掉 _retry_count 参数
-        const currentUrl = getCurrentUrlWithoutRetryCount();
+        // 获取当前 URL
+        const currentUrl = window.location.pathname + window.location.search;
 
         console.log('[Probe] 探测服务状态:', currentUrl);
 
@@ -169,15 +169,53 @@
         const timeoutId = setTimeout(() => controller.abort(), PROBE_TIMEOUT);
 
         const response = await fetch(currentUrl, {
-          method: 'HEAD', // 使用 HEAD 方法，只检查状态不下载内容
+          method: 'GET', // 使用 GET 而不是 HEAD，获取完整响应
           cache: 'no-cache',
-          signal: controller.signal
+          redirect: 'manual', // 不自动跟随重定向，避免无限循环
+          signal: controller.signal,
+          headers: {
+            'X-Health-Check': 'true' // 标识这是健康检查请求
+          }
         });
 
         clearTimeout(timeoutId);
 
-        // 检查响应状态
-        if (response.ok && response.status === 200) {
+        // 检查响应状态和响应头
+        const contentType = response.headers.get('content-type') || '';
+        const isErrorPage = response.headers.get('x-proxy-error-page') === 'true';
+
+        console.log('[Probe] 状态码:', response.status, 'Content-Type:', contentType, '是否错误页面:', isErrorPage);
+
+        // 如果收到 302/303 重定向，说明服务正在恢复中，继续探测
+        if (response.status === 302 || response.status === 303) {
+          console.log('[Probe] 收到重定向响应，服务可能正在恢复，继续探测');
+          return;
+        }
+
+        // 如果是 502 或明确标记为错误页面，继续探测
+        if (response.status === 502 || isErrorPage) {
+          console.log('[Probe] 服务未恢复，继续探测');
+          return;
+        }
+
+        // 如果是 200，需要进一步验证不是错误页面
+        if (response.status === 200) {
+          // 检查响应头是否明确标记为错误页面
+          if (isErrorPage) {
+            console.log('[Probe] 收到 200 但是错误页面，继续探测');
+            return;
+          }
+
+          // 读取响应文本，检查是否包含错误页面的特征
+          const text = await response.text();
+
+          // 检查是否是当前的错误页面（通过检查特定的标识字符串）
+          if (text.includes('哎呀，写错代码了') || text.includes('X-Proxy-Error-Page')) {
+            console.log('[Probe] 响应内容包含错误页面标识，继续探测');
+            return;
+          }
+
+          // 通过所有检查，认为服务真正恢复
           console.log('[Probe] 服务已恢复，准备刷新页面');
           stopServiceProbe();
 
@@ -187,7 +225,7 @@
             window.location.href = currentUrl;
           }, 300);
         } else {
-          console.log('[Probe] 服务未恢复，状态码:', response.status);
+          console.log('[Probe] 收到非预期状态码:', response.status, '继续探测');
         }
       } catch (error) {
         // 网络错误、超时或服务未恢复
@@ -200,17 +238,6 @@
       }
     }
 
-    // 获取当前 URL（去掉 _retry_count 参数）
-    function getCurrentUrlWithoutRetryCount() {
-      try {
-        const url = new URL(window.location.href);
-        url.searchParams.delete('_retry_count');
-        return url.pathname + url.search;
-      } catch (e) {
-        return window.location.pathname;
-      }
-    }
-
     // 复制错误信息到剪贴板
     async function handleCopy() {
       if (!errorData) {
@@ -250,6 +277,7 @@
 
     // 告诉妙搭修复
     function handleRepair() {
+      console.log('[Render Error Repair] 告诉妙搭修复错误:', errorData);
       sendPostMessage({
         type: 'RenderErrorRepair',
         data: errorData,
@@ -346,7 +374,7 @@
         class="error-image"
       />
       <p class="title">哎呀，写错代码了</p>
-      <p class="description">可复制错误信息，或告诉妙搭进行修复</p>
+      <p class="description">可复制错误信息，或告诉妙搭进行修复。</p>
       <div class="button-group">
         <button class="button button-copy" id="copyBtn" onclick="handleCopy()">
           复制错误信息

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 http2 = require("http");
     module2.exports = getCurrentNodeMethods() || getBasicNodeMethods();
     function getCurrentNodeMethods() {
-      return http.METHODS && http.METHODS.map(/* @__PURE__ */ __name(function lowerCaseMethod(method) {
+      return http2.METHODS && http2.METHODS.map(/* @__PURE__ */ __name(function lowerCaseMethod(method) {
         return method.toLowerCase();
       }, "lowerCaseMethod"));
     }
@@ -26001,7 +26001,7 @@ var require_application = __commonJS({
     var query = require_query();
     var debug = require_src3()("express:application");
     var View = require_view();
-    var http = require("http");
+    var http2 = require("http");
     var compileETag = require_utils2().compileETag;
     var compileQueryParser = require_utils2().compileQueryParser;
     var compileTrust = require_utils2().compileTrust;
@@ -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 = http2.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 http2 = 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(http2.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 http2 = 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(http2.ServerResponse.prototype);
     module2.exports = res;
     var charsetRegExp = /;\s*charset\s*=/;
     res.status = /* @__PURE__ */ __name(function status(code) {
@@ -28407,7 +28407,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 +28422,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;
     }
@@ -28547,7 +28558,7 @@ function injectErrorData(template, errorLogs) {
 }
 __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, maxRedirects = 3 } = options || {};
+  const { logDir = import_node_path2.default.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");
@@ -28559,33 +28570,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 retry response");
-          } else {
-            console.log("[Proxy Error]: Service did not recover within timeout, sending retry response");
-          }
+        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;
         }
-        const redirected = sendSimpleRetryResponse(req, res, maxRedirects);
-        if (redirected) return;
-        console.log("[Proxy Error]: Falling back to scenario 2 (detailed error page)");
+        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);
       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) {
@@ -28600,45 +28610,17 @@ function handleDevProxyError(err, req, res, options) {
   })();
 }
 __name(handleDevProxyError, "handleDevProxyError");
-function getRedirectCount(url) {
-  try {
-    const urlObj = new URL(url, "http://localhost");
-    const retryCount = urlObj.searchParams.get("_retry_count");
-    return retryCount ? parseInt(retryCount, 10) : 0;
-  } catch {
-    return 0;
-  }
-}
-__name(getRedirectCount, "getRedirectCount");
-function addRedirectCount(url, count) {
-  try {
-    const urlObj = new URL(url, "http://localhost");
-    urlObj.searchParams.set("_retry_count", String(count));
-    return urlObj.pathname + urlObj.search;
-  } catch {
-    return url;
-  }
-}
-__name(addRedirectCount, "addRedirectCount");
-function sendSimpleRetryResponse(req, res, maxRedirects) {
-  if (res.headersSent) return true;
+function sendSimpleRedirect(req, res) {
+  if (res.headersSent) return;
   const originalUrl = req.url || "/";
-  const currentCount = getRedirectCount(originalUrl);
-  if (currentCount >= maxRedirects) {
-    console.log(`[Proxy Error]: Max redirects (${maxRedirects}) reached, will show detailed error page`);
-    return false;
-  }
-  const nextCount = currentCount + 1;
-  const redirectUrl = addRedirectCount(originalUrl, nextCount);
-  console.log(`[Proxy Error]: Redirecting (attempt ${nextCount}/${maxRedirects}) to ${redirectUrl}`);
+  console.log("[Proxy Error]: Sending 302 redirect to", originalUrl);
   res.writeHead(302, {
-    "Location": redirectUrl,
+    "Location": originalUrl,
     "Cache-Control": "no-cache, no-store, must-revalidate"
   });
   res.end();
-  return true;
 }
-__name(sendSimpleRetryResponse, "sendSimpleRetryResponse");
+__name(sendSimpleRedirect, "sendSimpleRedirect");
 
 // src/middlewares/index.ts
 var import_node_path8 = __toESM(require("path"), 1);