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

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);
 
@@ -200,17 +200,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 +239,7 @@
 
     // 告诉妙搭修复
     function handleRepair() {
+      console.log('[Render Error Repair] 告诉妙搭修复错误:', errorData);
       sendPostMessage({
         type: 'RenderErrorRepair',
         data: errorData,
@@ -346,7 +336,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

@@ -28547,7 +28547,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");
@@ -28571,14 +28571,13 @@ function handleDevProxyError(err, req, res, options) {
           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]: Service recovered, sending redirect");
+            sendSimpleRedirect(req, res);
+            return;
           }
+          console.log("[Proxy Error]: Service did not recover within timeout, showing error page");
         }
-        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]: 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();
@@ -28600,45 +28599,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);