@base44-preview/cli 0.1.12-pr.595.db709c9 → 0.1.12-pr.595.e3f5cae

package/dist/cli/index.js

@@ -247842,6 +247842,10 @@ async function* readLines(body) {
 async function* readStreamEvents(body) {
   let eventName = "";
   for await (const line of readLines(body)) {
+    if (line.startsWith(":")) {
+      yield { kind: "ping" };
+      continue;
+    }
     if (line.startsWith("event:")) {
       eventName = line.slice(6).trim();
       continue;
@@ -258480,12 +258484,14 @@ function streamEventToLogEntry(event) {
 }
 async function printStreamUntilEnd(stream, levelFilter, jsonMode, startTime) {
   let lastTime = startTime;
-  let producedEvents = false;
+  let provedAlive = false;
   try {
     for await (const event of stream) {
-      producedEvents = true;
+      provedAlive = true;
       if (event.kind === "end")
-        return { lastTime, producedEvents, end: event.end };
+        return { lastTime, provedAlive, end: event.end };
+      if (event.kind === "ping")
+        continue;
       if (levelFilter && event.log.level !== levelFilter)
         continue;
       writeFollowLine(streamEventToLogEntry(event.log), jsonMode);
@@ -258493,11 +258499,13 @@ async function printStreamUntilEnd(stream, levelFilter, jsonMode, startTime) {
         lastTime = event.log.time;
     }
   } catch {}
-  return { lastTime, producedEvents, end: null };
+  return { lastTime, provedAlive, end: null };
 }
 var STREAM_RECONNECT_DELAY_MS = 1000;
 var MAX_DROPS_SINCE_LAST_EVENT = 2;
 var CONNECT_RETRY_DELAYS_MS = [1000, 2000, 4000, 8000];
+var countDropTowardGivingUp = (dropsSinceLastEvent, provedAlive) => provedAlive ? 1 : dropsSinceLastEvent + 1;
+var shouldGiveUpStreaming = (dropsSinceLastEvent) => dropsSinceLastEvent >= MAX_DROPS_SINCE_LAST_EVENT;
 async function connectWhileTransientlyUnavailable(filters) {
   let attempt = await openLogStream(filters);
   for (const retryDelay of CONNECT_RETRY_DELAYS_MS) {
@@ -258508,42 +258516,56 @@ async function connectWhileTransientlyUnavailable(filters) {
   }
   return attempt;
 }
-async function streamUntilExhausted(options, jsonMode) {
-  const filters = {
-    functions: parseFunctionNames(options.function),
-    env: options.env
-  };
-  let everConnected = false;
+async function streamUntilExhausted(firstStream, filters, options, jsonMode) {
+  let events = firstStream;
   let lastTime = "";
   let dropsSinceLastEvent = 0;
   while (true) {
-    const attempt = await connectWhileTransientlyUnavailable(filters);
-    if (attempt.kind !== "stream")
-      break;
-    everConnected = true;
-    const ending = await printStreamUntilEnd(attempt.events, options.level, jsonMode, lastTime);
+    const ending = await printStreamUntilEnd(events, options.level, jsonMode, lastTime);
     lastTime = ending.lastTime;
     if (ending.end) {
       if (!ending.end.retriable)
-        break;
+        return;
       dropsSinceLastEvent = 0;
     } else {
-      dropsSinceLastEvent = ending.producedEvents ? 1 : dropsSinceLastEvent + 1;
-      if (dropsSinceLastEvent >= MAX_DROPS_SINCE_LAST_EVENT)
-        break;
+      dropsSinceLastEvent = countDropTowardGivingUp(dropsSinceLastEvent, ending.provedAlive);
+      if (shouldGiveUpStreaming(dropsSinceLastEvent))
+        return;
     }
     await delay2(STREAM_RECONNECT_DELAY_MS);
+    const reopened = await connectWhileTransientlyUnavailable(filters);
+    if (reopened.kind !== "stream")
+      return;
+    events = reopened.events;
   }
-  return { everConnected, lastTime };
 }
-async function followLogs(functionNames, options, availableFunctionNames, jsonMode, logger2) {
-  const { everConnected, lastTime } = await streamUntilExhausted(options, jsonMode);
-  logger2.warn(everConnected ? "Realtime stream disconnected — falling back to polling (lines may lag ~20-30s)." : "Realtime stream unavailable — falling back to polling (lines may lag ~20-30s).");
-  return pollLogs(functionNames, options, availableFunctionNames, jsonMode, {
-    lastTime,
-    boundaryKeys: new Set
+function streamLostError() {
+  return new ApiError("The realtime log stream stopped and could not be re-established", {
+    hints: [
+      { message: "Start a new live tail", command: "base44 logs --follow" },
+      {
+        message: "Or read recent logs without streaming",
+        command: "base44 logs"
+      }
+    ]
   });
 }
+async function followLogs(functionNames, options, availableFunctionNames, jsonMode, logger2) {
+  const filters = {
+    functions: parseFunctionNames(options.function),
+    env: options.env
+  };
+  const opened = await connectWhileTransientlyUnavailable(filters);
+  if (opened.kind !== "stream") {
+    logger2.warn(opened.kind === "refused" ? "Realtime logs are not available for this app — falling back to polling (lines may lag ~20-30s)." : "Could not reach the realtime log stream — falling back to polling (lines may lag ~20-30s).");
+    return pollLogs(functionNames, options, availableFunctionNames, jsonMode, {
+      lastTime: "",
+      boundaryKeys: new Set
+    });
+  }
+  await streamUntilExhausted(opened.events, filters, options, jsonMode);
+  throw streamLostError();
+}
 async function pollLogs(functionNames, options, availableFunctionNames, jsonMode, initialState) {
   let state = initialState;
   let first = state.lastTime === "";
@@ -258677,7 +258699,7 @@ async function logsAction(ctx, options) {
 function getLogsCommand() {
   return new Base44Command("logs").description("Fetch function logs for this app").option("--function <names>", "Filter by function name(s), comma-separated. If omitted, fetches logs for all deployed functions").option("--since <datetime>", "Show logs from this time. ISO datetime or relative shorthand (e.g. 1h, 30m, 2d)", normalizeDatetime).option("--until <datetime>", "Show logs until this time. ISO datetime or relative shorthand (e.g. 1h, 30m, 2d)", normalizeDatetime).addOption(new Option("--level <level>", "Filter by log level").choices([
     ...LogLevelSchema.options
-  ])).option("-n, --limit <n>", "Results per page (1-1000, default: 50)").option("-f, --follow", "Stream new logs as they arrive").addOption(new Option("--order <order>", "Sort order").choices(["asc", "desc"])).addOption(new Option("--env <env>", "Which deployment to read logs from: preview (current draft) or prod (published). Default: preview").choices([...LogEnvSchema.options])).action(logsAction);
+  ])).option("-n, --limit <n>", "Results per page (1-1000; the server returns at most 500)").option("-f, --follow", "Stream new logs as they arrive").addOption(new Option("--order <order>", "Sort order").choices(["asc", "desc"])).addOption(new Option("--env <env>", "Which deployment to read logs from: preview (current draft) or prod (published). Default: preview").choices([...LogEnvSchema.options])).action(logsAction);
 }
 
 // src/cli/commands/project/scaffold.ts
@@ -268307,4 +268329,4 @@ export {
   runCLI
 };
 
-//# debugId=9A9871757366EC3764756E2164756E21
+//# debugId=2322876375B5637364756E2164756E21