@base44-preview/cli 0.0.55-pr.545.8ee8765 → 0.0.55-pr.545.9513e13

package/dist/cli/index.js

@@ -255490,6 +255490,7 @@ class ServeRunner {
   logger;
   child;
   stopping = false;
+  stopPromise;
   exitListeners = [];
   constructor(options8) {
     this.command = options8.command;
@@ -255501,12 +255502,14 @@ class ServeRunner {
     if (this.child) {
       return;
     }
+    const stdin2 = process21.platform === "win32" ? "ignore" : "inherit";
     const child = spawn3(this.command, {
       cwd: this.cwd,
       shell: true,
-      detached: process21.platform !== "win32",
+      detached: true,
       env: { ...process21.env, ...this.env },
-      stdio: ["inherit", "pipe", "pipe"]
+      stdio: [stdin2, "pipe", "pipe"],
+      windowsHide: true
     });
     this.child = child;
     this.setupHandlers(child);
@@ -255515,32 +255518,29 @@ class ServeRunner {
     this.exitListeners.push(listener);
   }
   async stop() {
+    if (this.stopPromise) {
+      return this.stopPromise;
+    }
+    this.stopPromise = this.stopChild();
+    return this.stopPromise;
+  }
+  async stopChild() {
     const child = this.child;
     if (!child || child.exitCode !== null) {
       return;
     }
     this.stopping = true;
-    const hasExited = () => child.exitCode !== null || child.signalCode !== null;
     const exited = new Promise((resolve10) => child.once("exit", () => resolve10()));
-    const waitForExit2 = async (timeoutMs) => {
-      await Promise.race([
-        exited,
-        new Promise((resolve10) => setTimeout(resolve10, timeoutMs))
-      ]);
-    };
     if (process21.platform === "win32" && child.pid) {
       const taskkill = spawn3("taskkill", ["/pid", String(child.pid), "/T", "/F"], {
-        stdio: "ignore"
+        stdio: "ignore",
+        windowsHide: true
       });
-      await new Promise((resolve10) => taskkill.once("exit", () => resolve10()));
-      await waitForExit2(3000);
-      if (!hasExited()) {
-        child.kill("SIGKILL");
-        await waitForExit2(1000);
-      }
-      return;
-    }
-    if (child.pid) {
+      await new Promise((resolve10) => {
+        taskkill.once("exit", () => resolve10());
+        taskkill.once("error", () => resolve10());
+      });
+    } else if (child.pid) {
       try {
         process21.kill(-child.pid, "SIGTERM");
       } catch {
@@ -257287,7 +257287,7 @@ async function createDevServer(options8) {
     port: process.env.IS_TEST === "true" ? undefined : DEFAULT_PORT
   });
   const baseUrl = `http://localhost:${port}`;
-  const { functions, entities, project: project2 } = await options8.loadResources();
+  const { functions, entities, project: project2, siteUrl } = await options8.loadResources();
   const app = import_express6.default();
   const remoteProxy = import_http_proxy_middleware2.createProxyMiddleware({
     target: BASE44_APP_URL,
@@ -257347,6 +257347,12 @@ async function createDevServer(options8) {
   const customIntegrationRoutes = createCustomIntegrationRoutes(remoteProxy, devLogger);
   app.use("/api/apps/:appId/integrations/custom", customIntegrationRoutes);
   app.use((req, res, next) => {
+    if (siteUrl && (req.path === "/login" || req.path.startsWith("/login/"))) {
+      const targetUrl = new URL(req.originalUrl, siteUrl);
+      devLogger.warn(`"${req.originalUrl}" requires hosted login, redirecting to ${targetUrl.toString()}`);
+      res.redirect(targetUrl.toString());
+      return;
+    }
     if (!req.originalUrl.endsWith("analytics/track/batch")) {
       devLogger.warn(`"${req.originalUrl}" is not supported in local development, passing call to production`);
     }
@@ -257416,12 +257422,27 @@ async function createDevServer(options8) {
       logger: createDevLogger("frontend", theme.colors.base44Orange)
     });
   }
+  let shutdownPromise;
   const shutdown = async () => {
-    base44ConfigWatcher.close();
-    io6.close();
-    await functionManager.stopAll();
-    await serveRunner?.stop();
-    server.close();
+    shutdownPromise ??= (async () => {
+      base44ConfigWatcher.close();
+      io6.close();
+      await functionManager.stopAll();
+      await serveRunner?.stop();
+      await new Promise((resolve12, reject) => {
+        server.close((error48) => {
+          if (error48) {
+            reject(error48);
+            return;
+          }
+          resolve12();
+        });
+      });
+    })().catch((error48) => {
+      const errorMessage = error48 instanceof Error ? error48.message : String(error48);
+      devLogger.error(`Failed to shut down dev server: ${errorMessage}`);
+    });
+    return shutdownPromise;
   };
   process.on("SIGINT", shutdown);
   process.on("SIGTERM", shutdown);
@@ -257452,6 +257473,9 @@ async function devAction(ctx, options8) {
   }
   const port = options8.port ? Number(options8.port) : undefined;
   const appId = app.id;
+  const siteUrlPromise = getSiteUrl().catch(() => {
+    return;
+  });
   const { port: resolvedPort, isServingFrontend } = await createDevServer({
     log,
     port,
@@ -257459,7 +257483,8 @@ async function devAction(ctx, options8) {
     denoWrapperPath: getDenoWrapperPath(),
     loadResources: async () => {
       const { functions, entities, project: project2 } = await readProjectConfig();
-      return { functions, entities, project: project2 };
+      const siteUrl = await siteUrlPromise;
+      return { functions, entities, project: project2, siteUrl };
     }
   });
   const outroMessage = isServingFrontend ? "Open your app using the frontend dev server URL" : `Dev server is available at ${theme.colors.links(localServerUrl(resolvedPort))}`;
@@ -261945,4 +261970,4 @@ export {
   CLIExitError
 };
 
-//# debugId=C0C3C333AB7ECBC364756E2164756E21
+//# debugId=F0F854B64EB6D34464756E2164756E21