@lark-apaas/fullstack-cli 1.1.16-alpha.7 → 1.1.16-beta.0

package/dist/index.js

@@ -5446,6 +5446,90 @@ function readJsonLinesTailByLevel(filePath, maxLines, offset, levels) {
 
 // src/commands/read-logs/index.ts
 var LOG_TYPES = ["server", "trace", "server-std", "client-std", "browser"];
+function normalizeObjectKey(key) {
+  return key.toLowerCase().replace(/_/g, "");
+}
+function formatIsoWithLocalOffset(date, includeMilliseconds) {
+  const pad2 = (n) => String(n).padStart(2, "0");
+  const pad3 = (n) => String(n).padStart(3, "0");
+  const year = date.getFullYear();
+  const month = pad2(date.getMonth() + 1);
+  const day = pad2(date.getDate());
+  const hour = pad2(date.getHours());
+  const minute = pad2(date.getMinutes());
+  const second = pad2(date.getSeconds());
+  const ms = pad3(date.getMilliseconds());
+  const tzOffsetMinutes = -date.getTimezoneOffset();
+  const sign = tzOffsetMinutes >= 0 ? "+" : "-";
+  const abs = Math.abs(tzOffsetMinutes);
+  const offsetHH = pad2(Math.floor(abs / 60));
+  const offsetMM = pad2(abs % 60);
+  const msPart = includeMilliseconds ? `.${ms}` : "";
+  return `${year}-${month}-${day}T${hour}:${minute}:${second}${msPart}${sign}${offsetHH}:${offsetMM}`;
+}
+function formatLocalDateTimeStringWithOffset(input) {
+  const match = input.match(/^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/);
+  if (!match) return input;
+  const year = Number(match[1]);
+  const month = Number(match[2]);
+  const day = Number(match[3]);
+  const hour = Number(match[4]);
+  const minute = Number(match[5]);
+  const second = Number(match[6]);
+  const date = new Date(year, month - 1, day, hour, minute, second, 0);
+  if (Number.isNaN(date.getTime())) return input;
+  return formatIsoWithLocalOffset(date, false);
+}
+function formatIsoNoTzStringWithOffset(input) {
+  const match = input.match(
+    /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.(\d{1,3}))?$/
+  );
+  if (!match) return input;
+  const year = Number(match[1]);
+  const month = Number(match[2]);
+  const day = Number(match[3]);
+  const hour = Number(match[4]);
+  const minute = Number(match[5]);
+  const second = Number(match[6]);
+  const msRaw = match[7];
+  const ms = typeof msRaw === "string" ? Number(msRaw.padEnd(3, "0")) : 0;
+  const date = new Date(year, month - 1, day, hour, minute, second, ms);
+  if (Number.isNaN(date.getTime())) return input;
+  return formatIsoWithLocalOffset(date, typeof msRaw === "string");
+}
+function normalizeTimeString(input) {
+  const localDateTime = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/;
+  if (localDateTime.test(input)) {
+    return formatLocalDateTimeStringWithOffset(input);
+  }
+  const isoWithTz = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{1,3})?(?:Z|[+-]\d{2}:\d{2})$/i;
+  if (isoWithTz.test(input)) {
+    const date = new Date(input);
+    if (Number.isNaN(date.getTime())) return input;
+    const includeMs = /\.\d{1,3}/.test(input);
+    return formatIsoWithLocalOffset(date, includeMs);
+  }
+  const isoNoTz = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{1,3})?$/;
+  if (isoNoTz.test(input)) {
+    return formatIsoNoTzStringWithOffset(input);
+  }
+  return input;
+}
+function normalizeTimezonesInValue(value, keyNormalized) {
+  if (typeof value === "string" && (keyNormalized === "time" || keyNormalized === "servertime")) {
+    return normalizeTimeString(value);
+  }
+  if (!value || typeof value !== "object") return value;
+  if (Array.isArray(value)) {
+    return value.map((item) => normalizeTimezonesInValue(item));
+  }
+  const obj = value;
+  const result = {};
+  for (const [key, child] of Object.entries(obj)) {
+    result[key] = normalizeTimezonesInValue(child, normalizeObjectKey(key));
+  }
+  return result;
+}
 function sanitizeStructuredLog(value) {
   if (!value || typeof value !== "object") return value;
   if (Array.isArray(value)) return value;
@@ -5550,16 +5634,17 @@ async function readLogsJsonResult(options) {
   const logs = [];
   let hasError = false;
   for (const line of lines) {
-    if (!hasError && hasErrorInStdLines([line])) {
-      hasError = true;
-    }
     try {
       const parsed = JSON.parse(line);
-      logs.push(sanitizeStructuredLog(parsed));
+      const normalized = normalizeTimezonesInValue(parsed);
+      logs.push(sanitizeStructuredLog(normalized));
       if (!hasError && hasErrorInLogObject(parsed)) {
         hasError = true;
       }
     } catch {
+      if (!hasError && hasErrorInStdLines([line])) {
+        hasError = true;
+      }
       continue;
     }
   }
@@ -5589,15 +5674,8 @@ function resolveLogFilePath(logDir, type) {
   throw new Error(`Unsupported log type: ${type}`);
 }
 async function run4(options) {
-  try {
-    const result = await readLogsJsonResult(options);
-    process.stdout.write(JSON.stringify(result) + "\n");
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    const result = { hasError: true, totalLinesCount: 0, logs: [message] };
-    process.stdout.write(JSON.stringify(result) + "\n");
-    process.exitCode = 1;
-  }
+  const result = await readLogsJsonResult(options);
+  process.stdout.write(JSON.stringify(result) + "\n");
 }
 function parseLogType(input) {
   const value = typeof input === "string" ? input.trim() : "";
@@ -5629,9 +5707,9 @@ var readLogsCommand = {
   name: "read-logs",
   description: "Read latest logs from log files",
   register(program) {
-    program.command(this.name).description(this.description).option("--dir <path>", "Logs directory", "logs").option("--type <type>", `Log type: ${LOG_TYPES.join("|")}`, "server-std").option("--max-lines <lines>", "Max lines to return", "30").option("--offset <lines>", "Skip latest N lines for pagination", "0").option("--trace-id <id>", "Filter structured logs by trace id").option("--level <levels>", "Filter structured logs by level (comma-separated)").action(async (rawOptions) => {
+    program.command(this.name).description(this.description).option("--dir <path>", "Logs directory", "/tmp").option("--type <type>", `Log type: ${LOG_TYPES.join("|")}`, "server-std").option("--max-lines <lines>", "Max lines to return", "30").option("--offset <lines>", "Skip latest N lines for pagination", "0").option("--trace-id <id>", "Filter structured logs by trace id").option("--level <levels>", "Filter structured logs by level (comma-separated)").action(async (rawOptions) => {
       try {
-        const logDir = typeof rawOptions.dir === "string" ? rawOptions.dir : "logs";
+        const logDir = typeof rawOptions.dir === "string" ? rawOptions.dir : "/tmp";
         const type = parseLogType(rawOptions.type);
         const maxLines = parsePositiveInt(rawOptions.maxLines, "--max-lines");
         const offset = parseNonNegativeInt(rawOptions.offset, "--offset");
@@ -5640,8 +5718,7 @@ var readLogsCommand = {
         await run4({ logDir, type, maxLines, offset, traceId, levels });
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        const result = { hasError: true, totalLinesCount: 0, logs: [message] };
-        process.stdout.write(JSON.stringify(result) + "\n");
+        process.stderr.write(message + "\n");
         process.exitCode = 1;
       }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.16-alpha.7",
+  "version": "1.1.16-beta.0",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",