@fgv/ts-res-browser-cli 5.0.0-2 → 5.0.0-21

package/README.md

@@ -17,19 +17,28 @@ Command-line interface to launch ts-res-browser with specified resources and con
 npm install -g @fgv/ts-res-browser-cli
 ```
 
+Or use directly with npx (no installation required):
+
+```bash
+npx @fgv/ts-res-browser-cli --help
+```
+
 ## Usage
 
 ### Basic Usage
 
 ```bash
 # Launch browser with resources from a directory
-ts-res-browser-cli browse --input ./resources --config default
+ts-res-browser-cli browse --input ./resources --config default --serve
+
+# With npx (no installation required)
+npx @fgv/ts-res-browser-cli --input ./resources --config default --serve
 
 # Launch with a specific configuration file
-ts-res-browser-cli browse --input ./my-resources --config ./config.json
+ts-res-browser-cli browse --input ./my-resources --config ./config.json --serve
 
 # Create ZIP and launch without opening browser automatically
-ts-res-browser-cli browse --input ./resources --config extended-example --no-open
+ts-res-browser-cli browse --input ./resources --config extended-example --serve --no-open
 ```
 
 ### ZIP Workflow
@@ -42,19 +51,33 @@ The CLI automatically creates ZIP archives containing your resources and configu
 
 ```bash
 # Creates: ~/Downloads/ts-res-bundle-[timestamp].zip
-ts-res-browser-cli browse --input ./resources --config my-config
+ts-res-browser-cli browse --input ./resources --config my-config --serve
 ```
 
-### Development Server
+### Server Options
+
+The CLI provides several ways to launch the browser with a server:
 
 ```bash
-# Automatically start development server locally
+# Recommended: Universal server start (works everywhere)
+ts-res-browser-cli browse --input ./resources --serve
+
+# Development server (monorepo environment only)  
 ts-res-browser-cli browse --input ./resources --dev
 
-# Use existing server at custom URL  
+# Connect to existing server
 ts-res-browser-cli browse --input ./resources --url http://localhost:3001
 ```
 
+**Server Flag Behavior:**
+- `--serve`: Works in both monorepo and published packages
+  - **Monorepo**: Starts webpack dev server with hot reloading (port 3000)
+  - **Published packages**: Starts static file server (port 8080)
+- `--dev`: Development server with hot reloading (monorepo only)
+  - **Monorepo**: Same as `--serve` 
+  - **Published packages**: Shows error with instructions to use `--serve`
+- `--url`: Connect to existing server at specified URL
+
 ### Advanced Options
 
 ```bash
@@ -64,8 +87,8 @@ ts-res-browser-cli browse \
   --context-filter "language=en-US|territory=US" \
   --reduce-qualifiers
 
-# Interactive mode with sample data
-ts-res-browser-cli browse --interactive
+# Interactive mode with sample data (requires server)
+ts-res-browser-cli browse --interactive --serve
 
 # Verbose output
 ts-res-browser-cli browse --input ./resources --verbose
@@ -89,8 +112,9 @@ Launch ts-res-browser with specified resources and configuration.
 - `-p, --port <number>`: Port for local browser instance
 - `--url <url>`: URL of remote browser instance
 - `--no-open`: Do not open browser automatically
-- `--interactive`: Launch in interactive mode with sample data
-- `--dev`: Automatically start development server locally
+- `--interactive`: Launch in interactive mode with sample data (requires --serve, --dev, or --url)
+- `--serve`: Start server (dev in monorepo, serve in published packages) and connect automatically
+- `--dev`: Start development server locally (monorepo only)
 - `-v, --verbose`: Verbose output
 - `-q, --quiet`: Quiet output
 

package/lib/cli.d.ts

@@ -29,9 +29,5 @@ export declare class TsResBrowserCliApp {
      * Parses and validates browse options
      */
     private _parseBrowseOptions;
-    /**
-     * Sets up graceful shutdown handling
-     */
-    private _setupGracefulShutdown;
 }
 //# sourceMappingURL=cli.d.ts.map

package/lib/cli.js

