@neurodevs/node-lsl 16.0.3 → 16.1.0

package/src/impl/LslStreamInfo.ts

@@ -7,8 +7,6 @@ import LiblslAdapter from './LiblslAdapter.js'
 export default class LslStreamInfo implements StreamInfo {
     public static Class?: StreamInfoConstructor
 
-    private static instanceCache: Record<string, StreamInfo> = {}
-
     public readonly name: string
     public readonly type: string
     public readonly sourceId: string
@@ -36,6 +34,7 @@ export default class LslStreamInfo implements StreamInfo {
             channelFormat,
             sampleRateHz,
             units = this.defaultUnits,
+            boundStreamInfo,
         } = options
 
         this.name = name
@@ -47,38 +46,16 @@ export default class LslStreamInfo implements StreamInfo {
         this.sampleRateHz = sampleRateHz
         this.units = units
 
-        this.createStreamInfo()
-        this.appendChannelsToStreamInfo()
+        if (!boundStreamInfo) {
+            this.createStreamInfo()
+            this.appendChannelsToStreamInfo()
+        } else {
+            this.boundInfo = boundStreamInfo
+        }
     }
 
     public static Create(options: StreamInfoOptions) {
-        const {
-            name,
-            type,
-            sourceId,
-            channelNames,
-            channelFormat,
-            sampleRateHz,
-        } = options
-
-        const channelCount = channelNames.length
-
-        const key = JSON.stringify({
-            name,
-            type,
-            sourceId,
-            channelCount,
-            channelFormat,
-            sampleRateHz,
-        })
-
-        let instance = this.instanceCache[key]
-
-        if (instance === undefined) {
-            instance = new (this.Class ?? this)(options)
-            this.instanceCache[key] = instance
-        }
-        return instance
+        return new (this.Class ?? this)(options)
     }
 
     private createStreamInfo() {
@@ -139,4 +116,5 @@ export interface StreamInfoOptions {
     type?: string
     sourceId?: string
     units?: string
+    boundStreamInfo?: BoundStreamInfo
 }

package/src/testDoubles/Liblsl/FakeLiblsl.ts

@@ -16,9 +16,13 @@ import {
     PullChunkOptions,
     PullSampleOptions,
     DestroyStreamInfoOptions,
+    ResolveByPropOptions,
+    DestroyOutletOptions,
 } from 'impl/LiblslAdapter.js'
 
 export default class FakeLiblsl implements Liblsl {
+    public static fakeResolveHandles: bigint[] = []
+
     public static fakeSamples: Float32Array[] = [
         new Float32Array([1, 2, 3]),
         new Float32Array([4, 5, 6]),
@@ -46,12 +50,14 @@ export default class FakeLiblsl implements Liblsl {
     public streamInfo: BoundStreamInfo = {} as BoundStreamInfo
 
     public lastCreateStreamInfoOptions?: CreateStreamInfoOptions
-    public lastDestroyStreamInfoOptions?: DestroyStreamInfoOptions
     public lastAppendChannelsToStreamInfoOptions?: AppendChannelsToStreamInfoOptions
+    public lastDestroyStreamInfoOptions?: DestroyStreamInfoOptions
+    public lastResolveByPropOptions?: ResolveByPropOptions
     public lastCreateOutletOptions?: CreateOutletOptions
     public lastPushSampleFloatTimestampOptions?: PushSampleFloatTimestampOptions
     public lastPushSampleStringTimestampOptions?: PushSampleStringTimestampOptions
     public lastCreateInletOptions?: CreateInletOptions
+    public lastDestroyOutletOptions?: DestroyOutletOptions
     public lastPullSampleOptions?: PullSampleOptions
     public lastPullChunkOptions?: PullChunkOptions
     public lastFlushInletOptions?: FlushInletOptions
@@ -72,16 +78,21 @@ export default class FakeLiblsl implements Liblsl {
         return this.streamInfo
     }
 
-    public destroyStreamInfo(options: DestroyStreamInfoOptions) {
-        this.lastDestroyStreamInfoOptions = options
-    }
-
     public appendChannelsToStreamInfo(
         options: AppendChannelsToStreamInfoOptions
     ) {
         this.lastAppendChannelsToStreamInfoOptions = options
     }
 
+    public destroyStreamInfo(options: DestroyStreamInfoOptions) {
+        this.lastDestroyStreamInfoOptions = options
+    }
+
+    public async resolveByProp(options: ResolveByPropOptions) {
+        this.lastResolveByPropOptions = options
+        return FakeLiblsl.fakeResolveHandles
+    }
+
     public pushSampleFloatTimestamp(options: PushSampleFloatTimestampOptions) {
         this.lastPushSampleFloatTimestampOptions = options
         return FakeLiblsl.fakeErrorCode
@@ -101,8 +112,9 @@ export default class FakeLiblsl implements Liblsl {
         return this.outlet
     }
 
-    public destroyOutlet() {
+    public destroyOutlet(options: DestroyOutletOptions) {
         this.destroyOutletHitCount++
+        this.lastDestroyOutletOptions = options
     }
 
     public createInlet(options: CreateInletOptions) {