@swell/cli 2.9.24 → 2.9.26

package/dist/commands/app/dev.js

@@ -14,6 +14,8 @@ import { analyzeFunctionSource, hasKindDiagnostic, } from '../../lib/function-so
 import { detectPackageManager, getExecSpawnArgs, } from '../../lib/package-manager.js';
 import style from '../../lib/style.js';
 import { PushAppCommand } from '../../push-app-command.js';
+// How long shutdown waits for the tunnel address to be cleared on the platform
+const UNREGISTER_TIMEOUT_MS = 5000;
 /**
  * Headers that show the frontend dev server the public host and scheme, as
  * managed hosting does. The tunnel replaces both with its own, so without them
@@ -118,7 +120,8 @@ export default class AppDev extends PushAppCommand {
         // Register cleanup handlers to clear local proxy on exit
         process.on('SIGINT', this.cleanupOnExit.bind(this));
         process.on('SIGTERM', this.cleanupOnExit.bind(this));
-        const serverPort = await this.startProxyServer(port);
+        // The handlers above must finish unregistering before the process exits.
+        const serverPort = await this.startProxyServer(port, false);
         await this.startAppFunctionServer(spinner, serverPort);
         this.emitLifecycleEvent('preview:proxy-ready', {
             proxyPort: serverPort,
@@ -135,7 +138,14 @@ export default class AppDev extends PushAppCommand {
             proc.kill();
         }
         try {
-            await this.updateLocalProxy(null, this.storefront?.id);
+            // The address can't be cleared while the admin API is unreachable, so
+            // don't hold the exit on the request; the platform falls back on its own.
+            await Promise.race([
+                this.updateLocalProxy(null, this.storefront?.id),
+                new Promise((resolve) => {
+                    setTimeout(resolve, UNREGISTER_TIMEOUT_MS);
+                }),
+            ]);
         }
         catch {
             // Ignore errors during cleanup

package/dist/lib/proxy.d.ts

@@ -2,6 +2,7 @@ export interface ProxyContext {
     appId?: string;
     storeId?: string;
     storefrontId?: string;
+    handleSignals?: boolean;
 }
 /**
  * Stop the active tunnel (if any) so the process can exit on its own.

package/dist/lib/proxy.js

@@ -19,7 +19,7 @@ export function stopProxy() {
     activeLocaltunnel?.close();
     activeLocaltunnel = null;
 }
-async function startCloudflaredTunnel(port) {
+async function startCloudflaredTunnel(port, handleSignals = true) {
     // Stop existing tunnel if called again
     if (activeTunnel) {
         activeTunnel.stop();
@@ -56,16 +56,18 @@ async function startCloudflaredTunnel(port) {
     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();
-        });
+        if (handleSignals) {
+            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;
 }
@@ -92,7 +94,7 @@ export async function getProxyUrl(port, context) {
             // eslint-disable-next-line unicorn/no-useless-switch-case
             case 'cloudflared':
             default: {
-                return await startCloudflaredTunnel(port);
+                return await startCloudflaredTunnel(port, context?.handleSignals);
             }
         }
     }

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

@@ -82,6 +82,7 @@ export declare abstract class PushAppCommand extends RemoteAppCommand {
     logDashboardUrl(flags: {
         [flag: string]: any;
     }): void;
+    logDeployedStorefrontUrl(): Promise<void>;
     logStorefrontConnected(): void;
     logStorefrontFrontendUrl(storefront?: any, branchId?: string): void;
     logReleaseDetailsHint(error: any): void;
@@ -93,7 +94,7 @@ export declare abstract class PushAppCommand extends RemoteAppCommand {
     logLocalPreviewUrl(): void;
     setStoreUser(storeUser: boolean): void;
     setWatchingFiles(): Promise<void>;
-    startProxyServer(port?: number): Promise<number>;
+    startProxyServer(port?: number, handleSignals?: boolean): Promise<number>;
     updateFrontendDeployment(currentStore: string, projectType: FrontendProjectType, deploymentUrl: string, deploymentHash: string): Promise<void>;
     updateLocalProxy(proxyUrl: string | null, storefrontId?: string): Promise<void>;
     watchForChanges({ logChanges, onChange, syncAll, }?: {

package/dist/push-app-command.js

@@ -286,6 +286,9 @@ export class PushAppCommand extends RemoteAppCommand {
             }
             await this.handleRequestErrors(async () => this.api.post({ adminPath: `/apps/${this.app.id}/frontend-package` }, { body: { package: serialized } }));
             this.log(`Deployed managed frontend package ${pkg.digest}.`);
+            if (log !== false) {
+                await this.logDeployedStorefrontUrl();
+            }
             return;
         }
         if (this.app.frontend?.hosting === 'managed' &&
@@ -306,10 +309,10 @@ export class PushAppCommand extends RemoteAppCommand {
             await this.updateFrontendDeployment(currentStore, projectType, deploymentUrl, deploymentHash);
         }
         if (log !== false) {
-            if (this.app.type === 'storefront' && this.storefront) {
-                this.logStorefrontFrontendUrl(this.storefront);
+            if (this.app.type === 'storefront') {
+                await this.logDeployedStorefrontUrl();
             }
-            else if (this.app.type !== 'storefront') {
+            else {
                 // Get updated app with `installed` property
                 this.app = await this.getApp(this.app.id);
                 this.logAppFrontendUrl();
@@ -737,6 +740,21 @@ export class PushAppCommand extends RemoteAppCommand {
         const currentStore = localConfig.getDefaultStore();
         this.log(`View the ${style.appConfigValue(this.app.name)} app in your dashboard at ${style.link(this.dashboardUrl(flags, currentStore))}.`);
     }
+    // `swell app push` deploys without choosing a storefront, so fall back to
+    // the app's latest one in this environment
+    async logDeployedStorefrontUrl() {
+        if (this.app.type !== 'storefront') {
+            return;
+        }
+        // The frontend is already deployed, so a failed lookup only skips the link
+        const storefront = this.storefront ||
+            (await this.api
+                .get({ adminPath: `/apps/${this.app.id}/storefront` })
+                .catch(() => null));
+        if (storefront) {
+            this.logStorefrontFrontendUrl(storefront);
+        }
+    }
     logStorefrontConnected() {
         if (!this.storefront) {
             this.error('Storefront not connected');
@@ -885,7 +903,7 @@ export class PushAppCommand extends RemoteAppCommand {
     async setWatchingFiles() {
         this.watchingFiles = new Set(await globAllFilesByPath(this.appPath));
     }
-    async startProxyServer(port) {
+    async startProxyServer(port, handleSignals = true) {
         // Find an open port starting at 3000
         const freePort = port ||
             (await getPort({ port: portNumbers(3000, 3100) })) ||
@@ -895,6 +913,7 @@ export class PushAppCommand extends RemoteAppCommand {
             appId: this.app.id,
             storeId: localConfig.getDefaultStore(),
             storefrontId: this.storefront?.id,
+            handleSignals,
         });
         await this.updateLocalProxy(proxyUrl, this.storefront?.id);
         return freePort;

package/oclif.manifest.json

@@ -3606,5 +3606,5 @@
       ]
     }
   },
-  "version": "2.9.24"
+  "version": "2.9.26"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swell/cli",
-  "version": "2.9.24",
+  "version": "2.9.26",
   "type": "module",
   "description": "Swell's command line interface/utility",
   "keywords": [