@webqit/webflo 1.0.32 → 1.0.33

package/package.json

@@ -12,7 +12,7 @@
     "vanila-javascript"
   ],
   "homepage": "https://webqit.io/tooling/webflo",
-  "version": "1.0.32",
+  "version": "1.0.33",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -41,6 +41,7 @@
     "@webqit/observer": "^2.0.7",
     "@webqit/oohtml-ssr": "^2.1.1",
     "@webqit/util": "^0.8.11",
+    "dotenv": "^16.4.7",
     "esbuild": "^0.14.38",
     "ioredis": "^5.5.0",
     "jsdom": "^21.1.1",

package/src/config-pi/deployment/Env.js

@@ -13,18 +13,13 @@ export default class Env extends Dotfile {
 
     // @desc
     static get ['@desc']() {
-        return 'Environmental variables config.';
-    }
-
-    // isEnv
-    get isEnv() {
-        return true;
+        return 'Environmental variable mappings.';
     }
 
     // Defaults merger
     withDefaults(config) {
         return this.merge({
-            autoload: true,
+            mappings: {}
         }, config, 'patch');
     }
 
@@ -33,13 +28,13 @@ export default class Env extends Dotfile {
         // Questions
         return [
             {
-                name: 'entries',
+                name: 'mappings',
                 type: 'recursive',
                 controls: {
-                    name: 'variable',
+                    name: 'variable mappings',
                     combomode: true,
                 },
-                initial: config.entries,
+                initial: config.mappings,
                 schema: [
                     {
                         name: 'name',
@@ -54,15 +49,7 @@ export default class Env extends Dotfile {
                         validation: ['important'],
                     },
                 ],
-            },
-            {
-                name: 'autoload',
-                type: 'toggle',
-                message: 'Choose whether to autoload variables into "process.env"',
-                active: 'YES',
-                inactive: 'NO',
-                initial: config.autoload,
-            },
+            }
         ];
     }
 }

package/src/config-pi/runtime/Client.js

@@ -28,8 +28,6 @@ export default class Client extends Dotfile {
                 webpush: false,
                 custom_install: false,
                 exposed: ['display-mode', 'notifications'],
-                vapid_public_key_variable: 'VAPID_PUBLIC_KEY',
-                generic_public_webhook_url_variable: 'GENERIC_PUBLIC_WEBHOOK_URL',
             },
         }, config, 'patch');
     }
@@ -102,17 +100,7 @@ export default class Client extends Dotfile {
                         type: 'list',
                         message: 'Specify features exposed on capabilities.exposed',
                         initial: (config.exposed || []).join(', '),
-                    },
-                    {
-                        name: 'vapid_public_key_variable',
-                        type: (prev, answers) => !answers.webpush ? null : 'text',
-                        message: 'Enter the environment variable name for APP_VAPID_PUBLIC_KEY if not as written',
-                    },
-                    {
-                        name: 'generic_public_webhook_url_variable',
-                        type: 'text',
-                        message: 'Enter the environment variable name for GENERIC_PUBLIC_WEBHOOK_URL if not as written',
-                    },
+                    }
                 ]
             }
         ];

package/src/config-pi/runtime/Server.js

@@ -29,17 +29,12 @@ export default class Server extends Dotfile {
                 force: false,
             },
             force_www: '',
-            session_key_variable: 'SESSION_KEY',
             capabilities: {
                 database: false,
                 database_dialect: 'postgres',
-                database_url_variable: 'DATABASE_URL',
                 redis: false,
-                redis_url_variable: 'REDIS_URL',
                 webpush: false,
                 vapid_subject: 'mailto:foo@example.com',
-                vapid_public_key_variable: 'VAPID_PUBLIC_KEY',
-                vapid_private_key_variable: 'VAPID_PRIVATE_KEY',
             },
         }, config, 'patch');
     }
@@ -77,12 +72,6 @@ export default class Server extends Dotfile {
                 choices: CHOICES.force_www,
                 initial: this.indexOfInitial(CHOICES.force_www, config.force_www),
             },
