@neurodevs/ndx-native 7.0.0 → 7.1.0

package/build/testDoubles/Libndx/FakeLibndx.d.ts

@@ -1,25 +1,29 @@
-import { BleBackendOptions, WriteBleCharacteristicOptions, FtdiBackendOptions, Libndx, LibndxAdapterOptions, StartBleBackendOptions, NativeResult, BleRssiOptions, DiscoverBleUuidOptions } from '../../impl/LibndxAdapter.js';
+import { AddBleCharCallbacksOptions, BleBackendOptions, WriteBleCharacteristicOptions, UsbBackendOptions, WriteUsbBackendOptions, Libndx, LibndxAdapterOptions, StartBleBackendOptions, NativeResult, BleRssiOptions, DiscoverBleUuidOptions } from '../../impl/LibndxAdapter.js';
 export default class FakeLibndx implements Libndx {
     static callsToConstructor: (LibndxAdapterOptions | undefined)[];
     static callsToDiscoverBleUuid: DiscoverBleUuidOptions[];
     static callsToCreateBleBackend: BleBackendOptions[];
     static callsToStartBleBackend: StartBleBackendOptions[];
+    static callsToAddBleCharCallbacks: AddBleCharCallbacksOptions[];
     static callsToWriteBleCharacteristic: WriteBleCharacteristicOptions[];
     static callsToStopBleBackend: BleBackendOptions[];
     static callsToSetBleRssiInterval: BleRssiOptions[];
-    static callsToCreateFtdiBackend: FtdiBackendOptions[];
-    static callsToStartFtdiBackend: FtdiBackendOptions[];
-    static callsToStopFtdiBackend: FtdiBackendOptions[];
+    static callsToCreateUsbBackend: UsbBackendOptions[];
+    static callsToStartUsbBackend: UsbBackendOptions[];
+    static callsToWriteUsbBackend: WriteUsbBackendOptions[];
+    static callsToStopUsbBackend: UsbBackendOptions[];
     static fakeResult: NativeResult;
     constructor(options?: LibndxAdapterOptions);
     discoverBleUuid(options: DiscoverBleUuidOptions): NativeResult;
     createBleBackend(options: BleBackendOptions): NativeResult;
     startBleBackend(options: StartBleBackendOptions): NativeResult;
+    addBleCharCallbacks(options: AddBleCharCallbacksOptions): NativeResult;
     writeBleCharacteristic(options: WriteBleCharacteristicOptions): NativeResult;
     setBleRssiInterval(options: BleRssiOptions): NativeResult;
     stopBleBackend(options: BleBackendOptions): NativeResult;
-    createFtdiBackend(options: FtdiBackendOptions): NativeResult;
-    startFtdiBackend(options: FtdiBackendOptions): NativeResult;
-    stopFtdiBackend(options: FtdiBackendOptions): NativeResult;
+    createUsbBackend(options: UsbBackendOptions): NativeResult;
+    startUsbBackend(options: UsbBackendOptions): NativeResult;
+    writeUsbBackend(options: WriteUsbBackendOptions): NativeResult;
+    stopUsbBackend(options: UsbBackendOptions): NativeResult;
     static resetTestDouble(): void;
 }

package/build/testDoubles/Libndx/FakeLibndx.js