@@ -60,16 +60,15 @@ const ts_utils_1 = require("@fgv/ts-utils");
 const TsRes = __importStar(require("@fgv/ts-res"));
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
-const browserLauncher_1 = require("./browserLauncher");
+const simpleBrowserLauncher_1 = require("./simpleBrowserLauncher");
 /**
  * Main CLI class for ts-res-browser-cli
  */
 class TsResBrowserCliApp {
     constructor() {
         this._program = new commander_1.Command();
-        this._launcher = new browserLauncher_1.BrowserLauncher();
+        this._launcher = new simpleBrowserLauncher_1.SimpleBrowserLauncher();
         this._setupCommands();
-        this._setupGracefulShutdown();
     }
     /**
      * Runs the CLI with the provided arguments
@@ -102,6 +101,7 @@ class TsResBrowserCliApp {
             .option('--no-open', 'Do not open browser automatically')
             .option('--interactive', 'Launch in interactive mode with sample data', false)
             .option('--dev', 'Automatically start development server locally', false)
+            .option('--serve', 'Start server (dev in monorepo, serve in published packages) and connect automatically', false)
             .action(async (options) => {
             // If no options provided, show help
             if (!this._hasOptions(options)) {
@@ -130,6 +130,7 @@ class TsResBrowserCliApp {
             .option('--no-open', 'Do not open browser automatically')
             .option('--interactive', 'Launch in interactive mode with sample data', false)
             .option('--dev', 'Automatically start development server locally', false)
+            .option('--serve', 'Start server (dev in monorepo, serve in published packages) and connect automatically', false)
             .action(async (options) => {
             await this._handleBrowseCommand(options);
         });
@@ -161,7 +162,8 @@ class TsResBrowserCliApp {
             options.reduceQualifiers ||
             options.interactive ||
             options.url ||
-            options.dev);
+            options.dev ||
+            options.serve);
     }
     /**
      * Handles the browse command
@@ -348,7 +350,8 @@ class TsResBrowserCliApp {
                 url: options.url,
                 open: options.open,
                 interactive: options.interactive || false,
-                dev: options.dev || false
+                dev: options.dev || false,
+                serve: options.serve || false
             };
             return (0, ts_utils_1.succeed)(browseOptions);
         }
@@ -356,18 +359,6 @@ class TsResBrowserCliApp {
             return (0, ts_utils_1.fail)(`Failed to parse options: ${error}`);
         }
     }
-    /**
-     * Sets up graceful shutdown handling
-     */
-    _setupGracefulShutdown() {
-        const shutdown = (signal) => {
-            console.log(`\nReceived ${signal}, shutting down gracefully...`);
-            this._launcher.shutdown();
-            process.exit(0);
-        };
-        process.on('SIGINT', () => shutdown('SIGINT'));
-        process.on('SIGTERM', () => shutdown('SIGTERM'));
-    }
 }
 exports.TsResBrowserCliApp = TsResBrowserCliApp;
 //# sourceMappingURL=cli.js.map

package/lib/index.d.ts

@@ -1,4 +1,4 @@
 export * from './cli';
 export * from './options';
-export * from './browserLauncher';
+export * from './simpleBrowserLauncher';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.js

@@ -38,5 +38,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // Export main components
 __exportStar(require("./cli"), exports);
 __exportStar(require("./options"), exports);
-__exportStar(require("./browserLauncher"), exports);
+__exportStar(require("./simpleBrowserLauncher"), exports);
 //# sourceMappingURL=index.js.map

package/lib/options.d.ts