-            {
-                name: 'session_key_variable',
-                type: 'text',
-                message: 'Enter the environment variable name for SESSION_KEY if not as written',
-                initial: config.session_key_variable,
-            },
             {
                 name: 'https',
                 controls: {
@@ -142,11 +131,6 @@ export default class Server extends Dotfile {
                         type: (prev, answers) => !answers.database ? null : 'text',
                         message: 'Enter the database dialect (postgres for now)',
                     },
-                    {
-                        name: 'database_url_variable',
-                        type: (prev, answers) => !answers.database ? null : 'text',
-                        message: 'Enter the environment variable name for DATABASE_URL if not as written',
-                    },
                     {
                         name: 'redis',
                         type: 'toggle',
@@ -154,11 +138,6 @@ export default class Server extends Dotfile {
                         active: 'YES',
                         inactive: 'NO',
                     },
-                    {
-                        name: 'redis_url_variable',
-                        type: (prev, answers) => !answers.redis ? null : 'text',
-                        message: 'Enter the environment variable name for REDIS_URL if not as written',
-                    },
                     {
                         name: 'webpush',
                         type: 'toggle',
@@ -170,17 +149,7 @@ export default class Server extends Dotfile {
                         name: 'vapid_subject',
                         type: (prev, answers) => !answers.webpush ? null : 'text',
                         message: 'Enter the vapid_subject URL',
-                    },
-                    {
-                        name: 'vapid_public_key_variable',
-                        type: (prev, answers) => !answers.webpush ? null : 'text',
-                        message: 'Enter the environment variable name for VAPID_PUBLIC_KEY if not as written',
-                    },
-                    {
-                        name: 'vapid_private_key_variable',
-                        type: (prev, answers) => !answers.webpush ? null : 'text',
-                        message: 'Enter the environment variable name for VAPID_PRIVATE_KEY if not as written',
-                    },
+                    }
                 ]
             },
         ];

package/src/runtime-pi/WebfloStorage.js

