@soundworks/core 4.0.0-alpha.13 → 4.0.0-alpha.15

package/src/server/StateManager.js

@@ -1,7 +1,7 @@
 import EventEmitter from 'node:events';
 
 import { idGenerator, isString, isPlainObject } from '@ircam/sc-utils';
-import clonedeep from 'lodash.clonedeep';
+import clonedeep from 'lodash/cloneDeep.js';
 
 import BaseStateManager from '../common/BaseStateManager.js';
 import ParameterBag from '../common/ParameterBag.js';
@@ -17,6 +17,7 @@ import {
   ATTACH_ERROR,
   OBSERVE_REQUEST,
   OBSERVE_RESPONSE,
+  OBSERVE_ERROR,
   OBSERVE_NOTIFICATION,
   UNOBSERVE_NOTIFICATION,
   DELETE_SCHEMA,
@@ -359,17 +360,21 @@ class StateManager extends BaseStateManager {
           client.transport.emit(CREATE_RESPONSE, reqId, stateId, remoteId, schemaName, sendedSchema, currentValues);
 
           this._observers.forEach(observer => {
-            if (observer.id !== nodeId) {
+            // prevent propagating infos about internal states
+            if (!PRIVATE_STATES.includes(schemaName)) {
               observer.transport.emit(OBSERVE_NOTIFICATION, schemaName, stateId, nodeId);
             }
           });
         } catch (err) {
-          client.transport.emit(CREATE_ERROR, reqId, err.message);
-          console.error(err.message);
+          const msg = `Cannot create state "${schemaName}", ${err.message}`;
+          console.error(msg);
+
+          client.transport.emit(CREATE_ERROR, reqId, msg);
         }
       } else {
         const msg = `Cannot create state "${schemaName}", schema does not exists`;
         console.error(msg);
+
         client.transport.emit(CREATE_ERROR, reqId, msg);
       }
     });
@@ -410,36 +415,43 @@ class StateManager extends BaseStateManager {
           client.transport.emit(ATTACH_RESPONSE, reqId, state.id, remoteId, schemaName, sendedSchema, currentValues);
         } else {
           const msg = `Cannot attach, no existing state for schema "${schemaName}" with stateId: "${stateId}"`;
-          client.transport.emit(ATTACH_ERROR, reqId, msg);
           console.error(msg);
+
+          client.transport.emit(ATTACH_ERROR, reqId, msg);
         }
       } else {
         const msg = `Cannot attach, schema "${schemaName}" does not exists`;
-        client.transport.emit(ATTACH_ERROR, reqId, msg);
         console.error(msg);
+
+        client.transport.emit(ATTACH_ERROR, reqId, msg);
       }
     });
 
     // ---------------------------------------------
     // OBSERVE PEERS (be notified when a state is created, lazy)
     // ---------------------------------------------
