spfn 0.2.0-beta.12 → 0.2.0-beta.14

package/dist/index.js

@@ -755,7 +755,7 @@ var init_deployment_config = __esm({
 
 // src/utils/version.ts
 function getCliVersion() {
-  return "0.2.0-beta.12";
+  return "0.2.0-beta.14";
 }
 function getTagFromVersion(version) {
   const match = version.match(/-([a-z]+)\./i);
@@ -782,6 +782,7 @@ async function setupPackageJson(cwd, packageJsonPath, packageJson, packageManage
   const spfnTag = getSpfnTag();
   packageJson.dependencies["@spfn/core"] = spfnTag;
   packageJson.dependencies["@sinclair/typebox"] = "^0.34.0";
+  packageJson.dependencies["drizzle-orm"] = "^0.45.0";
   packageJson.dependencies["drizzle-typebox"] = "^0.1.0";
   packageJson.dependencies["spfn"] = spfnTag;
   packageJson.dependencies["concurrently"] = "^9.2.1";
@@ -1262,29 +1263,28 @@ init_init();
 init_logger();
 init_package_manager();
 import { Command as Command4 } from "commander";
-import { existsSync as existsSync11, readFileSync as readFileSync3, writeFileSync as writeFileSync6, mkdirSync } from "fs";
+import { existsSync as existsSync11, readFileSync as readFileSync3, writeFileSync as writeFileSync6, mkdirSync, unlinkSync, watch } from "fs";
 import { join as join11 } from "path";
-import { createConnection } from "net";
 import { execa as execa4 } from "execa";
 import chokidar from "chokidar";
-function waitForPort(port, host, timeoutMs = 3e4) {
-  const start = Date.now();
+function waitForReadyFile(filePath, timeoutMs = 3e4) {
   return new Promise((resolve2, reject) => {
-    const tryConnect = () => {
-      if (Date.now() - start > timeoutMs) {
-        reject(new Error(`Server did not start within ${timeoutMs / 1e3}s (port ${port})`));
-        return;
+    if (existsSync11(filePath)) {
+      unlinkSync(filePath);
+    }
+    const timer = setTimeout(() => {
+      watcher.close();
+      reject(new Error(`Server did not become ready within ${timeoutMs / 1e3}s`));
+    }, timeoutMs);
+    const dir = join11(filePath, "..");
+    const fileName = filePath.split("/").pop();
+    const watcher = watch(dir, (event, name) => {
+      if (name === fileName && existsSync11(filePath)) {
+        watcher.close();
+        clearTimeout(timer);
+        resolve2(readFileSync3(filePath, "utf-8").trim());
       }
-      const socket = createConnection({ port, host }, () => {
-        socket.destroy();
-        resolve2();
-      });
-      socket.on("error", () => {
-        socket.destroy();
-        setTimeout(tryConnect, 300);
-      });
-    };
-    tryConnect();
+    });
   });
 }
 var devCommand = new Command4("dev").description("Start SPFN development server (detects and runs Next.js + Hono)").option("-p, --port <port>", "Server port").option("-H, --host <host>", "Server host").option("--routes <path>", "Routes directory path").option("--server-only", "Run only Hono server (skip Next.js)").option("--watch", "Enable hot reload (watch mode)").action(async (options) => {
@@ -1314,17 +1314,22 @@ var devCommand = new Command4("dev").description("Start SPFN development server
   if (options.host) configParts.push(`host: '${options.host}'`);
   if (options.routes) configParts.push(`routesPath: '${options.routes}'`);
   configParts.push("debug: true");
+  const readyFile = join11(tempDir, "server-ready");
   writeFileSync6(serverEntry, `
+import { writeFileSync } from 'fs';
+
 // Load environment variables FIRST (before any imports that depend on them)
-// Use centralized environment loader for standard dotenv priority
 await import('@spfn/core/config');
 
 // Import and start server
 const { startServer } = await import('@spfn/core/server');
 
-await startServer({
+const instance = await startServer({
     ${configParts.join(",\n    ")}
 });
+
+// Signal ready with actual port
+writeFileSync(${JSON.stringify(readyFile)}, String(instance.config.port));
 `);
   writeFileSync6(watcherEntry, `
 // Load environment variables
@@ -1577,12 +1582,9 @@ catch (error)
   process.on("SIGTERM", cleanup);
   startWatcher();
   startServer();
-  const serverHost = options.host ?? process.env.HOST ?? "localhost";
-  const serverPort = Number(options.port ?? process.env.PORT ?? 4e3);
   try {
-    logger.info(`[SPFN] Waiting for server on port ${serverPort}...`);
-    await waitForPort(serverPort, serverHost);
-    logger.info(`[SPFN] Server ready, starting Next.js...
+    const port = await waitForReadyFile(readyFile);
+    logger.info(`[SPFN] Server ready on port ${port}, starting Next.js...
 `);
   } catch (error) {
     logger.warn(`[SPFN] Server readiness check timed out, starting Next.js anyway...`);
@@ -2106,7 +2108,7 @@ import { Command as Command9 } from "commander";
 import chalk10 from "chalk";
 
 // src/commands/db/utils/drizzle.ts
-import { existsSync as existsSync15, writeFileSync as writeFileSync9, unlinkSync } from "fs";
+import { existsSync as existsSync15, writeFileSync as writeFileSync9, unlinkSync as unlinkSync2 } from "fs";
 import { spawn } from "child_process";
 import chalk9 from "chalk";
 import ora6 from "ora";
@@ -2153,7 +2155,7 @@ async function runDrizzleCommand(command) {
     });
     const cleanup = () => {
       if (!hasUserConfig && existsSync15(tempConfigPath)) {
-        unlinkSync(tempConfigPath);
+        unlinkSync2(tempConfigPath);
       }
     };
     drizzleProcess.on("close", (code) => {
@@ -2619,7 +2621,7 @@ async function dbMigrate(options = {}) {
 
 // src/commands/db/studio.ts
 import chalk17 from "chalk";
-import { existsSync as existsSync18, writeFileSync as writeFileSync10, unlinkSync as unlinkSync2 } from "fs";
+import { existsSync as existsSync18, writeFileSync as writeFileSync10, unlinkSync as unlinkSync3 } from "fs";
 import { spawn as spawn3 } from "child_process";
 import { env as env4 } from "@spfn/core/config";
 import "@spfn/core/config";
@@ -2664,7 +2666,7 @@ async function dbStudio(requestedPort) {
     });
     const cleanup = () => {
       if (!hasUserConfig && existsSync18(tempConfigPath)) {
-        unlinkSync2(tempConfigPath);
+        unlinkSync3(tempConfigPath);
       }
     };
     studioProcess.on("exit", (code) => {
@@ -2694,7 +2696,7 @@ async function dbStudio(requestedPort) {
     });
   } catch (error) {
     if (!hasUserConfig && existsSync18(tempConfigPath)) {
-      unlinkSync2(tempConfigPath);
+      unlinkSync3(tempConfigPath);
     }
     console.error(chalk17.red("\u274C Failed to start Drizzle Studio"));
     console.error(chalk17.red(error instanceof Error ? error.message : "Unknown error"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spfn",
-  "version": "0.2.0-beta.12",
+  "version": "0.2.0-beta.14",
   "description": "Superfunction CLI - Add SPFN to your Next.js project",
   "type": "module",
   "bin": {
@@ -67,7 +67,7 @@
     "postgres": "^3.4.0",
     "prompts": "^2.4.2",
     "tsup": "^8.5.0",
-    "@spfn/core": "0.2.0-beta.14"
+    "@spfn/core": "0.2.0-beta.16"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",