@@ -28,8 +28,10 @@ export class WebfloStorage {
     }
 
     async commit() {
-        if (!this.#store || !this.#key || !this.#modified) return;
-        await this.#registry.set(this.#key, this.#store);
+        if (this.#store && this.#key && this.#modified) {
+            await this.#registry.set(this.#key, this.#store);
+        }
+        this.#modified = false;
     }
 
     get size() { return this.store().then((store) => Object.keys(store).length); }
@@ -78,6 +80,7 @@ export class WebfloStorage {
         for (const key of await this.keys()) {
             Reflect.deleteProperty(await this.store(), key);
         }
+        this.#modified = true;
         await this.emit();
         return this;
     }

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

@@ -2,6 +2,7 @@ const { Observer } = webqit;
 
 export class Capabilities {
 
+    #runtime;
     #params;
 
     #exposed = {};
@@ -9,11 +10,10 @@ export class Capabilities {
 
     #cleanups = [];
 
-    static async initialize(params) {
+    static async initialize(runtime, params) {
         const instance = new this;
+        instance.#runtime = runtime;
         instance.#params = params;
-        instance.#params.generic_public_webhook_url = instance.#params.generic_public_webhook_url_variable && instance.#params.env[instance.#params.generic_public_webhook_url_variable];
-        instance.#params.vapid_public_key = instance.#params.vapid_public_key_variable && instance.#params.env[instance.#params.vapid_public_key_variable];
         // --------
         // Custom install
         const onbeforeinstallprompt = (e) => {
@@ -26,11 +26,11 @@ export class Capabilities {
         instance.#cleanups.push(() => window.removeEventListener('beforeinstallprompt', onbeforeinstallprompt));
         // --------
         // Webhooks
-        if (instance.#params.generic_public_webhook_url) {
+        if (instance.#runtime.env('GENERIC_PUBLIC_WEBHOOK_URL')) {
             // --------
             // app.installed
             const onappinstalled = () => {
-                fetch(instance.#params.generic_public_webhook_url, {
+                fetch(instance.#runtime.env('GENERIC_PUBLIC_WEBHOOK_URL'), {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },
                     body: JSON.stringify({ type: 'app.installed', data: true })
@@ -51,7 +51,7 @@ export class Capabilities {
                         if (eventPayload.type === 'push.subscribe' && !eventPayload.data) {
                             return window.queueMicrotask(pushPermissionStatusHandler);
                         }
-                        fetch(instance.#params.generic_public_webhook_url, {
+                        fetch(instance.#runtime.env('GENERIC_PUBLIC_WEBHOOK_URL'), {
                             method: 'POST',
                             headers: { 'Content-Type': 'application/json' },
                             body: JSON.stringify(eventPayload)
@@ -186,8 +186,8 @@ export class Capabilities {
             if (!params.userVisibleOnly) {
                 params = { ...params, userVisibleOnly: true };
             }
-            if (!params.applicationServerKey && this.#params.vapid_public_key) {
-                params = { ...params, applicationServerKey: urlBase64ToUint8Array(this.#params.vapid_public_key) };
+            if (!params.applicationServerKey && this.#runtime.env('VAPID_PUBLIC_KEY')) {
+                params = { ...params, applicationServerKey: urlBase64ToUint8Array(this.#runtime.env('VAPID_PUBLIC_KEY')) };
             }
         }
         return params;

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

@@ -48,6 +48,12 @@ export class WebfloClient extends WebfloRuntime {
         return document.querySelector('meta[name="webflo-viewtransitions"]')?.value;
     }
 
+    env(key) {
+        return key in this.cx.params.mappings
+        ? this.cx.params.env[this.cx.params.mappings[key]]
+        : this.cx.params.env[key];
+    }
+
     constructor(host) {
         super();
         this.#host = host;
@@ -317,6 +323,7 @@ export class WebfloClient extends WebfloRuntime {
                 if (scope.eventLifecyclePromises.dirty && !scope.eventLifecyclePromises.size) {
                     throw new Error('Final response already sent');
                 }
+                await scope.httpEvent.session.commit();
                 return await this.execPush(scope.clientMessaging, response);
             },
         };

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

@@ -52,7 +52,7 @@ export class WebfloRootClient1 extends WebfloClient {
 			this.#workport = await this.constructor.Workport.initialize(null, (this.cx.params.public_base_url || '') + filename, restServiceWorkerParams);
 			cleanups.push(() => this.#workport.close());
 		}
-		this.#capabilities = await this.constructor.Capabilities.initialize({ ...this.cx.params.capabilities, env: this.cx.params.env });
+		this.#capabilities = await this.constructor.Capabilities.initialize(this, this.cx.params.capabilities);
 		cleanups.push(() => this.#capabilities.close());
 		// --------
         // Bind network status handlers

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

@@ -25,14 +25,11 @@ export async function generate() {
     if (!cx.config.deployment?.Layout) {
         throw new Error(`The Client configurator "config.deployment.Layout" is required in context.`);
     }
-    const env = {};
     const clientConfig = await (new cx.config.runtime.Client(cx)).read();
-    clientConfig.env = env;
     if (clientConfig.capabilities?.service_worker && !cx.config.runtime.client?.Worker) {
         throw new Error(`The Service Worker configurator "config.runtime.client.Worker" is required in context.`);
     }
     const workerConfig = await (new cx.config.runtime.client.Worker(cx)).read();
-    workerConfig.env = env;
     // -----------
     if (!cx.config.deployment?.Layout) {
         throw new Error(`The Layout configurator "config.deployment.Layout" is required in context.`);
@@ -43,17 +40,25 @@ export async function generate() {
     const dirClient = Path.resolve(cx.CWD || '', layoutConfig.CLIENT_DIR);
     const dirWorker = Path.resolve(cx.CWD || '', layoutConfig.WORKER_DIR);
     const dirSelf = Path.dirname(Url.fileURLToPath(import.meta.url)).replace(/\\/g, '/');
+    const env = {};
+    const envConfig = { mappings: {} };
+    // Copy vars
     if (clientConfig.copy_public_variables) {
-        if (!cx.config.deployment?.Env) {
-            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();
-        const $env = { ...envConfig.entries, ...process.env };
+        const $env = { ...process.env };
         for (const key in $env) {
             if (!key.includes('PUBLIC_') && !key.includes('_PUBLIC')) continue;
             env[key] = $env[key];
         }
+        if (cx.config.deployment?.Env) {
+            const $envConfig = await (new cx.config.deployment.Env(cx)).read();
+            envConfig.mappings = $envConfig.mappings;
+        }
     }
+    // Expose these nodes
+    clientConfig.env = env;
+    workerConfig.env = env;
+    clientConfig.mappings = envConfig.mappings;
+    workerConfig.mappings = envConfig.mappings;
     // -----------
     // Scan Subdocuments
     const scanSubroots = (sparoot, rootFileName) => {
@@ -76,7 +81,7 @@ export async function generate() {
     const generateClient = async function(sparoot, spaGraphCallback = null) {
         let [ subsparoots, targets ] = (sparoot && scanSubroots(sparoot, 'index.html')) || [ [], false ];
         if (!sparoot) sparoot = '/';
-        let spaRouting = { root: sparoot, subroots: subsparoots, targets };
+        let spaRouting = { name: 'client', root: sparoot, subroots: subsparoots, targets };
         let codeSplitting = !!(sparoot !== '/' || subsparoots.length);
         let outfileMain = Path.join(sparoot, clientConfig.bundle_filename),
             outfileWebflo = _beforeLast(clientConfig.bundle_filename, '.js') + '.webflo.js';
@@ -151,7 +156,7 @@ export async function generate() {
     const generateWorker = async function(workerroot, workerGraphCallback = null) {
         let [ subworkerroots, targets ] = workerroot && scanSubroots(workerroot, 'workerroot') || [ [], false ];
         if (!workerroot) workerroot = '/';
-        let workerRouting = { root: workerroot, subroots: subworkerroots, targets };
+        let workerRouting = { name: 'worker', root: workerroot, subroots: subworkerroots, targets };
         let gen = { imports: {}, code: [], };
         if (cx.logger) {
             cx.logger.log(cx.logger.style.comment(`-----------------`));
@@ -273,17 +278,19 @@ function declareRoutesObj(gen, routesDir, targetDir, varName, routing) {
     let _routesDir = Path.join(routesDir, routing.root),
         _targetDir = Path.join(targetDir, routing.root);
     cx.logger && cx.logger.log(cx.logger.style.keyword(`> `) + `Declaring routes...`);
+    const routeFileEnding = new RegExp(`(?:\\/(?:${routing.name}|index)\\.js)$`);
     // ----------------
     // Directory walker
     const walk = (dir, callback) => {
         Fs.readdirSync(dir).forEach(f => {
             let resource = Path.join(dir, f);
             let _namespace = '/' + Path.relative(routesDir, resource).replace(/\\/g, '/');
-            let namespace = _beforeLast(_namespace, '/index.js') || '/';
             if (Fs.statSync(resource).isDirectory()) {
-                if (routing.subroots.includes(namespace)) return;
+                if (routing.subroots.includes(_namespace)) return;
                 walk(resource, callback);
             } else {
+                if (f === 'index.js' && Fs.existsSync(Path.join(dir, `${routing.name}.js`))) return;
+                let namespace = _namespace.replace(routeFileEnding, '') || '/';
                 let relativePath = Path.relative(_targetDir, resource).replace(/\\/g, '/');
                 callback(resource, namespace, relativePath);
             }
@@ -295,7 +302,7 @@ function declareRoutesObj(gen, routesDir, targetDir, varName, routing) {
     let indexCount = 0;
     if (Fs.existsSync(_routesDir)) {
         walk(_routesDir, (file, namespace, relativePath) => {
-            if (relativePath.endsWith('/index.js')) {
+            if (routeFileEnding.test(relativePath)) {
                 // Import code
                 let routeName = 'index' + (++ indexCount);
                 // IMPORTANT: we;re taking a step back here so that the parent-child relationship for 

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

@@ -157,6 +157,7 @@ export class WebfloWorker extends WebfloRuntime {
 				if (scope.eventLifecyclePromises.dirty && !scope.eventLifecyclePromises.size) {
 					throw new Error('Final response already sent');
 				}
+				await scope.httpEvent.session.commit();
 				return await this.execPush(scope.clientMessaging, response);
 			},
 		};

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

@@ -13,9 +13,9 @@ export class Router extends WebfloRouter {
                 if (_segmentOnFile.index) return _segmentOnFile;
                 var _currentPath = thisTick.trailOnFile.concat(_seg).join('/'),
                     routeHandlerFile;
-                return Fs.existsSync(routeHandlerFile = Path.join(this.cx.CWD, this.cx.layout.SERVER_DIR, _currentPath, 'index.js')) ? { seg: _seg, index: routeHandlerFile } : (
-                    Fs.existsSync(Path.join(this.cx.CWD, this.cx.layout.SERVER_DIR, _currentPath)) ? { seg: _seg, dirExists: true } : _segmentOnFile
-                );
+                return Fs.existsSync(routeHandlerFile = Path.join(this.cx.CWD, this.cx.layout.SERVER_DIR, _currentPath, 'server.js')) || Fs.existsSync(routeHandlerFile = Path.join(this.cx.CWD, this.cx.layout.SERVER_DIR, _currentPath, 'index.js'))
+                    ? { seg: _seg, index: routeHandlerFile }
+                    : (Fs.existsSync(Path.join(this.cx.CWD, this.cx.layout.SERVER_DIR, _currentPath)) ? { seg: _seg, dirExists: true } : _segmentOnFile);
             }, { seg: null });
             thisTick.trail = thisTick.trail.concat(thisTick.currentSegment);
             thisTick.trailOnFile = thisTick.trailOnFile.concat(thisTick.currentSegmentOnFile.seg);
@@ -23,8 +23,11 @@ export class Router extends WebfloRouter {
         } else {
             thisTick.trail = [];
             thisTick.trailOnFile = [];
-            thisTick.currentSegmentOnFile = { index: Path.join(this.cx.CWD, this.cx.layout.SERVER_DIR, 'index.js') };
-            thisTick.exports = Fs.existsSync(thisTick.currentSegmentOnFile.index) 
+            let routeHandlerFile;
+            thisTick.currentSegmentOnFile = Fs.existsSync(routeHandlerFile = Path.join(this.cx.CWD, this.cx.layout.SERVER_DIR, 'server.js')) || Fs.existsSync(routeHandlerFile = Path.join(this.cx.CWD, this.cx.layout.SERVER_DIR, 'index.js'))
+                ? { index: routeHandlerFile }
+                : {};
+            thisTick.exports = thisTick.currentSegmentOnFile.index
                 ? await import(Url.pathToFileURL(thisTick.currentSegmentOnFile.index)) 
                 : null;
         }

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

@@ -30,26 +30,28 @@ export class SessionStorage extends WebfloStorage {
                 sessionID = crypto.randomUUID();
             }
         }
-        return new this(params.registry || inmemSessionRegistry, sessionID, request);
+        return new this(params.registry || inmemSessionRegistry, sessionID, request, params.ttl);
     }
 
     #sessionID;
     get sessionID() { return this.#sessionID; }
+    #ttl;
     
-    constructor(reqistry, sessionID, request) {
+    constructor(reqistry, sessionID, request, ttl) {
         super(
             reqistry,
-            `session:${sessionID}`,
+            `session/${sessionID}`,
             request,
             true
         );
         this.#sessionID = sessionID;
+        this.#ttl = ttl;
     }
 
     async commit(response = null) {
         if (response && !response.headers.get('Set-Cookie', true).find((c) => c.name === '__sessid')) {
             // expires six months
-            response.headers.append('Set-Cookie', `__sessid=${this.#sessionID}; Path=/; Secure; HttpOnly; SameSite=Lax; Max-Age=15768000`);
+            response.headers.append('Set-Cookie', `__sessid=${this.#sessionID}; Path=/; Secure; HttpOnly; SameSite=Lax; Max-Age=${this.#ttl}`);
         }
         await super.commit();
     }

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

@@ -5,6 +5,7 @@ import Http from 'http';
 import Https from 'https';
 import WebSocket from 'ws';
 import Mime from 'mime-types';
+import 'dotenv/config';
 import QueryString from 'querystring';
 import { _from as _arrFrom, _any } from '@webqit/util/arr/index.js';
 import { _isEmpty, _isObject } from '@webqit/util/js/index.js';
@@ -65,20 +66,25 @@ export class WebfloServer extends WebfloRuntime {
         this.#cx = cx;
     }
 
+    env(key) {
+        return key in this.#cx.env.mappings
+        ? process.env[this.#cx.env.mappings[key]]
+        : process.env[key];
+    }
+
     async initialize() {
+        process.on('uncaughtException', (err) => {
+            console.error('Uncaught- Exception:', err);
+        });
+        process.on('unhandledRejection', (reason, promise) => {
+            console.log('Unhandled -Rejection', reason, promise);
+        });
         const resolveContextObj = async (cx, force = false) => {
             if (_isEmpty(cx.layout) || force) { cx.layout = await (new cx.config.deployment.Layout(cx)).read(); }
             if (_isEmpty(cx.server) || force) { cx.server = await (new cx.config.runtime.Server(cx)).read(); }
             if (_isEmpty(cx.env) || force) { cx.env = await (new cx.config.deployment.Env(cx)).read(); }
         };
         await resolveContextObj(this.#cx);
-        if (this.#cx.env.autoload !== false) {
-            Object.keys(this.#cx.env.entries).forEach(key => {
-                if (!(key in process.env)) {
-                    process.env[key] = this.#cx.env.entries[key];
-                }
-            });
-        }
         // ---------------
         if (this.#cx.config.deployment.Proxy) {
             const proxied = await (new this.#cx.config.deployment.Proxy(this.#cx)).read();
@@ -115,18 +121,14 @@ export class WebfloServer extends WebfloRuntime {
             }
             if (this.#proxies.size) {
                 this.#cx.logger.info(`> Reverse proxy active.`);
-                for (let [id, def] of this.#proxies) {
+                for (const [id, def] of this.#proxies) {
                     this.#cx.logger.info(`> ${id} >>> ${def.port}`);
                 }
             }
             this.#cx.logger.info(``);
+            this.#cx.logger.info(`Capabilities: ${Object.keys(this.#sdk).join(', ')}`);
+            this.#cx.logger.info(``);
         }
-        process.on('uncaughtException', (err) => {
-            console.error('Uncaught Exception:', err);
-        });
-        process.on('unhandledRejection', (reason, promise) => {
-            console.log('Unhandled Rejection', reason, promise);
-        });
     }
 
     control() {
@@ -189,55 +191,45 @@ export class WebfloServer extends WebfloRuntime {
             if (this.#cx.server.capabilities.database_dialect !== 'postgres') {
                 throw new Error(`Only postgres supported for now for database dialect`);
             }
-            if (process.env[this.#cx.server.capabilities.database_url_variable]) {
-                console.log('Database capabilities');
+            if (this.env('DATABASE_URL')) {
                 const { SQLClient } = await import('@linked-db/linked-ql/sql');
                 const { default: pg } = await import('pg');
                 // Obtain pg client
                 const pgClient = new pg.Pool({
-                    connectionString: process.env[this.#cx.server.capabilities.database_url_variable],
-                    database: 'postgres',
-                    idle_in_transaction_session_timeout: 0
+                    connectionString: this.env('DATABASE_URL')
                 });
-                // Connect
                 await (async function connect() {
-                    /*
                     pgClient.on('error', (e) => {
-                        console.log('____________error_', e);
+                        console.log('PG Error', e);
                     });
                     pgClient.on('end', (e) => {
-                        console.log('____________end_', e);
+                        console.log('PG End', e);
                     });
                     pgClient.on('notice', (e) => {
-                        console.log('____________notice_', e);
+                        console.log('PG Notice', e);
                     });
-                    */
                     await pgClient.connect();
                 })();
                 this.#sdk.db = new SQLClient(pgClient, { dialect: 'postgres' });
             } else {
-                console.log('No database capabilities');
                 //const { ODBClient } = await import('@linked-db/linked-ql/odb');
                 //this.#sdk.db = new ODBClient({ dialect: 'postgres' });
             }
         }
         if (this.#cx.server.capabilities?.redis) {
             const { Redis } = await import('ioredis');
-            this.#sdk.redis = process.env[this.#cx.server.capabilities.redis_url_variable]
-                ? new Redis(process.env[this.#cx.server.capabilities.redis_url_variable])
+            this.#sdk.redis = this.env('REDIS_URL')
+                ? new Redis(this.env('REDIS_URL'))
                 : new Redis;
-            console.log('Redis capabilities', process.env[this.#cx.server.capabilities.redis_url_variable] ? 'with url' : '');
         }
         if (this.#cx.server.capabilities?.webpush) {
             const { default: webpush } = await import('web-push');
-            console.log('Webpuah capabilities');
             this.#sdk.webpush = webpush;
-            if (process.env[this.#cx.server.capabilities.vapid_public_key_variable]
-            && process.env[this.#cx.server.capabilities.vapid_private_key_variable]) {
+            if (this.env('VAPID_PUBLIC_KEY') && this.env('VAPID_PRIVATE_KEY')) {
                 webpush.setVapidDetails(
                     this.#cx.server.capabilities.vapid_subject,
-                    process.env[this.#cx.server.capabilities.vapid_public_key_variable],
-                    process.env[this.#cx.server.capabilities.vapid_private_key_variable]
+                    this.env('VAPID_PUBLIC_KEY'),
+                    this.env('VAPID_PRIVATE_KEY')
                 );
             }
         }
@@ -280,11 +272,12 @@ export class WebfloServer extends WebfloRuntime {
         // and actual processing
         scope.request = this.createRequest(scope.url.href, requestInit);
         scope.session = this.constructor.SessionStorage.create(scope.request, {
-            secret: process.env[this.#cx.server.session_key_variable],
+            secret: this.env('SESSION_KEY'),
             registry: this.#sdk.redis && {
-                get: async (key) => { return JSON.parse(await this.#sdk.redis.get(key) || null) },
-                set: async (key, value) => { return await this.#sdk.redis.set(key, JSON.stringify(value), 'EX', 15768000) },
+                get: async (key) => { return JSON.parse(await this.#sdk.redis.get(`${scope.url.host}/${key}`) || null) },
+                set: async (key, value) => { return await this.#sdk.redis.set(`${scope.url.host}/${key}`, JSON.stringify(value), 'EX', this.env('SESSION_TTL') || 2592000/*30days*/) },
             },
+            ttl: this.env('SESSION_TTL') || 2592000/*30days*/,
         });
         if (!scope.error) {
             if (!(scope.clientMessagingRegistry = this.#globalMessagingRegistry.get(scope.session.sessionID))) {
@@ -573,6 +566,7 @@ export class WebfloServer extends WebfloRuntime {
                     console.error('Final response already sent');
                     return;
                 }
+                await scope.httpEvent.session.commit();
                 return await this.execPush(scope.clientMessaging, response);
             },
         };
@@ -584,11 +578,12 @@ 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: process.env[this.#cx.server.session_key_variable],
+            secret: this.env('SESSION_KEY'),
             registry: this.#sdk.redis && {
-                get: async (key) => { return JSON.parse(await this.#sdk.redis.get(key) || null) },
-                set: async (key, value) => { return await this.#sdk.redis.set(key, JSON.stringify(value), 'EX', 15768000) },
+                get: async (key) => { return JSON.parse(await this.#sdk.redis.get(`${scope.url.host}/${key}`) || null) },
+                set: async (key, value) => { return await this.#sdk.redis.set(`${scope.url.host}/${key}`, JSON.stringify(value), 'EX', this.env('SESSION_TTL') || 2592000/*30days*/); },
             },
+            ttl: this.env('SESSION_TTL') || 2592000/*30days*/,
         });
         const sessionID = scope.session.sessionID;
         if (!this.#globalMessagingRegistry.has(sessionID)) {