@feltdb/core 0.6.8 → 0.6.9

package/dist/cli/application.js

@@ -1,6 +1,6 @@
 import fs from 'fs';
+import net from 'net';
 import path from 'path';
-import { spawn } from 'child_process';
 const FRAMEWORKS = [
     { name: 'Next.js', packages: ['next'], pattern: /(?:^|\s)next(?:\s+dev)?(?:\s|$)/ },
     { name: 'Astro', packages: ['astro'], pattern: /(?:^|\s)astro(?:\s+dev)?(?:\s|$)/ },
@@ -21,107 +21,74 @@ function packageManagerAt(root, declared) {
         return 'bun';
     return 'npm';
 }
-function configuredPort(script = '') {
+function scriptPort(script = '') {
     const match = script.match(/(?:^|\s)(?:PORT=|--port(?:=|\s+)|-p\s+)(\d{1,5})(?:\s|$)/i);
     if (!match)
         return undefined;
     const port = Number(match[1]);
     return port > 0 && port <= 65535 ? port : undefined;
 }
+function readJson(file, malformedMessage) {
+    try {
+        return JSON.parse(fs.readFileSync(file, 'utf8'));
+    }
+    catch (error) {
+        throw new Error(`${malformedMessage} (${error.message})`);
+    }
+}
+/** Read application metadata only. This function never starts an application. */
 export function detectApplication(root) {
     const packageFile = path.join(root, 'package.json');
-    let manifest = {};
-    if (fs.existsSync(packageFile)) {
-        try {
-            manifest = JSON.parse(fs.readFileSync(packageFile, 'utf8'));
-        }
-        catch (error) {
-            throw new Error(`Cannot detect application: malformed package.json (${error.message})`);
-        }
-    }
-    const manager = packageManagerAt(root, typeof manifest.packageManager === 'string' ? manifest.packageManager : undefined);
+    const manifest = fs.existsSync(packageFile) ? readJson(packageFile, 'Cannot inspect application: malformed package.json') : {};
     const script = typeof manifest.scripts?.dev === 'string' ? manifest.scripts.dev.trim() : undefined;
     const dependencies = { ...manifest.dependencies, ...manifest.devDependencies };
     const framework = FRAMEWORKS.find(candidate => candidate.packages.some(name => name in dependencies) || (script ? candidate.pattern.test(script) : false));
-    const invokesFeltDb = !!script && /(?:^|\s)feltdb\s+dev(?:\s|$)/.test(script);
-    if (script && !invokesFeltDb) {
-        const executable = process.platform === 'win32' ? `${manager}.cmd` : manager;
-        return {
-            packageManager: manager,
-            framework: framework?.name || 'Custom',
-            devScript: script,
-            command: executable,
-            args: manager === 'npm' || manager === 'bun' ? ['run', 'dev'] : ['dev'],
-            configuredPort: configuredPort(script),
-        };
-    }
-    // Projects generated by FeltDB historically use `feltdb dev` as their script.
-    // Keep their Vite application working without recursively spawning this CLI.
-    if (framework?.name === 'Vite' || fs.existsSync(path.join(root, 'index.html'))) {
-        const executable = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-        return { packageManager: manager, framework: 'Vite', devScript: script, command: executable, args: ['exec', '--', 'vite'] };
-    }
-    throw new Error('Cannot determine how to start the application. Add a package.json dev script or pass --app-url.');
+    const feltConfigFile = path.join(root, 'feltdb.config.json');
+    const feltConfig = fs.existsSync(feltConfigFile) ? readJson(feltConfigFile, 'Cannot inspect application: malformed feltdb.config.json') : {};
+    const configuredUrl = typeof feltConfig.appUrl === 'string' ? feltConfig.appUrl
+        : typeof feltConfig.applicationUrl === 'string' ? feltConfig.applicationUrl : undefined;
+    return {
+        packageManager: packageManagerAt(root, typeof manifest.packageManager === 'string' ? manifest.packageManager : undefined),
+        framework: framework?.name || (script ? 'Custom' : 'Unknown'),
+        devScript: script,
+        configuredPort: scriptPort(script),
+        configuredUrl,
+    };
 }
-const URL_PATTERN = /https?:\/\/(?:localhost|127(?:\.\d{1,3}){3}|\[::1\])(?::\d{1,5})?(?:\/[^\s\x1b]*)?/gi;
-export function applicationUrls(output) {
-    const plain = output.replace(/\x1b\[[0-?]*[ -\/]*[@-~]/g, '');
-    return [...plain.matchAll(URL_PATTERN)].map(match => match[0].replace(/[),.;]+$/, ''));
+export function applicationUrlCandidate(project, environment = process.env) {
+    if (environment.FELTDB_APP_URL)
+        return environment.FELTDB_APP_URL;
+    if (project.configuredUrl)
+        return project.configuredUrl;
+    if (project.configuredPort)
+        return `http://127.0.0.1:${project.configuredPort}`;
+    return undefined;
 }
-export function startApplication(project, root, options = {}) {
-    const env = { ...process.env };
-    if (options.appPort)
-        env.PORT = String(options.appPort);
-    const args = [...project.args];
-    // This is only the legacy Vite fallback, never an override of an existing script.
-    if (project.framework === 'Vite' && !project.devScript?.replace(/\s+/g, ' ').match(/^(?:npm run )?vite/)) {
-        args.push('--host', '127.0.0.1');
-        if (options.appPort)
-            args.push('--port', String(options.appPort));
+export function applicationIsRunning(url, timeoutMs = 750) {
+    let parsed;
+    try {
+        parsed = new URL(url);
     }
-    if (options.appPort && project.devScript) {
-        const flag = project.framework === 'Next.js' ? '-p' : '--port';
-        if (['Vite', 'Next.js', 'Astro', 'Nuxt', 'SvelteKit', 'Remix'].includes(project.framework)) {
-            if (project.packageManager === 'npm')
-                args.push('--');
-            args.push(flag, String(options.appPort));
-        }
+    catch {
+        return Promise.resolve(false);
     }
-    const child = spawn(project.command, args, { cwd: root, env, stdio: ['inherit', 'pipe', 'pipe'] });
-    const url = new Promise((resolve, reject) => {
-        let settled = false;
-        const finish = (value) => { if (!settled) {
-            settled = true;
-            clearTimeout(timer);
-            resolve(value);
-        } };
-        const inspect = (chunk) => {
-            const text = chunk.toString();
-            process.stdout.write(text);
-            const found = applicationUrls(text);
-            if (found.length)
-                finish(found[0]);
-        };
-        child.stdout?.on('data', inspect);
-        child.stderr?.on('data', inspect);
-        child.once('error', error => { if (!settled) {
-            settled = true;
-            clearTimeout(timer);
-            reject(error);
-        } });
-        child.once('exit', code => { if (!settled) {
-            settled = true;
-            clearTimeout(timer);
-            reject(new Error(`Application exited before reporting its URL (status ${code ?? 'unknown'})`));
-        } });
-        const timer = setTimeout(() => {
-            if (!settled) {
-                settled = true;
-                reject(new Error('Unable to determine application URL from dev-server output. Pass --app-url or --app-port.'));
-            }
-        }, options.startupTimeoutMs ?? 30000);
-        if (options.appPort)
-            finish(`http://127.0.0.1:${options.appPort}`);
+    if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:')
+        return Promise.resolve(false);
+    const port = Number(parsed.port || (parsed.protocol === 'https:' ? 443 : 80));
+    return new Promise(resolve => {
+        const socket = net.createConnection({ host: parsed.hostname, port });
+        const done = (running) => { socket.destroy(); resolve(running); };
+        socket.setTimeout(timeoutMs);
+        socket.once('connect', () => done(true));
+        socket.once('timeout', () => done(false));
+        socket.once('error', () => done(false));
     });
-    return { child, url };
+}
+/** Discover only a deterministically configured, already-running application. */
+export async function discoverApplicationUrl(root) {
+    const project = detectApplication(root);
+    const candidate = applicationUrlCandidate(project);
+    if (!candidate)
+        return { project };
+    return { project, url: await applicationIsRunning(candidate) ? candidate : undefined };
 }

package/dist/cli/commands.js

@@ -9,7 +9,7 @@ import { createRequire } from 'module';
 import { spawn, spawnSync } from 'child_process';
 import { createFeltDB, diffFlowSpec, formatFlowSpec, parseFlowSpec, planFlowSpecMigration, startLocalDevelopmentAuthority, validateFlowSpec } from '@feltdb/core';
 import { discoverWorkspace, ensureWorkspaceGitIgnored, generatePairingToken, persistPairingToken, displayWorkspaceStatus, initializeWorkspace, startPairingDiscoveryServer } from './workspace-integration.js';
-import { detectApplication, startApplication } from './application.js';
+import { detectApplication, discoverApplicationUrl } from './application.js';
 function loadProjectEnvironment(file = path.resolve('.env.local')) {
     if (!fs.existsSync(file))
         return;
@@ -495,6 +495,45 @@ async function handleDev(args) {
     const runtimeNamespace = config.runtime === 'managed'
         ? process.env.VITE_FELTDB_MANAGED_NAMESPACE || config.namespace
         : config.namespace;
+    const hasAppUrl = args.includes('--app-url');
+    const appUrlArgument = hasAppUrl ? args[args.indexOf('--app-url') + 1] : undefined;
+    if (hasAppUrl && !appUrlArgument)
+        throw new Error('--app-url requires a URL');
+    const hasAppPort = args.includes('--app-port') || args.includes('--port');
+    const appPortValue = args.includes('--app-port')
+        ? args[args.indexOf('--app-port') + 1]
+        : args.includes('--port') ? args[args.indexOf('--port') + 1] : undefined;
+    if (!hasAppUrl && hasAppPort && !appPortValue)
+        throw new Error('--app-port requires a port');
+    const appPort = appPortValue ? Number(appPortValue) : undefined;
+    if (appUrlArgument) {
+        try {
+            const parsed = new URL(appUrlArgument);
+            if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:')
+                throw new Error('unsupported protocol');
+        }
+        catch {
+            throw new Error(`Invalid --app-url: ${appUrlArgument}`);
+        }
+    }
+    if (!hasAppUrl && appPortValue && (!Number.isInteger(appPort) || appPort < 1 || appPort > 65535))
+        throw new Error(`Invalid --app-port: ${appPortValue}`);
+    let discoveredApplication;
+    if (!hasAppUrl && !appPort) {
+        discoveredApplication = await discoverApplicationUrl(projectDir);
+    }
+    else {
+        try {
+            discoveredApplication = { project: detectApplication(projectDir) };
+        }
+        catch {
+            discoveredApplication = { project: { packageManager: 'npm', framework: 'External' } };
+        }
+    }
+    const appUrl = appUrlArgument || (appPort ? `http://127.0.0.1:${appPort}` : discoveredApplication.url);
+    if (!appUrl) {
+        throw new Error('No application URL was detected.\nStart your application and run:\n  feltdb dev --app-url http://127.0.0.1:<port>\nOr configure applicationUrl in feltdb.config.json.');
+    }
     const requestedStudioPort = Number(args.includes('--studio-port') ? args[args.indexOf('--studio-port') + 1] || '7701' : '7701');
     const studioPort = String(await availablePort(requestedStudioPort));
     if (studioPort !== String(requestedStudioPort))
@@ -549,49 +588,13 @@ async function handleDev(args) {
         pairingDiscoveryServer = await startPairingDiscoveryServer(token, discoveryPort);
         pairingToken = token.token;
     }
-    const hasAppUrl = args.includes('--app-url');
-    const appUrlArgument = hasAppUrl ? args[args.indexOf('--app-url') + 1] : undefined;
-    if (hasAppUrl && !appUrlArgument)
-        throw new Error('--app-url requires a URL');
-    const hasAppPort = args.includes('--app-port') || args.includes('--port');
-    const appPortValue = args.includes('--app-port')
-        ? args[args.indexOf('--app-port') + 1]
-        : args.includes('--port') ? args[args.indexOf('--port') + 1] : undefined;
-    if (!hasAppUrl && hasAppPort && !appPortValue)
-        throw new Error('--app-port requires a port');
-    const appPort = appPortValue ? Number(appPortValue) : undefined;
-    if (appUrlArgument) {
-        try {
-            const parsed = new URL(appUrlArgument);
-            if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:')
-                throw new Error('unsupported protocol');
-        }
-        catch {
-            throw new Error(`Invalid --app-url: ${appUrlArgument}`);
-        }
-    }
-    if (!hasAppUrl && appPortValue && (!Number.isInteger(appPort) || appPort < 1 || appPort > 65535))
-        throw new Error(`Invalid --app-port: ${appPortValue}`);
-    const application = appUrlArgument ? undefined : detectApplication(projectDir);
-    const runningApplication = application ? startApplication(application, projectDir, { appPort }) : undefined;
-    let appUrl;
-    try {
-        appUrl = appUrlArgument || await runningApplication.url;
-    }
-    catch (error) {
-        runningApplication?.child.kill('SIGTERM');
-        pairingDiscoveryServer?.close();
-        await localAuthority?.close();
-        stopSelfHosted();
-        throw error;
-    }
     console.log('FeltDB Dev Server');
     console.log(`  Authority: ${process.env.VITE_FELTDB_URL}`);
     console.log(`  Studio:    http://127.0.0.1:${studioPort}`);
     console.log(`  Pairing:   http://127.0.0.1:${(pairingDiscoveryServer?.address()).port}`);
     console.log('Application');
-    console.log(`  Framework: ${application?.framework || 'External'}`);
-    console.log(`  Dev command: ${application ? [application.command.replace(/\.cmd$/, ''), ...application.args].join(' ') : '(already running)'}`);
+    console.log(`  Framework: ${discoveredApplication.project.framework}`);
+    console.log('  Dev command: (managed externally)');
     console.log(`  URL:       ${appUrl}`);
     console.log(`  Namespace: ${config.namespace}`);
     console.log(`  Runtime:   ${config.runtime}`);
@@ -610,18 +613,8 @@ async function handleDev(args) {
     const open = !args.includes('--no-open');
     console.log(`Application: ${appUrl}`);
     console.log(`Studio:      http://127.0.0.1:${studioPort}\n`);
-    let shuttingDown = false;
-    const stopApplication = () => { if (runningApplication && !runningApplication.child.killed)
-        runningApplication.child.kill('SIGTERM'); };
-    const stopAll = () => { shuttingDown = true; stopApplication(); pairingDiscoveryServer?.close(); void localAuthority?.close(); stopSelfHosted(); };
-    // In an inherited terminal Ctrl-C can reach Vite before this parent process.
-    // Never leave Studio (or its port) running after the application exits.
-    runningApplication?.child.once('exit', code => {
-        if (shuttingDown)
-            return;
-        stopSelfHosted();
-        process.exit(code ?? 0);
-    });
+    console.log(`Using existing application at ${appUrl}\n`);
+    const stopAll = () => { pairingDiscoveryServer?.close(); void localAuthority?.close(); stopSelfHosted(); };
     process.once('exit', stopAll);
     process.once('SIGINT', () => { stopAll(); process.exit(130); });
     process.once('SIGTERM', () => { stopAll(); process.exit(143); });

package/dist/cli/index.js

@@ -23,7 +23,7 @@ import * as path from 'path';
 import * as readline from 'readline';
 import { getClient } from './api-client.js';
 import { loadFeltDBConfig, createDefaultConfig, validateModel, } from './config.js';
-const VERSION = '0.6.8';
+const VERSION = '0.6.9';
 function prompt(question) {
     const rl = readline.createInterface({
         input: process.stdin,

package/dist/create/package-versions.js

@@ -1,4 +1,4 @@
 // One release train keeps generated applications installable. The repository
 // validation script checks these values against every workspace manifest.
-export const FELTDB_PACKAGE_VERSION = '0.6.8';
+export const FELTDB_PACKAGE_VERSION = '0.6.9';
 export const feltdbPackageRange = `^${FELTDB_PACKAGE_VERSION}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feltdb/core",
-  "version": "0.6.8",
+  "version": "0.6.9",
   "description": "FeltDB Core - Application-facing database with Browser, Local, and Server runtimes. Durable state, reactive APIs.",
   "license": "MIT",
   "type": "module",