jsgui3-server 0.0.146 → 0.0.147

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,33 @@ 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('src_path_client_js', src_path_client_js);
-
+        const { src_path_client_js } = this;
+
+        console.log('[HTTP_Webpageorsite_Publisher] get_ready called, 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 +195,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 +274,7 @@ class HTTP_Webpageorsite_Publisher extends HTTP_Publisher {
                 // This part here is just getting ready to publish.
 
 
-            
+
 
 
 
@@ -312,7 +325,7 @@ class HTTP_Webpageorsite_Publisher extends HTTP_Publisher {
             console.trace();
             throw 'stop';
 
-            
+
 
         } else {
             console.log('js_bundler_res', js_bundler_res);
@@ -330,7 +343,7 @@ class HTTP_Webpageorsite_Publisher extends HTTP_Publisher {
 
 
 
-        
+
 
 
 

package/server.js

@@ -1,8 +1,8 @@
 const jsgui = require('jsgui3-html'),
 	http = require('http'),
 	https = require('https'),
-    {prop, read_only} = require('obext'),
-    fs = require('fs'),
+	{ prop, read_only } = require('obext'),
+	fs = require('fs'),
 	Resource = jsgui.Resource,
 	Server_Resource_Pool = require('./resources/server-resource-pool'),
 	Router = jsgui.Router,
@@ -15,7 +15,7 @@ const jsgui = require('jsgui3-html'),
 		tof
 	} = jsgui;
 
-	
+
 const lib_path = require('path');
 const Web_Admin_Page_Control = require('./controls/page/admin');
 const Web_Admin_Panel_Control = require('./controls/panel/admin');
@@ -24,6 +24,7 @@ const HTTP_Website_Publisher = require('./publishers/http-website-publisher');
 const Webpage = require('./website/webpage');
 const HTTP_Webpage_Publisher = require('./publishers/http-webpage-publisher');
 const HTTP_Function_Publisher = require('./publishers/http-function-publisher');
+const HTTP_Observable_Publisher = require('./publishers/http-observable-publisher');
 
 const Static_Route_HTTP_Responder = require('./http/responders/static/Static_Route_HTTP_Responder');
 
@@ -45,23 +46,23 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 		};
 
 
-		if (spec.debug !== undefined) {
-			this.debug = spec.debug;
-		}
-
-		const style_config = spec.style;
-		const bundler_config = spec.bundler;
+		if (spec.debug !== undefined) {
+			this.debug = spec.debug;
+		}
+
+		const style_config = spec.style;
+		const bundler_config = spec.bundler;
 
 		// or src_path_client_js as well...
 
-		Object.defineProperty(this, 'disk_path_client_js', {get: () => disk_path_client_js, set: (value) => disk_path_client_js = value});
-		Object.defineProperty(this, 'src_path_client_js', {get: () => disk_path_client_js, set: (value) => disk_path_client_js = value});
-		Object.defineProperty(this, 'source_path_client_js', {get: () => disk_path_client_js, set: (value) => disk_path_client_js = value});
+		Object.defineProperty(this, 'disk_path_client_js', { get: () => disk_path_client_js, set: (value) => disk_path_client_js = value });
+		Object.defineProperty(this, 'src_path_client_js', { get: () => disk_path_client_js, set: (value) => disk_path_client_js = value });
+		Object.defineProperty(this, 'source_path_client_js', { get: () => disk_path_client_js, set: (value) => disk_path_client_js = value });
 
 		let Ctrl = spec.Ctrl || undefined
-		Object.defineProperty(this, 'Ctrl', {get: () => Ctrl, set: value => Ctrl = value})
+		Object.defineProperty(this, 'Ctrl', { get: () => Ctrl, set: value => Ctrl = value })
 		let name = spec.name || undefined;
-		Object.defineProperty(this, 'name', {get: () => name, set: value => name = value})
+		Object.defineProperty(this, 'name', { get: () => name, set: value => name = value })
 		this.__type_name = __type_name || 'server';
 		const resource_pool = this.resource_pool = new Server_Resource_Pool({
 			'access': {
@@ -92,20 +93,20 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 		if (Ctrl) {
 
 
-			const wp_app = new Webpage({content: Ctrl});
+			const wp_app = new Webpage({ content: Ctrl });
+
+			const opts_wp_publisher = {
+				'webpage': wp_app
+
+			};
+			if (bundler_config !== undefined) opts_wp_publisher.bundler = bundler_config;
 
-			const opts_wp_publisher = {
-				'webpage': wp_app
-
-			};
-			if (bundler_config !== undefined) opts_wp_publisher.bundler = bundler_config;
-
-			if (this.debug) {
-				opts_wp_publisher.debug = this.debug;
-			}
+			if (this.debug) {
+				opts_wp_publisher.debug = this.debug;
+			}
 
-			if (disk_path_client_js) opts_wp_publisher.src_path_client_js = disk_path_client_js;
-			if (style_config !== undefined) opts_wp_publisher.style = style_config;
+			if (disk_path_client_js) opts_wp_publisher.src_path_client_js = disk_path_client_js;
+			if (style_config !== undefined) opts_wp_publisher.style = style_config;
 
 
 
@@ -122,7 +123,7 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 
 					for (const bundle_item of wp_ready_res._arr) {
 						//console.log('Object.keys(bundle_item)', Object.keys(bundle_item));
-						const {type, extension, text, route, response_buffers, response_headers} = bundle_item;
+						const { type, extension, text, route, response_buffers, response_headers } = bundle_item;
 						const bundle_item_http_responder = new Static_Route_HTTP_Responder(bundle_item);
 
 
@@ -165,18 +166,18 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 			const ws_app = this.app = this.website = new Website(opts_website);
 			// Be able to treat Webpage as an app?
 
-			const opts_ws_publisher = {
-				'website': ws_app
-			};
-			if (disk_path_client_js) {
-				opts_ws_publisher.disk_path_client_js = disk_path_client_js;
-			}
-			if (bundler_config !== undefined) {
-				opts_ws_publisher.bundler = bundler_config;
-			}
-			if (style_config !== undefined) {
-				opts_ws_publisher.style = style_config;
-			}
+			const opts_ws_publisher = {
+				'website': ws_app
+			};
+			if (disk_path_client_js) {
+				opts_ws_publisher.disk_path_client_js = disk_path_client_js;
+			}
+			if (bundler_config !== undefined) {
+				opts_ws_publisher.bundler = bundler_config;
+			}
+			if (style_config !== undefined) {
+				opts_ws_publisher.style = style_config;
+			}
 			const ws_publisher = new HTTP_Website_Publisher(opts_ws_publisher);
 			this._ws_publisher = ws_publisher;
 			ws_publisher.on('ready', () => {
@@ -191,7 +192,7 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 			});
 		}
 
-		
+
 		Object.defineProperty(this, 'router', { get: () => server_router })
 	}
 
@@ -200,7 +201,7 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 		//   Possibly ensure it exists.
 		//const fn_publisher = this.function_publisher;
 		//fn_publisher.add(name, fn);
-		const fpub = new HTTP_Function_Publisher({name, fn});
+		const fpub = new HTTP_Function_Publisher({ name, fn });
 
 		this.function_publishers = this.function_publishers || [];
 		this.function_publishers.push(fpub);
@@ -208,11 +209,24 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 		this.server_router.set_route('/api/' + name, fpub, fpub.handle_http);
 	}
 
+	publish_observable(route, obs, options = {}) {
+		const publisher = new HTTP_Observable_Publisher({
+			obs,
+			...options
+		});
+		this.server_router.set_route(route, publisher, publisher.handle_http);
+		return publisher;
+	}
+
+	publishObservable(route, obs, options) {
+		return this.publish_observable(route, obs, options);
+	}
+
 
 	get resource_names() {
 		return this.resource_pool.resource_names;
 	}
-	'start' (port, callback, fnProcessRequest) {
+	'start'(port, callback, fnProcessRequest) {
 		if (tof(port) !== 'number') {
 			console.log('Invalid port:', port);
 			console.trace();
@@ -233,7 +247,7 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 					if (err) {
 						callback(err);
 					} else {
-						 // NEW: Filter addresses by allowed_addresses if specified.
+						// NEW: Filter addresses by allowed_addresses if specified.
 						let arr_ipv4_addresses = [];
 						each(net, (arr_addresses, name) => {
 							each(arr_addresses, (obj_address) => {
@@ -245,33 +259,33 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 						if (this.allowed_addresses && this.allowed_addresses.length) {
 							arr_ipv4_addresses = arr_ipv4_addresses.filter(a => this.allowed_addresses.indexOf(a) > -1);
 						}
-						arr_ipv4_addresses = [...new Set(arr_ipv4_addresses)];
-						console.log('IPv4 addresses to bind:', arr_ipv4_addresses);
-						let num_to_start = arr_ipv4_addresses.length;
-						let started_count = 0;
-						let last_error = null;
-						let ready_raised = false;
-						if (num_to_start === 0) {
-							callback('No allowed network interfaces found.');
-							return;
-						}
-						const finalize_start = (err) => {
-							if (num_to_start !== 0) return;
-							if (started_count > 0) {
-								if (!ready_raised) {
-									console.log('Server ready');
-									this.raise('ready');
-									ready_raised = true;
-								}
-								if (callback) callback(null, true);
-								return;
-							}
-							const final_error = err || last_error || new Error('No servers started.');
-							if (callback) callback(final_error);
-						};
-						const respond_not_found = (res) => {
-							if (!res.headersSent) {
-								const body = 'Not Found';
+						arr_ipv4_addresses = [...new Set(arr_ipv4_addresses)];
+						console.log('IPv4 addresses to bind:', arr_ipv4_addresses);
+						let num_to_start = arr_ipv4_addresses.length;
+						let started_count = 0;
+						let last_error = null;
+						let ready_raised = false;
+						if (num_to_start === 0) {
+							callback('No allowed network interfaces found.');
+							return;
+						}
+						const finalize_start = (err) => {
+							if (num_to_start !== 0) return;
+							if (started_count > 0) {
+								if (!ready_raised) {
+									console.log('Server ready');
+									this.raise('ready');
+									ready_raised = true;
+								}
+								if (callback) callback(null, true);
+								return;
+							}
+							const final_error = err || last_error || new Error('No servers started.');
+							if (callback) callback(final_error);
+						};
+						const respond_not_found = (res) => {
+							if (!res.headersSent) {
+								const body = 'Not Found';
 								res.statusCode = 404;
 								res.setHeader('Content-Type', 'text/plain; charset=utf-8');
 								res.setHeader('Content-Length', Buffer.byteLength(body));
@@ -326,70 +340,70 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 						if (this.https_options) {
 							each(arr_ipv4_addresses, (ipv4_address) => {
 								try {
-									var https_server = https.createServer(this.https_options, function(req, res) {
+									var https_server = https.createServer(this.https_options, function (req, res) {
 										process_request(req, res);
 									});
 									this.http_servers.push(https_server);
-									https_server.on('error', (err) => {
-										last_error = err;
-										if (err.code === 'EACCES') {
-											console.error('Permission denied:', err.message);
-										} else if (err.code === 'EADDRINUSE') {
-											console.error(`Address ${ipv4_address}:${port} already in use; skipping.`);
-										} else {
-											console.error('https_server error:', err);
-										}
-										num_to_start--;
-										finalize_start(err);
-									});
-									https_server.timeout = 10800000;
-									https_server.listen(port, ipv4_address, () => {
-										console.log('* Server running at https://' + ipv4_address + ':' + port + '/');
-										started_count++;
-										num_to_start--;
-										finalize_start(null);
-									});
-								} catch (err) {
-									console.log('https_server err', err);
-									num_to_start--;
-									finalize_start(err);
-								}
-							});
-						} else {
-						each(arr_ipv4_addresses, (ipv4_address) => {
-								try {
-								var http_server = http.createServer(function(req, res) {
-									process_request(req, res);
-								});
-									this.http_servers.push(http_server);
-									http_server.on('error', (err) => {
-										last_error = err;
-										if (err.code === 'EACCES') {
-											console.error('Permission denied:', err.message);
-										} else if (err.code === 'EADDRINUSE') {
-											console.error(`Address ${ipv4_address}:${port} already in use; skipping.`);
-										} else {
-											console.error('http_server error:', err);
-										}
-										num_to_start--;
-										finalize_start(err);
-									});
-									http_server.timeout = 10800000;
-									http_server.listen(port, ipv4_address, () => {
-										console.log('* Server running at http://' + ipv4_address + ':' + port + '/');
-										started_count++;
-										num_to_start--;
-										finalize_start(null);
-									});
-								} catch (err) {
-									console.log('http_server err', err);
-									num_to_start--;
-									finalize_start(err);
-								}
-							});
-						}
-					}
-				});
+									https_server.on('error', (err) => {
+										last_error = err;
+										if (err.code === 'EACCES') {
+											console.error('Permission denied:', err.message);
+										} else if (err.code === 'EADDRINUSE') {
+											console.error(`Address ${ipv4_address}:${port} already in use; skipping.`);
+										} else {
+											console.error('https_server error:', err);
+										}
+										num_to_start--;
+										finalize_start(err);
+									});
+									https_server.timeout = 10800000;
+									https_server.listen(port, ipv4_address, () => {
+										console.log('* Server running at https://' + ipv4_address + ':' + port + '/');
+										started_count++;
+										num_to_start--;
+										finalize_start(null);
+									});
+								} catch (err) {
+									console.log('https_server err', err);
+									num_to_start--;
+									finalize_start(err);
+								}
+							});
+						} else {
+							each(arr_ipv4_addresses, (ipv4_address) => {
+								try {
+									var http_server = http.createServer(function (req, res) {
+										process_request(req, res);
+									});
+									this.http_servers.push(http_server);
+									http_server.on('error', (err) => {
+										last_error = err;
+										if (err.code === 'EACCES') {
+											console.error('Permission denied:', err.message);
+										} else if (err.code === 'EADDRINUSE') {
+											console.error(`Address ${ipv4_address}:${port} already in use; skipping.`);
+										} else {
+											console.error('http_server error:', err);
+										}
+										num_to_start--;
+										finalize_start(err);
+									});
+									http_server.timeout = 10800000;
+									http_server.listen(port, ipv4_address, () => {
+										console.log('* Server running at http://' + ipv4_address + ':' + port + '/');
+										started_count++;
+										num_to_start--;
+										finalize_start(null);
+									});
+								} catch (err) {
+									console.log('http_server err', err);
+									num_to_start--;
+									finalize_start(err);
+								}
+							});
+						}
+					}
+				});
 			}
 		});
 	}
@@ -441,64 +455,64 @@ if (require.main === module) {
 	}
 	current();
 
-} else {}
+} else { }
 
 // 
 
 const summary = {
-    "classes": [
-        "JSGUI_Single_Process_Server",
-        "Server_Resource_Pool",
-        "Router",
-        "Website_Resource",
-        "Server_Page_Context",
-        "Web_Admin_Page_Control",
-        "Web_Admin_Panel_Control",
-        "Website",
-        "HTTP_Website_Publisher",
-        "Webpage"
-    ],
-    "methods": {
-        "JSGUI_Single_Process_Server": [
-            "constructor",
-            "start",
-            "stop"
-        ],
-        "Server_Resource_Pool": [
-            "constructor"
-        ],
-        "Router": [
-            "constructor",
-            "set_route",
-            "unset_route"
-        ],
-        "Website_Resource": [
-            "constructor",
-            "process"
-        ],
-        "Server_Page_Context": [
-            "constructor",
-            "respond_string"
-        ],
-        "Web_Admin_Page_Control": [
-            "constructor"
-        ],
-        "Web_Admin_Panel_Control": [
-            "constructor"
-        ],
-        "Website": [
-            "constructor",
-            "add_page",
-            "add_page_resource",
-            "add_page_resource_from_webpage"
-        ],
-        "HTTP_Website_Publisher": [
-            "constructor"
-        ],
-        "Webpage": [
-            "constructor"
-        ]
-    }
+	"classes": [
+		"JSGUI_Single_Process_Server",
+		"Server_Resource_Pool",
+		"Router",
+		"Website_Resource",
+		"Server_Page_Context",
+		"Web_Admin_Page_Control",
+		"Web_Admin_Panel_Control",
+		"Website",
+		"HTTP_Website_Publisher",
+		"Webpage"
+	],
+	"methods": {
+		"JSGUI_Single_Process_Server": [
+			"constructor",
+			"start",
+			"stop"
+		],
+		"Server_Resource_Pool": [
+			"constructor"
+		],
+		"Router": [
+			"constructor",
+			"set_route",
+			"unset_route"
+		],
+		"Website_Resource": [
+			"constructor",
+			"process"
+		],
+		"Server_Page_Context": [
+			"constructor",
+			"respond_string"
+		],
+		"Web_Admin_Page_Control": [
+			"constructor"
+		],
+		"Web_Admin_Panel_Control": [
+			"constructor"
+		],
+		"Website": [
+			"constructor",
+			"add_page",
+			"add_page_resource",
+			"add_page_resource_from_webpage"
+		],
+		"HTTP_Website_Publisher": [
+			"constructor"
+		],
+		"Webpage": [
+			"constructor"
+		]
+	}
 }
 
 JSGUI_Single_Process_Server.summary = summary;