@neurodevs/node-lsl 11.4.1 → 12.0.0

package/build/testDoubles/StreamTransportBridge/FakeStreamTransportBridge.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class FakeStreamTransportBridge {
+    constructor() {
+        FakeStreamTransportBridge.numCallsToConstructor++;
+    }
+    static resetTestDouble() {
+        FakeStreamTransportBridge.numCallsToConstructor = 0;
+    }
+}
+FakeStreamTransportBridge.numCallsToConstructor = 0;
+exports.default = FakeStreamTransportBridge;
+//# sourceMappingURL=FakeStreamTransportBridge.js.map

package/build/testDoubles/StreamTransportBridge/FakeStreamTransportBridge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FakeStreamTransportBridge.js","sourceRoot":"","sources":["../../../src/testDoubles/StreamTransportBridge/FakeStreamTransportBridge.ts"],"names":[],"mappings":";;AAEA,MAAqB,yBAAyB;IAK1C;QACI,yBAAyB,CAAC,qBAAqB,EAAE,CAAA;IACrD,CAAC;IAEM,MAAM,CAAC,eAAe;QACzB,yBAAyB,CAAC,qBAAqB,GAAG,CAAC,CAAA;IACvD,CAAC;;AARa,+CAAqB,GAAG,CAAC,CAAA;kBAHtB,yBAAyB"}

package/build/testDoubles/generateRandomOutletOptions.d.ts

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

package/build/testDoubles/generateRandomOutletOptions.js

@@ -1,20 +1,23 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = generateRandomOutletOptions;
 const crypto_1 = require("crypto");
