@playdrop/playdrop-cli 0.5.3 → 0.5.5

package/dist/commands/dev.js

@@ -4,40 +4,15 @@ exports.dev = dev;
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const types_1 = require("@playdrop/types");
-const config_1 = require("../config");
-const apiClient_1 = require("../apiClient");
+const commandContext_1 = require("../commandContext");
 const http_1 = require("../http");
-const environment_1 = require("../environment");
 const messages_1 = require("../messages");
 const catalogue_utils_1 = require("../catalogue-utils");
 const devShared_1 = require("./devShared");
+const appUrls_1 = require("../appUrls");
 const devServer_1 = require("./devServer");
-const DEFAULT_DEV_PORT = 8888;
 const DEFAULT_ROOM_BASE = 'http://localhost:3001';
 async function dev(targetArg, _port, appOption) {
-    const cfg = (0, config_1.loadConfig)();
-    if (!cfg.env) {
-        (0, messages_1.printConfigEnvironmentMissing)('project dev');
-        process.exitCode = 1;
-        return;
-    }
-    if (!cfg.token) {
-        (0, messages_1.printLoginRequired)('Starting the dev server', 'project dev');
-        process.exitCode = 1;
-        return;
-    }
-    const envConfig = (0, environment_1.resolveEnvironmentConfig)(cfg.env);
-    if (!envConfig) {
-        const choices = (0, environment_1.formatEnvironmentList)();
-        (0, messages_1.printUnknownEnvironment)(cfg.env, choices, 'project dev');
-        process.exitCode = 1;
-        return;
-    }
-    if (envConfig.allowInsecureRequests) {
-        process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
-    }
-    const client = (0, apiClient_1.createCliApiClient)({ baseUrl: envConfig.apiBase, token: cfg.token });
-    const portToUse = DEFAULT_DEV_PORT;
     let resolvedTarget;
     try {
         resolvedTarget = (0, devShared_1.resolveDevTarget)(targetArg, appOption);
@@ -86,14 +61,7 @@ async function dev(targetArg, _port, appOption) {
     try {
         const match = (0, catalogue_utils_1.findAppDefinition)(filePath);
         appName = match.name;
-        appTypeSlug =
-            match.type === 'TOOL'
-                ? 'tool'
-                : match.type === 'TEMPLATE'
-                    ? 'template'
-                    : match.type === 'DEMO'
-                        ? 'demo'
-                        : 'game';
+        appTypeSlug = (0, appUrls_1.getAppTypeSlug)(match.type);
     }
     catch (error) {
         if (resolvedTarget.cataloguePath) {
@@ -105,179 +73,188 @@ async function dev(targetArg, _port, appOption) {
             return;
         }
     }
-    let currentUsername = '';
-    try {
-        currentUsername = await (0, devShared_1.fetchDevUsername)(client);
-    }
-    catch (error) {
-        if (error instanceof http_1.CLIUnsupportedClientError) {
-            return;
-        }
-        if (error instanceof types_1.UnsupportedClientError) {
-            (0, http_1.handleUnsupportedError)(error, 'Authentication');
-            process.exitCode = 1;
-            return;
-        }
-        if (error instanceof types_1.ApiError) {
-            (0, messages_1.printErrorWithHelp)(`Could not fetch your account (status ${error.status}).`, [
-                'Run "playdrop auth login" to refresh your session and ensure the API is reachable.',
-                'Use "playdrop auth whoami" afterwards to confirm your status.',
-            ], { command: 'project dev' });
-            process.exitCode = 1;
-            return;
-        }
-        if ((0, devShared_1.isNetworkError)(error)) {
-            (0, messages_1.printNetworkIssue)('Could not reach the Playdrop API to resolve your account.', 'project dev');
-            process.exitCode = 1;
-            return;
-        }
-        if (error instanceof Error && error.message === 'DEV_USERNAME_EMPTY') {
-            (0, messages_1.printErrorWithHelp)('Could not determine your Playdrop creator username.', [
-                'Retry "playdrop project dev" in a moment.',
-                'If the problem persists, contact the Playdrop team.'
-            ], { command: 'project dev' });
-            process.exitCode = 1;
-            return;
-        }
-        throw error;
-    }
-    let appResponse = null;
-    if (resolvedTarget.cataloguePath) {
-        try {
-            appResponse = await (0, devShared_1.assertAppRegistered)(client, currentUsername, appName);
+    const workspacePath = resolvedTarget.cataloguePath ?? (0, node_path_1.dirname)(filePath);
+    await (0, commandContext_1.withEnvironment)('project dev', 'Starting the dev server', 
+    // eslint-disable-next-line complexity
+    async ({ client, env, envConfig, account }) => {
+        let currentUsername = account?.username?.trim() ?? '';
+        if (!currentUsername) {
+            try {
+                currentUsername = await (0, devShared_1.fetchDevUsername)(client);
+            }
+            catch (error) {
+                if (error instanceof http_1.CLIUnsupportedClientError) {
+                    return;
+                }
+                if (error instanceof types_1.UnsupportedClientError) {
+                    (0, http_1.handleUnsupportedError)(error, 'Authentication');
+                    process.exitCode = 1;
+                    return;
+                }
+                if (error instanceof types_1.ApiError) {
+                    (0, messages_1.printErrorWithHelp)(`Could not fetch your account (status ${error.status}).`, [
+                        'Run "playdrop auth login" to refresh your session and ensure the API is reachable.',
+                        'Use "playdrop auth whoami" afterwards to confirm your status.',
+                    ], { command: 'project dev' });
+                    process.exitCode = 1;
+                    return;
+                }
+                if ((0, devShared_1.isNetworkError)(error)) {
+                    (0, messages_1.printNetworkIssue)('Could not reach the Playdrop API to resolve your account.', 'project dev');
+                    process.exitCode = 1;
+                    return;
+                }
+                throw error;
+            }
         }
-        catch (error) {
-            if (error instanceof http_1.CLIUnsupportedClientError) {
-                return;
+        let appResponse = null;
+        if (resolvedTarget.cataloguePath) {
+            try {
+                appResponse = await (0, devShared_1.assertAppRegistered)(client, currentUsername, appName);
             }
-            if (error instanceof types_1.UnsupportedClientError) {
-                (0, http_1.handleUnsupportedError)(error, 'Dev');
-                process.exitCode = 1;
-                return;
+            catch (error) {
+                if (error instanceof http_1.CLIUnsupportedClientError) {
+                    return;
+                }
+                if (error instanceof types_1.UnsupportedClientError) {
+                    (0, http_1.handleUnsupportedError)(error, 'Dev');
+                    process.exitCode = 1;
+                    return;
+                }
+                if (error instanceof types_1.ApiError) {
+                    if (error.status === 404) {
+                        (0, messages_1.printErrorWithHelp)(`App ${currentUsername}/${appName} is not registered on ${env}.`, [
+                            `Run "playdrop project create app ${appName}" to register the app before starting the dev server.`,
+                            'If you expected it to exist, ensure you are logged into the correct environment.'
+                        ], { command: 'project dev' });
+                    }
+                    else {
+                        (0, messages_1.printErrorWithHelp)(`Failed to verify app registration (status ${error.status}).`, [
+                            'Retry in a moment.',
+                            'If the issue persists, contact the Playdrop team.'
+                        ], { command: 'project dev' });
+                    }
+                    process.exitCode = 1;
+                    return;
+                }
+                if ((0, devShared_1.isNetworkError)(error)) {
+                    (0, messages_1.printNetworkIssue)('Could not reach the Playdrop API to verify the app registration.', 'project dev');
+                    process.exitCode = 1;
+                    return;
+                }
+                throw error;
             }
-            if (error instanceof types_1.ApiError) {
-                if (error.status === 404) {
-                    (0, messages_1.printErrorWithHelp)(`App ${currentUsername}/${appName} is not registered on ${cfg.env}.`, [
-                        `Run "playdrop project create app ${appName}" to register the app before starting the dev server.`,
-                        'If you expected it to exist, ensure you are logged into the correct environment.'
-                    ], { command: 'project dev' });
+        }
+        const projectInfo = (0, devShared_1.findProjectInfo)(filePath);
+        const devScriptAvailable = Boolean(projectInfo.projectDir && projectInfo.packageJson && typeof projectInfo.packageJson.scripts?.dev === 'string');
+        if (resolvedTarget.ecsPath && resolvedTarget.serverScriptPath && appResponse?.id) {
+            try {
+                if (!(0, node_fs_1.existsSync)(resolvedTarget.ecsPath) || !(0, node_fs_1.existsSync)(resolvedTarget.serverScriptPath)) {
+                    throw new Error('ecs_or_server_missing');
                 }
-                else {
-                    (0, messages_1.printErrorWithHelp)(`Failed to verify app registration (status ${error.status}).`, [
-                        'Retry in a moment.',
-                        'If the issue persists, contact the Playdrop team.'
-                    ], { command: 'project dev' });
+                const ecsRaw = (0, node_fs_1.readFileSync)(resolvedTarget.ecsPath, 'utf8');
+                const ecsJson = JSON.parse(ecsRaw);
+                const serverJs = (0, node_fs_1.readFileSync)(resolvedTarget.serverScriptPath, 'utf8');
+                const roomBase = (process.env.PLAYDROP_ROOM_BASE || DEFAULT_ROOM_BASE).replace(/\/$/, '');
+                const response = await fetch(`${roomBase}/rooms/dev_config`, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({
+                        app_id: appResponse.id,
+                        ecs: ecsJson,
+                        server_js: serverJs,
+                    }),
+                });
+                if (!response.ok) {
+                    let reason = `${response.status}`;
+                    try {
+                        const payload = await response.json();
+                        if (payload?.error) {
+                            reason = payload.error;
+                        }
+                    }
+                    catch {
+                        // ignore parse errors
+                    }
+                    throw new Error(`room_dev_config_failed:${reason}`);
                 }
-                process.exitCode = 1;
-                return;
+                console.log(`Uploaded dev ECS config to engine-server for app ${appName}.`);
             }
-            if ((0, devShared_1.isNetworkError)(error)) {
-                (0, messages_1.printNetworkIssue)('Could not reach the Playdrop API to verify the app registration.', 'project dev');
+            catch (error) {
+                (0, messages_1.printErrorWithHelp)(error?.message || 'Failed to upload dev ECS config to engine-server.', [
+                    'Ensure catalogue entry includes valid "ecs" and "server" paths.',
+                    'Check PLAYDROP_ROOM_BASE or the default http://localhost:3001 is reachable.',
+                ], { command: 'project dev' });
                 process.exitCode = 1;
                 return;
             }
-            throw error;
         }
-    }
-    const projectInfo = (0, devShared_1.findProjectInfo)(filePath);
-    const devScriptAvailable = Boolean(projectInfo.projectDir && projectInfo.packageJson && typeof projectInfo.packageJson.scripts?.dev === 'string');
-    // Upload ECS dev assets to engine-server if configured.
-    if (resolvedTarget.ecsPath && resolvedTarget.serverScriptPath && appResponse?.id) {
+        let handle;
         try {
-            if (!(0, node_fs_1.existsSync)(resolvedTarget.ecsPath) || !(0, node_fs_1.existsSync)(resolvedTarget.serverScriptPath)) {
-                throw new Error('ecs_or_server_missing');
-            }
-            const ecsRaw = (0, node_fs_1.readFileSync)(resolvedTarget.ecsPath, 'utf8');
-            const ecsJson = JSON.parse(ecsRaw);
-            const serverJs = (0, node_fs_1.readFileSync)(resolvedTarget.serverScriptPath, 'utf8');
-            const roomBase = (process.env.PLAYDROP_ROOM_BASE || DEFAULT_ROOM_BASE).replace(/\/$/, '');
-            const response = await fetch(`${roomBase}/rooms/dev_config`, {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({
-                    app_id: appResponse.id,
-                    ecs: ecsJson,
-                    server_js: serverJs,
-                }),
+            handle = await (0, devServer_1.startDevServer)({
+                appName,
+                appType: appTypeSlug,
+                creatorUsername: currentUsername,
+                htmlPath: filePath,
+                port: devServer_1.DEV_ROUTER_PORT,
+                projectInfo,
             });
-            if (!response.ok) {
-                let reason = `${response.status}`;
-                try {
-                    const payload = await response.json();
-                    if (payload?.error) {
-                        reason = payload.error;
-                    }
-                }
-                catch {
-                    // ignore parse errors
-                }
-                throw new Error(`room_dev_config_failed:${reason}`);
-            }
-            console.log(`Uploaded dev ECS config to engine-server for app ${appName}.`);
         }
         catch (error) {
-            (0, messages_1.printErrorWithHelp)(error?.message || 'Failed to upload dev ECS config to engine-server.', [
-                'Ensure catalogue entry includes valid "ecs" and "server" paths.',
-                'Check PLAYDROP_ROOM_BASE or the default http://localhost:3001 is reachable.',
-            ], { command: 'project dev' });
+            const message = typeof error?.message === 'string' ? error.message : '';
+            const mountConflict = (0, devServer_1.parseMountConflictError)(message);
+            if (mountConflict) {
+                (0, messages_1.printErrorWithHelp)(`A different dev session already owns ${mountConflict.ref}.`, [
+                    `Active owner pid: ${mountConflict.ownerPid}.`,
+                    `Mounted repo root: ${mountConflict.repoRoot}.`,
+                    `Mounted HTML path: ${mountConflict.htmlPath}.`,
+                ], { command: 'project dev' });
+            }
+            else {
+                (0, messages_1.printErrorWithHelp)(error?.message || `Failed to start the shared dev router on port ${devServer_1.DEV_ROUTER_PORT}.`, [
+                    'Close the conflicting process or wait for the stale mount to exit.',
+                    'Ensure the app HTML file exists and is readable.',
+                ], { command: 'project dev' });
+            }
             process.exitCode = 1;
             return;
         }
-    }
-    let handle;
-    try {
-        handle = await (0, devServer_1.startDevServer)({
-            appName,
-            htmlPath: filePath,
-            port: portToUse,
-            projectInfo,
-        });
-    }
-    catch (error) {
-        (0, messages_1.printErrorWithHelp)(error?.message || `Failed to start dev server on port ${portToUse}.`, [
-            'Check if another process is already using the port.',
-            'Ensure the HTML file exists and is readable.',
-        ], { command: 'project dev' });
-        process.exitCode = 1;
-        return;
-    }
-    let shuttingDown = false;
-    const handleShutdown = () => {
-        if (shuttingDown)
-            return;
-        shuttingDown = true;
-        handle
-            .close()
-            .catch(closeError => {
-            console.error(closeError instanceof Error ? closeError.message : closeError);
-        });
-    };
-    process.on('SIGINT', handleShutdown);
-    process.on('SIGTERM', handleShutdown);
-    handle.server.on('close', () => {
-        process.off('SIGINT', handleShutdown);
-        process.off('SIGTERM', handleShutdown);
-    });
-    const webUrl = envConfig.webBase;
-    const entryLabel = (0, node_path_1.relative)(process.cwd(), filePath) || filePath;
-    const runtimeRootLabel = (0, node_path_1.relative)(process.cwd(), (0, node_path_1.dirname)(filePath)) || (0, node_path_1.dirname)(filePath);
-    console.log(`🚀 App dev server running at http://localhost:${portToUse}`);
-    console.log(`Serving ${entryLabel}`);
-    console.log(`Static root ${runtimeRootLabel}`);
-    if (projectInfo.projectDir && !devScriptAvailable && projectInfo.packageJsonPath) {
-        const projectLabel = (0, devShared_1.formatProjectLabel)(projectInfo);
-        if (projectLabel) {
-            console.log(`ℹ️ package.json detected at ${projectLabel}, but no "dev" script was found. Run your build/watch scripts manually if needed.`);
+        let shuttingDown = false;
+        const handleShutdown = () => {
+            if (shuttingDown)
+                return;
+            shuttingDown = true;
+            process.off('SIGINT', handleShutdown);
+            process.off('SIGTERM', handleShutdown);
+            handle
+                .close()
+                .catch(closeError => {
+                console.error(closeError instanceof Error ? closeError.message : closeError);
+            });
+        };
+        process.on('SIGINT', handleShutdown);
+        process.on('SIGTERM', handleShutdown);
+        const webUrl = envConfig.webBase;
+        const entryLabel = (0, node_path_1.relative)(process.cwd(), filePath) || filePath;
+        const runtimeRootLabel = (0, node_path_1.relative)(process.cwd(), (0, node_path_1.dirname)(filePath)) || (0, node_path_1.dirname)(filePath);
+        console.log(`App dev router mounted at ${handle.appUrl}`);
+        console.log(`Serving ${entryLabel}`);
+        console.log(`Static root ${runtimeRootLabel}`);
+        if (projectInfo.projectDir && !devScriptAvailable && projectInfo.packageJsonPath) {
+            const projectLabel = (0, devShared_1.formatProjectLabel)(projectInfo);
+            if (projectLabel) {
+                console.log(`package.json detected at ${projectLabel}, but no "dev" script was found. Run your build/watch scripts manually if needed.`);
+            }
         }
-    }
-    if (webUrl) {
-        const iframeUrl = `${webUrl}/creators/${encodeURIComponent(currentUsername)}/apps/${appTypeSlug}/${encodeURIComponent(appName)}/dev`;
-        console.log(`\n🎮 Test your app at:`);
-        console.log(`   ${iframeUrl}`);
-        console.log('\nMake something fun then share it with');
-        console.log(`playdrop project publish ${appName}`);
-    }
-    else {
-        console.log(`\nOpen ${handle.appUrl} in your browser to test locally.`);
-    }
+        if (webUrl) {
+            const iframeUrl = `${webUrl}/creators/${encodeURIComponent(currentUsername)}/apps/${appTypeSlug}/${encodeURIComponent(appName)}/dev`;
+            console.log('\nTest your app at:');
+            console.log(`  ${iframeUrl}`);
+            console.log('\nMake something fun then share it with');
+            console.log(`playdrop project publish ${appName}`);
+        }
+        else {
+            console.log(`\nOpen ${handle.appUrl} in your browser to test locally.`);
+        }
+    }, { workspacePath });
 }

package/dist/commands/devServer.d.ts

@@ -1,18 +1,41 @@
-import http from 'node:http';
 import { type ChildProcess } from 'node:child_process';
 import type { ProjectInfo } from './devShared';
 export interface StartDevServerOptions {
     appName: string;
+    appType: string;
+    creatorUsername: string;
     htmlPath: string;
     port: number;
     projectInfo: ProjectInfo;
 }
 export interface DevServerHandle {
-    server: http.Server;
+    server: null;
     devProcess: ChildProcess | null;
     startedDevProcess: boolean;
     appUrl: string;
     close(): Promise<void>;
 }
+export declare const DEV_ROUTER_PORT = 8888;
+type MountConflictDetails = {
+    ref: string;
+    ownerPid: number;
+    repoRoot: string;
+    htmlPath: string;
+};
+export declare function parseMountConflictError(message: string): MountConflictDetails | null;
+export declare function buildLocalDevAppUrl(input: {
+    creatorUsername: string;
+    appType: string;
+    appName: string;
+    port?: number;
+}): string;
+export declare function ensureDevRouterRunning(port?: number): Promise<void>;
 export declare function startDevServer(options: StartDevServerOptions): Promise<DevServerHandle>;
-export declare function isDevServerAvailable(appName: string, port: number, timeoutMs?: number): Promise<boolean>;
+export declare function isDevServerAvailable(input: {
+    creatorUsername: string;
+    appType: string;
+    appName: string;
+    port?: number;
+}, timeoutMs?: number): Promise<boolean>;
+export declare function runDevRouterServer(port?: number): Promise<void>;
+export {};