@@ -59,6 +59,10 @@ export interface IBrowseOptions {
      * Whether to automatically start the development server
      */
     dev?: boolean;
+    /**
+     * Whether to start server (dev in monorepo, serve in published packages) and connect automatically
+     */
+    serve?: boolean;
     /**
      * Whether to use ZIP loading mode (internal flag)
      */
@@ -91,5 +95,6 @@ export interface IBrowseCommandOptions {
     interactive?: boolean;
     url?: string;
     dev?: boolean;
+    serve?: boolean;
 }
 //# sourceMappingURL=options.d.ts.map

package/lib/simpleBrowserLauncher.d.ts

@@ -0,0 +1,32 @@
+import { Result } from '@fgv/ts-utils';
+import { IBrowseOptions } from './options';
+/**
+ * Simplified browser launcher using direct dependency on ts-res-browser
+ */
+export declare class SimpleBrowserLauncher {
+    /**
+     * Launches the browser with the specified options
+     */
+    launch(options: IBrowseOptions): Promise<Result<void>>;
+    /**
+     * Starts the server using ts-res-browser CLI directly
+     */
+    private _startServer;
+    /**
+     * Opens the browser to the specified URL
+     */
+    private _openBrowser;
+    /**
+     * Builds the URL with query parameters based on options
+     */
+    private _buildUrl;
+    /**
+     * Determines if a ZIP archive should be created based on the options
+     */
+    private _shouldCreateZip;
+    /**
+     * Creates a ZIP archive containing the input and config files
+     */
+    private _createZipArchive;
+}
+//# sourceMappingURL=simpleBrowserLauncher.d.ts.map

package/lib/{browserLauncher.js → simpleBrowserLauncher.js}

@@ -54,21 +54,28 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BrowserLauncher = void 0;
+exports.SimpleBrowserLauncher = void 0;
 const child_process_1 = require("child_process");
 const path = __importStar(require("path"));
-const http = __importStar(require("http"));
 const ts_utils_1 = require("@fgv/ts-utils");
 const zipArchiver_1 = require("./zipArchiver");
 /**
- * Manages launching the browser application with specified options
+ * Simplified browser launcher using direct dependency on ts-res-browser
  */
-class BrowserLauncher {
+class SimpleBrowserLauncher {
     /**
      * Launches the browser with the specified options
      */
     async launch(options) {
         try {
+            // Validate options before proceeding
+            if (options.interactive && !options.dev && !options.serve && !options.url) {
+                return (0, ts_utils_1.fail)('Interactive mode requires either --dev/--serve to start a local server or --url to specify a remote server.\n\n' +
+                    'Examples:\n' +
+                    '  ts-res-browser-cli --interactive --dev\n' +
+                    '  ts-res-browser-cli --interactive --serve\n' +
+                    '  ts-res-browser-cli --interactive --url https://example.com/ts-res-browser');
+            }
             // Check if we need to create a ZIP archive for file-based inputs
             let zipCreated = false;
             let finalOptions = Object.assign({}, options);
@@ -90,25 +97,15 @@ class BrowserLauncher {
                     loadZip: true, zipFile: zipFileName, zipPath: zipResult.value.zipPath });
                 zipCreated = true;
             }
-            // Start development server if requested
-            if (finalOptions.dev && !finalOptions.url) {
+            // Start server if requested
+            if ((finalOptions.dev || finalOptions.serve) && !finalOptions.url) {
                 if (!finalOptions.quiet) {
-                    console.log('Starting TS-RES Browser development server...');
+                    console.log('Starting TS-RES Browser server...');
                 }
-                const serverResult = await this._startDevServer(finalOptions);
+                const serverResult = await this._startServer(finalOptions);
                 if (serverResult.isFailure()) {
                     return serverResult;
                 }
-                // Wait for server to be ready
-                const port = options.port || 3000;
-                const readyResult = await this._waitForServerReady(port, options.verbose || false);
-                if (readyResult.isFailure()) {
-                    this._stopDevServer();
-                    return readyResult;
-                }
-                if (!options.quiet) {
-                    console.log(`Development server started on port ${port}`);
-                }
             }
             // Build URL with parameters
             const url = this._buildUrl(finalOptions);
@@ -150,6 +147,39 @@ class BrowserLauncher {
             return (0, ts_utils_1.fail)(`Failed to launch browser: ${error}`);
         }
     }
+    /**
+     * Starts the server using ts-res-browser CLI directly
+     */
+    async _startServer(options) {
+        try {
+            // Use ts-res-browser directly from node_modules
+            const browserPath = require.resolve('@fgv/ts-res-browser/cli.js');
+            const command = `node "${browserPath}" ${options.dev ? 'dev' : 'serve'}`;
+            if (options.verbose) {
+                console.log(`Running: ${command}`);
+            }
+            return new Promise((resolve) => {
+                const child = (0, child_process_1.exec)(command, (error) => {
+                    if (error) {
+                        resolve((0, ts_utils_1.fail)(`Failed to start server: ${error.message}`));
+                    }
+                    else {
+                        resolve((0, ts_utils_1.succeed)(undefined));
+                    }
+                });
+                // Give server time to start, then assume success
+                setTimeout(() => {
+                    if (options.verbose) {
+                        console.log('Server startup initiated');
+                    }
+                    resolve((0, ts_utils_1.succeed)(undefined));
+                }, 2000);
+            });
+        }
+        catch (error) {
+            return (0, ts_utils_1.fail)(`Failed to start server: ${error}`);
+        }
+    }
     /**
      * Opens the browser to the specified URL
      */
@@ -173,8 +203,9 @@ class BrowserLauncher {
      * Builds the URL with query parameters based on options
      */
     _buildUrl(options) {
-        // Use provided URL or default to localhost
-        const baseUrl = options.url || `http://localhost:${options.port || 3000}`;
+        // Use provided URL or default based on server type
+        const defaultPort = options.dev ? 3000 : 8080;
+        const baseUrl = options.url || `http://localhost:${options.port || defaultPort}`;
         const params = new URLSearchParams();
         if (options.input) {
             params.set('input', options.input);
@@ -212,103 +243,6 @@ class BrowserLauncher {
         const queryString = params.toString();
         return queryString ? `${baseUrl}?${queryString}` : baseUrl;
     }
-    /**
-     * Starts the development server for ts-res-browser
-     */
-    async _startDevServer(options) {
-        try {
-            // Find the ts-res-browser project directory
-            // Assume we're running from tools/ts-res-browser-cli, so go up and over to tools/ts-res-browser
-            const browserProjectPath = path.resolve(__dirname, '../../ts-res-browser');
-            if (options.verbose) {
-                console.log(`Looking for ts-res-browser at: ${browserProjectPath}`);
-            }
-            const port = options.port || 3000;
-            const env = Object.assign(Object.assign({}, process.env), { PORT: port.toString() });
-            this._devServer = (0, child_process_1.spawn)('rushx', ['dev'], {
-                cwd: browserProjectPath,
-                env,
-                stdio: options.verbose ? 'inherit' : ['ignore', 'pipe', 'pipe']
-            });
-            this._devServer.on('error', (error) => {
-                return (0, ts_utils_1.fail)(`Failed to start development server: ${error}`);
-            });
-            // Give the server a moment to start
-            await this._sleep(3000);
-            if (this._devServer && !this._devServer.killed) {
-                if (options.verbose) {
-                    console.log('Development server process started successfully');
-                }
-                return (0, ts_utils_1.succeed)(undefined);
-            }
-            else {
-                return (0, ts_utils_1.fail)('Development server process failed to start');
-            }
-        }
-        catch (error) {
-            return (0, ts_utils_1.fail)(`Failed to start development server: ${error}`);
-        }
-    }
-    /**
-     * Waits for the development server to be ready by checking HTTP availability
-     */
-    async _waitForServerReady(port, verbose, maxAttempts = 60) {
-        for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-            try {
-                const isReady = await this._checkServerHealth(port);
-                if (isReady) {
-                    if (verbose) {
-                        console.log(`Server is ready at http://localhost:${port}`);
-                    }
-                    return (0, ts_utils_1.succeed)(undefined);
-                }
-            }
-            catch (error) {
-                // Server not ready yet, continue waiting
-            }
-            if (verbose && attempt % 10 === 0) {
-                console.log(`Waiting for server to be ready... (attempt ${attempt}/${maxAttempts})`);
-            }
-            await this._sleep(1000);
-        }
-        return (0, ts_utils_1.fail)(`Server did not become ready after ${maxAttempts} attempts`);
-    }
-    /**
-     * Checks if the server is responding
-     */
-    async _checkServerHealth(port) {
-        return new Promise((resolve) => {
-            const request = http.get(`http://localhost:${port}`, (res) => {
-                resolve(res.statusCode !== undefined && res.statusCode >= 200 && res.statusCode < 400);
-            });
-            request.on('error', () => {
-                resolve(false);
-            });
-            request.setTimeout(3000, () => {
-                request.destroy();
-                resolve(false);
-            });
-        });
-    }
-    /**
-     * Stops the development server
-     */
-    _stopDevServer() {
-        if (this._devServer && !this._devServer.killed) {
-            this._devServer.kill('SIGTERM');
-            setTimeout(() => {
-                if (this._devServer && !this._devServer.killed) {
-                    this._devServer.kill('SIGKILL');
-                }
-            }, 5000);
-        }
-    }
-    /**
-     * Sleep for the specified number of milliseconds
-     */
-    _sleep(ms) {
-        return new Promise((resolve) => setTimeout(resolve, ms));
-    }
     /**
      * Determines if a ZIP archive should be created based on the options
      */
@@ -336,12 +270,6 @@ class BrowserLauncher {
             return (0, ts_utils_1.fail)(`Failed to create ZIP archive: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
-    /**
-     * Graceful shutdown - stops development server if running
-     */
-    shutdown() {
-        this._stopDevServer();
-    }
 }
-exports.BrowserLauncher = BrowserLauncher;
-//# sourceMappingURL=browserLauncher.js.map
+exports.SimpleBrowserLauncher = SimpleBrowserLauncher;
+//# sourceMappingURL=simpleBrowserLauncher.js.map

package/lib/zipArchiver.d.ts

@@ -1,4 +1,5 @@
 import { Result } from '@fgv/ts-utils';
+import { ZipArchive } from '@fgv/ts-res';
 export interface ZipArchiveOptions {
     input?: string;
     config?: string;
@@ -6,20 +7,7 @@ export interface ZipArchiveOptions {
 }
 export interface ZipArchiveResult {
     zipPath: string;
-    manifest: ZipManifest;
-}
-export interface ZipManifest {
-    timestamp: string;
-    input?: {
-        type: 'file' | 'directory';
-        originalPath: string;
-        archivePath: string;
-    };
-    config?: {
-        type: 'file';
-        originalPath: string;
-        archivePath: string;
-    };
+    manifest: ZipArchive.IZipArchiveManifest;
 }
 export declare class ZipArchiver {
     /**

package/lib/zipArchiver.js

@@ -34,11 +34,11 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zipArchiver = exports.ZipArchiver = void 0;
-const archiver = __importStar(require("archiver"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
 const ts_utils_1 = require("@fgv/ts-utils");
+const ts_res_1 = require("@fgv/ts-res");
 class ZipArchiver {
     /**
      * Create a ZIP archive containing the specified input and config files/directories
@@ -53,79 +53,18 @@ class ZipArchiver {
             if (!fs.existsSync(outputDir)) {
                 fs.mkdirSync(outputDir, { recursive: true });
             }
-            const output = fs.createWriteStream(zipPath);
-            const archive = archiver.create('zip', {
-                zlib: { level: 6 } // Good compression level
+            // Create ZIP archive using the new zip-archive packlet
+            const creator = new ts_res_1.ZipArchive.ZipArchiveCreator();
+            const createResult = await creator.createFromBuffer({
+                inputPath: options.input,
+                configPath: options.config
             });
-            // Create manifest
-            const manifest = {
-                timestamp: new Date().toISOString()
-            };
-            // Promise to handle async archiving
-            const archivePromise = new Promise((resolve, reject) => {
-                output.on('close', () => {
-                    resolve();
-                });
-                output.on('error', (err) => {
-                    reject(err);
-                });
-                archive.on('error', (err) => {
-                    reject(err);
-                });
-            });
-            // Pipe archive data to the file
-            archive.pipe(output);
-            // Add input files/directory
-            if (options.input) {
-                const inputPath = path.resolve(options.input);
-                if (!fs.existsSync(inputPath)) {
-                    return (0, ts_utils_1.fail)(`Input path does not exist: ${inputPath}`);
-                }
-                const stats = fs.statSync(inputPath);
-                if (stats.isDirectory()) {
-                    // Add entire directory recursively, preserving structure
-                    const dirName = path.basename(inputPath);
-                    archive.directory(inputPath, `input/${dirName}`);
-                    manifest.input = {
-                        type: 'directory',
-                        originalPath: inputPath,
-                        archivePath: `input/${dirName}`
-                    };
-                }
-                else if (stats.isFile()) {
-                    // Add single file
-                    const fileName = path.basename(inputPath);
-                    archive.file(inputPath, { name: `input/${fileName}` });
-                    manifest.input = {
-                        type: 'file',
-                        originalPath: inputPath,
-                        archivePath: `input/${fileName}`
-                    };
-                }
-            }
-            // Add config file
-            if (options.config) {
-                const configPath = path.resolve(options.config);
-                if (!fs.existsSync(configPath)) {
-                    return (0, ts_utils_1.fail)(`Config file does not exist: ${configPath}`);
-                }
-                const stats = fs.statSync(configPath);
-                if (!stats.isFile()) {
-                    return (0, ts_utils_1.fail)(`Config path must be a file: ${configPath}`);
-                }
-                const fileName = path.basename(configPath);
-                archive.file(configPath, { name: `config/${fileName}` });
-                manifest.config = {
-                    type: 'file',
-                    originalPath: configPath,
-                    archivePath: `config/${fileName}`
-                };
+            if (createResult.isFailure()) {
+                return (0, ts_utils_1.fail)(createResult.message);
             }
-            // Add manifest
-            archive.append(JSON.stringify(manifest, null, 2), { name: 'manifest.json' });
-            // Finalize the archive
-            await archive.finalize();
-            await archivePromise;
+            const { zipBuffer, manifest } = createResult.value;
+            // Write the ZIP buffer to disk
+            fs.writeFileSync(zipPath, zipBuffer);
             return (0, ts_utils_1.succeed)({
                 zipPath,
                 manifest

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fgv/ts-res-browser-cli",
-  "version": "5.0.0-2",
+  "version": "5.0.0-21",
   "description": "Command-line interface to launch ts-res-browser with specified options",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -22,26 +22,25 @@
   },
   "dependencies": {
     "commander": "^11.0.0",
-    "archiver": "~7.0.1",
-    "@types/archiver": "~6.0.3",
-    "@fgv/ts-res": "5.0.0-2",
-    "@fgv/ts-json": "5.0.0-2",
-    "@fgv/ts-utils": "5.0.0-2",
-    "@fgv/ts-json-base": "5.0.0-2"
+    "@fgv/ts-res": "5.0.0-21",
+    "@fgv/ts-json-base": "5.0.0-21",
+    "@fgv/ts-json": "5.0.0-21",
+    "@fgv/ts-res-browser": "5.0.0-21",
+    "@fgv/ts-utils": "5.0.0-21"
   },
   "devDependencies": {
-    "@rushstack/heft": "~0.74.0",
-    "@rushstack/heft-node-rig": "~2.9.0",
+    "@rushstack/heft": "~0.74.2",
+    "@rushstack/heft-node-rig": "~2.9.3",
     "@types/jest": "^29.5.14",
     "@types/node": "^20.14.9",
     "eslint": "^8.57.0",
     "jest": "^29.7.0",
-    "typescript": "^5.7.3",
-    "@fgv/ts-utils-jest": "5.0.0-2"
+    "typescript": "^5.8.3",
+    "@fgv/ts-utils-jest": "5.0.0-21"
   },
   "scripts": {
     "build": "heft build --clean",
-    "test": "heft test --clean",
+    "test": "echo 'No tests configured for ts-res-browser-cli - this is a CLI launcher tool' && exit 0",
     "clean": "heft clean",
     "lint": "eslint src --ext .ts",
     "fixlint": "eslint src --ext .ts --fix"