-const test_utils_1 = require("@sprucelabs/test-utils");
+const generate_id_1 = __importDefault(require("@neurodevs/generate-id"));
 const consts_1 = require("./consts");
 function generateRandomOutletOptions() {
     const randomChannelIdx = (0, crypto_1.randomInt)(consts_1.TEST_SUPPORTED_CHANNEL_FORMATS.length);
     return {
-        name: (0, test_utils_1.generateId)(),
-        type: (0, test_utils_1.generateId)(),
-        channelNames: new Array((0, crypto_1.randomInt)(1, 10)).fill((0, test_utils_1.generateId)()),
+        name: (0, generate_id_1.default)(),
+        type: (0, generate_id_1.default)(),
+        channelNames: new Array((0, crypto_1.randomInt)(1, 10)).fill((0, generate_id_1.default)()),
         sampleRate: Math.random() * 10,
         channelFormat: consts_1.TEST_SUPPORTED_CHANNEL_FORMATS[randomChannelIdx],
-        sourceId: (0, test_utils_1.generateId)(),
-        manufacturer: (0, test_utils_1.generateId)(),
-        unit: (0, test_utils_1.generateId)(),
+        sourceId: (0, generate_id_1.default)(),
+        manufacturer: (0, generate_id_1.default)(),
+        unit: (0, generate_id_1.default)(),
         chunkSize: (0, crypto_1.randomInt)(0, 10),
         maxBuffered: (0, crypto_1.randomInt)(0, 10),
     };

package/build/testDoubles/generateRandomOutletOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateRandomOutletOptions.js","sourceRoot":"","sources":["../../src/testDoubles/generateRandomOutletOptions.ts"],"names":[],"mappings":";;AAKA,8CAeC;AApBD,mCAAkC;AAClC,uDAAmD;AAEnD,qCAAyD;AAEzD,SAAwB,2BAA2B;IAC/C,MAAM,gBAAgB,GAAG,IAAA,kBAAS,EAAC,uCAA8B,CAAC,MAAM,CAAC,CAAA;IAEzE,OAAO;QACH,IAAI,EAAE,IAAA,uBAAU,GAAE;QAClB,IAAI,EAAE,IAAA,uBAAU,GAAE;QAClB,YAAY,EAAE,IAAI,KAAK,CAAC,IAAA,kBAAS,EAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAA,uBAAU,GAAE,CAAC;QAC5D,UAAU,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;QAC9B,aAAa,EAAE,uCAA8B,CAAC,gBAAgB,CAAC;QAC/D,QAAQ,EAAE,IAAA,uBAAU,GAAE;QACtB,YAAY,EAAE,IAAA,uBAAU,GAAE;QAC1B,IAAI,EAAE,IAAA,uBAAU,GAAE;QAClB,SAAS,EAAE,IAAA,kBAAS,EAAC,CAAC,EAAE,EAAE,CAAC;QAC3B,WAAW,EAAE,IAAA,kBAAS,EAAC,CAAC,EAAE,EAAE,CAAC;KACZ,CAAA;AACzB,CAAC"}
+{"version":3,"file":"generateRandomOutletOptions.js","sourceRoot":"","sources":["../../src/testDoubles/generateRandomOutletOptions.ts"],"names":[],"mappings":";;;;;AAKA,8CAeC;AApBD,mCAAkC;AAClC,yEAA+C;AAE/C,qCAAyD;AAEzD,SAAwB,2BAA2B;IAC/C,MAAM,gBAAgB,GAAG,IAAA,kBAAS,EAAC,uCAA8B,CAAC,MAAM,CAAC,CAAA;IAEzE,OAAO;QACH,IAAI,EAAE,IAAA,qBAAU,GAAE;QAClB,IAAI,EAAE,IAAA,qBAAU,GAAE;QAClB,YAAY,EAAE,IAAI,KAAK,CAAC,IAAA,kBAAS,EAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAA,qBAAU,GAAE,CAAC;QAC5D,UAAU,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;QAC9B,aAAa,EAAE,uCAA8B,CAAC,gBAAgB,CAAC;QAC/D,QAAQ,EAAE,IAAA,qBAAU,GAAE;QACtB,YAAY,EAAE,IAAA,qBAAU,GAAE;QAC1B,IAAI,EAAE,IAAA,qBAAU,GAAE;QAClB,SAAS,EAAE,IAAA,kBAAS,EAAC,CAAC,EAAE,EAAE,CAAC;QAC3B,WAAW,EAAE,IAAA,kBAAS,EAAC,CAAC,EAAE,EAAE,CAAC;KACT,CAAA;AAC5B,CAAC"}

package/build/types.d.ts

@@ -1,8 +1,8 @@
 import { FuncObj, FieldType } from 'ffi-rs';
 import { CHANNEL_FORMATS } from './consts';
-import { LslInlet } from './modules/LslStreamInlet';
-import { LslOutlet } from './modules/LslStreamOutlet';
-export type StreamFixuture = LslOutlet | LslInlet;
+import { StreamInlet } from './impl/LslStreamInlet';
+import { StreamOutlet } from './impl/LslStreamOutlet';
+export type StreamFixuture = StreamOutlet | StreamInlet;
 export type ChannelFormat = (typeof CHANNEL_FORMATS)[number];
 export interface DurationMarker {
     name: string;

package/package.json

@@ -1,11 +1,23 @@
 {
   "name": "@neurodevs/node-lsl",
-  "version": "11.4.1",
-  "main": "build/index.js",
+  "version": "12.0.0",
+  "description": "Lab Streaming Layer (LSL) bindings for Node",
+  "keywords": [
+    "nodejs",
+    "typescript",
+    "tdd"
+  ],
+  "license": "MIT",
+  "author": "Eric Yates <hello@ericthecurious.com>",
+  "homepage": "https://github.com/neurodevs/node-lsl",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/neurodevs/node-lsl.git"
   },
+  "bugs": {
+    "url": "https://github.com/neurodevs/node-lsl/issues"
+  },
+  "main": "build/index.js",
   "scripts": {
     "build.ci": "yarn run build.tsc && yarn run build.resolve-paths && yarn run lint",
     "build.dev": "yarn run build.tsc --sourceMap ; yarn run resolve-paths.lint",
@@ -30,7 +42,14 @@
     "watch.tsc": "tsc -w",
     "test.rs": "node build/test.js"
   },
+  "dependencies": {
+    "ffi-rs": "^1.0.98",
+    "node-gyp": "^10.2.0",
+    "ref-array-napi": "^1.2.2",
+    "ref-napi": "^3.0.3"
+  },
   "devDependencies": {
+    "@neurodevs/generate-id": "^1.0.0",
     "@sprucelabs/jest-json-reporter": "^8.0.542",
     "@sprucelabs/resolve-path-aliases": "^2.0.516",
     "@sprucelabs/test": "^9.0.59",
@@ -48,13 +67,6 @@
     "tsc-watch": "^6.2.1",
     "typescript": "^5.6.3"
   },
-  "description": "Lab Streaming Layer (LSL) bindings for Node",
-  "skill": {
-    "namespace": "node-lsl",
-    "upgradeIgnoreList": [
-      "@sprucelabs/spruce-test-fixtures"
-    ]
-  },
   "jest": {
     "testRunner": "jest-circus/runner",
     "maxWorkers": 4,
@@ -73,14 +85,10 @@
       "^#spruce/(.*)$": "<rootDir>/build/.spruce/$1"
     }
   },
-  "dependencies": {
-    "@sprucelabs/error": "^6.0.541",
-    "@sprucelabs/schema": "^30.0.560",
-    "@sprucelabs/spruce-core-schemas": "^40.1.547",
-    "@sprucelabs/spruce-skill-utils": "^31.0.624",
-    "ffi-rs": "^1.0.98",
-    "node-gyp": "^10.2.0",
-    "ref-array-napi": "^1.2.2",
-    "ref-napi": "^3.0.3"
+  "skill": {
+    "namespace": "node-lsl",
+    "upgradeIgnoreList": [
+      "@sprucelabs/spruce-test-fixtures"
+    ]
   }
 }

package/src/.spruce/settings.json

@@ -6,8 +6,6 @@
     "skill"
   ],
   "installed": [
-    "test",
-    "schema",
-    "error"
+    "test"
   ]
 }

