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

package/dist/cli/index.js

@@ -258516,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 = countDropTowardGivingUp(dropsSinceLastEvent, ending.provedAlive);
       if (shouldGiveUpStreaming(dropsSinceLastEvent))
-        break;
+        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 === "";
@@ -258685,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
@@ -268315,4 +268329,4 @@ export {
   runCLI
 };
 
-//# debugId=1E7E334F907BD35264756E2164756E21
+//# debugId=2322876375B5637364756E2164756E21