@swell/cli 2.3.0 → 2.3.1

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

@@ -83,7 +83,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/oclif.manifest.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swell/cli",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "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",