@neurodevs/node-lsl 10.2.2 → 11.0.1

package/build/testDoubles/{MockTimeMarkerOutlet.d.ts → MarkerOutlet/MockMarkerOutlet.d.ts}

@@ -1,5 +1,6 @@
-import { DurationMarker, LslSample, TimeMarkerOutlet } from '..';
-export default class MockTimeMarkerOutlet implements TimeMarkerOutlet {
+import { MarkerOutlet } from '../../components/EventMarkerOutlet';
+import { DurationMarker, LslSample } from '../../nodeLsl.types';
+export default class MockMarkerOutlet implements MarkerOutlet {
     private didPushMarkers;
     private pushedMarkers?;
     private didPushSamples;

package/build/testDoubles/{MockTimeMarkerOutlet.js → MarkerOutlet/MockMarkerOutlet.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const test_utils_1 = require("@sprucelabs/test-utils");
-class MockTimeMarkerOutlet {
+class MockMarkerOutlet {
     constructor() {
         this.didPushMarkers = false;
         this.didPushSamples = false;
@@ -38,5 +38,5 @@ class MockTimeMarkerOutlet {
         test_utils_1.assert.isFalse(this.didPushMarkers, `Expected to NOT have pushed markers but did. Try 'outlet.pushMarkers(...)'`);
     }
 }
-exports.default = MockTimeMarkerOutlet;
-//# sourceMappingURL=MockTimeMarkerOutlet.js.map
+exports.default = MockMarkerOutlet;
+//# sourceMappingURL=MockMarkerOutlet.js.map

package/build/testDoubles/MarkerOutlet/MockMarkerOutlet.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MockMarkerOutlet.js","sourceRoot":"","sources":["../../../src/testDoubles/MarkerOutlet/MockMarkerOutlet.ts"],"names":[],"mappings":";;AAAA,uDAA+C;AAI/C,MAAqB,gBAAgB;IAArC;QACY,mBAAc,GAAG,KAAK,CAAA;QAEtB,mBAAc,GAAG,KAAK,CAAA;IAsDlC,CAAC;IAnDU,IAAI,KAAI,CAAC;IACT,OAAO,KAAI,CAAC;IAEZ,UAAU,CAAC,MAAiB;QAC/B,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACvB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAA;YAC1B,IAAI,CAAC,aAAa,GAAG,EAAE,CAAA;QAC3B,CAAC;QACD,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IACpC,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,OAAyB;QAC9C,IAAI,CAAC,cAAc,GAAG,IAAI,CAAA;QAC1B,IAAI,CAAC,aAAa,GAAG,OAAO,CAAA;IAChC,CAAC;IAEM,oBAAoB,CAAC,OAAqB;QAC7C,mBAAM,CAAC,MAAM,CACT,IAAI,CAAC,cAAc,EACnB,0EAA0E,CAC7E,CAAA;QAED,IAAI,OAAO,EAAE,CAAC;YACV,mBAAM,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;QACnD,CAAC;IACL,CAAC;IAEM,uBAAuB;QAC1B,mBAAM,CAAC,OAAO,CACV,IAAI,CAAC,cAAc,EACnB,2EAA2E,CAC9E,CAAA;IACL,CAAC;IAEM,oBAAoB,CAAC,OAA0B;QAClD,mBAAM,CAAC,MAAM,CACT,IAAI,CAAC,cAAc,EACnB,2EAA2E,CAC9E,CAAA;QAED,IAAI,OAAO,EAAE,CAAC;YACV,mBAAM,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;QACnD,CAAC;IACL,CAAC;IAEM,uBAAuB;QAC1B,mBAAM,CAAC,OAAO,CACV,IAAI,CAAC,cAAc,EACnB,4EAA4E,CAC/E,CAAA;IACL,CAAC;CACJ;AAzDD,mCAyDC"}

package/build/testDoubles/MarkerOutlet/SpyMarkerOutlet.d.ts

@@ -0,0 +1,9 @@
+import EventMarkerOutlet from '../../components/EventMarkerOutlet';
+import { LslOutlet } from '../../components/LslStreamOutlet';
+export default class SpyMarkerOutlet extends EventMarkerOutlet {
+    totalWaitTimeMs: number;
+    constructor(lslOutlet: LslOutlet);
+    wait(durationMs: number): Promise<void>;
+    getLslOutlet(): LslOutlet;
+    resetTestDouble(): void;
+}

package/build/testDoubles/MarkerOutlet/SpyMarkerOutlet.js

@@ -0,0 +1,24 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const EventMarkerOutlet_1 = __importDefault(require("../../components/EventMarkerOutlet"));
+class SpyMarkerOutlet extends EventMarkerOutlet_1.default {
+    constructor(lslOutlet) {
+        super(lslOutlet);
+        this.totalWaitTimeMs = 0;
+    }
+    async wait(durationMs) {
+        this.totalWaitTimeMs += durationMs;
+        return Promise.resolve();
+    }
+    getLslOutlet() {
+        return this.lslOutlet;
+    }
+    resetTestDouble() {
+        this.totalWaitTimeMs = 0;
+    }
+}
+exports.default = SpyMarkerOutlet;
+//# sourceMappingURL=SpyMarkerOutlet.js.map

package/build/testDoubles/MarkerOutlet/SpyMarkerOutlet.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SpyMarkerOutlet.js","sourceRoot":"","sources":["../../../src/testDoubles/MarkerOutlet/SpyMarkerOutlet.ts"],"names":[],"mappings":";;;;;AAAA,2FAAkE;AAGlE,MAAqB,eAAgB,SAAQ,2BAAiB;IAG1D,YAAmB,SAAoB;QACnC,KAAK,CAAC,SAAS,CAAC,CAAA;QAChB,IAAI,CAAC,eAAe,GAAG,CAAC,CAAA;IAC5B,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,UAAkB;QAChC,IAAI,CAAC,eAAe,IAAI,UAAU,CAAA;QAClC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;IAC5B,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,SAAS,CAAA;IACzB,CAAC;IAEM,eAAe;QAClB,IAAI,CAAC,eAAe,GAAG,CAAC,CAAA;IAC5B,CAAC;CACJ;AApBD,kCAoBC"}

package/build/testDoubles/{FakeStreamInfo.d.ts → StreamInfo/FakeStreamInfo.d.ts}

@@ -1,5 +1,5 @@
-import { StreamInfo, StreamInfoOptions } from '../components/LslStreamInfo';
-import { BoundStreamInfo } from '../nodeLsl.types';
+import { StreamInfo, StreamInfoOptions } from '../../components/LslStreamInfo';
+import { BoundStreamInfo } from '../../nodeLsl.types';
 export default class FakeStreamInfo implements StreamInfo {
     static callsToConstructor: StreamInfoOptions[];
     static boundStreamInfo: BoundStreamInfo;

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

@@ -0,0 +1 @@
+{"version":3,"file":"FakeStreamInfo.js","sourceRoot":"","sources":["../../../src/testDoubles/StreamInfo/FakeStreamInfo.ts"],"names":[],"mappings":";;AAGA,MAAqB,cAAc;IAI/B,YAAmB,OAA0B;QACzC,cAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACnD,CAAC;IAED,IAAW,eAAe;QACtB,OAAO,cAAc,CAAC,eAAe,CAAA;IACzC,CAAC;IAEM,MAAM,CAAC,eAAe;QACzB,cAAc,CAAC,kBAAkB,GAAG,EAAE,CAAA;IAC1C,CAAC;;AAba,iCAAkB,GAAwB,EAAE,CAAA;AAC5C,8BAAe,GAAG,EAAqB,CAAA;kBAFpC,cAAc"}

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

@@ -0,0 +1,9 @@
+import LslStreamInfo, { StreamInfoOptions } from '../../components/LslStreamInfo';
+export default class SpyStreamInfo extends LslStreamInfo {
+    constructor(options: StreamInfoOptions);
+    getStreamInfo(): import("../..").BoundStreamInfo;
+    getName(): string;
+    getType(): string;
+    getSourceId(): string;
+    getUnits(): string;
+}

package/build/testDoubles/{SpyLslStreamInfo.js → StreamInfo/SpyStreamInfo.js}

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const LslStreamInfo_1 = __importDefault(require("../components/LslStreamInfo"));
-class SpyLslStreamInfo extends LslStreamInfo_1.default {
+const LslStreamInfo_1 = __importDefault(require("../../components/LslStreamInfo"));
+class SpyStreamInfo extends LslStreamInfo_1.default {
     constructor(options) {
         super(options);
     }
@@ -24,5 +24,5 @@ class SpyLslStreamInfo extends LslStreamInfo_1.default {
         return this.units;
     }
 }
-exports.default = SpyLslStreamInfo;
-//# sourceMappingURL=SpyLslStreamInfo.js.map
+exports.default = SpyStreamInfo;
+//# sourceMappingURL=SpyStreamInfo.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SpyStreamInfo.js","sourceRoot":"","sources":["../../../src/testDoubles/StreamInfo/SpyStreamInfo.ts"],"names":[],"mappings":";;;;;AAAA,mFAEuC;AAEvC,MAAqB,aAAc,SAAQ,uBAAa;IACpD,YAAmB,OAA0B;QACzC,KAAK,CAAC,OAAO,CAAC,CAAA;IAClB,CAAC;IAEM,aAAa;QAChB,OAAO,IAAI,CAAC,UAAU,CAAA;IAC1B,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;AAxBD,gCAwBC"}

package/build/testDoubles/generateRandomOutletOptions.d.ts

@@ -1,2 +1,2 @@
-import { LslOutletOptions } from '../components/LslOutlet';
+import { LslOutletOptions } from '../components/LslStreamOutlet';
 export default function generateRandomOutletOptions(): LslOutletOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neurodevs/node-lsl",
-  "version": "10.2.2",
+  "version": "11.0.1",
   "main": "build/index.js",
   "repository": {
     "type": "git",

package/src/__tests__/AbstractLslTest.ts

@@ -0,0 +1,58 @@
+import AbstractSpruceTest, { generateId } from '@sprucelabs/test-utils'
+import LiblslAdapter from '../adapters/LiblslAdapter'
+import EventMarkerOutlet from '../components/EventMarkerOutlet'
+import LslStreamInfo from '../components/LslStreamInfo'
+import LslStreamInlet from '../components/LslStreamInlet'
+
+import LslStreamOutlet from '../components/LslStreamOutlet'
+import FakeLiblsl from '../testDoubles/Liblsl/FakeLiblsl'
+import { SpyLslInlet } from '../testDoubles/LslInlet/SpyLslInlet'
+import FakeLslOutlet from '../testDoubles/LslOutlet/FakeLslOutlet'
+import SpyMarkerOutlet from '../testDoubles/MarkerOutlet/SpyMarkerOutlet'
+import FakeStreamInfo from '../testDoubles/StreamInfo/FakeStreamInfo'
+import SpyStreamInfo from '../testDoubles/StreamInfo/SpyStreamInfo'
+
+export default class AbstractLslTest extends AbstractSpruceTest {
+    protected static fakeLiblsl: FakeLiblsl
+
+    protected static async beforeEach() {
+        await super.beforeEach()
+
+        this.setFakeLiblsl()
+    }
+
+    protected static setFakeLiblsl() {
+        this.fakeLiblsl = new FakeLiblsl()
+        LiblslAdapter.setInstance(this.fakeLiblsl)
+    }
+
+    protected static setSpyStreamInfo() {
+        LslStreamInfo.Class = SpyStreamInfo
+    }
+
+    protected static setFakeStreamInfo() {
+        LslStreamInfo.Class = FakeStreamInfo
+        FakeStreamInfo.resetTestDouble()
+    }
+
+    protected static setSpyLslInlet() {
+        LslStreamInlet.Class = SpyLslInlet
+    }
+
+    protected static setFakeLslOutlet() {
+        LslStreamOutlet.Class = FakeLslOutlet
+        FakeLslOutlet.resetTestDouble()
+    }
+
+    protected static setSpyMarkerOutlet() {
+        EventMarkerOutlet.Class = SpyMarkerOutlet
+    }
+
+    protected static readonly name_ = generateId()
+    protected static readonly type = generateId()
+    protected static readonly sourceId = generateId()
+    protected static readonly units = generateId()
+    protected static readonly channelNames = [generateId(), generateId()]
+    protected static readonly chunkSize = Math.floor(Math.random() * 100)
+    protected static readonly maxBuffered = Math.floor(Math.random() * 100)
+}

package/src/__tests__/EventMarkerOutlet.test.ts

@@ -0,0 +1,165 @@
+import { randomInt } from 'crypto'
+import { assert, generateId, test } from '@sprucelabs/test-utils'
+import EventMarkerOutlet from '../components/EventMarkerOutlet'
+import { LslOutletOptions } from '../components/LslStreamOutlet'
+import generateRandomOutletOptions from '../testDoubles/generateRandomOutletOptions'
+import FakeLslOutlet from '../testDoubles/LslOutlet/FakeLslOutlet'
+import SpyMarkerOutlet from '../testDoubles/MarkerOutlet/SpyMarkerOutlet'
+import AbstractLslTest from './AbstractLslTest'
+
+export default class EventMarkerOutletTest extends AbstractLslTest {
+    private static instance: SpyMarkerOutlet
+
+    protected static async beforeEach() {
+        await super.beforeEach()
+
+        this.setFakeLiblsl()
+        this.setFakeLslOutlet()
+        this.setSpyMarkerOutlet()
+
+        this.instance = await this.EventMarkerOutlet()
+    }
+
+    @test()
+    protected static async loadsWithEventMarkerSpecificOptions() {
+        assert.isEqualDeep(FakeLslOutlet.callsToConstructor[0].options, {
+            name: 'Event markers',
+            type: 'Markers',
+            channelNames: ['Markers'],
+            sampleRate: 0,
+            channelFormat: 'string',
+            sourceId: 'event-markers',
+            manufacturer: 'N/A',
+            unit: 'N/A',
+            chunkSize: 0,
+            maxBuffered: 0,
+        })
+    }
+
+    @test()
+    protected static async canOverrideDefaultOptions() {
+        const options = generateRandomOutletOptions()
+        await this.EventMarkerOutlet(options)
+
+        assert.isEqualDeep(FakeLslOutlet.callsToConstructor[1].options, options)
+    }
+
+    @test()
+    protected static async pushingSingleMarkerIncrementsHitCountAndWaitTime() {
+        const markers = [this.generateDurationMarker()]
+        await this.instance.pushMarkers(markers)
+
+        const marker = markers[0]
+
+        assert.isEqual(
+            FakeLslOutlet.callsToPushSample[0][0],
+            marker.name,
+            'Pushed the wrong marker!'
+        )
+
+        assert.isEqual(this.instance.totalWaitTimeMs, marker.durationMs)
+    }
+
+    @test()
+    protected static async pushingTwoMarkersIncrementsHitCountAndWaitTimeTwice() {
+        const markers = await this.pushTotalMarkers(2)
+
+        assert.isEqual(FakeLslOutlet.callsToPushSample.length, 2)
+
+        assert.isEqual(
+            this.instance.totalWaitTimeMs,
+            markers[0].durationMs + markers[1].durationMs
+        )
+    }
+
+    @test('can stop on the first marker', 1)
+    @test('can stop on the second marker', 2)
+    @test('can stop on the third marker', 3)
+    protected static async canStopEventMarkersMidPush(bailIdx: number) {
+        let hitCount = 0
+
+        const outlet = this.instance.getLslOutlet()
+
+        outlet.pushSample = () => {
+            hitCount += 1
+            if (hitCount === bailIdx) {
+                this.instance.stop()
+            }
+        }
+
+        await this.pushTotalMarkers(10)
+
+        assert.isEqual(hitCount, bailIdx)
+    }
+
+    @test()
+    protected static async canStartAgainAfterStopping() {
+        this.instance.stop()
+
+        let hitCount = 0
+
+        const outlet = this.instance.getLslOutlet()
+
+        outlet.pushSample = () => {
+            hitCount++
+        }
+
+        await this.pushTotalMarkers(10)
+
+        assert.isEqual(hitCount, 10)
+    }
+
+    @test()
+    protected static async doesNotWaitIfStopped() {
+        await this.setupOutlet()
+
+        const startMs = Date.now()
+        const promise = this.pushTotalMarkers(2, 1000)
+        this.instance.stop()
+        await promise
+        const endMs = Date.now()
+
+        assert.isBelow(endMs - startMs, 10)
+    }
+
+    @test()
+    protected static async clearsTheTimeoutOnStop() {
+        void this.pushTotalMarkers(2, 100)
+        this.instance.stop()
+
+        this.lslOutlet.pushSample = () =>
+            assert.fail('Should not have been called')
+    }
+
+    private static get lslOutlet() {
+        return this.instance.getLslOutlet()
+    }
+
+    private static async setupOutlet() {
+        EventMarkerOutlet.Class = EventMarkerOutlet as any
+        this.instance = await this.EventMarkerOutlet()
+    }
+
+    private static async pushTotalMarkers(total: number, durationMs?: number) {
+        const markers = new Array(total)
+            .fill(null)
+            .map(() => this.generateDurationMarker(durationMs))
+
+        await this.instance.pushMarkers(markers)
+
+        return markers
+    }
+
+    private static generateDurationMarker(durationMs?: number) {
+        return {
+            name: generateId(),
+            durationMs: durationMs ?? randomInt(100, 1000),
+        }
+    }
+
+    private static async EventMarkerOutlet(
+        options?: Partial<LslOutletOptions>
+    ) {
+        return (await EventMarkerOutlet.Create(options)) as SpyMarkerOutlet
+    }
+}

package/src/__tests__/{Liblsl.test.ts → LiblslAdapter.test.ts}

@@ -1,12 +1,7 @@
 import { randomInt } from 'crypto'
-import AbstractSpruceTest, {
-    test,
-    assert,
-    errorAssert,
-    generateId,
-} from '@sprucelabs/test-utils'
+import { test, assert, errorAssert, generateId } from '@sprucelabs/test-utils'
 import { DataType, OpenParams } from 'ffi-rs'
-import LiblslImpl from '../components/Liblsl'
+import LiblslAdapter from '../adapters/LiblslAdapter'
 import {
     BoundChild,
     BoundDescription,
@@ -18,9 +13,10 @@ import {
     LiblslBindings,
     LslChannel,
 } from '../nodeLsl.types'
-import FakeLiblsl from '../testDoubles/FakeLiblsl'
+import FakeLiblsl from '../testDoubles/Liblsl/FakeLiblsl'
+import AbstractLslTest from './AbstractLslTest'
 
-export default class LiblslTest extends AbstractSpruceTest {
+export default class LiblslAdapterTest extends AbstractLslTest {
     private static lsl: Liblsl
     private static libraryPath?: string
     private static libraryOptions?: Record<string, any>
@@ -76,11 +72,11 @@ export default class LiblslTest extends AbstractSpruceTest {
         this.appendChildHitCount = 0
 
         delete this.ffiRsOpenOptions
-        LiblslImpl.ffiRsOpen = (options) => {
+        LiblslAdapter.ffiRsOpen = (options) => {
             this.ffiRsOpenOptions = options
         }
 
-        LiblslImpl.ffiRsDefine = (options) => {
+        LiblslAdapter.ffiRsDefine = (options) => {
             this.ffiRsDefineOptions = options
             if (this.shouldThrowWhenCreatingBindings) {
                 throw new Error('Failed to create bindings!')
@@ -88,16 +84,16 @@ export default class LiblslTest extends AbstractSpruceTest {
             return this.fakeBindings as any
         }
 
-        LiblslImpl.resetInstance()
-        this.lsl = LiblslImpl.getInstance()
+        LiblslAdapter.resetInstance()
+        this.lsl = LiblslAdapter.getInstance()
     }
 
     @test()
     protected static async throwsWhenBindingsFailToLoad() {
         this.shouldThrowWhenCreatingBindings = true
-        LiblslImpl.resetInstance()
+        LiblslAdapter.resetInstance()
 
-        const err = assert.doesThrow(() => LiblslImpl.getInstance())
+        const err = assert.doesThrow(() => LiblslAdapter.getInstance())
         errorAssert.assertError(err, 'FAILED_TO_LOAD_LIBLSL', {
             liblslPath: process.env.LIBLSL_PATH,
         })
@@ -167,21 +163,21 @@ export default class LiblslTest extends AbstractSpruceTest {
 
     @test()
     protected static async worksAsASingleton() {
-        const liblsl = LiblslImpl.getInstance()
+        const liblsl = LiblslAdapter.getInstance()
         //@ts-ignore
-        assert.isInstanceOf(liblsl, LiblslImpl)
+        assert.isInstanceOf(liblsl, LiblslAdapter)
     }
 
     @test()
     protected static async singletonIsTheSame() {
-        assert.isEqual(LiblslImpl.getInstance(), LiblslImpl.getInstance())
+        assert.isEqual(LiblslAdapter.getInstance(), LiblslAdapter.getInstance())
     }
 
     @test()
     protected static canSetInstance() {
         const fake = new FakeLiblsl()
-        LiblslImpl.setInstance(fake)
-        assert.isEqual(LiblslImpl.getInstance(), fake)
+        LiblslAdapter.setInstance(fake)
+        assert.isEqual(LiblslAdapter.getInstance(), fake)
     }
 
     @test()
@@ -402,8 +398,8 @@ export default class LiblslTest extends AbstractSpruceTest {
     protected static async defaultsToMacOsPath() {
         delete process.env.LIBLSL_PATH
 
-        LiblslImpl.resetInstance()
-        this.lsl = LiblslImpl.getInstance()
+        LiblslAdapter.resetInstance()
+        this.lsl = LiblslAdapter.getInstance()
 
         assert.isEqual(
             this.ffiRsOpenOptions?.path,

package/src/__tests__/LslStreamInfo.test.ts

@@ -1,16 +1,16 @@
 import { test, assert, generateId, errorAssert } from '@sprucelabs/test-utils'
 import LslStreamInfo, { StreamInfoOptions } from '../components/LslStreamInfo'
 import { CHANNEL_FORMATS } from '../consts'
-import SpyLslStreamInfo from '../testDoubles/SpyLslStreamInfo'
-import AbstractNodeLslTest from './AbstractNodeLslTest'
+import SpyStreamInfo from '../testDoubles/StreamInfo/SpyStreamInfo'
+import AbstractLslTest from './AbstractLslTest'
 
-export default class LslStreamInfoTest extends AbstractNodeLslTest {
-    private static instance: SpyLslStreamInfo
+export default class LslStreamInfoTest extends AbstractLslTest {
+    private static instance: SpyStreamInfo
 
     protected static async beforeEach() {
         await super.beforeEach()
 
-        this.setSpyLslStreamInfo()
+        this.setSpyStreamInfo()
 
         this.instance = this.LslStreamInfo()
     }
@@ -191,13 +191,6 @@ export default class LslStreamInfoTest extends AbstractNodeLslTest {
         )
     }
 
-    private static LslStreamInfo(options?: Partial<StreamInfoOptions>) {
-        return LslStreamInfo.Create({
-            ...this.defaultOptions,
-            ...options,
-        }) as SpyLslStreamInfo
-    }
-
     private static readonly defaultOptions = {
         name: generateId(),
         type: generateId(),
@@ -206,4 +199,11 @@ export default class LslStreamInfoTest extends AbstractNodeLslTest {
         channelFormat: 'float32',
         sampleRate: 100 * Math.random(),
     } as StreamInfoOptions
+
+    private static LslStreamInfo(options?: Partial<StreamInfoOptions>) {
+        return LslStreamInfo.Create({
+            ...this.defaultOptions,
+            ...options,
+        }) as SpyStreamInfo
+    }
 }

package/src/__tests__/{LslInlet.test.ts → LslStreamInlet.test.ts}

@@ -1,10 +1,10 @@
 import { test, assert, errorAssert } from '@sprucelabs/test-utils'
-import LslInlet, { LslInletOptions } from '../components/LslInlet'
-import FakeStreamInfo from '../testDoubles/FakeStreamInfo'
-import { SpyLslInlet } from '../testDoubles/SpyLslInlet'
-import AbstractNodeLslTest from './AbstractNodeLslTest'
+import LslStreamInlet, { LslInletOptions } from '../components/LslStreamInlet'
+import { SpyLslInlet } from '../testDoubles/LslInlet/SpyLslInlet'
+import FakeStreamInfo from '../testDoubles/StreamInfo/FakeStreamInfo'
+import AbstractLslTest from './AbstractLslTest'
 
-export default class LslInletTest extends AbstractNodeLslTest {
+export default class LslStreamInletTest extends AbstractLslTest {
     private static instance: SpyLslInlet
 
     protected static async beforeEach() {
@@ -13,11 +13,11 @@ export default class LslInletTest extends AbstractNodeLslTest {
         this.setSpyLslInlet()
         this.setFakeStreamInfo()
 
-        this.instance = this.LslInlet()
+        this.instance = this.LslStreamInlet()
     }
 
     @test()
-    protected static async canCreateLslInlet() {
+    protected static async canCreateLslStreamInlet() {
         assert.isTruthy(this.instance, 'Instance should be created!')
     }
 
@@ -25,7 +25,7 @@ export default class LslInletTest extends AbstractNodeLslTest {
     protected static async throwsWithMissingRequiredOptions() {
         const err = assert.doesThrow(
             // @ts-ignore
-            () => LslInlet.Create()
+            () => LslStreamInlet.Create()
         )
         errorAssert.assertError(err, 'MISSING_PARAMETERS', {
             parameters: [
@@ -56,7 +56,7 @@ export default class LslInletTest extends AbstractNodeLslTest {
 
     @test()
     protected static async uniqueNameHasSetPrefix() {
-        const instance = this.LslInlet({ name: undefined })
+        const instance = this.LslStreamInlet({ name: undefined })
 
         assert.doesInclude(
             instance.getName(),
@@ -82,7 +82,7 @@ export default class LslInletTest extends AbstractNodeLslTest {
         )
     }
 
-    private static LslInlet(options?: Partial<LslInletOptions>) {
+    private static LslStreamInlet(options?: Partial<LslInletOptions>) {
         const defaultOptions = {
             channelNames: this.channelNames,
             channelFormat: 'float32',
@@ -94,6 +94,6 @@ export default class LslInletTest extends AbstractNodeLslTest {
             maxBuffered: this.maxBuffered,
             ...options,
         } as LslInletOptions
-        return LslInlet.Create(defaultOptions) as SpyLslInlet
+        return LslStreamInlet.Create(defaultOptions) as SpyLslInlet
     }
 }