@neurodevs/node-lsl 12.0.5 → 13.0.0

package/build/testDoubles/StreamTransportBridge/FakeStreamTransportBridge.d.ts

@@ -1,6 +1,12 @@
 import { StreamTransportBridge } from '../../impl/LslWebSocketBridge.js';
 export default class FakeStreamTransportBridge implements StreamTransportBridge {
     static numCallsToConstructor: number;
+    static numCallsToActivate: number;
+    static numCallsToDeactivate: number;
+    static numCallsToDestroy: number;
     constructor();
+    activate(): void;
+    deactivate(): void;
+    destroy(): void;
     static resetTestDouble(): void;
 }

package/build/testDoubles/StreamTransportBridge/FakeStreamTransportBridge.js

@@ -1,10 +1,25 @@
 export default class FakeStreamTransportBridge {
     static numCallsToConstructor = 0;
+    static numCallsToActivate = 0;
+    static numCallsToDeactivate = 0;
+    static numCallsToDestroy = 0;
     constructor() {
         FakeStreamTransportBridge.numCallsToConstructor++;
     }
+    activate() {
+        FakeStreamTransportBridge.numCallsToActivate++;
+    }
+    deactivate() {
+        FakeStreamTransportBridge.numCallsToDeactivate++;
+    }
+    destroy() {
+        FakeStreamTransportBridge.numCallsToDestroy++;
+    }
     static resetTestDouble() {
         FakeStreamTransportBridge.numCallsToConstructor = 0;
+        FakeStreamTransportBridge.numCallsToActivate = 0;
+        FakeStreamTransportBridge.numCallsToDeactivate = 0;
+        FakeStreamTransportBridge.numCallsToDestroy = 0;
     }
 }
 //# sourceMappingURL=FakeStreamTransportBridge.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"FakeStreamTransportBridge.js","sourceRoot":"","sources":["../../../src/testDoubles/StreamTransportBridge/FakeStreamTransportBridge.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,OAAO,yBAAyB;IAGnC,MAAM,CAAC,qBAAqB,GAAG,CAAC,CAAA;IAEvC;QACI,yBAAyB,CAAC,qBAAqB,EAAE,CAAA;IACrD,CAAC;IAEM,MAAM,CAAC,eAAe;QACzB,yBAAyB,CAAC,qBAAqB,GAAG,CAAC,CAAA;IACvD,CAAC"}
