jsgui3-server 0.0.147 → 0.0.148

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

@@ -5,17 +5,17 @@ const Core_JS_Non_Minifying_Bundler_Using_ESBuild = require('./Core_JS_Non_Minif
 const Bundler_Using_ESBuild = require('./Bundler_Using_ESBuild');
 const {is_array} = require('lang-tools');
 
-const Core_JS_Single_File_Minifying_Bundler_Using_ESBuild = require('./Core_JS_Single_File_Minifying_Bundler_Using_ESBuild');
+const Core_JS_Single_File_Minifying_Bundler_Using_ESBuild = require('./Core_JS_Single_File_Minifying_Bundler_Using_ESBuild');
 
 //const CSS_Extractor = require('./_Old_CSS_Extractor');
 
 // Use a different CSS extractor.
 
 
-const Bundle = require('../../bundle');
-
-const CSS_And_JS_From_JS_String_Extractor = require('../../../extractors/js/css_and_js/CSS_And_JS_From_JS_String_Extractor');
-const {compile_styles} = require('../../style-bundler');
+const Bundle = require('../../bundle');
+
+const CSS_And_JS_From_JS_String_Extractor = require('../../../extractors/js/css_and_js/CSS_And_JS_From_JS_String_Extractor');
+const {compile_styles} = require('../../style-bundler');
 
 
 class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
@@ -24,10 +24,10 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
 
         if (spec.debug !== undefined) this.debug = spec.debug;
 
-        // Store bundler configuration
-        this.bundler_config = spec.bundler || {};
-        const style_config = spec.style || this.bundler_config.style || {};
-        this.style_config = Object.assign({debug: this.debug === true}, style_config);
+        // Store bundler configuration
+        this.bundler_config = spec.bundler || {};
+        const style_config = spec.style || this.bundler_config.style || {};
+        this.style_config = Object.assign({debug: this.debug === true}, style_config);
 
         //this.css_extractor = new CSS_Extractor();
 
@@ -49,7 +49,7 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
     }
 
     bundle(js_file_path) {
-        const {non_minifying_bundler, css_and_js_from_js_string_extractor, minifying_js_single_file_bundler, style_config} = this;
+        const {non_minifying_bundler, css_and_js_from_js_string_extractor, minifying_js_single_file_bundler, style_config} = this;
 
         // Validate input
         if (typeof js_file_path !== 'string' || js_file_path.trim() === '') {
@@ -66,6 +66,7 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
 
         const res_obs = obs(async(next, complete, error) => {
 
+            try {
             //console.log('Advanced_JS_Bundler_Using_ESBuild bundle js_file_path:', js_file_path);
 
             const res_nmb = await non_minifying_bundler.bundle(js_file_path);
@@ -88,17 +89,17 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
                             const {text} = bundle_item;
                             // Then use the css and js from js extractor.
 
-                            const res_extract_styles_and_js = await css_and_js_from_js_string_extractor.extract(text);
-                            const {
-                                css = '',
-                                scss = '',
-                                sass = '',
-                                style_segments = [],
-                                js = text
-                            } = res_extract_styles_and_js || {};
-
-                            const style_bundle = compile_styles({css, scss, sass, style_segments}, style_config);
-                            const compiled_css = style_bundle.css || '';
+                            const res_extract_styles_and_js = await css_and_js_from_js_string_extractor.extract(text);
+                            const {
+                                css = '',
+                                scss = '',
+                                sass = '',
+                                style_segments = [],
+                                js = text
+                            } = res_extract_styles_and_js || {};
+
+                            const style_bundle = compile_styles({css, scss, sass, style_segments}, style_config);
+                            const compiled_css = style_bundle.css || '';
 
                             if (this.debug) {
                                 // Generate source maps for CSS-free JS
@@ -112,11 +113,11 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
                                     text: css_free_bundle_item.text
                                 }
                                 res_bundle.push(o_js_bundle_item);
-                                const o_css_bundle_item = {
-                                    type: 'CSS',
-                                    extension: 'css',
-                                    text: compiled_css
-                                }
+                                const o_css_bundle_item = {
+                                    type: 'CSS',
+                                    extension: 'css',
+                                    text: compiled_css
+                                }
                                 res_bundle.push(o_css_bundle_item);
                                 next(res_bundle);
                                 complete(res_bundle);
@@ -140,11 +141,11 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
 
                                 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: compiled_css
-                                    }
+                                    const o_css_bundle_item = {
+                                        type: 'CSS',
+                                        extension: 'css',
+                                        text: compiled_css
+                                    }
                                     minified_bundle.push(o_css_bundle_item);
                                     next(minified_bundle);
                                     complete(minified_bundle);
@@ -241,6 +242,27 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
             // Need to use a non minifying bundler (first).
 
 
+            } catch (bundleError) {
+                // Defensive programming: Log error but don't crash the server
+                console.error('[Advanced_JS_Bundler_Using_ESBuild] Bundling failed:', bundleError.message || bundleError);
+                console.error('[Advanced_JS_Bundler_Using_ESBuild] Returning empty bundle to allow server startup.');
+                
+                // Return an empty bundle so the server can continue
+                const fallback_bundle = new Bundle();
+                fallback_bundle.push({
+                    type: 'JavaScript',
+                    extension: 'js',
+                    text: '/* Bundling failed - see server logs */'
+                });
+                fallback_bundle.push({
+                    type: 'CSS',
+                    extension: 'css',
+                    text: '/* Bundling failed - see server logs */'
+                });
+                next(fallback_bundle);
+                complete(fallback_bundle);
+            }
+
             const _old_code = async() => {
 
                 const css_extractor_res = await css_extractor.separate_css_and_js(js_file_path)
@@ -290,4 +312,4 @@ class Advanced_JS_Bundler_Using_ESBuild extends Bundler_Using_ESBuild {
 }
 
 
-module.exports = Advanced_JS_Bundler_Using_ESBuild;
+module.exports = Advanced_JS_Bundler_Using_ESBuild;

package/server.js

@@ -75,6 +75,63 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 		});
 		resource_pool.add(server_router);
 		this.https_options = spec.https_options || undefined;
+
+		// Admin Module Setup
+		// Admin Module Setup
+		const Admin_Module = require('./admin-ui/server');
+		this.admin = new Admin_Module(this);
+		this.admin.attach_to_router(server_router);
+
+		// Register Admin Page Route
+		let Admin_Page_Control;
+		try {
+			console.log('DEBUG: Attempting to load Admin_Page_Control...');
+			Admin_Page_Control = require('./admin-ui/client').controls.Admin_Page;
+			console.log('DEBUG: Admin_Page_Control type:', typeof Admin_Page_Control);
+		} catch (e) {
+			console.warn('DEBUG: Failed to load Admin_Page_Control', e);
+		}
+
+		if (Admin_Page_Control) {
+			console.log('DEBUG: Creating Admin Webpage...');
+			const admin_app = new Webpage({
+				content: Admin_Page_Control,
+				title: 'jsgui3 Admin'
+			});
+
+			const HTTP_Webpage_Publisher = require('./publishers/http-webpage-publisher');
+			console.log('DEBUG: Creating Admin Publisher...');
+			const admin_publisher = new HTTP_Webpage_Publisher({
+				name: 'Admin_Publisher',
+				webpage: admin_app,
+				//src_path_client_js: require('path').join(__dirname, 'admin-ui/client.js')
+			});
+			// Fix for Resource_Pool.add(undefined) error
+			admin_publisher.name = 'Admin_Publisher';
+
+			admin_publisher.on('ready', (res_ready) => {
+				if (res_ready._arr) {
+					for (const bundle_item of res_ready._arr) {
+						const { route } = bundle_item;
+						const Static_Route_HTTP_Responder = require('./http/responders/static/Static_Route_HTTP_Responder');
+						const responder = new Static_Route_HTTP_Responder(bundle_item);
+						server_router.set_route(route, responder, responder.handle_http);
+					}
+				}
+			});
+
+			server_router.set_route('/admin', admin_publisher, admin_publisher.handle_http);
+			console.log('DEBUG: Adding admin_publisher to pool:', !!admin_publisher);
+			if (admin_publisher) {
+				resource_pool.add(admin_publisher);
+			} else {
+				console.error('DEBUG: admin_publisher is undefined!');
+			}
+		} else {
+			console.warn('Skipping /admin route registration due to missing control.');
+		}
+
+
 		if (spec.routes) {
 			throw 'NYI - will use Website class rather than Website_Resource here'
 			each(spec.routes, (app_spec, route) => {
@@ -145,8 +202,12 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 					'name': 'Website_Resource - Single Webpage',
 					'webpage': wp_app
 				});
-				resource_pool.add(ws_resource);
-
+				console.log('DEBUG: Adding ws_resource to pool:', !!ws_resource);
+				if (ws_resource) {
+					resource_pool.add(ws_resource);
+				} else {
+					console.error('DEBUG: ws_resource is undefined!');
+				}
 				this.raise('ready');
 			});
 
@@ -227,6 +288,14 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 		return this.resource_pool.resource_names;
 	}
 	'start'(port, callback, fnProcessRequest) {
+		// Guard against double-start which causes EADDRINUSE
+		if (this._started) {
+			console.warn('Server.start() called but server already started. Ignoring duplicate call.');
+			if (callback) callback(null, true);
+			return;
+		}
+		this._started = true;
+
 		if (tof(port) !== 'number') {
 			console.log('Invalid port:', port);
 			console.trace();
@@ -274,7 +343,7 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 							if (started_count > 0) {
 								if (!ready_raised) {
 									console.log('Server ready');
-									this.raise('ready');
+									this.raise('listening'); // Changed from 'ready' to avoid double-fire
 									ready_raised = true;
 								}
 								if (callback) callback(null, true);