RU-T47 PR#221 fixes

Author: ucswift

package.json

@@ -109,7 +109,6 @@
     "app-icon-badge": "^0.1.2",
     "axios": "~1.12.0",
     "babel-plugin-module-resolver": "^5.0.2",
-    "babel-plugin-transform-import-meta": "^2.3.3",
     "buffer": "^6.0.3",
     "countly-sdk-react-native-bridge": "25.4.1",
     "date-fns": "^4.1.0",
@@ -191,8 +190,9 @@
     "@types/mapbox-gl": "3.4.1",
     "@types/react": "~19.0.10",
     "@types/react-native-base64": "~0.2.2",
-    "@typescript-eslint/eslint-plugin": "~7.18.0",
-    "@typescript-eslint/parser": "~7.18.0",
+    "@typescript-eslint/eslint-plugin": "^8.0.0",
+    "@typescript-eslint/parser": "^8.0.0",
+    "babel-plugin-transform-import-meta": "^2.3.3",
     "babel-jest": "~30.0.0",
     "concurrently": "9.2.1",
     "cross-env": "~7.0.3",
@@ -201,7 +201,7 @@
     "electron-builder": "26.4.0",
     "electron-squirrel-startup": "^1.0.1",
     "eslint": "~8.57.0",
-    "eslint-config-expo": "~7.1.2",
+    "eslint-config-expo": "~9.2.0",
     "eslint-config-prettier": "~9.1.0",
     "eslint-import-resolver-typescript": "~3.6.3",
     "eslint-plugin-i18n-json": "~4.0.0",
@@ -226,7 +226,7 @@
     "tailwindcss": "3.4.4",
     "ts-jest": "~29.1.2",
     "ts-node": "~10.9.2",
