@swell/cli 2.3.0 → 2.3.2

package/dist/commands/app/dev.d.ts

@@ -16,7 +16,10 @@ export default class AppDev extends PushAppCommand {
     functionErrors: Map<string, string>;
     functionPorts: Map<string, number>;
     tmpDir: string;
+    frontendPort: number | null;
+    isCleaningUp: boolean;
     run(): Promise<void>;
+    private cleanupOnExit;
     runAppFrontendDevIfApplicable(frontendPort?: number): Promise<number | void>;
     private createFunctionRouter;
     private createTmpDirectory;

package/dist/commands/app/dev.js

@@ -46,6 +46,10 @@ export default class AppDev extends PushAppCommand {
     functionPorts = new Map();
     // Directory for compiled function files and wrangler context
     tmpDir = '';
+    // Port for frontend dev server (used for routing non-function requests)
+    frontendPort = null;
+    // Guard against multiple cleanup calls
+    isCleaningUp = false;
     async run() {
         const { flags } = await this.parse(AppDev);
         const { port, 'frontend-port': frontendPort } = flags;
@@ -62,6 +66,21 @@ export default class AppDev extends PushAppCommand {
         const serverPort = await this.startProxyServer(port);
         await this.startAppFunctionServer(spinner, serverPort);
         await this.runAppFrontendDevIfApplicable(frontendPort);
+        // Register cleanup handlers to clear local proxy on exit
+        process.on('SIGINT', this.cleanupOnExit.bind(this));
+        process.on('SIGTERM', this.cleanupOnExit.bind(this));
+    }
+    async cleanupOnExit() {
+        if (this.isCleaningUp)
+            return;
+        this.isCleaningUp = true;
+        try {
+            await this.updateLocalProxy(null, this.storefront?.id);
+        }
+        catch {
+            // Ignore errors during cleanup
+        }
+        // Note: proxy.ts signal handlers will call process.exit()
     }
     async runAppFrontendDevIfApplicable(frontendPort) {
         const projectType = this.getFrontendProjectType(false);
@@ -70,6 +89,8 @@ export default class AppDev extends PushAppCommand {
             this.argv.push('--app-dev');
             // add proxy-port flag (use provided port or auto-detect)
             const proxyPort = frontendPort || (await getPort({ port: portNumbers(4000, 4100) }));
+            // Store frontend port for function router to use for fallback routing
+            this.frontendPort = proxyPort;
             this.argv.push('--proxy-port', String(proxyPort));
             this.config.runCommand('app:frontend:dev', this.argv);
             return proxyPort;
@@ -111,6 +132,24 @@ export default class AppDev extends PushAppCommand {
                 });
                 req.pipe(proxyReq);
             }
+            else if (this.frontendPort) {
+                // Proxy non-function requests to frontend dev server
+                const proxyReq = http.request({
+                    hostname: 'localhost',
+                    port: this.frontendPort,
+                    path: req.url,
+                    method: req.method,
+                    headers: req.headers,
+                }, (proxyRes) => {
+                    res.writeHead(proxyRes.statusCode, proxyRes.headers);
+                    proxyRes.pipe(res);
+                });
+                proxyReq.on('error', (error) => {
+                    res.writeHead(502);
+                    res.end(`Frontend dev server error: ${error.message}`);
+                });
+                req.pipe(proxyReq);
+            }
             else {
                 res.writeHead(404);
                 const functionError = this.functionErrors.get(functionName);

package/dist/commands/app/frontend/dev.js

@@ -26,7 +26,7 @@ export default class AppFrontendDev extends PushAppCommand {
         }),
         'app-dev': Flags.boolean({
             description: 'indicates frontend app is running in app dev mode',
-            default: true,
+            default: false,
         }),
     };
     static orientation = {
@@ -57,7 +57,11 @@ export default class AppFrontendDev extends PushAppCommand {
         if (!isAppDev) {
             this.log(`Starting app dev server...\n`);
         }
-        const serverPort = await this.startProxyServer(proxyPort || port);
+        // When running as child of `swell app dev`, don't create a new tunnel.
+        // The parent command already created the tunnel and handles routing.
+        const serverPort = isAppDev && proxyPort
+            ? proxyPort
+            : await this.startProxyServer(proxyPort || port);
         await this.execFrontendProject(serverPort, isAppDev);
     }
     async execFrontendProject(serverPort, isAppDev) {
@@ -83,7 +87,7 @@ export default class AppFrontendDev extends PushAppCommand {
                     }
                     // 3. READY DETECTION: Detect server ready, show our message
                     if (!serverReadyDetected &&
-                        (/✓ ready in \d+/.test(string) || /✓ starting/.test(string))) {
+                        (/✓ ready in \d+/i.test(string) || /✓ starting/i.test(string))) {
                         serverReadyDetected = true;
                         this.log(`Started ${projectType.name} dev server on port ${serverPort}.\n`);
                         const sessionId = localConfig.getSessionId(currentStore);

package/dist/commands/app/version.js

@@ -168,7 +168,7 @@ behavior by using the --no-git-tag option.`;
             spinner,
         });
         if (!versionResponse || !versionResponse.version) {
-            spinner.fail('Something went wrong.');
+            throw new Error('Something went wrong. Server could not create version.');
         }
         // update the local app config file since remote was successful
         this.swellConfig.set('version', nextVersion);

package/dist/lib/proxy.js

@@ -1,8 +1,62 @@
+import { bin, install, Tunnel } from 'cloudflared';
 import localtunnel from 'localtunnel';
 import ngrok from 'ngrok';
+import * as fs from 'node:fs';
+import ora from 'ora';
 import { LOCAL_PROXY_PROVIDER } from './constants.js';
+let activeTunnel = null;
+let cleanupRegistered = false;
+async function startCloudflaredTunnel(port) {
+    // Stop existing tunnel if called again
+    if (activeTunnel) {
+        activeTunnel.stop();
+        activeTunnel = null;
+    }
+    // Ensure cloudflared binary is installed
+    if (!fs.existsSync(bin)) {
+        const spinner = ora('Installing cloudflared tunnel (first time only)...').start();
+        await install(bin);
+        spinner.stop();
+    }
+    // Use Tunnel.quick() for quick tunnels without a Cloudflare account
+    const tunnel = Tunnel.quick(`http://localhost:${port}`);
+    activeTunnel = tunnel;
+    // Wait for the URL to be available
+    const url = await new Promise((resolve, reject) => {
+        const timeout = setTimeout(() => {
+            tunnel.stop();
+            activeTunnel = null;
+            reject(new Error('Timeout waiting for cloudflared tunnel URL. Check if cloudflared can connect to Cloudflare.'));
+        }, 60000);
+        tunnel.on('url', (tunnelUrl) => {
+            clearTimeout(timeout);
+            resolve(tunnelUrl);
+        });
+        tunnel.on('error', (error) => {
+            clearTimeout(timeout);
+            activeTunnel = null;
+            reject(error);
+        });
+    });
+    // Register cleanup handlers only once, referencing activeTunnel for current tunnel
+    if (!cleanupRegistered) {
+        cleanupRegistered = true;
+        process.on('exit', () => activeTunnel?.stop());
+        process.on('SIGINT', () => {
+            activeTunnel?.stop();
+            // eslint-disable-next-line no-process-exit
+            process.exit();
+        });
+        process.on('SIGTERM', () => {
+            activeTunnel?.stop();
+            // eslint-disable-next-line no-process-exit
+            process.exit();
+        });
+    }
+    return url;
+}
 export async function getProxyUrl(port) {
-    const provider = LOCAL_PROXY_PROVIDER || 'localtunnel';
+    const provider = LOCAL_PROXY_PROVIDER || 'cloudflared';
     try {
         switch (provider) {
             case 'local': {
@@ -14,16 +68,19 @@ export async function getProxyUrl(port) {
                     region: 'us', // TODO: make it configurable
                 });
             }
-            // eslint-disable-next-line unicorn/no-useless-switch-case
-            case 'localtunnel':
-            default: {
+            case 'localtunnel': {
                 const tunnel = await localtunnel({ port });
                 return tunnel.url;
             }
+            // eslint-disable-next-line unicorn/no-useless-switch-case
+            case 'cloudflared':
+            default: {
+                return await startCloudflaredTunnel(port);
+            }
         }
     }
     catch (error) {
-        console.log(error);
+        console.error(error);
         throw new Error(`Unable to start tunnel on port ${port} (${provider}): ${error.message}`);
     }
 }

package/dist/push-app-command.d.ts

@@ -80,7 +80,7 @@ export declare abstract class PushAppCommand extends RemoteAppCommand {
     setWatchingFiles(): Promise<void>;
     startProxyServer(port?: number): Promise<number>;
     updateFrontendDeployment(currentStore: string, projectType: FrontendProjectType, deploymentUrl: string, deploymentHash: string): Promise<void>;
-    updateLocalProxy(proxyUrl: string, storefrontId?: string): Promise<void>;
+    updateLocalProxy(proxyUrl: string | null, storefrontId?: string): Promise<void>;
     watchForChanges({ logChanges, onChange, syncAll, }?: {
         logChanges?: boolean;
         onChange?: (appConfig?: AppConfig, result?: any) => void;

package/oclif.manifest.json

@@ -2875,5 +2875,5 @@
       ]
     }
   },
-  "version": "2.3.0"
+  "version": "2.3.2"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swell/cli",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "type": "module",
   "description": "Swell's command line interface/utility",
   "keywords": [
@@ -37,6 +37,7 @@
     "ajv-formats": "3.0.1",
     "blake3-wasm": "2.1.5",
     "chalk": "5.3.0",
+    "cloudflared": "0.7.1",
     "conf": "11.0.2",
     "configstore": "6.0.0",
     "esbuild": "0.19.5",