@webqit/webflo 0.11.32 → 0.11.33

package/package.json

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

package/src/runtime-pi/Cookies.js

@@ -22,7 +22,7 @@ export default class Cookies extends Map {
         retrn = super.set(name, valueObj);
         if (!this.outLock) {
             if (_isObject(value)) { valueStr = this.stringifyEntry(value); }
-            this.headers.append(this.headers.cookieHeaderName, `${ name }=${ valueStr }`);
+            append(this.headers, `${ name }=${ valueStr }`);
         }
         // -----------------
         this.inLock = false;
@@ -36,7 +36,7 @@ export default class Cookies extends Map {
         let retrn = super.delete(name);
         this.headers.delete(this.headers.cookieHeaderName);
         for (let [ name, definition ] of this) {
-            this.headers.append(this.headers.cookieHeaderName, `${ name }=${ this.stringifyEntry(definition) }`);
+            append(this.headers, `${ name }=${ this.stringifyEntry(definition) }`);
         }
         // -----------------
         this.inLock = false;
@@ -72,4 +72,11 @@ export default class Cookies extends Map {
         return this.headers.get(this.headers.cookieHeaderName);
     }
 
+}
+
+function append(headers, value) {
+    let values = [value];
+    let currentValue = headers.get(headers.cookieHeaderName);
+    if (currentValue) { values.unshift(currentValue); }
+    headers.set(headers.cookieHeaderName, values.join(headers.cookieHeaderSeparator));
 }

package/src/runtime-pi/xRequestHeaders.js

@@ -36,6 +36,10 @@ const xRequestHeaders = NativeHeaders => class extends xHeaders(NativeHeaders) {
     get cookieHeaderName() {
         return 'Cookie';
     }
+        
+    get cookieHeaderSeparator() {
+        return ';';
+    }
 
     get Cookies() {
         return Cookies;

package/src/runtime-pi/xResponseHeaders.js

@@ -55,6 +55,10 @@ const _ResponseHeaders = NativeHeaders => class extends _Headers(NativeHeaders)
     get cookieHeaderName() {
         return 'Set-Cookie';
     }
+        
+    get cookieHeaderSeparator() {
+        return ',';
+    }
 
     get Cookies() {
         return Cookies;

package/src/services-pi/cert/http-auth-hook.js

@@ -1,11 +1,11 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 /**
  * imports
  */
 import Fs from 'fs';
 import Path from 'path';
-import * as _layout from '../../config/layout.js';
+import Layout from '../../config-pi/deployment/Layout.js';
 
 // ------------------------------------------
 
@@ -16,8 +16,8 @@ const domain = process.env.CERTBOT_DOMAIN,
     allDomains = process.env.CERTBOT_ALL_DOMAINS.split(',')*/
     ;
 (async function() {
-    const layout = await _layout.read({});
+    const layout = await (new Layout({ name: 'webflo', flags: {} })).read();
     const acmeDir = Path.join(layout.PUBLIC_DIR, './.well-known/acme-challenge/');
     Fs.mkdirSync(acmeDir, {recursive:true});
     Fs.writeFileSync(Path.join(acmeDir, token), validation);
-})();
+})();

package/src/services-pi/cert/http-cleanup-hook.js

@@ -1,11 +1,11 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 /**
  * imports
  */
 import Fs from 'fs';
 import Path from 'path';
-import * as _layout from '../../config/layout.js';
+import Layout from '../../config-pi/deployment/Layout.js';
 
 // ------------------------------------------
 
@@ -17,7 +17,7 @@ const domain = process.env.CERTBOT_DOMAIN,
     allDomains = process.env.CERTBOT_ALL_DOMAINS.split(',')*/
     ;
 (async function() {
-    const layout = await _layout.read({});
+    const layout = await (new Layout({ name: 'webflo', flags: {} })).read();
     const acmeFile = Path.join(layout.PUBLIC_DIR, './.well-known/acme-challenge/', token);
     Fs.unlinkSync(acmeFile);
-})();
+})();