@base44-preview/cli 0.1.12-pr.611.23d31b2 → 0.1.13-pr.612.385bd7a

package/dist/cli/index.js

@@ -221222,7 +221222,7 @@ var require_dist5 = __commonJS(function(exports, module) {
     determineAgent: () => determineAgent
   });
   module.exports = __toCommonJS2(src_exports);
-  var import_promises25 = __require("node:fs/promises");
+  var import_promises26 = __require("node:fs/promises");
   var import_node_fs25 = __require("node:fs");
   var DEVIN_LOCAL_PATH = "/opt/.devin";
   var CURSOR2 = "cursor";
@@ -221280,7 +221280,7 @@ var require_dist5 = __commonJS(function(exports, module) {
       return { isAgent: true, agent: { name: REPLIT } };
     }
     try {
-      await (0, import_promises25.access)(DEVIN_LOCAL_PATH, import_node_fs25.constants.F_OK);
+      await (0, import_promises26.access)(DEVIN_LOCAL_PATH, import_node_fs25.constants.F_OK);
       return { isAgent: true, agent: { name: DEVIN } };
     } catch (error48) {}
     return { isAgent: false, agent: undefined };
@@ -247823,10 +247823,8 @@ async function* readLines(body) {
   try {
     while (true) {
       const result = await readOrSilence(reader);
-      if (result === "silence") {
-        await reader.cancel();
+      if (result === "silence")
         return;
-      }
       if (result.done || !result.value)
         return;
       buffered += decoder.decode(result.value, { stream: true });
@@ -247836,7 +247834,7 @@ async function* readLines(body) {
       yield* lines;
     }
   } finally {
-    reader.releaseLock();
+    await reader.cancel().catch(() => {});
   }
 }
 async function* readStreamEvents(body) {
@@ -247864,17 +247862,16 @@ async function* readStreamEvents(body) {
 var STREAM_CONNECT_TIMEOUT_MS = 1e4;
 var isWorthReconnecting = (status) => status >= 500;
 async function openLogStream(filters) {
+  const url2 = buildStreamUrl(filters);
+  const headers = {
+    Accept: "text/event-stream",
+    ...await buildStreamAuthHeaders()
+  };
   const connectPhase = new AbortController;
   const connectTimer = setTimeout(() => connectPhase.abort(), STREAM_CONNECT_TIMEOUT_MS);
   let response;
   try {
-    response = await fetch(buildStreamUrl(filters), {
-      headers: {
-        Accept: "text/event-stream",
-        ...await buildStreamAuthHeaders()
-      },
-      signal: connectPhase.signal
-    });
+    response = await fetch(url2, { headers, signal: connectPhase.signal });
   } catch {
     return { kind: "transient" };
   } finally {
@@ -248062,7 +248059,7 @@ import { join as join12 } from "node:path";
 // package.json
 var package_default = {
   name: "base44",
-  version: "0.1.12",
+  version: "0.1.13",
   description: "Base44 CLI - Unified interface for managing Base44 applications",
   type: "module",
   bin: {
@@ -258413,6 +258410,7 @@ function getLinkCommand() {
 }
 
 // src/cli/commands/project/logs.ts
+import { setTimeout as delay2 } from "node:timers/promises";
 function parseFunctionFilters(options) {
   const filters = {};
   if (options.since) {
@@ -258473,7 +258471,6 @@ function writeFollowLine(entry, jsonMode) {
   process.stdout.write(`${line}
 `);
 }
-var delay2 = (ms2) => new Promise((resolve9) => setTimeout(resolve9, ms2));
 function streamEventToLogEntry(event) {
   return {
     time: event.time,
@@ -258501,46 +258498,42 @@ async function printStreamUntilEnd(stream, levelFilter, jsonMode, startTime) {
   } catch {}
   return { lastTime, provedAlive, end: null };
 }
-var RECONNECT_DELAYS_MS = [1000, 2000, 4000, 8000];
-var ONE_STRIKE_FOR_A_STREAM_THAT_WORKED = 1;
-var strikesAfter = (ending, strikes) => {
-  if (ending.end)
-    return 0;
-  return ending.provedAlive ? ONE_STRIKE_FOR_A_STREAM_THAT_WORKED : strikes + 1;
-};
-var hasRunOutOfStrikes = (strikes) => strikes >= RECONNECT_DELAYS_MS.length;
-async function connectWithinStrikes(filters, strikes) {
-  let spent = strikes;
+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);
-  while (attempt.kind === "transient") {
-    spent += 1;
-    if (hasRunOutOfStrikes(spent))
-      return { kind: "exhausted" };
-    await delay2(RECONNECT_DELAYS_MS[spent - 1]);
+  for (const retryDelay of CONNECT_RETRY_DELAYS_MS) {
+    if (attempt.kind !== "transient")
+      return attempt;
+    await delay2(retryDelay);
     attempt = await openLogStream(filters);
   }
-  if (attempt.kind === "refused")
-    return { kind: "refused" };
-  return { kind: "stream", events: attempt.events, strikes: spent };
+  return attempt;
 }
 async function streamUntilExhausted(firstStream, filters, options, jsonMode) {
   let events = firstStream;
   let lastTime = "";
-  let strikes = 0;
+  let dropsSinceLastEvent = 0;
   while (true) {
     const ending = await printStreamUntilEnd(events, options.level, jsonMode, lastTime);
     lastTime = ending.lastTime;
-    if (ending.end && !ending.end.retriable)
-      return;
-    strikes = strikesAfter(ending, strikes);
-    if (hasRunOutOfStrikes(strikes))
-      return;
-    await delay2(RECONNECT_DELAYS_MS[strikes]);
-    const reconnected = await connectWithinStrikes(filters, strikes);
-    if (reconnected.kind !== "stream")
+    if (ending.end) {
+      if (!ending.end.retriable)
+        return;
+      dropsSinceLastEvent = 0;
+    } else {
+      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 = reconnected.events;
-    strikes = reconnected.strikes;
+    events = reopened.events;
   }
 }
 function streamLostError() {
@@ -258559,7 +258552,14 @@ async function followLogs(functionNames, options, availableFunctionNames, jsonMo
     functions: parseFunctionNames(options.function),
     env: options.env
   };
-  const opened = await connectWithinStrikes(filters, 0);
+  if (options.since) {
+    logger2.warn("--since reads the past, so this run polls instead of streaming (lines may lag ~20-30s).");
+    return pollLogs(functionNames, options, availableFunctionNames, jsonMode, {
+      lastTime: "",
+      boundaryKeys: new Set
+    });
+  }
+  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, {
@@ -258674,9 +258674,6 @@ async function logsAction(ctx, options) {
     return { outroMessage: "No functions found in this app." };
   }
   if (options.follow) {
-    if (options.since) {
-      throw new InvalidInputError("--since cannot be combined with --follow yet (the realtime stream starts from now).");
-    }
     if (options.until) {
       throw new InvalidInputError("--until cannot be combined with --follow (a stream has no end).");
     }
@@ -268333,4 +268330,4 @@ export {
   runCLI
 };
 
-//# debugId=F798B29EB4A3A54F64756E2164756E21
+//# debugId=80FBE85BCE476A3564756E2164756E21