@webqit/webflo 1.0.1 → 1.0.3

package/package.json

@@ -12,7 +12,7 @@
     "vanila-javascript"
   ],
   "homepage": "https://webqit.io/tooling/webflo",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/runtime-pi/client/WebfloRootClient1.js

@@ -1,5 +1,6 @@
 import { WebfloClient } from './WebfloClient.js';
 import { Context } from './Context.js';
+import { Workport } from './Workport.js';
 
 const { Observer } = webqit;
 
@@ -7,6 +8,8 @@ export class WebfloRootClient1 extends WebfloClient {
 
 	static get Context() { return Context; }
 
+	static get Workport() { return Workport; }
+
 	static create(host, cx = {}) {
         return new this(host, this.Context.create(cx));
     }
@@ -73,7 +76,8 @@ export class WebfloRootClient1 extends WebfloClient {
 				PUSH_REGISTRATION_PUBLIC_URL: this.cx.params.env[push_registration_url_env],
 				startMessages: true
 			};
-			//this.workport.registerServiceWorker(base + filename, swParams);
+			this.workport = new this.constructor.Workport;
+			this.workport.registerServiceWorker(base + filename, swParams);
 		}
 		if (window.opener) {
 			// Window opener pinging

package/src/runtime-pi/client/Workport.js

@@ -19,9 +19,9 @@ export class Workport {
         const stateChange = (target) => {
             // target.state can be any of: "parsed", "installing", "installed", "activating", "activated", "redundant"
             if (target.state === 'redundant') {
-                this.remove(target);
+                //this.remove(target);
             } else if (target.state === 'activated') {
-                this.add(target);
+                //this.add(target);
             }
         }
         // We're always installing at first for a new service worker.

package/src/runtime-pi/client/generate.js

@@ -47,13 +47,14 @@ export async function generate() {
             throw new Error(`The Layout configurator "config.deployment.Env" is required in context to bundle public env.`);
         }
         const envConfig = await (new cx.config.deployment.Env(cx)).read();
-        for (const key in envConfig.entries) {
+        const env = { ...envConfig.entries, ...process.env };
+        for (const key in env) {
             if (!key.includes('PUBLIC_') && !key.includes('_PUBLIC')) continue;
             if (clientConfig.bundle_public_env) {
-                clientConfig.env[key] = envConfig.entries[key];
+                clientConfig.env[key] = env[key];
             }
             if (workerConfig.bundle_public_env) {
-                workerConfig.env[key] = envConfig.entries[key];
+                workerConfig.env[key] = env[key];
             }
         }
     }

package/src/runtime-pi/client/worker/WebfloWorker.js

@@ -141,7 +141,7 @@ export class WebfloWorker extends WebfloRuntime {
 			// Create and route request
 			scope.request = this.createRequest(scope.url, scope.init);
 			scope.cookies = this.constructor.CookieStorage.create(scope.request);
-			scope.session = this.constructor.SessionStorage.create(scope.request, { secret: this.cx.env.entries.SESSION_KEY });
+			scope.session = this.constructor.SessionStorage.create(scope.request);
 			const portID = crypto.randomUUID();
 			scope.clientMessaging = new ClientMessaging(this, portID, { isPrimary: true });
 			scope.user = this.constructor.HttpUser.create(

package/src/runtime-pi/server/WebfloServer.js

@@ -121,7 +121,7 @@ export class WebfloServer extends WebfloRuntime {
     control() {
         // ---------------
         if (!this.#cx.flags['test-only'] && !this.#cx.flags['https-only'] && this.#cx.server.port) {
-            const httpServer = Http.createServer((request, response) => this.handleNodeHttpRequest('http', request, response));
+            const httpServer = Http.createServer((request, response) => this.handleNodeHttpRequest(request, response));
             httpServer.listen(this.#cx.server.port);
             // -------
             let domains = parseDomains(this.#cx.server.domains);
@@ -133,12 +133,12 @@ export class WebfloServer extends WebfloRuntime {
             });
             // Handle WebSocket connections
             httpServer.on('upgrade', (request, socket, head) => {
-                this.handleNodeWsRequest(wss, 'ws', request, socket, head);
+                this.handleNodeWsRequest(wss, request, socket, head);
             });
         }
         // ---------------
         if (!this.#cx.flags['test-only'] && !this.#cx.flags['http-only'] && this.#cx.server.https.port) {
-            const httpsServer = Https.createServer((request, response) => this.handleNodeHttpRequest('https', request, response));
+            const httpsServer = Https.createServer((request, response) => this.handleNodeHttpRequest(request, response));
             httpsServer.listen(this.#cx.server.https.port);
             // -------
             const addSSLContext = (serverConfig, domains) => {
@@ -164,15 +164,22 @@ export class WebfloServer extends WebfloRuntime {
             }
             // Handle WebSocket connections
             httpsServer.on('upgrade', (request, socket, head) => {
-                this.handleNodeWsRequest(wss, 'wss', request, socket, head);
+                this.handleNodeWsRequest(wss, request, socket, head);
             });
         }
         // ---------------
         const wss = new WebSocket.Server({ noServer: true });
     }
 
+    getRequestProto(nodeRequest) {
+        return nodeRequest.connection.encrypted ? 'https' : (nodeRequest.headers['x-forwarded-proto'] || 'http');
+    }
+
     #globalMessagingRegistry = new Map;
-    async handleNodeWsRequest(wss, proto, nodeRequest, socket, head) {
+    async handleNodeWsRequest(wss, nodeRequest, socket, head) {
+        const proto = this.getRequestProto(nodeRequest);
+        console.log('__________ws:', proto);
+
         const [fullUrl, requestInit] = this.parseNodeRequest(proto, nodeRequest, false);
         const scope = {};
         scope.url = new URL(fullUrl);
@@ -231,7 +238,10 @@ export class WebfloServer extends WebfloRuntime {
         }
     }
 
-    async handleNodeHttpRequest(proto, nodeRequest, nodeResponse) {
+    async handleNodeHttpRequest(nodeRequest, nodeResponse) {
+        const proto = this.getRequestProto(nodeRequest);
+        console.log('__________http:', proto);
+
         const [fullUrl, requestInit] = this.parseNodeRequest(proto, nodeRequest);
         const scope = {};
         scope.url = new URL(fullUrl);
@@ -570,7 +580,6 @@ export class WebfloServer extends WebfloRuntime {
         const is404 = response.status === 404;
         if (is404) return response;
         const acceptedOrUnchanged = [202/*Accepted*/, 304/*Not Modified*/].includes(response.status);
-        const t = response.status === 404;
         if (httpEvent.request.headers.get('Accept')) {
             const requestAccept = httpEvent.request.headers.get('Accept', true);
             if (requestAccept.match('text/html') && !response.meta.static) {
@@ -585,9 +594,6 @@ export class WebfloServer extends WebfloRuntime {
         // Satisfy "Range" header
         if (httpEvent.request.headers.get('Range') && !response.headers.get('Content-Range')
         && (response.body instanceof ReadableStream || ArrayBuffer.isView(response.body))) {
-                if (t) {
-                    console.log(httpEvent.request.url, response.body);
-                }
             const rangeRequest = httpEvent.request.headers.get('Range', true);
             const body = _ReadableStream.from(response.body);
             // ...in partials