jsgui3-server 0.0.138 → 0.0.140

package/publishers/http-webpage-publisher.js

@@ -23,7 +23,54 @@ class HTTP_Webpage_Publisher extends HTTP_Webpageorsite_Publisher {
                 return webpage;
             }
         });
-        this.static_routes_responses_webpage_bundle_preparer = new Static_Routes_Responses_Webpage_Bundle_Preparer();
+
+        // Store bundler configuration for passing to preparers
+        this.bundler_config = spec.bundler || {};
+
+        // Add input validation for bundler configuration
+        if (spec.bundler !== undefined && typeof spec.bundler !== 'object') {
+            throw new Error('bundler must be an object');
+        }
+
+        // Add input validation for compression settings
+        if (this.bundler_config.compression) {
+            const compression = this.bundler_config.compression;
+            if (compression.enabled !== undefined && typeof compression.enabled !== 'boolean') {
+                throw new Error('bundler.compression.enabled must be a boolean');
+            }
+            if (compression.algorithms && !Array.isArray(compression.algorithms)) {
+                throw new Error('bundler.compression.algorithms must be an array');
+            }
+            if (compression.algorithms) {
+                const validAlgorithms = ['gzip', 'br'];
+                for (const alg of compression.algorithms) {
+                    if (!validAlgorithms.includes(alg)) {
+                        throw new Error(`Invalid compression algorithm: ${alg}. Must be one of: ${validAlgorithms.join(', ')}`);
+                    }
+                }
+            }
+            if (compression.threshold !== undefined && (typeof compression.threshold !== 'number' || compression.threshold < 0)) {
+                throw new Error('bundler.compression.threshold must be a non-negative number');
+            }
+        }
+
+        // Add input validation for minification settings
+        if (this.bundler_config.minify) {
+            const minify = this.bundler_config.minify;
+            if (minify.level !== undefined && typeof minify.level !== 'string') {
+                throw new Error('bundler.minify.level must be a string');
+            }
+            if (minify.level !== undefined) {
+                const validLevels = ['conservative', 'normal', 'aggressive'];
+                if (!validLevels.includes(minify.level)) {
+                    throw new Error(`Invalid minification level: ${minify.level}. Must be one of: ${validLevels.join(', ')}`);
+                }
+            }
+        }
+
+        this.static_routes_responses_webpage_bundle_preparer = new Static_Routes_Responses_Webpage_Bundle_Preparer({
+            bundler_config: this.bundler_config
+        });
         (async() => {
             const res_get_ready = await this.get_ready();
             this.raise('ready', res_get_ready);

package/resources/processors/bundlers/js/esbuild/Advanced_JS_Bundler_Using_ESBuild.js

@@ -18,16 +18,20 @@ const CSS_And_JS_From_JS_String_Extractor = require('../../../extractors/js/css_
 
 
 class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
-    constructor(spec) {
+    constructor(spec = {}) {
         super(spec);
 
         if (spec.debug !== undefined) this.debug = spec.debug;
 
+        // Store bundler configuration
+        this.bundler_config = spec.bundler || {};
+
         //this.css_extractor = new CSS_Extractor();
 
 
         this.non_minifying_bundler = new Core_JS_Non_Minifying_Bundler_Using_ESBuild({
-            debug: this.debug
+            debug: this.debug,
+            sourcemaps: this.bundler_config.sourcemaps
         });
 
 
@@ -35,20 +39,27 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
 
 
         // Probably don't use that minifying bundler in debug mode.
-        this.minifying_js_single_file_bundler = new Core_JS_Single_File_Minifying_Bundler_Using_ESBuild();
+        this.minifying_js_single_file_bundler = new Core_JS_Single_File_Minifying_Bundler_Using_ESBuild({
+            minify: this.bundler_config.minify
+        });
 
     }
 
     bundle(js_file_path) {
         const {non_minifying_bundler, css_and_js_from_js_string_extractor, minifying_js_single_file_bundler} = this;
 
+        // Validate input
+        if (typeof js_file_path !== 'string' || js_file_path.trim() === '') {
+            throw new Error('bundle() expects a valid file path string');
+        }
+
         // Maybe this should get them positioned absolutely when removed from the grid?
         //   But then what about the space they leave?
 
         // This is just a simple principle demo though.
         //   Maybe want a simple and explicit option to change behaviour like I specify.
 
-        
+
 
         const res_obs = obs(async(next, complete, error) => {
 
@@ -78,30 +89,22 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
                             const {css, js} = res_extract_css_and_js_from_js;
 
                             if (this.debug) {
-
-                                // sourcemap: 'inline'
-
-                                // Don't minify the js.
-
-                                // Make res bundle items that include the CSS and the non-minified JS.
-
-                                // Including the source map would be better still.
+                                // Generate source maps for CSS-free JS
+                                const css_free_bundle_result = await non_minifying_bundler.bundle_js_string(js);
+                                const css_free_bundle_item = css_free_bundle_result[0]._arr[0];
 
                                 const res_bundle = new Bundle();
-                                // Add the non-minified JS (as a bundle item object)
-
                                 const o_js_bundle_item = {
                                     type: 'JavaScript',
-                                    extension: 'JS',
-                                    text: js
+                                    extension: 'js',
+                                    text: css_free_bundle_item.text
                                 }
-                                res_bundle.add(o_js_bundle_item);
+                                res_bundle.push(o_js_bundle_item);
                                 const o_css_bundle_item = {
                                     type: 'CSS',
                                     extension: 'css',
                                     text: css
                                 }
-
                                 res_bundle.push(o_css_bundle_item);
                                 next(res_bundle);
                                 complete(res_bundle);
@@ -112,125 +115,30 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
 
 
 
-
                             } else {
-
-
-                                const minified_js = await minifying_js_single_file_bundler.bundle(js);
+                                // Generate source maps for CSS-free JS and minify
+                                const css_free_bundle_result = await non_minifying_bundler.bundle_js_string(js);
+                                const css_free_bundle_item = css_free_bundle_result[0]._arr[0];
+                                const minified_js = await minifying_js_single_file_bundler.bundle(css_free_bundle_item.text);
 
                                 //console.log('minified_js', minified_js);
                                 //console.log('minified_js.length', minified_js.length);
 
                                 // it's an array....
 
-                                if (is_array(minified_js)) {
-
-                                    if (minified_js.length === 1) {
-
-
-                                        // Should put it all in a single res bundle though....
-                                        //   Though merging / concating bundles will be fine too.
-
-
-
-                                        const minified_js_bundle_collection = minified_js[0];
-
-                                        
-
-                                        const o_css_bundle_item = {
-                                            type: 'CSS',
-                                            extension: 'css',
-                                            text: css
-                                        }
-
-                                        minified_js_bundle_collection.push(o_css_bundle_item);
-
-
-                                        // Maybe will provide the class / class instance that processes CSS or SASS/SCSS / whatever else.
-
-
-
-                                        // Could add the extracted CSS here.
-
-
-
-                                        next(minified_js_bundle_collection);
-
-                                        // But create a CSS bundle item...
-
-
-
-
-
-                                        // And also the CSS...
-
-
-
-
-
-                                        complete(minified_js_bundle_collection);
-
-
-
-                                        const unneeded_looking_into_the_js_bundle = () => {
-                                            if (minified_js_bundle_collection._arr) {
-
-                                                if (minified_js_bundle_collection._arr.length === 1) {
-
-                                                    const minified_js_bundle_item = minified_js_bundle_collection._arr[0];
-                                                    console.log('minified_js_bundle_item', minified_js_bundle_item);
-
-
-                                                    if (minified_js_bundle_item.type === 'JavaScript') {
-
-                                                        //const str_minified_js = minified_js_bundle_item.text;
-
-                                                        //const res = 
-
-
-
-
-
-                                                    } else {
-
-                                                        console.trace();
-                                                        throw 'NYI';
-
-                                                    }
-
-
-                                                    // Could even check it's js here...?
-
-
-                                                    console.trace();
-                                                    throw 'NYI';
-
-
-                                                } else {
-                                                    console.trace();
-                                                    throw 'NYI';
-                                                }
-
-                                            } else {
-
-                                                console.trace();
-                                                throw 'NYI';
-
-                                            }
-
-                                        }
-
-                                        
-
-                                    } else {
-                                        console.trace();
-                                        throw 'stop';
+                                if (is_array(minified_js) && minified_js.length === 1) {
+                                    const minified_bundle = minified_js[0];
+                                    const o_css_bundle_item = {
+                                        type: 'CSS',
+                                        extension: 'css',
+                                        text: css
                                     }
-
+                                    minified_bundle.push(o_css_bundle_item);
+                                    next(minified_bundle);
+                                    complete(minified_bundle);
                                 } else {
-
                                     console.trace();
-                                    throw 'stop';
+                                    throw 'Unexpected minified JS structure';
                                 }
 
 
@@ -240,12 +148,8 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
                             
 
 
-
-
                             
-
-
-
+                            
                             //console.trace();
                             //throw 'stop';
 
@@ -259,13 +163,11 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
 
 
 
-
                             // Maybe that will be a Ready_To_Serve_Static_Bundle
 
 
 
 
-
                             // Though it needs to provide (a bundle of?) both JS and CSS.
                             //   Better to use a standard bundle class (collection) to transfer these objects.
 
@@ -291,17 +193,6 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
 
 
 
-
-
-
-
-
-
-
-
-
-
-
                             //console.log('res_extract_css_and_js_from_js', res_extract_css_and_js_from_js);
 
                             //console.trace();
@@ -372,7 +263,6 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
 
             
 
-
         });
         return res_obs;
 
@@ -382,8 +272,10 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
 
     }
 
+
     
 
 }
 
+
 module.exports = Advanced_JS_Bundler_Using_ESBuild;

package/resources/processors/bundlers/js/esbuild/Core_JS_Non_Minifying_Bundler_Using_ESBuild.js

@@ -14,11 +14,13 @@ const Bundler_Using_ESBuild = require('./Bundler_Using_ESBuild');
 
 
 class Core_JS_Non_Minifying_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
-    constructor(spec) {
+    constructor(spec = {}) {
         super(spec);
 
         if (spec.debug !== undefined) this.debug = spec.debug;
 
+        // Store sourcemap configuration
+        this.sourcemap_config = spec.sourcemaps || {};
 
     }
 
@@ -42,11 +44,56 @@ class Core_JS_Non_Minifying_Bundler_Using_ESBuild extends Bundler_Using_ESBuild
 
 
 
+    bundle_js_string(js_string) {
+        const res_obs = obs(async(next, complete, error) => {
+            const o_build = {
+                stdin: {
+                    contents: js_string,
+                    resolveDir: process.cwd()
+                },
+                bundle: true,
+                treeShaking: true,
+                write: false,
+                // Remove outdir since we're keeping in memory
+            }
+
+            // Configure sourcemaps based on configuration
+            const sourcemapsEnabled = this.sourcemap_config.enabled !== false; // Default: true in debug, false in production
+            if (sourcemapsEnabled && (this.debug || this.sourcemap_config.includeInProduction)) {
+                o_build.sourcemap = this.sourcemap_config.format || 'inline';
+            }
+
+            let result = await esbuild.build(o_build);
+
+            if (result.outputFiles.length === 1) {
+                const output_file = result.outputFiles[0];
+                const res_bundle = new Bundle();
+                const o_bundle_item = {
+                    type: 'JavaScript',
+                    extension: 'js',
+                    text: output_file.text
+                }
+                res_bundle.push(o_bundle_item);
+                next(res_bundle);
+                complete();
+            } else {
+                console.trace();
+                throw 'NYI';
+            }
+        });
+        return res_obs;
+    }
+
     bundle(js_file_path) {
 
 
         const res_obs = obs(async(next, complete, error) => {
 
+            // Validate input
+            if (typeof js_file_path !== 'string' || js_file_path.trim() === '') {
+                throw new Error('bundle() expects a valid file path string');
+            }
+
             //console.log('Core_JS_Bundler_Using_ESBuild bundle js_file_path:', js_file_path);
 
             // Looks like we need better linking build options....
@@ -57,7 +104,7 @@ class Core_JS_Non_Minifying_Bundler_Using_ESBuild extends Bundler_Using_ESBuild
 
                 //format: 'iife',
                 bundle: true,
-                
+
                 // Possibly no minification here....
                 // Want to use non-minified or only partially minified version to separate the JS and the CSS.
 
@@ -65,11 +112,13 @@ class Core_JS_Non_Minifying_Bundler_Using_ESBuild extends Bundler_Using_ESBuild
 
                 //sourcemap: 'external',
                 write: false,
-                outdir: 'out',
+                // Remove outdir since we're keeping in memory
             }
 
-            if (this.debug) {
-                o_build.sourcemap = 'inline';
+            // Configure sourcemaps based on configuration
+            const sourcemapsEnabled = this.sourcemap_config.enabled !== false; // Default: true in debug, false in production
+            if (sourcemapsEnabled && (this.debug || this.sourcemap_config.includeInProduction)) {
+                o_build.sourcemap = this.sourcemap_config.format || 'inline';
             }
 
 

package/resources/processors/bundlers/js/esbuild/Core_JS_Single_File_Minifying_Bundler_Using_ESBuild.js

@@ -16,8 +16,11 @@ const Bundler_Using_ESBuild = require('./Bundler_Using_ESBuild');
 
 
 class Core_JS_Single_File_Minifying_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
-    constructor(spec) {
+    constructor(spec = {}) {
         super(spec);
+
+        // Store minification configuration
+        this.minify_config = spec.minify || this.get_default_minify_config();
     }
 
     // And the options....
@@ -30,10 +33,35 @@ class Core_JS_Single_File_Minifying_Bundler_Using_ESBuild extends Bundler_Using_
     // Core_JS_Non_Minifying_Bundler_Using_ESBuild for example....
 
     // Really specific class names for specific functionality to call reqlly quickly and interchange really quickly.
-    
+
     // Probably use the non-minifying bundler, and then use a minifier afterwards.
     // And here the minifier is ESBuild, as is the bundler.
 
+    get_minify_options() {
+        const level = this.minify_config.level || 'normal';
+        const enabled = this.minify_config.enabled !== false; // Default: true
+
+        if (!enabled) {
+            return false; // Disable minification
+        }
+
+        const baseOptions = {
+            conservative: { mangle: false, compress: { sequences: false } },
+            normal: { mangle: true, compress: true },
+            aggressive: { mangle: true, compress: { drop_console: true, drop_debugger: true } }
+        };
+
+        const options = { ...baseOptions[level], ...this.minify_config.options };
+        return options;
+    }
+
+    get_default_minify_config() {
+        return {
+            enabled: true,
+            level: 'normal'
+        };
+    }
+
 
 
 
@@ -43,6 +71,10 @@ class Core_JS_Single_File_Minifying_Bundler_Using_ESBuild extends Bundler_Using_
     bundle(str_js) {
 
 
+            // Validate input
+            if (typeof str_js !== 'string') {
+                throw new Error('bundle() expects a string parameter');
+            }
         const res_obs = obs(async(next, complete, error) => {
 
 
@@ -60,7 +92,7 @@ class Core_JS_Single_File_Minifying_Bundler_Using_ESBuild extends Bundler_Using_
                     //sourcefile: 'imaginary-file.js',
                     //loader: 'ts',
                 },
-                //bundle: true,
+                bundle: true,
                 
                 // Possibly no minification here....
                 // Want to use non-minified or only partially minified version to separate the JS and the CSS.
@@ -71,7 +103,7 @@ class Core_JS_Single_File_Minifying_Bundler_Using_ESBuild extends Bundler_Using_
 
                 //sourcemap: 'external',
                 write: false,
-                outdir: 'out',
+                // Remove outdir since we're keeping in memory
             })
             //console.log('result.outputFiles:\n\n');
             for (let out of result.outputFiles) {

package/serve-factory.js

@@ -144,6 +144,9 @@ module.exports = (Server) => {
         };
         if (typeof serve_options.ctrl === 'function') {
             server_spec.Ctrl = serve_options.ctrl;
+        } else if (serve_options.api && typeof serve_options.api === 'object') {
+            // API-only server: explicitly disable website setup
+            server_spec.website = false;
         }
         if (root_client_path) {
             server_spec.src_path_client_js = root_client_path;
@@ -153,7 +156,7 @@ module.exports = (Server) => {
         if (host) {
             server_instance.allowed_addresses = Array.isArray(host) ? host : [host];
         }
-    
+
         const settle = (resolver, value) => {
             if (callback) {
                 try {
@@ -164,9 +167,9 @@ module.exports = (Server) => {
             }
             return resolver(value);
         };
-    
+
         let has_started = false;
-    
+
         const extra_page_promises = additional_pages.map(([route, cfg]) => prepare_webpage_route(server_instance, route, cfg, {
             caller_dir,
             debug: debug_enabled
@@ -177,41 +180,65 @@ module.exports = (Server) => {
                 debug: debug_enabled
             }));
         }
-    
+
         if (serve_options.api && typeof serve_options.api === 'object') {
+            console.log('🔍 DEBUG: Setting up API routes');
             for (const [name, handler] of Object.entries(serve_options.api)) {
                 if (typeof handler === 'function') {
+                    console.log(`🔍 DEBUG: Publishing API route: ${name}`);
                     server_instance.publish(name, handler);
                 }
             }
+            console.log('🔍 DEBUG: API routes setup complete');
         }
-    
+
         return new Promise((resolve, reject) => {
             const start_server = () => {
                 if (has_started) return;
                 has_started = true;
+                console.log('🔍 DEBUG: Calling server_instance.start()');
                 server_instance.start(port, (err) => {
-                    if (err) return settle(reject, err);
+                    if (err) {
+                        console.log('🔍 DEBUG: server_instance.start() failed:', err);
+                        return settle(reject, err);
+                    }
+                    console.log('🔍 DEBUG: server_instance.start() succeeded');
                     const message = host ? `Serving on http://${Array.isArray(host) ? host[0] : host}:${port || 0}/` : `Serving on port ${port || 0} (all IPv4 interfaces)`;
                     console.log(message);
                     console.log('Server ready');
                     settle(resolve, server_instance);
                 });
             };
-    
+
+            console.log('🔍 DEBUG: Setting up ready event listener');
             server_instance.on('ready', () => {
+                console.log('🔍 DEBUG: Ready event fired');
                 Promise.allSettled(extra_page_promises).then(results => {
                     const rejected_entry = results.find(result => result.status === 'rejected');
                     if (rejected_entry) {
+                        console.log('🔍 DEBUG: Extra page promise rejected:', rejected_entry.reason);
                         return settle(reject, rejected_entry.reason);
                     }
+                    console.log('🔍 DEBUG: All extra page promises resolved, calling start_server()');
                     start_server();
-                }).catch(err => settle(reject, err));
+                }).catch(err => {
+                    console.log('🔍 DEBUG: Extra page promises error:', err);
+                    settle(reject, err);
+                });
             });
-    
+
+            // For API-only servers, trigger ready immediately after API setup
+            if (serve_options.api && typeof serve_options.api === 'object' && !serve_options.ctrl) {
+                console.log('🔍 DEBUG: API-only server detected, triggering ready event');
+                server_instance.raise('ready');
+            }
+
+            console.log('🔍 DEBUG: Setting up fallback timeout');
             setTimeout(() => {
                 // Fallback in case ready event never fires (should not happen, but guard just in case)
+                console.log('🔍 DEBUG: Fallback timeout triggered, has_started:', has_started);
                 if (!has_started) {
+                    console.log('🔍 DEBUG: Calling start_server() from fallback');
                     start_server();
                 }
             }, 2000).unref?.();

package/server.js

@@ -85,7 +85,7 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 		const opts_webpage = {
 			'name': this.name || 'Website'
 		};
-		
+
 		if (Ctrl) {
 
 
@@ -102,7 +102,7 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 
 			if (disk_path_client_js) opts_wp_publisher.src_path_client_js = disk_path_client_js;
 
-			
+
 
 			// HTTP_Webpage_Publisher probably needs to build the JavaScript. Possibly other assets too.
 			const wp_publisher = new HTTP_Webpage_Publisher(opts_wp_publisher);
@@ -125,7 +125,8 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 
 
 					}
-	
+
+
 					//console.trace();
 					//throw 'stop';
 
@@ -145,6 +146,12 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 
 
 		} else {
+			// Check if this is an API-only server (no website needed)
+			if (spec.website === false) {
+				// API-only server: emit ready immediately after router setup
+				this.raise('ready');
+				return;
+			}
 
 			// Ahhh the web page publisher may be used instead of the website publisher.
 			//   See about making use of relevant shared abstractions.
@@ -173,7 +180,6 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 			});
 		}
 
-
 		
 		Object.defineProperty(this, 'router', { get: () => server_router })
 	}