-    "typescript": "~5.5.4",
+    "typescript": "5.8.x",
     "wait-on": "9.0.3"
   },
   "repository": {

plugins/withInCallAudioModule.js

@@ -115,9 +115,18 @@ class InCallAudioModule(reactContext: ReactApplicationContext) : ReactContextBas
           when (normalizedRoute) {
             "bluetooth" -> {
               audioManager.isSpeakerphoneOn = false
+              if (!audioManager.isBluetoothScoAvailableOffCall) {
+                audioManager.isBluetoothScoOn = false
+                promise.reject("BLUETOOTH_SCO_UNAVAILABLE", "Bluetooth SCO is not available off call")
+                return
+              }
+
+              audioManager.startBluetoothSco()
               audioManager.isBluetoothScoOn = true
-              if (audioManager.isBluetoothScoAvailableOffCall) {
-                audioManager.startBluetoothSco()
+
+              if (!audioManager.isBluetoothScoOn) {
+                promise.reject("BLUETOOTH_SCO_START_FAILED", "Failed to start Bluetooth SCO")
+                return
               }
             }
 

src/components/settings/bluetooth-device-selection-bottom-sheet.tsx

@@ -44,7 +44,6 @@ export function BluetoothDeviceSelectionBottomSheet({ isOpen, onClose }: Bluetoo
       setHasScanned(true);
       await bluetoothAudioService.startScanning(10000); // 10 second scan
     } catch (error) {
-      setHasScanned(false); // Reset scan state on error
       logger.error({
         message: 'Failed to start Bluetooth scan',
         context: { error },

src/lib/utils.ts

@@ -63,14 +63,14 @@ export function invertColor(hex: string, bw: boolean): string {
 
 export function padZero(str: string, len: number): string {
   len = len || 2;
-  var zeros = new Array(len).join('0');
+  const zeros = new Array(len).join('0');
   return (zeros + str).slice(-len);
 }
 
 export function uuidv4() {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-    var r = (Math.random() * 16) | 0,
-      v = c === 'x' ? r : (r & 0x3) | 0x8;
+    const r = (Math.random() * 16) | 0;
+    const v = c === 'x' ? r : (r & 0x3) | 0x8;
     return v.toString(16);
   });
 }

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

@@ -244,4 +244,42 @@ describe('BluetoothAudioService Refactoring', () => {
       expect(legacyStore.setMicrophoneEnabled).toHaveBeenCalledWith(true);
     });
   });
+
+  describe('Capability parsing strictness', () => {
+    it('should reject explicit falsy read capability values', () => {
+      const service = bluetoothAudioService as any;
+
+      expect(service.hasReadCapability({ Read: false })).toBe(false);
+      expect(service.hasReadCapability({ read: 0 })).toBe(false);
+      expect(service.hasReadCapability({ read: 'false' })).toBe(false);
+    });
+
+    it('should accept explicit truthy read capability values', () => {
+      const service = bluetoothAudioService as any;
+
+      expect(service.hasReadCapability({ Read: true })).toBe(true);
+      expect(service.hasReadCapability({ read: 1 })).toBe(true);
+      expect(service.hasReadCapability({ read: 'true' })).toBe(true);
+      expect(service.hasReadCapability({ read: '1' })).toBe(true);
+      expect(service.hasReadCapability({ read: 'read' })).toBe(true);
+    });
+
+    it('should reject explicit falsy notify/read capability values', () => {
+      const service = bluetoothAudioService as any;
+
+      expect(service.hasNotificationOrReadCapability({ Notify: false })).toBe(false);
+      expect(service.hasNotificationOrReadCapability({ indicate: 0 })).toBe(false);
+      expect(service.hasNotificationOrReadCapability({ read: 'false' })).toBe(false);
+    });
+
+    it('should accept explicit truthy notify/read capability values', () => {
+      const service = bluetoothAudioService as any;
+
+      expect(service.hasNotificationOrReadCapability({ notify: true })).toBe(true);
+      expect(service.hasNotificationOrReadCapability({ indicate: 1 })).toBe(true);
+      expect(service.hasNotificationOrReadCapability({ read: 'true' })).toBe(true);
+      expect(service.hasNotificationOrReadCapability({ read: '1' })).toBe(true);
+      expect(service.hasNotificationOrReadCapability({ notify: 'notify' })).toBe(true);
+    });
+  });
 });

src/services/app-lifecycle.ts

@@ -1,6 +1,6 @@
 import { AppState, type AppStateStatus } from 'react-native';
 
-import { useLogger } from '@/lib/logging';
+import { logger } from '@/lib/logging';
 import { useAppLifecycleStore } from '@/stores/app/app-lifecycle';
 
 class AppLifecycleService {
@@ -25,7 +25,7 @@ class AppLifecycleService {
   private handleAppStateChange = (nextAppState: AppStateStatus): void => {
     const currentState = useAppLifecycleStore.getState().appState;
 
-    useLogger().info({
+    logger.info({
       message: 'App state changed',
       context: {
         from: currentState,

src/services/bluetooth-audio.service.ts

@@ -187,34 +187,40 @@ class BluetoothAudioService {
     }
   }
 
+  private addEventListener(listener: { remove: () => void }): void {
+    if (!this.eventListeners.includes(listener)) {
+      this.eventListeners.push(listener);
+    }
+  }
+
+  private removeEventListener(listener: { remove: () => void } | null): void {
+    if (!listener) {
+      return;
+    }
+
+    this.eventListeners = this.eventListeners.filter((registeredListener) => registeredListener !== listener);
+  }
+
   private setupEventListeners(): void {
     // Bluetooth state change listener
-    //const stateListener = DeviceEventEmitter.addListener('BleManagerDidUpdateState', this.handleBluetoothStateChange.bind(this));
     const stateListener = BleManager.onDidUpdateState(this.handleBluetoothStateChange.bind(this));
-    this.eventListeners.push(stateListener);
+    this.addEventListener(stateListener);
 
     // Device disconnection listener
-    //const disconnectListener = DeviceEventEmitter.addListener('BleManagerDisconnectPeripheral', this.handleDeviceDisconnected.bind(this));
     const disconnectListener = BleManager.onDisconnectPeripheral(this.handleDeviceDisconnected.bind(this));
-    this.eventListeners.push(disconnectListener);
+    this.addEventListener(disconnectListener);
 
     // Device discovered listener
-    //const discoverListener = DeviceEventEmitter.addListener('BleManagerDiscoverPeripheral', this.handleDeviceDiscovered.bind(this));
     const discoverListener = BleManager.onDiscoverPeripheral(this.handleDeviceDiscovered.bind(this));
-    this.eventListeners.push(discoverListener);
+    this.addEventListener(discoverListener);
 
     // Characteristic value update listener
-    //const valueUpdateListener = DeviceEventEmitter.addListener('BleManagerDidUpdateValueForCharacteristic', this.handleCharacteristicValueUpdate.bind(this));
     const valueUpdateListener = BleManager.onDidUpdateValueForCharacteristic(this.handleCharacteristicValueUpdate.bind(this));
-    this.eventListeners.push(valueUpdateListener);
-
-    const legacyValueUpdateListener = DeviceEventEmitter.addListener('BleManagerDidUpdateValueForCharacteristic', this.handleCharacteristicValueUpdate.bind(this));
-    this.eventListeners.push(legacyValueUpdateListener);
+    this.addEventListener(valueUpdateListener);
 
     // Stop scan listener
-    //const stopScanListener = DeviceEventEmitter.addListener('BleManagerStopScan', this.handleScanStopped.bind(this));
     const stopScanListener = BleManager.onStopScan(this.handleScanStopped.bind(this));
-    this.eventListeners.push(stopScanListener);
+    this.addEventListener(stopScanListener);
   }
 
   private handleBluetoothStateChange(args: { state: BleState }): void {
@@ -1126,11 +1132,12 @@ class BluetoothAudioService {
     }
 
     this.mediaButtonEventListener = DeviceEventEmitter.addListener('onMediaButtonEvent', this.handleMediaButtonFallbackEvent.bind(this));
-    this.eventListeners.push(this.mediaButtonEventListener);
+    this.addEventListener(this.mediaButtonEventListener);
   }
 
   private stopMediaButtonFallbackMonitoring(): void {
     if (this.mediaButtonEventListener) {
+      this.removeEventListener(this.mediaButtonEventListener);
       this.mediaButtonEventListener.remove();
       this.mediaButtonEventListener = null;
     }
@@ -1522,7 +1529,7 @@ class BluetoothAudioService {
           return false;
         }
 
-        return value === true || value === 1 || normalizedValue === normalizedKey || normalizedValue === 'true' || normalizedValue === '1' || normalizedValue.length > 0;
+        return value === true || value === 1 || normalizedValue === normalizedKey || normalizedValue === 'true' || normalizedValue === '1';
       });
     }
 
@@ -1558,7 +1565,7 @@ class BluetoothAudioService {
           return false;
         }
 
-        return value === true || value === 1 || normalizedValue === normalizedKey || normalizedValue === 'true' || normalizedValue === '1' || normalizedValue.length > 0;
+        return value === true || value === 1 || normalizedValue === normalizedKey || normalizedValue === 'true' || normalizedValue === '1';
       });
     }
 

src/services/callkeep.service.android.ts

@@ -323,7 +323,6 @@ export class CallKeepService {
     }
 
     if (now < this.muteEventStormEndTime) {
-      this.muteEventStormEndTime = now + 800;
       logger.debug({
         message: 'Ignored CallKeep mute state change (storm cooldown, Android)',
         context: { muted, callUUID, stormEndsAt: this.muteEventStormEndTime },