@webqit/webflo 1.0.19 → 1.0.21

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

@@ -25,13 +25,13 @@ export class WebfloWorker extends WebfloRuntime {
 
 	static get SessionStorage() { return SessionStorage; }
 
-    static get HttpUser() { return HttpUser; }
+	static get HttpUser() { return HttpUser; }
 
 	static get Workport() { return Workport; }
 
 	static create(cx) {
-        return new this(this.Context.create(cx));
-    }
+		return new this(this.Context.create(cx));
+	}
 
 	#cx;
 	get cx() { return this.#cx; }
@@ -44,7 +44,7 @@ export class WebfloWorker extends WebfloRuntime {
 		this.#cx = cx;
 	}
 
-	initialize() {
+	async initialize() {
 		// ONINSTALL
 		const installHandler = (event) => {
 			if (this.cx.params.skip_waiting) self.skipWaiting();
@@ -53,7 +53,7 @@ export class WebfloWorker extends WebfloRuntime {
 				// Add files to cache
 				event.waitUntil(self.caches.open(this.cx.params.cache_name).then(async cache => {
 					if (this.cx.logger) { this.cx.logger.log('[ServiceWorker] Pre-caching resources.'); }
-					for (const urls of [ 'cache_first_urls', 'cache_only_urls' ]) {
+					for (const urls of ['cache_first_urls', 'cache_only_urls']) {
 						const _urls = (this.cx.params[urls] || []).map(c => c.trim()).filter(c => c && !pattern(c, self.origin).isPattern());
 						await cache.addAll(_urls);
 					}
@@ -74,7 +74,7 @@ export class WebfloWorker extends WebfloRuntime {
 								return self.caches.delete(key);
 							}
 						}));
-					}) 
+					})
 				}
 				resolve();
 			}));
@@ -82,11 +82,11 @@ export class WebfloWorker extends WebfloRuntime {
 		self.addEventListener('install', installHandler);
 		self.addEventListener('activate', activateHandler);
 		const uncontrols = this.control();
-        return () => {
-            self.removeEventListener('install', installHandler);
-            self.removeEventListener('activate', activateHandler);
+		return () => {
+			self.removeEventListener('install', installHandler);
+			self.removeEventListener('activate', activateHandler);
 			uncontrols();
-        };
+		};
 	}
 
 	control() {
@@ -112,42 +112,54 @@ export class WebfloWorker extends WebfloRuntime {
 				event.respondWith(this.navigate(event.request.url, event.request, { event }));
 			}
 		};
+		const webpushHandler = (event) => {
+			if (!(self.Notification && self.Notification.permission === 'granted')) return;
+			let data;
+			try {
+				data = event.data?.json() ?? {};
+			} catch(e) { return; }
+			const { type, title, ...params } = data;
+			if (type !== 'notification') return;
+			self.registration.showNotification(title, params);
+		};
 		self.addEventListener('fetch', fetchHandler);
-        return () => {
-            self.removeEventListener('fetch', fetchHandler);
-        };
+		self.addEventListener('push', webpushHandler);
+		return () => {
+			self.removeEventListener('fetch', fetchHandler);
+			self.removeEventListener('push', webpushHandler);
+		};
 	}
 
