@base44-preview/cli 0.0.32-pr.249.38b7e86 → 0.0.32-pr.249.535f2a7

package/dist/cli/index.js

@@ -178102,6 +178102,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;
@@ -178217,6 +178229,21 @@ class FileReadError extends SystemError {
     });
   }
 }
+
+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";
   entityName;
@@ -186654,7 +186681,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) {
@@ -195198,9 +195227,9 @@ function getTypesCommand(context) {
 }
 
 // src/cli/dev/dev-server/main.ts
+import { dirname as dirname12, join as join16 } from "node:path";
 var import_cors = __toESM(require_lib4(), 1);
 var import_express2 = __toESM(require_express(), 1);
-import { dirname as dirname12, join as join16 } from "node:path";
 
 // node_modules/get-port/index.js
 import net from "node:net";
@@ -195327,8 +195356,8 @@ var dateTimeFormat = new Intl.DateTimeFormat([], {
   hour12: false
 });
 var colorByType = {
-  error: source_default.red,
-  warn: source_default.yellow,
+  error: theme.styles.error,
+  warn: theme.styles.warn,
   log: (text) => text
 };
 function createDevLogger(isPrefixed = true) {
@@ -195348,7 +195377,7 @@ function createDevLogger(isPrefixed = true) {
   const prefixedLog = (type, msg) => {
     const timestamp = dateTimeFormat.format(new Date);
     const colorize = colorByType[type];
-    console.log(`${source_default.gray(timestamp)} ${colorize(msg)}`);
+    console.log(`${theme.styles.dim(timestamp)} ${colorize(msg)}`);
   };
   return isPrefixed ? {
     log: (msg) => prefixedLog("log", msg),
@@ -195372,7 +195401,7 @@ function createDevLogger(isPrefixed = true) {
 }
 
 // src/cli/dev/dev-server/function-manager.ts
-import { spawn as spawn2 } from "node:child_process";
+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));
@@ -195382,6 +195411,7 @@ 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]));
@@ -195390,12 +195420,16 @@ class FunctionManager {
   functionNames() {
     return Array.from(this.functions.keys());
   }
+  getFunction(name2) {
+    return this.functions.get(name2);
+  }
   verifyDenoIsInstalled() {
     if (this.functions.size > 0) {
-      try {
-        spawn2("deno", ["--version"]);
-      } catch {
-        throw new Error("Deno is required to run functions. Please install it from https://deno.com/download");
+      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" }]
+        });
       }
     }
   }
@@ -195404,13 +195438,25 @@ class FunctionManager {
     if (existing?.ready) {
       return existing.port;
     }
+    const pending = this.starting.get(name2);
+    if (pending) {
+      return pending;
+    }
     const backendFunction = this.functions.get(name2);
     if (!backendFunction) {
-      throw new Error(`Function "${name2}" not found`);
+      throw new InvalidInputError(`Function "${name2}" not found`, {
+        hints: [{ message: "Check available functions in your project" }]
+      });
     }
-    if (existing && !existing.ready) {
-      return this.waitForReady(name2, existing);
+    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 = {
@@ -195432,6 +195478,7 @@ class FunctionManager {
       process21.kill();
     }
     this.running.clear();
+    this.starting.clear();
   }
   stop(name2) {
     const running = this.running.get(name2);
@@ -195485,7 +195532,11 @@ class FunctionManager {
   waitForReady(name2, runningFunc) {
     return new Promise((resolve5, reject) => {
       const timeout3 = setTimeout(() => {
-        reject(new Error(`Function "${name2}" failed to start within timeout`));
+        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();
@@ -195500,7 +195551,9 @@ class FunctionManager {
       runningFunc.process.on("exit", (code2) => {
         if (!runningFunc.ready) {
           clearTimeout(timeout3);
-          reject(new Error(`Function "${name2}" exited with code ${code2}`));
+          reject(new InternalError(`Function "${name2}" exited with code ${code2}`, {
+            hints: [{ message: "Check the function code for errors" }]
+          }));
         }
       });
     });
@@ -195603,12 +195656,13 @@ async function createDevServer(options8) {
     }
     next();
   });
-  const [functions] = await Promise.all([
-    functionResource.readAll(join16(configDir, project2.functionsDir))
-  ]);
+  const functions = await functionResource.readAll(join16(configDir, project2.functionsDir));
   const devLogger = createDevLogger(false);
   const functionManager = new FunctionManager(functions, devLogger);
   functionManager.verifyDenoIsInstalled();
+  if (functionManager.functionNames().length > 0) {
+    M2.info(`Loaded functions: ${functionManager.functionNames().join(", ")}`);
+  }
   const functionRoutes = createFunctionRoutes(functionManager, devLogger);
   app.use("/api/apps/:appId/functions", functionRoutes);
   app.use((req, res, next) => {
@@ -195622,12 +195676,13 @@ async function createDevServer(options8) {
         } else {
           reject(err);
         }
+      } else {
         const shutdown = () => {
           functionManager.stopAll();
+          server.close();
         };
         process.on("SIGINT", shutdown);
         process.on("SIGTERM", shutdown);
-      } else {
         resolve5({
           port,
           server
@@ -200032,4 +200087,4 @@ export {
   CLIExitError
 };
 
-//# debugId=F7187C428A4270E164756E2164756E21
+//# debugId=10D47D308F001A4164756E2164756E21