fix(bluetooth-classic): ignore requests for undefined addresses

Closes #136
legovaer · Mar 22, 2020 · ed733a3 · ed733a3
1 parent c5b181f
commit ed733a3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/integrations/bluetooth-classic/bluetooth-classic.service.spec.ts b/src/integrations/bluetooth-classic/bluetooth-classic.service.spec.ts
@@ -329,6 +329,22 @@ Requesting information ...
     expect(handleSpy.mock.calls[1][0].device).toEqual(device);
   });
 
+  it('should not trigger Bluetooth commands for undefined addresses', async () => {
+    jest.spyOn(service, 'shouldInquire').mockReturnValue(true);
+    const inquireSpy = jest.spyOn(service, 'inquireRssi');
+
+    await service.handleRssiRequest(undefined);
+    expect(inquireSpy).not.toHaveBeenCalled();
+  });
+
+  it('should not trigger Bluetooth commands for empty addresses', async () => {
+    jest.spyOn(service, 'shouldInquire').mockReturnValue(true);
+    const inquireSpy = jest.spyOn(service, 'inquireRssi');
+
+    await service.handleRssiRequest('');
+    expect(inquireSpy).not.toHaveBeenCalled();
+  });
+
   it('should ignore RSSI requests of inquiries are disabled', () => {
     jest.spyOn(service, 'shouldInquire').mockReturnValue(false);
     const handleRssiMock = jest

diff --git a/src/integrations/bluetooth-classic/bluetooth-classic.service.ts b/src/integrations/bluetooth-classic/bluetooth-classic.service.ts
@@ -90,6 +90,11 @@ export class BluetoothClassicService extends KalmanFilterable(Object, 1.4, 1)
    * @param address - Bluetooth MAC address
    */
   async handleRssiRequest(address: string): Promise<void> {
+    if (_.isEmpty(address)) {
+      this.logger.error('RSSI update for empty address requested');
+      return;
+    }
+
     if (this.shouldInquire()) {
       let rssi = await this.inquireRssi(address);