+{"version":3,"file":"FakeStreamTransportBridge.js","sourceRoot":"","sources":["../../../src/testDoubles/StreamTransportBridge/FakeStreamTransportBridge.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,OAAO,yBAAyB;IAGnC,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,yBAAyB,CAAC,qBAAqB,EAAE,CAAA;IACrD,CAAC;IAEM,QAAQ;QACX,yBAAyB,CAAC,kBAAkB,EAAE,CAAA;IAClD,CAAC;IAEM,UAAU;QACb,yBAAyB,CAAC,oBAAoB,EAAE,CAAA;IACpD,CAAC;IAEM,OAAO;QACV,yBAAyB,CAAC,iBAAiB,EAAE,CAAA;IACjD,CAAC;IAEM,MAAM,CAAC,eAAe;QACzB,yBAAyB,CAAC,qBAAqB,GAAG,CAAC,CAAA;QACnD,yBAAyB,CAAC,kBAAkB,GAAG,CAAC,CAAA;QAChD,yBAAyB,CAAC,oBAAoB,GAAG,CAAC,CAAA;QAClD,yBAAyB,CAAC,iBAAiB,GAAG,CAAC,CAAA;IACnD,CAAC"}

package/build/testDoubles/StreamTransportBridge/SpyLslWebSocketBridge.d.ts

@@ -0,0 +1,4 @@
+import LslWebSocketBridge, { StreamTransportBridgeConstructorOptions } from '../../impl/LslWebSocketBridge.js';
+export default class SpyLslWebSocketBridge extends LslWebSocketBridge {
+    constructor(options: StreamTransportBridgeConstructorOptions);
+}

package/build/testDoubles/StreamTransportBridge/SpyLslWebSocketBridge.js

@@ -0,0 +1,7 @@
+import LslWebSocketBridge from '../../impl/LslWebSocketBridge.js';
+export default class SpyLslWebSocketBridge extends LslWebSocketBridge {
+    constructor(options) {
+        super(options);
+    }
+}
+//# sourceMappingURL=SpyLslWebSocketBridge.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SpyLslWebSocketBridge.js","sourceRoot":"","sources":["../../../src/testDoubles/StreamTransportBridge/SpyLslWebSocketBridge.ts"],"names":[],"mappings":"AAAA,OAAO,kBAEN,MAAM,kCAAkC,CAAA;AAEzC,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,kBAAkB;IACjE,YAAmB,OAAgD;QAC/D,KAAK,CAAC,OAAO,CAAC,CAAA;IAClB,CAAC;CACJ"}

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

@@ -0,0 +1,10 @@
+export default class FakeWebSocket {
+    static callsToSend: {
+        id: string;
+        data: unknown;
+    }[];
+    readyState: number;
+    id: string;
+    send(data: unknown): void;
+    static resetTestDouble(): void;
+}

package/build/testDoubles/WebSockets/FakeWebSocket.js

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

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

@@ -0,0 +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"}

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

@@ -0,0 +1,13 @@
+import FakeWebSocket from './FakeWebSocket.js';
+export default class FakeWebSocketServer {
+    static callsToConstructor: FakeWSSConstructorOptions[];
+    static numCallsToClose: number;
+    static clients: Set<FakeWebSocket>;
+    clients: Set<FakeWebSocket>;
+    constructor(options: FakeWSSConstructorOptions);
+    close(): void;
+    static resetTestDouble(): void;
+}
+export interface FakeWSSConstructorOptions {
+    port: number;
+}

package/build/testDoubles/WebSockets/FakeWebSocketServer.js

@@ -0,0 +1,22 @@
+import FakeWebSocket from './FakeWebSocket.js';
+export default class FakeWebSocketServer {
+    static callsToConstructor = [];
+    static numCallsToClose = 0;
+    static clients = new Set([
+        new FakeWebSocket(),
+        new FakeWebSocket(),
+    ]);
+    clients = FakeWebSocketServer.clients;
+    constructor(options) {
+        FakeWebSocketServer.callsToConstructor.push(options);
+    }
+    close() {
+        FakeWebSocketServer.numCallsToClose += 1;
+    }
+    static resetTestDouble() {
+        FakeWebSocketServer.callsToConstructor = [];
+        FakeWebSocketServer.numCallsToClose = 0;
+        FakeWebSocket.resetTestDouble();
+    }
+}
+//# sourceMappingURL=FakeWebSocketServer.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"FakeWebSocketServer.js","sourceRoot":"","sources":["../../../src/testDoubles/WebSockets/FakeWebSocketServer.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,oBAAoB,CAAA;AAE9C,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAC7B,MAAM,CAAC,kBAAkB,GAAgC,EAAE,CAAA;IAC3D,MAAM,CAAC,eAAe,GAAG,CAAC,CAAA;IAE1B,MAAM,CAAC,OAAO,GAAG,IAAI,GAAG,CAAgB;QAC3C,IAAI,aAAa,EAAE;QACnB,IAAI,aAAa,EAAE;KACtB,CAAC,CAAA;IAEK,OAAO,GAAG,mBAAmB,CAAC,OAAO,CAAA;IAE5C,YAAmB,OAAkC;QACjD,mBAAmB,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACxD,CAAC;IAEM,KAAK;QACR,mBAAmB,CAAC,eAAe,IAAI,CAAC,CAAA;IAC5C,CAAC;IAEM,MAAM,CAAC,eAAe;QACzB,mBAAmB,CAAC,kBAAkB,GAAG,EAAE,CAAA;QAC3C,mBAAmB,CAAC,eAAe,GAAG,CAAC,CAAA;QAEvC,aAAa,CAAC,eAAe,EAAE,CAAA;IACnC,CAAC"}

package/build/testDoubles/generateRandomOutletOptions.js

@@ -7,13 +7,13 @@ export default function generateRandomOutletOptions() {
         name: generateId(),
         type: generateId(),
         channelNames: new Array(randomInt(1, 10)).fill(generateId()),
-        sampleRate: Math.random() * 10,
+        sampleRateHz: Math.random() * 10,
         channelFormat: TEST_SUPPORTED_CHANNEL_FORMATS[randomChannelIdx],
         sourceId: generateId(),
         manufacturer: generateId(),
-        unit: generateId(),
+        units: generateId(),
         chunkSize: randomInt(0, 10),
-        maxBuffered: randomInt(0, 10),
+        maxBufferedMs: randomInt(0, 10),
     };
 }
 //# sourceMappingURL=generateRandomOutletOptions.js.map

