@webqit/webflo 0.11.37 → 0.11.39

package/package.json

@@ -12,7 +12,7 @@
     "vanila-javascript"
   ],
   "homepage": "https://webqit.io/tooling/webflo",
-  "version": "0.11.37",
+  "version": "0.11.39",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -43,7 +43,7 @@
     "esbuild": "^0.14.38",
     "form-data-encoder": "^1.6.0",
     "formdata-node": "^4.3.0",
-    "formidable": "^2.0.0-dev.20200131.2",
+    "formidable": "^2.0.1",
     "mime-types": "^2.1.33",
     "node-fetch": "^2.6.1",
     "simple-git": "^2.20.1",

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

@@ -21,14 +21,14 @@ export default class Server extends Dotfile {
         return this.merge({
             port: process.env.port || 3000,
             domains: [],
-            force_www: '',
             https: {
                 port: 0,
-                keyfile: '',
-                certfile: '',
                 domains: [],
+                keyfile: '/etc/letsencrypt/live/[domain]/privkey.pem',
+                certfile: '/etc/letsencrypt/live/[domain]/fullchain.pem',
                 force: false,
             },
+            force_www: '',
             oohtml_support: 'full',
         }, config, 'patch');
     }

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

@@ -220,7 +220,12 @@ export default class Runtime extends _Runtime {
      * @return Array
      */
     async parseNodeRequest(proto, request) {
-        const fullUrl = proto + '://' + request.headers.host + request.url;
+        let url = request.url;
+        // Detected when using manual proxy setting in a browser
+        if (url.startsWith(`http://${ request.headers.host }`) || url.startsWith(`https://${ request.headers.host }`)) {
+            url = url.split(request.headers.host)[1];
+        }
+        const fullUrl = proto + '://' + request.headers.host + url;
         const requestInit = { method: request.method, headers: request.headers };
         if (request.method !== 'GET' && request.method !== 'HEAD') {
             requestInit.body = await new Promise((resolve, reject) => {

package/src/runtime-pi/xfetch.js

@@ -2,9 +2,9 @@
 /**
  * The xfetch Mixin
  */
-const xfetch = (whatwagFetch, xRequest) => {
+const xfetch = (whatwagFetch, xRequest = null) => {
     return (url, init = {}) => {
-        if (init.body && (typeof init.body === 'object')) {
+        if (init.body && (typeof init.body === 'object') && xRequest) {
             return whatwagFetch(new xRequest(url, init));
         }
         return whatwagFetch(url, init);