package/src/__tests__/{AbstractLslTest.ts → AbstractPackageTest.ts}

@@ -1,18 +1,19 @@
-import AbstractSpruceTest, { generateId } from '@sprucelabs/test-utils'
-import EventMarkerOutlet from '../modules/EventMarkerOutlet'
-import LiblslAdapter from '../modules/LiblslAdapter'
-import LslStreamInfo from '../modules/LslStreamInfo'
-import LslStreamInlet from '../modules/LslStreamInlet'
+import AbstractSpruceTest from '@sprucelabs/test-utils'
+import generateId from '@neurodevs/generate-id'
+import LiblslAdapter from '../impl/LiblslAdapter'
+import LslEventMarkerOutlet from '../impl/LslEventMarkerOutlet'
+import LslStreamInfo from '../impl/LslStreamInfo'
+import LslStreamInlet from '../impl/LslStreamInlet'
 
-import LslStreamOutlet from '../modules/LslStreamOutlet'
+import LslStreamOutlet from '../impl/LslStreamOutlet'
+import SpyEventMarkerOutlet from '../testDoubles/EventMarkerOutlet/SpyEventMarkerOutlet'
 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'
+import { SpyStreamInlet } from '../testDoubles/StreamInlet/SpyStreamInlet'
+import FakeStreamOutlet from '../testDoubles/StreamOutlet/FakeStreamOutlet'
 
