@neurodevs/node-lsl 22.0.0 → 22.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,11 +1,21 @@
1
1
  import AbstractPackageTest from '../AbstractPackageTest.js';
2
2
  export default class BleObserverControllerTest extends AbstractPackageTest {
3
3
  private static instance;
4
+ private static passedAdvertisements;
5
+ private static readonly fakeError;
6
+ private static readonly data;
7
+ private static readonly length;
8
+ private static readonly timestampSec;
4
9
  protected static beforeEach(): Promise<void>;
5
10
  protected static createsInstance(): Promise<void>;
6
11
  protected static startObservingCreatesBleObserverBackend(): Promise<void>;
7
12
  protected static startObservingStartsBleObserverBackend(): Promise<void>;
13
+ protected static passesExpectedArgsToOnAdvertisement(): Promise<void>;
8
14
  protected static stopObservingStopsBleObserverBackend(): Promise<void>;
15
+ protected static createBleObserverBackendThrowsOnError(): Promise<void>;
16
+ protected static startObservingThrowsOnError(): Promise<void>;
17
+ protected static stopObservingThrowsOnError(): Promise<void>;
18
+ private static setFakeErrorResult;
9
19
  private static startObserving;
10
20
  private static stopObserving;
11
21
  private static BleObserverController;
@@ -10,8 +10,14 @@ import AbstractPackageTest from '../AbstractPackageTest.js';
10
10
  import { FakeLibndx } from '@neurodevs/ndx-native';
11
11
  export default class BleObserverControllerTest extends AbstractPackageTest {
12
12
  static instance;
13
+ static passedAdvertisements;
14
+ static fakeError = this.generateId();
15
+ static data = Buffer.from([0x01, 0x02, 0x03]);
16
+ static length = 3;
17
+ static timestampSec = 1234.5;
13
18
  static async beforeEach() {
14
19
  await super.beforeEach();
20
+ this.passedAdvertisements = [];
15
21
  this.instance = this.BleObserverController();
16
22
  }
17
23
  static async createsInstance() {
@@ -29,12 +35,41 @@ export default class BleObserverControllerTest extends AbstractPackageTest {
29
35
  assert.isEqual(deviceUuid, this.deviceUuid, 'Did not pass deviceUuid to startBleObserverBackend!');
30
36
  assert.isFunction(onAdvertisement, 'Did not pass onAdvertisement to startBleObserverBackend!');
31
37
  }
38
+ static async passesExpectedArgsToOnAdvertisement() {
39
+ await this.startObserving();
40
+ FakeLibndx.callsToStartBleObserver[0]?.onAdvertisement(this.data, this.length, this.timestampSec);
41
+ assert.isEqualDeep(this.passedAdvertisements[0], {
42
+ data: this.data,
43
+ length: this.length,
44
+ timestampSec: this.timestampSec,
45
+ }, 'Did not pass expected args to onAdvertisement!');
46
+ }
32
47
  static async stopObservingStopsBleObserverBackend() {
33
48
  await this.stopObserving();
34
49
  assert.isEqualDeep(FakeLibndx.callsToStopBleObserver[0], {
35
50
  deviceUuid: this.deviceUuid,
36
51
  });
37
52
  }
53
+ static async createBleObserverBackendThrowsOnError() {
54
+ this.setFakeErrorResult();
55
+ //@ts-ignore
56
+ this.instance.startBleObserverBackend = () => { };
57
+ await assert.doesThrowAsync(async () => await this.startObserving(), this.fakeError, 'Did not throw error!');
58
+ }
59
+ static async startObservingThrowsOnError() {
60
+ this.setFakeErrorResult();
61
+ await assert.doesThrowAsync(async () => await this.startObserving(), this.fakeError, 'Did not throw error!');
62
+ }
63
+ static async stopObservingThrowsOnError() {
64
+ this.setFakeErrorResult();
65
+ await assert.doesThrowAsync(async () => await this.stopObserving(), this.fakeError, 'Did not throw error!');
66
+ }
67
+ static setFakeErrorResult() {
68
+ FakeLibndx.fakeResult = {
69
+ status: 400,
70
+ error: this.fakeError,
71
+ };
72
+ }
38
73
  static async startObserving() {
39
74
  await this.instance.startObserving();
40
75
  }
@@ -44,6 +79,9 @@ export default class BleObserverControllerTest extends AbstractPackageTest {
44
79
  static BleObserverController() {
45
80
  return BleObserverController.Create({
46
81
  deviceUuid: this.deviceUuid,
82
+ onAdvertisement: (data, length, timestampSec) => {
83
+ this.passedAdvertisements.push({ data, length, timestampSec });
84
+ },
47
85
  });
48
86
  }
49
87
  }
@@ -56,7 +94,19 @@ __decorate([
56
94
  __decorate([
57
95
  test()
58
96
  ], BleObserverControllerTest, "startObservingStartsBleObserverBackend", null);
97
+ __decorate([
98
+ test()
99
+ ], BleObserverControllerTest, "passesExpectedArgsToOnAdvertisement", null);
59
100
  __decorate([
60
101
  test()
61
102
  ], BleObserverControllerTest, "stopObservingStopsBleObserverBackend", null);
103
+ __decorate([
104
+ test()
105
+ ], BleObserverControllerTest, "createBleObserverBackendThrowsOnError", null);
106
+ __decorate([
107
+ test()
108
+ ], BleObserverControllerTest, "startObservingThrowsOnError", null);
109
+ __decorate([
110
+ test()
111
+ ], BleObserverControllerTest, "stopObservingThrowsOnError", null);
62
112
  //# sourceMappingURL=BleObserverController.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"BleObserverController.test.js","sourceRoot":"","sources":["../../../src/__tests__/impl/BleObserverController.test.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAElD,OAAO,qBAEN,MAAM,iDAAiD,CAAA;AACxD,OAAO,mBAAmB,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,mBAAmB;IAC9D,MAAM,CAAC,QAAQ,CAAa;IAE1B,MAAM,CAAC,KAAK,CAAC,UAAU;QAC7B,MAAM,KAAK,CAAC,UAAU,EAAE,CAAA;QAExB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAA;IAChD,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,eAAe;QAClC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,4BAA4B,CAAC,CAAA;IAChE,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,uCAAuC;QAC1D,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;QAE3B,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE;YACvD,UAAU,EAAE,IAAI,CAAC,UAAU;SAC9B,CAAC,CAAA;IACN,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,sCAAsC;QACzD,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;QAE3B,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,GACjC,UAAU,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAA;QAEzC,MAAM,CAAC,OAAO,CACV,UAAU,EACV,IAAI,CAAC,UAAU,EACf,qDAAqD,CACxD,CAAA;QACD,MAAM,CAAC,UAAU,CACb,eAAe,EACf,0DAA0D,CAC7D,CAAA;IACL,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,oCAAoC;QACvD,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;QAE1B,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC,CAAC,EAAE;YACrD,UAAU,EAAE,IAAI,CAAC,UAAU;SAC9B,CAAC,CAAA;IACN,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,cAAc;QAC/B,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAA;IACxC,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,aAAa;QAC9B,MAAM,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAA;IACvC,CAAC;IAEO,MAAM,CAAC,qBAAqB;QAChC,OAAO,qBAAqB,CAAC,MAAM,CAAC;YAChC,UAAU,EAAE,IAAI,CAAC,UAAU;SAC9B,CAAC,CAAA;IACN,CAAC;CACJ;AArD0B;IADtB,IAAI,EAAE;sDAGN;AAGsB;IADtB,IAAI,EAAE;8EAON;AAGsB;IADtB,IAAI,EAAE;6EAgBN;AAGsB;IADtB,IAAI,EAAE;2EAON"}
1
+ {"version":3,"file":"BleObserverController.test.js","sourceRoot":"","sources":["../../../src/__tests__/impl/BleObserverController.test.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  export default class BleObserverController implements BleObserver {
2
2
  static Class?: BleObserverConstructor;
3
3
  private readonly deviceUuid;
4
+ private readonly onAdvertisement?;
4
5
  private readonly ndx;
5
6
  protected constructor(options: BleObserverOptions);
6
7
  static Create(options: BleObserverOptions): BleObserver;
@@ -9,6 +10,7 @@ export default class BleObserverController implements BleObserver {
9
10
  private startBleObserverBackend;
10
11
  stopObserving(): Promise<void>;
11
12
  private stopBleObserverBackend;
13
+ private throwIfError;
12
14
  }
13
15
  export interface BleObserver {
14
16
  startObserving(): Promise<void>;
@@ -17,4 +19,6 @@ export interface BleObserver {
17
19
  export type BleObserverConstructor = new (options: BleObserverOptions) => BleObserver;
18
20
  export type BleObserverOptions = {
19
21
  deviceUuid: string;
22
+ onAdvertisement?: OnAdvertisement;
20
23
  };
24
+ export type OnAdvertisement = (data: Buffer, length: number, timestampSec: number) => void;
@@ -2,10 +2,12 @@ import { LibndxAdapter } from '@neurodevs/ndx-native';
2
2
  export default class BleObserverController {
3
3
  static Class;
4
4
  deviceUuid;
5
+ onAdvertisement;
5
6
  ndx = LibndxAdapter.getInstance();
6
7
  constructor(options) {
7
- const { deviceUuid } = options;
8
+ const { deviceUuid, onAdvertisement } = options;
8
9
  this.deviceUuid = deviceUuid ?? '';
10
+ this.onAdvertisement = onAdvertisement;
9
11
  }
10
12
  static Create(options) {
11
13
  return new (this.Class ?? this)(options);
@@ -15,23 +17,33 @@ export default class BleObserverController {
15
17
  this.startBleObserverBackend();
16
18
  }
17
19
  createBleObserverBackend() {
18
- this.ndx.createBleObserverBackend({
20
+ const { status, error } = this.ndx.createBleObserverBackend({
19
21
  deviceUuid: this.deviceUuid,
20
22
  });
23
+ this.throwIfError(status, error);
21
24
  }
22
25
  startBleObserverBackend() {
23
- this.ndx.startBleObserverBackend({
26
+ const { status, error } = this.ndx.startBleObserverBackend({
24
27
  deviceUuid: this.deviceUuid,
25
- onAdvertisement: (_data, _length, _timestampSec) => { },
28
+ onAdvertisement: (data, length, timestampSec) => {
29
+ this.onAdvertisement?.(data, length, timestampSec);
30
+ },
26
31
  });
32
+ this.throwIfError(status, error);
27
33
  }
28
34
  async stopObserving() {
29
35
  this.stopBleObserverBackend();
30
36
  }
31
37
  stopBleObserverBackend() {
32
- this.ndx.stopBleObserverBackend({
38
+ const { status, error } = this.ndx.stopBleObserverBackend({
33
39
  deviceUuid: this.deviceUuid,
34
40
  });
41
+ this.throwIfError(status, error);
42
+ }
43
+ throwIfError(status, error) {
44
+ if (status !== 200) {
45
+ throw new Error(`${status} error: ${error ?? 'Unknown error'}`);
46
+ }
35
47
  }
36
48
  }
37
49
  //# sourceMappingURL=BleObserverController.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"BleObserverController.js","sourceRoot":"","sources":["../../../src/impl/controllers/BleObserverController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAErD,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAC/B,MAAM,CAAC,KAAK,CAAyB;IAE3B,UAAU,CAAQ;IAClB,GAAG,GAAG,aAAa,CAAC,WAAW,EAAE,CAAA;IAElD,YAAsB,OAA2B;QAC7C,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAA;QAE9B,IAAI,CAAC,UAAU,GAAG,UAAU,IAAI,EAAE,CAAA;IACtC,CAAC;IAEM,MAAM,CAAC,MAAM,CAAC,OAA2B;QAC5C,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,OAAO,CAAC,CAAA;IAC5C,CAAC;IAEM,KAAK,CAAC,cAAc;QACvB,IAAI,CAAC,wBAAwB,EAAE,CAAA;QAC/B,IAAI,CAAC,uBAAuB,EAAE,CAAA;IAClC,CAAC;IAEO,wBAAwB;QAC5B,IAAI,CAAC,GAAG,CAAC,wBAAwB,CAAC;YAC9B,UAAU,EAAE,IAAI,CAAC,UAAU;SAC9B,CAAC,CAAA;IACN,CAAC;IAEO,uBAAuB;QAC3B,IAAI,CAAC,GAAG,CAAC,uBAAuB,CAAC;YAC7B,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,eAAe,EAAE,CACb,KAAa,EACb,OAAe,EACf,aAAqB,EACvB,EAAE,GAAE,CAAC;SACV,CAAC,CAAA;IACN,CAAC;IAEM,KAAK,CAAC,aAAa;QACtB,IAAI,CAAC,sBAAsB,EAAE,CAAA;IACjC,CAAC;IAEO,sBAAsB;QAC1B,IAAI,CAAC,GAAG,CAAC,sBAAsB,CAAC;YAC5B,UAAU,EAAE,IAAI,CAAC,UAAU;SAC9B,CAAC,CAAA;IACN,CAAC;CACJ"}
1
+ {"version":3,"file":"BleObserverController.js","sourceRoot":"","sources":["../../../src/impl/controllers/BleObserverController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAErD,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAC/B,MAAM,CAAC,KAAK,CAAyB;IAE3B,UAAU,CAAQ;IAClB,eAAe,CAAkB;IACjC,GAAG,GAAG,aAAa,CAAC,WAAW,EAAE,CAAA;IAElD,YAAsB,OAA2B;QAC7C,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,OAAO,CAAA;QAE/C,IAAI,CAAC,UAAU,GAAG,UAAU,IAAI,EAAE,CAAA;QAClC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;IAC1C,CAAC;IAEM,MAAM,CAAC,MAAM,CAAC,OAA2B;QAC5C,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,OAAO,CAAC,CAAA;IAC5C,CAAC;IAEM,KAAK,CAAC,cAAc;QACvB,IAAI,CAAC,wBAAwB,EAAE,CAAA;QAC/B,IAAI,CAAC,uBAAuB,EAAE,CAAA;IAClC,CAAC;IAEO,wBAAwB;QAC5B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,wBAAwB,CAAC;YACxD,UAAU,EAAE,IAAI,CAAC,UAAU;SAC9B,CAAC,CAAA;QAEF,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACpC,CAAC;IAEO,uBAAuB;QAC3B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,uBAAuB,CAAC;YACvD,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,eAAe,EAAE,CACb,IAAY,EACZ,MAAc,EACd,YAAoB,EACtB,EAAE;gBACA,IAAI,CAAC,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;YACtD,CAAC;SACJ,CAAC,CAAA;QAEF,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACpC,CAAC;IAEM,KAAK,CAAC,aAAa;QACtB,IAAI,CAAC,sBAAsB,EAAE,CAAA;IACjC,CAAC;IAEO,sBAAsB;QAC1B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,sBAAsB,CAAC;YACtD,UAAU,EAAE,IAAI,CAAC,UAAU;SAC9B,CAAC,CAAA;QAEF,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACpC,CAAC;IAEO,YAAY,CAAC,MAAc,EAAE,KAAyB;QAC1D,IAAI,MAAM,KAAK,GAAG,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,WAAW,KAAK,IAAI,eAAe,EAAE,CAAC,CAAA;QACnE,CAAC;IACL,CAAC;CACJ"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@neurodevs/node-lsl",
3
- "version": "22.0.0",
3
+ "version": "22.1.0",
4
4
  "description": "Lab Streaming Layer (LSL) bindings for Node",
5
5
  "type": "module",
6
6
  "keywords": [
@@ -8,10 +8,19 @@ import { FakeLibndx } from '@neurodevs/ndx-native'
8
8
 
9
9
  export default class BleObserverControllerTest extends AbstractPackageTest {
10
10
  private static instance: BleObserver
11
+ private static passedAdvertisements: PassedAdvertisement[]
12
+
13
+ private static readonly fakeError = this.generateId()
14
+
15
+ private static readonly data = Buffer.from([0x01, 0x02, 0x03])
16
+ private static readonly length = 3
17
+ private static readonly timestampSec = 1234.5
11
18
 
12
19
  protected static async beforeEach() {
13
20
  await super.beforeEach()
14
21
 
22
+ this.passedAdvertisements = []
23
+
15
24
  this.instance = this.BleObserverController()
16
25
  }
17
26
 
@@ -47,6 +56,27 @@ export default class BleObserverControllerTest extends AbstractPackageTest {
47
56
  )
48
57
  }
49
58
 
59
+ @test()
60
+ protected static async passesExpectedArgsToOnAdvertisement() {
61
+ await this.startObserving()
62
+
63
+ FakeLibndx.callsToStartBleObserver[0]?.onAdvertisement(
64
+ this.data,
65
+ this.length,
66
+ this.timestampSec
67
+ )
68
+
69
+ assert.isEqualDeep(
70
+ this.passedAdvertisements[0],
71
+ {
72
+ data: this.data,
73
+ length: this.length,
74
+ timestampSec: this.timestampSec,
75
+ },
76
+ 'Did not pass expected args to onAdvertisement!'
77
+ )
78
+ }
79
+
50
80
  @test()
51
81
  protected static async stopObservingStopsBleObserverBackend() {
52
82
  await this.stopObserving()
@@ -56,6 +86,49 @@ export default class BleObserverControllerTest extends AbstractPackageTest {
56
86
  })
57
87
  }
58
88
 
89
+ @test()
90
+ protected static async createBleObserverBackendThrowsOnError() {
91
+ this.setFakeErrorResult()
92
+
93
+ //@ts-ignore
94
+ this.instance.startBleObserverBackend = () => {}
95
+
96
+ await assert.doesThrowAsync(
97
+ async () => await this.startObserving(),
98
+ this.fakeError,
99
+ 'Did not throw error!'
100
+ )
101
+ }
102
+
103
+ @test()
104
+ protected static async startObservingThrowsOnError() {
105
+ this.setFakeErrorResult()
106
+
107
+ await assert.doesThrowAsync(
108
+ async () => await this.startObserving(),
109
+ this.fakeError,
110
+ 'Did not throw error!'
111
+ )
112
+ }
113
+
114
+ @test()
115
+ protected static async stopObservingThrowsOnError() {
116
+ this.setFakeErrorResult()
117
+
118
+ await assert.doesThrowAsync(
119
+ async () => await this.stopObserving(),
120
+ this.fakeError,
121
+ 'Did not throw error!'
122
+ )
123
+ }
124
+
125
+ private static setFakeErrorResult() {
126
+ FakeLibndx.fakeResult = {
127
+ status: 400,
128
+ error: this.fakeError,
129
+ }
130
+ }
131
+
59
132
  private static async startObserving() {
60
133
  await this.instance.startObserving()
61
134
  }
@@ -67,6 +140,19 @@ export default class BleObserverControllerTest extends AbstractPackageTest {
67
140
  private static BleObserverController() {
68
141
  return BleObserverController.Create({
69
142
  deviceUuid: this.deviceUuid,
143
+ onAdvertisement: (
144
+ data: Buffer,
145
+ length: number,
146
+ timestampSec: number
147
+ ) => {
148
+ this.passedAdvertisements.push({ data, length, timestampSec })
149
+ },
70
150
  })
71
151
  }
72
152
  }
153
+
154
+ type PassedAdvertisement = {
155
+ data: Buffer
156
+ length: number
157
+ timestampSec: number
158
+ }
@@ -4,12 +4,14 @@ export default class BleObserverController implements BleObserver {
4
4
  public static Class?: BleObserverConstructor
5
5
 
6
6
  private readonly deviceUuid: string
7
+ private readonly onAdvertisement?: OnAdvertisement
7
8
  private readonly ndx = LibndxAdapter.getInstance()
8
9
 
9
10
  protected constructor(options: BleObserverOptions) {
10
- const { deviceUuid } = options
11
+ const { deviceUuid, onAdvertisement } = options
11
12
 
12
13
  this.deviceUuid = deviceUuid ?? ''
14
+ this.onAdvertisement = onAdvertisement
13
15
  }
14
16
 
15
17
  public static Create(options: BleObserverOptions) {
@@ -22,20 +24,26 @@ export default class BleObserverController implements BleObserver {
22
24
  }
23
25
 
24
26
  private createBleObserverBackend() {
25
- this.ndx.createBleObserverBackend({
27
+ const { status, error } = this.ndx.createBleObserverBackend({
26
28
  deviceUuid: this.deviceUuid,
27
29
  })
30
+
31
+ this.throwIfError(status, error)
28
32
  }
29
33
 
30
34
  private startBleObserverBackend() {
31
- this.ndx.startBleObserverBackend({
35
+ const { status, error } = this.ndx.startBleObserverBackend({
32
36
  deviceUuid: this.deviceUuid,
33
37
  onAdvertisement: (
34
- _data: Buffer,
35
- _length: number,
36
- _timestampSec: number
37
- ) => {},
38
+ data: Buffer,
39
+ length: number,
40
+ timestampSec: number
41
+ ) => {
42
+ this.onAdvertisement?.(data, length, timestampSec)
43
+ },
38
44
  })
45
+
46
+ this.throwIfError(status, error)
39
47
  }
40
48
 
41
49
  public async stopObserving() {
@@ -43,9 +51,17 @@ export default class BleObserverController implements BleObserver {
43
51
  }
44
52
 
45
53
  private stopBleObserverBackend() {
46
- this.ndx.stopBleObserverBackend({
54
+ const { status, error } = this.ndx.stopBleObserverBackend({
47
55
  deviceUuid: this.deviceUuid,
48
56
  })
57
+
58
+ this.throwIfError(status, error)
59
+ }
60
+
61
+ private throwIfError(status: number, error: string | undefined) {
62
+ if (status !== 200) {
63
+ throw new Error(`${status} error: ${error ?? 'Unknown error'}`)
64
+ }
49
65
  }
50
66
  }
51
67
  export interface BleObserver {
@@ -59,4 +75,11 @@ export type BleObserverConstructor = new (
59
75
 
60
76
  export type BleObserverOptions = {
61
77
  deviceUuid: string
78
+ onAdvertisement?: OnAdvertisement
62
79
  }
80
+
81
+ export type OnAdvertisement = (
82
+ data: Buffer,
83
+ length: number,
84
+ timestampSec: number
85
+ ) => void