@webqit/webflo 0.20.27 → 0.20.28

package/package.json

@@ -12,7 +12,7 @@
     "vanila-javascript"
   ],
   "homepage": "https://webqit.io/tooling/webflo",
-  "version": "0.20.27",
+  "version": "0.20.28",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@octokit/webhooks": "^7.15.1",
     "@webqit/backpack": "^0.1.12",
-    "@webqit/fetch-plus": "^0.1.20",
+    "@webqit/fetch-plus": "^0.1.21",
     "@webqit/keyval": "^0.2.17",
     "@webqit/observer": "^3.8.14",
     "@webqit/oohtml-ssr": "^2.2.2",

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

@@ -237,8 +237,6 @@ export class WebfloClient extends AppRuntime {
 
     _canIntercept(e) { return !(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey); }
 
-    #xRedirectCode = 200;
-
     isHashChange(urlObj) { return _before(this.location.href, '#') === _before(urlObj.href, '#') && (this.location.href.includes('#') || urlObj.href.includes('#')); }
 
     isSpaRoute(urlObj) {
@@ -269,7 +267,6 @@ export class WebfloClient extends AppRuntime {
         const request = super.createRequest(href, init);
         request.headers.set('Accept', 'application/json');
         request.headers.set('X-Redirect-Policy', 'manual-when-cross-spa');
-        request.headers.set('X-Redirect-Code', this.#xRedirectCode);
         request.headers.set('X-Powered-By', '@webqit/webflo');
         return request;
     }
@@ -448,7 +445,7 @@ export class WebfloClient extends AppRuntime {
                 // Must come as first thing
                 const backgroundPort = LiveResponse.getPort(response);
                 this.background.addPort(backgroundPort);
-                 
+
                 const liveResponse = response instanceof LiveResponse
                     ? response
                     : LiveResponse.from(response);
@@ -507,14 +504,9 @@ export class WebfloClient extends AppRuntime {
 
     async processRedirect(response) {
         // Normalize redirect
-        let statusCode = response.status;
-        const xActualRedirectCode = parseInt(response.headers.get('X-Redirect-Code'));
-
-        if (xActualRedirectCode && statusCode === this.#xRedirectCode) {
-            const responseMeta = _meta(response);
-            responseMeta.set('status', xActualRedirectCode); // @NOTE 1
-            statusCode = xActualRedirectCode;
-        }
+        const statusCode = response.headers.has('X-Redirect-Code')
+            ? parseInt(response.headers.get('X-Redirect-Code'))
+            : response.status;
 
         // Trigger redirect
         if ([302, 301].includes(statusCode)) {

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

@@ -520,7 +520,6 @@ export class WebfloServer extends AppRuntime {
     writeRedirectHeaders(httpEvent, response) {
         const $sparoots = this.bootstrap.$sparoots;
         const xRedirectPolicy = httpEvent.request.headers.get('X-Redirect-Policy');
-        const xRedirectCode = httpEvent.request.headers.get('X-Redirect-Code') || 300;
         const destinationURL = new URL(response.headers.get('Location'), httpEvent.url.origin);
         const isSameOriginRedirect = destinationURL.origin === httpEvent.url.origin;
         let isSameSpaRedirect = true;
@@ -536,8 +535,6 @@ export class WebfloServer extends AppRuntime {
             response.headers.set('X-Redirect-Code', response.status);
             response.headers.set('Access-Control-Allow-Origin', '*');
             response.headers.set('Cache-Control', 'no-store');
-            const responseMeta = _meta(response);
-            responseMeta.set('status', xRedirectCode);
         }
     }
 
@@ -973,7 +970,7 @@ export class WebfloServer extends AppRuntime {
         const errorCode = statusCode >= 400 && statusCode < 500 ? statusCode : 0;
         const xRedirectCode = response.headers.get('X-Redirect-Code');
         const isRedirect = (xRedirectCode || statusCode + '').startsWith('3') && (xRedirectCode || statusCode) !== 304;
-        const _statusCode = xRedirectCode && `${xRedirectCode} (${statusCode})` || statusCode;
+        const _statusCode = xRedirectCode && `${statusCode} (${xRedirectCode})` || statusCode;
         const responseMeta = _meta(response);
         // ---------------