@qumra/cli 2.4.20 → 2.4.21

package/dist/cli.js

@@ -35,7 +35,7 @@ var fs$k = require('node:fs');
 var require$$0$g = require('http');
 var require$$1$b = require('https');
 var zlib$3 = require('zlib');
-var net$4 = require('net');
+var require$$3$4 = require('net');
 var require$$4$5 = require('tls');
 var process$5 = require('node:process');
 var require$$0$i = require('node:buffer');
@@ -57,7 +57,7 @@ var require$$2$b = require('node:http');
 var require$$5$6 = require('node:querystring');
 var require$$0$q = require('node:diagnostics_channel');
 var require$$4$6 = require('node:tls');
-var require$$3$4 = require('node:zlib');
+var require$$3$5 = require('node:zlib');
 var require$$5$7 = require('node:perf_hooks');
 var require$$8$1 = require('node:util/types');
 var require$$1$d = require('node:sqlite');
@@ -110,7 +110,7 @@ var fs__namespace$1 = /*#__PURE__*/_interopNamespaceDefault(fs$j);
 var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path$d);
 var fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs$i);
 var blessed__namespace = /*#__PURE__*/_interopNamespaceDefault(blessed);
-var net__namespace = /*#__PURE__*/_interopNamespaceDefault(net$4);
+var require$$3__namespace = /*#__PURE__*/_interopNamespaceDefault(require$$3$4);
 var readline__namespace = /*#__PURE__*/_interopNamespaceDefault(readline$4);
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -304366,7 +304366,7 @@ class SectionBuilder {
     }
 }
 
-var version$2 = "2.4.20";
+var version$2 = "2.4.21";
 var pkg = {
 	version: version$2};
 
@@ -315027,7 +315027,7 @@ var extension$1 = { format: format$5, parse: parse$o };
 const EventEmitter$6 = require$$2$7;
 const https$3 = require$$1$b;
 const http$8 = require$$0$g;
-const net$3 = net$4;
+const net$3 = require$$3$4;
 const tls$1 = require$$4$5;
 const { randomBytes, createHash: createHash$1 } = require$$0$d;
 const { Duplex: Duplex$3, Readable: Readable$8 } = require$$0$b;
