@soundworks/core 3.1.0-beta.6 → 3.2.1

package/client/Socket.js

@@ -91,6 +91,7 @@ class Socket {
     }
 
     let url;
+    let webSocketOptions;
 
     if (isBrowser()) {
       const protocol = window.location.protocol.replace(/^http?/, 'ws');
@@ -99,13 +100,17 @@ class Socket {
         port
       } = window.location;
       url = `${protocol}//${hostname}:${port}/${path}`;
+      webSocketOptions = {};
     } else {
-      const protocol = config.useHttps ? 'wss:' : 'ws:';
+      const protocol = config.env.useHttps ? 'wss:' : 'ws:';
       const {
         serverIp,
         port
       } = config.env;
       url = `${protocol}//${serverIp}:${port}/${path}`;
+      webSocketOptions = {
+        rejectUnauthorized: false
+      };
     }
 
     const queryParams = `clientType=${clientType}&key=${key}`; // ----------------------------------------------------------
@@ -116,7 +121,7 @@ class Socket {
     await new Promise((resolve, reject) => {
       const trySocket = async () => {
         log(`[string socket] trying connection - url: ${stringSocketUrl}`);
-        const ws = new _isomorphicWs.default(stringSocketUrl);
+        const ws = new _isomorphicWs.default(stringSocketUrl, webSocketOptions);
         ws.addEventListener('open', connectEvent => {
           // parse incoming messages for pubsub
           this.ws = ws;
@@ -154,7 +159,7 @@ class Socket {
     const binarySocketUrl = `${url}?binary=1&${queryParams}`;
     await new Promise((resolve, reject) => {
       log(`[binary socket] trying connection - url: ${binarySocketUrl}`);
-      const ws = new _isomorphicWs.default(binarySocketUrl);
+      const ws = new _isomorphicWs.default(binarySocketUrl, webSocketOptions);
       ws.binaryType = 'arraybuffer';
       ws.addEventListener('open', connectEvent => {
         // parse incoming messages for pubsub

package/client.js

@@ -0,0 +1,28 @@
+"use strict";
+
+/**
+ * This is a dirty shortcut to enable cleaner import in template using `type=module`
+ * This should be cleaned little by little...
+ *
+ * We need to define if we can be backward compatible there if we go to full module (probably not)
+ */
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.Client = exports.AbstractExperience = void 0;
+
+var _AbstractExperience2 = _interopRequireDefault(require("./client/AbstractExperience.js"));
+
+var _Client2 = _interopRequireDefault(require("./client/Client.js"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const AbstractExperience = _AbstractExperience2.default;
+exports.AbstractExperience = AbstractExperience;
+const Client = _Client2.default;
+exports.Client = Client;
+var _default = {
+  AbstractExperience: _AbstractExperience2.default,
+  Client: _Client2.default
+};
+exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soundworks/core",
-  "version": "3.1.0-beta.6",
+  "version": "3.2.1",
   "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'
@@ -309,6 +310,8 @@ class Server {
       // ------------------------------------------------------------
       // init acitvities
       // ------------------------------------------------------------
+      // we should at least have one activity registered for each client here
+      // i.e. the Experience so it's ok
       this.activities.forEach(activity => {
         activity.clientTypes.forEach(clientType => {
           if (!this._clientTypeActivitiesMap[clientType]) {
@@ -544,14 +547,18 @@ class Server {
         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/
 
 
-      res.writeHead(200, {
-        'Cross-Origin-Resource-Policy': 'same-origin',
-        'Cross-Origin-Embedder-Policy': 'require-corp',
-        'Cross-Origin-Opener-Policy': 'same-origin'
-      });
+      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);
       res.end(appIndex);
     }); // return route infos for logging on server start
@@ -567,6 +574,11 @@ class Server {
   _onSocketConnection(clientType, socket) {
     const client = new _Client.default(clientType, socket);
     const activities = this._clientTypeActivitiesMap[clientType];
+
+    if (activities == undefined) {
+      throw new Error(`No activity registered for "${clientType}" clients, make sure an Experience has been initialized for this client (see src/server/index.js)`);
+    }
+
     socket.addListener('close', () => {
       // clean sockets
       socket.terminate(); // remove client from activities

package/server.js

@@ -0,0 +1,28 @@
+"use strict";
+
+/**
+ * This is a dirty shortcut to enable cleaner import in template using `type=module`
+ * This should be cleaned little by little...
+ *
+ * We need to define if we can be backward compatible there if we go to full module (probably not)
+ */
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.Server = exports.AbstractExperience = void 0;
+
+var _Server2 = _interopRequireDefault(require("./server/Server.js"));
+
+var _AbstractExperience2 = _interopRequireDefault(require("./server/AbstractExperience.js"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const AbstractExperience = _AbstractExperience2.default;
+exports.AbstractExperience = AbstractExperience;
+const Server = _Server2.default;
+exports.Server = Server;
+var _default = {
+  AbstractExperience: _AbstractExperience2.default,
+  Server: _Server2.default
+};
+exports.default = _default;