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

package/dist/index.js

@@ -28392,8 +28392,6 @@ __name(collapseExtraBlankLines, "collapseExtraBlankLines");
 // src/helpers/proxy-error/index.ts
 import fs2 from "fs";
 import path2 from "path";
-import { createReadStream } from "fs";
-import { createInterface } from "readline";
 import http from "http";
 import https from "https";
 var errorHtmlTemplate = null;
@@ -28469,63 +28467,82 @@ function parseLogLine(line) {
   if (!trimmed) return null;
   const match = trimmed.match(/^\[\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\]\s+\[server\]\s+(.*)$/);
   if (match) {
-    return match[1];
+    const content = match[1].trim();
+    return content || null;
   }
-  return trimmed;
+  return null;
 }
 __name(parseLogLine, "parseLogLine");
 async function readRecentErrorLogs(logDir, maxLogs, fileName) {
   const logFilePath = path2.join(logDir, fileName);
+  let fileStats;
   try {
-    await fs2.promises.access(logFilePath);
+    fileStats = await fs2.promises.stat(logFilePath);
   } catch {
     return {
       logs: [],
       hasCompileError: false
     };
   }
-  const allLines = [];
-  const stream = createReadStream(logFilePath, {
-    encoding: "utf8"
-  });
-  const rl = createInterface({
-    input: stream,
-    crlfDelay: Infinity
-  });
+  const fileSize = fileStats.size;
+  const maxReadSize = 1024 * 1024;
+  const readSize = Math.min(fileSize, maxReadSize);
+  const startPosition = Math.max(0, fileSize - readSize);
+  const buffer = Buffer.allocUnsafe(readSize);
+  let fileHandle;
   try {
-    for await (const line of rl) {
-      const parsed = parseLogLine(line);
-      if (parsed !== null) {
-        allLines.push(parsed);
-      }
-    }
+    fileHandle = await fs2.promises.open(logFilePath, "r");
+    await fileHandle.read(buffer, 0, readSize, startPosition);
+  } catch (error) {
+    console.error("[Proxy Error]: Failed to read log file:", error);
+    return {
+      logs: [],
+      hasCompileError: false
+    };
   } finally {
-    rl.close();
-    stream.destroy();
+    if (fileHandle) {
+      await fileHandle.close();
+    }
+  }
+  const content = buffer.toString("utf8");
+  const lines = content.split("\n");
+  if (startPosition > 0 && lines.length > 0) {
+    lines.shift();
+  }
+  const allLines = [];
+  for (const line of lines) {
+    const parsed = parseLogLine(line);
+    if (parsed !== null) {
+      allLines.push(parsed);
+    }
   }
   let startIndex = -1;
   for (let i = allLines.length - 1; i >= 0; i--) {
-    if (allLines[i].includes("dev:server")) {
+    const line = allLines[i];
+    if (line.includes("Starting compilation in watch mode") || line.includes("File change detected. Starting incremental compilation")) {
       startIndex = i;
       break;
     }
   }
   if (startIndex === -1) {
+    console.log("[Proxy Error]: No compilation start marker found, returning last logs");
+    const fallbackLogs = allLines.slice(-maxLogs);
+    const hasCompileError2 = checkForErrors(fallbackLogs);
     return {
-      logs: [],
-      hasCompileError: false
+      logs: fallbackLogs,
+      hasCompileError: hasCompileError2
     };
   }
   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;
+  for (let i = startIndex + 1; i < allLines.length; i++) {
+    const line = allLines[i];
+    if (line.includes("Starting compilation in watch mode") || line.includes("File change detected. Starting incremental compilation")) {
+      endIndex = i;
       break;
     }
   }
   const errorSection = allLines.slice(startIndex, endIndex);
+  const hasCompileError = checkForErrors(errorSection);
   const logs = errorSection.length > maxLogs ? errorSection.slice(-maxLogs) : errorSection;
   return {
     logs,
@@ -28533,6 +28550,20 @@ async function readRecentErrorLogs(logDir, maxLogs, fileName) {
   };
 }
 __name(readRecentErrorLogs, "readRecentErrorLogs");
+function checkForErrors(logs) {
+  for (const line of logs) {
+    const compileErrorMatch = line.match(/Found (\d+) errors?\. Watching for file changes/);
+    if (compileErrorMatch) {
+      const errorCount = parseInt(compileErrorMatch[1], 10);
+      if (errorCount > 0) {
+        console.log(`[Proxy Error]: Found ${errorCount} compilation error(s)`);
+        return true;
+      }
+    }
+  }
+  return false;
+}
+__name(checkForErrors, "checkForErrors");
 function injectErrorData(template, errorLogs, clientBasePath) {
   let logsText = "";
   if (errorLogs.length > 0) {
@@ -28545,9 +28576,9 @@ function injectErrorData(template, errorLogs, clientBasePath) {
 }
 __name(injectErrorData, "injectErrorData");
 function handleDevProxyError(err, req, res, options) {
-  const { logDir = path2.join(process.cwd(), "logs"), maxErrorLogs = 100, logFileName = "server.log", retryTimeout = 5e3, retryInterval = 500, target, clientBasePath = process.env.CLIENT_BASE_PATH || "/" } = options || {};
+  const { logDir = path2.join(process.cwd(), "logs"), maxErrorLogs = 100, logFileName = "server.log", retryTimeout = 5e3, retryInterval = 500, target = `http://localhost:${process.env.SERVER_PORT || 3e3}`, clientBasePath = process.env.CLIENT_BASE_PATH || "/" } = options || {};
   const clientBasePathWithoutSlash = normalizeBasePath(clientBasePath);
-  console.error("[Proxy Error]:", err.message);
+  console.error("[Proxy Error]:", err.message, clientBasePathWithoutSlash);
   if (res.headersSent) {
     console.error("[Proxy Error]: Headers already sent, cannot send error page");
     return;
@@ -28556,7 +28587,7 @@ function handleDevProxyError(err, req, res, options) {
     try {
       const isConnError = isConnectionError(err);
       const { logs: errorLogs, hasCompileError } = await readRecentErrorLogs(logDir, maxErrorLogs, logFileName);
-      if (isConnError && !hasCompileError && target) {
+      if (isConnError && !hasCompileError) {
         console.log("[Proxy Error]: Connection error without compile errors, possibly server restarting...");
         try {
           new URL(target);
@@ -29124,18 +29155,18 @@ __name(serializeError, "serializeError");
 import { join as join2 } from "path";
 
 // src/middlewares/dev-logs/services.ts
-import { createReadStream as createReadStream2, promises as fs7 } from "fs";
-import { createInterface as createInterface2 } from "readline";
+import { createReadStream, promises as fs7 } from "fs";
+import { createInterface } from "readline";
 async function readLogEntriesByTrace(filePath, traceId, limit) {
   const exists = await fileExists(filePath);
   if (!exists) {
     return void 0;
   }
   const matches = [];
-  const stream = createReadStream2(filePath, {
+  const stream = createReadStream(filePath, {
     encoding: "utf8"
   });
-  const rl = createInterface2({
+  const rl = createInterface({
     input: stream,
     crlfDelay: Infinity
   });
@@ -29286,10 +29317,10 @@ async function readLogFilePage(filePath, page, pageSize) {
   const capacity = page * pageSize;
   const buffer = [];
   let totalLines = 0;
-  const stream = createReadStream2(filePath, {
+  const stream = createReadStream(filePath, {
     encoding: "utf8"
   });
-  const rl = createInterface2({
+  const rl = createInterface({
     input: stream,
     crlfDelay: Infinity
   });