package/build/testDoubles/generateRandomOutletOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateRandomOutletOptions.js","sourceRoot":"","sources":["../../src/testDoubles/generateRandomOutletOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAClC,OAAO,UAAU,MAAM,wBAAwB,CAAA;AAG/C,OAAO,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAA;AAE5D,MAAM,CAAC,OAAO,UAAU,2BAA2B;IAC/C,MAAM,gBAAgB,GAAG,SAAS,CAAC,8BAA8B,CAAC,MAAM,CAAC,CAAA;IAEzE,OAAO;QACH,IAAI,EAAE,UAAU,EAAE;QAClB,IAAI,EAAE,UAAU,EAAE;QAClB,YAAY,EAAE,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QAC5D,UAAU,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;QAC9B,aAAa,EAAE,8BAA8B,CAAC,gBAAgB,CAAC;QAC/D,QAAQ,EAAE,UAAU,EAAE;QACtB,YAAY,EAAE,UAAU,EAAE;QAC1B,IAAI,EAAE,UAAU,EAAE;QAClB,SAAS,EAAE,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC;QAC3B,WAAW,EAAE,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC;KACT,CAAA;AAC5B,CAAC"}
+{"version":3,"file":"generateRandomOutletOptions.js","sourceRoot":"","sources":["../../src/testDoubles/generateRandomOutletOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAClC,OAAO,UAAU,MAAM,wBAAwB,CAAA;AAG/C,OAAO,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAA;AAE5D,MAAM,CAAC,OAAO,UAAU,2BAA2B;IAC/C,MAAM,gBAAgB,GAAG,SAAS,CAAC,8BAA8B,CAAC,MAAM,CAAC,CAAA;IAEzE,OAAO;QACH,IAAI,EAAE,UAAU,EAAE;QAClB,IAAI,EAAE,UAAU,EAAE;QAClB,YAAY,EAAE,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QAC5D,YAAY,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;QAChC,aAAa,EAAE,8BAA8B,CAAC,gBAAgB,CAAC;QAC/D,QAAQ,EAAE,UAAU,EAAE;QACtB,YAAY,EAAE,UAAU,EAAE;QAC1B,KAAK,EAAE,UAAU,EAAE;QACnB,SAAS,EAAE,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC;QAC3B,aAAa,EAAE,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC;KACX,CAAA;AAC5B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neurodevs/node-lsl",
-  "version": "12.0.5",
+  "version": "13.0.0",
   "description": "Lab Streaming Layer (LSL) bindings for Node",
   "type": "module",
   "keywords": [
@@ -45,15 +45,17 @@
   },
   "dependencies": {
     "@neurodevs/generate-id": "^1.0.9",
-    "ffi-rs": "^1.0.98",
+    "ffi-rs": "^1.3.0",
     "node-gyp": "^10.2.0",
     "ref-array-napi": "^1.2.2",
-    "ref-napi": "^3.0.3"
+    "ref-napi": "^3.0.3",
+    "ws": "^8.18.3"
   },
   "devDependencies": {
     "@neurodevs/node-tdd": "^0.2.2",
     "@types/ffi-napi": "^4.0.10",
     "@types/node": "^22.9.0",
+    "@types/ws": "^8.18.1",
     "chokidar-cli": "^3.0.0",
     "concurrently": "^9.1.0",
     "eslint": "^9.15.0",

package/src/__tests__/AbstractPackageTest.ts

@@ -1,16 +1,24 @@
 import AbstractModuleTest from '@neurodevs/node-tdd'
 
+import { Server } from 'ws'
 import LiblslAdapter from '../impl/LiblslAdapter.js'
 import LslEventMarkerOutlet from '../impl/LslEventMarkerOutlet.js'
 import LslStreamInfo from '../impl/LslStreamInfo.js'
-import LslStreamInlet from '../impl/LslStreamInlet.js'
+import LslStreamInlet, {
+    OnDataCallback,
+    StreamInletOptions,
+} from '../impl/LslStreamInlet.js'
 import LslStreamOutlet from '../impl/LslStreamOutlet.js'
+import LslWebSocketBridge from '../impl/LslWebSocketBridge.js'
 import SpyEventMarkerOutlet from '../testDoubles/EventMarkerOutlet/SpyEventMarkerOutlet.js'
 import FakeLiblsl from '../testDoubles/Liblsl/FakeLiblsl.js'
 import FakeStreamInfo from '../testDoubles/StreamInfo/FakeStreamInfo.js'
 import SpyStreamInfo from '../testDoubles/StreamInfo/SpyStreamInfo.js'
+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/StreamTransportBridge/SpyLslWebSocketBridge.js'
+import FakeWebSocketServer from '../testDoubles/WebSockets/FakeWebSocketServer.js'
 
 export default class AbstractPackageTest extends AbstractModuleTest {
     protected static fakeLiblsl: FakeLiblsl
@@ -24,6 +32,8 @@ export default class AbstractPackageTest extends AbstractModuleTest {
     protected static setFakeLiblsl() {
         this.fakeLiblsl = new FakeLiblsl()
         LiblslAdapter.setInstance(this.fakeLiblsl)
+
+        FakeLiblsl.fakeErrorCode = 0
     }
 
     protected static setSpyStreamInfo() {
@@ -39,6 +49,11 @@ export default class AbstractPackageTest extends AbstractModuleTest {
         LslStreamInlet.Class = SpyStreamInlet
     }
 
+    protected static setFakeStreamInlet() {
+        LslStreamInlet.Class = FakeStreamInlet
+        FakeStreamInlet.resetTestDouble()
+    }
+
     protected static setFakeStreamOutlet() {
         LslStreamOutlet.Class = FakeStreamOutlet
         FakeStreamOutlet.resetTestDouble()
@@ -48,6 +63,15 @@ export default class AbstractPackageTest extends AbstractModuleTest {
         LslEventMarkerOutlet.Class = SpyEventMarkerOutlet
     }
 
+    protected static setSpyLslWebSocketBridge() {
+        LslWebSocketBridge.Class = SpyLslWebSocketBridge
+    }
+
+    protected static setFakeWebSocketServer() {
+        LslWebSocketBridge.WSS = FakeWebSocketServer as unknown as typeof Server
+        FakeWebSocketServer.resetTestDouble()
+    }
+
     protected static readonly name_ = this.generateId()
     protected static readonly type = this.generateId()
     protected static readonly sourceId = this.generateId()
@@ -56,9 +80,33 @@ export default class AbstractPackageTest extends AbstractModuleTest {
     protected static readonly channelNames = [
         this.generateId(),
         this.generateId(),
+        this.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)
+    protected static get channelCount() {
+        return this.channelNames.length
+    }
+
+    protected static readonly chunkSize = 2
+    protected static readonly sampleRateHz = Math.floor(Math.random() * 100)
+    protected static readonly maxBufferedMs = Math.floor(Math.random() * 1000)
+
+    protected static LslStreamInlet(
+        options: Partial<StreamInletOptions>,
+        onData: OnDataCallback
+    ) {
+        const defaultOptions = {
+            sampleRateHz: 0,
+            channelNames: this.channelNames,
+            channelFormat: 'float32',
+            chunkSize: this.chunkSize,
+            maxBufferedMs: this.maxBufferedMs,
+            name: this.name_,
+            type: this.type,
+            sourceId: this.sourceId,
+            ...options,
+        } as StreamInletOptions
+
+        return LslStreamInlet.Create(defaultOptions, onData)
+    }
 }

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

@@ -1,20 +1,26 @@
 import { randomInt } from 'crypto'
 import { test, assert } from '@neurodevs/node-tdd'
-import { DataType, OpenParams } from 'ffi-rs'
+import {
+    createPointer,
+    DataType,
+    FieldType,
+    FuncObj,
+    OpenParams,
+    unwrapPointer,
+} from 'ffi-rs'
 
-import LiblslAdapter from '../../impl/LiblslAdapter.js'
-import FakeLiblsl from '../../testDoubles/Liblsl/FakeLiblsl.js'
 import {
     BoundChild,
     BoundDescription,
     BoundInlet,
     BoundOutlet,
     BoundStreamInfo,
-    FfiRsDefineOptions,
     Liblsl,
     LiblslBindings,
     LslChannel,
-} from '../../types.js'
+} from 'impl/LiblslAdapter.js'
+import LiblslAdapter from '../../impl/LiblslAdapter.js'
+import FakeLiblsl from '../../testDoubles/Liblsl/FakeLiblsl.js'
 import AbstractPackageTest from '../AbstractPackageTest.js'
 
 export default class LiblslAdapterTest extends AbstractPackageTest {
@@ -44,6 +50,7 @@ export default class LiblslAdapterTest extends AbstractPackageTest {
     private static appendChildHitCount: number
     private static ffiRsOpenOptions?: OpenParams
     private static ffiRsDefineOptions: FfiRsDefineOptions
+    private static ffiRsLoadOptions?: Record<string, any>
 
     protected static async beforeEach() {
         await super.beforeEach()
@@ -74,11 +81,11 @@ export default class LiblslAdapterTest extends AbstractPackageTest {
         this.appendChildHitCount = 0
 
         delete this.ffiRsOpenOptions
-        LiblslAdapter.ffiRsOpen = (options) => {
+        LiblslAdapter.open = (options) => {
             this.ffiRsOpenOptions = options
         }
 
-        LiblslAdapter.ffiRsDefine = (options) => {
+        LiblslAdapter.define = (options) => {
             this.ffiRsDefineOptions = options as FfiRsDefineOptions
             if (this.shouldThrowWhenCreatingBindings) {
                 throw new Error('Failed to create bindings!')
@@ -86,6 +93,11 @@ export default class LiblslAdapterTest extends AbstractPackageTest {
             return this.fakeBindings as any
         }
 
+        LiblslAdapter.load = (options) => {
+            this.ffiRsLoadOptions = options
+            return {} as any
+        }
+
         LiblslAdapter.resetInstance()
         this.instance = LiblslAdapter.getInstance()
     }
@@ -157,7 +169,7 @@ export default class LiblslAdapterTest extends AbstractPackageTest {
             },
             lsl_push_sample_ft: {
                 library: 'lsl',
-                retType: DataType.Void,
+                retType: DataType.I32,
                 paramsType: [
                     DataType.External,
                     DataType.FloatArray,
@@ -166,7 +178,7 @@ export default class LiblslAdapterTest extends AbstractPackageTest {
             },
             lsl_push_sample_strt: {
                 library: 'lsl',
-                retType: DataType.Void,
+                retType: DataType.I32,
                 paramsType: [
                     DataType.External,
                     DataType.StringArray,
@@ -232,7 +244,13 @@ export default class LiblslAdapterTest extends AbstractPackageTest {
     @test()
     protected static async canCreateOutletWithRequiredParams() {
         const { options, outlet } = this.createRandomOutlet()
-        assert.isEqualDeep(this.createOutletParams, Object.values(options))
+
+        const expected = {
+            ...options,
+            maxBufferedMs: options.maxBufferedMs / 1000,
+        }
+
+        assert.isEqualDeep(this.createOutletParams, Object.values(expected))
         assert.isEqual(outlet, this.fakeOutlet)
     }
 
@@ -304,7 +322,7 @@ export default class LiblslAdapterTest extends AbstractPackageTest {
         assert.isEqual(this.appendChildValueParams[2][1], 'type')
 
         assert.isEqual(this.appendChildValueParams[0][2], channel.label)
-        assert.isEqual(this.appendChildValueParams[1][2], channel.unit)
+        assert.isEqual(this.appendChildValueParams[1][2], channel.units)
         assert.isEqual(this.appendChildValueParams[2][2], channel.type)
     }
 
@@ -326,7 +344,7 @@ export default class LiblslAdapterTest extends AbstractPackageTest {
         assert.isEqual(this.appendChildParams?.[2][1], 'channel')
 
         assert.isEqual(this.appendChildValueParams[3][2], channel2.label)
-        assert.isEqual(this.appendChildValueParams[4][2], channel2.unit)
+        assert.isEqual(this.appendChildValueParams[4][2], channel2.units)
         assert.isEqual(this.appendChildValueParams[5][2], channel2.type)
     }
 
@@ -370,10 +388,141 @@ export default class LiblslAdapterTest extends AbstractPackageTest {
     @test()
     protected static async canCreateInletWithRequiredParams() {
         const { options, inlet } = this.createRandomInlet()
-        assert.isEqualDeep(this.createInletParams, Object.values(options))
+
+        const expected = {
+            ...options,
+            maxBufferedMs: options.maxBufferedMs / 1000,
+        }
+
+        assert.isEqualDeep(this.createInletParams, Object.values(expected))
         assert.isEqual(inlet, this.fakeInlet)
     }
 
+    @test()
+    protected static async pullSampleCallsBinding() {
+        const { inlet } = this.createRandomInlet()
+
+        const dataBuffer = Buffer.alloc(4 * this.channelCount)
+        const dataBufferElements = this.channelCount
+        const timeout = 0.0
+
+        const dataBufferPtr = unwrapPointer(
+            createPointer({
+                paramsType: [DataType.U8Array],
+                paramsValue: [dataBuffer],
+            })
+        )[0]
+
+        const errcodePtr = unwrapPointer(
+            createPointer({
+                paramsType: [DataType.U8Array],
+                paramsValue: [new Int32Array(1)],
+            })
+        )[0]
+
+        this.instance.pullSample({
+            inlet,
+            dataBufferPtr,
+            dataBufferElements,
+            timeout,
+            errcodePtr,
+        })
+
+        assert.isEqualDeep(
+            this.ffiRsLoadOptions,
+            {
+                library: 'lsl',
+                funcName: 'lsl_pull_sample_f',
+                retType: DataType.Double,
+                paramsType: [
+                    DataType.External,
+                    DataType.External,
+                    DataType.I32,
+                    DataType.Double,
+                    DataType.External,
+                ],
+                paramsValue: [
+                    inlet,
+                    dataBufferPtr,
+                    dataBufferElements,
+                    timeout,
+                    errcodePtr,
+                ],
+            },
+            'Did not call pullSample with expected options!'
+        )
+    }
+
+    @test()
+    protected static async pullChunkCallsBinding() {
+        const { inlet } = this.createRandomInlet()
+
+        const dataBuffer = Buffer.alloc(4 * this.chunkSize * this.channelCount)
+        const timestampBuffer = Buffer.alloc(8 * this.chunkSize)
+        const dataBufferElements = this.chunkSize * this.channelCount
+        const timestampBufferElements = this.chunkSize
+        const timeout = 0.0
+
+        const dataBufferPtr = unwrapPointer(
+            createPointer({
+                paramsType: [DataType.U8Array],
+                paramsValue: [dataBuffer],
+            })
+        )[0]
+
+        const timestampBufferPtr = unwrapPointer(
+            createPointer({
+                paramsType: [DataType.U8Array],
+                paramsValue: [timestampBuffer],
+            })
+        )[0]
+
+        const errcodePtr = unwrapPointer(
+            createPointer({
+                paramsType: [DataType.U8Array],
+                paramsValue: [new Int32Array(1)],
+            })
+        )[0]
+
+        this.instance.pullChunk({
+            inlet,
+            dataBufferPtr,
+            timestampBufferPtr,
+            dataBufferElements,
+            timestampBufferElements,
+            timeout,
+            errcodePtr,
+        })
+
+        assert.isEqualDeep(
+            this.ffiRsLoadOptions,
+            {
+                library: 'lsl',
+                funcName: 'lsl_pull_chunk_f',
+                retType: DataType.Double,
+                paramsType: [
+                    DataType.External,
+                    DataType.External,
+                    DataType.External,
+                    DataType.I32,
+                    DataType.I32,
+                    DataType.Double,
+                    DataType.External,
+                ],
+                paramsValue: [
+                    inlet,
+                    dataBufferPtr,
+                    timestampBufferPtr,
+                    dataBufferElements,
+                    timestampBufferElements,
+                    timeout,
+                    errcodePtr,
+                ],
+            },
+            'Did not call pullChunk with expected options!'
+        )
+    }
+
     @test()
     protected static async flushInletCallsBinding() {
         const { inlet } = this.createRandomInlet()
@@ -386,6 +535,18 @@ export default class LiblslAdapterTest extends AbstractPackageTest {
         )
     }
 
+    @test()
+    protected static async destroyInletCallsBinding() {
+        const { inlet } = this.createRandomInlet()
+        this.instance.destroyInlet({ inlet })
+
+        assert.isEqualDeep(
+            this.destroyInletParams,
+            [inlet],
+            'Should have called destroyInlet with expected params!'
+        )
+    }
+
     private static createRandomStreamInfo() {
         return this.instance.createStreamInfo(
             this.generateRandomCreateStreamInfoOptions()
@@ -409,7 +570,7 @@ export default class LiblslAdapterTest extends AbstractPackageTest {
         const options = {
             info,
             chunkSize: randomInt(10),
-            maxBuffered: randomInt(10),
+            maxBufferedMs: randomInt(10),
         }
         return options
     }
@@ -418,7 +579,7 @@ export default class LiblslAdapterTest extends AbstractPackageTest {
         return {
             label: this.generateId(),
             type: this.generateId(),
-            unit: this.generateId(),
+            units: this.generateId(),
         }
     }
 
@@ -427,7 +588,7 @@ export default class LiblslAdapterTest extends AbstractPackageTest {
             name: this.generateId(),
             type: this.generateId(),
             channelCount: randomInt(1, 10),
-            sampleRate: randomInt(100),
+            sampleRateHz: randomInt(100),
             channelFormat: randomInt(7),
             sourceId: this.generateId(),
         }
@@ -449,9 +610,11 @@ export default class LiblslAdapterTest extends AbstractPackageTest {
             },
             lsl_push_sample_ft: (params: any[]) => {
                 this.pushSampleFloatTimestampParams = params
+                return 0
             },
             lsl_push_sample_strt: (params: any[]) => {
                 this.pushSampleStringTimestampParams = params
+                return 0
             },
             lsl_destroy_outlet: (params: any[]) => {
                 this.destroyOutletParams = params
@@ -489,3 +652,5 @@ export default class LiblslAdapterTest extends AbstractPackageTest {
         }
     }
 }
+
+export type FfiRsDefineOptions = FuncObj<FieldType, boolean | undefined>

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

@@ -31,14 +31,14 @@ export default class EventMarkerOutletTest extends AbstractPackageTest {
         assert.isEqualDeep(FakeStreamOutlet.callsToConstructor[0].options, {
             name: 'Event markers',
             type: 'Markers',
+            sourceId: 'event-markers',
             channelNames: ['Markers'],
-            sampleRate: 0,
             channelFormat: 'string',
-            sourceId: 'event-markers',
-            manufacturer: 'N/A',
-            unit: 'N/A',
+            sampleRateHz: 0,
             chunkSize: 0,
-            maxBuffered: 0,
+            maxBufferedMs: 0,
+            manufacturer: 'N/A',
+            units: 'N/A',
         })
     }
 

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

@@ -146,7 +146,7 @@ export default class LslStreamInfoTest extends AbstractPackageTest {
             sourceId: this.generateId(),
             channelCount: this.channelNames.length,
             channelFormat: CHANNEL_FORMATS[randomChannelIdx],
-            sampleRate: 100 * Math.random(),
+            sampleRateHz: 100 * Math.random(),
         }
 
         this.LslStreamInfo(options)
@@ -173,7 +173,7 @@ export default class LslStreamInfoTest extends AbstractPackageTest {
                 info: this.instance.getStreamInfo(),
                 channels: this.channelNames.map((label: string) => ({
                     label,
-                    unit: this.units,
+                    units: this.units,
                     type: this.type,
                 })),
             },
@@ -187,7 +187,7 @@ export default class LslStreamInfoTest extends AbstractPackageTest {
         sourceId: this.generateId(),
         channelNames: this.channelNames,
         channelFormat: 'float32',
-        sampleRate: 100 * Math.random(),
+        sampleRateHz: 100 * Math.random(),
     } as StreamInfoOptions
 
     private static LslStreamInfo(options?: Partial<StreamInfoOptions>) {