-    createRequest(href, init = {}) {
+	createRequest(href, init = {}) {
 		if (init instanceof Request && init.url === (href.href || href)) {
 			return init;
 		}
 		return new Request(href, init);
-    }
+	}
 
 	async navigate(url, init = {}, detail = {}) {
 		// Resolve inputs
-        const scope = { url, init, detail };
+		const scope = { url, init, detail };
 		if (typeof scope.url === 'string') {
 			scope.url = new URL(scope.url, self.location.origin);
 		}
 		// ---------------
-        // Event lifecycle
-        scope.eventLifecyclePromises = new Set;
-        scope.eventLifecycleHooks = {
-            waitUntil: (promise) => {
-                promise = Promise.resolve(promise);
-                scope.eventLifecyclePromises.add(promise);
-                scope.eventLifecyclePromises.dirty = true;
-                promise.then(() => scope.eventLifecyclePromises.delete(promise));
-            },
-            respondWith: async (response) => {
-                if (scope.eventLifecyclePromises.dirty && !scope.eventLifecyclePromises.size) {
-                    throw new Error('Final response already sent');
-                }
-                return await this.execPush(scope.clientMessaging, response);
-            },
-        };
+		// Event lifecycle
+		scope.eventLifecyclePromises = new Set;
+		scope.eventLifecycleHooks = {
+			waitUntil: (promise) => {
+				promise = Promise.resolve(promise);
+				scope.eventLifecyclePromises.add(promise);
+				scope.eventLifecyclePromises.dirty = true;
+				promise.then(() => scope.eventLifecyclePromises.delete(promise));
+			},
+			respondWith: async (response) => {
+				if (scope.eventLifecyclePromises.dirty && !scope.eventLifecyclePromises.size) {
+					throw new Error('Final response already sent');
+				}
+				return await this.execPush(scope.clientMessaging, response);
+			},
+		};
 		// Create and route request
 		scope.request = this.createRequest(scope.url, scope.init);
 		scope.cookies = this.constructor.CookieStorage.create(scope.request);
@@ -165,13 +177,15 @@ export class WebfloWorker extends WebfloRuntime {
 			cookies: scope.cookies,
 			session: scope.session,
 			user: scope.user,
-			client: scope.clientMessaging
+			client: scope.clientMessaging,
+			sdk: {}
 		});
+		await this.setup(scope.httpEvent);
 		// Restore session before dispatching
-		if (scope.request.method === 'GET' 
-		&& (scope.redirectMessageID = scope.httpEvent.url.query['redirect-message'])
-		&& (scope.redirectMessage = scope.session.get(`redirect-message:${scope.redirectMessageID}`))) {
-			scope.session.delete(`redirect-message:${scope.redirectMessageID}`);
+		if (scope.request.method === 'GET'
+			&& (scope.redirectMessageID = scope.httpEvent.url.query['redirect-message'])
+			&& (scope.redirectMessage = await scope.session.get(`redirect-message:${scope.redirectMessageID}`))) {
+			await scope.session.delete(`redirect-message:${scope.redirectMessageID}`);
 		}
 		// Dispatch for response
 		scope.response = await this.dispatch(scope.httpEvent, {}, async (event) => {
@@ -182,30 +196,30 @@ export class WebfloWorker extends WebfloRuntime {
 			return await this.remoteFetch(event.request);
 		});
 		// ---------------
-        // Response processing
-        scope.hasBackgroundActivity = scope.clientMessaging.isMessaging() || scope.eventLifecyclePromises.size || (scope.redirectMessage && !(scope.response instanceof Response && scope.response.headers.get('Location')));
-        scope.response = await this.normalizeResponse(scope.httpEvent, scope.response, scope.hasBackgroundActivity);
+		// Response processing
+		scope.response = await this.normalizeResponse(scope.httpEvent, scope.response);
+		scope.hasBackgroundActivity = scope.clientMessaging.isMessaging() || scope.eventLifecyclePromises.size || (scope.redirectMessage && !scope.response.headers.get('Location'));
 		if (scope.hasBackgroundActivity) {
 			scope.response.headers.set('X-Background-Messaging', `ch:${scope.clientMessaging.port.name}`);
-        }
+		}
 		if (scope.response.headers.get('Location')) {
-            if (scope.redirectMessage) {
-                scope.session.set(`redirect-message:${scope.redirectMessageID}`, scope.redirectMessage);
-            }
+			if (scope.redirectMessage) {
+				scope.session.set(`redirect-message:${scope.redirectMessageID}`, scope.redirectMessage);
+			}
 		} else {
 			if (scope.redirectMessage) {
-                scope.eventLifecycleHooks.respondWith(scope.redirectMessage);
-            }
+				scope.eventLifecycleHooks.respondWith(scope.redirectMessage);
+			}
 		}
