npm - jsgui3-server - Versions diffs - 0.0.148 → 0.0.150 - Mend

jsgui3-server 0.0.148 → 0.0.150

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (154) hide show

package/server.js CHANGED Viewed

@@ -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');
@@ -131,6 +134,196 @@ class JSGUI_Single_Process_Server extends Evented_Class {
 			console.warn('Skipping /admin route registration due to missing control.');
 		}
+		// ─── Admin UI V1 (Dashboard with Stat Cards) ─────────
+		// Configurable via spec.admin:
+		//   spec.admin === false              → disable admin entirely
+		//   spec.admin = { enabled: false }   → disable admin entirely
+		//   spec.admin = { sections: [...] }  → add custom sidebar sections
+		//   spec.admin = { endpoints: [...] } → add custom protected endpoints
+		const admin_config = spec.admin !== undefined ? spec.admin : {};
+		const admin_enabled = admin_config !== false && (admin_config.enabled !== false);
+		const Admin_Module_V1 = require('./admin-ui/v1/server');
+		if (admin_enabled) {
+		this.admin_v1 = new Admin_Module_V1(typeof admin_config === 'object' ? admin_config : {});
+		this.admin_v1.init(this);
+		// Register Admin V1 Page Route
+		let Admin_Shell_Control;
+		try {
+			Admin_Shell_Control = require('./admin-ui/v1/client').controls.Admin_Shell;
+		} catch (e) {
+			console.warn('Failed to load Admin_Shell control:', e.message || e);
+		}
+		if (Admin_Shell_Control) {
+			const admin_v1_app = new Webpage({
+				content: Admin_Shell_Control,
+				title: 'jsgui3 Admin Dashboard'
+			});
+			const admin_v1_publisher = new HTTP_Webpage_Publisher({
+				name: 'Admin_V1_Publisher',
+				webpage: admin_v1_app,
+				src_path_client_js: lib_path.join(__dirname, 'admin-ui/v1/client.js')
+			});
+			admin_v1_publisher.name = 'Admin_V1_Publisher';
+			const is_dev_defaults = !process.env.ADMIN_V1_PASSWORD && process.env.NODE_ENV !== 'production';
+			const login_hint = is_dev_defaults
+				? '<div class="hint dev-creds">Dev defaults active — username: <code>admin</code> password: <code>admin</code></div><div class="hint">Set ADMIN_V1_USER / ADMIN_V1_PASSWORD env vars for production.</div>'
+				: '<div class="hint">Sign in with your configured credentials.</div>';
+			const login_html = `<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1" />
+	<title>Admin Login</title>
+	<style>
+		body { margin:0; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Helvetica,Arial,sans-serif; background:#111428; color:#e8e8f0; display:flex; align-items:center; justify-content:center; min-height:100vh; }
+		.card { width: 340px; background:#1b1f38; border:1px solid #2f3358; border-radius:10px; padding:20px; }
+		h1 { margin:0 0 16px; font-size:1rem; }
+		label { display:block; margin:10px 0 6px; font-size:0.8rem; color:#9aa0c8; }
+		input { width:100%; box-sizing:border-box; background:#13162a; border:1px solid #2e345c; color:#e8e8f0; border-radius:6px; padding:8px 10px; }
+		button { margin-top:14px; width:100%; border:1px solid #4facfe; background:#224267; color:#d3ebff; border-radius:6px; padding:8px 10px; cursor:pointer; }
+		.err { margin-top:10px; color:#ff8e9f; font-size:0.8rem; min-height:1.1rem; }
+		.hint { margin-top:12px; color:#7f86b3; font-size:0.75rem; }
+		.dev-creds { color:#43e97b; }
+		code { background:#13162a; padding:2px 6px; border-radius:4px; font-size:0.8rem; }
+	</style>
+</head>
+<body>
+	<div class="card">
+		<h1>jsgui3 Admin Login</h1>
+		<form id="login-form">
+			<label for="username">Username</label>
+			<input id="username" autocomplete="username" required />
+			<label for="password">Password</label>
+			<input id="password" type="password" autocomplete="current-password" required />
+			<button type="submit">Sign In</button>
+			<div class="err" id="err"></div>
+			${login_hint}
+		</form>
+	</div>
+	<script>
+		(async () => {
+			try {
+				const session = await fetch('/api/admin/v1/auth/session', { credentials: 'same-origin' }).then(r => r.json());
+				if (session && session.authenticated) {
+					location.replace('/admin/v1');
+					return;
+				}
+			} catch (e) {}
+			const form = document.getElementById('login-form');
+			const err = document.getElementById('err');
+			form.addEventListener('submit', async (e) => {
+				e.preventDefault();
+				err.textContent = '';
+				const username = document.getElementById('username').value;
+				const password = document.getElementById('password').value;
+				try {
+					const res = await fetch('/api/admin/v1/auth/login', {
+						method: 'POST',
+						headers: { 'Content-Type': 'application/json' },
+						credentials: 'same-origin',
+						body: JSON.stringify({ username, password })
+					});
+					const data = await res.json();
+					if (!res.ok || !data.ok) {
+						err.textContent = data && data.error ? data.error : 'Login failed';
+						return;
+					}
+					location.replace('/admin/v1');
+				} catch (e2) {
+					err.textContent = 'Network error';
+				}
+			});
+		})();
+	</script>
+</body>
+</html>`;
+			const serve_admin_v1_page = (req, res) => {
+				if (req && typeof req.url === 'string' && req.url.startsWith('/admin/v1/login')) {
+					res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+					res.end(login_html);
+					return;
+				}
+				if (!this.admin_v1 || !this.admin_v1.is_admin_read_request(req)) {
+					res.writeHead(302, { Location: '/admin/v1/login' });
+					res.end();
+					return;
+				}
+				if (admin_v1_cached_html) {
+					res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+					res.end(admin_v1_cached_html);
+				} else {
+					res.writeHead(503, { 'Content-Type': 'text/plain' });
+					res.end('Admin UI v1 is loading, please retry...');
+				}
+			};
+			server_router.set_route('/admin/v1/login', null, (req, res) => {
+				res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+				res.end(login_html);
+			});
+			// Namespace admin v1 assets under /admin/v1/ to avoid
+			// colliding with the main app's /js/js.js and /css/css.css.
+			let admin_v1_cached_html = null;
+			admin_v1_publisher.on('ready', (res_ready) => {
+				if (res_ready && res_ready._arr) {
+					for (const bundle_item of res_ready._arr) {
+						const { type } = bundle_item;
+						if (type === 'HTML') {
+							// Rewrite asset references so browser fetches
+							// the admin-specific JS/CSS, not the main app's.
+							let html = bundle_item.text || '';
+							html = html.replace(
+								/href="\/css\/css\.css"/g,
+								'href="/admin/v1/css/css.css"'
+							);
+							html = html.replace(
+								/src="\/js\/js\.js"/g,
+								'src="/admin/v1/js/js.js"'
+							);
+							// Inject viewport meta for mobile rendering
+							if (!html.includes('name="viewport"')) {
+								html = html.replace(
+									/<head([^>]*)>/i,
+									'<head$1><meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">'
+								);
+							}
+							admin_v1_cached_html = html;
+						} else {
+							// JS → /admin/v1/js/js.js, CSS → /admin/v1/css/css.css
+							const namespaced_route =
+								type === 'JavaScript' ? '/admin/v1/js/js.js' :
+								type === 'CSS'        ? '/admin/v1/css/css.css' :
+								'/admin/v1' + bundle_item.route;
+							const responder = new Static_Route_HTTP_Responder(bundle_item);
+							server_router.set_route(namespaced_route, responder, responder.handle_http);
+						}
+					}
+					// Serve authenticated admin page at /admin/v1
+					server_router.set_route('/admin/v1', null, serve_admin_v1_page);
+				}
+			});
+			// Temporary handler until the publisher finishes bundling
+			server_router.set_route('/admin/v1', null, serve_admin_v1_page);
+			resource_pool.add(admin_v1_publisher);
+		} else {
+			console.warn('Skipping /admin/v1 route registration due to missing Admin_Shell control.');
+		}
+		} else {
+			// admin_enabled === false
+			this.admin_v1 = null;
+		}
 		if (spec.routes) {
 			throw 'NYI - will use Website class rather than Website_Resource here'
@@ -267,7 +460,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 = {}) {
@@ -275,7 +471,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;
 	}
