@webqit/webflo 1.0.18 → 1.0.20

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

@@ -4,6 +4,7 @@ import Path from 'path';
 import Http from 'http';
 import Https from 'https';
 import WebSocket from 'ws';
+import webpush from 'web-push';
 import Mime from 'mime-types';
 import QueryString from 'querystring';
 import { _from as _arrFrom, _any } from '@webqit/util/arr/index.js';
@@ -196,7 +197,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 +209,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 +258,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 +290,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
             });
         }
         // -----------------
@@ -485,11 +488,14 @@ export class WebfloServer extends WebfloRuntime {
                 promise = Promise.resolve(promise);
                 scope.eventLifecyclePromises.add(promise);
                 scope.eventLifecyclePromises.dirty = true;
-                promise.then(() => scope.eventLifecyclePromises.delete(promise));
+                promise.then(() => {
+                    scope.eventLifecyclePromises.delete(promise);
+                });
             },
             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);
             },
@@ -501,7 +507,7 @@ 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] });
         const sessionID = scope.session.sessionID;
         if (!this.#globalMessagingRegistry.has(sessionID)) {
             this.#globalMessagingRegistry.set(sessionID, new ClientMessagingRegistry(this, sessionID));
@@ -519,13 +525,24 @@ export class WebfloServer extends WebfloRuntime {
             cookies: scope.cookies,
             session: scope.session,
             user: scope.user,
-            client: scope.clientMessaging
+            client: scope.clientMessaging,
+            sdk: { ...(this.#cx.server.capabilities?.webpush ? { webpush } : {}) }
         });
+        if (this.#cx.server.capabilities?.webpush
+        && this.#cx.env.entries[this.#cx.server.capabilities.app_vapid_public_key_variable]
+        && this.#cx.env.entries[this.#cx.server.capabilities.app_vapid_private_key_variable]) {
+            webpush.setVapidDetails(
+                scope.url.origin.replace(/^http:/i, 'https:'),
+                this.#cx.env.entries[this.#cx.server.capabilities.app_vapid_public_key_variable],
+                this.#cx.env.entries[this.#cx.server.capabilities.app_vapid_private_key_variable]
+            );
+        }
+        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}`);
+            await scope.session.delete(`redirect-message:${scope.redirectMessageID}`);
         }
         // Dispatch for response
         scope.response = await this.dispatch(scope.httpEvent, {}, async (event) => {
@@ -533,15 +550,15 @@ export class WebfloServer extends WebfloRuntime {
         });
         // ---------------
         // Response processing
-        scope.hasBackgroundActivity = 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 {
@@ -562,7 +579,9 @@ export class WebfloServer extends WebfloRuntime {
                         scope.clientMessaging.close();
                     }, 100);
                 });
-            } else scope.clientMessaging.close();
+            } else {
+                scope.clientMessaging.close();
+            }
         });
         return scope.response;
     }

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,