@@ -358635,7 +358635,7 @@ function requireNode$5 () {
 
 		    case 'PIPE':
 		    case 'TCP':
-		      var net = net$4;
+		      var net = require$$3$4;
 		      stream = new net.Socket({
 		        fd: fd,
 		        readable: false,
@@ -434482,7 +434482,7 @@ function validMime (type) {
 
 var accepts$2 = accepts$3;
 var deprecate$1 = depd_1('express');
-var isIP$1 = net$4.isIP;
+var isIP$1 = require$$3$4.isIP;
 var typeis = typeIsExports;
 var http$3 = require$$0$g;
 var fresh = fresh_1;
@@ -490388,7 +490388,7 @@ const lazyLoaders = {
   'node:crypto': () => require$$2$8,
   'node:sqlite': () => require$$1$d,
   'node:worker_threads': () => require$$2$c,
-  'node:zlib': () => require$$3$4
+  'node:zlib': () => require$$3$5
 };
 
 /**
@@ -491470,7 +491470,7 @@ function requireUtil$4 () {
 	hasRequiredUtil$4 = 1;
 
 	const { Transform } = require$$0$k;
-	const zlib = require$$3$4;
+	const zlib = require$$3$5;
 	const { redirectStatusSet, referrerPolicyTokens, badPortsSet } = requireConstants$2();
 	const { getGlobalOrigin } = requireGlobal();
 	const { collectAnHTTPQuotedString, parseMIMEType } = requireDataUrl();
@@ -506922,7 +506922,7 @@ var cache$2 = (opts = {}) => {
   }
 };
 
-const { createInflate, createGunzip, createBrotliDecompress, createZstdDecompress } = require$$3$4;
+const { createInflate, createGunzip, createBrotliDecompress, createZstdDecompress } = require$$3$5;
 const { pipeline } = require$$0$k;
 const DecoratorHandler = decoratorHandler;
 const { runtimeFeatures } = runtimeFeatures$2;
@@ -510794,7 +510794,7 @@ function requireFetch () {
 	} = requireResponse();
 	const { HeadersList } = requireHeaders();
 	const { Request, cloneRequest, getRequestDispatcher, getRequestState } = requireRequest();
-	const zlib = require$$3$4;
+	const zlib = require$$3$5;
 	const {
 	  makePolicyContainer,
 	  clonePolicyContainer,
@@ -516300,7 +516300,7 @@ function requirePermessageDeflate () {
 	if (hasRequiredPermessageDeflate) return permessageDeflate;
 	hasRequiredPermessageDeflate = 1;
 
-	const { createInflateRaw, Z_DEFAULT_WINDOWBITS } = require$$3$4;
+	const { createInflateRaw, Z_DEFAULT_WINDOWBITS } = require$$3$5;
 	const { isValidClientWindowBits } = requireUtil$1();
 
 	const tail = Buffer.from([0x00, 0x00, 0xff, 0xff]);
@@ -533297,7 +533297,7 @@ let ThemeProxyService = class ThemeProxyService {
      */
     isPortAvailable(port) {
         return new Promise((resolve) => {
-            const server = net__namespace.createServer();
+            const server = require$$3__namespace.createServer();
             server.once('error', (err) => {
                 if (err.code === 'EADDRINUSE') {
                     resolve(false);
@@ -534476,56 +534476,9 @@ let AppDevServerService = class AppDevServerService {
         this.logger = logger;
         this.childProcess = null;
     }
-    async start(options) {
-        const { env, cwd = process.cwd() } = options;
-        this.logger.componentLog('React Router', 'Starting development server...');
-        return new Promise((resolve, reject) => {
-            var _a, _b;
-            const child = require$$1$7.spawn('npx', ['react-router', 'dev'], {
-                cwd,
-                env: { ...process.env, ...env },
-                shell: true,
-                stdio: ['pipe', 'pipe', 'pipe'],
-            });
-            this.childProcess = child;
-            (_a = child.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
-                const lines = data.toString().trim().split('\n');
-                for (const line of lines) {
-                    if (line.trim()) {
-                        this.logger.componentLog('React Router', line.trim());
-                    }
-                }
-            });
-            (_b = child.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => {
-                const lines = data.toString().trim().split('\n');
-                for (const line of lines) {
-                    if (line.trim()) {
-                        // Check if it's a warning (npm warn) or actual error
-                        if (line.includes('warn')) {
-                            this.logger.componentLog('React Router', line.trim(), 'warn');
-                        }
-                        else {
-                            this.logger.componentLog('React Router', line.trim(), 'error');
-                        }
-                    }
-                }
-            });
-            child.on('error', (err) => {
-                reject(new Error(`Server failed to start: ${err.message}`));
-            });
-            // Consider server started after small delay
-            setTimeout(resolve, 2000);
-            // Handle exit
-            child.on('exit', (code) => {
-                this.childProcess = null;
-                if (code !== 0) {
-                    this.logger.componentLog('React Router', `Server exited with code ${code}`, 'error');
-                }
-            });
-        });
-    }
     /**
-     * Start dev server with DevUI logging
+     * Start dev server with DevUI logging.
+     * Returns the actual port the server is listening on (parsed from Vite output).
      */
     async startWithUI(devUI, options) {
         const { env, cwd = process.cwd() } = options;
@@ -534539,11 +534492,20 @@ let AppDevServerService = class AppDevServerService {
                 stdio: ['pipe', 'pipe', 'pipe'],
             });
             this.childProcess = child;
+            let resolved = false;
             (_a = child.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
                 const lines = data.toString().trim().split('\n');
                 for (const line of lines) {
                     if (line.trim()) {
                         devUI.log('React Router', line.trim());
+                        // Parse actual port from Vite output: "➜  Local:   http://localhost:4002/"
+                        if (!resolved) {
+                            const match = line.match(/Local:\s+https?:\/\/[^:]+:(\d+)/);
+                            if (match) {
+                                resolved = true;
+                                resolve(Number(match[1]));
+                            }
+                        }
                     }
                 }
             });
@@ -534562,23 +534524,35 @@ let AppDevServerService = class AppDevServerService {
             });
             child.on('error', (err) => {
                 devUI.log('React Router', `Failed to start: ${err.message}`, 'error');
-                reject(new Error(`Server failed to start: ${err.message}`));
+                if (!resolved) {
+                    resolved = true;
+                    reject(new Error(`Server failed to start: ${err.message}`));
+                }
             });
-            // Consider server started after small delay
-            setTimeout(resolve, 2000);
             // Handle exit
             child.on('exit', (code) => {
                 this.childProcess = null;
                 if (code !== 0) {
                     devUI.log('React Router', `Server exited with code ${code}`, 'error');
                 }
+                if (!resolved) {
+                    resolved = true;
+                    reject(new Error(`Server exited with code ${code}`));
+                }
             });
+            // Timeout fallback
+            setTimeout(() => {
+                if (!resolved) {
+                    resolved = true;
+                    // Fallback to the PORT env if we couldn't parse the actual port
+                    resolve(Number(env.PORT) || 3000);
+                }
+            }, 30000);
         });
     }
     stop() {
         if (this.childProcess && !this.childProcess.killed && this.childProcess.pid) {
             try {
-                // Kill the whole process tree spawned by shell: true
                 process.kill(this.childProcess.pid, 'SIGTERM');
             }
             catch {
@@ -534587,33 +534561,6 @@ let AppDevServerService = class AppDevServerService {
             this.childProcess = null;
         }
     }
-    async getAvailablePort(startPort = 4000) {
-        let port = startPort;
-        while (true) {
-            const isAvailable = await this.isPortAvailable(port);
-            if (isAvailable) {
-                return port;
-            }
-            port++;
-        }
-    }
-    isPortAvailable(port) {
-        return new Promise((resolve) => {
-            const server = net__namespace.createServer();
-            server.once('error', (err) => {
-                if (err.code === 'EADDRINUSE') {
-                    resolve(false);
-                }
-                else {
-                    throw err;
-                }
-            });
-            server.once('listening', () => {
-                server.close(() => resolve(true));
-            });
-            server.listen(port);
-        });
-    }
 };
 AppDevServerService = __decorate$5([
     commonExports.Injectable(),
@@ -534672,19 +534619,11 @@ let AppService = class AppService {
             devStore = await this.getOrCreateDevStore(app.organization.handle);
             await this.config.update({ devStore });
         }
-        // Get available port
-        const port = await this.devServer.getAvailablePort();
-        // Create tunnel (before UI starts)
-        this.logger.componentLog('tunnel', 'Creating tunnel...');
-        const localUrl = `http://127.0.0.1:${port}`;
-        const developmentUrl = await this.tunnel.createTunnel(localUrl);
-        // Update dev data
-        await this.appApi.updateDevData(developmentUrl, qumraConfig.clientId);
-        // URLs
+        // URLs will be updated after tunnel is created
+        let developmentUrl = '';
         const installUrl = `https://${devStore}/admin/oauth/cli-install-app?client_id=${qumraConfig.clientId}`;
-        // Create BlessedUI with separate log panels
+        // Create BlessedUI first for all logging
         const devUI = new BlessedUI();
-        // Start BlessedUI
         devUI.start({
             title: 'Qumra App Dev',
             subtitle: 'Using qumra.config.json for default values:',
@@ -534694,10 +534633,7 @@ let AppService = class AppService {
                 { key: 'App', value: app.title },
                 { key: 'Dev store', value: devStore },
             ],
-            urls: [
-                { label: 'Preview URL', url: developmentUrl },
-                { label: 'Install URL', url: installUrl },
-            ],
+            urls: [],
             shortcuts: [
                 {
                     key: 'q', label: 'Quit', handler: () => {
@@ -534707,32 +534643,31 @@ let AppService = class AppService {
                         process.exit(0);
                     }
                 },
-                { key: 'p', label: 'Preview', handler: () => open(developmentUrl) },
+                { key: 'p', label: 'Preview', handler: () => { if (developmentUrl)
+                        open(developmentUrl); } },
                 { key: 'o', label: 'Open Store', handler: () => open(installUrl) },
             ],
             logPanels: ['All', 'Server', 'Tunnel', 'Prisma'],
         });
-        // Log initial steps
-        // devUI.log('prisma', 'Running migrations...');
-        // execSync('npx prisma db push && npx prisma generate', {
-        //   cwd: process.cwd(),
-        //   stdio: 'ignore',
-        // });
-        // devUI.log('prisma', 'Migrations complete', 'success');
-        devUI.log('tunnel', `Tunnel ready: ${developmentUrl}`, 'success');
-        devUI.log('app-preview', 'Dev preview ready', 'success');
-        // Open install URL in browser
-        await open(installUrl);
-        // Start dev server with DevUI logging
-        await this.devServer.startWithUI(devUI, {
+        // Start dev server FIRST - returns the actual port Vite chose
+        const actualPort = await this.devServer.startWithUI(devUI, {
             env: {
-                QUMRA_APP_URL: developmentUrl,
                 QUMRA_API_KEY: qumraConfig.clientId,
                 QUMRA_API_SECRET: app.secretKey,
-                PORT: String(port),
-                SOCKET_PORT: String(port),
+                PORT: '3000',
+                SOCKET_PORT: '3000',
             },
         });
+        devUI.log('server', `Server running on port ${actualPort}`, 'success');
+        // Create tunnel AFTER server is running, using the actual port
+        devUI.log('tunnel', 'Creating tunnel...');
+        developmentUrl = await this.tunnel.createTunnel(`http://127.0.0.1:${actualPort}`);
+        devUI.log('tunnel', `Tunnel ready: ${developmentUrl}`, 'success');
+        // Update dev data
+        await this.appApi.updateDevData(developmentUrl, qumraConfig.clientId);
+        devUI.log('app-preview', 'Dev preview ready', 'success');
+        // Open install URL only after everything is running
+        await open(installUrl);
     }
     async deploy() {
         const qumraConfig = await this.config.load();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qumra/cli",
-  "version": "2.4.20",
+  "version": "2.4.21",
   "description": "Official CLI for Qumra Cloud e-commerce platform. Build, develop, and deploy themes and apps.",
   "main": "dist/cli.js",
   "bin": {