jsgui3-server 0.0.146 → 0.0.148

package/publishers/http-observable-publisher.js

@@ -27,6 +27,9 @@ class Observable_Publisher extends HTTP_Publisher {
         this.type = 'observable';
         this.obs = obs;
 
+        // Expose schema if provided (either in spec or on the observable itself)
+        this.schema = spec.schema || obs.schema || null;
+
         this.keep_alive_interval_ms = (spec && spec.keep_alive_interval_ms !== undefined)
             ? spec.keep_alive_interval_ms
             : default_keep_alive_interval_ms;
@@ -301,6 +304,11 @@ class Observable_Publisher extends HTTP_Publisher {
             this._write_sse(res, `event: paused\ndata: ${this._stringify_sse_data({ status: 'paused' })}\n\n`);
         }
 
+        // Send schema if available
+        if (this.schema) {
+            this._write_sse(res, `event: schema\ndata: ${this._stringify_sse_data(this.schema)}\n\n`);
+        }
+
         let removed = false;
         const remove_connection = () => {
             if (removed) return;

package/publishers/http-webpage-publisher.js

@@ -5,7 +5,7 @@ const HTTP_Publisher = require('./http-publisher');
 const Server_Static_Page_Context = require('../static-page-context');
 
 const HTTP_Webpageorsite_Publisher = require('./http-webpageorsite-publisher');
-const {obs} = require('fnl');
+const { obs } = require('fnl');
 
 const Static_Routes_Responses_Webpage_Bundle_Preparer = require('./helpers/preparers/static/bundle/Static_Routes_Responses_Webpage_Bundle_Preparer');
 
@@ -71,10 +71,20 @@ class HTTP_Webpage_Publisher extends HTTP_Webpageorsite_Publisher {
         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);
-
+        (async () => {
+            try {
+                const res_get_ready = await this.get_ready();
+                this.raise('ready', res_get_ready);
+            } catch (e) {
+                console.error('HTTP_Webpage_Publisher error: Failed to get ready (bundling or preparation failed).');
+                console.error(e);
+                // Can't just ignore it if it means the server won't handle requests correctly, 
+                // but at least it won't crash the whole process.
+                // We might want to emit an error event.
+                this.raise('error', e);
+                // Also raise 'ready' so the pool/server can continue starting up other things
+                this.raise('ready', {});
+            }
         })();
 
     }
@@ -82,7 +92,7 @@ class HTTP_Webpage_Publisher extends HTTP_Webpageorsite_Publisher {
     async get_ready() {
         //await super.get_ready();
 
-        const {static_routes_responses_webpage_bundle_preparer} = this;
+        const { static_routes_responses_webpage_bundle_preparer } = this;
 
 
         // Its a bundle....
@@ -91,7 +101,7 @@ class HTTP_Webpage_Publisher extends HTTP_Webpageorsite_Publisher {
 
         const render_webpage = async () => {
 
-            const {webpage} = this;
+            const { webpage } = this;
             const Ctrl = webpage.content;
 
             // In business activating it with the page context.
@@ -112,25 +122,48 @@ class HTTP_Webpage_Publisher extends HTTP_Webpageorsite_Publisher {
                 ctrl_css_link.dom.attributes.rel = 'stylesheet';
                 ctrl_css_link.dom.attributes.href = '/css/css.css';
                 ctrl.head.add(ctrl_css_link);
-                
+
                 const ctrl_js_script_link = new jsgui_client.controls.script({
                     context: static_page_context
                 });
 
                 ctrl_js_script_link.dom.attributes.src = '/js/js.js';
                 ctrl.body.add(ctrl_js_script_link);
-                
+
                 ctrl.active();
                 const html = await ctrl.all_html_render();
                 return html;
             } else {
+                // Control is not a document - wrap it in an Active_HTML_Document
+                const Active_HTML_Document = require('../controls/Active_HTML_Document');
+
+                const doc = new Active_HTML_Document({
+                    context: static_page_context
+                });
+
+                // Add CSS link to head
+                const ctrl_css_link = new jsgui_client.controls.link({
+                    context: static_page_context
+                });
+                ctrl_css_link.dom.attributes.rel = 'stylesheet';
+                ctrl_css_link.dom.attributes.href = '/css/css.css';
+                doc.head.add(ctrl_css_link);
 
-                // C reate doc and put control inside that?
+                // Add the control to body
+                doc.body.add(ctrl);
 
-                console.trace();
-                throw 'NYI';
+                // Add JS script link to body
+                const ctrl_js_script_link = new jsgui_client.controls.script({
+                    context: static_page_context
+                });
+                ctrl_js_script_link.dom.attributes.src = '/js/js.js';
+                doc.body.add(ctrl_js_script_link);
+
+                doc.active();
+                const html = await doc.all_html_render();
+                return html;
             }
-            
+
         }
 
         // Maybe a Webpage_Rendering_Preparer could do this even?
@@ -157,7 +190,7 @@ class HTTP_Webpage_Publisher extends HTTP_Webpageorsite_Publisher {
         // Then publish it to the router...?
         //   server.serve_prepared_static_routes_bundle ?????
         return webpage_or_website_res_get_ready;
-        
+
     }
 
 
@@ -165,17 +198,17 @@ class HTTP_Webpage_Publisher extends HTTP_Webpageorsite_Publisher {
         console.log('HTTP_Webpage_Publisher handle_http');
         console.log('req.url', req.url);
 
-        const {webpage} = this;
-        
+        const { webpage } = this;
+
         const Ctrl = webpage.content;
         const ctrl = new Ctrl();
-        
+
         res.writeHead(200, {
             'Content-Type': 'text/html'
-          });
+        });
 
         res.end(ctrl.all_html_render());
-        
+
     }
 }
 

package/publishers/http-webpageorsite-publisher.js

@@ -1,9 +1,9 @@
 
 
 
-const {each, Router, tof} = require('jsgui3-html');
+const { each, Router, tof } = require('jsgui3-html');
 const HTTP_Publisher = require('./http-publisher');
-const {obs} = require('fnl');
+const { obs } = require('fnl');
 
 // The Webpage bundler should be able to come up with the compiled JS and CSS, maybe even a favicon.
 
@@ -97,9 +97,9 @@ class HTTP_Webpageorsite_Publisher extends HTTP_Publisher {
     constructor(spec) {
         super(spec);
 
-        if (spec.debug !== undefined) this.debug = spec.debug;
-        this.style_config = spec.style || {};
-        this.bundler_config = spec.bundler || {};
+        if (spec.debug !== undefined) this.debug = spec.debug;
+        this.style_config = spec.style || {};
+        this.bundler_config = spec.bundler || {};
 
         // But then some properties to do with the js client(s?) file path.
 
@@ -109,37 +109,37 @@ class HTTP_Webpageorsite_Publisher extends HTTP_Publisher {
         // js_client_file_path ??? client_js_file_path???
 
         let src_path_client_js;
-		if (spec.disk_path_client_js) {
-			src_path_client_js = spec.disk_path_client_js;
-		} else if (spec.src_path_client_js) {
-			src_path_client_js = spec.src_path_client_js;
-		} else if (spec.source_path_client_js) {
-			src_path_client_js = spec.source_path_client_js;
-		};
+        if (spec.disk_path_client_js) {
+            src_path_client_js = spec.disk_path_client_js;
+        } else if (spec.src_path_client_js) {
+            src_path_client_js = spec.src_path_client_js;
+        } else if (spec.source_path_client_js) {
+            src_path_client_js = spec.source_path_client_js;
+        };
 
-		// or src_path_client_js as well...
+        // or src_path_client_js as well...
 
-		Object.defineProperty(this, 'disk_path_client_js', {get: () => src_path_client_js, set: (value) => src_path_client_js = value});
-		Object.defineProperty(this, 'src_path_client_js', {get: () => src_path_client_js, set: (value) => src_path_client_js = value});
-		Object.defineProperty(this, 'source_path_client_js', {get: () => src_path_client_js, set: (value) => src_path_client_js = value});
+        Object.defineProperty(this, 'disk_path_client_js', { get: () => src_path_client_js, set: (value) => src_path_client_js = value });
+        Object.defineProperty(this, 'src_path_client_js', { get: () => src_path_client_js, set: (value) => src_path_client_js = value });
+        Object.defineProperty(this, 'source_path_client_js', { get: () => src_path_client_js, set: (value) => src_path_client_js = value });
 
 
         // But then need to have some things that get it ready on this level...
 
         // Maybe need a get_ready (async or obs) function....
 
-        this.js_bundler = new JS_Bundler({
-            'debug': this.debug || false,
-            'style': this.style_config,
-            'bundler': this.bundler_config
-        });
+        this.js_bundler = new JS_Bundler({
+            'debug': this.debug || false,
+            'style': this.style_config,
+            'bundler': this.bundler_config
+        });
 
 
     }
 
     async get_ready() {
 
-        const {js_bundler} = this;
+        const { js_bundler } = this;
         //await super.get_ready(); // Does not have one
 
         // Then bundle (extract (process) everything in and referenced by the JS file (s) into a bundle object)
@@ -158,20 +158,51 @@ class HTTP_Webpageorsite_Publisher extends HTTP_Publisher {
         // Single js client for whole website??? Could work, not so sure.
         //   Appropriate defalt setting (using v explicit classes) will help it to work.
 
+        const { src_path_client_js } = this;
+
+        console.log('[HTTP_Webpageorsite_Publisher] get_ready called, src_path_client_js:', src_path_client_js);
+
+        // Defensive programming: Handle missing client JS path
+        if (!src_path_client_js) {
+            console.warn('[HTTP_Webpageorsite_Publisher] No src_path_client_js provided. Returning empty bundle.');
+            const bundle = new Bundle();
+            // Could add empty CSS/JS placeholders if needed to prevent errors downstream
+            bundle.push({
+                type: 'CSS',
+                extension: 'css',
+                text: '/* No client CSS - Server Start Mode */'
+            });
+            bundle.push({
+                type: 'JavaScript',
+                extension: 'js',
+                text: '/* No client JS - Server Start Mode */'
+            });
+            return bundle;
+        }
 
-
-        const {src_path_client_js} = this;
-
-        //console.log('src_path_client_js', src_path_client_js);
-
+        // Skip bundling if no client.js path is provided
+        // This allows Server.serve() to work with SSR-only controls
+        if (!src_path_client_js) {
+            console.log('[HTTP_Webpageorsite_Publisher] No src_path_client_js provided - skipping JS bundling');
+            // Return an empty bundle with minimal CSS and JS
+            const empty_bundle = new Bundle();
+            empty_bundle.push({
+                type: 'CSS',
+                extension: 'css',
+                text: '/* No client CSS */'
+            });
+            empty_bundle.push({
+                type: 'JavaScript',
+                extension: 'js',
+                text: '/* No client JS - SSR only */'
+            });
+            return empty_bundle;
+        }
 
         // The js_bundler may need to operate in 'debug' mode.
-
         const js_bundler_res = await js_bundler.bundle(src_path_client_js);
         // Should also get the CSS from it....
 
-
-
         //console.log('js_bundler_res', js_bundler_res);
 
         // Res of length 2 - with a css item and a js item.
@@ -182,7 +213,7 @@ class HTTP_Webpageorsite_Publisher extends HTTP_Publisher {
 
             const css_item = bundle._arr.find((item) => item.type === 'CSS');
             const js_item = bundle._arr.find((item) => item.type === 'JavaScript');
-            
+
             if (css_item && js_item) {
 
                 return bundle;
@@ -261,7 +292,7 @@ class HTTP_Webpageorsite_Publisher extends HTTP_Publisher {
                 // This part here is just getting ready to publish.
 
 
-            
+
 
 
 
@@ -312,7 +343,7 @@ class HTTP_Webpageorsite_Publisher extends HTTP_Publisher {
             console.trace();
             throw 'stop';
 
-            
+
 
         } else {
             console.log('js_bundler_res', js_bundler_res);
@@ -330,7 +361,7 @@ class HTTP_Webpageorsite_Publisher extends HTTP_Publisher {
 
 
 
-        
+
 
 
 

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;