@swell/cli 2.5.6 → 2.5.8

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

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import { ChildProcess } from 'node:child_process';
 import { PushAppCommand } from '../../push-app-command.js';
 export default class AppDev extends PushAppCommand {
     static delayOrientation: boolean;
@@ -16,6 +18,7 @@ export default class AppDev extends PushAppCommand {
     static summary: string;
     functionErrors: Map<string, string>;
     functionPorts: Map<string, number>;
+    functionProcesses: Map<string, ChildProcess>;
     tmpDir: string;
     frontendPort: number | null;
     isCleaningUp: boolean;

package/dist/commands/app/dev.js

@@ -50,6 +50,8 @@ export default class AppDev extends PushAppCommand {
     functionErrors = new Map();
     // All available functions
     functionPorts = new Map();
+    // Wrangler child processes to kill on cleanup
+    functionProcesses = new Map();
     // Directory for compiled function files and wrangler context
     tmpDir = '';
     // Port for frontend dev server (used for routing non-function requests)
@@ -84,6 +86,9 @@ export default class AppDev extends PushAppCommand {
         if (this.isCleaningUp)
             return;
         this.isCleaningUp = true;
+        for (const [, proc] of this.functionProcesses) {
+            proc.kill();
+        }
         try {
             await this.updateLocalProxy(null, this.storefront?.id);
         }
@@ -296,7 +301,9 @@ ENVIRONMENT = "development"
             // Re-bundle the function
             const { code } = await bundleFunction(fullPath);
             // Update the bundled file (wrangler dev will auto-reload)
-            const bundledPath = path.join(this.tmpDir, `${appConfig.name}.js`);
+            const functionDir = path.join(this.tmpDir, `${appConfig.name}`);
+            await fs.promises.mkdir(functionDir, { recursive: true });
+            const bundledPath = path.join(functionDir, `${appConfig.name}.js`);
             await fs.promises.writeFile(bundledPath, code);
             if (this.functionPorts.has(appConfig.name)) {
                 this.log(`\nUpdating function ${appConfig.name}...`);
@@ -355,6 +362,7 @@ ENVIRONMENT = "development"
     }
     async startFunctionServers(functions) {
         const functionStatus = new Map();
+        const allocatedFunctionPorts = new Set();
         const allocatedInspectorPorts = new Set();
         /* eslint-disable no-await-in-loop */
         for (const func of functions) {
@@ -363,7 +371,11 @@ ENVIRONMENT = "development"
                 // Function server already running
                 continue;
             }
-            const functionPort = await getPort({ port: portNumbers(9000, 9100) });
+            const functionPort = await getPort({
+                port: portNumbers(9000, 9100),
+                exclude: [...allocatedFunctionPorts],
+            });
+            allocatedFunctionPorts.add(functionPort);
             const inspectorPort = await getPort({
                 port: portNumbers(9229, 9329),
                 exclude: [...allocatedInspectorPorts],
@@ -373,12 +385,15 @@ ENVIRONMENT = "development"
                 // Bundle the function
                 const fullPath = path.join(this.appPath, func.filePath);
                 const { code } = await bundleFunction(fullPath);
-                // Write bundled function to tmp directory
-                const bundledPath = path.join(this.tmpDir, `${functionName}.js`);
+                // Each function gets its own directory to avoid wrangler state conflicts
+                const functionDir = path.join(this.tmpDir, functionName);
+                await fs.promises.mkdir(functionDir, { recursive: true });
+                // Write bundled function to its directory
+                const bundledPath = path.join(functionDir, `${functionName}.js`);
                 await fs.promises.writeFile(bundledPath, code);
                 // Generate wrangler config
                 const wranglerConfig = this.generateWranglerConfig(functionName, bundledPath);
-                const configPath = path.join(this.tmpDir, `${functionName}.toml`);
+                const configPath = path.join(functionDir, `${functionName}.toml`);
                 await fs.promises.writeFile(configPath, wranglerConfig);
                 functionStatus.set(functionName, 'starting');
                 // Start wrangler process in background using detected package manager
@@ -392,7 +407,7 @@ ENVIRONMENT = "development"
                     `--port=${functionPort}`,
                     `--inspector-port=${inspectorPort}`,
                 ], {
-                    cwd: this.tmpDir,
+                    cwd: functionDir,
                     // stdio: 'pipe', // Capture output for debugging
                     detached: false,
                 });
@@ -458,7 +473,8 @@ ENVIRONMENT = "development"
                         this.functionErrors.set(functionName, `Process exited with code ${code}`);
                     }
                 });
-                // Store the port for routing
+                // Store the process and port for routing
+                this.functionProcesses.set(functionName, wranglerProcess);
                 this.functionPorts.set(functionName, functionPort);
             }
             catch (error) {

package/dist/create-app-command.js

@@ -503,7 +503,7 @@ export class CreateAppCommand extends SwellCommand {
     }
     async addFrontendAllowedHosts(projectType, configPath) {
         // Configure allowedHosts for frameworks using Vite dev server
-        // This allows tunneling services (ngrok, localtunnel) to proxy requests to the local dev environment
+        // This allows tunneling services (localtunnel) to proxy requests to the local dev environment
         switch (projectType.slug) {
             case 'astro': {
                 await this.addAllowedHostsToAstro(configPath);

package/dist/lib/proxy.js

@@ -1,6 +1,5 @@
 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';
@@ -70,12 +69,6 @@ export async function getProxyUrl(port, context) {
             case 'local': {
                 return `http://localhost:${port}`;
             }
-            case 'ngrok': {
-                return await ngrok.connect({
-                    addr: port,
-                    region: 'us', // TODO: make it configurable
-                });
-            }
             case 'localtunnel': {
                 const tunnel = await localtunnel({ port });
                 return tunnel.url;

package/dist/lib/swell-function-wrapper.d.ts

@@ -100,6 +100,7 @@ declare class SwellRequest {
     getIngestableLogs(response: any): {
         params: any;
     } | undefined;
+    formatRequestData(): string;
     ingestLogs(response: any): Promise<void>;
     /**
      * Merge values into app data for the current request.

package/dist/lib/swell-function-wrapper.js

@@ -170,12 +170,22 @@ class SwellRequest {
                 ...this.logParams,
                 message: {
                     ...this.logParams?.message,
+                    data: this.logParams?.message?.data || this.formatRequestData(),
                     logs: this._logs,
                     status: response.status,
                 },
             },
         };
     }
+    formatRequestData() {
+        try {
+            const stringData = JSON.stringify(this.body ?? null);
+            return stringData.substring(0, 1024000);
+        }
+        catch {
+            return '';
+        }
+    }
     async ingestLogs(response) {
         const ingestableLogs = this.getIngestableLogs(response);
         if (!ingestableLogs) {

package/oclif.manifest.json

@@ -2969,5 +2969,5 @@
       ]
     }
   },
-  "version": "2.5.6"
+  "version": "2.5.8"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swell/cli",
-  "version": "2.5.6",
+  "version": "2.5.8",
   "type": "module",
   "description": "Swell's command line interface/utility",
   "keywords": [
@@ -51,7 +51,6 @@
     "localtunnel": "2.0.2",
     "lodash": "4.17.21",
     "mime-detect": "1.2.0",
-    "ngrok": "5.0.0-beta.2",
     "node-fetch": "3.3.2",
     "oclif": "4.0.3",
     "open": "9.1.0",