-export default class AbstractLslTest extends AbstractSpruceTest {
+export default class AbstractPackageTest extends AbstractSpruceTest {
     protected static fakeLiblsl: FakeLiblsl
 
     protected static async beforeEach() {
@@ -35,17 +36,21 @@ export default class AbstractLslTest extends AbstractSpruceTest {
         FakeStreamInfo.resetTestDouble()
     }
 
-    protected static setSpyLslInlet() {
-        LslStreamInlet.Class = SpyLslInlet
+    protected static setSpyStreamInlet() {
+        LslStreamInlet.Class = SpyStreamInlet
     }
 
-    protected static setFakeLslOutlet() {
-        LslStreamOutlet.Class = FakeLslOutlet
-        FakeLslOutlet.resetTestDouble()
+    protected static setFakeStreamOutlet() {
+        LslStreamOutlet.Class = FakeStreamOutlet
+        FakeStreamOutlet.resetTestDouble()
     }
 
-    protected static setSpyMarkerOutlet() {
-        EventMarkerOutlet.Class = SpyMarkerOutlet
+    protected static setSpyEventMarkerOutlet() {
+        LslEventMarkerOutlet.Class = SpyEventMarkerOutlet
+    }
+
+    protected static generateId() {
+        return generateId()
     }
 
     protected static readonly name_ = generateId()
@@ -55,4 +60,5 @@ export default class AbstractLslTest extends AbstractSpruceTest {
     protected static readonly channelNames = [generateId(), generateId()]
     protected static readonly chunkSize = Math.floor(Math.random() * 100)
     protected static readonly maxBuffered = Math.floor(Math.random() * 100)
+    protected static readonly sampleRate = Math.floor(Math.random() * 100)
 }

package/src/__tests__/{modules → impl}/LiblslAdapter.test.ts

@@ -1,7 +1,8 @@
 import { randomInt } from 'crypto'
-import { test, assert, errorAssert, generateId } from '@sprucelabs/test-utils'
+import { test, assert } from '@sprucelabs/test-utils'
+import generateId from '@neurodevs/generate-id'
 import { DataType, OpenParams } from 'ffi-rs'
-import LiblslAdapter from '../../modules/LiblslAdapter'
+import LiblslAdapter from '../../impl/LiblslAdapter'
 import FakeLiblsl from '../../testDoubles/Liblsl/FakeLiblsl'
 import {
     BoundChild,
@@ -14,10 +15,10 @@ import {
     LiblslBindings,
     LslChannel,
 } from '../../types'
-import AbstractLslTest from '../AbstractLslTest'
+import AbstractPackageTest from '../AbstractPackageTest'
 
-export default class LiblslAdapterTest extends AbstractLslTest {
-    private static lsl: Liblsl
+export default class LiblslAdapterTest extends AbstractPackageTest {
+    private static instance: Liblsl
     private static libraryPath?: string
     private static libraryOptions?: Record<string, any>
     private static fakeBindings: LiblslBindings
@@ -85,7 +86,12 @@ export default class LiblslAdapterTest extends AbstractLslTest {
         }
 
         LiblslAdapter.resetInstance()
-        this.lsl = LiblslAdapter.getInstance()
+        this.instance = LiblslAdapter.getInstance()
+    }
+
+    @test()
+    protected static async createsInstance() {
+        assert.isTruthy(this.instance, 'Failed to create instance!')
     }
 
     @test()
@@ -94,9 +100,13 @@ export default class LiblslAdapterTest extends AbstractLslTest {
         LiblslAdapter.resetInstance()
 
         const err = assert.doesThrow(() => LiblslAdapter.getInstance())
-        errorAssert.assertError(err, 'FAILED_TO_LOAD_LIBLSL', {
-            liblslPath: process.env.LIBLSL_PATH,
-        })
+
+        debugger
+
+        assert.isTrue(
+            err.message.includes(this.generateFailedMessage()),
+            'Did not receive the expected error!'
+        )
     }
 
     @test()
@@ -107,60 +117,6 @@ export default class LiblslAdapterTest extends AbstractLslTest {
         })
     }
 
-    @test()
-    protected static throwsWhenCreateStreamInfoIsMissingRequiredParams() {
-        //@ts-ignore
-        const err = assert.doesThrow(() => this.lsl.createStreamInfo())
-        errorAssert.assertError(err, 'MISSING_PARAMETERS', {
-            parameters: [
-                'name',
-                'type',
-                'channelCount',
-                'sampleRate',
-                'channelFormat',
-                'sourceId',
-            ],
-        })
-    }
-
-    @test()
-    protected static async throwsWhenAppendChannelsIsMissingRequiredParams() {
-        const err = assert.doesThrow(() =>
-            //@ts-ignore
-            this.lsl.appendChannelsToStreamInfo({})
-        )
-        errorAssert.assertError(err, 'MISSING_PARAMETERS', {
-            parameters: ['info', 'channels'],
-        })
-    }
-
-    @test()
-    protected static async throwsWhenCreateOutletIsMissingRequiredParams() {
-        //@ts-ignore
-        const err = assert.doesThrow(() => this.lsl.createOutlet({}))
-        errorAssert.assertError(err, 'MISSING_PARAMETERS', {
-            parameters: ['info', 'chunkSize', 'maxBuffered'],
-        })
-    }
-
-    @test()
-    protected static async throwsWhenPushSampleFloatTimestampIsMissingRequiredParams() {
-        //@ts-ignore
-        const err = assert.doesThrow(() => this.lsl.pushSampleFloatTimestamp())
-        errorAssert.assertError(err, 'MISSING_PARAMETERS', {
-            parameters: ['outlet', 'sample', 'timestamp'],
-        })
-    }
-
-    @test()
-    protected static async throwsWhenPushSampleStringTimestampIsMissingRequiredParams() {
-        //@ts-ignore
-        const err = assert.doesThrow(() => this.lsl.pushSampleFloatTimestamp())
-        errorAssert.assertError(err, 'MISSING_PARAMETERS', {
-            parameters: ['outlet', 'sample', 'timestamp'],
-        })
-    }
-
     @test()
     protected static async worksAsASingleton() {
         const liblsl = LiblslAdapter.getInstance()
@@ -263,7 +219,7 @@ export default class LiblslAdapterTest extends AbstractLslTest {
     @test()
     protected static async canCreateStreamInfoWithRequiredParams() {
         const options = this.generateRandomCreateStreamInfoOptions()
-        const actual = this.lsl.createStreamInfo(options)
+        const actual = this.instance.createStreamInfo(options)
 
         assert.isEqual(actual, this.fakeStreamInfo)
         assert.isEqualDeep(this.createStreamInfoParams, Object.values(options))
@@ -285,7 +241,7 @@ export default class LiblslAdapterTest extends AbstractLslTest {
             sample: expected,
             timestamp,
         }
-        this.lsl.pushSampleFloatTimestamp(options)
+        this.instance.pushSampleFloatTimestamp(options)
 
         assert.isEqualDeep(this.pushSampleFloatTimestampParams, [
             this.fakeOutlet,
@@ -303,7 +259,7 @@ export default class LiblslAdapterTest extends AbstractLslTest {
             sample: expected,
             timestamp,
         }
-        this.lsl.pushSampleStringTimestamp(options)
+        this.instance.pushSampleStringTimestamp(options)
         assert.isEqual(
             this.pushSampleStringTimestampParams?.[0],
             this.fakeOutlet
@@ -317,7 +273,7 @@ export default class LiblslAdapterTest extends AbstractLslTest {
         const info = this.createRandomStreamInfo()
         const channel: LslChannel = this.generateRandomChannelValues()
 
-        this.lsl.appendChannelsToStreamInfo({
+        this.instance.appendChannelsToStreamInfo({
             info,
             channels: [channel],
         })
@@ -354,7 +310,7 @@ export default class LiblslAdapterTest extends AbstractLslTest {
         const channel1 = this.generateRandomChannelValues()
         const channel2 = this.generateRandomChannelValues()
 
-        this.lsl.appendChannelsToStreamInfo({
+        this.instance.appendChannelsToStreamInfo({
             info,
             channels: [channel1, channel2],
         })
@@ -374,23 +330,23 @@ export default class LiblslAdapterTest extends AbstractLslTest {
     protected static async canDestroyOutlet() {
         const outlet = this.createRandomOutlet()
         const options = { outlet }
-        this.lsl.destroyOutlet(options)
+        this.instance.destroyOutlet(options)
 
         assert.isEqualDeep(this.destroyOutletParams, Object.values(options))
     }
 
     @test()
     protected static async callingLocalClockTwiceReturnsDifferentTimestamps() {
-        const t1 = this.lsl.localClock()
+        const t1 = this.instance.localClock()
         await this.wait(10)
-        const t2 = this.lsl.localClock()
+        const t2 = this.instance.localClock()
         assert.isNotEqual(t1, t2)
     }
 
     @test()
     protected static async localClockBindingReceivesEmptyArray() {
         delete this.localClockParams
-        this.lsl.localClock()
+        this.instance.localClock()
         assert.isEqualDeep(this.localClockParams, [])
     }
 
@@ -399,7 +355,7 @@ export default class LiblslAdapterTest extends AbstractLslTest {
         delete process.env.LIBLSL_PATH
 
         LiblslAdapter.resetInstance()
-        this.lsl = LiblslAdapter.getInstance()
+        this.instance = LiblslAdapter.getInstance()
 
         assert.isEqual(
             this.ffiRsOpenOptions?.path,
@@ -415,20 +371,20 @@ export default class LiblslAdapterTest extends AbstractLslTest {
     }
 
     private static createRandomStreamInfo() {
-        return this.lsl.createStreamInfo(
+        return this.instance.createStreamInfo(
             this.generateRandomCreateStreamInfoOptions()
         )
     }
 
     private static createRandomOutlet() {
         const options = this.createRandomOptions()
-        const outlet = this.lsl.createOutlet(options)
+        const outlet = this.instance.createOutlet(options)
         return { options, outlet }
     }
 
     private static createRandomInlet() {
         const options = this.createRandomOptions()
-        const inlet = this.lsl.createInlet(options)
+        const inlet = this.instance.createInlet(options)
         return { options, inlet }
     }
 
@@ -461,6 +417,10 @@ export default class LiblslAdapterTest extends AbstractLslTest {
         }
     }
 
+    private static generateFailedMessage() {
+        return `Loading the liblsl dylib failed! I tried to load it from ${process.env.LIBLSL_PATH}.`
+    }
+
     private static FakeBindings() {
         return {
             lsl_create_streaminfo: (params: any[]) => {

package/src/__tests__/{modules/EventMarkerOutlet.test.ts → impl/LslEventMarkerOutlet.test.ts}

@@ -1,28 +1,34 @@
 import { randomInt } from 'crypto'
-import { assert, generateId, test } from '@sprucelabs/test-utils'
-import EventMarkerOutlet from '../../modules/EventMarkerOutlet'
-import { LslOutletOptions } from '../../modules/LslStreamOutlet'
+import { assert, test } from '@sprucelabs/test-utils'
+import generateId from '@neurodevs/generate-id'
+import LslEventMarkerOutlet from '../../impl/LslEventMarkerOutlet'
+import { StreamOutletOptions } from '../../impl/LslStreamOutlet'
+import SpyEventMarkerOutlet from '../../testDoubles/EventMarkerOutlet/SpyEventMarkerOutlet'
 import generateRandomOutletOptions from '../../testDoubles/generateRandomOutletOptions'
-import FakeLslOutlet from '../../testDoubles/LslOutlet/FakeLslOutlet'
-import SpyMarkerOutlet from '../../testDoubles/MarkerOutlet/SpyMarkerOutlet'
-import AbstractLslTest from '../AbstractLslTest'
+import FakeStreamOutlet from '../../testDoubles/StreamOutlet/FakeStreamOutlet'
+import AbstractPackageTest from '../AbstractPackageTest'
 
-export default class EventMarkerOutletTest extends AbstractLslTest {
-    private static instance: SpyMarkerOutlet
+export default class EventMarkerOutletTest extends AbstractPackageTest {
+    private static instance: SpyEventMarkerOutlet
 
     protected static async beforeEach() {
         await super.beforeEach()
 
         this.setFakeLiblsl()
-        this.setFakeLslOutlet()
-        this.setSpyMarkerOutlet()
+        this.setFakeStreamOutlet()
+        this.setSpyEventMarkerOutlet()
 
-        this.instance = await this.EventMarkerOutlet()
+        this.instance = await this.LslEventMarkerOutlet()
+    }
+
+    @test()
+    protected static async createsInstance() {
+        assert.isTruthy(this.instance, 'Failed to create instance!')
     }
 
     @test()
     protected static async loadsWithEventMarkerSpecificOptions() {
-        assert.isEqualDeep(FakeLslOutlet.callsToConstructor[0].options, {
+        assert.isEqualDeep(FakeStreamOutlet.callsToConstructor[0].options, {
             name: 'Event markers',
             type: 'Markers',
             channelNames: ['Markers'],
@@ -39,9 +45,12 @@ export default class EventMarkerOutletTest extends AbstractLslTest {
     @test()
     protected static async canOverrideDefaultOptions() {
         const options = generateRandomOutletOptions()
-        await this.EventMarkerOutlet(options)
+        await this.LslEventMarkerOutlet(options)
 
-        assert.isEqualDeep(FakeLslOutlet.callsToConstructor[1].options, options)
+        assert.isEqualDeep(
+            FakeStreamOutlet.callsToConstructor[1].options,
+            options
+        )
     }
 
     @test()
@@ -52,7 +61,7 @@ export default class EventMarkerOutletTest extends AbstractLslTest {
         const marker = markers[0]
 
         assert.isEqual(
-            FakeLslOutlet.callsToPushSample[0][0],
+            FakeStreamOutlet.callsToPushSample[0][0],
             marker.name,
             'Pushed the wrong marker!'
         )
@@ -64,7 +73,7 @@ export default class EventMarkerOutletTest extends AbstractLslTest {
     protected static async pushingTwoMarkersIncrementsHitCountAndWaitTimeTwice() {
         const markers = await this.pushTotalMarkers(2)
 
-        assert.isEqual(FakeLslOutlet.callsToPushSample.length, 2)
+        assert.isEqual(FakeStreamOutlet.callsToPushSample.length, 2)
 
         assert.isEqual(
             this.instance.totalWaitTimeMs,
@@ -78,7 +87,7 @@ export default class EventMarkerOutletTest extends AbstractLslTest {
     protected static async canStopEventMarkersMidPush(bailIdx: number) {
         let hitCount = 0
 
-        const outlet = this.instance.getLslOutlet()
+        const outlet = this.instance.getStreamOutlet()
 
         outlet.pushSample = () => {
             hitCount += 1
@@ -98,7 +107,7 @@ export default class EventMarkerOutletTest extends AbstractLslTest {
 
         let hitCount = 0
 
-        const outlet = this.instance.getLslOutlet()
+        const outlet = this.instance.getStreamOutlet()
 
         outlet.pushSample = () => {
             hitCount++
@@ -127,7 +136,7 @@ export default class EventMarkerOutletTest extends AbstractLslTest {
         void this.pushTotalMarkers(2, 100)
         this.instance.stop()
 
-        this.lslOutlet.pushSample = () =>
+        this.streamOutlet.pushSample = () =>
             assert.fail('Should not have been called')
     }
 
@@ -136,16 +145,16 @@ export default class EventMarkerOutletTest extends AbstractLslTest {
         const markerName = generateId()
         this.instance.pushMarker(markerName)
 
-        assert.isEqual(FakeLslOutlet.callsToPushSample[0][0], markerName)
+        assert.isEqual(FakeStreamOutlet.callsToPushSample[0][0], markerName)
     }
 
-    private static get lslOutlet() {
-        return this.instance.getLslOutlet()
+    private static get streamOutlet() {
+        return this.instance.getStreamOutlet()
     }
 
     private static async setupOutlet() {
-        EventMarkerOutlet.Class = EventMarkerOutlet as any
-        this.instance = await this.EventMarkerOutlet()
+        LslEventMarkerOutlet.Class = LslEventMarkerOutlet as any
+        this.instance = await this.LslEventMarkerOutlet()
     }
 
     private static async pushTotalMarkers(total: number, durationMs?: number) {
@@ -165,9 +174,11 @@ export default class EventMarkerOutletTest extends AbstractLslTest {
         }
     }
 
-    private static async EventMarkerOutlet(
-        options?: Partial<LslOutletOptions>
+    private static async LslEventMarkerOutlet(
+        options?: Partial<StreamOutletOptions>
     ) {
-        return (await EventMarkerOutlet.Create(options)) as SpyMarkerOutlet
+        return (await LslEventMarkerOutlet.Create(
+            options
+        )) as SpyEventMarkerOutlet
     }
 }

package/src/__tests__/{modules → impl}/LslStreamInfo.test.ts

@@ -1,10 +1,11 @@
-import { test, assert, generateId, errorAssert } from '@sprucelabs/test-utils'
+import { test, assert } from '@sprucelabs/test-utils'
+import generateId from '@neurodevs/generate-id'
 import { CHANNEL_FORMATS } from '../../consts'
-import LslStreamInfo, { StreamInfoOptions } from '../../modules/LslStreamInfo'
+import LslStreamInfo, { StreamInfoOptions } from '../../impl/LslStreamInfo'
 import SpyStreamInfo from '../../testDoubles/StreamInfo/SpyStreamInfo'
-import AbstractLslTest from '../AbstractLslTest'
+import AbstractPackageTest from '../AbstractPackageTest'
 
-export default class LslStreamInfoTest extends AbstractLslTest {
+export default class LslStreamInfoTest extends AbstractPackageTest {
     private static instance: SpyStreamInfo
 
     protected static async beforeEach() {
@@ -16,19 +17,8 @@ export default class LslStreamInfoTest extends AbstractLslTest {
     }
 
     @test()
-    protected static async canCreateLslStreamInfo() {
-        assert.isTruthy(this.instance, 'Instance should be created!')
-    }
-
-    @test()
-    protected static async throwsWithMissingRequiredOptions() {
-        const err = assert.doesThrow(
-            // @ts-ignore
-            () => LslStreamInfo.Create()
-        )
-        errorAssert.assertError(err, 'MISSING_PARAMETERS', {
-            parameters: ['channelNames', 'channelFormat', 'sampleRate'],
-        })
+    protected static async createsInstance() {
+        assert.isTruthy(this.instance, 'Failed to create instance!')
     }
 
     @test()