@base44-preview/cli 0.0.32-pr.249.69186d6 → 0.0.32-pr.249.89127f3

package/dist/cli/index.js

@@ -186681,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) {
@@ -186783,12 +186785,12 @@ var BANNER_LINES = [
   "██████╔╝██║  ██║███████║███████╗      ██║     ██║",
   "╚═════╝ ╚═╝  ╚═╝╚══════╝╚══════╝      ╚═╝     ╚═╝"
 ];
-async function printBanner() {
-  if (process.stdout.isTTY) {
-    await printAnimatedLines(BANNER_LINES);
-  } else {
+async function printBanner(isNonInteractive) {
+  if (isNonInteractive) {
     console.log(theme.colors.base44Orange(BANNER_LINES.join(`
 `)));
+  } else {
+    await printAnimatedLines(BANNER_LINES);
   }
 }
 // src/cli/errors.ts
@@ -193593,7 +193595,7 @@ async function printUpgradeNotificationIfAvailable() {
 async function runCommand(commandFn, options, context) {
   console.log();
   if (options?.fullBanner) {
-    await printBanner();
+    await printBanner(context.isNonInteractive);
     Ie("");
   } else {
     Ie(theme.colors.base44OrangeBackground(" Base 44 "));
@@ -194523,7 +194525,7 @@ function printSummary(results, oauthOutcomes) {
     M2.error(`Failed: ${r2.type}${r2.error ? ` - ${r2.error}` : ""}`);
   }
 }
-async function pushConnectorsAction() {
+async function pushConnectorsAction(isNonInteractive) {
   const { connectors } = await readProjectConfig();
   if (connectors.length === 0) {
     M2.info("No local connectors found - checking for remote connectors to remove");
@@ -194537,18 +194539,18 @@ async function pushConnectorsAction() {
   const needsOAuth = filterPendingOAuth(results);
   let outroMessage = "Connectors pushed to Base44";
   const oauthOutcomes = await promptOAuthFlows(needsOAuth, {
-    skipPrompt: !!process.env.CI
+    skipPrompt: isNonInteractive
   });
   const allAuthorized = oauthOutcomes.size > 0 && [...oauthOutcomes.values()].every((s) => s === "ACTIVE");
   if (needsOAuth.length > 0 && !allAuthorized) {
-    outroMessage = process.env.CI ? "Skipped OAuth in CI. Run 'base44 connectors push' locally or open the links above to authorize." : "Some connectors still require authorization. Run 'base44 connectors push' or open the links above to authorize.";
+    outroMessage = isNonInteractive ? "Skipped OAuth in non-interactive mode. Run 'base44 connectors push' locally or open the links above to authorize." : "Some connectors still require authorization. Run 'base44 connectors push' or open the links above to authorize.";
   }
   printSummary(results, oauthOutcomes);
   return { outroMessage };
 }
 function getConnectorsPushCommand(context) {
   return new Command("push").description("Push local connectors to Base44 (overwrites connectors on Base44)").action(async () => {
-    await runCommand(pushConnectorsAction, { requireAuth: true }, context);
+    await runCommand(() => pushConnectorsAction(context.isNonInteractive), { requireAuth: true }, context);
   });
 }
 
@@ -194558,16 +194560,16 @@ function getConnectorsCommand(context) {
 }
 
 // src/cli/commands/dashboard/open.ts
-async function openDashboard() {
+async function openDashboard(isNonInteractive) {
   const dashboardUrl = getDashboardUrl();
-  if (!process.env.CI) {
+  if (!isNonInteractive) {
     await open_default(dashboardUrl);
   }
   return { outroMessage: `Dashboard opened at ${dashboardUrl}` };
 }
 function getDashboardOpenCommand(context) {
   return new Command("open").description("Open the app dashboard in your browser").action(async () => {
-    await runCommand(openDashboard, { requireAuth: true }, context);
+    await runCommand(() => openDashboard(context.isNonInteractive), { requireAuth: true }, context);
   });
 }
 
@@ -194873,7 +194875,7 @@ ${summaryLines.join(`
   const needsOAuth = filterPendingOAuth(result.connectorResults ?? []);
   if (needsOAuth.length > 0) {
     const oauthOutcomes = await promptOAuthFlows(needsOAuth, {
-      skipPrompt: options.yes || !!process.env.CI
+      skipPrompt: options.yes || options.isNonInteractive
     });
     const allAuthorized = oauthOutcomes.size > 0 && [...oauthOutcomes.values()].every((s) => s === "ACTIVE");
     if (!allAuthorized) {
@@ -194888,7 +194890,10 @@ ${summaryLines.join(`
 }
 function getDeployCommand(context) {
   return new Command("deploy").description("Deploy all project resources (entities, functions, agents, connectors, and site)").option("-y, --yes", "Skip confirmation prompt").action(async (options) => {
-    await runCommand(() => deployAction(options), { requireAuth: true }, context);
+    await runCommand(() => deployAction({
+      ...options,
+      isNonInteractive: context.isNonInteractive
+    }), { requireAuth: true }, context);
   });
 }
 
@@ -195070,21 +195075,24 @@ async function deployAction2(options) {
 }
 function getSiteDeployCommand(context) {
   return new Command("deploy").description("Deploy built site files to Base44 hosting").option("-y, --yes", "Skip confirmation prompt").action(async (options) => {
-    await runCommand(() => deployAction2(options), { requireAuth: true }, context);
+    await runCommand(() => deployAction2({
+      ...options,
+      isNonInteractive: context.isNonInteractive
+    }), { requireAuth: true }, context);
   });
 }
 
 // src/cli/commands/site/open.ts
-async function openAction() {
+async function openAction(isNonInteractive) {
   const siteUrl = await getSiteUrl();
-  if (!process.env.CI) {
+  if (!isNonInteractive) {
     await open_default(siteUrl);
   }
   return { outroMessage: `Site opened at ${siteUrl}` };
 }
 function getSiteOpenCommand(context) {
   return new Command("open").description("Open the published site in your browser").action(async () => {
-    await runCommand(openAction, { requireAuth: true }, context);
+    await runCommand(() => openAction(context.isNonInteractive), { requireAuth: true }, context);
   });
 }
 
@@ -195354,8 +195362,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) {
@@ -195375,7 +195383,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),
@@ -195399,7 +195407,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));
@@ -195409,6 +195417,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]));
@@ -195422,13 +195431,10 @@ class FunctionManager {
   }
   verifyDenoIsInstalled() {
     if (this.functions.size > 0) {
-      try {
-        spawn2("deno", ["--version"]);
-      } catch {
+      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" }
-          ]
+          hints: [{ message: "Install Deno from https://deno.com/download" }]
         });
       }
     }
@@ -195438,15 +195444,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 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 = {
@@ -195468,6 +195484,7 @@ class FunctionManager {
       process21.kill();
     }
     this.running.clear();
+    this.starting.clear();
   }
   stop(name2) {
     const running = this.running.get(name2);
@@ -195520,7 +195537,16 @@ class FunctionManager {
   }
   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" }
@@ -195537,14 +195563,6 @@ class FunctionManager {
         }
       };
       runningFunc.process.stdout?.on("data", onData);
-      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" }]
-          }));
-        }
-      });
     });
   }
 }
