RU-T47 PR#221 fixes

Author: ucswift

src/services/__tests__/bluetooth-audio.service.test.ts

@@ -36,6 +36,7 @@ jest.mock('react-native-ble-manager', () => ({
     getDiscoveredPeripherals: jest.fn(),
     removeAllListeners: jest.fn(),
     removePeripheral: jest.fn(),
+    read: jest.fn(),
   },
 }));
 
@@ -282,4 +283,35 @@ describe('BluetoothAudioService Refactoring', () => {
       expect(service.hasNotificationOrReadCapability({ notify: 'notify' })).toBe(true);
     });
   });
+
+  describe('Read polling baseline handling', () => {
+    it('should prime first read and only dispatch after value changes', async () => {
+      const service = bluetoothAudioService as any;
+      const bleManagerMock = require('react-native-ble-manager').default;
+      const mockHandleButtonEvent = jest.fn();
+
+      service.handleButtonEventFromCharacteristic = mockHandleButtonEvent;
+      service.monitoredReadCharacteristics = [
+        {
+          serviceUuid: 'service-1',
+          characteristicUuid: 'characteristic-1',
+          lastHexValue: null,
+        },
+      ];
+
+      bleManagerMock.read = jest.fn().mockResolvedValueOnce([0x00]).mockResolvedValueOnce([0x01]).mockResolvedValueOnce([0x01]);
+
+      await service.pollReadCharacteristics('device-1');
+      expect(service.monitoredReadCharacteristics[0].lastHexValue).toBe('00');
+      expect(mockHandleButtonEvent).not.toHaveBeenCalled();
+
+      await service.pollReadCharacteristics('device-1');
+      expect(service.monitoredReadCharacteristics[0].lastHexValue).toBe('01');
+      expect(mockHandleButtonEvent).toHaveBeenCalledTimes(1);
+      expect(mockHandleButtonEvent).toHaveBeenCalledWith('device-1', 'service-1', 'characteristic-1', 'AQ==');
+
+      await service.pollReadCharacteristics('device-1');
+      expect(mockHandleButtonEvent).toHaveBeenCalledTimes(1);
+    });
+  });
 });

src/services/bluetooth-audio.service.ts

@@ -1310,7 +1310,7 @@ class BluetoothAudioService {
   }
 
   private async startNotificationsForButtonControls(deviceId: string, peripheralInfo: PeripheralInfo): Promise<void> {
-    const subscribedPairs = new Set<string>();
+    const successfullySubscribed = new Set<string>();
     this.monitoredReadCharacteristics = [];
     const isSpecializedDevice = Boolean(this.connectedDevice && this.connectedDevice.id === deviceId && this.getDeviceType(this.connectedDevice) === 'specialized');
 
@@ -1342,7 +1342,7 @@ class BluetoothAudioService {
         }
 
         await BleManager.startNotification(deviceId, config.service, config.characteristic);
-        subscribedPairs.add(`${config.service.toUpperCase()}::${config.characteristic.toUpperCase()}`);
+        successfullySubscribed.add(`${config.service.toUpperCase()}::${config.characteristic.toUpperCase()}`);
         this.registerReadPollingCharacteristic(config.service, config.characteristic);
         logger.info({
           message: 'Started notifications for button control',
@@ -1378,13 +1378,13 @@ class BluetoothAudioService {
         const pairKey = `${String(serviceUuid).toUpperCase()}::${String(characteristicUuid).toUpperCase()}`;
         const shouldSubscribe = isSpecializedDevice ? true : this.isLikelyButtonCharacteristic(serviceUuid, characteristicUuid) || this.hasNotificationOrReadCapability(characteristic?.properties);
 
-        if (!shouldSubscribe || subscribedPairs.has(pairKey)) {
+        if (!shouldSubscribe || successfullySubscribed.has(pairKey)) {
           continue;
         }
 
         try {
           await BleManager.startNotification(deviceId, serviceUuid, characteristicUuid);
-          subscribedPairs.add(pairKey);
+          successfullySubscribed.add(pairKey);
 
           if (isSpecializedDevice || this.hasReadCapability(characteristic?.properties)) {
             this.registerReadPollingCharacteristic(serviceUuid, characteristicUuid);
@@ -1422,11 +1422,16 @@ class BluetoothAudioService {
           continue;
         }
 
+        const pairKey = `${String(serviceUuid).toUpperCase()}::${String(characteristicUuid).toUpperCase()}`;
+        if (!successfullySubscribed.has(pairKey)) {
+          continue;
+        }
+
         this.registerReadPollingCharacteristic(serviceUuid, characteristicUuid);
       }
     }
 
-    if (subscribedPairs.size > 0) {
+    if (successfullySubscribed.size > 0) {
       useBluetoothAudioStore.getState().setIsHeadsetButtonMonitoring(true);
       this.startReadPollingFallback(deviceId);
     } else {
@@ -1488,6 +1493,11 @@ class BluetoothAudioService {
           continue;
         }
 
+        if (entry.lastHexValue === null) {
+          entry.lastHexValue = nextHexValue;
+          continue;
+        }
+
         if (entry.lastHexValue === nextHexValue) {
           continue;
         }
@@ -2106,13 +2116,21 @@ class BluetoothAudioService {
   }
 
   private scheduleMicApplyRetry(enabled: boolean): void {
+    this.pendingMicEnabled = enabled;
+
     if (this.micApplyRetryTimeout) {
       return;
     }
 
     this.micApplyRetryTimeout = setTimeout(() => {
       this.micApplyRetryTimeout = null;
-      this.requestMicrophoneState(enabled);
+
+      const pendingEnabled = this.pendingMicEnabled;
+      if (pendingEnabled === null) {
+        return;
+      }
+
+      this.requestMicrophoneState(pendingEnabled);
     }, 160);
   }