@@ -478,19 +677,84 @@ 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 (this.admin_v1 && typeof this.admin_v1.destroy === 'function') {
+			this.admin_v1.destroy();
+		}
+		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);
 		});
 	}
 }
@@ -498,10 +762,21 @@ 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;
+// Admin UI extensibility exports
+JSGUI_Single_Process_Server.Admin_Module_V1 = require('./admin-ui/v1/server');
+JSGUI_Single_Process_Server.Admin_Auth_Service = require('./admin-ui/v1/admin_auth_service');
+JSGUI_Single_Process_Server.Admin_User_Store = require('./admin-ui/v1/admin_user_store');
 JSGUI_Single_Process_Server.serve = require('./serve-factory')(JSGUI_Single_Process_Server);
 module.exports = JSGUI_Single_Process_Server;

package/tests/README.md CHANGED Viewed

@@ -19,16 +19,28 @@ 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
+├── admin-ui-jsgui-controls.test.js # Admin shell interaction + control-first 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 +57,12 @@ 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
+# Admin UI shell interaction regression
+node tests/test-runner.js --test=admin-ui-jsgui-controls.test.js
 # Using mocha directly
 npx mocha tests/bundlers.test.js
 ```
@@ -59,6 +77,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 +104,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 +249,26 @@ 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
+- `admin-ui-jsgui-controls.test.js` validates admin shell interactions, custom section nav refresh, retry/logout control behavior, and SSE open/error/heartbeat handling
+- `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