@soundworks/core 3.1.0-beta.4 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soundworks/core",
-  "version": "3.1.0-beta.4",
+  "version": "3.1.0",
   "description": "full-stack javascript framework for distributed audio visual experiences on the web",
   "authors": [
     "Benjamin Matuszewski",
@@ -33,34 +33,34 @@
   },
   "dependencies": {
     "chalk": "^4.1.2",
-    "columnify": "^1.5.4",
+    "columnify": "^1.6.0",
     "compression": "^1.7.1",
-    "debug": "^4.1.1",
+    "debug": "^4.3.4",
     "fast-deep-equal": "^3.1.3",
     "fast-text-encoding": "^1.0.0",
     "isomorphic-ws": "^4.0.1",
-    "keyv": "^4.0.3",
+    "keyv": "^4.2.2",
     "keyv-file": "^0.2.0",
     "lodash.clonedeep": "^4.5.0",
     "lodash.merge": "^4.6.2",
-    "pem": "^1.12.5",
+    "pem": "^1.14.6",
     "polka": "^0.5.2",
-    "serve-static": "^1.13.2",
+    "serve-static": "^1.15.0",
     "uuid": "^8.3.2",
     "window-or-global": "^1.0.1",
-    "ws": "^8.2.3"
+    "ws": "^8.5.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.4.4",
-    "@babel/core": "^7.4.5",
-    "@babel/preset-env": "^7.4.5",
-    "chai": "^4.2.0",
-    "chokidar": "^3.0.1",
+    "@babel/cli": "^7.17.6",
+    "@babel/core": "^7.17.9",
+    "@babel/preset-env": "^7.16.11",
+    "chai": "^4.3.6",
+    "chokidar": "^3.5.3",
     "chokidar-cli": "^3.0.0",
     "docdash": "^1.2.0",
-    "jsdoc": "^3.6.2",
+    "jsdoc": "^3.6.10",
     "markdown-toc": "^1.2.0",
-    "mocha": "^9.1.3"
+    "mocha": "^9.2.2"
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.5",

package/server/Server.js

@@ -237,7 +237,8 @@ class Server {
           path: 'socket',
           pingInterval: 5000
         },
-        useHttps: false
+        useHttps: false,
+        crossOriginIsolated: true
       },
       app: {
         name: 'soundworks'
@@ -264,7 +265,37 @@ class Server {
       }
     }
 
-    this._clientConfigFunction = clientConfigFunction;
+    this._clientConfigFunction = clientConfigFunction; // basic http authentication
+
+    if (this.config.env.auth) {
+      this.router.use((req, res, next) => {
+        const isProtected = this.config.env.auth.clients.map(type => req.path.endsWith(`/${type}`)).reduce((acc, value) => acc || value, false);
+
+        if (isProtected) {
+          // authentication middleware
+          const auth = this.config.env.auth; // parse login and password from headers
+
+          const b64auth = (req.headers.authorization || '').split(' ')[1] || '';
+          const [login, password] = Buffer.from(b64auth, 'base64').toString().split(':'); // verify login and password are set and correct
+
+          if (login && password && login === auth.login && password === auth.password) {
+            // -> access granted...
+            return next();
+          } // -> access denied...
+
+
+          res.writeHead(401, {
+            'WWW-Authenticate': 'Basic',
+            'Content-Type': 'text/plain'
+          });
+          res.end('Authentication required.');
+        } else {
+          // route not protected
+          return next();
+        }
+      });
+    }
+
     return Promise.resolve();
   }
   /**
@@ -414,7 +445,7 @@ class Server {
           }
         }
 
-        _logger.default.clientConfigAndRouting(routes, this.config.app.clients, this.config.env.serverIp);
+        _logger.default.clientConfigAndRouting(routes, this.config);
 
         return Promise.resolve();
       }).then(() => {
@@ -512,6 +543,18 @@ class Server {
 
       if (this.config.env.subpath && !data.env.subpath) {
         data.env.subpath = this.config.env.subpath;
+      } // cors / coop / coep headers for `crossOriginIsolated pages, enables
+      // sharedArrayBuffers and high precision timers
+      // this is the default behavior
+      // cf. https://web.dev/why-coop-coep/
+
+
+      if (this.config.env.crossOriginIsolated) {
+        res.writeHead(200, {
+          'Cross-Origin-Resource-Policy': 'same-origin',
+          'Cross-Origin-Embedder-Policy': 'require-corp',
+          'Cross-Origin-Opener-Policy': 'same-origin'
+        });
       }
 
       const appIndex = tmpl(data);

package/server/utils/logger.js

@@ -19,7 +19,10 @@ const logger = {
     console.log(_chalk.default.cyan(`+ ${msg}`));
   },
 
-  clientConfigAndRouting(routes, clientsConfig, serverIp) {
+  clientConfigAndRouting(routes, config) {
+    const clientsConfig = config.app.clients;
+    const serverIp = config.env.serverIp;
+    const auth = config.env.auth;
     const table = [];
 
     for (let clientType in clientsConfig) {
@@ -27,18 +30,20 @@ const logger = {
 
       if (client.target === 'node') {
         const line = {
-          clientType: `${clientType}`,
+          client_type: `> ${clientType}`,
           target: _chalk.default.red(client.target),
           path: `server ip: ${_chalk.default.green(serverIp)}`,
-          default: undefined
+          default: undefined,
+          auth: undefined
         };
         table.push(line);
       } else if (client.target === 'browser') {
         const line = {
-          clientType: `${clientType}`,
+          client_type: `> ${clientType}`,
           target: _chalk.default.red(client.target),
           path: routes.find(r => r.clientType === clientType) ? _chalk.default.green(routes.find(r => r.clientType === clientType).path) : _chalk.default.red('no route defined'),
-          default: client.default ? 'default' : undefined
+          default: client.default ? 'x' : undefined,
+          auth: auth && auth.clients.indexOf(clientType) !== -1 ? 'x' : undefined
         };
         table.push(line);
       } else {
@@ -46,10 +51,21 @@ const logger = {
       }
     }
 
+    console.log(``);
     console.log((0, _columnify.default)(table, {
-      showHeaders: false,
-      minWidth: 14
-    })); // check if a route is defined but not in config
+      showHeaders: true,
+      minWidth: 6,
+      columnSplitter: ' | ',
+      config: {
+        default: {
+          align: 'center'
+        },
+        auth: {
+          align: 'center'
+        }
+      }
+    }));
+    console.log(``); // check if a route is defined but not in config
 
     const configClientTypes = Object.keys(clientsConfig);
     routes.forEach(r => {