@soundworks/core 3.5.0 → 3.6.0

package/client/Socket.js

@@ -119,6 +119,8 @@ class Socket {
 
     const stringSocketUrl = `${url}?binary=0&${queryParams}`;
     await new Promise((resolve, reject) => {
+      let connectionRefusedLogged = false;
+
       const trySocket = async () => {
         log(`[string socket] trying connection - url: ${stringSocketUrl}`);
         const ws = new _isomorphicWs.default(stringSocketUrl, webSocketOptions);
@@ -145,7 +147,11 @@ class Socket {
 
         ws.addEventListener('error', e => {
           if (e.type === 'error' && e.error.code === 'ECONNREFUSED') {
-            console.log('[socket] connection refused - (retry in 1s)');
+            if (!connectionRefusedLogged) {
+              console.log('[socket] connection refused, waiting for the server to start');
+              connectionRefusedLogged = true;
+            }
+
             setTimeout(trySocket, 1000);
           }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soundworks/core",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "description": "full-stack javascript framework for distributed audio visual experiences on the web",
   "authors": [
     "Benjamin Matuszewski",

package/server/Server.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _events = _interopRequireDefault(require("events"));
-
 var _fs = _interopRequireDefault(require("fs"));
 
 var _http = _interopRequireDefault(require("http"));
@@ -170,14 +168,15 @@ class Server {
      */
 
     this._routes = {};
-    /**
-     * @private
-     */
+    /** @private */
 
     this._htmlTemplateConfig = {
       engine: null,
       directory: null
     };
+    /** @private */
+
+    this._listeners = new Map();
   }
   /**
    *
@@ -300,6 +299,7 @@ class Server {
       });
     }
 
+    await this._emit('inited');
     return Promise.resolve();
   }
   /**
@@ -501,7 +501,7 @@ class Server {
 
           const ifaces = _os.default.networkInterfaces();
 
-          this.router.listen(port, () => {
+          this.router.listen(port, async () => {
             _logger.default.title(`${protocol} server listening on`);
 
             Object.keys(ifaces).forEach(dev => {
@@ -511,11 +511,11 @@ class Server {
                 }
               });
             });
+            await this._emit('started');
             resolve();
           });
         });
       });
-      await this.pluginManager.start();
       return Promise.resolve();
     } catch (err) {
       console.error(err);
@@ -526,6 +526,7 @@ class Server {
   async stop() {
     this.sockets.terminate();
     this.httpServer.close();
+    await this._emit('stopped');
     return Promise.resolve();
   }
   /**
@@ -703,6 +704,42 @@ class Server {
     return db;
   }
 
+  addListener(channel, callback) {
+    if (!this._listeners.has(channel)) {
+      const listeners = new Set();
+
+      this._listeners.set(channel, listeners);
+    }
+
+    const listeners = this._listeners.get(channel);
+
+    listeners.add(callback);
+  }
+
+  removeListener(channel, callback) {
+    if (this._listeners.has(channel)) {
+      const listeners = this._listeners.get(channel);
+
+      listeners.delete(callback);
+
+      if (listeners.size === 0) {
+        this._listeners.delete(channel);
+      }
+    }
+  }
+  /** @private */
+
+
+  async _emit(channel) {
+    if (this._listeners.has(channel)) {
+      const listeners = this._listeners.get(channel);
+
+      for (let callback of listeners) {
+        await callback();
+      }
+    }
+  }
+
 }
 
 var _default = Server;