jsgui3-server 0.0.147 → 0.0.149

package/server.js

@@ -25,6 +25,9 @@ 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 HTTP_SSE_Publisher = require('./publishers/http-sse-publisher');
+const Process_Resource = require('./resources/process-resource');
+const Remote_Process_Resource = require('./resources/remote-process-resource');
 
 const Static_Route_HTTP_Responder = require('./http/responders/static/Static_Route_HTTP_Responder');
 
@@ -75,6 +78,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 +205,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');
 			});
 
@@ -206,7 +270,10 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 		this.function_publishers = this.function_publishers || [];
 		this.function_publishers.push(fpub);
 
-		this.server_router.set_route('/api/' + name, fpub, fpub.handle_http);
+		// Auto-prefix /api/ for simple names
+		// If name already starts with '/', use as-is for full route control
+		const full_route = name.startsWith('/') ? name : '/api/' + name;
+		this.server_router.set_route(full_route, fpub, fpub.handle_http);
 	}
 
 	publish_observable(route, obs, options = {}) {
@@ -214,7 +281,10 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 			obs,
 			...options
 		});
-		this.server_router.set_route(route, publisher, publisher.handle_http);
+		// Auto-prefix /api/ for simple names (like publish() does)
+		// If route already starts with '/', use as-is for backward compatibility
+		const full_route = route.startsWith('/') ? route : '/api/' + route;
+		this.server_router.set_route(full_route, publisher, publisher.handle_http);
 		return publisher;
 	}
 