-        Promise.all([...scope.eventLifecyclePromises]).then(() => {
-            if (scope.clientMessaging.isMessaging()) {
-                scope.clientMessaging.on('connected', () => {
-                    setTimeout(() => {
-                        scope.clientMessaging.close();
-                    }, 100);
-                });
-            } else scope.clientMessaging.close();
-        });
+		Promise.all([...scope.eventLifecyclePromises]).then(() => {
+			if (scope.clientMessaging.isMessaging()) {
+				scope.clientMessaging.on('connected', () => {
+					setTimeout(() => {
+						scope.clientMessaging.close();
+					}, 100);
+				});
+			} else scope.clientMessaging.close();
+		});
 		return scope.response;
 	}
 
@@ -287,7 +301,7 @@ export class WebfloWorker extends WebfloRuntime {
 
 	async getRequestCache(request) {
 		const cacheName = request.headers.get('Accept') === 'application/json'
-			? this.cx.params.cache_name + '_json' 
+			? this.cx.params.cache_name + '_json'
 			: this.cx.params.cache_name;
 		return self.caches.open(cacheName);
 	}

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

@@ -1,8 +1,9 @@
 import { WebfloWorker } from './WebfloWorker.js';
 
-export function start() {
+export async function start() {
     const instance = WebfloWorker.create(this || {});
-    instance.initialize();
+    await instance.initialize();
+    return instance;
 }
 
 export {

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

@@ -8,10 +8,12 @@ export class CookieStorage extends WebfloCookieStorage {
         );
     }
 
-    commit(response) {
-        for (const cookieStr of this.render()) {
-            response.headers.append('Set-Cookie', cookieStr);
+    async commit(response = null) {
+        if (response) {
+            for (const cookieStr of await this.render()) {
+                response.headers.append('Set-Cookie', cookieStr);
+            }
         }
-        super.commit();
+        await super.commit();
     }
 }

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

@@ -1,7 +1,7 @@
 import { WebfloStorage } from '../WebfloStorage.js';
 import crypto from 'crypto';
 
-const sessionStorage = new Map;
+const inmemSessionRegistry = new Map;
 export class SessionStorage extends WebfloStorage {
 
     static create(request, params = {}) {
@@ -26,28 +26,26 @@ export class SessionStorage extends WebfloStorage {
                 sessionID = crypto.randomUUID();
             }
         }
-        if (sessionStorage.has(sessionID)) {
-            return sessionStorage.get(sessionID);
-        }
-        const instance = new this(request, sessionID);
-        sessionStorage.set(sessionID, instance);
-        return instance;
-    }
-
-    constructor(request, sessionID) {
-        super(request, true);
-        this.#sessionID = sessionID;
+        return new this(params.registry || inmemSessionRegistry, sessionID, request);
     }
 
     #sessionID;
-    get sessionID() {
-        return this.#sessionID;
+    get sessionID() { return this.#sessionID; }
+    
+    constructor(reqistry, sessionID, request) {
+        super(
+            reqistry,
+            `session:${sessionID}`,
+            request,
+            true
+        );
+        this.#sessionID = sessionID;
     }
 
-    commit(response, force = false) {
-        if (response.headers.get('Set-Cookie', true).find((c) => c.name === '__sessid')) return;
-        if (!force && !this.getAdded().length && !this.getDeleted().length) return;
-        response.headers.append('Set-Cookie', `__sessid=${this.#sessionID}; Path=/; Secure; HttpOnly; SameSite=Lax; Max-Age=31536000`);
-        super.commit();
+    async commit(response = null) {
+        if (response && !response.headers.get('Set-Cookie', true).find((c) => c.name === '__sessid')) {
+            response.headers.append('Set-Cookie', `__sessid=${this.#sessionID}; Path=/; Secure; HttpOnly; SameSite=Lax; Max-Age=31536000`);
+        }
+        await super.commit();
     }
 }

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

@@ -54,6 +54,9 @@ export class WebfloServer extends WebfloRuntime {
     // Typically for access by Router
     get cx() { return this.#cx; }
 
+    #sdk = {};
+    get sdk() { return this.#sdk; }
+
     constructor(cx) {
         super();
         if (!(cx instanceof this.constructor.Context)) {
@@ -99,6 +102,46 @@ export class WebfloServer extends WebfloRuntime {
             }));
         }
         // ---------------
+        if (this.#cx.server.capabilities?.database) {
+            if (this.#cx.server.capabilities.database_dialect !== 'postgres') {
+                throw new Error(`Only postgres supported for now for database dialect`);
+            }
+            if (this.#cx.env.entries[this.#cx.server.capabilities.database_url_variable]) {
+                const { SQLClient } = await import('@linked-db/linked-ql/sql');
+                const { default: pg } = await import('pg');
+                // Obtain pg client
+                const pgClient = new pg.Pool({
+                    connectionString: this.#cx.env.entries[this.#cx.server.capabilities.database_url_variable],
+                    database: 'postgres',
+                });
+                // Connect
+                await pgClient.connect();
+                this.#sdk.db = new SQLClient(pgClient, { dialect: 'postgres' });
+            } else {
+                //const { ODBClient } = await import('@linked-db/linked-ql/odb');
+                //this.#sdk.db = new ODBClient({ dialect: 'postgres' });
+            }
+        }
+        if (this.#cx.server.capabilities?.redis && this.#cx.env.entries[this.#cx.server.capabilities.redis_url_variable]) {
+            const { Redis } = await import('ioredis');
+            this.#sdk.redis = !this.#cx.env.entries[this.#cx.server.capabilities.redis_url_variable]
+                ? new Redis : new Redis(this.#cx.env.entries[this.#cx.server.capabilities.redis_url_variable], {
+                    tls: { rejectUnauthorized: false }, // Required for Upstash
+                });
+        }
+        if (this.#cx.server.capabilities?.webpush) {
+            const { default: webpush } = await import('web-push');
+            this.#sdk.webpush = webpush;
+            if (this.#cx.env.entries[this.#cx.server.capabilities.vapid_public_key_variable]
+            && this.#cx.env.entries[this.#cx.server.capabilities.vapid_private_key_variable]) {
+                webpush.setVapidDetails(
+                    this.#cx.server.capabilities.vapid_subject,
+                    this.#cx.env.entries[this.#cx.server.capabilities.vapid_public_key_variable],
+                    this.#cx.env.entries[this.#cx.server.capabilities.vapid_private_key_variable]
+                );
+            }
+        }
+        // ---------------
         this.control();
         if (this.#cx.logger) {
             if (this.#servers.size) {
@@ -196,7 +239,7 @@ export class WebfloServer extends WebfloRuntime {
         if (!scope.error) {
             if (!hosts.includes(scope.url.hostname) && !hosts.includes('*')) {
                 scope.error = 'Unrecognized host';
-            } else if (scope.url.protocol === 'ws:' && this.#cx.server.https.force) {
+            } else if (scope.url.protocol === 'ws:' && this.#cx.server.https.port && this.#cx.server.https.force) {
                 scope.error = `Only secure connections allowed (wss:)`;
             } else if (scope.url.hostname.startsWith('www.') && this.#cx.server.force_www === 'remove') {
                 scope.error = `Connections not allowed over the www subdomain`;
@@ -208,7 +251,7 @@ export class WebfloServer extends WebfloRuntime {
         // Level 3 validation
         // and actual processing
         scope.request = this.createRequest(scope.url.href, requestInit);
-        scope.session = this.constructor.SessionStorage.create(scope.request, { secret: this.#cx.env.entries.SESSION_KEY });
+        scope.session = this.constructor.SessionStorage.create(scope.request, { secret: this.#cx.env.entries[this.#cx.server.session_key_variable] });
         if (!scope.error) {
             if (!(scope.clientMessagingRegistry = this.#globalMessagingRegistry.get(scope.session.sessionID))) {
                 scope.error = `Lost or invalid clientID`;
@@ -257,7 +300,7 @@ export class WebfloServer extends WebfloRuntime {
             if (!hosts.includes(scope.url.hostname) && !hosts.includes('*')) {
                 scope.exit = { status: 500 };
                 scope.exitMessage = 'Unrecognized host';
-            } else if (scope.url.protocol === 'http:' && this.#cx.server.https.force) {
+            } else if (scope.url.protocol === 'http:' && this.#cx.server.https.port && this.#cx.server.https.force) {
                 scope.exit = {
                     status: 302,
                     headers: { Location: (scope.url.protocol = 'https:', scope.url.href) }
@@ -289,7 +332,9 @@ export class WebfloServer extends WebfloRuntime {
         if (!scope.response) {
             scope.response = await this.navigate(fullUrl, requestInit, {
                 request: nodeRequest,
-                response: nodeResponse
+                response: nodeResponse,
+                ipAddress: nodeRequest.headers['x-forwarded-for']?.split(',')[0]
+                    || nodeRequest.socket.remoteAddress
             });
         }
         // -----------------
@@ -491,7 +536,8 @@ export class WebfloServer extends WebfloRuntime {
             },
             respondWith: async (response, isRedirectMessage = false) => {
                 if (!isRedirectMessage && scope.eventLifecyclePromises.dirty && !scope.eventLifecyclePromises.size) {
-                    throw new Error('Final response already sent');
+                    console.error('Final response already sent');
+                    return;
                 }
                 return await this.execPush(scope.clientMessaging, response);
             },
@@ -503,7 +549,13 @@ export class WebfloServer extends WebfloRuntime {
             : [];
         scope.request = this.createRequest(scope.url.href, scope.init, scope.autoHeaders.filter((header) => header.type === 'request'));
         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, {
+            secret: this.#cx.env.entries[this.#cx.server.session_key_variable],
+            registry: this.#sdk.redis && {
+                get: async (key) => { return await this.#sdk.redis.hgetall(key) },
+                set: async (key, value) => { return await this.#sdk.redis.hset(key, value) },
+            },
+        });
         const sessionID = scope.session.sessionID;
         if (!this.#globalMessagingRegistry.has(sessionID)) {
             this.#globalMessagingRegistry.set(sessionID, new ClientMessagingRegistry(this, sessionID));
@@ -521,13 +573,15 @@ export class WebfloServer extends WebfloRuntime {
             cookies: scope.cookies,
             session: scope.session,
             user: scope.user,
-            client: scope.clientMessaging
+            client: scope.clientMessaging,
+            sdk: this.#sdk
         });
+        await this.setup(scope.httpEvent);
         // Restore session before dispatching
         if (scope.request.method === 'GET' 
         && (scope.redirectMessageID = scope.httpEvent.url.query['redirect-message'])
-        && (scope.redirectMessage = scope.session.get(`redirect-message:${scope.redirectMessageID}`))) {
-            scope.session.delete(`redirect-message:${scope.redirectMessageID}`);
+        && (scope.redirectMessage = await scope.session.get(`redirect-message:${scope.redirectMessageID}`))) {
+            await scope.session.delete(`redirect-message:${scope.redirectMessageID}`);
         }
         // Dispatch for response
         scope.response = await this.dispatch(scope.httpEvent, {}, async (event) => {
@@ -535,15 +589,15 @@ export class WebfloServer extends WebfloRuntime {
         });
         // ---------------
         // Response processing
-        scope.hasBackgroundActivity = scope.clientMessaging.isMessaging() || scope.eventLifecyclePromises.size || (scope.redirectMessage && !(scope.response instanceof Response && scope.response.headers.get('Location')));
-        scope.response = await this.normalizeResponse(scope.httpEvent, scope.response, scope.hasBackgroundActivity);
+        scope.response = await this.normalizeResponse(scope.httpEvent, scope.response);
+        scope.hasBackgroundActivity = scope.clientMessaging.isMessaging() || scope.eventLifecyclePromises.size || (scope.redirectMessage && !scope.response.headers.get('Location'));
         if (scope.hasBackgroundActivity) {
             scope.response.headers.set('X-Background-Messaging', `ws:${scope.clientMessaging.portID}`);
         }
         // Reponse handlers
         if (scope.response.headers.get('Location')) {
             if (scope.redirectMessage) {
-                scope.session.set(`redirect-message:${scope.redirectMessageID}`, scope.redirectMessage);
+                await scope.session.set(`redirect-message:${scope.redirectMessageID}`, scope.redirectMessage);
             }
             this.writeRedirectHeaders(scope.httpEvent, scope.response);
         } else {

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

@@ -3,6 +3,7 @@ import { WebfloServer } from './WebfloServer.js';
 export async function start() {
     const instance = WebfloServer.create(this || {});
     await instance.initialize();
+    return instance;
 }
 
 export {

package/src/runtime-pi/util-http.js

@@ -47,6 +47,9 @@ export function renderHttpMessageInit(httpMessageInit) {
 }
 
 export async function parseHttpMessage(httpMessage) {
+    if (httpMessage.meta && 'body' in httpMessage.meta && httpMessage.meta.type === 'json') {
+        return httpMessage.meta.body;
+    }
     let result;
     const contentType = httpMessage.headers.get('Content-Type') || '';
     if (contentType === 'application/x-www-form-urlencoded' || contentType.startsWith('multipart/form-data')) {
@@ -132,9 +135,19 @@ Object.defineProperties(Request, {
         value: async function (request, init = {}) {
             const requestInit = [
                 'method', 'headers', 'mode', 'credentials', 'cache', 'redirect', 'referrer', 'integrity',
-            ].reduce((init, prop) => ({ [prop]: request[prop], ...init }), {});
+            ].reduce(($init, prop) => (
+                { ...$init, [prop]: prop in init ? init[prop] : (prop === 'headers' ? new Headers(request[prop]) : request[prop]) }
+            ), {});
             if (!['GET', 'HEAD'].includes(init.method?.toUpperCase() || request.method)) {
-                requestInit.body = await request.clone().arrayBuffer();
+                if ('body' in init) {
+                    requestInit.body = init.body
+                    if (!('headers' in init)) {
+                        requestInit.headers.delete('Content-Type');
+                        requestInit.headers.delete('Content-Length');
+                    }
+                } else {
+                    requestInit.body = await request.clone().arrayBuffer();
+                }
             }
             if (requestInit.mode === 'navigate') {
                 requestInit.mode = 'cors';

package/src/services-pi/index.js

@@ -3,7 +3,9 @@
  * @imports
  */
 import * as cert from './cert/index.js';
+import * as push from './push/index.js';
 
 export {
     cert,
+    push,
 }

package/src/services-pi/push/index.js

@@ -0,0 +1,23 @@
+
+/**
+ * imports
+ */
+import webpush from 'web-push';
+
+/**
+ * @description
+ */
+export const desc = {
+    generate: 'Generate a set of VAPID keys for push notifications.',
+};
+
+/**
+ * Reads SSL from file.
+ * 
+ * @return object
+ */
+export async function generate() {
+    const cx = this || {};
+    const vapidKeys = webpush.generateVAPIDKeys();
+    cx.logger.log(vapidKeys);
+}

package/src/static-pi/index.js

@@ -3,7 +3,7 @@
  * @imports
 import * as client from './client/index.js';
 import * as server from './server/index.js';
- */
+*/
 
 export {
     //client,