@webqit/webflo 0.20.21 → 0.20.23

package/package.json

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

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

@@ -3,7 +3,7 @@ import Url from 'url';
 import Path from 'path';
 import Http from 'http';
 import Https from 'https';
-import WebSocket from 'ws';
+import { WebSocketServer } from 'ws';
 import Mime from 'mime-types';
 import crypto from 'crypto';
 import 'dotenv/config';
@@ -226,7 +226,7 @@ export class WebfloServer extends WebfloRuntime {
             });
         }
 
-        const wss = new WebSocket.Server({ noServer: true });
+        const wss = new WebSocketServer({ noServer: true });
 
         process.on('uncaughtException', (err) => {
             console.error('Uncaught Exception:', err);
@@ -505,7 +505,7 @@ export class WebfloServer extends WebfloRuntime {
             const matchRoot = path => sparoots.reduce((prev, root) => prev || (`${path}/`.startsWith(`${root}/`) && root), null);
             isSameSpaRedirect = matchRoot(destinationURL.pathname) === matchRoot(httpEvent.url.pathname);
         }
-        if (xRedirectPolicy === 'manual' || (!isSameOriginRedirect && xRedirectPolicy === 'manual-when-cross-origin') || (!isSameSpaRedirect && xRedirectPolicy === 'manual-when-cross-spa')) {
+        if (xRedirectPolicy === 'manual' || (!isSameOriginRedirect && (xRedirectPolicy === 'manual-when-cross-origin' || xRedirectPolicy === 'manual-when-cross-spa')) || (!isSameSpaRedirect && xRedirectPolicy === 'manual-when-cross-spa')) {
             response.headers.set('X-Redirect-Code', responseShim.prototype.status.get.call(response));
             response.headers.set('Access-Control-Allow-Origin', '*');
             response.headers.set('Cache-Control', 'no-store');