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

package/dist/cli/index.js

@@ -120898,7 +120898,7 @@ function parse42(toml, { maxDepth = 1000, integersAsBigInt } = {}) {
   }
   return res;
 }
-async function readFile6(file2) {
+async function readFile5(file2) {
   if (isUrlString(file2)) {
     file2 = new URL(file2);
   }
@@ -134692,7 +134692,7 @@ ${codeblock}`, options8);
     "\\": "\\"
   };
   KEY_PART_RE = /^[a-zA-Z0-9-_]+[ \t]*$/;
-  read_file_default = readFile6;
+  read_file_default = readFile5;
   loadConfigFromPackageJson = process.versions.bun ? async function loadConfigFromBunPackageJson(file2) {
     const { prettier } = await readBunPackageJson(file2);
     return prettier;
@@ -143927,7 +143927,7 @@ var require_parse7 = __commonJS(function(exports) {
       extension: url3.getExtension(path18)
     };
     try {
-      const resolver = await readFile7(file2, options8, $refs);
+      const resolver = await readFile6(file2, options8, $refs);
       $ref.pathType = resolver.plugin.name;
       file2.data = resolver.result;
       const parser2 = await parseFile(file2, options8, $refs);
@@ -143940,7 +143940,7 @@ var require_parse7 = __commonJS(function(exports) {
       throw err;
     }
   }
-  async function readFile7(file2, options8, $refs) {
+  async function readFile6(file2, options8, $refs) {
     let resolvers = plugins.all(options8.resolve);
     resolvers = plugins.filter(resolvers, "canRead", file2);
     plugins.sort(resolvers);
@@ -221223,7 +221223,7 @@ var require_dist5 = __commonJS(function(exports, module) {
   });
   module.exports = __toCommonJS2(src_exports);
   var import_promises25 = __require("node:fs/promises");
-  var import_node_fs24 = __require("node:fs");
+  var import_node_fs25 = __require("node:fs");
   var DEVIN_LOCAL_PATH = "/opt/.devin";
   var CURSOR2 = "cursor";
   var CURSOR_CLI = "cursor-cli";
@@ -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_fs24.constants.F_OK);
+      await (0, import_promises25.access)(DEVIN_LOCAL_PATH, import_node_fs25.constants.F_OK);
       return { isAgent: true, agent: { name: DEVIN } };
     } catch (error48) {}
     return { isAgent: false, agent: undefined };
@@ -247752,137 +247752,6 @@ var functionResource = {
   readAll: readAllFunctions,
   push: (functions) => deployFunctionsSequentially(functions)
 };
-// src/core/resources/function/stream-api.ts
-var StreamLogEventSchema = exports_external.object({
-  time: exports_external.string(),
-  level: exports_external.preprocess((value) => value === "warn" ? "warning" : value, LogLevelSchema),
-  function: exports_external.string().nullable(),
-  message: exports_external.string()
-});
-var StreamEndEventSchema = exports_external.object({
-  reason: exports_external.string(),
-  retriable: exports_external.boolean()
-});
-function buildStreamUrl(filters) {
-  const { id } = getAppContext();
-  const url2 = new URL(`/api/apps/${id}/functions-mgmt/logs/stream`, getBase44ApiUrl());
-  if (filters.functions?.length) {
-    url2.searchParams.set("function", filters.functions.join(","));
-  }
-  if (filters.env) {
-    url2.searchParams.set("env", filters.env);
-  }
-  return url2.href;
-}
-async function buildStreamAuthHeaders() {
-  const workspaceApiKey = getWorkspaceApiKeyFromEnv();
-  if (workspaceApiKey && isWorkspaceApiKey(workspaceApiKey)) {
-    return { api_key: workspaceApiKey };
-  }
-  const auth = await readAuth();
-  if (isTokenExpired(auth)) {
-    const refreshedToken = await refreshAndSaveTokens();
-    if (refreshedToken) {
-      return { Authorization: `Bearer ${refreshedToken}` };
-    }
-  }
-  return { Authorization: `Bearer ${auth.accessToken}` };
-}
-function parseStreamEvent(eventName, data) {
-  try {
-    const payload = JSON.parse(data);
-    if (eventName === "end") {
-      const result = StreamEndEventSchema.safeParse(payload);
-      return result.success ? { kind: "end", end: result.data } : null;
-    }
-    if (eventName === "") {
-      const result = StreamLogEventSchema.safeParse(payload);
-      return result.success ? { kind: "log", log: result.data } : null;
-    }
-    return null;
-  } catch {
-    return null;
-  }
-}
-var STREAM_SILENCE_TIMEOUT_MS = 60000;
-async function readOrSilence(reader) {
-  let timer;
-  const silence = new Promise((resolve3) => {
-    timer = setTimeout(() => resolve3("silence"), STREAM_SILENCE_TIMEOUT_MS);
-  });
-  try {
-    return await Promise.race([reader.read(), silence]);
-  } finally {
-    clearTimeout(timer);
-  }
-}
-async function* readLines(body) {
-  const reader = body.getReader();
-  const decoder = new TextDecoder;
-  let buffered = "";
-  try {
-    while (true) {
-      const result = await readOrSilence(reader);
-      if (result === "silence") {
-        await reader.cancel();
-        return;
-      }
-      if (result.done || !result.value)
-        return;
-      buffered += decoder.decode(result.value, { stream: true });
-      const lines = buffered.split(`
-`);
-      buffered = lines.pop() ?? "";
-      yield* lines;
-    }
-  } finally {
-    reader.releaseLock();
-  }
-}
-async function* readStreamEvents(body) {
-  let eventName = "";
-  for await (const line of readLines(body)) {
-    if (line.startsWith("event:")) {
-      eventName = line.slice(6).trim();
-      continue;
-    }
-    if (line.startsWith("data:")) {
-      const event = parseStreamEvent(eventName, line.slice(5));
-      eventName = "";
-      if (event)
-        yield event;
-      continue;
-    }
-    if (line.trim() === "")
-      eventName = "";
-  }
-}
-var STREAM_CONNECT_TIMEOUT_MS = 1e4;
-var isWorthReconnecting = (status) => status >= 500;
-async function openLogStream(filters) {
-  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
-    });
-  } catch {
-    return { kind: "transient" };
-  } finally {
-    clearTimeout(connectTimer);
-  }
-  if (!response.ok) {
-    return isWorthReconnecting(response.status) ? { kind: "transient" } : { kind: "refused" };
-  }
-  if (!response.body)
-    return { kind: "transient" };
-  return { kind: "stream", events: readStreamEvents(response.body) };
-}
 // src/core/project/config.ts
 class ProjectConfigReader {
   pluginSourceByNamespace = new Map;
@@ -248396,9 +248265,9 @@ async function createArchive(pathToArchive, targetArchivePath) {
 }
 // src/core/site/manifest.ts
 import { createHash } from "node:crypto";
-import { readFile as readFile2, stat } from "node:fs/promises";
+import { createReadStream } from "node:fs";
+import { stat } from "node:fs/promises";
 import { basename as basename4, join as join15 } from "node:path";
-var MAX_ASSET_SIZE_BYTES = 25 * 1024 * 1024;
 var MAX_ASSET_COUNT = 1e5;
 var ASSETS_IGNORE_FILE = ".assetsignore";
 var ALWAYS_IGNORED = new Set([
@@ -248406,8 +248275,12 @@ var ALWAYS_IGNORED = new Set([
   "wrangler.json",
   ".dev.vars"
 ]);
-function hashAsset(appId, content) {
-  return createHash("sha256").update(Buffer.from(appId, "utf8")).update(content).digest("hex").slice(0, 32);
+async function hashAssetFile(appId, absolutePath) {
+  const hash2 = createHash("sha256").update(Buffer.from(appId, "utf8"));
+  for await (const chunk of createReadStream(absolutePath)) {
+    hash2.update(chunk);
+  }
+  return hash2.digest("hex").slice(0, 32);
 }
 async function buildAssetManifest(assetsDir, appId) {
   const manifest = {};
@@ -248426,11 +248299,7 @@ async function buildAssetManifest(assetsDir, appId) {
   for (const relativePath of relativeFilePaths.sort()) {
     const absolutePath = join15(assetsDir, ...relativePath.split("/"));
     const { size } = await stat(absolutePath);
-    if (size > MAX_ASSET_SIZE_BYTES) {
-      throw new InvalidInputError(`Static asset "${relativePath}" is ${size} bytes, which exceeds the 25 MiB per-file limit.`);
-    }
-    const content = await readFile2(absolutePath);
-    const hash2 = hashAsset(appId, content);
+    const hash2 = await hashAssetFile(appId, absolutePath);
     manifest[`/${relativePath}`] = { hash: hash2, size };
     if (!filesByHash.has(hash2)) {
       filesByHash.set(hash2, { absolutePath, hash: hash2, size });
@@ -248439,11 +248308,11 @@ async function buildAssetManifest(assetsDir, appId) {
   return { manifest, filesByHash };
 }
 // src/core/site/static-site.ts
-import { readFile as readFile4 } from "node:fs/promises";
+import { readFile as readFile3 } from "node:fs/promises";
 import { join as join16 } from "node:path";
 
 // src/core/site/upload.ts
-import { readFile as readFile3 } from "node:fs/promises";
+import { readFile as readFile2 } from "node:fs/promises";
 
 // ../../node_modules/p-map/index.js
 async function pMap(iterable, mapper, {
@@ -248589,7 +248458,7 @@ async function uploadPresignedAsset(upload, assets) {
   if (!file2) {
     throw new InternalError(`Server requested upload of unknown asset path: ${upload.path}`);
   }
-  const content = await readFile3(file2.absolutePath);
+  const content = await readFile2(file2.absolutePath);
   try {
     await distribution_default.put(upload.url, {
       body: new Uint8Array(content),
@@ -248626,7 +248495,7 @@ async function deployStaticSite(options) {
       onProgress: progress?.onAssetUpload
     });
   }
-  const indexHtml = await readFile4(join16(outputDir, "index.html"));
+  const indexHtml = await readFile3(join16(outputDir, "index.html"));
   const finalized = await finalizeStaticDeployment(created.deploymentId, new Uint8Array(indexHtml), created.sessionId);
   return { deploymentId: finalized.deploymentId };
 }
@@ -253790,7 +253659,7 @@ var duplex = () => new Duplex({ read() {}, write() {} });
 var handleDummyPromise = async (error48, verboseInfo, options) => handleResult(error48, verboseInfo, options);
 
 // ../../node_modules/execa/lib/stdio/handle-async.js
-import { createReadStream, createWriteStream } from "node:fs";
+import { createReadStream as createReadStream2, createWriteStream } from "node:fs";
 import { Buffer as Buffer5 } from "node:buffer";
 import { Readable as Readable4, Writable as Writable2, Duplex as Duplex2 } from "node:stream";
 var handleStdioAsync = (options, verboseInfo) => handleStdio(addPropertiesAsync, options, verboseInfo, false);
@@ -253813,8 +253682,8 @@ var addProperties2 = {
 var addPropertiesAsync = {
   input: {
     ...addProperties2,
-    fileUrl: ({ value }) => ({ stream: createReadStream(value) }),
-    filePath: ({ value: { file: file2 } }) => ({ stream: createReadStream(file2) }),
+    fileUrl: ({ value }) => ({ stream: createReadStream2(value) }),
+    filePath: ({ value: { file: file2 } }) => ({ stream: createReadStream2(file2) }),
     webStream: ({ value }) => ({ stream: Readable4.fromWeb(value) }),
     iterable: ({ value }) => ({ stream: Readable4.from(value) }),
     asyncIterable: ({ value }) => ({ stream: Readable4.from(value) }),
@@ -258469,84 +258338,9 @@ function writeFollowLine(entry, jsonMode) {
   process.stdout.write(`${line}
 `);
 }
-var delay2 = (ms2) => new Promise((resolve9) => setTimeout(resolve9, ms2));
-function streamEventToLogEntry(event) {
-  return {
-    time: event.time,
-    level: event.level,
-    message: event.function ? `[${event.function}] ${event.message}` : event.message,
-    source: event.function ?? ""
-  };
-}
-async function printStreamUntilEnd(stream, levelFilter, jsonMode, startTime) {
-  let lastTime = startTime;
-  let producedEvents = false;
-  try {
-    for await (const event of stream) {
-      producedEvents = true;
-      if (event.kind === "end")
-        return { lastTime, producedEvents, end: event.end };
-      if (levelFilter && event.log.level !== levelFilter)
-        continue;
-      writeFollowLine(streamEventToLogEntry(event.log), jsonMode);
-      if (event.log.time > lastTime)
-        lastTime = event.log.time;
-    }
-  } catch {}
-  return { lastTime, producedEvents, end: null };
-}
-var STREAM_RECONNECT_DELAY_MS = 1000;
-var MAX_DROPS_SINCE_LAST_EVENT = 2;
-var CONNECT_RETRY_DELAYS_MS = [1000, 2000, 4000, 8000];
-async function connectWhileTransientlyUnavailable(filters) {
-  let attempt = await openLogStream(filters);
-  for (const retryDelay of CONNECT_RETRY_DELAYS_MS) {
-    if (attempt.kind !== "transient")
-      return attempt;
-    await delay2(retryDelay);
-    attempt = await openLogStream(filters);
-  }
-  return attempt;
-}
-async function streamUntilExhausted(options, jsonMode) {
-  const filters = {
-    functions: parseFunctionNames(options.function),
-    env: options.env
-  };
-  let everConnected = false;
-  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);
-    lastTime = ending.lastTime;
-    if (ending.end) {
-      if (!ending.end.retriable)
-        break;
-      dropsSinceLastEvent = 0;
-    } else {
-      dropsSinceLastEvent = ending.producedEvents ? 1 : dropsSinceLastEvent + 1;
-      if (dropsSinceLastEvent >= MAX_DROPS_SINCE_LAST_EVENT)
-        break;
-    }
-    await delay2(STREAM_RECONNECT_DELAY_MS);
-  }
-  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
-  });
-}
-async function pollLogs(functionNames, options, availableFunctionNames, jsonMode, initialState) {
-  let state = initialState;
-  let first = state.lastTime === "";
+async function followLogs(functionNames, options, availableFunctionNames, jsonMode) {
+  let state = { lastTime: "", boundaryKeys: new Set };
+  let first = true;
   while (true) {
     const pollOptions = first ? options : { ...options, since: state.lastTime };
     const entries = await fetchLogsForFunctions(functionNames, pollOptions, availableFunctionNames);
@@ -258556,7 +258350,7 @@ async function pollLogs(functionNames, options, availableFunctionNames, jsonMode
     for (const entry of fresh)
       writeFollowLine(entry, jsonMode);
     first = false;
-    await delay2(2000);
+    await new Promise((resolve9) => setTimeout(resolve9, 2000));
   }
 }
 function formatLogs(entries, env3) {
@@ -258648,9 +258442,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).");
     }
@@ -258658,7 +258449,7 @@ async function logsAction(ctx, options) {
       throw new InvalidInputError("--order cannot be combined with --follow (a live tail always streams oldest to newest).");
     }
     options.order = "asc";
-    return followLogs(functionNames, options, availableFunctionNames, ctx.jsonMode, ctx.log);
+    return followLogs(functionNames, options, availableFunctionNames, ctx.jsonMode);
   }
   let entries = await fetchLogsForFunctions(functionNames, options, availableFunctionNames);
   const limit = options.limit ? Number.parseInt(options.limit, 10) : undefined;
@@ -258880,7 +258671,7 @@ async function callTool(appId, tool, payload, schema12, context, timeout2 = 6000
 function listDirectory(appId, params) {
   return callTool(appId, "list_directory", { ...params }, ListDirectoryResponseSchema, "listing directory");
 }
-function readFile5(appId, params) {
+function readFile4(appId, params) {
   return callTool(appId, "read_file", { ...params }, ReadFileResponseSchema, "reading file");
 }
 function writeFile2(appId, params) {
@@ -259010,7 +258801,7 @@ async function readFileAction({ runTask: runTask2 }, paths, options) {
   const { id: appId } = getAppContext();
   const offset = parsePositiveInt(options.offset, "--offset");
   const limit = parsePositiveInt(options.limit, "--limit");
-  const result = await runTask2("Reading file", () => readFile5(appId, { paths, offset, limit }));
+  const result = await runTask2("Reading file", () => readFile4(appId, { paths, offset, limit }));
   return { outroMessage: "Read file", stdout: toJsonStdout(result) };
 }
 function getSandboxReadFileCommand() {
@@ -266312,7 +266103,7 @@ class ReduceableCache {
   }
 }
 // ../../node_modules/posthog-node/dist/extensions/error-tracking/modifiers/context-lines.node.mjs
-import { createReadStream as createReadStream2 } from "node:fs";
+import { createReadStream as createReadStream3 } from "node:fs";
 import { createInterface as createInterface2 } from "node:readline";
 var LRU_FILE_CONTENTS_CACHE = new exports_error_tracking.ReduceableCache(25);
 var LRU_FILE_CONTENTS_FS_READ_FAILED = new exports_error_tracking.ReduceableCache(20);
@@ -266356,7 +266147,7 @@ async function addSourceContext(frames) {
 }
 function getContextLinesFromFile(path19, ranges, output) {
   return new Promise((resolve16) => {
-    const stream = createReadStream2(path19);
+    const stream = createReadStream3(path19);
     const lineReaded = createInterface2({
       input: stream
     });
@@ -268307,4 +268098,4 @@ export {
   runCLI
 };
 
-//# debugId=9A9871757366EC3764756E2164756E21
+//# debugId=31021F5DECFABABC64756E2164756E21