@base44-preview/cli 0.0.32-pr.271.5d60e7b → 0.0.33-pr.225.299669a

package/dist/cli/index.js

@@ -136896,12 +136896,12 @@ var require_linker = __commonJS((exports) => {
 var require_optionValidator = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.validateOptions = undefined;
-  function validateOptions2({ maxItems }) {
+  function validateOptions3({ maxItems }) {
     if (maxItems !== undefined && maxItems < -1) {
       throw RangeError(`Expected options.maxItems to be >= -1, but was given ${maxItems}.`);
     }
   }
-  exports.validateOptions = validateOptions2;
+  exports.validateOptions = validateOptions3;
 });
 
 // node_modules/json-schema-to-typescript/dist/src/index.js
@@ -178514,6 +178514,18 @@ class InvalidInputError extends UserError {
   code = "INVALID_INPUT";
 }
 
+class DependencyNotFoundError extends UserError {
+  code = "DEPENDENCY_NOT_FOUND";
+  constructor(message, options) {
+    super(message, {
+      hints: options?.hints ?? [
+        { message: "Install the required dependency and try again" }
+      ],
+      cause: options?.cause
+    });
+  }
+}
+
 class ApiError extends SystemError {
   code = "API_ERROR";
   statusCode;
@@ -178629,6 +178641,39 @@ class FileReadError extends SystemError {
     });
   }
 }