@@ -227,6 +297,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 +352,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);
@@ -409,19 +487,81 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 	}
 
 	close(callback) {
-		let count = this.http_servers.length;
-		if (count === 0) {
-			if (callback) process.nextTick(callback);
-			return;
-		}
-		this.http_servers.forEach(server => {
-			server.close(() => {
-				count--;
-				if (count === 0) {
-					this.http_servers = [];
-					if (callback) callback();
+		const invoke_stop = (target, done) => {
+			if (!target || typeof target.stop !== 'function') {
+				done(null);
+				return;
+			}
+
+			if (target.stop.length >= 1) {
+				target.stop((error) => done(error || null));
+				return;
+			}
+
+			try {
+				const stop_result = target.stop();
+				if (stop_result && typeof stop_result.then === 'function') {
+					stop_result.then(() => done(null), (error) => done(error || null));
+					return;
 				}
+				done(null);
+			} catch (error) {
+				done(error);
+			}
+		};
+
+		const close_http_servers = (done) => {
+			let count = this.http_servers.length;
+			if (count === 0) {
+				this.http_servers = [];
+				done();
+				return;
+			}
+
+			this.http_servers.forEach(server => {
+				server.close(() => {
+					count--;
+					if (count === 0) {
+						this.http_servers = [];
+						done();
+					}
+				});
 			});
+		};
+
+		const finalize_close = (error) => {
+			if (callback) callback(error || null);
+		};
+
+		const stop_targets = [];
+		if (this.resource_pool) {
+			stop_targets.push(this.resource_pool);
+		}
+		if (this.sse_publisher) {
+			stop_targets.push(this.sse_publisher);
+		}
+
+		if (stop_targets.length === 0) {
+			close_http_servers(() => finalize_close(null));
+			return;
+		}
+
+		let pending_stops = stop_targets.length;
+		const stop_errors = [];
+		const on_stop_complete = (error) => {
+			if (error) {
+				stop_errors.push(error);
+			}
+			pending_stops--;
+			if (pending_stops > 0) {
+				return;
+			}
+			const first_error = stop_errors.length > 0 ? stop_errors[0] : null;
+			close_http_servers(() => finalize_close(first_error));
+		};
+
+		stop_targets.forEach((target) => {
+			invoke_stop(target, on_stop_complete);
 		});
 	}
 }
@@ -429,10 +569,15 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 JSGUI_Single_Process_Server.jsgui = jsgui;
 
 JSGUI_Single_Process_Server.Resource = Resource;
+JSGUI_Single_Process_Server.Resource.Process = Process_Resource;
+JSGUI_Single_Process_Server.Resource.Remote_Process = Remote_Process_Resource;
 JSGUI_Single_Process_Server.Page_Context = Server_Page_Context;
 JSGUI_Single_Process_Server.Server_Page_Context = Server_Page_Context;
 JSGUI_Single_Process_Server.Website_Resource = Website_Resource;
 JSGUI_Single_Process_Server.Publishers = Publishers;
+JSGUI_Single_Process_Server.Process_Resource = Process_Resource;
+JSGUI_Single_Process_Server.Remote_Process_Resource = Remote_Process_Resource;
+JSGUI_Single_Process_Server.HTTP_SSE_Publisher = HTTP_SSE_Publisher;
 JSGUI_Single_Process_Server.serve = require('./serve-factory')(JSGUI_Single_Process_Server);
 
 module.exports = JSGUI_Single_Process_Server;

package/tests/README.md

@@ -19,16 +19,27 @@ The test suite covers all aspects of the Phase 1 implementation:
 tests/
 ├── bundlers.test.js              # Component isolation tests for bundlers
 ├── assigners.test.js             # Component isolation tests for assigners
-├── publishers.test.js            # Component isolation tests for publishers
-├── configuration-validation.test.js  # Configuration validation tests
-├── end-to-end.test.js            # Full integration tests
+├── publishers.test.js            # Component isolation tests for publishers
+├── configuration-validation.test.js  # Configuration validation tests
+├── admin-ui-render.test.js       # Admin page render regression test
+├── serve.test.js                 # Server.serve core behavior tests
+├── serve-resources.test.js       # Server.serve + resource integration tests
+├── process-resource.test.js      # Process_Resource lifecycle and restart tests
+├── remote-process-resource.test.js # Remote_Process_Resource polling/recovery tests
+├── server-resource-pool.test.js  # Resource pool lifecycle and event forwarding tests
+├── http-sse-publisher.test.js    # HTTP_SSE_Publisher protocol/lifecycle tests
+├── end-to-end.test.js            # Full integration tests
 ├── content-analysis.test.js      # Content analysis and verification
 ├── performance.test.js           # Performance benchmarks
 ├── error-handling.test.js        # Error handling and edge cases
+├── control-optimizer-cache-behavior.test.js # Optimizer cache enable/disable behavior
 ├── examples-controls.e2e.test.js # Example apps regression (controls)
 ├── sass-controls.e2e.test.js     # Sass/CSS controls E2E coverage
 ├── jsgui3-html-examples.puppeteer.test.js # Puppeteer interaction tests (jsgui3-html examples)
+├── bundling-default-control-elimination.puppeteer.test.js # Puppeteer: default control elimination bundle checks
 ├── window-examples.puppeteer.test.js # Puppeteer interaction tests (window examples)
+├── window-resource-integration.puppeteer.test.js # Browser E2E: controls + resource APIs + SSE
+├── helpers/puppeteer-e2e-harness.js # Shared Puppeteer story runner + probes
 ├── test-runner.js                # Custom test runner with reporting
 └── README.md                     # This file
 ```
@@ -45,6 +56,9 @@ npm test
 # Using the custom test runner
 node tests/test-runner.js --test=bundlers.test.js
 
+# Optimizer cache behavior
+node tests/test-runner.js --test=control-optimizer-cache-behavior.test.js
+
 # Using mocha directly
 npx mocha tests/bundlers.test.js
 ```
@@ -59,6 +73,16 @@ npm run test:examples:controls
 npm run test:puppeteer:windows
 ```
 
+### Run Puppeteer Bundling Elimination Tests
+```bash
+npm run test:puppeteer:bundling
+```
+
+### Run Puppeteer Resource Integration Tests
+```bash
+npm run test:puppeteer:resources
+```
+
 ### Run Tests with Options
 ```bash
 # Debug mode (enables sourcemaps)
@@ -76,16 +100,35 @@ node tests/test-runner.js --test=end-to-end.test.js --debug
 1. Run a focused suite first (fast feedback).
 2. Run the example regression suite next (HTML/CSS/JS smoke checks).
 3. Run Puppeteer interaction tests last (heavier, requires a browser).
-4. Run the full suite only when changes are broad or before release.
+4. Run the resource integration Puppeteer suite when changing resources/SSE APIs.
+5. Run the full suite only when changes are broad or before release.
 
 Suggested sequence:
 ```bash
 node tests/test-runner.js --test=bundlers.test.js
 npm run test:examples:controls
+npm run test:puppeteer:bundling
 npm run test:puppeteer:windows
+npm run test:puppeteer:resources
 npm test
 ```
 
+## Advanced Puppeteer E2E Methodology
+
+For high-value interaction and integration coverage, use the shared harness:
+
+- `tests/helpers/puppeteer-e2e-harness.js`
+
+Key patterns:
+
+- Write deterministic interaction stories with `run_interaction_story(...)` and named steps.
+- Add browser probes (`console`, `pageerror`, `requestfailed`) and assert they stay clean.
+- Assert both UI state and server truth for integration cases.
+- For resource flows, validate both:
+  - API actions (`/api/resource/*`) and
+  - SSE propagation (`/events`) reflected in client UI/debug state.
+- Keep selectors stable (`id` or `data-test`) so interaction tests remain robust.
+
 ## Patterns That Work
 
 - Use per-test temporary client files and delete them in `finally`.
@@ -202,6 +245,25 @@ Browser-level interaction checks for jsgui3-html examples:
 
 - MVVM counter interactions, bindings, and validation state
 
+### 11. Window Resource Integration Puppeteer Tests (`window-resource-integration.puppeteer.test.js`)
+
+Browser-level interaction checks that combine controls and server resources:
+
+- Step-driven control interactions (date + datetime controls)
+- Client actions invoking resource lifecycle APIs (`start`, `stop`, `restart`)
+- SSE resource state events reflected in client UI
+- Cross-checking client-observed state with server resource pool state
+
+### 12. Core Resource and Serve Reliability Tests
+
+- `admin-ui-render.test.js` validates the admin page control renders without clobbering control internals
+- `serve.test.js` validates `Server.serve` startup/route readiness behavior
+- `serve-resources.test.js` validates in-process and process resource wiring in serve mode
+- `process-resource.test.js` validates direct process lifecycle + crash restart handling
+- `remote-process-resource.test.js` validates polling, unreachable, and recovered transitions
+- `server-resource-pool.test.js` validates pool forwarding, remove/stop, and summaries
+- `http-sse-publisher.test.js` validates SSE broadcast/send/replay/keepalive semantics
+
 ## Configuration Examples
 
 ### Basic Minification

package/tests/admin-ui-render.test.js

@@ -0,0 +1,24 @@
+const assert = require('assert');
+const { describe, it } = require('mocha');
+const { Page_Context } = require('jsgui3-html');
+
+const admin_ui = require('../admin-ui/client');
+
+describe('Admin UI rendering', function() {
+    it('renders Admin_Page without overriding core content collection', () => {
+        const Admin_Page = admin_ui.controls && admin_ui.controls.Admin_Page;
+        assert.strictEqual(typeof Admin_Page, 'function', 'Expected Admin_Page control export');
+
+        const page_context = new Page_Context({});
+        const admin_page = new Admin_Page({
+            context: page_context
+        });
+
+        assert(admin_page.content && typeof admin_page.content.length === 'function', 'Expected control content collection to remain intact');
+
+        const html_output = admin_page.all_html_render();
+        assert.strictEqual(typeof html_output, 'string');
+        assert(html_output.includes('admin-content'));
+        assert(html_output.includes('jsgui3 Admin'));
+    });
+});

package/tests/assigners.test.js

@@ -39,8 +39,12 @@ describe('Assigner Component Isolation Tests', function() {
     });
 
     describe('Single_Control_Webpage_Server_Static_Compressed_Response_Buffers_Assigner', function() {
-        it('should compress content with default gzip settings', async function() {
-            const assigner = new Single_Control_Webpage_Server_Static_Compressed_Response_Buffers_Assigner();
+        it('should compress content with default gzip settings', async function() {
+            const assigner = new Single_Control_Webpage_Server_Static_Compressed_Response_Buffers_Assigner({
+                compression: {
+                    threshold: 0
+                }
+            });
 
             await assigner.assign(mockBundleItems);
 
@@ -56,14 +60,18 @@ describe('Assigner Component Isolation Tests', function() {
                 }
             });
 
-            // Verify compression statistics
-            assert.strictEqual(assigner.compression_stats.total_items, 3, 'Should track 3 total items');
-            assert.strictEqual(assigner.compression_stats.gzip_compressed, 3, 'Should have compressed 3 items with gzip');
-            assert(assigner.compression_stats.gzip_savings >= 0, 'Gzip savings should be non-negative');
+            // Verify compression statistics
+            assert.strictEqual(assigner.compression_stats.total_items, 3, 'Should track 3 total items');
+            assert.strictEqual(assigner.compression_stats.gzip_compressed, 3, 'Should have compressed 3 items with gzip');
+            assert.strictEqual(typeof assigner.compression_stats.gzip_savings, 'number', 'Gzip savings should be numeric');
         });
 
-        it('should compress content with default brotli settings', async function() {
-            const assigner = new Single_Control_Webpage_Server_Static_Compressed_Response_Buffers_Assigner();
+        it('should compress content with default brotli settings', async function() {
+            const assigner = new Single_Control_Webpage_Server_Static_Compressed_Response_Buffers_Assigner({
+                compression: {
+                    threshold: 0
+                }
+            });
 
             await assigner.assign(mockBundleItems);
 
@@ -79,18 +87,19 @@ describe('Assigner Component Isolation Tests', function() {
                 }
             });
 
-            // Verify compression statistics
-            assert.strictEqual(assigner.compression_stats.brotli_compressed, 3, 'Should have compressed 3 items with brotli');
-            assert(assigner.compression_stats.brotli_savings >= 0, 'Brotli savings should be non-negative');
+            // Verify compression statistics
+            assert.strictEqual(assigner.compression_stats.brotli_compressed, 3, 'Should have compressed 3 items with brotli');
+            assert.strictEqual(typeof assigner.compression_stats.brotli_savings, 'number', 'Brotli savings should be numeric');
         });
 
         it('should respect compression configuration - gzip only', async function() {
-            const assigner = new Single_Control_Webpage_Server_Static_Compressed_Response_Buffers_Assigner({
-                compression: {
-                    enabled: true,
-                    algorithms: ['gzip']
-                }
-            });
+            const assigner = new Single_Control_Webpage_Server_Static_Compressed_Response_Buffers_Assigner({
+                compression: {
+                    enabled: true,
+                    algorithms: ['gzip'],
+                    threshold: 0
+                }
+            });
 
             await assigner.assign(mockBundleItems);
 
@@ -105,12 +114,13 @@ describe('Assigner Component Isolation Tests', function() {
         });
 
         it('should respect compression configuration - brotli only', async function() {
-            const assigner = new Single_Control_Webpage_Server_Static_Compressed_Response_Buffers_Assigner({
-                compression: {
-                    enabled: true,
-                    algorithms: ['br']
-                }
-            });
+            const assigner = new Single_Control_Webpage_Server_Static_Compressed_Response_Buffers_Assigner({
+                compression: {
+                    enabled: true,
+                    algorithms: ['br'],
+                    threshold: 0
+                }
+            });
 
             await assigner.assign(mockBundleItems);
 
@@ -125,13 +135,14 @@ describe('Assigner Component Isolation Tests', function() {
         });
 
         it('should respect compression configuration - custom gzip level', async function() {
-            const assigner = new Single_Control_Webpage_Server_Static_Compressed_Response_Buffers_Assigner({
-                compression: {
-                    enabled: true,
-                    algorithms: ['gzip'],
-                    gzip: { level: 1 } // Fastest compression
-                }
-            });
+            const assigner = new Single_Control_Webpage_Server_Static_Compressed_Response_Buffers_Assigner({
+                compression: {
+                    enabled: true,
+                    algorithms: ['gzip'],
+                    gzip: { level: 1 }, // Fastest compression
+                    threshold: 0
+                }
+            });
 
             await assigner.assign(mockBundleItems);
 
@@ -143,13 +154,14 @@ describe('Assigner Component Isolation Tests', function() {
         });
 
         it('should respect compression configuration - custom brotli quality', async function() {
-            const assigner = new Single_Control_Webpage_Server_Static_Compressed_Response_Buffers_Assigner({
-                compression: {
-                    enabled: true,
-                    algorithms: ['br'],
-                    brotli: { quality: 1 } // Lowest quality (fastest)
-                }
-            });
+            const assigner = new Single_Control_Webpage_Server_Static_Compressed_Response_Buffers_Assigner({
+                compression: {
+                    enabled: true,
+                    algorithms: ['br'],
+                    brotli: { quality: 1 }, // Lowest quality (fastest)
+                    threshold: 0
+                }
+            });
 
             await assigner.assign(mockBundleItems);
 
@@ -288,8 +300,12 @@ describe('Assigner Component Isolation Tests', function() {
     });
 
     describe('Compression Statistics', function() {
-        it('should track compression statistics accurately', async function() {
-            const assigner = new Single_Control_Webpage_Server_Static_Compressed_Response_Buffers_Assigner();
+        it('should track compression statistics accurately', async function() {
+            const assigner = new Single_Control_Webpage_Server_Static_Compressed_Response_Buffers_Assigner({
+                compression: {
+                    threshold: 0
+                }
+            });
 
             await assigner.assign(mockBundleItems);
 
@@ -313,4 +329,4 @@ describe('Assigner Component Isolation Tests', function() {
             assert.strictEqual(assigner.compression_stats.total_items, 2);
         });
     });
-});
+});