@soundworks/core 3.3.2 → 3.4.0

package/client/Client.js

@@ -179,6 +179,10 @@ class Client {
     return this._ready;
   }
 
+  async stop() {
+    this.socket.terminate();
+  }
+
 }
 
 ;

package/client/Socket.js

@@ -315,6 +315,15 @@ class Socket {
   removeAllBinaryListeners(channel) {
     this._removeAllListeners(this._binaryListeners, channel);
   }
+  /**
+   * Immediately close the 2 sockets
+   */
+
+
+  terminate() {
+    this.ws.close();
+    this.binaryWs.close();
+  }
 
 }
 

package/common/ParameterBag.js

@@ -258,6 +258,23 @@ const types = {
       });
     },
 
+    sanitizeSchema: def => {
+      // sanitize `null` values in received schema, this prevent a bug when
+      // `min` and `max` are explicitely set to `±Infinity`, the schema is stringified
+      // when sent over the network and therefore Infinity is transformed to `null`
+      //
+      // JSON.parse({ a: Infinity });
+      // > { "a": null }
+      if (def.min === null) {
+        def.min = -Infinity;
+      }
+
+      if (def.max === null) {
+        def.max = Infinity;
+      }
+
+      return def;
+    },
     coerceFunction: (name, def, value) => {
       if (!(typeof value === 'number' && Math.floor(value) === value)) {
         throw new TypeError(`[stateManager] Invalid value for integer param "${name}": ${value}`);
@@ -276,6 +293,23 @@ const types = {
       });
     },
 
+    sanitizeSchema: def => {
+      // sanitize `null` values in received schema, this prevent a bug when
+      // `min` and `max` are explicitely set to `±Infinity`, the schema is stringified
+      // when sent over the network and therefore Infinity is transformed to `null`
+      //
+      // JSON.parse({ a: Infinity });
+      // > { "a": null }
+      if (def.min === null) {
+        def.min = -Infinity;
+      }
+
+      if (def.max === null) {
+        def.max = Infinity;
+      }
+
+      return def;
+    },
     coerceFunction: (name, def, value) => {
       if (typeof value !== 'number' || value !== value) {
         // reject NaN
@@ -385,6 +419,11 @@ class ParameterBag {
         defaultOptions,
         coerceFunction
       } = types[def.type];
+
+      if (types[def.type].sanitizeSchema) {
+        def = types[def.type].sanitizeSchema(def);
+      }
+
       def = Object.assign({}, defaultOptions, def); // if event property is set to true, the param must
       // be nullable and its default value is `undefined`
 

package/common/SharedState.js

@@ -152,7 +152,7 @@ ${JSON.stringify(initValues, null, 2)}`);
         immediate,
         filterChange,
         event
-      } = this._parameters.getSchema(name); // @note 20211209 - we have an issue here server-side, because if the value
+      } = this._parameters.getSchema(name); // @note 20211209 - we had an issue here server-side, because if the value
       // is an object or an array, the reference is shared by everybody, therefore
       // `changed` is always false and the new value is never propagated...
       // FIXED - `state.get` now returns a deep copy when `type` is `any`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soundworks/core",
-  "version": "3.3.2",
+  "version": "3.4.0",
   "description": "full-stack javascript framework for distributed audio visual experiences on the web",
   "authors": [
     "Benjamin Matuszewski",
@@ -39,7 +39,6 @@
     "debug": "^4.3.4",
     "fast-deep-equal": "^3.1.3",
     "fast-text-encoding": "^1.0.0",
-    "http-terminator": "^3.2.0",
     "isomorphic-ws": "^4.0.1",
     "keyv": "^4.2.2",
     "keyv-file": "^0.2.0",
@@ -62,7 +61,8 @@
     "docdash": "^1.2.0",
     "jsdoc": "^3.6.10",
     "markdown-toc": "^1.2.0",
-    "mocha": "^9.2.2"
+    "mocha": "^9.2.2",
+    "serial-mocha": "^0.0.4"
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.5",

package/server/Server.js

@@ -41,8 +41,6 @@ var _keyv = _interopRequireDefault(require("keyv"));
 
 var _keyvFile = _interopRequireDefault(require("keyv-file"));
 
-var _httpTerminator = require("http-terminator");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 let _dbNamespaces = new Set();
@@ -518,13 +516,13 @@ class Server {
     } catch (err) {
       console.error(err);
     }
-  }
+  } // @todo - handle gracefull close of the server
+
 
   async stop() {
-    const httpTerminator = (0, _httpTerminator.createHttpTerminator)({
-      server: this.httpServer
-    });
-    await httpTerminator.terminate();
+    this.sockets.terminate();
+    this.httpServer.close();
+    return Promise.resolve();
   }
   /**
    * Open the route for the given client.

package/server/Sockets.js

@@ -81,6 +81,12 @@ class Sockets {
       }
     });
   }
+
+  terminate() {
+    const sockets = this._rooms.get('*');
+
+    sockets.forEach(socket => socket.terminate());
+  }
   /** @private */