@neurodevs/node-lsl 14.1.5 → 16.0.0

package/build/impl/LslWebSocketBridge.d.ts

@@ -1,26 +1,36 @@
-import { WebSocketServer } from 'ws';
+import WebSocket, { WebSocketServer } from 'ws';
 import { ChannelFormat } from './LiblslAdapter.js';
 import { StreamInlet } from './LslStreamInlet.js';
 export default class LslWebSocketBridge implements WebSocketBridge {
     static Class?: WebSocketBridgeConstructor;
+    static WS: typeof WebSocket;
     static WSS: typeof import("ws").Server;
     private inlet;
-    private wss;
+    private localServer?;
+    private remoteSockets?;
     private isDestroyed;
     protected constructor(options: WebSocketBridgeConstructorOptions);
     static Create(options: WebSocketBridgeOptions): WebSocketBridge;
+    private throwIfNoLocalServerOrRemoteSockets;
+    private readonly insufficientOptionsError;
     activate(): void;
     private throwIfBridgeIsDestroyed;
+    private readonly cannotActivateMessage;
     private startPullingData;
     deactivate(): void;
+    private readonly cannotDeactivateMessage;
     private stopPullingData;
     destroy(): void;
     private destroyBoundInlet;
-    private closeWebSocketServer;
+    private closeLocalServerIfExists;
+    private closeRemoteSocketsIfExists;
     private static createOnDataCallback;
     private static broadcastToClients;
-    private static LslStreamInlet;
+    private static sendToSockets;
+    private static createSocketsFrom;
+    private static WebSocket;
     private static WebSocketServer;
+    private static LslStreamInlet;
 }
 export interface WebSocketBridge {
     activate(): void;
@@ -36,9 +46,11 @@ export interface WebSocketBridgeOptions {
     name?: string;
     type?: string;
     sourceId?: string;
-    wssPort?: number;
+    listenPort?: number;
+    connectUrls?: string | string[];
 }
 export interface WebSocketBridgeConstructorOptions extends WebSocketBridgeOptions {
     inlet: StreamInlet;
-    wss: WebSocketServer;
+    localServer?: WebSocketServer;
+    remoteSockets?: WebSocket[];
 }

package/build/impl/LslWebSocketBridge.js

@@ -1,72 +1,114 @@
-import { WebSocketServer } from 'ws';
+import WebSocket, { WebSocketServer } from 'ws';
 import LslStreamInlet from './LslStreamInlet.js';
 export default class LslWebSocketBridge {
     static Class;
+    static WS = WebSocket;
     static WSS = WebSocketServer;
     inlet;
-    wss;
+    localServer;
+    remoteSockets;
     isDestroyed = false;
     constructor(options) {
-        const { inlet, wss } = options;
+        const { inlet, localServer, remoteSockets } = options;
         this.inlet = inlet;
-        this.wss = wss;
+        this.localServer = localServer;
+        this.remoteSockets = remoteSockets;
+        this.throwIfNoLocalServerOrRemoteSockets();
     }
     static Create(options) {
-        const { wssPort = 8080 } = options ?? {};
-        const wss = this.WebSocketServer(wssPort);
-        const inlet = this.LslStreamInlet(options, wss);
-        return new (this.Class ?? this)({ ...options, inlet, wss });
+        const { listenPort, connectUrls, ...rest } = options;
+        const inletOptions = rest;
+        const localServer = this.WebSocketServer(listenPort);
+        const remoteSockets = this.createSocketsFrom(connectUrls);
+        const inlet = this.LslStreamInlet(inletOptions, localServer, remoteSockets);
+        return new (this.Class ?? this)({
+            ...options,
+            inlet,
+            localServer,
+            remoteSockets,
+        });
     }
+    throwIfNoLocalServerOrRemoteSockets() {
+        if (!(this.localServer || this.remoteSockets)) {
+            throw new Error(this.insufficientOptionsError);
+        }
+    }
+    insufficientOptionsError = `At least one of listenPort or connectUrls must be provided!`;
     activate() {
-        this.throwIfBridgeIsDestroyed();
+        this.throwIfBridgeIsDestroyed(this.cannotActivateMessage);
         this.startPullingData();
     }
-    throwIfBridgeIsDestroyed() {
+    throwIfBridgeIsDestroyed(err) {
         if (this.isDestroyed) {
-            throw new Error(`\n\n Cannot re-activate bridge after destroying it! \n\n Please create and activate a new instance. \n`);
+            throw new Error(err);
         }
     }
+    cannotActivateMessage = `\n\n Cannot activate bridge after destroying it! \n\n Please create and activate a new instance. \n`;
     startPullingData() {
         this.inlet.startPulling();
     }
     deactivate() {
+        this.throwIfBridgeIsDestroyed(this.cannotDeactivateMessage);
         this.stopPullingData();
     }
+    cannotDeactivateMessage = `\n\n Cannot deactivate bridge after destroying it! \n\n Please create and activate a new instance. \n`;
     stopPullingData() {
         this.inlet.stopPulling();
     }
     destroy() {
         this.destroyBoundInlet();
-        this.closeWebSocketServer();
+        this.closeLocalServerIfExists();
+        this.closeRemoteSocketsIfExists();
         this.isDestroyed = true;
     }
     destroyBoundInlet() {
         this.inlet.destroy();
     }
-    closeWebSocketServer() {
-        this.wss.close();
+    closeLocalServerIfExists() {
+        this.localServer?.close();
+    }
+    closeRemoteSocketsIfExists() {
+        this.remoteSockets?.forEach((socket) => socket.close());
     }
-    static createOnDataCallback(wss) {
+    static createOnDataCallback(localServer, remoteSockets) {
         return (samples, timestamps) => {
-            this.broadcastToClients(wss, samples, timestamps);
+            const payload = JSON.stringify({ samples, timestamps });
+            if (localServer) {
+                this.broadcastToClients(localServer, payload);
+            }
+            if (remoteSockets) {
+                this.sendToSockets(remoteSockets, payload);
+            }
         };
     }
-    static broadcastToClients(wss, samples, timestamps) {
-        for (const client of wss.clients) {
+    static broadcastToClients(localServer, payload) {
+        for (const client of localServer.clients) {
             if (client.readyState === WebSocket.OPEN) {
-                client.send(JSON.stringify({
-                    samples,
-                    timestamps,
-                }));
+                client.send(payload);
             }
         }
     }
-    static LslStreamInlet(options, wss) {
-        const onData = this.createOnDataCallback(wss);
-        return LslStreamInlet.Create(options, onData);
+    static sendToSockets(remoteSockets, payload) {
+        for (const socket of remoteSockets) {
+            if (socket.readyState === WebSocket.OPEN) {
+                socket.send(payload);
+            }
+        }
+    }
+    static createSocketsFrom(connectUrls) {
+        return connectUrls
+            ? (Array.isArray(connectUrls) ? connectUrls : [connectUrls]).map((url) => this.WebSocket(url))
+            : undefined;
     }
-    static WebSocketServer(wssPort) {
-        return new this.WSS({ port: wssPort });
+    static WebSocket(url) {
+        return new this.WS(url);
+    }
+    static WebSocketServer(listenPort) {
+        return listenPort ? new this.WSS({ port: listenPort }) : undefined;
+    }
+    static LslStreamInlet(options, localServer, remoteSockets) {
+        const onData = this.createOnDataCallback(localServer, remoteSockets);
+        return LslStreamInlet.Create(options, onData);
     }
 }
 //# sourceMappingURL=LslWebSocketBridge.js.map

package/build/impl/LslWebSocketBridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"LslWebSocketBridge.js","sourceRoot":"","sources":["../../src/impl/LslWebSocketBridge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LslWebSocketBridge.js","sourceRoot":"","sources":["../../src/impl/LslWebSocketBridge.ts"],"names":[],"mappings":"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"}

package/build/testDoubles/StreamInfo/FakeStreamInfo.d.ts

@@ -4,8 +4,16 @@ export default class FakeStreamInfo implements StreamInfo {
     static callsToConstructor: StreamInfoOptions[];
     static numCallsToDestroy: number;
     static boundStreamInfo: BoundStreamInfo;
+    name: string;
+    type: string;
+    sourceId: string;
+    channelNames: string[];
+    channelFormat: "float32";
+    sampleRateHz: number;
+    units: string;
     constructor(options: StreamInfoOptions);
     destroy(): void;
+    get channelCount(): number;
     get boundStreamInfo(): BoundStreamInfo;
     static resetTestDouble(): void;
 }

package/build/testDoubles/StreamInfo/FakeStreamInfo.js

@@ -1,13 +1,24 @@
+import generateId from '@neurodevs/generate-id';
 export default class FakeStreamInfo {
     static callsToConstructor = [];
     static numCallsToDestroy = 0;
     static boundStreamInfo = {};
+    name = generateId();
+    type = generateId();
+    sourceId = generateId();
+    channelNames = [generateId(), generateId()];
+    channelFormat = 'float32';
+    sampleRateHz = 0;
+    units = 'N/A';
     constructor(options) {
         FakeStreamInfo.callsToConstructor.push(options);
     }
     destroy() {
         FakeStreamInfo.numCallsToDestroy++;
     }
+    get channelCount() {
+        return this.channelNames.length;
+    }
     get boundStreamInfo() {
         return FakeStreamInfo.boundStreamInfo;
     }

package/build/testDoubles/StreamInfo/FakeStreamInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"FakeStreamInfo.js","sourceRoot":"","sources":["../../../src/testDoubles/StreamInfo/FakeStreamInfo.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,OAAO,OAAO,cAAc;IACxB,MAAM,CAAC,kBAAkB,GAAwB,EAAE,CAAA;IACnD,MAAM,CAAC,iBAAiB,GAAG,CAAC,CAAA;IAE5B,MAAM,CAAC,eAAe,GAAG,EAAqB,CAAA;IAErD,YAAmB,OAA0B;QACzC,cAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACnD,CAAC;IAEM,OAAO;QACV,cAAc,CAAC,iBAAiB,EAAE,CAAA;IACtC,CAAC;IAED,IAAW,eAAe;QACtB,OAAO,cAAc,CAAC,eAAe,CAAA;IACzC,CAAC;IAEM,MAAM,CAAC,eAAe;QACzB,cAAc,CAAC,kBAAkB,GAAG,EAAE,CAAA;QACtC,cAAc,CAAC,iBAAiB,GAAG,CAAC,CAAA;IACxC,CAAC"}
+{"version":3,"file":"FakeStreamInfo.js","sourceRoot":"","sources":["../../../src/testDoubles/StreamInfo/FakeStreamInfo.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,wBAAwB,CAAA;AAK/C,MAAM,CAAC,OAAO,OAAO,cAAc;IACxB,MAAM,CAAC,kBAAkB,GAAwB,EAAE,CAAA;IACnD,MAAM,CAAC,iBAAiB,GAAG,CAAC,CAAA;IAE5B,MAAM,CAAC,eAAe,GAAG,EAAqB,CAAA;IAE9C,IAAI,GAAG,UAAU,EAAE,CAAA;IACnB,IAAI,GAAG,UAAU,EAAE,CAAA;IACnB,QAAQ,GAAG,UAAU,EAAE,CAAA;IACvB,YAAY,GAAa,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,CAAC,CAAA;IACrD,aAAa,GAAG,SAAkB,CAAA;IAClC,YAAY,GAAG,CAAC,CAAA;IAChB,KAAK,GAAG,KAAK,CAAA;IAEpB,YAAmB,OAA0B;QACzC,cAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACnD,CAAC;IAEM,OAAO;QACV,cAAc,CAAC,iBAAiB,EAAE,CAAA;IACtC,CAAC;IAED,IAAW,YAAY;QACnB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAA;IACnC,CAAC;IAED,IAAW,eAAe;QACtB,OAAO,cAAc,CAAC,eAAe,CAAA;IACzC,CAAC;IAEM,MAAM,CAAC,eAAe;QACzB,cAAc,CAAC,kBAAkB,GAAG,EAAE,CAAA;QACtC,cAAc,CAAC,iBAAiB,GAAG,CAAC,CAAA;IACxC,CAAC"}

package/build/testDoubles/StreamInfo/SpyStreamInfo.d.ts

@@ -1,9 +1,11 @@
 import LslStreamInfo, { StreamInfoOptions } from '../../impl/LslStreamInfo.js';
 export default class SpyStreamInfo extends LslStreamInfo {
+    static numCallsToConstructor: number;
     constructor(options: StreamInfoOptions);
     getBoundInfo(): import("../../index.js").BoundStreamInfo;
     getName(): string;
     getType(): string;
     getSourceId(): string;
     getUnits(): string;
+    static resetTestDouble(): void;
 }

package/build/testDoubles/StreamInfo/SpyStreamInfo.js

@@ -1,7 +1,9 @@
 import LslStreamInfo from '../../impl/LslStreamInfo.js';
 export default class SpyStreamInfo extends LslStreamInfo {
+    static numCallsToConstructor = 0;
     constructor(options) {
         super(options);
+        SpyStreamInfo.numCallsToConstructor++;
     }
     getBoundInfo() {
         return this.boundInfo;
@@ -18,5 +20,8 @@ export default class SpyStreamInfo extends LslStreamInfo {
     getUnits() {
         return this.units;
     }
+    static resetTestDouble() {
+        SpyStreamInfo.numCallsToConstructor = 0;
+    }
 }
 //# sourceMappingURL=SpyStreamInfo.js.map

package/build/testDoubles/StreamInfo/SpyStreamInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"SpyStreamInfo.js","sourceRoot":"","sources":["../../../src/testDoubles/StreamInfo/SpyStreamInfo.ts"],"names":[],"mappings":"AAAA,OAAO,aAAoC,MAAM,6BAA6B,CAAA;AAE9E,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,aAAa;IACpD,YAAmB,OAA0B;QACzC,KAAK,CAAC,OAAO,CAAC,CAAA;IAClB,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,SAAS,CAAA;IACzB,CAAC;IAEM,OAAO;QACV,OAAO,IAAI,CAAC,IAAI,CAAA;IACpB,CAAC;IAEM,OAAO;QACV,OAAO,IAAI,CAAC,IAAI,CAAA;IACpB,CAAC;IAEM,WAAW;QACd,OAAO,IAAI,CAAC,QAAQ,CAAA;IACxB,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,KAAK,CAAA;IACrB,CAAC;CACJ"}
+{"version":3,"file":"SpyStreamInfo.js","sourceRoot":"","sources":["../../../src/testDoubles/StreamInfo/SpyStreamInfo.ts"],"names":[],"mappings":"AAAA,OAAO,aAAoC,MAAM,6BAA6B,CAAA;AAE9E,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,aAAa;IAC7C,MAAM,CAAC,qBAAqB,GAAG,CAAC,CAAA;IAEvC,YAAmB,OAA0B;QACzC,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,aAAa,CAAC,qBAAqB,EAAE,CAAA;IACzC,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,SAAS,CAAA;IACzB,CAAC;IAEM,OAAO;QACV,OAAO,IAAI,CAAC,IAAI,CAAA;IACpB,CAAC;IAEM,OAAO;QACV,OAAO,IAAI,CAAC,IAAI,CAAA;IACpB,CAAC;IAEM,WAAW;QACd,OAAO,IAAI,CAAC,QAAQ,CAAA;IACxB,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,KAAK,CAAA;IACrB,CAAC;IAEM,MAAM,CAAC,eAAe;QACzB,aAAa,CAAC,qBAAqB,GAAG,CAAC,CAAA;IAC3C,CAAC"}

package/build/testDoubles/WebSocketBridge/FakeWebSocketBridge.d.ts

@@ -9,4 +9,6 @@ export default class FakeWebSocketBridge implements WebSocketBridge {
     deactivate(): void;
     destroy(): void;
     static resetTestDouble(): void;
+    private static setFakeWebSocket;
+    private static setFakeWebSocketServer;
 }

package/build/testDoubles/WebSocketBridge/FakeWebSocketBridge.js

@@ -1,3 +1,6 @@
+import LslWebSocketBridge from '../../impl/LslWebSocketBridge.js';
+import FakeWebSocket from '../WebSockets/FakeWebSocket.js';
+import FakeWebSocketServer from '../WebSockets/FakeWebSocketServer.js';
 export default class FakeWebSocketBridge {
     static numCallsToConstructor = 0;
     static numCallsToActivate = 0;
@@ -16,10 +19,21 @@ export default class FakeWebSocketBridge {
         FakeWebSocketBridge.numCallsToDestroy++;
     }
     static resetTestDouble() {
-        FakeWebSocketBridge.numCallsToConstructor = 0;
-        FakeWebSocketBridge.numCallsToActivate = 0;
-        FakeWebSocketBridge.numCallsToDeactivate = 0;
-        FakeWebSocketBridge.numCallsToDestroy = 0;
+        this.numCallsToConstructor = 0;
+        this.numCallsToActivate = 0;
+        this.numCallsToDeactivate = 0;
+        this.numCallsToDestroy = 0;
+        this.setFakeWebSocket();
+        this.setFakeWebSocketServer();
+    }
+    static setFakeWebSocket() {
+        LslWebSocketBridge.WS = FakeWebSocket;
+        FakeWebSocket.resetTestDouble();
+    }
+    static setFakeWebSocketServer() {
+        LslWebSocketBridge.WSS =
+            FakeWebSocketServer;
+        FakeWebSocketServer.resetTestDouble();
     }
 }
 //# sourceMappingURL=FakeWebSocketBridge.js.map

package/build/testDoubles/WebSocketBridge/FakeWebSocketBridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"FakeWebSocketBridge.js","sourceRoot":"","sources":["../../../src/testDoubles/WebSocketBridge/FakeWebSocketBridge.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAC7B,MAAM,CAAC,qBAAqB,GAAG,CAAC,CAAA;IAChC,MAAM,CAAC,kBAAkB,GAAG,CAAC,CAAA;IAC7B,MAAM,CAAC,oBAAoB,GAAG,CAAC,CAAA;IAC/B,MAAM,CAAC,iBAAiB,GAAG,CAAC,CAAA;IAEnC;QACI,mBAAmB,CAAC,qBAAqB,EAAE,CAAA;IAC/C,CAAC;IAEM,QAAQ;QACX,mBAAmB,CAAC,kBAAkB,EAAE,CAAA;IAC5C,CAAC;IAEM,UAAU;QACb,mBAAmB,CAAC,oBAAoB,EAAE,CAAA;IAC9C,CAAC;IAEM,OAAO;QACV,mBAAmB,CAAC,iBAAiB,EAAE,CAAA;IAC3C,CAAC;IAEM,MAAM,CAAC,eAAe;QACzB,mBAAmB,CAAC,qBAAqB,GAAG,CAAC,CAAA;QAC7C,mBAAmB,CAAC,kBAAkB,GAAG,CAAC,CAAA;QAC1C,mBAAmB,CAAC,oBAAoB,GAAG,CAAC,CAAA;QAC5C,mBAAmB,CAAC,iBAAiB,GAAG,CAAC,CAAA;IAC7C,CAAC"}
+{"version":3,"file":"FakeWebSocketBridge.js","sourceRoot":"","sources":["../../../src/testDoubles/WebSocketBridge/FakeWebSocketBridge.ts"],"names":[],"mappings":"AACA,OAAO,kBAEN,MAAM,kCAAkC,CAAA;AACzC,OAAO,aAAa,MAAM,gCAAgC,CAAA;AAC1D,OAAO,mBAAmB,MAAM,sCAAsC,CAAA;AAEtE,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAC7B,MAAM,CAAC,qBAAqB,GAAG,CAAC,CAAA;IAChC,MAAM,CAAC,kBAAkB,GAAG,CAAC,CAAA;IAC7B,MAAM,CAAC,oBAAoB,GAAG,CAAC,CAAA;IAC/B,MAAM,CAAC,iBAAiB,GAAG,CAAC,CAAA;IAEnC;QACI,mBAAmB,CAAC,qBAAqB,EAAE,CAAA;IAC/C,CAAC;IAEM,QAAQ;QACX,mBAAmB,CAAC,kBAAkB,EAAE,CAAA;IAC5C,CAAC;IAEM,UAAU;QACb,mBAAmB,CAAC,oBAAoB,EAAE,CAAA;IAC9C,CAAC;IAEM,OAAO;QACV,mBAAmB,CAAC,iBAAiB,EAAE,CAAA;IAC3C,CAAC;IAEM,MAAM,CAAC,eAAe;QACzB,IAAI,CAAC,qBAAqB,GAAG,CAAC,CAAA;QAC9B,IAAI,CAAC,kBAAkB,GAAG,CAAC,CAAA;QAC3B,IAAI,CAAC,oBAAoB,GAAG,CAAC,CAAA;QAC7B,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAA;QAE1B,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,IAAI,CAAC,sBAAsB,EAAE,CAAA;IACjC,CAAC;IAEO,MAAM,CAAC,gBAAgB;QAC3B,kBAAkB,CAAC,EAAE,GAAG,aAA4C,CAAA;QACpE,aAAa,CAAC,eAAe,EAAE,CAAA;IACnC,CAAC;IAEO,MAAM,CAAC,sBAAsB;QACjC,kBAAkB,CAAC,GAAG;YAClB,mBAAwD,CAAA;QAC5D,mBAAmB,CAAC,eAAe,EAAE,CAAA;IACzC,CAAC"}

package/build/testDoubles/WebSockets/FakeWebSocket.d.ts

@@ -1,10 +1,14 @@
 export default class FakeWebSocket {
+    static callsToConstructor: (string | undefined)[];
     static callsToSend: {
         id: string;
         data: unknown;
     }[];
+    static numCallsToClose: number;
     readyState: number;
     id: string;
+    constructor(url?: string);
     send(data: unknown): void;
+    close(): void;
     static resetTestDouble(): void;
 }

package/build/testDoubles/WebSockets/FakeWebSocket.js

@@ -1,14 +1,25 @@
 import generateId from '@neurodevs/generate-id';
 import WebSocket from 'ws';
 export default class FakeWebSocket {
+    static callsToConstructor = [];
     static callsToSend = [];
+    static numCallsToClose = 0;
     readyState = WebSocket.OPEN;
     id = generateId();
+    constructor(url) {
+        FakeWebSocket.callsToConstructor.push(url);
+    }
     send(data) {
         FakeWebSocket.callsToSend.push({ id: this.id, data });
     }
+    close() {
+        FakeWebSocket.numCallsToClose++;
+        this.readyState = WebSocket.CLOSED;
+    }
     static resetTestDouble() {
-        FakeWebSocket.callsToSend = [];
+        this.callsToConstructor = [];
+        this.callsToSend = [];
+        this.numCallsToClose = 0;
     }
 }
 //# sourceMappingURL=FakeWebSocket.js.map

package/build/testDoubles/WebSockets/FakeWebSocket.js.map

@@ -1 +1 @@
-{"version":3,"file":"FakeWebSocket.js","sourceRoot":"","sources":["../../../src/testDoubles/WebSockets/FakeWebSocket.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,wBAAwB,CAAA;AAC/C,OAAO,SAAS,MAAM,IAAI,CAAA;AAE1B,MAAM,CAAC,OAAO,OAAO,aAAa;IACvB,MAAM,CAAC,WAAW,GAAoC,EAAE,CAAA;IAExD,UAAU,GAAW,SAAS,CAAC,IAAI,CAAA;IACnC,EAAE,GAAG,UAAU,EAAE,CAAA;IAEjB,IAAI,CAAC,IAAa;QACrB,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;IACzD,CAAC;IAEM,MAAM,CAAC,eAAe;QACzB,aAAa,CAAC,WAAW,GAAG,EAAE,CAAA;IAClC,CAAC"}
+{"version":3,"file":"FakeWebSocket.js","sourceRoot":"","sources":["../../../src/testDoubles/WebSockets/FakeWebSocket.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,wBAAwB,CAAA;AAC/C,OAAO,SAAS,MAAM,IAAI,CAAA;AAE1B,MAAM,CAAC,OAAO,OAAO,aAAa;IACvB,MAAM,CAAC,kBAAkB,GAA2B,EAAE,CAAA;IACtD,MAAM,CAAC,WAAW,GAAoC,EAAE,CAAA;IACxD,MAAM,CAAC,eAAe,GAAG,CAAC,CAAA;IAE1B,UAAU,GAAW,SAAS,CAAC,IAAI,CAAA;IACnC,EAAE,GAAG,UAAU,EAAE,CAAA;IAExB,YAAmB,GAAY;QAC3B,aAAa,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC9C,CAAC;IAEM,IAAI,CAAC,IAAa;QACrB,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;IACzD,CAAC;IAEM,KAAK;QACR,aAAa,CAAC,eAAe,EAAE,CAAA;QAC/B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC,MAAM,CAAA;IACtC,CAAC;IAEM,MAAM,CAAC,eAAe;QACzB,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAA;QAC5B,IAAI,CAAC,WAAW,GAAG,EAAE,CAAA;QACrB,IAAI,CAAC,eAAe,GAAG,CAAC,CAAA;IAC5B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neurodevs/node-lsl",
-  "version": "14.1.5",
+  "version": "16.0.0",
   "description": "Lab Streaming Layer (LSL) bindings for Node",
   "type": "module",
   "keywords": [

package/src/__tests__/AbstractPackageTest.ts

@@ -1,4 +1,5 @@
 import AbstractModuleTest from '@neurodevs/node-tdd'
+import WebSocket from 'ws'
 
 import { Server } from 'ws'
 import LiblslAdapter from '../impl/LiblslAdapter.js'
@@ -18,6 +19,7 @@ import FakeStreamInlet from '../testDoubles/StreamInlet/FakeStreamInlet.js'
 import { SpyStreamInlet } from '../testDoubles/StreamInlet/SpyStreamInlet.js'
 import FakeStreamOutlet from '../testDoubles/StreamOutlet/FakeStreamOutlet.js'
 import SpyLslWebSocketBridge from '../testDoubles/WebSocketBridge/SpyLslWebSocketBridge.js'
+import FakeWebSocket from '../testDoubles/WebSockets/FakeWebSocket.js'
 import FakeWebSocketServer from '../testDoubles/WebSockets/FakeWebSocketServer.js'
 
 export default class AbstractPackageTest extends AbstractModuleTest {
@@ -38,11 +40,14 @@ export default class AbstractPackageTest extends AbstractModuleTest {
 
     protected static setSpyStreamInfo() {
         LslStreamInfo.Class = SpyStreamInfo
+        SpyStreamInfo.resetTestDouble()
     }
 
     protected static setFakeStreamInfo() {
         LslStreamInfo.Class = FakeStreamInfo
         FakeStreamInfo.resetTestDouble()
+
+        LslStreamInfo['instanceCache'] = {}
     }
 
     protected static setSpyStreamInlet() {
@@ -67,6 +72,11 @@ export default class AbstractPackageTest extends AbstractModuleTest {
         LslWebSocketBridge.Class = SpyLslWebSocketBridge
     }
 
+    protected static setFakeWebSocket() {
+        LslWebSocketBridge.WS = FakeWebSocket as unknown as typeof WebSocket
+        FakeWebSocket.resetTestDouble()
+    }
+
     protected static setFakeWebSocketServer() {
         LslWebSocketBridge.WSS = FakeWebSocketServer as unknown as typeof Server
         FakeWebSocketServer.resetTestDouble()

package/src/__tests__/impl/LslStreamInfo.test.ts

@@ -13,6 +13,8 @@ export default class LslStreamInfoTest extends AbstractPackageTest {
 
         this.setSpyStreamInfo()
 
+        LslStreamInfo['instanceCache'] = {}
+
         this.instance = this.LslStreamInfo()
     }
 
@@ -23,8 +25,15 @@ export default class LslStreamInfoTest extends AbstractPackageTest {
 
     @test()
     protected static async generatesUniqueNameIfNotProvided() {
-        const instance1 = this.LslStreamInfo({ name: undefined })
-        const instance2 = this.LslStreamInfo({ name: undefined })
+        const instance1 = this.LslStreamInfo({
+            name: undefined,
+            type: this.generateId(),
+        })
+
+        const instance2 = this.LslStreamInfo({
+            name: undefined,
+            type: this.generateId(),
+        })
 
         assert.isNotEqual(
             instance1.getName(),
@@ -58,8 +67,15 @@ export default class LslStreamInfoTest extends AbstractPackageTest {
 
     @test()
     protected static async generatesUniqueTypeIfNotProvided() {
-        const instance1 = this.LslStreamInfo({ type: undefined })
-        const instance2 = this.LslStreamInfo({ type: undefined })
+        const instance1 = this.LslStreamInfo({
+            type: undefined,
+            name: this.generateId(),
+        })
+
+        const instance2 = this.LslStreamInfo({
+            type: undefined,
+            name: this.generateId(),
+        })
 
         assert.isNotEqual(
             instance1.getType(),
@@ -82,8 +98,15 @@ export default class LslStreamInfoTest extends AbstractPackageTest {
 
     @test()
     protected static async generatesUniqueSourceIdIfNotProvided() {
-        const instance1 = this.LslStreamInfo({ sourceId: undefined })
-        const instance2 = this.LslStreamInfo({ sourceId: undefined })
+        const instance1 = this.LslStreamInfo({
+            sourceId: undefined,
+            name: this.generateId(),
+        })
+
+        const instance2 = this.LslStreamInfo({
+            sourceId: undefined,
+            name: this.generateId(),
+        })
 
         assert.isNotEqual(
             instance1.getSourceId(),
@@ -192,6 +215,17 @@ export default class LslStreamInfoTest extends AbstractPackageTest {
         )
     }
 
+    @test()
+    protected static async cachesInfoIfPassedSameOptions() {
+        this.LslStreamInfo()
+
+        assert.isEqual(
+            SpyStreamInfo.numCallsToConstructor,
+            1,
+            'Did not cache stream info!'
+        )
+    }
+
     private static readonly defaultOptions = {
         name: this.generateId(),
         type: this.generateId(),