+
+class FunctionNotFoundError extends ApiError {
+  constructor(functionName, cause) {
+    super(`Function "${functionName}" was not found in this app`, {
+      statusCode: 404,
+      cause,
+      hints: [
+        {
+          message: "Make sure the function name is correct and has been deployed",
+          command: "base44 functions deploy"
+        },
+        {
+          message: "List project functions by checking the base44/functions/ directory"
+        }
+      ]
+    });
+  }
+}
+
+class InternalError extends SystemError {
+  code = "INTERNAL_ERROR";
+  constructor(message, options) {
+    super(message, {
+      hints: options?.hints ?? [
+        {
+          message: "This is an unexpected error. Please report it if it persists."
+        }
+      ],
+      cause: options?.cause
+    });
+  }
+}
+
 class TypeGenerationError extends SystemError {
   code = "TYPE_GENERATION_ERROR";
   constructor(message, entityName, cause) {
@@ -185985,6 +186030,13 @@ var DeployFunctionsResponseSchema = exports_external.object({
   skipped: exports_external.array(exports_external.string()).optional().nullable(),
   errors: exports_external.array(exports_external.object({ name: exports_external.string(), message: exports_external.string() })).nullable()
 });
+var LogLevelSchema = exports_external.enum(["log", "info", "warn", "error", "debug"]);
+var FunctionLogEntrySchema = exports_external.object({
+  time: exports_external.string(),
+  level: LogLevelSchema,
+  message: exports_external.string()
+});
+var FunctionLogsResponseSchema = exports_external.array(FunctionLogEntrySchema);
 
 // src/core/resources/function/api.ts
 function toDeployPayloadItem(fn) {
@@ -186015,6 +186067,55 @@ async function deployFunctions(functions) {
   }
   return result.data;
 }
+function buildLogsQueryString(filters) {
+  const params = new URLSearchParams;
+  if (filters.since) {
+    params.set("since", filters.since);
+  }
+  if (filters.until) {
+    params.set("until", filters.until);
+  }
+  if (filters.level) {
+    params.set("level", filters.level);
+  }
+  if (filters.limit !== undefined) {
+    params.set("limit", String(filters.limit));
+  }
+  if (filters.order) {
+    params.set("order", filters.order);
+  }
+  const queryString = params.toString();
+  return queryString ? `?${queryString}` : "";
+}
+async function fetchFunctionLogs(functionName, filters = {}) {
+  const appClient = getAppClient();
+  const queryString = buildLogsQueryString(filters);
+  let response;
+  try {
+    response = await appClient.get(`functions-mgmt/${functionName}/logs${queryString}`);
+  } catch (error48) {
+    if (error48 instanceof HTTPError) {
+      if (error48.response.status === 404) {
+        throw new FunctionNotFoundError(functionName, error48);
+      }
+      try {
+        const body = await error48.response.clone().json();
+        if (body.error_type === "KeyError") {
+          throw new FunctionNotFoundError(functionName, error48);
+        }
+      } catch (parseError) {
+        if (parseError instanceof ApiError)
+          throw parseError;
+      }
+    }
+    throw await ApiError.fromHttpError(error48, `fetching function logs: '${functionName}'`);
+  }
+  const result = FunctionLogsResponseSchema.safeParse(await response.json());
+  if (!result.success) {
+    throw new SchemaValidationError("Invalid function logs response from server", result.error);
+  }
+  return result.data;
+}
 // src/core/resources/function/config.ts
 import { dirname as dirname4, join as join5 } from "node:path";
 async function readFunctionConfig(configPath) {
@@ -187064,7 +187165,9 @@ var theme = {
   styles: {
     header: source_default.dim,
     bold: source_default.bold,
-    dim: source_default.dim
+    dim: source_default.dim,
+    error: source_default.red,
+    warn: source_default.yellow
   },
   format: {
     errorContext(ctx) {
@@ -193846,7 +193949,7 @@ var {
 // package.json
 var package_default = {
   name: "base44",
-  version: "0.0.32",
+  version: "0.0.33",
   description: "Base44 CLI - Unified interface for managing Base44 applications",
   type: "module",
   bin: {
@@ -193887,6 +193990,7 @@ var package_default = {
     "@types/bun": "^1.2.15",
     "@types/common-tags": "^1.8.4",
     "@types/cors": "^2.8.19",
+    "@types/deno": "^2.5.0",
     "@types/ejs": "^3.1.5",
     "@types/express": "^5.0.6",
     "@types/json-schema": "^7.0.15",
@@ -193973,7 +194077,6 @@ async function printUpgradeNotificationIfAvailable() {
 
 // src/cli/utils/runCommand.ts
 async function runCommand(commandFn, options, context) {
-  console.log();
   if (options?.fullBanner) {
     await printBanner(context.isNonInteractive);
     We("");
@@ -193999,8 +194102,11 @@ async function runCommand(commandFn, options, context) {
       const appConfig = await initAppConfig();
       context.errorReporter.setContext({ appId: appConfig.id });
     }
-    const { outroMessage } = await commandFn();
-    Le(outroMessage || "");
+    const result = await commandFn();
+    Le(result.outroMessage || "");
+    if (result.stdout) {
+      process.stdout.write(result.stdout);
+    }
   } catch (error48) {
     const errorMessage = error48 instanceof Error ? error48.message : String(error48);
     R2.error(errorMessage);
@@ -195027,6 +195133,147 @@ function getFunctionsDeployCommand(context) {
   }));
 }
 
+// src/cli/commands/logs/index.ts
+var VALID_LEVELS = ["log", "info", "warn", "error", "debug"];
+function parseFunctionFilters(options) {
+  const filters = {};
+  if (options.since) {
+    filters.since = options.since;
+  }
+  if (options.until) {
+    filters.until = options.until;
+  }
+  if (options.level) {
+    filters.level = options.level;
+  }
+  if (options.limit) {
+    filters.limit = Number.parseInt(options.limit, 10);
+  }
+  if (options.order) {
+    filters.order = options.order.toLowerCase();
+  }
+  return filters;
+}
+function parseFunctionNames(option) {
+  if (!option)
+    return [];
+  return option.split(",").map((s) => s.trim()).filter((s) => s.length > 0);
+}
+function normalizeDatetime(value) {
+  if (/Z$|[+-]\d{2}:\d{2}$/.test(value))
+    return value;
+  return `${value}Z`;
+}
+function validateOptions2(options) {
+  if (options.level && !VALID_LEVELS.includes(options.level)) {
+    throw new InvalidInputError(`Invalid level: "${options.level}". Must be one of: ${VALID_LEVELS.join(", ")}.`);
+  }
+  if (options.limit) {
+    const limit = Number.parseInt(options.limit, 10);
+    if (Number.isNaN(limit) || limit < 1 || limit > 1000) {
+      throw new InvalidInputError(`Invalid limit: "${options.limit}". Must be a number between 1 and 1000.`);
+    }
+  }
+  if (options.order) {
+    const order = options.order.toUpperCase();
+    if (order !== "ASC" && order !== "DESC") {
+      throw new InvalidInputError(`Invalid order: "${options.order}". Must be "ASC" or "DESC".`);
+    }
+  }
+}
+function formatEntry(entry) {
+  const time3 = entry.time.substring(0, 19).replace("T", " ");
+  const level = entry.level.toUpperCase().padEnd(5);
+  const message = entry.message.trim();
+  return `${time3} ${level} ${message}
+`;
+}
+function formatLogs(entries) {
+  if (entries.length === 0) {
+    return `No logs found matching the filters.
+`;
+  }
+  let output = `Showing ${entries.length} function log entries
+
+`;
+  for (const entry of entries) {
+    output += formatEntry(entry);
+  }
+  return output;
+}
+function normalizeLogEntry(entry, functionName) {
+  return {
+    time: entry.time,
+    level: entry.level,
+    message: `[${functionName}] ${entry.message}`,
+    source: functionName
+  };
+}
+async function fetchLogsForFunctions(functionNames, options, availableFunctionNames) {
+  const filters = parseFunctionFilters(options);
+  const allEntries = [];
+  for (const functionName of functionNames) {
+    let logs;
+    try {
+      logs = await fetchFunctionLogs(functionName, filters);
+    } catch (error48) {
+      if (error48 instanceof FunctionNotFoundError && availableFunctionNames.length > 0) {
+        const available = availableFunctionNames.join(", ");
+        throw new InvalidInputError(`Function "${functionName}" was not found in this app`, {
+          hints: [
+            {
+              message: `Available functions in this project: ${available}`
+            },
+            {
+              message: "Make sure the function has been deployed before fetching logs",
+              command: "base44 functions deploy"
+            }
+          ]
+        });
+      }
+      throw error48;
+    }
+    const entries = logs.map((entry) => normalizeLogEntry(entry, functionName));
+    allEntries.push(...entries);
+  }
+  if (functionNames.length > 1) {
+    const order = options.order?.toUpperCase() === "ASC" ? 1 : -1;
+    allEntries.sort((a2, b) => order * a2.time.localeCompare(b.time));
+  }
+  return allEntries;
+}
+async function getAllFunctionNames() {
+  const { functions } = await readProjectConfig();
+  return functions.map((fn) => fn.name);
+}
+async function logsAction(options) {
+  if (options.since)
+    options.since = normalizeDatetime(options.since);
+  if (options.until)
+    options.until = normalizeDatetime(options.until);
+  validateOptions2(options);
+  const specifiedFunctions = parseFunctionNames(options.function);
+  const allProjectFunctions = await getAllFunctionNames();
+  const functionNames = specifiedFunctions.length > 0 ? specifiedFunctions : allProjectFunctions;
+  if (functionNames.length === 0) {
+    return { stdout: `No functions found in this project.
+` };
+  }
+  let entries = await fetchLogsForFunctions(functionNames, options, allProjectFunctions);
+  const limit = options.limit ? Number.parseInt(options.limit, 10) : undefined;
+  if (limit !== undefined && entries.length > limit) {
+    entries = entries.slice(0, limit);
+  }
+  const stdout = options.json ? `${JSON.stringify(entries, null, 2)}
+` : formatLogs(entries);
+  return { stdout };
+}
+function getLogsCommand(context) {
+  return new Command("logs").description("Fetch function logs for this app").option("--function <names>", "Filter by function name(s), comma-separated. If omitted, fetches logs for all project functions").option("--since <datetime>", "Show logs from this time (ISO format)").option("--until <datetime>", "Show logs until this time (ISO format)").option("--level <level>", "Filter by log level: log, info, warn, error, debug").option("-n, --limit <n>", "Results per page (1-1000, default: 50)").option("--order <order>", "Sort order: ASC|DESC (default: DESC)").option("--json", "Output raw JSON").action(async (options) => {
+    await runCommand(() => logsAction(options), { requireAuth: true }, context);
+  });
+}
+
 // src/cli/commands/project/create.ts
 import { basename as basename3, join as join11, resolve as resolve2 } from "node:path";
 var import_lodash = __toESM(require_lodash(), 1);
@@ -195610,9 +195857,12 @@ function getTypesCommand(context) {
   return new Command("types").description("Manage TypeScript type generation").addCommand(getTypesGenerateCommand(context));
 }
 
+// src/cli/commands/dev.ts
+import { dirname as dirname12, join as join16 } from "node:path";
+
 // src/cli/dev/dev-server/main.ts
 var import_cors = __toESM(require_lib4(), 1);
-var import_express = __toESM(require_express(), 1);
+var import_express2 = __toESM(require_express(), 1);
 
 // node_modules/get-port/index.js
 import net from "node:net";
@@ -195729,13 +195979,232 @@ async function getPorts(options8) {
 }
 
 // src/cli/dev/dev-server/main.ts
+var import_http_proxy_middleware2 = __toESM(require_dist2(), 1);
+
+// src/cli/dev/createDevLogger.ts
+var colorByType = {
+  error: theme.styles.error,
+  warn: theme.styles.warn,
+  log: (text) => text
+};
+function createDevLogger() {
+  const print = (type, msg) => {
+    const colorize = colorByType[type];
+    console[type](colorize(msg));
+  };
+  return {
+    log: (msg) => print("log", msg),
+    error: (msg, err) => {
+      print("error", msg);
+      if (err) {
+        print("error", String(err));
+      }
+    },
+    warn: (msg) => print("warn", msg)
+  };
+}
+
+// src/cli/dev/dev-server/function-manager.ts
+import { spawn as spawn2, spawnSync as spawnSync2 } from "node:child_process";
+import { dirname as dirname11, join as join15 } from "node:path";
+import { fileURLToPath as fileURLToPath7 } from "node:url";
+var __dirname5 = dirname11(fileURLToPath7(import.meta.url));
+var WRAPPER_PATH = join15(__dirname5, "../deno-runtime/main.js");
+var READY_TIMEOUT = 30000;
+
+class FunctionManager {
+  functions;
+  running = new Map;
+  starting = new Map;
+  logger;
+  constructor(functions, logger) {
+    this.functions = new Map(functions.map((f7) => [f7.name, f7]));
+    this.logger = logger;
+    if (functions.length > 0) {
+      this.verifyDenoIsInstalled();
+    }
+  }
+  verifyDenoIsInstalled() {
+    const result = spawnSync2("deno", ["--version"]);
+    if (result.error) {
+      throw new DependencyNotFoundError("Deno is required to run functions", {
+        hints: [{ message: "Install Deno from https://deno.com/download" }]
+      });
+    }
+  }
+  getFunctionNames() {
+    return Array.from(this.functions.keys());
+  }
+  async ensureRunning(name2) {
+    const backendFunction = this.functions.get(name2);
+    if (!backendFunction) {
+      throw new InvalidInputError(`Function "${name2}" not found`, {
+        hints: [{ message: "Check available functions in your project" }]
+      });
+    }
+    const existing = this.running.get(name2);
+    if (existing?.ready) {
+      return existing.port;
+    }
+    const pending = this.starting.get(name2);
+    if (pending) {
+      return pending;
+    }
+    const promise2 = this.startFunction(name2, backendFunction);
+    this.starting.set(name2, promise2);
+    try {
+      return await promise2;
+    } finally {
+      this.starting.delete(name2);
+    }
+  }
+  async startFunction(name2, backendFunction) {
+    const port = await this.allocatePort();
+    const process21 = this.spawnFunction(backendFunction, port);
+    const runningFunc = {
+      process: process21,
+      port,
+      ready: false
+    };
+    this.running.set(name2, runningFunc);
+    this.setupProcessHandlers(name2, process21);
+    return this.waitForReady(name2, runningFunc);
+  }
+  stopAll() {
+    for (const [name2, { process: process21 }] of this.running) {
+      this.logger.log(`[dev-server] Stopping function: ${name2}`);
+      process21.kill();
+    }
+    this.running.clear();
+    this.starting.clear();
+  }
+  async allocatePort() {
+    const usedPorts = Array.from(this.running.values()).map((r5) => r5.port);
+    return getPorts({ exclude: usedPorts });
+  }
+  spawnFunction(func, port) {
+    this.logger.log(`[dev-server] Spawning function "${func.name}" on port ${port}`);
+    const process21 = spawn2("deno", ["run", "--allow-all", WRAPPER_PATH], {
+      env: {
+        ...globalThis.process.env,
+        FUNCTION_PATH: func.entryPath,
+        FUNCTION_PORT: String(port),
+        FUNCTION_NAME: func.name
+      },
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    return process21;
+  }
+  setupProcessHandlers(name2, process21) {
+    process21.stdout?.on("data", (data) => {
+      const lines = data.toString().trim().split(`
+`);
+      for (const line3 of lines) {
+        this.logger.log(line3);
+      }
+    });
+    process21.stderr?.on("data", (data) => {
+      const lines = data.toString().trim().split(`
+`);
+      for (const line3 of lines) {
+        this.logger.error(line3);
+      }
+    });
+    process21.on("exit", (code2) => {
+      this.logger.log(`[dev-server] Function "${name2}" exited with code ${code2}`);
+      this.running.delete(name2);
+    });
+    process21.on("error", (error48) => {
+      this.logger.error(`[dev-server] Function "${name2}" error:`, error48);
+      this.running.delete(name2);
+    });
+  }
+  waitForReady(name2, runningFunc) {
+    return new Promise((resolve5, reject) => {
+      runningFunc.process.on("exit", (code2) => {
+        if (!runningFunc.ready) {
+          clearTimeout(timeout3);
+          reject(new InternalError(`Function "${name2}" exited with code ${code2}`, {
+            hints: [{ message: "Check the function code for errors" }]
+          }));
+        }
+      });
+      const timeout3 = setTimeout(() => {
+        runningFunc.process.kill();
+        reject(new InternalError(`Function "${name2}" failed to start within ${READY_TIMEOUT / 1000}s timeout`, {
+          hints: [
+            { message: "Check the function code for startup errors" }
+          ]
+        }));
+      }, READY_TIMEOUT);
+      const onData = (data) => {
+        const output = data.toString();
+        if (output.includes("Listening on")) {
+          runningFunc.ready = true;
+          clearTimeout(timeout3);
+          runningFunc.process.stdout?.off("data", onData);
+          resolve5(runningFunc.port);
+        }
+      };
+      runningFunc.process.stdout?.on("data", onData);
+    });
+  }
+}
+
+// src/cli/dev/dev-server/routes/functions.ts
+var import_express = __toESM(require_express(), 1);
 var import_http_proxy_middleware = __toESM(require_dist2(), 1);
+import { ServerResponse } from "node:http";
+function createFunctionRouter(manager, logger) {
+  const router = import_express.Router({ mergeParams: true });
+  const portsByRequest = new WeakMap;
+  const proxy = import_http_proxy_middleware.createProxyMiddleware({
+    router: (req) => `http://localhost:${portsByRequest.get(req)}`,
+    changeOrigin: true,
+    on: {
+      proxyReq: (proxyReq, req) => {
+        const xAppId = req.headers["x-app-id"];
+        if (xAppId) {
+          proxyReq.setHeader("Base44-App-Id", xAppId);
+        }
+        proxyReq.setHeader("Base44-Api-Url", `${req.protocol}://${req.headers.host}`);
+      },
+      error: (err, _req, res) => {
+        logger.error("Function proxy error:", err);
+        if (res instanceof ServerResponse && !res.headersSent) {
+          res.writeHead(502, { "Content-Type": "application/json" });
+          res.end(JSON.stringify({
+            error: "Failed to proxy request to function",
+            details: err.message
+          }));
+        }
+      }
+    }
+  });
+  router.all("/:functionName", async (req, res, next) => {
+    const { functionName } = req.params;
+    try {
+      const port = await manager.ensureRunning(functionName);
+      portsByRequest.set(req, port);
+      next();
+    } catch (error48) {
+      logger.error("Function error:", error48);
+      const message = error48 instanceof Error ? error48.message : String(error48);
+      res.status(500).json({ error: message });
+    }
+  }, proxy);
+  return router;
+}
+
+// src/cli/dev/dev-server/main.ts
 var DEFAULT_PORT = 4400;
 var BASE44_APP_URL = "https://base44.app";
-async function createDevServer(options8 = {}) {
-  const port = options8.port ?? await getPorts({ port: DEFAULT_PORT });
-  const app = import_express.default();
-  const remoteProxy = import_http_proxy_middleware.createProxyMiddleware({
+async function createDevServer(options8) {
+  const { port: userPort } = options8;
+  const port = userPort ?? await getPorts({ port: DEFAULT_PORT });
+  const { functions } = await options8.loadResources();
+  const app = import_express2.default();
+  const remoteProxy = import_http_proxy_middleware2.createProxyMiddleware({
     target: BASE44_APP_URL,
     changeOrigin: true
   });
@@ -195751,6 +196220,13 @@ async function createDevServer(options8 = {}) {
     }
     next();
   });
+  const devLogger = createDevLogger();
+  const functionManager = new FunctionManager(functions, devLogger);
+  if (functionManager.getFunctionNames().length > 0) {
+    R2.info(`Loaded functions: ${functionManager.getFunctionNames().join(", ")}`);
+    const functionRoutes = createFunctionRouter(functionManager, devLogger);
+    app.use("/api/apps/:appId/functions", functionRoutes);
+  }
   app.use((req, res, next) => {
     return remoteProxy(req, res, next);
   });
@@ -195763,6 +196239,12 @@ async function createDevServer(options8 = {}) {
           reject(err);
         }
       } else {
+        const shutdown = () => {
+          functionManager.stopAll();
+          server.close();
+        };
+        process.on("SIGINT", shutdown);
+        process.on("SIGTERM", shutdown);
         resolve5({
           port,
           server
@@ -195775,7 +196257,15 @@ async function createDevServer(options8 = {}) {
 // src/cli/commands/dev.ts
 async function devAction(options8) {
   const port = options8.port ? Number(options8.port) : undefined;
-  const { port: resolvedPort } = await createDevServer({ port });
+  const { port: resolvedPort } = await createDevServer({
+    port,
+    loadResources: async () => {
+      const { project: project2 } = await readProjectConfig();
+      const configDir = dirname12(project2.configPath);
+      const functions = await functionResource.readAll(join16(configDir, project2.functionsDir));
+      return { functions };
+    }
+  });
   return {
     outroMessage: `Dev server is available at ${theme.colors.links(`http://localhost:${resolvedPort}`)}`
   };
@@ -195899,6 +196389,7 @@ function createProgram(context) {
   program2.addCommand(getSiteCommand(context));
   program2.addCommand(getTypesCommand(context));
   program2.addCommand(getDevCommand(context), { hidden: true });
+  program2.addCommand(getLogsCommand(context));
   return program2;
 }
 
@@ -195937,7 +196428,7 @@ function nanoid3(size = 21) {
 }
 
 // node_modules/posthog-node/dist/extensions/error-tracking/modifiers/module.node.mjs
-import { dirname as dirname11, posix, sep } from "path";
+import { dirname as dirname13, posix, sep } from "path";
 function createModulerModifier() {
   const getModuleFromFileName = createGetModuleFromFilename();
   return async (frames) => {
@@ -195946,7 +196437,7 @@ function createModulerModifier() {
     return frames;
   };
 }
-function createGetModuleFromFilename(basePath = process.argv[1] ? dirname11(process.argv[1]) : process.cwd(), isWindows4 = sep === "\\") {
+function createGetModuleFromFilename(basePath = process.argv[1] ? dirname13(process.argv[1]) : process.cwd(), isWindows4 = sep === "\\") {
   const normalizedBase = isWindows4 ? normalizeWindowsPath2(basePath) : basePath;
   return (filename) => {
     if (!filename)
@@ -200163,4 +200654,4 @@ export {
   CLIExitError
 };
 
-//# debugId=8FF06F66318A4ACC64756E2164756E21
+//# debugId=00151F47FED4FE2F64756E2164756E21