@nextnode-solutions/nn 1.1.4 → 1.1.6

package/dist/index.js

@@ -19885,10 +19885,10 @@ set -e
 
 # Init script for ${appName}
 # 1. Sets passwords for Supabase service roles
-# 2. Runs all SQL files in /docker-entrypoint-initdb.d/migrations/ in order
+# 2. Runs all SQL files in /docker-entrypoint-initdb.d/nn-migrations/ in order
 
 ROLES_SQL="/etc/postgresql.schema.sql"
-MIGRATIONS_DIR="/docker-entrypoint-initdb.d/migrations"
+MIGRATIONS_DIR="/docker-entrypoint-initdb.d/nn-migrations"
 
 # Set passwords for supabase_auth_admin and authenticator
 if [ -f "$ROLES_SQL" ]; then
@@ -20072,7 +20072,9 @@ function generateLocalSupabaseServices(supabaseConfig, appName, ports) {
   lines.push("    volumes:");
   lines.push("      - supabase-db-data:/var/lib/postgresql/data");
   lines.push("      - ./supabase/roles.sql:/etc/postgresql.schema.sql:ro");
-  lines.push("      - ./supabase/init:/docker-entrypoint-initdb.d/migrations");
+  lines.push(
+    "      - ./supabase/init:/docker-entrypoint-initdb.d/nn-migrations"
+  );
   lines.push(
     "      - ./supabase/init-db.sh:/docker-entrypoint-initdb.d/zz-init.sh"
   );
@@ -20784,13 +20786,23 @@ function gracefulKill(proc, timeoutMs = 5e3) {
   });
 }
 async function waitForHealthy(checkFn, label, maxMs = 6e4) {
-  let delay = 500;
-  let elapsed = 0;
-  while (elapsed < maxMs) {
-    if (checkFn()) return true;
-    await sleep(delay);
-    elapsed += delay;
-    delay = Math.min(delay * 2, 4e3);
+  const start = Date.now();
+  let nextLog = start;
+  consola.info(`Waiting for ${label} to become healthy...`);
+  while (Date.now() - start < maxMs) {
+    if (checkFn()) {
+      consola.success(`${label} healthy`);
+      return true;
+    }
+    const now = Date.now();
+    if (now >= nextLog) {
+      const remaining = Math.ceil((maxMs - (now - start)) / 1e3);
+      consola.info(
+        `Still waiting for ${label}... (${remaining}s remaining)`
+      );
+      nextLog = now + 1e4;
+    }
+    await sleep(2e3);
   }
   consola.warn(`${label} did not become healthy within ${maxMs / 1e3}s`);
   return false;
@@ -20900,9 +20912,15 @@ function ensureGitignore(projectDir) {
 function allServicesHealthy(composePath) {
   const statuses = getServiceStatuses(composePath);
   if (statuses.length === 0) return false;
-  return statuses.every(
-    (s2) => s2.state === "running" && (s2.health === "" || s2.health === "healthy")
+  const unhealthy = statuses.filter(
+    (s2) => s2.state !== "running" || s2.health !== "" && s2.health !== "healthy"
   );
+  if (unhealthy.length > 0) {
+    consola.debug(
+      `Not ready: ${unhealthy.map((s2) => `${s2.name}(state=${s2.state},health=${s2.health})`).join(", ")}`
+    );
+  }
+  return unhealthy.length === 0;
 }
 function printStartupSummary(composePath, services, ports) {
   console.log("");
@@ -20987,11 +21005,27 @@ var init_up = __esm({
           writeEnvLocal(projectDir, envVars);
         }
         const composePath = join6(nnDir, "docker-compose.local.yml");
+        let appProc;
+        let dockerLogProc;
+        const cleanup = async () => {
+          consola.info("\nShutting down...");
+          if (appProc?.pid) {
+            await gracefulKill(appProc);
+          }
+          if (dockerLogProc?.pid) {
+            await gracefulKill(dockerLogProc);
+          }
+          if (services.names.length > 0 && existsSync6(composePath)) {
+            stopDockerServices(composePath);
+          }
+          consola.info("Local environment stopped.");
+          process.exit(0);
+        };
+        process.on("SIGINT", cleanup);
+        process.on("SIGTERM", cleanup);
         if (services.names.length > 0) {
           if (areServicesRunning(composePath)) {
-            consola.info(
-              "Services are already running. Attaching to logs..."
-            );
+            consola.info("Services already running, checking health...");
           } else {
             const composeContent = generateLocalCompose(
               config,
@@ -21003,11 +21037,11 @@ var init_up = __esm({
             consola.info("Starting Docker services...");
             const envFilePath = join6(nnDir, ".env");
             startDockerServices(composePath, envFilePath);
-            await waitForHealthy(
-              () => allServicesHealthy(composePath),
-              "Docker services"
-            );
           }
+          await waitForHealthy(
+            () => allServicesHealthy(composePath),
+            "Docker services"
+          );
           printStartupSummary(composePath, services, ports);
         } else {
           consola.info("No services configured \u2014 starting app only");
@@ -21019,7 +21053,7 @@ var init_up = __esm({
         }
         const devCmd = detectDevCommand(projectDir);
         consola.info(`Starting app: ${devCmd.command} ${devCmd.args.join(" ")}`);
-        const appProc = spawn3(devCmd.command, devCmd.args, {
+        appProc = spawn3(devCmd.command, devCmd.args, {
           cwd: projectDir,
           stdio: ["ignore", "pipe", "pipe"],
           env: { ...process.env, ...envVars }
@@ -21029,26 +21063,9 @@ var init_up = __esm({
         }
         const colorOffset = services.names.length + 1;
         pipeWithPrefix(appProc, "app", colorOffset);
-        let dockerLogProc;
         if (services.names.length > 0) {
           dockerLogProc = streamDockerLogs(composePath);
         }
-        const cleanup = async () => {
-          consola.info("\nShutting down...");
-          if (appProc.pid) {
-            await gracefulKill(appProc);
-          }
-          if (dockerLogProc?.pid) {
-            await gracefulKill(dockerLogProc);
-          }
-          if (services.names.length > 0 && existsSync6(composePath)) {
-            stopDockerServices(composePath);
-          }
-          consola.info("Local environment stopped.");
-          process.exit(0);
-        };
-        process.on("SIGINT", cleanup);
-        process.on("SIGTERM", cleanup);
         appProc.on("exit", (code) => {
           if (code !== null && code !== 0) {
             consola.error(`App exited with code ${code}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextnode-solutions/nn",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "files": [
     "dist"
   ],