@@ -3,12 +3,14 @@ export default class FakeLibndx {
     static callsToDiscoverBleUuid = [];
     static callsToCreateBleBackend = [];
     static callsToStartBleBackend = [];
+    static callsToAddBleCharCallbacks = [];
     static callsToWriteBleCharacteristic = [];
     static callsToStopBleBackend = [];
     static callsToSetBleRssiInterval = [];
-    static callsToCreateFtdiBackend = [];
-    static callsToStartFtdiBackend = [];
-    static callsToStopFtdiBackend = [];
+    static callsToCreateUsbBackend = [];
+    static callsToStartUsbBackend = [];
+    static callsToWriteUsbBackend = [];
+    static callsToStopUsbBackend = [];
     static fakeResult = { status: 200 };
     constructor(options) {
         FakeLibndx.callsToConstructor.push(options);
@@ -25,6 +27,10 @@ export default class FakeLibndx {
         FakeLibndx.callsToStartBleBackend.push(options);
         return FakeLibndx.fakeResult;
     }
+    addBleCharCallbacks(options) {
+        FakeLibndx.callsToAddBleCharCallbacks.push(options);
+        return FakeLibndx.fakeResult;
+    }
     writeBleCharacteristic(options) {
         FakeLibndx.callsToWriteBleCharacteristic.push(options);
         return FakeLibndx.fakeResult;
@@ -37,16 +43,20 @@ export default class FakeLibndx {
         FakeLibndx.callsToStopBleBackend.push(options);
         return FakeLibndx.fakeResult;
     }
-    createFtdiBackend(options) {
-        FakeLibndx.callsToCreateFtdiBackend.push(options);
+    createUsbBackend(options) {
+        FakeLibndx.callsToCreateUsbBackend.push(options);
+        return FakeLibndx.fakeResult;
+    }
+    startUsbBackend(options) {
+        FakeLibndx.callsToStartUsbBackend.push(options);
         return FakeLibndx.fakeResult;
     }
-    startFtdiBackend(options) {
-        FakeLibndx.callsToStartFtdiBackend.push(options);
+    writeUsbBackend(options) {
+        FakeLibndx.callsToWriteUsbBackend.push(options);
         return FakeLibndx.fakeResult;
     }
-    stopFtdiBackend(options) {
-        FakeLibndx.callsToStopFtdiBackend.push(options);
+    stopUsbBackend(options) {
+        FakeLibndx.callsToStopUsbBackend.push(options);
         return FakeLibndx.fakeResult;
     }
     static resetTestDouble() {
@@ -54,12 +64,14 @@ export default class FakeLibndx {
         FakeLibndx.callsToDiscoverBleUuid = [];
         FakeLibndx.callsToCreateBleBackend = [];
         FakeLibndx.callsToStartBleBackend = [];
+        FakeLibndx.callsToAddBleCharCallbacks = [];
         FakeLibndx.callsToWriteBleCharacteristic = [];
         FakeLibndx.callsToStopBleBackend = [];
         FakeLibndx.callsToSetBleRssiInterval = [];
-        FakeLibndx.callsToCreateFtdiBackend = [];
-        FakeLibndx.callsToStartFtdiBackend = [];
-        FakeLibndx.callsToStopFtdiBackend = [];
+        FakeLibndx.callsToCreateUsbBackend = [];
+        FakeLibndx.callsToStartUsbBackend = [];
+        FakeLibndx.callsToWriteUsbBackend = [];
+        FakeLibndx.callsToStopUsbBackend = [];
     }
 }
 //# sourceMappingURL=FakeLibndx.js.map

package/build/testDoubles/Libndx/FakeLibndx.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neurodevs/ndx-native",
-  "version": "7.0.0",
+  "version": "7.1.0",
   "description": "Native Node.js adapters for LSL, XDF, and LabRecorder",
   "type": "module",
   "keywords": [

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

@@ -25,7 +25,8 @@ export default class LibndxAdapterTest extends AbstractPackageTest {
     private static readonly bleValueToWrite = this.generateId()
     private static readonly bleRssiIntervalMs = Math.random()
 
-    private static readonly ftdiSerialNumber = this.generateId()
+    private static readonly usbSerialNumber = this.generateId()
+    private static readonly usbValueToWrite = this.generateId()
 
     private static readonly charCallbacks = [
         {
@@ -53,6 +54,11 @@ export default class LibndxAdapterTest extends AbstractPackageTest {
         onConnected: unknown
         charCallbacks: CharacteristicCallback[]
     }[] = []
+    private static readonly callsToAddBleCharCallbacks: {
+        uuid: string
+        charCallbacks: unknown
+        numCallbacks: number
+    }[] = []
     private static readonly callsToWriteBle: string[][] = []
     private static readonly callsToSetBleRssiInterval: {
         uuid: string
@@ -61,9 +67,10 @@ export default class LibndxAdapterTest extends AbstractPackageTest {
     }[] = []
     private static readonly callsToStopBle: string[][] = []
 
-    private static readonly callsToCreateFtdi: string[][] = []
-    private static readonly callsToStartFtdi: string[][] = []
-    private static readonly callsToStopFtdi: string[][] = []
+    private static readonly callsToCreateUsb: string[][] = []
+    private static readonly callsToStartUsb: string[][] = []
+    private static readonly callsToWriteUsb: string[][] = []
+    private static readonly callsToStopUsb: string[][] = []
 
     protected static async beforeEach() {
         await super.beforeEach()
@@ -114,12 +121,14 @@ export default class LibndxAdapterTest extends AbstractPackageTest {
                 'str discover_ble_uuid(str name_prefix, OnDiscoveredFn *on_discovered)',
                 'str create_ble_backend(str config)',
                 'str start_ble_backend(str uuid, OnConnectedFn *on_connected, CharCallback *callbacks, int num_callbacks)',
+                'str add_ble_char_callbacks(str uuid, CharCallback *callbacks, int num_callbacks)',
                 'str write_ble_characteristic(str uuid, str charUuid, str value)',
                 'str set_ble_rssi_interval(str uuid, int interval_ms, OnRssiFn *on_rssi)',
                 'str stop_ble_backend(str uuid)',
-                'str create_ftdi_backend(str config)',
-                'str start_ftdi_backend(str serial)',
-                'str stop_ftdi_backend(str serial)',
+                'str create_usb_backend(str config)',
+                'str start_usb_backend(str serial)',
+                'str write_usb_backend(str serial, str value)',
+                'str stop_usb_backend(str serial)',
             ],
             'Did not register expected koffi func signatures!'
         )
@@ -317,6 +326,36 @@ export default class LibndxAdapterTest extends AbstractPackageTest {
         )
     }
 
+    @test()
+    protected static async addBleCharCallbacksCallsBindingWithExpectedArgs() {
+        this.addBleCharCallbacks()
+
+        const call = this.callsToAddBleCharCallbacks[0]
+
+        assert.isEqual(
+            call.uuid,
+            this.bleDeviceUuid,
+            'addBleCharCallbacks did not pass expected uuid to binding!'
+        )
+
+        assert.isEqual(
+            call.numCallbacks,
+            this.charCallbacks.length,
+            'addBleCharCallbacks did not pass expected callback count to binding!'
+        )
+    }
+
+    @test()
+    protected static async addBleCharCallbacksReturnsJson() {
+        const json = this.addBleCharCallbacks()
+
+        assert.isEqualDeep(
+            json,
+            this.successfulResult,
+            'addBleCharCallbacks did not return a JSON string!'
+        )
+    }
+
     @test()
     protected static async writeBleCharacteristicCallsBindingWithExpectedArgs() {
         this.writeBleCharacteristic()
@@ -414,68 +453,90 @@ export default class LibndxAdapterTest extends AbstractPackageTest {
     }
 
     @test()
-    protected static async createFtdiBackendCallsBindingWithExpectedArgs() {
-        this.createFtdiBackend()
+    protected static async createUsbBackendCallsBindingWithExpectedArgs() {
+        this.createUsbBackend()
 
         assert.isEqualDeep(
-            this.callsToCreateFtdi[0][0],
-            JSON.stringify({ serialNumber: this.ftdiSerialNumber }),
-            'createFtdiBackend did not call binding with expected args!'
+            this.callsToCreateUsb[0][0],
+            JSON.stringify({ serial_number: this.usbSerialNumber }),
+            'createUsbBackend did not call binding with expected args!'
         )
     }
 
     @test()
-    protected static async createFtdiBackendReturnsJson() {
-        const json = this.createFtdiBackend()
+    protected static async createUsbBackendReturnsJson() {
+        const json = this.createUsbBackend()
 
         assert.isEqualDeep(
             json,
             this.successfulResult,
-            'createFtdiBackend did not return a JSON string!'
+            'createUsbBackend did not return a JSON string!'
         )
     }
 
     @test()
-    protected static async startFtdiBackendCallsBindingWithExpectedArgs() {
-        this.startFtdiBackend()
+    protected static async startUsbBackendCallsBindingWithExpectedArgs() {
+        this.startUsbBackend()
 
         assert.isEqual(
-            this.callsToStartFtdi[0][0],
-            this.ftdiSerialNumber,
-            'startFtdiBackend did not call binding with expected args!'
+            this.callsToStartUsb[0][0],
+            this.usbSerialNumber,
+            'startUsbBackend did not call binding with expected args!'
         )
     }
 
     @test()
-    protected static async startFtdiBackendReturnsJson() {
-        const json = this.startFtdiBackend()
+    protected static async startUsbBackendReturnsJson() {
+        const json = this.startUsbBackend()
 
         assert.isEqualDeep(
             json,
             this.successfulResult,
-            'startFtdiBackend did not return a JSON string!'
+            'startUsbBackend did not return a JSON string!'
         )
     }
 
     @test()
-    protected static async stopFtdiBackendCallsBindingWithExpectedArgs() {
-        this.stopFtdiBackend()
+    protected static async writeUsbBackendCallsBindingWithExpectedArgs() {
+        this.writeUsbBackend()
+
+        assert.isEqualDeep(
+            this.callsToWriteUsb[0],
+            [this.usbSerialNumber, this.usbValueToWrite],
+            'writeUsbBackend did not call binding with expected args!'
+        )
+    }
+
+    @test()
+    protected static async writeUsbBackendReturnsJson() {
+        const json = this.writeUsbBackend()
+
+        assert.isEqualDeep(
+            json,
+            this.successfulResult,
+            'writeUsbBackend did not return a JSON string!'
+        )
+    }
+
+    @test()
+    protected static async stopUsbBackendCallsBindingWithExpectedArgs() {
+        this.stopUsbBackend()
 
         assert.isEqual(
-            this.callsToStopFtdi[0][0],
-            this.ftdiSerialNumber,
-            'stopFtdiBackend did not call binding with expected args!'
+            this.callsToStopUsb[0][0],
+            this.usbSerialNumber,
+            'stopUsbBackend did not call binding with expected args!'
         )
     }
 
     @test()
-    protected static async stopFtdiBackendReturnsJson() {
-        const json = this.stopFtdiBackend()
+    protected static async stopUsbBackendReturnsJson() {
+        const json = this.stopUsbBackend()
 
         assert.isEqualDeep(
             json,
             this.successfulResult,
-            'stopFtdiBackend did not return a JSON string!'
+            'stopUsbBackend did not return a JSON string!'
         )
     }
 
@@ -502,6 +563,13 @@ export default class LibndxAdapterTest extends AbstractPackageTest {
         })
     }
 
+    private static addBleCharCallbacks() {
+        return this.instance.addBleCharCallbacks({
+            deviceUuid: this.bleDeviceUuid,
+            charCallbacks: this.charCallbacks,
+        })
+    }
+
     private static writeBleCharacteristic() {
         return this.instance.writeBleCharacteristic({
             deviceUuid: this.bleDeviceUuid,
@@ -524,21 +592,28 @@ export default class LibndxAdapterTest extends AbstractPackageTest {
         })
     }
 
-    private static createFtdiBackend() {
-        return this.instance.createFtdiBackend({
-            serialNumber: this.ftdiSerialNumber,
+    private static createUsbBackend() {
+        return this.instance.createUsbBackend({
+            serialNumber: this.usbSerialNumber,
+        })
+    }
+
+    private static startUsbBackend() {
+        return this.instance.startUsbBackend({
+            serialNumber: this.usbSerialNumber,
         })
     }
 
-    private static startFtdiBackend() {
-        return this.instance.startFtdiBackend({
-            serialNumber: this.ftdiSerialNumber,
+    private static writeUsbBackend() {
+        return this.instance.writeUsbBackend({
+            serialNumber: this.usbSerialNumber,
+            value: this.usbValueToWrite,
         })
     }
 
-    private static stopFtdiBackend() {
-        return this.instance.stopFtdiBackend({
-            serialNumber: this.ftdiSerialNumber,
+    private static stopUsbBackend() {
+        return this.instance.stopUsbBackend({
+            serialNumber: this.usbSerialNumber,
         })
     }
 
@@ -563,6 +638,14 @@ export default class LibndxAdapterTest extends AbstractPackageTest {
                 })
                 return JSON.stringify(this.successfulResult)
             },
+            add_ble_char_callbacks: (args: any) => {
+                this.callsToAddBleCharCallbacks.push({
+                    uuid: args[0],
+                    charCallbacks: args[1],
+                    numCallbacks: args[2],
+                })
+                return JSON.stringify(this.successfulResult)
+            },
             write_ble_characteristic: (args) => {
                 this.callsToWriteBle.push(args)
                 return JSON.stringify(this.successfulResult)
@@ -579,16 +662,20 @@ export default class LibndxAdapterTest extends AbstractPackageTest {
                 this.callsToStopBle.push(args)
                 return JSON.stringify(this.successfulResult)
             },
-            create_ftdi_backend: (args) => {
-                this.callsToCreateFtdi.push(args)
+            create_usb_backend: (args) => {
+                this.callsToCreateUsb.push(args)
+                return JSON.stringify(this.successfulResult)
+            },
+            start_usb_backend: (args) => {
+                this.callsToStartUsb.push(args)
                 return JSON.stringify(this.successfulResult)
             },
-            start_ftdi_backend: (args) => {
-                this.callsToStartFtdi.push(args)
+            write_usb_backend: (args) => {
+                this.callsToWriteUsb.push(args)
                 return JSON.stringify(this.successfulResult)
             },
-            stop_ftdi_backend: (args) => {
-                this.callsToStopFtdi.push(args)
+            stop_usb_backend: (args) => {
+                this.callsToStopUsb.push(args)
                 return JSON.stringify(this.successfulResult)
             },
         }
@@ -598,11 +685,13 @@ export default class LibndxAdapterTest extends AbstractPackageTest {
         this.callsToDiscoverBle.length = 0
         this.callsToCreateBle.length = 0
         this.callsToStartBle.length = 0
+        this.callsToAddBleCharCallbacks.length = 0
         this.callsToStopBle.length = 0
         this.callsToSetBleRssiInterval.length = 0
-        this.callsToCreateFtdi.length = 0
-        this.callsToStartFtdi.length = 0
-        this.callsToStopFtdi.length = 0
+        this.callsToCreateUsb.length = 0
+        this.callsToStartUsb.length = 0
+        this.callsToWriteUsb.length = 0
+        this.callsToStopUsb.length = 0
     }
 
     private static clearAndFakeFfi() {

package/src/impl/LibndxAdapter.ts

@@ -69,6 +69,10 @@ export default class LibndxAdapter implements Libndx {
         const wrap1 = (f: (a: string) => string) => (args: [string]) =>
             f(args[0])
 
+        const wrap2 =
+            (f: (a: string, b: string) => string) => (args: [string, string]) =>
+                f(args[0], args[1])
+
         const wrap3 =
             (f: (a: string, b: string, c: string) => string) =>
             (args: [string, string, string]) =>
@@ -79,6 +83,11 @@ export default class LibndxAdapter implements Libndx {
             (args: [string, unknown, unknown, number]) =>
                 f(args[0], args[1], args[2], args[3])
 
+        const wrapAddBleCharCallbacks =
+            (f: (a: string, b: unknown, c: number) => string) =>
+            (args: [string, unknown, number]) =>
+                f(args[0], args[1], args[2])
+
         const wrapSetBleRssiInterval =
             (f: (a: string, b: number, c: unknown) => string) =>
             (args: [string, number, unknown]) =>
@@ -103,6 +112,11 @@ export default class LibndxAdapter implements Libndx {
                     'str start_ble_backend(str uuid, OnConnectedFn *on_connected, CharCallback *callbacks, int num_callbacks)'
                 )
             ),
+            add_ble_char_callbacks: wrapAddBleCharCallbacks(
+                lib.func(
+                    'str add_ble_char_callbacks(str uuid, CharCallback *callbacks, int num_callbacks)'
+                )
+            ),
             write_ble_characteristic: wrap3(
                 lib.func(
                     'str write_ble_characteristic(str uuid, str charUuid, str value)'
@@ -114,14 +128,17 @@ export default class LibndxAdapter implements Libndx {
                 )
             ),
             stop_ble_backend: wrap1(lib.func('str stop_ble_backend(str uuid)')),
-            create_ftdi_backend: wrap1(
-                lib.func('str create_ftdi_backend(str config)')
+            create_usb_backend: wrap1(
+                lib.func('str create_usb_backend(str config)')
+            ),
+            start_usb_backend: wrap1(
+                lib.func('str start_usb_backend(str serial)')
             ),
-            start_ftdi_backend: wrap1(
-                lib.func('str start_ftdi_backend(str serial)')
+            write_usb_backend: wrap2(
+                lib.func('str write_usb_backend(str serial, str value)')
             ),
-            stop_ftdi_backend: wrap1(
-                lib.func('str stop_ftdi_backend(str serial)')
+            stop_usb_backend: wrap1(
+                lib.func('str stop_usb_backend(str serial)')
             ),
         }
     }
@@ -204,6 +221,33 @@ export default class LibndxAdapter implements Libndx {
         )
     }
 
+    public addBleCharCallbacks(options: AddBleCharCallbacksOptions) {
+        const { deviceUuid, charCallbacks } = options
+
+        const registered = charCallbacks.map(
+            ({ charUuid, charName, onData }) => ({
+                charUuid,
+                charName,
+                onData: LibndxAdapter.koffiRegister(
+                    onData,
+                    LibndxAdapter.koffiPointer(
+                        LibndxAdapter.getCharCallbackProto()!
+                    )
+                ),
+            })
+        )
+
+        this.registeredCallbacks.push(...registered)
+
+        return JSON.parse(
+            this.bindings.add_ble_char_callbacks([
+                deviceUuid,
+                registered,
+                registered.length,
+            ])
+        )
+    }
+
     public writeBleCharacteristic(options: WriteBleCharacteristicOptions) {
         const { deviceUuid, charUuid: characteristicUuid, value } = options
 
@@ -238,21 +282,29 @@ export default class LibndxAdapter implements Libndx {
         return JSON.parse(this.bindings.stop_ble_backend([deviceUuid]))
     }
 
-    public createFtdiBackend(options: FtdiBackendOptions) {
+    public createUsbBackend(options: UsbBackendOptions) {
         const { serialNumber } = options
-        const configJson = JSON.stringify({ serialNumber })
+        const configJson = JSON.stringify({ serial_number: serialNumber })
 
-        return JSON.parse(this.bindings.create_ftdi_backend([configJson]))
+        return JSON.parse(this.bindings.create_usb_backend([configJson]))
     }
 
-    public startFtdiBackend(options: FtdiBackendOptions) {
+    public startUsbBackend(options: UsbBackendOptions) {
         const { serialNumber } = options
-        return JSON.parse(this.bindings.start_ftdi_backend([serialNumber]))
+        return JSON.parse(this.bindings.start_usb_backend([serialNumber]))
     }
 
-    public stopFtdiBackend(options: FtdiBackendOptions) {
+    public writeUsbBackend(options: WriteUsbBackendOptions) {
+        const { serialNumber, value } = options
+
+        return JSON.parse(
+            this.bindings.write_usb_backend([serialNumber, value])
+        )
+    }
+
+    public stopUsbBackend(options: UsbBackendOptions) {
         const { serialNumber } = options
-        return JSON.parse(this.bindings.stop_ftdi_backend([serialNumber]))
+        return JSON.parse(this.bindings.stop_usb_backend([serialNumber]))
     }
 
     private static getCharCallbackProto() {
@@ -311,12 +363,14 @@ export interface Libndx {
     discoverBleUuid(options: DiscoverBleUuidOptions): NativeResult
     createBleBackend(options: BleBackendOptions): NativeResult
     startBleBackend(options: StartBleBackendOptions): NativeResult
+    addBleCharCallbacks(options: AddBleCharCallbacksOptions): NativeResult
     writeBleCharacteristic(options: WriteBleCharacteristicOptions): NativeResult
     setBleRssiInterval(options: BleRssiOptions): NativeResult
     stopBleBackend(options: BleBackendOptions): NativeResult
-    createFtdiBackend(options: FtdiBackendOptions): NativeResult
-    startFtdiBackend(options: FtdiBackendOptions): NativeResult
-    stopFtdiBackend(options: FtdiBackendOptions): NativeResult
+    createUsbBackend(options: UsbBackendOptions): NativeResult
+    startUsbBackend(options: UsbBackendOptions): NativeResult
+    writeUsbBackend(options: WriteUsbBackendOptions): NativeResult
+    stopUsbBackend(options: UsbBackendOptions): NativeResult
 }
 
 export type LibndxConstructor = new (options?: LibndxAdapterOptions) => Libndx
@@ -339,6 +393,10 @@ export interface StartBleBackendOptions extends BleBackendOptions {
     charCallbacks: CharacteristicCallback[]
 }
 
+export interface AddBleCharCallbacksOptions extends BleBackendOptions {
+    charCallbacks: CharacteristicCallback[]
+}
+
 export interface BleRssiOptions extends BleBackendOptions {
     intervalMs: number
     onRssi: (rssi: number) => void
@@ -356,20 +414,26 @@ export interface CharacteristicCallback {
     onData: (data: Buffer, length: number, timestampSec: number) => void
 }
 
-export interface FtdiBackendOptions {
+export interface UsbBackendOptions {
     serialNumber: string
 }
 
+export interface WriteUsbBackendOptions extends UsbBackendOptions {
+    value: string
+}
+
 export interface LibndxBindings {
     discover_ble_uuid(args: [string, unknown]): string
     create_ble_backend(args: [string]): string
     start_ble_backend(args: [string, unknown, unknown, number]): string
+    add_ble_char_callbacks(args: [string, unknown, number]): string
     write_ble_characteristic(args: [string, string, string]): string
     set_ble_rssi_interval(args: [string, number, unknown]): string
     stop_ble_backend(args: [string]): string
-    create_ftdi_backend(args: [string]): string
-    start_ftdi_backend(args: [string]): string
-    stop_ftdi_backend(args: [string]): string
+    create_usb_backend(args: [string]): string
+    start_usb_backend(args: [string]): string
+    write_usb_backend(args: [string, string]): string
+    stop_usb_backend(args: [string]): string
 }
 
 export interface NativePeripheral {