@@ -195613,8 +195631,10 @@ function proxyRequest(req, res, port, logger) {
           error: "Failed to proxy request to function",
           details: error48.message
         });
+        res.once("finish", resolve5);
+      } else {
+        resolve5();
       }
-      resolve5();
     });
     req.pipe(proxyReq);
   });
@@ -195645,9 +195665,7 @@ 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();
@@ -195667,12 +195685,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
@@ -195785,7 +195804,7 @@ async function eject(options8) {
 }
 function getEjectCommand(context) {
   return new Command("eject").description("Download the code for an existing Base44 project").option("-p, --path <path>", "Path where to write the project").option("--project-id <id>", "Project ID to eject (skips interactive selection)").option("-y, --yes", "Skip confirmation prompts").action(async (options8) => {
-    await runCommand(() => eject(options8), { requireAuth: true, requireAppConfig: false }, context);
+    await runCommand(() => eject({ ...options8, isNonInteractive: context.isNonInteractive }), { requireAuth: true, requireAppConfig: false }, context);
   });
 }
 
@@ -200052,7 +200071,8 @@ function addCommandInfoToErrorReporter(program2, errorReporter) {
 async function runCLI() {
   const errorReporter = new ErrorReporter;
   errorReporter.registerProcessErrorHandlers();
-  const context = { errorReporter };
+  const isNonInteractive = !process.stdin.isTTY || !process.stdout.isTTY;
+  const context = { errorReporter, isNonInteractive };
   const program2 = createProgram(context);
   try {
     const userInfo = await readAuth();
@@ -200077,4 +200097,4 @@ export {
   CLIExitError
 };
 
-//# debugId=B7317FFB63A141D964756E2164756E21
+//# debugId=E2377672720E70A864756E2164756E21