@webqit/webflo 0.20.28 → 0.20.29

package/src/runtime-pi/webflo-client/webflo-embedded.js

@@ -1,5 +1,9 @@
-export function defineElement(WebfloSubClient, embedTagNames = 'webflo-embedded') {
-    window.customElements.define(embedTagNames, class extends HTMLElement {
+import { WebfloSubClient } from './WebfloSubClient.js';
+
+export function defineElement() {
+    const embedTagName = 'webflo-embedded';
+
+    window.customElements.define(embedTagName, class extends HTMLElement {
 
         #superRuntime;
         #lifecycleController;
@@ -39,7 +43,7 @@ export function defineElement(WebfloSubClient, embedTagNames = 'webflo-embedded'
         }
 
         async connectedCallback() {
-            this.#superRuntime = (this.parentNode?.closest(embedTagNames) || document).webfloRuntime;
+            this.#superRuntime = (this.parentNode?.closest(embedTagName) || document).webfloRuntime;
             this.#lifecycleController = await WebfloSubClient.create(this.#superRuntime, this).initialize();
         }
 

package/src/runtime-pi/webflo-routing/HttpCookies101.js

@@ -20,7 +20,7 @@ export class HttpCookies101 extends HttpKeyvalInterface {
     // ------ extras
 
     async render() {
-        const json = await this.json(true);
+        const json = await this.json({ meta: true });
 
         const entries = Object.keys(json).concat(Object.keys(this.#initial)).map((key) => {
             const a = this.#initial[key];
@@ -45,8 +45,11 @@ export function renderCookieObjToString(cookieObj) {
     const attrsArr = [`${cookieObj.name}=${/*encodeURIComponent*/(cookieObj.value)}`];
     for (const attrName in cookieObj) {
         if (['name', 'value'].includes(attrName)) continue;
+        
         let _attrName = attrName[0].toUpperCase() + attrName.substring(1);
         if (_attrName === 'MaxAge') { _attrName = 'Max-Age' };
+
+        if (cookieObj[attrName] === false) continue;
         attrsArr.push(cookieObj[attrName] === true ? _attrName : `${_attrName}=${cookieObj[attrName]}`);
     }
     return attrsArr.join('; ');

package/src/runtime-pi/webflo-routing/HttpEvent111.js

@@ -30,7 +30,7 @@ export class HttpEvent111 {
             node._context.parentEvent = this;
         });
 
-        this.#url = new URLPlus(this.#init.request.url);
+        this.#url = new URLPlus(this.#init.request.url, undefined, { immutable: true });
 
         this._parentEvent?.signal.addEventListener('abort', () => this.#abortController.abort(), { once: true });
         this.#init.request.signal?.addEventListener('abort', () => this.#abortController.abort(), { once: true });
@@ -168,9 +168,12 @@ export class HttpEvent111 {
         const urlRewrite = new URL(url, this.request.url);
         const newThread = this.thread.spawn(urlRewrite.searchParams.get('_thread'));
         urlRewrite.searchParams.set('_thread', newThread.threadID);
-        await newThread.append('back', this.request.url.replace(urlRewrite.origin, ''));
-        for (const [key, value] of Object.entries(data)) {
-            await newThread.append(key, value);
+
+        const back = this.request.url.replace(urlRewrite.origin, '');
+        await newThread.appendEach({ back, ...data });
+
+        if (this.url.query['_thread']) {
+            this.thread.extend();
         }
         //-----
         return await this.respondWith(null, { status, ...options, headers: { Location: urlRewrite.href } });

package/src/runtime-pi/webflo-routing/HttpKeyvalInterface.js

@@ -46,10 +46,11 @@ export class HttpKeyvalInterface {
     async keys() { return [...await this.#store.keys()]; }
     async values() { return [...await this.#store.values()]; }
     async entries() { return [...await this.#store.entries()]; }
-    async has(key) { return await this.#store.has(key); }
-    async get(key) { return await this.#store.get(key); }
-    async set(key, value) { await this.#store.set(key, value); }
-    async delete(key) { await this.#store.delete(key); }
+    async has(...args) { return await this.#store.has(...args); }
+    async get(...args) { return await this.#store.get(...args); }
+    async set(...args) { await this.#store.set(...args); }
+    async patch(...args) { await this.#store.patch(...args); }
+    async delete(...args) { await this.#store.delete(...args); }
     async clear() { await this.#store.clear(); }
     async json(...args) { return await this.#store.json(...args); }
 

package/src/runtime-pi/webflo-routing/HttpSession001.js

@@ -4,9 +4,8 @@ export class HttpSession001 extends HttpKeyvalInterface {
 
     #sessionID;
     get sessionID() { return this.#sessionID; }
-    #ttl;
     
-    constructor({ context = {}, store, request, thread, sessionID, ttl }) {
+    constructor({ context = {}, store, request, thread, sessionID }) {
         if (!sessionID) {
             throw new Error(`sessionID is required`);
         }
@@ -16,9 +15,7 @@ export class HttpSession001 extends HttpKeyvalInterface {
             request,
             thread,
             sessionID,
-            ttl
         });
         this.#sessionID = sessionID;
-        this.#ttl = ttl;
     }
 }

package/src/runtime-pi/webflo-routing/HttpThread111.js

@@ -6,8 +6,8 @@ export class HttpThread111 {
 
     static create({ context = {}, store, threadID, realm = 0 }) {
         let hydrationMode = true;
-        if (!threadID || !(new RegExp(`^wq\\.${realm}\\.`)).test(threadID)) {
-            threadID = `wq.${realm}.${(0 | Math.random() * 9e6).toString(36)}`;//`wq.${realm}.${crypto.randomUUID()}`;
+        if (!threadID || !/^[01]{3}-/.test(threadID)) {
+            threadID = `${realm === 3 ? '001' : '110'}-${(0 | Math.random() * 9e6).toString(36)}`;
             hydrationMode = false;
         }
         return new this({ context, store, threadID, realm, lifecycle: { dirty: hydrationMode, extended: false } });
@@ -75,63 +75,51 @@ export class HttpThread111 {
         return Object.keys(thread);
     }
 
-    async has(key, filter = null) {
+    async has(key) {
         if (!this.#lifecycle.dirty) return false;
-        if (filter === true || !filter) return (await this.keys()).includes(key);
-        const thread = await this.#store.get(this.#threadID) || {};
-        const values = [].concat(thread[key] ?? []);
-        return values.findIndex(filter) !== -1;
+        return (await this.keys()).includes(key);
     }
 
     async append(key, value) {
         this.#lifecycle.dirty = true;
+
         const thread = await this.#store.get(this.#threadID) || {};
-        thread[key] = [].concat(thread[key] ?? []);
-        thread[key].push(value);
+        thread[key] = { content: value, context: thread[key] };
+
         await this.#store.set(this.#threadID, thread);
     }
 
-    async get(key, filter = null) {
-        if (!this.#lifecycle.dirty) return filter === true ? [] : undefined;
+    async appendEach(hash) {
+        this.#lifecycle.dirty = true;
+
         const thread = await this.#store.get(this.#threadID) || {};
-        const values = [].concat(thread[key] ?? []);
+        for (const [key, value] of Object.entries(hash)) {
+            thread[key] = { content: value, context: thread[key] };
+        }
 
-        let value;
-        if (filter === true) {
-            value = values;
-        } else if (filter) {
-            value = values.find(filter);
-        } else { value = values[values.length - 1]; }
+        await this.#store.set(this.#threadID, thread);
+    }
 
-        return value;
+    async get(key, withContext = false) {
+        if (!this.#lifecycle.dirty) return null;
+        const thread = await this.#store.get(this.#threadID) || {};
+        return (withContext ? thread[key] : thread[key]?.content) || null;
     }
 
-    async consume(key, filter = null) {
-        if (!this.#lifecycle.dirty) return filter === true ? [] : undefined;
+    async consume(key, withContext = false) {
+        if (!this.#lifecycle.dirty) return null;
         const thread = await this.#store.get(this.#threadID) || {};
-        const values = [].concat(thread[key] ?? []);
-
-        let value;
-        if (filter === true) {
-            delete thread[key];
-            value = values;
-        } else if (filter) {
-            const i = values.findIndex(filter);
-            if (i !== -1) {
-                value = values.splice(i, 1)[0];
-            }
-        } else { value = values.pop(); }
-
-        if (!values.length) {
-            delete thread[key];
-        }
+
+        const value = thread[key];
+        delete thread[key];
+
         if (!Object.keys(thread).length) {
             await this.#store.delete(this.#threadID);
         } else {
             await this.#store.set(this.#threadID, thread);
         }
 
-        return value;
+        return (withContext ? value : value?.content) || null;
     }
 
     async clear() {

package/src/runtime-pi/webflo-routing/KeyvalsFactory001.js

@@ -37,11 +37,11 @@ export class KeyvalsFactory001 extends KeyvalsFactoryInterface {
     }
 
     create({ type, ...options }) {
-        const { path, ttl = 0 } = options;
+        const { path, ttl = null } = options;
 
         if (!Array.isArray(path) || path.length !== 2) throw new Error('Path must be an array of length 2');
         if (options.origins && (!Array.isArray(options.origins) || options.origins.length !== 1)) throw new Error('Origins must be an array of length 1');
-        if (ttl && typeof ttl !== 'number') throw new Error('TTL must be a number');
+        if (ttl !== null && typeof ttl !== 'number') throw new Error('TTL must be a number');
 
         const origins = (options.origins || this.defaultOrigins).concat(this.instanceID);
 

package/src/runtime-pi/webflo-routing/KeyvalsFactory110.js

@@ -32,11 +32,11 @@ export class KeyvalsFactory110 extends KeyvalsFactoryInterface {
     }
 
     create({ type = 'indexeddb', ...options }) {
-        const { path, ttl = 0 } = options;
+        const { path, ttl = null } = options;
 
         if (!Array.isArray(path) || path.length !== 2) throw new Error('Path must be an array of length 2');
         if (options.origins && (!Array.isArray(options.origins) || options.origins.length !== 1)) throw new Error('Origins must be an array of length 1');
-        if (ttl && typeof ttl !== 'number') throw new Error('TTL must be a number');
+        if (ttl !== null && typeof ttl !== 'number') throw new Error('TTL must be a number');
 
         const origins = (options.origins || this.defaultOrigins).concat(this.instanceID);
 

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

@@ -249,7 +249,9 @@ export class WebfloServer extends AppRuntime {
 
     identifyIncoming(request, autoGenerateID = false) {
         const secret = this.env('SESSION_KEY');
+
         let tenantID = request.headers.get('Cookie', true).find((c) => c.name === '__sessid')?.value;
+        
         if (tenantID?.includes('.')) {
             if (secret) {
                 const [rand, signature] = tenantID.split('.');
@@ -262,10 +264,12 @@ export class WebfloServer extends AppRuntime {
             } else {
                 tenantID = null;
             }
-        }
+        } else tenantID = null;
+
         if (!tenantID) {
             tenantID = request.headers.get('Authorization')?.replace(/\s+/, '_');
         }
+
         if (!tenantID && autoGenerateID) {
             if (secret) {
                 const rand = `${(0 | Math.random() * 9e6).toString(36)}`;
@@ -277,6 +281,7 @@ export class WebfloServer extends AppRuntime {
                 tenantID = crypto.randomUUID();
             }
         }
+
         return tenantID;
     }
 
@@ -708,15 +713,15 @@ export class WebfloServer extends AppRuntime {
         // Thread
         scopeObj.thread = HttpThread111.create({
             context: {},
-            store: this.#keyvals.create({ path: ['thread', scopeObj.tenantID], origins }),
+            store: this.#keyvals.create({ path: ['thread', scopeObj.tenantID], origins, ttl: 60*60*24*30/* 30 days */ }),
             threadID: scopeObj.url.searchParams.get('_thread'),
             realm: 3
         });
 
         // Cookies
-        const entries = scopeObj.request.headers.get('Cookie', true).map((c) => [c.name, c]);
+        const entries = scopeObj.request.headers.get('Cookie', true).map((c) => [c.name, c.value]);
         const store = InMemoryKV.create({ path: ['cookies', scopeObj.tenantID] });
-        entries.forEach(([key, value]) => store.set(key, { value }));
+        entries.forEach(([key, value]) => store.set({ key, value }));
         const initial = Object.fromEntries(entries);
         scopeObj.cookies = HttpCookies101.create({
             context: { handlersRegistry: this.#keyvals.getHandlers('cookies', true) },
@@ -730,7 +735,6 @@ export class WebfloServer extends AppRuntime {
             context: { handlersRegistry: this.#keyvals.getHandlers('session', true) },
             store: this.#keyvals.create({ path: ['session', scopeObj.tenantID], ttl: scopeObj.sessionTTL, origins }),
             sessionID: scopeObj.tenantID,
-            ttl: scopeObj.sessionTTL,
             realm: 3
         });
 

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

@@ -142,7 +142,7 @@ export class WebfloWorker extends AppRuntime {
 		// Thread
 		scopeObj.thread = HttpThread111.create({
 			context: {},
-			store: this.#keyvals.create({ path: ['thread', scopeObj.tenantID], origins }),
+			store: this.#keyvals.create({ path: ['thread', scopeObj.tenantID], origins, ttl: 60*60*24*30/* 30 days */ }),
 			threadID: scopeObj.url.searchParams.get('_thread'),
 			realm: 2
 		});