-    client.transport.addListener(OBSERVE_REQUEST, reqId => {
-      const statesInfos = [];
-
-      this._serverStatesById.forEach(state => {
-        const { schemaName, id, _creatorId } = state;
-        // only track application states
-        // (e.g. do not propagate infos about audit state)
-        if (!PRIVATE_STATES.includes(schemaName) && _creatorId !== client.id) {
-          statesInfos.push([schemaName, id, _creatorId]);
-        }
-      });
+    client.transport.addListener(OBSERVE_REQUEST, (reqId, observedSchemaName) => {
+      if (observedSchemaName === null || this._schemas.has(observedSchemaName)) {
+        const statesInfos = [];
 
-      // add client to observers first because if some (sync) server side
-      // callback throws, the client would never be added to the list
-      this._observers.add(client);
+        this._serverStatesById.forEach(state => {
+          const { schemaName, id, _creatorId } = state;
+
+          // prevent propagating infos about internal states
+          if (!PRIVATE_STATES.includes(schemaName)) {
+            statesInfos.push([schemaName, id, _creatorId]);
+          }
+        });
 
-      client.transport.emit(OBSERVE_RESPONSE, reqId, ...statesInfos);
+        // add client to observers first because if some synchronous server side
+        // callback throws, the client would never be added to the list
+        this._observers.add(client);
+
+        client.transport.emit(OBSERVE_RESPONSE, reqId, ...statesInfos);
+      } else {
+        const msg = `Cannot observe, schema "${observedSchemaName}" does not exists`;
+        client.transport.emit(OBSERVE_ERROR, reqId, msg);
+      }
     });
 
     client.transport.addListener(UNOBSERVE_NOTIFICATION, () => {
@@ -554,7 +566,7 @@ class StateManager extends BaseStateManager {
           attached.transport.emit(`${DELETE_NOTIFICATION}-${state.id}-${remoteId}`);
         }
 
-        this._serverStatesById.delete(this.id);
+        this._serverStatesById.delete(state.id);
       }
     }
 

package/src/server/audit-network-latency.worker.js

@@ -1,6 +1,6 @@
 import { parentPort } from 'node:worker_threads';
 
-import { getTime } from '@ircam/sc-gettime';
+import { getTime } from '@ircam/sc-utils';
 
 let stack = [];
 let averageLatencyWindow = 5;

package/src/server/crypto.js

@@ -23,16 +23,15 @@ const encryptionIV = crypto
 
 export function encryptData(obj) {
   const data = JSON.stringify(obj);
-  const cipher = crypto.createCipheriv(encryptionMethod, key, encryptionIV)
-  return Buffer.from(
-    cipher.update(data, 'utf8', 'hex') + cipher.final('hex')
-  ).toString('base64')
+  const cipher = crypto.createCipheriv(encryptionMethod, key, encryptionIV);
+
+  return Buffer.from(cipher.update(data, 'utf8', 'hex') + cipher.final('hex')).toString('base64');
 }
 
 export function decryptData(encryptedData) {
-  const buff = Buffer.from(encryptedData, 'base64')
-  const decipher = crypto.createDecipheriv(encryptionMethod, key, encryptionIV)
+  const buff = Buffer.from(encryptedData, 'base64');
+  const decipher = crypto.createDecipheriv(encryptionMethod, key, encryptionIV);
 
-  const decrypted = `${decipher.update(buff.toString('utf8'), 'hex', 'utf8')}${decipher.final('utf8')}`
+  const decrypted = `${decipher.update(buff.toString('utf8'), 'hex', 'utf8')}${decipher.final('utf8')}`;
   return JSON.parse(decrypted);
 }

package/src/common/promise-store.js

@@ -1,25 +0,0 @@
-import { idGenerator } from '@ircam/sc-utils';
-
-const generateRequestId = idGenerator();
-const requestPromises = new Map();
-
-export function storeRequestPromise(resolve, reject) {
-  const reqId = generateRequestId.next().value;
-  requestPromises.set(reqId, { resolve, reject });
-
-  return reqId;
-}
-
-export function resolveRequest(reqId, data) {
-  const { resolve } = requestPromises.get(reqId);
-  requestPromises.delete(reqId);
-
-  resolve(data);
-}
-
-export function rejectRequest(reqId, data) {
-  const { reject } = requestPromises.get(reqId);
-  requestPromises.delete(reqId);
-
-  reject(data);
-}

package/tsconfig.json

@@ -1,21 +0,0 @@
-{
-  "include": ["src/**/*.js"],
-
-  "compilerOptions": {
-    // Tells TypeScript to read JS files, as
-    // normally they are ignored as source files
-    "allowJs": true,
-    // Generate d.ts files
-    "declaration": true,
-    // This compiler run should
-    // only output d.ts files
-    "emitDeclarationOnly": true,
-    // Types should go into this directory.
-    // Removing this would place the .d.ts files
-    // next to the .js files
-    "outDir": "types",
-    // go to js file when using IDE functions like
-    // "Go to Definition" in VSCode
-    "declarationMap": true
-  }
-}