From 700fee1e90aa44e2f71fddad8a32073353f81fb3 Mon Sep 17 00:00:00 2001 From: Shawn Jackson Date: Fri, 29 Aug 2025 22:21:53 -0700 Subject: [PATCH 1/6] CU-868fdadum Expo update for And16k, bug fixes and tweaks. --- .DS_Store | Bin 10244 -> 10244 bytes .github/dependabot.yml | 1 + .github/workflows/react-native-cicd.yml | 36 +- app.config.ts | 1 + docs/signalr-service-refactoring.md | 132 ++++ expo-env.d.ts | 2 +- package.json | 25 +- .../audio-stream-bottom-sheet.tsx | 14 - .../bluetooth/bluetooth-audio-modal.tsx | 170 ++--- .../server-url-bottom-sheet-simple.test.tsx | 22 +- ...nit-selection-bottom-sheet-simple.test.tsx | 461 ++++++++++++++ .../unit-selection-bottom-sheet.test.tsx | 592 ++++++++++++++++++ .../settings/unit-selection-bottom-sheet.tsx | 122 ++-- .../__tests__/status-bottom-sheet.test.tsx | 318 +++++++++- src/components/status/status-bottom-sheet.tsx | 36 +- .../__tests__/use-map-signalr-updates.test.ts | 414 ++++++++++++ src/hooks/use-map-signalr-updates.ts | 163 +++-- src/hooks/use-status-signalr-updates.ts | 1 - .../location-foreground-permissions.test.ts | 415 ++++++++++++ src/services/__tests__/location.test.ts | 208 +++++- .../signalr.service.enhanced.test.ts | 278 ++++++++ .../__tests__/signalr.service.test.ts | 47 +- src/services/location.ts | 65 +- src/services/signalr.service.ts | 174 ++++- src/stores/status/__tests__/store.test.ts | 6 +- src/stores/status/store.ts | 23 +- src/translations/ar.json | 1 + src/translations/en.json | 1 + src/translations/es.json | 1 + src/utils/b01-inrico-debug.ts | 143 ----- tsconfig.json | 2 +- types/expo-random.d.ts | 0 yarn.lock | 433 ++++++++++--- 33 files changed, 3733 insertions(+), 574 deletions(-) create mode 100644 docs/signalr-service-refactoring.md create mode 100644 src/components/settings/__tests__/unit-selection-bottom-sheet-simple.test.tsx create mode 100644 src/components/settings/__tests__/unit-selection-bottom-sheet.test.tsx create mode 100644 src/hooks/__tests__/use-map-signalr-updates.test.ts create mode 100644 src/services/__tests__/location-foreground-permissions.test.ts create mode 100644 src/services/__tests__/signalr.service.enhanced.test.ts delete mode 100644 src/utils/b01-inrico-debug.ts create mode 100644 types/expo-random.d.ts diff --git a/.DS_Store b/.DS_Store index fe6609dcde68b12fe7d18569d65dec43b3f99d0d..d56c0a7b3a4cb30b593c03bc6a07c97b554cf7ea 100644 GIT binary patch delta 180 zcmZn(XbG6$&uF?aU^hRb>0};(%*oCI!jm@%G;kPNn&~JQ8XHWu5_A9w@{|P^<>ln( zr86)vFm5gqFk-Y%ODRrH%FoYX1PZY;Br@bNq%agQ%JKqb3xH6MAsHy2 z$B+h8lRo)?s3@cLx7w^0TvZ8`v3p{ delta 184 zcmZn(XbG6$&uFqSU^hRb$z&dZ%*hJ``8PKTDlksoBg8+MRoI1b$K>6DgOl(-cnO)%*%jOU> "$GITHUB_ENV" - - - name: 📋 Prepare Release Notes file - if: ${{ matrix.platform == 'android' }} - run: | + # Determine source of release notes: workflow input, PR body, or recent commits + if [ -n "$RELEASE_NOTES_INPUT" ]; then + NOTES="$RELEASE_NOTES_INPUT" + elif [ -n "$PR_BODY" ]; then + NOTES="$(printf '%s\n' "$PR_BODY" \ + | awk 'f && /^## /{exit} /^## Release Notes/{f=1; next} f')" + else + NOTES="$(git log -n 5 --pretty=format:'- %s')" + fi + # Fail if no notes extracted + if [ -z "$NOTES" ]; then + echo "Error: No release notes extracted" >&2 + exit 1 + fi + # Write header and notes to file { - echo "## Version 7.${{ github.run_number }} - $(date +%Y-%m-%d)" + echo "## Version 10.${{ github.run_number }} - $(date +%Y-%m-%d)" echo - printf '%s\n' "${RELEASE_NOTES:-No release notes provided.}" + printf '%s\n' "$NOTES" } > RELEASE_NOTES.md - name: 📦 Create Release diff --git a/app.config.ts b/app.config.ts index 3dd32726..4a9c9b2c 100644 --- a/app.config.ts +++ b/app.config.ts @@ -113,6 +113,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({ allowAlert: true, allowBadge: true, allowSound: true, + allowCriticalAlerts: true, }, }, sounds: [ diff --git a/docs/signalr-service-refactoring.md b/docs/signalr-service-refactoring.md new file mode 100644 index 00000000..8edad19b --- /dev/null +++ b/docs/signalr-service-refactoring.md @@ -0,0 +1,132 @@ +# SignalR Service and Map Hook Refactoring + +## Summary of Changes + +This refactoring addresses multiple issues with the SignalR service and map updates to prevent concurrent API calls, improve performance, and ensure thread safety. + +## Key Issues Addressed + +1. **Multiple concurrent calls to GetMapDataAndMarkers**: SignalR events were triggering multiple simultaneous API calls +2. **Lack of singleton enforcement**: SignalR service singleton pattern wasn't thread-safe +3. **No request cancellation**: In-flight requests weren't being cancelled when new events came in +4. **No debouncing**: Rapid consecutive SignalR events caused unnecessary API calls +5. **No connection locking**: Multiple concurrent connection attempts to the same hub were possible + +## Changes Made + +### 1. Enhanced SignalR Service (`src/services/signalr.service.ts`) + +#### Thread-Safe Singleton Pattern +- Added proper singleton instance management with race condition protection +- Added `resetInstance()` method for testing purposes +- Improved singleton creation with polling mechanism to prevent multiple instances + +#### Connection Locking +- Added `connectionLocks` Map to prevent concurrent connections to the same hub +- Added locking for `connectToHubWithEventingUrl()` and `connectToHub()` methods +- Added waiting logic for `disconnectFromHub()` and `invoke()` methods to wait for ongoing connections + +#### Improved Reconnection Logic +- Enhanced `handleConnectionClose()` with better error handling and logging +- Added proper cleanup on max reconnection attempts reached +- Improved connection state management during reconnection attempts +- Added check to prevent reconnection if connection was re-established during delay + +#### Better Error Handling +- Enhanced logging for all connection states +- Improved error context in log messages +- Added proper cleanup on connection failures + +### 2. Refactored Map Hook (`src/hooks/use-map-signalr-updates.ts`) + +#### Debouncing +- Added 1-second debounce delay to prevent rapid consecutive API calls +- Uses `setTimeout` to debounce SignalR update events + +#### Concurrency Prevention +- Added `isUpdating` ref to prevent multiple concurrent API calls +- Only one `getMapDataAndMarkers` call can be active at a time + +#### Request Cancellation +- Added `AbortController` support to cancel in-flight requests +- Previous requests are automatically cancelled when new updates come in +- Proper cleanup of abort controllers + +#### Enhanced Error Handling +- Added special handling for `AbortError` (logged as debug, not error) +- Improved error context in log messages +- Better error recovery mechanisms + +#### Proper Cleanup +- Added cleanup for debounce timers on unmount +- Added cleanup for abort controllers on unmount +- Proper cleanup in useEffect dependency arrays + +## Performance Improvements + +1. **Reduced API Calls**: Debouncing prevents excessive API calls during rapid SignalR events +2. **Request Cancellation**: Prevents unnecessary processing of outdated requests +3. **Singleton Enforcement**: Ensures only one SignalR service instance exists +4. **Connection Reuse**: Prevents duplicate connections to the same hub +5. **Better Memory Management**: Proper cleanup prevents memory leaks + +## Testing + +### New Test Coverage +- Comprehensive test suite for `useMapSignalRUpdates` hook (14 tests) +- Tests for debouncing, concurrency prevention, error handling, and cleanup +- Tests for AbortController integration +- Tests for edge cases and error scenarios + +### Enhanced SignalR Service Tests +- Added tests for singleton behavior +- Added tests for connection locking +- Enhanced existing test coverage +- Added tests for improved reconnection logic + +## Configuration + +### Debounce Timing +- Default debounce delay: 1000ms (configurable via `DEBOUNCE_DELAY` constant) +- Can be adjusted based on performance requirements + +### Reconnection Settings +- Max reconnection attempts: 5 (unchanged) +- Reconnection interval: 5000ms (unchanged) +- Enhanced with better cleanup and state management + +## Backward Compatibility + +All changes are backward compatible: +- Public API of SignalR service remains unchanged +- Map hook interface remains the same +- Existing functionality is preserved with performance improvements + +## Usage + +The refactored components work transparently with existing code: + +```typescript +// SignalR service usage remains the same +const signalRService = SignalRService.getInstance(); +await signalRService.connectToHubWithEventingUrl(config); + +// Map hook usage remains the same +useMapSignalRUpdates(onMarkersUpdate); +``` + +## Benefits + +1. **Improved Performance**: Fewer unnecessary API calls, better request management +2. **Better User Experience**: Faster map updates, reduced server load +3. **Enhanced Reliability**: Better error handling, improved connection management +4. **Memory Efficiency**: Proper cleanup prevents memory leaks +5. **Thread Safety**: Singleton pattern prevents race conditions +6. **Testability**: Comprehensive test coverage ensures reliability + +## Future Considerations + +1. **Configurable Debounce**: Could make debounce delay configurable via environment variables +2. **Request Priority**: Could implement priority system for different types of updates +3. **Caching**: Could add intelligent caching for map data +4. **Health Monitoring**: Could add connection health monitoring and reporting diff --git a/expo-env.d.ts b/expo-env.d.ts index 5411fdde..bf3c1693 100644 --- a/expo-env.d.ts +++ b/expo-env.d.ts @@ -1,3 +1,3 @@ /// -// NOTE: This file should not be edited and should be in your git ignore \ No newline at end of file +// NOTE: This file should not be edited and should be in your git ignore diff --git a/package.json b/package.json index 403d7192..6631ae7f 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "build:production:android": "cross-env APP_ENV=production EXPO_NO_DOTENV=1 eas build --profile production --platform android ", "build:internal:ios": "cross-env APP_ENV=internal EXPO_NO_DOTENV=1 eas build --profile internal --platform ios", "build:internal:android": "cross-env APP_ENV=internal EXPO_NO_DOTENV=1 eas build --profile internal --platform android", + "postinstall": "patch-package", "app-release": "cross-env SKIP_BRANCH_PROTECTION=true np --no-publish --no-cleanup --no-release-draft", "lint": "eslint . --ext .js,.jsx,.ts,.tsx", "type-check": "tsc --noemit", @@ -91,7 +92,7 @@ "@notifee/react-native": "^9.1.8", "@novu/react-native": "~2.6.6", "@react-native-community/netinfo": "^11.4.1", - "@rnmapbox/maps": "10.1.38", + "@rnmapbox/maps": "10.1.42-rc.0", "@semantic-release/git": "^10.0.1", "@sentry/react-native": "~6.10.0", "@shopify/flash-list": "1.7.3", @@ -142,23 +143,23 @@ "react-error-boundary": "~4.0.13", "react-hook-form": "~7.53.0", "react-i18next": "~15.0.1", - "react-native": "0.76.9", + "react-native": "0.77.3", "react-native-base64": "~0.2.1", "react-native-ble-manager": "^12.1.5", "react-native-callkeep": "github:Irfanwani/react-native-callkeep#957193d0716f1c2dfdc18e627cbff0f8a0800971", "react-native-edge-to-edge": "~1.1.2", "react-native-flash-message": "~0.4.2", - "react-native-gesture-handler": "~2.20.2", + "react-native-gesture-handler": "~2.22.0", "react-native-keyboard-controller": "~1.15.2", "react-native-logs": "~5.3.0", "react-native-mmkv": "~3.1.0", - "react-native-reanimated": "~3.16.1", + "react-native-reanimated": "~3.16.7", "react-native-restart": "0.0.27", - "react-native-safe-area-context": "4.12.0", - "react-native-screens": "~4.4.0", + "react-native-safe-area-context": "~5.1.0", + "react-native-screens": "~4.8.0", "react-native-svg": "~15.8.0", "react-native-web": "~0.19.13", - "react-native-webview": "13.12.5", + "react-native-webview": "~13.13.1", "react-query-kit": "~3.3.0", "tailwind-variants": "~0.2.1", "zod": "~3.23.8", @@ -201,6 +202,8 @@ "jest-junit": "~16.0.0", "lint-staged": "~15.2.9", "np": "~10.0.7", + "patch-package": "^8.0.0", + "postinstall-postinstall": "^2.1.0", "prettier": "~3.3.3", "react-native-svg-transformer": "~1.5.1", "tailwindcss": "3.4.4", @@ -225,7 +228,13 @@ }, "install": { "exclude": [ - "eslint-config-expo" + "eslint-config-expo", + "react-native@~0.76.6", + "react-native-reanimated@~3.16.1", + "react-native-gesture-handler@~2.20.0", + "react-native-screens@~4.4.0", + "react-native-safe-area-context@~4.12.0", + "react-native-webview@~13.12.5" ] } }, diff --git a/src/components/audio-stream/audio-stream-bottom-sheet.tsx b/src/components/audio-stream/audio-stream-bottom-sheet.tsx index 5dc865a3..2b3934e6 100644 --- a/src/components/audio-stream/audio-stream-bottom-sheet.tsx +++ b/src/components/audio-stream/audio-stream-bottom-sheet.tsx @@ -4,7 +4,6 @@ import React, { useEffect } from 'react'; import { useTranslation } from 'react-i18next'; import { Text } from '@/components/ui/text'; -import { useAnalytics } from '@/hooks/use-analytics'; import { useAudioStreamStore } from '@/stores/app/audio-stream-store'; import { Actionsheet, ActionsheetBackdrop, ActionsheetContent, ActionsheetDragIndicator, ActionsheetDragIndicatorWrapper } from '../ui/actionsheet'; @@ -16,7 +15,6 @@ import { VStack } from '../ui/vstack'; export const AudioStreamBottomSheet = () => { const { t } = useTranslation(); const { colorScheme } = useColorScheme(); - const { trackEvent } = useAnalytics(); const { isBottomSheetVisible, setIsBottomSheetVisible, availableStreams, currentStream, isLoadingStreams, isPlaying, isLoading, isBuffering, fetchAvailableStreams, playStream, stopStream } = useAudioStreamStore(); @@ -27,18 +25,6 @@ export const AudioStreamBottomSheet = () => { } }, [isBottomSheetVisible, availableStreams.length, fetchAvailableStreams]); - // Track when audio stream bottom sheet is opened/rendered - useEffect(() => { - if (isBottomSheetVisible) { - trackEvent('audio_stream_bottom_sheet_opened', { - availableStreamsCount: availableStreams.length, - hasCurrentStream: !!currentStream, - isCurrentlyPlaying: isPlaying, - currentStreamType: currentStream?.Type || 'none', - }); - } - }, [isBottomSheetVisible, trackEvent, availableStreams.length, currentStream, isPlaying]); - const handleStreamSelection = React.useCallback( async (streamId: string) => { try { diff --git a/src/components/bluetooth/bluetooth-audio-modal.tsx b/src/components/bluetooth/bluetooth-audio-modal.tsx index aea261a7..229b7b60 100644 --- a/src/components/bluetooth/bluetooth-audio-modal.tsx +++ b/src/components/bluetooth/bluetooth-audio-modal.tsx @@ -1,6 +1,5 @@ import { AlertTriangle, Bluetooth, BluetoothConnected, CheckCircle, Mic, MicOff, RefreshCw, Signal, Wifi } from 'lucide-react-native'; -import React, { useCallback, useEffect, useState } from 'react'; -import { useTranslation } from 'react-i18next'; +import React, { useEffect, useState } from 'react'; import { ScrollView } from 'react-native'; import { Actionsheet, ActionsheetBackdrop, ActionsheetContent, ActionsheetDragIndicator, ActionsheetDragIndicatorWrapper } from '@/components/ui/actionsheet'; @@ -13,8 +12,6 @@ import { HStack } from '@/components/ui/hstack'; import { Spinner } from '@/components/ui/spinner'; import { Text } from '@/components/ui/text'; import { VStack } from '@/components/ui/vstack'; -import { useAnalytics } from '@/hooks/use-analytics'; -import { logger } from '@/lib/logging'; import { bluetoothAudioService } from '@/services/bluetooth-audio.service'; import { type BluetoothAudioDevice, State, useBluetoothAudioStore } from '@/stores/app/bluetooth-audio-store'; import { useLiveKitStore } from '@/stores/app/livekit-store'; @@ -25,111 +22,61 @@ interface BluetoothAudioModalProps { } const BluetoothAudioModal: React.FC = ({ isOpen, onClose }) => { - const { t } = useTranslation(); const { bluetoothState, isScanning, isConnecting, availableDevices, connectedDevice, connectionError, isAudioRoutingActive, buttonEvents, lastButtonAction } = useBluetoothAudioStore(); const { isConnected: isLiveKitConnected, currentRoom } = useLiveKitStore(); - const { trackEvent } = useAnalytics(); const [isMicMuted, setIsMicMuted] = useState(false); - const [hasScanned, setHasScanned] = useState(false); - const handleStartScan = useCallback(async () => { + const handleStartScan = React.useCallback(async () => { try { - setHasScanned(true); await bluetoothAudioService.startScanning(15000); // 15 second scan } catch (error) { - logger.error({ - message: 'Failed to start Bluetooth scan', - context: { error }, - }); - setHasScanned(false); // Reset on error to allow retry + console.error('Failed to start Bluetooth scan:', error); } }, []); - const handleStopScan = useCallback(() => { + useEffect(() => { + // Update mic state from LiveKit + if (currentRoom?.localParticipant) { + setIsMicMuted(!currentRoom.localParticipant.isMicrophoneEnabled); + } + }, [currentRoom?.localParticipant, currentRoom?.localParticipant?.isMicrophoneEnabled]); + + useEffect(() => { + // Auto-start scanning when modal opens and Bluetooth is ready + if (isOpen && bluetoothState === State.PoweredOn && !isScanning && !connectedDevice) { + handleStartScan().catch((error) => { + console.error('Failed to start scan:', error); + }); + } + }, [isOpen, bluetoothState, isScanning, connectedDevice, handleStartScan]); + + const handleStopScan = React.useCallback(() => { bluetoothAudioService.stopScanning(); }, []); - const handleConnectDevice = useCallback( + const handleConnectDevice = React.useCallback( async (device: BluetoothAudioDevice) => { if (isConnecting) return; try { await bluetoothAudioService.connectToDevice(device.id); - - // Auto-connect functionality: Set as preferred device - const { setPreferredDevice } = useBluetoothAudioStore.getState(); - setPreferredDevice({ id: device.id, name: device.name || 'Unknown Device' }); - - // Store preference - const { setItem } = require('@/lib/storage'); - setItem('preferredBluetoothDevice', { id: device.id, name: device.name || 'Unknown Device' }); - - logger.info({ - message: 'Device connected and set as preferred', - context: { deviceId: device.id, deviceName: device.name }, - }); } catch (error) { - logger.warn({ - message: 'Failed to connect or set device as preferred', - context: { error }, - }); + console.error('Failed to connect to device:', error); } }, [isConnecting] ); - const handleDisconnectDevice = useCallback(async () => { + const handleDisconnectDevice = React.useCallback(async () => { try { await bluetoothAudioService.disconnectDevice(); } catch (error) { - logger.error({ - message: 'Failed to disconnect device', - context: { error }, - }); + console.error('Failed to disconnect device:', error); } }, []); - useEffect(() => { - // Update mic state from LiveKit - if (currentRoom?.localParticipant) { - setIsMicMuted(!currentRoom.localParticipant.isMicrophoneEnabled); - } - }, [currentRoom?.localParticipant, currentRoom?.localParticipant?.isMicrophoneEnabled]); - - useEffect(() => { - // Auto-start scanning when modal opens and Bluetooth is ready - if (isOpen && bluetoothState === State.PoweredOn && !isScanning && !connectedDevice) { - handleStartScan().catch((error) => { - console.error('Failed to start scan:', error); - }); - } - }, [isOpen, bluetoothState, isScanning, connectedDevice, handleStartScan]); - - // Track when Bluetooth audio modal is opened/rendered - useEffect(() => { - if (isOpen) { - trackEvent('bluetooth_audio_modal_opened', { - bluetoothState, - isConnecting, - availableDevicesCount: availableDevices.length, - hasConnectedDevice: !!connectedDevice, - isLiveKitConnected, - isAudioRoutingActive, - hasConnectionError: !!connectionError, - recentButtonEventsCount: buttonEvents.length, - }); - } - }, [isOpen, trackEvent, bluetoothState, isConnecting, availableDevices.length, connectedDevice, isLiveKitConnected, isAudioRoutingActive, connectionError, buttonEvents.length]); - - // Enhanced cleanup when dialog closes - useEffect(() => { - if (!isOpen && isScanning) { - handleStopScan(); - } - }, [isOpen, isScanning, handleStopScan]); - - const handleToggleMicrophone = useCallback(async () => { + const handleToggleMicrophone = React.useCallback(async () => { if (!currentRoom?.localParticipant) return; try { @@ -137,10 +84,7 @@ const BluetoothAudioModal: React.FC = ({ isOpen, onClo await currentRoom.localParticipant.setMicrophoneEnabled(!newMuteState); setIsMicMuted(newMuteState); } catch (error) { - logger.error({ - message: 'Failed to toggle microphone', - context: { error }, - }); + console.error('Failed to toggle microphone:', error); } }, [currentRoom?.localParticipant, isMicMuted]); @@ -150,14 +94,14 @@ const BluetoothAudioModal: React.FC = ({ isOpen, onClo return ( - {t('bluetooth.poweredOff')} + Bluetooth is turned off. Please enable Bluetooth to connect audio devices. ); case State.Unauthorized: return ( - {t('bluetooth.unauthorized')} + Bluetooth permission denied. Please grant Bluetooth permissions in Settings. ); case State.PoweredOn: @@ -166,7 +110,7 @@ const BluetoothAudioModal: React.FC = ({ isOpen, onClo return ( - {t('bluetooth.checking')} + Checking Bluetooth status... ); } @@ -180,7 +124,7 @@ const BluetoothAudioModal: React.FC = ({ isOpen, onClo - {t('bluetooth.connectionError')} + Connection Error {connectionError} @@ -197,16 +141,16 @@ const BluetoothAudioModal: React.FC = ({ isOpen, onClo - {connectedDevice.name || t('bluetooth.unknownDevice')} + {connectedDevice.name || 'Unknown Device'} - {t('bluetooth.connected')} + Connected {isAudioRoutingActive ? ( - {t('bluetooth.audioActive')} + Audio Active ) : null} - {connectedDevice.supportsMicrophoneControl ? {t('bluetooth.buttonControlAvailable')} : null} + {connectedDevice.supportsMicrophoneControl ? Button control available : null} @@ -214,12 +158,12 @@ const BluetoothAudioModal: React.FC = ({ isOpen, onClo {isLiveKitConnected ? ( ) : null} @@ -235,29 +179,29 @@ const BluetoothAudioModal: React.FC = ({ isOpen, onClo return ( - {t('bluetooth.recentButtonEvents')} + Recent Button Events {recentEvents.map((event, index) => ( {new Date(event.timestamp).toLocaleTimeString()} - {event.type === 'long_press' ? t('bluetooth.longPress') : event.type === 'double_press' ? t('bluetooth.doublePress') : ''} + {event.type === 'long_press' ? 'Long ' : event.type === 'double_press' ? 'Double ' : ''} {event.button === 'ptt_start' - ? t('bluetooth.pttStart') + ? 'PTT Start' : event.button === 'ptt_stop' - ? t('bluetooth.pttStop') + ? 'PTT Stop' : event.button === 'mute' - ? t('bluetooth.mute') + ? 'Mute' : event.button === 'volume_up' - ? t('bluetooth.volumeUp') + ? 'Volume +' : event.button === 'volume_down' - ? t('bluetooth.volumeDown') - : t('bluetooth.unknown')} + ? 'Volume -' + : 'Unknown'} {lastButtonAction && lastButtonAction.timestamp === event.timestamp ? ( - {t('bluetooth.applied')} + Applied ) : null} @@ -272,10 +216,10 @@ const BluetoothAudioModal: React.FC = ({ isOpen, onClo return ( - {hasScanned ? t('bluetooth.noDevicesFoundRetry') : t('bluetooth.noDevicesFound')} + No audio devices found ); @@ -284,17 +228,17 @@ const BluetoothAudioModal: React.FC = ({ isOpen, onClo return ( - {t('bluetooth.availableDevices')} + Available Devices @@ -308,7 +252,7 @@ const BluetoothAudioModal: React.FC = ({ isOpen, onClo - {device.name || t('bluetooth.unknownDevice')} + {device.name || 'Unknown Device'} {device.rssi ? ( <> @@ -318,12 +262,12 @@ const BluetoothAudioModal: React.FC = ({ isOpen, onClo ) : null} {device.hasAudioCapability ? ( - {t('bluetooth.audio')} + Audio ) : null} {device.supportsMicrophoneControl ? ( - {t('bluetooth.micControl')} + Mic Control ) : null} @@ -332,12 +276,12 @@ const BluetoothAudioModal: React.FC = ({ isOpen, onClo {!device.isConnected ? ( ) : ( - {t('bluetooth.connected')} + Connected )} @@ -361,11 +305,11 @@ const BluetoothAudioModal: React.FC = ({ isOpen, onClo - {t('bluetooth.title')} + Bluetooth Audio {connectedDevice && isLiveKitConnected ? ( - {t('bluetooth.liveKitActive')} + LiveKit Active ) : null} diff --git a/src/components/settings/__tests__/server-url-bottom-sheet-simple.test.tsx b/src/components/settings/__tests__/server-url-bottom-sheet-simple.test.tsx index 5d8003cd..b9eccd4d 100644 --- a/src/components/settings/__tests__/server-url-bottom-sheet-simple.test.tsx +++ b/src/components/settings/__tests__/server-url-bottom-sheet-simple.test.tsx @@ -12,22 +12,12 @@ jest.mock('nativewind', () => ({ useColorScheme: () => ({ colorScheme: 'light' }), })); -// Mock React Native APIs with isolated mocking -jest.mock('react-native/Libraries/Settings/Settings.ios', () => ({})); -jest.mock('react-native/Libraries/Settings/NativeSettingsManager', () => ({ - getConstants: () => ({}), - get: jest.fn(), - set: jest.fn(), -})); - -// Partial mock of React Native - preserve all original exports and only override Platform.OS -jest.mock('react-native', () => ({ - ...jest.requireActual('react-native'), - Platform: { - ...jest.requireActual('react-native').Platform, - OS: 'ios', - }, -})); +// Mock ScrollView specifically to avoid TurboModuleRegistry issues +jest.mock('react-native/Libraries/Components/ScrollView/ScrollView', () => { + const React = require('react'); + const { View } = require('react-native'); + return ({ children, ...props }: any) => React.createElement(View, props, children); +}); jest.mock('react-hook-form', () => ({ useForm: () => ({ diff --git a/src/components/settings/__tests__/unit-selection-bottom-sheet-simple.test.tsx b/src/components/settings/__tests__/unit-selection-bottom-sheet-simple.test.tsx new file mode 100644 index 00000000..3e0d25d4 --- /dev/null +++ b/src/components/settings/__tests__/unit-selection-bottom-sheet-simple.test.tsx @@ -0,0 +1,461 @@ +// Mock Platform first, before any other imports +jest.mock('react-native/Libraries/Utilities/Platform', () => ({ + OS: 'ios', + select: jest.fn().mockImplementation((obj) => obj.ios || obj.default), +})); + +// Mock ScrollView without mocking all of react-native +jest.mock('react-native/Libraries/Components/ScrollView/ScrollView', () => { + const React = require('react'); + return React.forwardRef(({ children, testID, ...props }: any, ref: any) => { + return React.createElement('View', { testID: testID || 'scroll-view', ref, ...props }, children); + }); +}); + +// Mock react-native-svg before anything else +jest.mock('react-native-svg', () => ({ + Svg: 'Svg', + Circle: 'Circle', + Ellipse: 'Ellipse', + G: 'G', + Text: 'Text', + TSpan: 'TSpan', + TextPath: 'TextPath', + Path: 'Path', + Polygon: 'Polygon', + Polyline: 'Polyline', + Line: 'Line', + Rect: 'Rect', + Use: 'Use', + Image: 'Image', + Symbol: 'Symbol', + Defs: 'Defs', + LinearGradient: 'LinearGradient', + RadialGradient: 'RadialGradient', + Stop: 'Stop', + ClipPath: 'ClipPath', + Pattern: 'Pattern', + Mask: 'Mask', + default: 'Svg', +})); + +// Mock @expo/html-elements +jest.mock('@expo/html-elements', () => ({ + H1: 'H1', + H2: 'H2', + H3: 'H3', + H4: 'H4', + H5: 'H5', + H6: 'H6', +})); + +import { render, screen, fireEvent, waitFor } from '@testing-library/react-native'; +import React from 'react'; + +import { type UnitResultData } from '@/models/v4/units/unitResultData'; +import { useCoreStore } from '@/stores/app/core-store'; +import { useRolesStore } from '@/stores/roles/store'; +import { useUnitsStore } from '@/stores/units/store'; + +import { UnitSelectionBottomSheet } from '../unit-selection-bottom-sheet'; + +// Mock stores +jest.mock('@/stores/app/core-store', () => ({ + useCoreStore: jest.fn(), +})); + +jest.mock('@/stores/roles/store', () => ({ + useRolesStore: { + getState: jest.fn(() => ({ + fetchRolesForUnit: jest.fn(), + })), + }, +})); + +jest.mock('@/stores/units/store', () => ({ + useUnitsStore: jest.fn(), +})); + +jest.mock('react-i18next', () => ({ + useTranslation: () => ({ + t: (key: string) => key, + }), +})); + +// Mock lucide icons to avoid SVG issues in tests +jest.mock('lucide-react-native', () => ({ + Check: 'Check', +})); + +// Mock gluestack UI components with simple implementations +jest.mock('@/components/ui/actionsheet', () => ({ + Actionsheet: ({ children, isOpen }: any) => (isOpen ? children : null), + ActionsheetBackdrop: ({ children }: any) => children || null, + ActionsheetContent: ({ children }: any) => children, + ActionsheetDragIndicator: () => null, + ActionsheetDragIndicatorWrapper: ({ children }: any) => children, + ActionsheetItem: ({ children, onPress, disabled }: any) => { + const React = require('react'); + const handlePress = disabled ? undefined : onPress; + return React.createElement( + 'TouchableOpacity', + { onPress: handlePress, testID: 'actionsheet-item', disabled }, + children + ); + }, + ActionsheetItemText: ({ children }: any) => { + const React = require('react'); + return React.createElement('Text', { testID: 'actionsheet-item-text' }, children); + }, +})); + +jest.mock('@/components/ui/box', () => ({ + Box: ({ children }: any) => { + const React = require('react'); + return React.createElement('View', { testID: 'box' }, children); + }, +})); + +jest.mock('@/components/ui/vstack', () => ({ + VStack: ({ children }: any) => { + const React = require('react'); + return React.createElement('View', { testID: 'vstack' }, children); + }, +})); + +jest.mock('@/components/ui/hstack', () => ({ + HStack: ({ children }: any) => { + const React = require('react'); + return React.createElement('View', { testID: 'hstack' }, children); + }, +})); + +jest.mock('@/components/ui/text', () => ({ + Text: ({ children }: any) => { + const React = require('react'); + return React.createElement('Text', { testID: 'text' }, children); + }, +})); + +jest.mock('@/components/ui/heading', () => ({ + Heading: ({ children }: any) => { + const React = require('react'); + return React.createElement('Text', { testID: 'heading' }, children); + }, +})); + +jest.mock('@/components/ui/button', () => ({ + Button: ({ children, onPress, disabled }: any) => { + const React = require('react'); + const handlePress = disabled ? undefined : onPress; + return React.createElement( + 'TouchableOpacity', + { onPress: handlePress, testID: 'button', disabled }, + children + ); + }, + ButtonText: ({ children }: any) => { + const React = require('react'); + return React.createElement('Text', { testID: 'button-text' }, children); + }, +})); + +jest.mock('@/components/ui/center', () => ({ + Center: ({ children }: any) => { + const React = require('react'); + return React.createElement('View', { testID: 'center' }, children); + }, +})); + +jest.mock('@/components/ui/spinner', () => ({ + Spinner: () => { + const React = require('react'); + return React.createElement('Text', { testID: 'spinner' }, 'Loading...'); + }, +})); + +const mockUseCoreStore = useCoreStore as jest.MockedFunction; +const mockUseUnitsStore = useUnitsStore as jest.MockedFunction; + +describe('UnitSelectionBottomSheet', () => { + const mockProps = { + isOpen: true, + onClose: jest.fn(), + }; + + const mockUnits: UnitResultData[] = [ + { + UnitId: '1', + Name: 'Engine 1', + Type: 'Engine', + DepartmentId: '1', + TypeId: 1, + CustomStatusSetId: '', + GroupId: '1', + GroupName: 'Station 1', + Vin: '', + PlateNumber: '', + FourWheelDrive: false, + SpecialPermit: false, + CurrentDestinationId: '', + CurrentStatusId: '', + CurrentStatusTimestamp: '', + Latitude: '', + Longitude: '', + Note: '', + } as UnitResultData, + { + UnitId: '2', + Name: 'Ladder 1', + Type: 'Ladder', + DepartmentId: '1', + TypeId: 2, + CustomStatusSetId: '', + GroupId: '1', + GroupName: 'Station 1', + Vin: '', + PlateNumber: '', + FourWheelDrive: false, + SpecialPermit: false, + CurrentDestinationId: '', + CurrentStatusId: '', + CurrentStatusTimestamp: '', + Latitude: '', + Longitude: '', + Note: '', + } as UnitResultData, + ]; + + const mockSetActiveUnit = jest.fn().mockResolvedValue(undefined); + const mockFetchUnits = jest.fn().mockResolvedValue(undefined); + const mockFetchRolesForUnit = jest.fn().mockResolvedValue(undefined); + + beforeEach(() => { + jest.clearAllMocks(); + + mockUseCoreStore.mockReturnValue({ + activeUnit: mockUnits[0], + setActiveUnit: mockSetActiveUnit, + } as any); + + mockUseUnitsStore.mockReturnValue({ + units: mockUnits, + fetchUnits: mockFetchUnits, + isLoading: false, + } as any); + + // Mock the roles store + (useRolesStore.getState as jest.Mock).mockReturnValue({ + fetchRolesForUnit: mockFetchRolesForUnit, + }); + }); + + it('renders correctly when open', () => { + render(); + + expect(screen.getByText('settings.select_unit')).toBeTruthy(); + expect(screen.getByText('settings.current_unit')).toBeTruthy(); + expect(screen.getAllByText('Engine 1')).toHaveLength(2); // One in current selection, one in list + expect(screen.getByText('Ladder 1')).toBeTruthy(); + }); + + it('does not render when closed', () => { + render(); + + expect(screen.queryByText('settings.select_unit')).toBeNull(); + }); + + it('displays loading state when fetching units', () => { + mockUseUnitsStore.mockReturnValue({ + units: [], + fetchUnits: jest.fn().mockResolvedValue(undefined), + isLoading: true, + } as any); + + render(); + + expect(screen.getByTestId('spinner')).toBeTruthy(); + expect(screen.getByText('Loading...')).toBeTruthy(); + }); + + it('displays empty state when no units available', () => { + mockUseUnitsStore.mockReturnValue({ + units: [], + fetchUnits: jest.fn().mockResolvedValue(undefined), + isLoading: false, + } as any); + + render(); + + expect(screen.getByText('settings.no_units_available')).toBeTruthy(); + }); + + it('fetches units when sheet opens and no units are loaded', async () => { + const spyFetchUnits = jest.fn().mockResolvedValue(undefined); + + mockUseUnitsStore.mockReturnValue({ + units: [], + fetchUnits: spyFetchUnits, + isLoading: false, + } as any); + + render(); + + await waitFor(() => { + expect(spyFetchUnits).toHaveBeenCalled(); + }); + }); + + it('does not fetch units when sheet opens and units are already loaded', () => { + render(); + + expect(mockFetchUnits).not.toHaveBeenCalled(); + }); + + it('handles unit selection successfully', async () => { + mockSetActiveUnit.mockResolvedValue(undefined); + mockFetchRolesForUnit.mockResolvedValue(undefined); + + render(); + + // Find the second unit (Ladder 1) and select it + const ladderUnit = screen.getByText('Ladder 1'); + fireEvent.press(ladderUnit); + + await waitFor(() => { + expect(mockSetActiveUnit).toHaveBeenCalledWith('2'); + }); + + await waitFor(() => { + expect(mockFetchRolesForUnit).toHaveBeenCalledWith('2'); + }); + + expect(mockProps.onClose).toHaveBeenCalled(); + }); + + it('handles unit selection failure gracefully', async () => { + const error = new Error('Failed to set active unit'); + mockSetActiveUnit.mockRejectedValue(error); + + render(); + + // Find the second unit (Ladder 1) and select it + const ladderUnit = screen.getByText('Ladder 1'); + fireEvent.press(ladderUnit); + + await waitFor(() => { + expect(mockSetActiveUnit).toHaveBeenCalledWith('2'); + }); + + // Should not call fetchRolesForUnit if setActiveUnit fails + expect(mockFetchRolesForUnit).not.toHaveBeenCalled(); + // Should not close the modal on error + expect(mockProps.onClose).not.toHaveBeenCalled(); + }); + + it('closes when cancel button is pressed', () => { + render(); + + const cancelButton = screen.getByText('common.cancel'); + fireEvent.press(cancelButton); + + expect(mockProps.onClose).toHaveBeenCalled(); + }); + + it('shows selected unit with check mark and proper styling', () => { + render(); + + // Engine 1 should be marked as selected since it's the active unit + expect(screen.getAllByText('Engine 1')).toHaveLength(2); + expect(screen.getByText('Ladder 1')).toBeTruthy(); + }); + + it('renders units with correct type information', () => { + render(); + + expect(screen.getByText('Engine')).toBeTruthy(); + expect(screen.getByText('Ladder')).toBeTruthy(); + }); + + it('handles fetch units error gracefully', async () => { + const consoleError = jest.spyOn(console, 'error').mockImplementation(() => { }); + const errorFetchUnits = jest.fn().mockRejectedValue(new Error('Network error')); + + mockUseUnitsStore.mockReturnValue({ + units: [], + fetchUnits: errorFetchUnits, + isLoading: false, + } as any); + + render(); + + await waitFor(() => { + expect(errorFetchUnits).toHaveBeenCalled(); + }); + + // Component should still render normally even if fetch fails + expect(screen.getByText('settings.select_unit')).toBeTruthy(); + + consoleError.mockRestore(); + }); + + describe('Accessibility', () => { + it('provides proper test IDs for testing', () => { + render(); + + expect(screen.getByTestId('scroll-view')).toBeTruthy(); + }); + }); + + describe('Edge Cases', () => { + it('handles missing active unit gracefully', () => { + mockUseCoreStore.mockReturnValue({ + activeUnit: null, + setActiveUnit: mockSetActiveUnit, + } as any); + + render(); + + // Should not show current unit section + expect(screen.queryByText('settings.current_unit')).toBeNull(); + // Should still show unit list + expect(screen.getByText('Engine 1')).toBeTruthy(); + }); + + it('handles units with missing names gracefully', () => { + const unitsWithMissingNames = [ + { + UnitId: '1', + Name: '', + Type: 'Engine', + DepartmentId: '1', + TypeId: 1, + CustomStatusSetId: '', + GroupId: '1', + GroupName: 'Station 1', + Vin: '', + PlateNumber: '', + FourWheelDrive: false, + SpecialPermit: false, + CurrentDestinationId: '', + CurrentStatusId: '', + CurrentStatusTimestamp: '', + Latitude: '', + Longitude: '', + Note: '', + } as UnitResultData, + ]; + + mockUseUnitsStore.mockReturnValue({ + units: unitsWithMissingNames, + fetchUnits: mockFetchUnits, + isLoading: false, + } as any); + + render(); + + // Should still render the unit even with empty name + expect(screen.getByText('Engine')).toBeTruthy(); + }); + }); +}); diff --git a/src/components/settings/__tests__/unit-selection-bottom-sheet.test.tsx b/src/components/settings/__tests__/unit-selection-bottom-sheet.test.tsx new file mode 100644 index 00000000..8914470c --- /dev/null +++ b/src/components/settings/__tests__/unit-selection-bottom-sheet.test.tsx @@ -0,0 +1,592 @@ +// Mock Platform first, before any other imports +jest.mock('react-native/Libraries/Utilities/Platform', () => ({ + OS: 'ios', + select: jest.fn().mockImplementation((obj) => obj.ios || obj.default), +})); + +// Mock ScrollView without mocking all of react-native +jest.mock('react-native/Libraries/Components/ScrollView/ScrollView', () => { + const React = require('react'); + return React.forwardRef(({ children, testID, ...props }: any, ref: any) => { + return React.createElement('View', { testID: testID || 'scroll-view', ref, ...props }, children); + }); +}); + +// Mock react-native-svg before anything else +jest.mock('react-native-svg', () => ({ + Svg: 'Svg', + Circle: 'Circle', + Ellipse: 'Ellipse', + G: 'G', + Text: 'Text', + TSpan: 'TSpan', + TextPath: 'TextPath', + Path: 'Path', + Polygon: 'Polygon', + Polyline: 'Polyline', + Line: 'Line', + Rect: 'Rect', + Use: 'Use', + Image: 'Image', + Symbol: 'Symbol', + Defs: 'Defs', + LinearGradient: 'LinearGradient', + RadialGradient: 'RadialGradient', + Stop: 'Stop', + ClipPath: 'ClipPath', + Pattern: 'Pattern', + Mask: 'Mask', + default: 'Svg', +})); + +// Mock @expo/html-elements +jest.mock('@expo/html-elements', () => ({ + H1: 'H1', + H2: 'H2', + H3: 'H3', + H4: 'H4', + H5: 'H5', + H6: 'H6', +})); + +import { render, screen, fireEvent, waitFor } from '@testing-library/react-native'; +import React from 'react'; + +import { type UnitResultData } from '@/models/v4/units/unitResultData'; +import { useCoreStore } from '@/stores/app/core-store'; +import { useRolesStore } from '@/stores/roles/store'; +import { useUnitsStore } from '@/stores/units/store'; + +import { UnitSelectionBottomSheet } from '../unit-selection-bottom-sheet'; + +// Mock stores +jest.mock('@/stores/app/core-store', () => ({ + useCoreStore: jest.fn(), +})); + +jest.mock('@/stores/roles/store', () => ({ + useRolesStore: { + getState: jest.fn(() => ({ + fetchRolesForUnit: jest.fn(), + })), + }, +})); + +jest.mock('@/stores/units/store', () => ({ + useUnitsStore: jest.fn(), +})); + +jest.mock('react-i18next', () => ({ + useTranslation: () => ({ + t: (key: string) => key, + }), +})); + +// Mock lucide icons to avoid SVG issues in tests +jest.mock('lucide-react-native', () => ({ + Check: 'Check', +})); + +// Mock gluestack UI components +jest.mock('@/components/ui/actionsheet', () => ({ + Actionsheet: ({ children, isOpen }: any) => (isOpen ? children : null), + ActionsheetBackdrop: ({ children }: any) => children || null, + ActionsheetContent: ({ children }: any) => children, + ActionsheetDragIndicator: () => null, + ActionsheetDragIndicatorWrapper: ({ children }: any) => children, + ActionsheetItem: ({ children, onPress, disabled, ...props }: any) => { + const React = require('react'); + return React.createElement( + 'View', + { + onPress: disabled ? undefined : onPress, + testID: props.testID || 'actionsheet-item', + accessibilityState: { disabled }, + }, + children + ); + }, + ActionsheetItemText: ({ children, ...props }: any) => { + const React = require('react'); + return React.createElement('Text', { testID: props.testID || 'actionsheet-item-text' }, children); + }, +})); + +jest.mock('@/components/ui/spinner', () => ({ + Spinner: (props: any) => { + const React = require('react'); + return React.createElement('Text', { testID: 'spinner' }, 'Loading...'); + }, +})); + +jest.mock('@/components/ui/box', () => ({ + Box: ({ children, ...props }: any) => { + const React = require('react'); + return React.createElement('View', { testID: props.testID || 'box' }, children); + }, +})); + +jest.mock('@/components/ui/vstack', () => ({ + VStack: ({ children, ...props }: any) => { + const React = require('react'); + return React.createElement('View', { testID: props.testID || 'vstack' }, children); + }, +})); + +jest.mock('@/components/ui/hstack', () => ({ + HStack: ({ children, ...props }: any) => { + const React = require('react'); + return React.createElement('View', { testID: props.testID || 'hstack' }, children); + }, +})); + +jest.mock('@/components/ui/text', () => ({ + Text: ({ children, ...props }: any) => { + const React = require('react'); + return React.createElement('Text', { testID: props.testID || 'text' }, children); + }, +})); + +jest.mock('@/components/ui/heading', () => ({ + Heading: ({ children, ...props }: any) => { + const React = require('react'); + return React.createElement('Text', { testID: props.testID || 'heading' }, children); + }, +})); + +jest.mock('@/components/ui/button', () => ({ + Button: ({ children, onPress, disabled, ...props }: any) => { + const React = require('react'); + return React.createElement( + 'View', + { + onPress: disabled ? undefined : onPress, + testID: props.testID || 'button', + accessibilityState: { disabled }, + }, + children + ); + }, + ButtonText: ({ children, ...props }: any) => { + const React = require('react'); + return React.createElement('Text', { testID: props.testID || 'button-text' }, children); + }, +})); + +jest.mock('@/components/ui/center', () => ({ + Center: ({ children, ...props }: any) => { + const React = require('react'); + return React.createElement('View', { testID: props.testID || 'center' }, children); + }, +})); + +const mockUseCoreStore = useCoreStore as jest.MockedFunction; +const mockUseUnitsStore = useUnitsStore as jest.MockedFunction; + +describe('UnitSelectionBottomSheet', () => { + const mockProps = { + isOpen: true, + onClose: jest.fn(), + }; + + const mockUnits: UnitResultData[] = [ + { + UnitId: '1', + Name: 'Engine 1', + Type: 'Engine', + DepartmentId: '1', + TypeId: 1, + CustomStatusSetId: '', + GroupId: '1', + GroupName: 'Station 1', + Vin: '', + PlateNumber: '', + FourWheelDrive: false, + SpecialPermit: false, + CurrentDestinationId: '', + CurrentStatusId: '', + CurrentStatusTimestamp: '', + Latitude: '', + Longitude: '', + Note: '', + } as UnitResultData, + { + UnitId: '2', + Name: 'Ladder 1', + Type: 'Ladder', + DepartmentId: '1', + TypeId: 2, + CustomStatusSetId: '', + GroupId: '1', + GroupName: 'Station 1', + Vin: '', + PlateNumber: '', + FourWheelDrive: false, + SpecialPermit: false, + CurrentDestinationId: '', + CurrentStatusId: '', + CurrentStatusTimestamp: '', + Latitude: '', + Longitude: '', + Note: '', + } as UnitResultData, + { + UnitId: '3', + Name: 'Rescue 1', + Type: 'Rescue', + DepartmentId: '1', + TypeId: 3, + CustomStatusSetId: '', + GroupId: '2', + GroupName: 'Station 2', + Vin: '', + PlateNumber: '', + FourWheelDrive: false, + SpecialPermit: false, + CurrentDestinationId: '', + CurrentStatusId: '', + CurrentStatusTimestamp: '', + Latitude: '', + Longitude: '', + Note: '', + } as UnitResultData, + ]; + + const mockSetActiveUnit = jest.fn().mockResolvedValue(undefined); + const mockFetchUnits = jest.fn().mockResolvedValue(undefined); + const mockFetchRolesForUnit = jest.fn().mockResolvedValue(undefined); + + beforeEach(() => { + jest.clearAllMocks(); + + mockUseCoreStore.mockReturnValue({ + activeUnit: mockUnits[0], + setActiveUnit: mockSetActiveUnit, + } as any); + + mockUseUnitsStore.mockReturnValue({ + units: mockUnits, + fetchUnits: mockFetchUnits, + isLoading: false, + } as any); + + // Mock the roles store + (useRolesStore.getState as jest.Mock).mockReturnValue({ + fetchRolesForUnit: mockFetchRolesForUnit, + }); + }); + + it('renders correctly when open', () => { + render(); + + expect(screen.getByText('settings.select_unit')).toBeTruthy(); + expect(screen.getByText('settings.current_unit')).toBeTruthy(); + expect(screen.getAllByText('Engine 1')).toHaveLength(2); // One in current selection, one in list + expect(screen.getByText('Ladder 1')).toBeTruthy(); + expect(screen.getByText('Rescue 1')).toBeTruthy(); + }); + + it('does not render when closed', () => { + render(); + + expect(screen.queryByText('settings.select_unit')).toBeNull(); + }); + + it('displays current unit selection', () => { + render(); + + expect(screen.getByText('settings.current_unit')).toBeTruthy(); + expect(screen.getAllByText('Engine 1')).toHaveLength(2); // One in current selection, one in list + }); + + it('displays loading state when fetching units', () => { + mockUseUnitsStore.mockReturnValue({ + units: [], + fetchUnits: jest.fn().mockResolvedValue(undefined), + isLoading: true, + } as any); + + render(); + + expect(screen.getByTestId('spinner')).toBeTruthy(); + expect(screen.getByText('Loading...')).toBeTruthy(); + }); + + it('displays empty state when no units available', () => { + mockUseUnitsStore.mockReturnValue({ + units: [], + fetchUnits: jest.fn().mockResolvedValue(undefined), + isLoading: false, + } as any); + + render(); + + expect(screen.getByText('settings.no_units_available')).toBeTruthy(); + }); + + it('fetches units when sheet opens and no units are loaded', async () => { + const spyFetchUnits = jest.fn().mockResolvedValue(undefined); + + mockUseUnitsStore.mockReturnValue({ + units: [], + fetchUnits: spyFetchUnits, + isLoading: false, + } as any); + + render(); + + await waitFor(() => { + expect(spyFetchUnits).toHaveBeenCalled(); + }); + }); + + it('does not fetch units when sheet opens and units are already loaded', () => { + render(); + + expect(mockFetchUnits).not.toHaveBeenCalled(); + }); + + it('handles unit selection successfully', async () => { + mockSetActiveUnit.mockResolvedValue(undefined); + mockFetchRolesForUnit.mockResolvedValue(undefined); + + render(); + + // Find the second unit (Ladder 1) and select it + const ladderUnit = screen.getByText('Ladder 1'); + fireEvent.press(ladderUnit); + + await waitFor(() => { + expect(mockSetActiveUnit).toHaveBeenCalledWith('2'); + }); + + await waitFor(() => { + expect(mockFetchRolesForUnit).toHaveBeenCalledWith('2'); + }); + + expect(mockProps.onClose).toHaveBeenCalled(); + }); + + it('handles unit selection failure gracefully', async () => { + const error = new Error('Failed to set active unit'); + mockSetActiveUnit.mockRejectedValue(error); + + render(); + + // Find the second unit (Ladder 1) and select it + const ladderUnit = screen.getByText('Ladder 1'); + fireEvent.press(ladderUnit); + + await waitFor(() => { + expect(mockSetActiveUnit).toHaveBeenCalledWith('2'); + }); + + // Should not call fetchRolesForUnit if setActiveUnit fails + expect(mockFetchRolesForUnit).not.toHaveBeenCalled(); + // Should not close the modal on error + expect(mockProps.onClose).not.toHaveBeenCalled(); + }); + + it('prevents multiple selections while loading', async () => { + mockSetActiveUnit.mockImplementation(() => new Promise((resolve) => setTimeout(resolve, 100))); + + render(); + + // Select first unit + const ladderUnit = screen.getByText('Ladder 1'); + fireEvent.press(ladderUnit); + + // Try to select another unit while first is processing + const rescueUnit = screen.getByText('Rescue 1'); + fireEvent.press(rescueUnit); + + await waitFor(() => { + expect(mockSetActiveUnit).toHaveBeenCalledTimes(1); + expect(mockSetActiveUnit).toHaveBeenCalledWith('2'); + }); + }); + + it('closes when cancel button is pressed', () => { + render(); + + const cancelButton = screen.getByText('common.cancel'); + fireEvent.press(cancelButton); + + expect(mockProps.onClose).toHaveBeenCalled(); + }); + + it('disables cancel button while unit selection is loading', async () => { + mockSetActiveUnit.mockImplementation(() => new Promise((resolve) => setTimeout(resolve, 100))); + + render(); + + // Start unit selection + const ladderUnit = screen.getByText('Ladder 1'); + fireEvent.press(ladderUnit); + + // Try to press cancel button - it should be disabled + const cancelButton = screen.getByText('common.cancel'); + fireEvent.press(cancelButton); + + // onClose should not be called because button is disabled + expect(mockProps.onClose).not.toHaveBeenCalled(); + }); + + it('shows selected unit with check mark and proper styling', () => { + render(); + + // Engine 1 should be marked as selected since it's the active unit + expect(screen.getAllByText('Engine 1')).toHaveLength(2); // One in current selection, one in list + + // Check mark should be present for selected unit + // Note: In actual implementation, the Check component would be rendered + // but in tests, it's just a string 'Check' + }); + + it('renders units with correct type information', () => { + render(); + + expect(screen.getByText('Engine')).toBeTruthy(); + expect(screen.getByText('Ladder')).toBeTruthy(); + expect(screen.getByText('Rescue')).toBeTruthy(); + }); + + it('handles fetch units error gracefully', async () => { + const consoleError = jest.spyOn(console, 'error').mockImplementation(() => { }); + const errorFetchUnits = jest.fn().mockRejectedValue(new Error('Network error')); + + mockUseUnitsStore.mockReturnValue({ + units: [], + fetchUnits: errorFetchUnits, + isLoading: false, + } as any); + + render(); + + await waitFor(() => { + expect(errorFetchUnits).toHaveBeenCalled(); + }); + + // Component should still render normally even if fetch fails + expect(screen.getByText('settings.select_unit')).toBeTruthy(); + + consoleError.mockRestore(); + }); + + describe('Performance Optimizations', () => { + it('memoizes unit item component to prevent unnecessary re-renders', () => { + const { rerender } = render(); + + // Re-render with same props + rerender(); + + // The component should be memoized and not cause unnecessary re-renders + expect(screen.getAllByText('Engine 1')).toHaveLength(2); + }); + + it('uses stable rendering for units list', () => { + render(); + + // ScrollView should be present with units + expect(screen.getByTestId('scroll-view')).toBeTruthy(); + expect(screen.getAllByText('Engine 1')).toHaveLength(2); // One in current selection, one in list + expect(screen.getByText('Ladder 1')).toBeTruthy(); + expect(screen.getByText('Rescue 1')).toBeTruthy(); + }); + }); + + describe('Accessibility', () => { + it('provides proper test IDs for testing', () => { + render(); + + expect(screen.getByTestId('scroll-view')).toBeTruthy(); + }); + }); + + describe('Edge Cases', () => { + it('handles missing active unit gracefully', () => { + mockUseCoreStore.mockReturnValue({ + activeUnit: null, + setActiveUnit: mockSetActiveUnit, + } as any); + + render(); + + // Should not show current unit section + expect(screen.queryByText('settings.current_unit')).toBeNull(); + // Should still show unit list + expect(screen.getByText('Engine 1')).toBeTruthy(); + }); + + it('handles units with missing names gracefully', () => { + const unitsWithMissingNames = [ + { + UnitId: '1', + Name: '', + Type: 'Engine', + DepartmentId: '1', + TypeId: 1, + CustomStatusSetId: '', + GroupId: '1', + GroupName: 'Station 1', + Vin: '', + PlateNumber: '', + FourWheelDrive: false, + SpecialPermit: false, + CurrentDestinationId: '', + CurrentStatusId: '', + CurrentStatusTimestamp: '', + Latitude: '', + Longitude: '', + Note: '', + } as UnitResultData, + ]; + + mockUseUnitsStore.mockReturnValue({ + units: unitsWithMissingNames, + fetchUnits: mockFetchUnits, + isLoading: false, + } as any); + + render(); + + // Should still render the unit even with empty name + expect(screen.getByText('Engine')).toBeTruthy(); + }); + + it('handles very long unit names gracefully', () => { + const unitsWithLongNames = [ + { + UnitId: '1', + Name: 'This is a very long unit name that might cause layout issues in the UI', + Type: 'Engine', + DepartmentId: '1', + TypeId: 1, + CustomStatusSetId: '', + GroupId: '1', + GroupName: 'Station 1', + Vin: '', + PlateNumber: '', + FourWheelDrive: false, + SpecialPermit: false, + CurrentDestinationId: '', + CurrentStatusId: '', + CurrentStatusTimestamp: '', + Latitude: '', + Longitude: '', + Note: '', + } as UnitResultData, + ]; + + mockUseUnitsStore.mockReturnValue({ + units: unitsWithLongNames, + fetchUnits: mockFetchUnits, + isLoading: false, + } as any); + + render(); + + expect(screen.getByText('This is a very long unit name that might cause layout issues in the UI')).toBeTruthy(); + }); + }); +}); diff --git a/src/components/settings/unit-selection-bottom-sheet.tsx b/src/components/settings/unit-selection-bottom-sheet.tsx index d7baa451..777bcc69 100644 --- a/src/components/settings/unit-selection-bottom-sheet.tsx +++ b/src/components/settings/unit-selection-bottom-sheet.tsx @@ -1,7 +1,7 @@ import { Check } from 'lucide-react-native'; -import { useColorScheme } from 'nativewind'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import { ScrollView } from 'react-native'; import { logger } from '@/lib/logging'; import { type UnitResultData } from '@/models/v4/units/unitResultData'; @@ -9,12 +9,12 @@ import { useCoreStore } from '@/stores/app/core-store'; import { useRolesStore } from '@/stores/roles/store'; import { useUnitsStore } from '@/stores/units/store'; -import { Actionsheet, ActionsheetBackdrop, ActionsheetContent, ActionsheetDragIndicator, ActionsheetDragIndicatorWrapper } from '../ui/actionsheet'; +import { Actionsheet, ActionsheetBackdrop, ActionsheetContent, ActionsheetDragIndicator, ActionsheetDragIndicatorWrapper, ActionsheetItem, ActionsheetItemText } from '../ui/actionsheet'; +import { Box } from '../ui/box'; import { Button, ButtonText } from '../ui/button'; import { Center } from '../ui/center'; +import { Heading } from '../ui/heading'; import { HStack } from '../ui/hstack'; -import { Pressable } from '../ui/pressable'; -import { ScrollView } from '../ui/scroll-view'; import { Spinner } from '../ui/spinner'; import { Text } from '../ui/text'; import { VStack } from '../ui/vstack'; @@ -24,15 +24,15 @@ interface UnitSelectionBottomSheetProps { onClose: () => void; } -export function UnitSelectionBottomSheet({ isOpen, onClose }: UnitSelectionBottomSheetProps) { +export const UnitSelectionBottomSheet = React.memo(({ isOpen, onClose }) => { const { t } = useTranslation(); - const { colorScheme } = useColorScheme(); const [isLoading, setIsLoading] = React.useState(false); const { units, fetchUnits, isLoading: isLoadingUnits } = useUnitsStore(); const { activeUnit, setActiveUnit } = useCoreStore(); + // Fetch units when sheet opens React.useEffect(() => { - if (isOpen) { + if (isOpen && units.length === 0) { fetchUnits().catch((error) => { logger.error({ message: 'Failed to fetch units', @@ -40,10 +40,21 @@ export function UnitSelectionBottomSheet({ isOpen, onClose }: UnitSelectionBotto }); }); } - }, [isOpen, fetchUnits]); + }, [isOpen, units.length, fetchUnits]); + + const handleClose = React.useCallback(() => { + if (isLoading) { + return; + } + onClose(); + }, [onClose, isLoading]); const handleUnitSelection = React.useCallback( async (unit: UnitResultData) => { + if (isLoading) { + return; + } + try { setIsLoading(true); await setActiveUnit(unit.UnitId); @@ -52,7 +63,7 @@ export function UnitSelectionBottomSheet({ isOpen, onClose }: UnitSelectionBotto message: 'Active unit updated successfully', context: { unitId: unit.UnitId }, }); - onClose(); + handleClose(); } catch (error) { logger.error({ message: 'Failed to update active unit', @@ -62,59 +73,70 @@ export function UnitSelectionBottomSheet({ isOpen, onClose }: UnitSelectionBotto setIsLoading(false); } }, - [setActiveUnit, onClose] + [setActiveUnit, handleClose, isLoading] ); return ( - + - + - - + + {t('settings.select_unit')} - + - {isLoadingUnits ? ( -
- -
- ) : units.length === 0 ? ( -
- {t('settings.no_units_available')} -
- ) : ( - - - {units.map((unit) => ( - handleUnitSelection(unit)} - disabled={isLoading} - className={`rounded-lg border p-4 ${colorScheme === 'dark' ? 'border-neutral-800 bg-neutral-800' : 'border-neutral-200 bg-neutral-50'} ${ - activeUnit?.UnitId === unit.UnitId ? (colorScheme === 'dark' ? 'bg-primary-900' : 'bg-primary-50') : '' - }`} - > - - - {unit.Name} - + {/* Current Selection */} + {activeUnit && ( + + + + {t('settings.current_unit')} + + + {activeUnit.Name} + + + + )} + + {/* Units List */} + + + {isLoadingUnits ? ( +
+ +
+ ) : units.length > 0 ? ( + + {units.map((unit) => ( + handleUnitSelection(unit)} disabled={isLoading} className={activeUnit?.UnitId === unit.UnitId ? 'data-[checked=true]:bg-background-100' : ''}> + + + {unit.Name} + + {unit.Type} - + - {activeUnit?.UnitId === unit.UnitId && } - - - ))} - + {activeUnit?.UnitId === unit.UnitId && } + + ))} + + ) : ( +
+ {t('settings.no_units_available')} +
+ )} - )} + - - @@ -122,4 +144,6 @@ export function UnitSelectionBottomSheet({ isOpen, onClose }: UnitSelectionBotto ); -} +}); + +UnitSelectionBottomSheet.displayName = 'UnitSelectionBottomSheet'; diff --git a/src/components/status/__tests__/status-bottom-sheet.test.tsx b/src/components/status/__tests__/status-bottom-sheet.test.tsx index 93ed22d4..9d713913 100644 --- a/src/components/status/__tests__/status-bottom-sheet.test.tsx +++ b/src/components/status/__tests__/status-bottom-sheet.test.tsx @@ -2199,7 +2199,219 @@ describe('StatusBottomSheet', () => { expect(screen.getByText('No statuses available')).toBeTruthy(); }); - // NEW TESTS FOR ENHANCED FUNCTIONALITY + // NEW TESTS FOR LAYOUT IMPROVEMENTS + + it('should show "Committed" status with both calls and stations without pushing Next button off screen', () => { + const committedStatus = { + Id: 'committed-status', + Text: 'Committed', + Detail: 3, // Both calls and stations enabled + Note: 1, // Note optional + }; + + const mockCalls = Array.from({ length: 5 }, (_, index) => ({ + CallId: `call-${index + 1}`, + Number: `C${String(index + 1).padStart(3, '0')}`, + Name: `Emergency Call ${index + 1}`, + Address: `${100 + index} Main Street`, + })); + + const mockStations = Array.from({ length: 3 }, (_, index) => ({ + GroupId: `station-${index + 1}`, + Name: `Fire Station ${index + 1}`, + Address: `${200 + index} Oak Avenue`, + GroupType: 'Station', + })); + + mockUseStatusBottomSheetStore.mockReturnValue({ + ...defaultBottomSheetStore, + isOpen: true, + selectedStatus: committedStatus, + currentStep: 'select-destination', + availableCalls: mockCalls, + availableStations: mockStations, + isLoading: false, + }); + + render(); + + // Should show tabs for both calls and stations + expect(screen.getByText('Calls')).toBeTruthy(); + expect(screen.getByText('Stations')).toBeTruthy(); + + // Should show No Destination option + expect(screen.getByText('No Destination')).toBeTruthy(); + + // Next button should be visible and accessible + expect(screen.getByText('Next')).toBeTruthy(); + + // Should show some calls on the Calls tab (default) + expect(screen.getByText('C001 - Emergency Call 1')).toBeTruthy(); + + // Switch to Stations tab + const stationsTab = screen.getByText('Stations'); + fireEvent.press(stationsTab); + + // Should show stations + expect(screen.getByText('Fire Station 1')).toBeTruthy(); + + // Next button should still be accessible + expect(screen.getByText('Next')).toBeTruthy(); + }); + + it('should maintain Next button visibility with many calls and stations in Committed status', () => { + const committedStatus = { + Id: 'committed-status', + Text: 'Committed', + Detail: 3, // Both calls and stations enabled + Note: 0, // No note required + }; + + // Create many calls and stations to test scrolling + const manyCalls = Array.from({ length: 15 }, (_, index) => ({ + CallId: `call-${index + 1}`, + Number: `C${String(index + 1).padStart(3, '0')}`, + Name: `Emergency Call ${index + 1}`, + Address: `${100 + index} Main Street`, + })); + + const manyStations = Array.from({ length: 10 }, (_, index) => ({ + GroupId: `station-${index + 1}`, + Name: `Fire Station ${index + 1}`, + Address: `${200 + index} Oak Avenue`, + GroupType: 'Station', + })); + + mockUseStatusBottomSheetStore.mockReturnValue({ + ...defaultBottomSheetStore, + isOpen: true, + selectedStatus: committedStatus, + currentStep: 'select-destination', + availableCalls: manyCalls, + availableStations: manyStations, + isLoading: false, + }); + + render(); + + // Should show first few calls + expect(screen.getByText('C001 - Emergency Call 1')).toBeTruthy(); + expect(screen.getByText('C005 - Emergency Call 5')).toBeTruthy(); + + // Next button should still be visible and functional + const nextButton = screen.getByText('Next'); + expect(nextButton).toBeTruthy(); + + // Should be able to click Next button without scrolling + fireEvent.press(nextButton); + + // Since no note is required, this should trigger submit + expect(mockSaveUnitStatus).toHaveBeenCalled(); + }); + + it('should handle status selection with many statuses without pushing Next button off screen', () => { + const manyStatuses = [ + { Id: 1, Type: 1, StateId: 1, Text: 'Available', BColor: '#28a745', Color: '#fff', Gps: false, Note: 0, Detail: 1 }, + { Id: 2, Type: 2, StateId: 2, Text: 'Responding', BColor: '#ffc107', Color: '#000', Gps: true, Note: 1, Detail: 2 }, + { Id: 3, Type: 3, StateId: 3, Text: 'On Scene', BColor: '#dc3545', Color: '#fff', Gps: true, Note: 2, Detail: 3 }, + { Id: 4, Type: 4, StateId: 4, Text: 'Committed', BColor: '#17a2b8', Color: '#fff', Gps: true, Note: 1, Detail: 3 }, + { Id: 5, Type: 5, StateId: 5, Text: 'Transporting', BColor: '#6f42c1', Color: '#fff', Gps: true, Note: 1, Detail: 2 }, + { Id: 6, Type: 6, StateId: 6, Text: 'At Hospital', BColor: '#e83e8c', Color: '#fff', Gps: false, Note: 2, Detail: 1 }, + { Id: 7, Type: 7, StateId: 7, Text: 'Clearing', BColor: '#fd7e14', Color: '#000', Gps: false, Note: 0, Detail: 0 }, + { Id: 8, Type: 8, StateId: 8, Text: 'Out of Service', BColor: '#6c757d', Color: '#fff', Gps: false, Note: 2, Detail: 0 }, + ]; + + // Update core store with many statuses + const coreStoreWithManyStatuses = { + ...defaultCoreStore, + activeStatuses: { + UnitType: '0', + Statuses: manyStatuses, + }, + }; + + mockGetState.mockReturnValue(coreStoreWithManyStatuses as any); + mockUseCoreStore.mockImplementation((selector: any) => { + if (selector) { + return selector(coreStoreWithManyStatuses); + } + return coreStoreWithManyStatuses; + }); + + mockUseStatusBottomSheetStore.mockReturnValue({ + ...defaultBottomSheetStore, + isOpen: true, + currentStep: 'select-status', + selectedStatus: null, + cameFromStatusSelection: true, + }); + + render(); + + // Should show all statuses + expect(screen.getByText('Available')).toBeTruthy(); + expect(screen.getByText('Committed')).toBeTruthy(); + expect(screen.getByText('Out of Service')).toBeTruthy(); + + // Next button should be visible but disabled since no status is selected + const nextButton = screen.getByText('Next'); + expect(nextButton).toBeTruthy(); + + // Select a status + const committedStatus = screen.getByText('Committed'); + fireEvent.press(committedStatus); + + // Next button should still be accessible after selection + expect(screen.getByText('Next')).toBeTruthy(); + }); + + it('should show proper layout spacing in destination step with reduced margins', () => { + const selectedStatus = { + Id: 'status-1', + Text: 'Responding', + Detail: 3, // Both calls and stations + Note: 1, + }; + + const mockCall = { + CallId: 'call-1', + Number: 'C001', + Name: 'Emergency Call', + Address: '123 Main St', + }; + + const mockStation = { + GroupId: 'station-1', + Name: 'Fire Station 1', + Address: '456 Oak Ave', + GroupType: 'Station', + }; + + mockUseStatusBottomSheetStore.mockReturnValue({ + ...defaultBottomSheetStore, + isOpen: true, + selectedStatus, + currentStep: 'select-destination', + availableCalls: [mockCall], + availableStations: [mockStation], + }); + + render(); + + // Check that the layout components are rendered + expect(screen.getByText('No Destination')).toBeTruthy(); + expect(screen.getByText('Calls')).toBeTruthy(); + expect(screen.getByText('Stations')).toBeTruthy(); + expect(screen.getByText('C001 - Emergency Call')).toBeTruthy(); + expect(screen.getByText('Next')).toBeTruthy(); + + // Verify we can select a call and the Next button remains accessible + const callOption = screen.getByText('C001 - Emergency Call'); + fireEvent.press(callOption); + + expect(mockSetSelectedCall).toHaveBeenCalledWith(mockCall); + expect(screen.getByText('Next')).toBeTruthy(); + }); it('should show selected status and destination on note step', () => { const selectedStatus = { @@ -2298,6 +2510,7 @@ describe('StatusBottomSheet', () => { await waitFor(() => { expect(mockSaveUnitStatus).toHaveBeenCalled(); expect(mockShowToast).toHaveBeenCalledWith('success', 'Status saved successfully'); + expect(mockReset).toHaveBeenCalled(); }); }); @@ -2334,6 +2547,11 @@ describe('StatusBottomSheet', () => { expect(errorSaveUnitStatus).toHaveBeenCalled(); expect(mockShowToast).toHaveBeenCalledWith('error', 'Failed to save status'); }); + + // Button should stop spinning even on error + await waitFor(() => { + expect(screen.getByText('Submit')).toBeTruthy(); // Should be back to normal state + }); }); it('should prevent double submission when submit is pressed multiple times', async () => { @@ -2368,6 +2586,52 @@ describe('StatusBottomSheet', () => { }); }); + it('should stop spinning immediately after status save completes', async () => { + const selectedStatus = { + Id: 1, + Text: 'Available', + Color: '#00FF00', + Detail: 0, + Note: 0, + }; + + // Create a mock that resolves after a short delay to simulate API call + const fastSaveUnitStatus = jest.fn().mockImplementation(() => Promise.resolve()); + + mockUseStatusBottomSheetStore.mockReturnValue({ + ...defaultBottomSheetStore, + isOpen: true, + currentStep: 'add-note', + selectedStatus, + selectedDestinationType: 'none', + }); + + mockUseStatusesStore.mockReturnValue({ + ...defaultStatusesStore, + saveUnitStatus: fastSaveUnitStatus, + }); + + render(); + + const submitButton = screen.getByText('Submit'); + + // Initially should show "Submit" + expect(screen.getByText('Submit')).toBeTruthy(); + + fireEvent.press(submitButton); + + // Should immediately show "Submitting" + await waitFor(() => { + expect(screen.getByText('Submitting')).toBeTruthy(); + }); + + // After the save completes, should go back to "Submit" and modal should close + await waitFor(() => { + expect(fastSaveUnitStatus).toHaveBeenCalled(); + expect(mockReset).toHaveBeenCalled(); // Modal should close immediately after save + }); + }); + it('should disable previous button when submitting on note step', async () => { const selectedStatus = { Id: 1, @@ -2633,4 +2897,56 @@ describe('StatusBottomSheet', () => { // Component should handle missing BColor gracefully with fallback }); + + it('should show Next button when tabs are visible with reduced ScrollView height', () => { + const committedStatus = { + Id: 4, + Text: 'Committed', + Color: '#FF6600', + Detail: 3, // Both calls and stations + Note: 0, + }; + + // Mock lots of calls and stations to ensure content would overflow + const manyCalls = Array.from({ length: 20 }, (_, i) => ({ + CallId: `call-${i}`, + Number: `C-${i.toString().padStart(3, '0')}`, + Name: `Emergency Call ${i}`, + Address: `${100 + i} Test Street`, + })); + + const manyStations = Array.from({ length: 15 }, (_, i) => ({ + GroupId: `station-${i}`, + Name: `Station ${i}`, + Address: `${200 + i} Station Road`, + GroupType: 'Fire Station', + })); + + mockUseStatusBottomSheetStore.mockReturnValue({ + ...defaultBottomSheetStore, + isOpen: true, + currentStep: 'select-destination', + selectedStatus: committedStatus, + availableCalls: manyCalls, + availableStations: manyStations, + isLoading: false, + }); + + render(); + + // Should show tab headers for calls and stations + expect(screen.getByText('Calls')).toBeTruthy(); + expect(screen.getByText('Stations')).toBeTruthy(); + + // Should show some calls (even with many items) + expect(screen.getByText('C-000 - Emergency Call 0')).toBeTruthy(); + + // Next button should still be visible and accessible + const nextButton = screen.getByText('Next'); + expect(nextButton).toBeTruthy(); + + // Button should be enabled (can proceed) + fireEvent.press(nextButton); + // Should not throw or fail to find the button + }); }); \ No newline at end of file diff --git a/src/components/status/status-bottom-sheet.tsx b/src/components/status/status-bottom-sheet.tsx index 3e702bc2..b127d972 100644 --- a/src/components/status/status-bottom-sheet.tsx +++ b/src/components/status/status-bottom-sheet.tsx @@ -434,7 +434,7 @@ export const StatusBottomSheet = () => { }; return ( - + @@ -498,10 +498,10 @@ export const StatusBottomSheet = () => { - - @@ -541,7 +541,7 @@ export const StatusBottomSheet = () => { )} {/* Tab Content */} - + {/* Show calls if detailLevel 2 or 3, and either no tabs or calls tab selected */} {(detailLevel === 2 || (detailLevel === 3 && selectedTab === 'calls')) && ( @@ -608,10 +608,10 @@ export const StatusBottomSheet = () => { )} - - @@ -628,9 +628,9 @@ export const StatusBottomSheet = () => { ) : null} - )} @@ -662,14 +662,14 @@ export const StatusBottomSheet = () => { - - - diff --git a/src/hooks/__tests__/use-map-signalr-updates.test.ts b/src/hooks/__tests__/use-map-signalr-updates.test.ts new file mode 100644 index 00000000..3c59f1e4 --- /dev/null +++ b/src/hooks/__tests__/use-map-signalr-updates.test.ts @@ -0,0 +1,414 @@ +import { renderHook, waitFor } from '@testing-library/react-native'; + +import { getMapDataAndMarkers } from '@/api/mapping/mapping'; +import { logger } from '@/lib/logging'; +import { type MapMakerInfoData } from '@/models/v4/mapping/getMapDataAndMarkersData'; +import { type GetMapDataAndMarkersResult } from '@/models/v4/mapping/getMapDataAndMarkersResult'; +import { useSignalRStore } from '@/stores/signalr/signalr-store'; + +import { useMapSignalRUpdates } from '../use-map-signalr-updates'; + +// Mock dependencies +jest.mock('@/api/mapping/mapping'); +jest.mock('@/lib/logging'); +jest.mock('@/stores/signalr/signalr-store'); + +const mockGetMapDataAndMarkers = getMapDataAndMarkers as jest.MockedFunction; +const mockLogger = logger as jest.Mocked; +const mockUseSignalRStore = useSignalRStore as jest.MockedFunction; + +// Mock setTimeout to allow synchronous testing +jest.useFakeTimers(); + +describe('useMapSignalRUpdates', () => { + const mockOnMarkersUpdate = jest.fn(); + const mockMapData: GetMapDataAndMarkersResult = { + PageSize: 0, + Timestamp: '', + Version: '', + Node: '', + RequestId: '', + Status: '', + Environment: '', + Data: { + MapMakerInfos: [ + { + Id: '1', + Latitude: 40.7128, + Longitude: -74.0060, + Title: 'Test Marker', + zIndex: '1', + ImagePath: 'test-icon', + InfoWindowContent: 'Test content', + Color: 'red', + Type: 1, + }, + ] as MapMakerInfoData[], + CenterLat: '40.7128', + CenterLon: '-74.0060', + ZoomLevel: '12', + }, + }; + + beforeEach(() => { + jest.clearAllMocks(); + jest.clearAllTimers(); + + // Reset store state + mockUseSignalRStore.mockReturnValue(0); + + // Mock successful API response by default + mockGetMapDataAndMarkers.mockResolvedValue(mockMapData); + }); + + afterEach(() => { + jest.runOnlyPendingTimers(); + }); + + it('should not trigger API call when lastUpdateTimestamp is 0', () => { + mockUseSignalRStore.mockReturnValue(0); + + renderHook(() => useMapSignalRUpdates(mockOnMarkersUpdate)); + + // Fast forward timers to ensure debounce completes + jest.runAllTimers(); + + expect(mockGetMapDataAndMarkers).not.toHaveBeenCalled(); + expect(mockOnMarkersUpdate).not.toHaveBeenCalled(); + }); + + it('should trigger API call when lastUpdateTimestamp changes', async () => { + const timestamp = Date.now(); + mockUseSignalRStore.mockReturnValue(timestamp); + + renderHook(() => useMapSignalRUpdates(mockOnMarkersUpdate)); + + // Fast forward timers to trigger debounced call + jest.runAllTimers(); + + await waitFor(() => { + expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + }); + + expect(mockOnMarkersUpdate).toHaveBeenCalledWith(mockMapData.Data.MapMakerInfos); + }); + + it('should debounce multiple rapid timestamp changes', async () => { + let timestamp = Date.now(); + + const { rerender } = renderHook( + (props) => { + mockUseSignalRStore.mockReturnValue(props.timestamp); + return useMapSignalRUpdates(mockOnMarkersUpdate); + }, + { initialProps: { timestamp } } + ); + + // Trigger multiple updates rapidly + for (let i = 0; i < 5; i++) { + timestamp += 100; + rerender({ timestamp }); + } + + // Only advance timer partially (less than debounce delay) + jest.advanceTimersByTime(500); + + // Should not have called API yet due to debouncing + expect(mockGetMapDataAndMarkers).not.toHaveBeenCalled(); + + // Now advance past the debounce delay + jest.runAllTimers(); + + await waitFor(() => { + expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + }); + + expect(mockOnMarkersUpdate).toHaveBeenCalledTimes(1); + }); + + it('should not make concurrent API calls', async () => { + const timestamp = Date.now(); + + // Make API call slow to simulate concurrent scenario + let resolveFirstCall: (value: any) => void; + const firstCallPromise = new Promise((resolve) => { + resolveFirstCall = resolve; + }); + + mockGetMapDataAndMarkers.mockReturnValueOnce(firstCallPromise as any); + + const { rerender } = renderHook( + (props) => { + mockUseSignalRStore.mockReturnValue(props.timestamp); + return useMapSignalRUpdates(mockOnMarkersUpdate); + }, + { initialProps: { timestamp } } + ); + + // Trigger first call + jest.runAllTimers(); + + // Update timestamp again while first call is still pending + rerender({ timestamp: timestamp + 1000 }); + jest.runAllTimers(); + + // First call should have been made, but second should be skipped due to concurrent protection + expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + + // Verify the debug log about skipping concurrent call + expect(mockLogger.debug).toHaveBeenCalledWith({ + message: 'Map markers update already in progress, skipping', + context: { timestamp: timestamp + 1000 }, + }); + + // Resolve first call + resolveFirstCall!(mockMapData); + + await waitFor(() => { + expect(mockOnMarkersUpdate).toHaveBeenCalledWith(mockMapData.Data.MapMakerInfos); + }); + }); + + it('should handle API errors gracefully', async () => { + const timestamp = Date.now(); + const error = new Error('API Error'); + + mockUseSignalRStore.mockReturnValue(timestamp); + mockGetMapDataAndMarkers.mockRejectedValue(error); + + renderHook(() => useMapSignalRUpdates(mockOnMarkersUpdate)); + + jest.runAllTimers(); + + await waitFor(() => { + expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + }); + + expect(mockLogger.error).toHaveBeenCalledWith({ + message: 'Failed to update map markers from SignalR update', + context: { error, timestamp }, + }); + + expect(mockOnMarkersUpdate).not.toHaveBeenCalled(); + }); + + it('should handle aborted requests gracefully', async () => { + const timestamp = Date.now(); + const abortError = new Error('The operation was aborted'); + abortError.name = 'AbortError'; + + mockUseSignalRStore.mockReturnValue(timestamp); + mockGetMapDataAndMarkers.mockRejectedValue(abortError); + + renderHook(() => useMapSignalRUpdates(mockOnMarkersUpdate)); + + jest.runAllTimers(); + + await waitFor(() => { + expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + }); + + // Should log as debug, not error + expect(mockLogger.debug).toHaveBeenCalledWith({ + message: 'Map markers request was aborted', + context: { timestamp }, + }); + + expect(mockLogger.error).not.toHaveBeenCalled(); + expect(mockOnMarkersUpdate).not.toHaveBeenCalled(); + }); + + it('should cancel previous request when new update comes in', async () => { + const timestamp1 = Date.now(); + + // Mock AbortController + const mockAbort = jest.fn(); + let abortControllerCount = 0; + const originalAbortController = global.AbortController; + + global.AbortController = jest.fn().mockImplementation(() => { + abortControllerCount++; + return { + signal: { aborted: false }, + abort: mockAbort, + }; + }) as any; + + renderHook(() => { + mockUseSignalRStore.mockReturnValue(timestamp1); + return useMapSignalRUpdates(mockOnMarkersUpdate); + }); + + // Trigger first call + jest.runAllTimers(); + + // Wait for the call to complete + await waitFor(() => { + expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + }); + + // Verify AbortController was created for the request + expect(abortControllerCount).toBe(1); + + // Restore original AbortController + global.AbortController = originalAbortController; + }); + + it('should not update markers if API returns empty data', async () => { + const timestamp = Date.now(); + const emptyMapData: GetMapDataAndMarkersResult = { + ...mockMapData, + Data: { + ...mockMapData.Data, + MapMakerInfos: [], + }, + }; + + mockUseSignalRStore.mockReturnValue(timestamp); + mockGetMapDataAndMarkers.mockResolvedValue(emptyMapData); + + renderHook(() => useMapSignalRUpdates(mockOnMarkersUpdate)); + + jest.runAllTimers(); + + await waitFor(() => { + expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + }); + + expect(mockOnMarkersUpdate).toHaveBeenCalledWith([]); + }); + + it('should handle null API response', async () => { + const timestamp = Date.now(); + mockUseSignalRStore.mockReturnValue(timestamp); + mockGetMapDataAndMarkers.mockResolvedValue(undefined as any); + + renderHook(() => useMapSignalRUpdates(mockOnMarkersUpdate)); + + jest.runAllTimers(); + + await waitFor(() => { + expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + }); + + expect(mockOnMarkersUpdate).not.toHaveBeenCalled(); + }); + + it('should not process the same timestamp twice', async () => { + const timestamp = Date.now(); + + const { rerender } = renderHook( + (props) => { + mockUseSignalRStore.mockReturnValue(props.timestamp); + return useMapSignalRUpdates(mockOnMarkersUpdate); + }, + { initialProps: { timestamp } } + ); + + // First update + jest.runAllTimers(); + + await waitFor(() => { + expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + }); + + // Reset mock call count + mockGetMapDataAndMarkers.mockClear(); + + // Trigger the same timestamp again + rerender({ timestamp }); + jest.runAllTimers(); + + // Should not make another API call + expect(mockGetMapDataAndMarkers).not.toHaveBeenCalled(); + }); + + it('should cleanup timers and abort requests on unmount', () => { + const timestamp = Date.now(); + mockUseSignalRStore.mockReturnValue(timestamp); + + // Mock AbortController + const mockAbort = jest.fn(); + const originalAbortController = global.AbortController; + global.AbortController = jest.fn().mockImplementation(() => ({ + signal: { aborted: false }, + abort: mockAbort, + })) as any; + + const { unmount } = renderHook(() => useMapSignalRUpdates(mockOnMarkersUpdate)); + + // Trigger call to create AbortController + jest.runAllTimers(); + + // Unmount the hook + unmount(); + + // Verify cleanup occurred - check that clearTimeout would have been called + // (we can't directly test this with jest.useFakeTimers) + expect(global.AbortController).toHaveBeenCalled(); + + // Restore original AbortController + global.AbortController = originalAbortController; + }); + + it('should maintain stable callback reference', async () => { + const timestamp = Date.now(); + mockUseSignalRStore.mockReturnValue(timestamp); + + const secondCallback = jest.fn(); + const { rerender } = renderHook( + ({ callback }) => useMapSignalRUpdates(callback), + { initialProps: { callback: mockOnMarkersUpdate } } + ); + + rerender({ callback: secondCallback }); + + jest.runAllTimers(); + + // The hook should use the latest callback + await waitFor(() => { + expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + }); + + await waitFor(() => { + expect(secondCallback).toHaveBeenCalled(); + }); + + expect(mockOnMarkersUpdate).not.toHaveBeenCalled(); + }); + + it('should log debug information for debouncing', () => { + const timestamp = Date.now(); + mockUseSignalRStore.mockReturnValue(timestamp); + + renderHook(() => useMapSignalRUpdates(mockOnMarkersUpdate)); + + expect(mockLogger.debug).toHaveBeenCalledWith({ + message: 'Debouncing map markers update', + context: { + lastUpdateTimestamp: timestamp, + lastProcessed: 0, + delay: 1000, + }, + }); + }); + + it('should log successful marker updates', async () => { + const timestamp = Date.now(); + mockUseSignalRStore.mockReturnValue(timestamp); + + renderHook(() => useMapSignalRUpdates(mockOnMarkersUpdate)); + + jest.runAllTimers(); + + await waitFor(() => { + expect(mockLogger.info).toHaveBeenCalledWith({ + message: 'Updating map markers from SignalR update', + context: { + markerCount: mockMapData.Data.MapMakerInfos.length, + timestamp, + }, + }); + }); + }); +}); diff --git a/src/hooks/use-map-signalr-updates.ts b/src/hooks/use-map-signalr-updates.ts index 781ba769..39bddc9f 100644 --- a/src/hooks/use-map-signalr-updates.ts +++ b/src/hooks/use-map-signalr-updates.ts @@ -1,61 +1,136 @@ -import { useEffect, useRef } from 'react'; +import { useCallback, useEffect, useRef } from 'react'; import { getMapDataAndMarkers } from '@/api/mapping/mapping'; import { logger } from '@/lib/logging'; import { type MapMakerInfoData } from '@/models/v4/mapping/getMapDataAndMarkersData'; import { useSignalRStore } from '@/stores/signalr/signalr-store'; +// Debounce delay in milliseconds to prevent rapid consecutive API calls +const DEBOUNCE_DELAY = 1000; + export const useMapSignalRUpdates = (onMarkersUpdate: (markers: MapMakerInfoData[]) => void) => { const lastProcessedTimestamp = useRef(0); + const isUpdating = useRef(false); + const debounceTimer = useRef(null); + const abortController = useRef(null); - const lastUpdateTimestamp = useSignalRStore((state) => { - //logger.info({ - // message: 'Zustand selector called for lastUpdateTimestamp', - // context: { lastUpdateTimestamp: state.lastUpdateTimestamp }, - //}); - return state.lastUpdateTimestamp; - }); + const lastUpdateTimestamp = useSignalRStore((state) => state.lastUpdateTimestamp); - //logger.info({ - // message: 'Setting up useMapSignalRUpdates', - // context: { lastUpdateTimestamp, lastProcessedTimestamp: lastProcessedTimestamp.current }, - //}); + const fetchAndUpdateMarkers = useCallback(async () => { + // Prevent concurrent API calls + if (isUpdating.current) { + logger.debug({ + message: 'Map markers update already in progress, skipping', + context: { timestamp: lastUpdateTimestamp }, + }); + return; + } - useEffect(() => { - //logger.info({ - // message: 'useEffect triggered in useMapSignalRUpdates', - // context: { lastUpdateTimestamp, lastProcessedTimestamp: lastProcessedTimestamp.current }, - //}); - - const fetchAndUpdateMarkers = async () => { - try { - const mapDataAndMarkers = await getMapDataAndMarkers(); - - if (mapDataAndMarkers && mapDataAndMarkers.Data) { - logger.info({ - message: 'Updating map markers from SignalR update', - context: { - markerCount: mapDataAndMarkers.Data.MapMakerInfos.length, - timestamp: lastUpdateTimestamp, - }, - }); - - onMarkersUpdate(mapDataAndMarkers.Data.MapMakerInfos); - } - - // Update the last processed timestamp after successful API call - lastProcessedTimestamp.current = lastUpdateTimestamp; - } catch (error) { - logger.error({ - message: 'Failed to update map markers from SignalR update', - context: { error }, + // Cancel any previous request + if (abortController.current) { + abortController.current.abort(); + } + + // Create new abort controller for this request + abortController.current = new AbortController(); + isUpdating.current = true; + + try { + logger.debug({ + message: 'Fetching map markers from SignalR update', + context: { timestamp: lastUpdateTimestamp }, + }); + + const mapDataAndMarkers = await getMapDataAndMarkers(); + + // Check if request was aborted + if (abortController.current?.signal.aborted) { + logger.debug({ + message: 'Map markers request was aborted', + context: { timestamp: lastUpdateTimestamp }, }); - // Don't update lastProcessedTimestamp on error so it can be retried + return; } - }; - if (lastUpdateTimestamp > 0 && lastUpdateTimestamp !== lastProcessedTimestamp.current) { - fetchAndUpdateMarkers(); + if (mapDataAndMarkers && mapDataAndMarkers.Data) { + logger.info({ + message: 'Updating map markers from SignalR update', + context: { + markerCount: mapDataAndMarkers.Data.MapMakerInfos.length, + timestamp: lastUpdateTimestamp, + }, + }); + + onMarkersUpdate(mapDataAndMarkers.Data.MapMakerInfos); + } + + // Update the last processed timestamp after successful API call + lastProcessedTimestamp.current = lastUpdateTimestamp; + } catch (error) { + // Don't log aborted requests as errors + if (error instanceof Error && error.name === 'AbortError') { + logger.debug({ + message: 'Map markers request was aborted', + context: { timestamp: lastUpdateTimestamp }, + }); + return; + } + + logger.error({ + message: 'Failed to update map markers from SignalR update', + context: { error, timestamp: lastUpdateTimestamp }, + }); + // Don't update lastProcessedTimestamp on error so it can be retried + } finally { + isUpdating.current = false; + abortController.current = null; } }, [lastUpdateTimestamp, onMarkersUpdate]); + + useEffect(() => { + // Clear any existing debounce timer + if (debounceTimer.current) { + clearTimeout(debounceTimer.current); + } + + // Only process if we have a valid timestamp and it's different from the last processed one + if (lastUpdateTimestamp > 0 && lastUpdateTimestamp !== lastProcessedTimestamp.current) { + logger.debug({ + message: 'Debouncing map markers update', + context: { + lastUpdateTimestamp, + lastProcessed: lastProcessedTimestamp.current, + delay: DEBOUNCE_DELAY, + }, + }); + + // Debounce the API call to prevent rapid consecutive requests + debounceTimer.current = setTimeout(() => { + fetchAndUpdateMarkers(); + }, DEBOUNCE_DELAY); + } + + // Cleanup function + return () => { + if (debounceTimer.current) { + clearTimeout(debounceTimer.current); + debounceTimer.current = null; + } + }; + }, [lastUpdateTimestamp, fetchAndUpdateMarkers]); + + // Cleanup on unmount + useEffect(() => { + return () => { + // Clear debounce timer + if (debounceTimer.current) { + clearTimeout(debounceTimer.current); + } + + // Abort any ongoing request + if (abortController.current) { + abortController.current.abort(); + } + }; + }, []); }; diff --git a/src/hooks/use-status-signalr-updates.ts b/src/hooks/use-status-signalr-updates.ts index 8f7b7390..6765e874 100644 --- a/src/hooks/use-status-signalr-updates.ts +++ b/src/hooks/use-status-signalr-updates.ts @@ -1,6 +1,5 @@ import { useEffect, useRef } from 'react'; -import { getUnitStatus } from '@/api/units/unitStatuses'; import { logger } from '@/lib/logging'; import { useCoreStore } from '@/stores/app/core-store'; import { useSignalRStore } from '@/stores/signalr/signalr-store'; diff --git a/src/services/__tests__/location-foreground-permissions.test.ts b/src/services/__tests__/location-foreground-permissions.test.ts new file mode 100644 index 00000000..6c979fca --- /dev/null +++ b/src/services/__tests__/location-foreground-permissions.test.ts @@ -0,0 +1,415 @@ +/** + * Tests for location service working with foreground-only permissions + * + * This test suite specifically covers the scenario where: + * - Foreground location permissions are granted + * - Background location permissions are denied + * - The app should still be able to track location in the foreground + * + * These tests were created to fix the issue where the app was failing to + * start location tracking when background permissions were denied, even + * though foreground permissions were granted. + */ + +// Mock all dependencies first +jest.mock('@/api/units/unitLocation', () => ({ + setUnitLocation: jest.fn(), +})); + +jest.mock('@/lib/hooks/use-background-geolocation', () => ({ + registerLocationServiceUpdater: jest.fn(), +})); + +jest.mock('@/lib/logging', () => ({ + logger: { + info: jest.fn(), + warn: jest.fn(), + error: jest.fn(), + }, +})); + +jest.mock('@/lib/storage/background-geolocation', () => ({ + loadBackgroundGeolocationState: jest.fn(), +})); + +// Create mock store states +const mockCoreStoreState = { + activeUnitId: 'unit-123' as string | null, +}; + +const mockLocationStoreState = { + setLocation: jest.fn(), + setBackgroundEnabled: jest.fn(), +}; + +// Mock stores with proper Zustand structure +jest.mock('@/stores/app/core-store', () => ({ + useCoreStore: { + getState: jest.fn(() => mockCoreStoreState), + }, +})); + +jest.mock('@/stores/app/location-store', () => ({ + useLocationStore: { + getState: jest.fn(() => mockLocationStoreState), + }, +})); + +jest.mock('expo-location', () => { + const mockRequestForegroundPermissions = jest.fn(); + const mockRequestBackgroundPermissions = jest.fn(); + const mockGetBackgroundPermissions = jest.fn(); + const mockWatchPositionAsync = jest.fn(); + const mockStartLocationUpdatesAsync = jest.fn(); + const mockStopLocationUpdatesAsync = jest.fn(); + return { + requestForegroundPermissionsAsync: mockRequestForegroundPermissions, + requestBackgroundPermissionsAsync: mockRequestBackgroundPermissions, + getBackgroundPermissionsAsync: mockGetBackgroundPermissions, + watchPositionAsync: mockWatchPositionAsync, + startLocationUpdatesAsync: mockStartLocationUpdatesAsync, + stopLocationUpdatesAsync: mockStopLocationUpdatesAsync, + Accuracy: { + Balanced: 'balanced', + }, + }; +}); + +jest.mock('expo-task-manager', () => ({ + defineTask: jest.fn(), + isTaskRegisteredAsync: jest.fn(), +})); + +jest.mock('react-native', () => ({ + AppState: { + addEventListener: jest.fn(() => ({ + remove: jest.fn(), + })), + currentState: 'active', + }, +})); + +import * as Location from 'expo-location'; +import * as TaskManager from 'expo-task-manager'; + +import { setUnitLocation } from '@/api/units/unitLocation'; +import { logger } from '@/lib/logging'; +import { loadBackgroundGeolocationState } from '@/lib/storage/background-geolocation'; +import { SaveUnitLocationInput } from '@/models/v4/unitLocation/saveUnitLocationInput'; + +// Import the service after mocks are set up +let locationService: any; + +// Mock types +const mockSetUnitLocation = setUnitLocation as jest.MockedFunction; +const mockLogger = logger as jest.Mocked; +const mockLoadBackgroundGeolocationState = loadBackgroundGeolocationState as jest.MockedFunction; +const mockTaskManager = TaskManager as jest.Mocked; +const mockLocation = Location as jest.Mocked; + +// Mock location data +const mockLocationObject: Location.LocationObject = { + coords: { + latitude: 37.7749, + longitude: -122.4194, + altitude: 10.5, + accuracy: 5.0, + altitudeAccuracy: 2.0, + heading: 90.0, + speed: 15.5, + }, + timestamp: Date.now(), +}; + +// Mock API response +const mockApiResponse = { + Id: 'location-12345', + PageSize: 0, + Timestamp: '', + Version: '', + Node: '', + RequestId: '', + Status: '', + Environment: '', +}; + +describe('LocationService - Foreground-Only Permissions', () => { + let mockLocationSubscription: jest.Mocked; + + beforeAll(() => { + // Import the service after all mocks are set up + const { locationService: service } = require('../location'); + locationService = service; + }); + + beforeEach(() => { + // Clear all mock call history + jest.clearAllMocks(); + + // Reset mock functions in store states + mockLocationStoreState.setLocation = jest.fn(); + mockLocationStoreState.setBackgroundEnabled = jest.fn(); + + // Setup mock location subscription + mockLocationSubscription = { + remove: jest.fn(), + } as jest.Mocked; + + // Setup Location API mocks for the EXACT scenario from the user's logs: + // Foreground: granted, Background: denied + mockLocation.requestForegroundPermissionsAsync.mockResolvedValue({ + status: 'granted' as any, + expires: 'never', + granted: true, + canAskAgain: true, + }); + + mockLocation.requestBackgroundPermissionsAsync.mockResolvedValue({ + status: 'denied' as any, + expires: 'never', + granted: false, + canAskAgain: true, + }); + + mockLocation.getBackgroundPermissionsAsync.mockResolvedValue({ + status: 'denied' as any, + expires: 'never', + granted: false, + canAskAgain: true, + }); + + mockLocation.watchPositionAsync.mockResolvedValue(mockLocationSubscription); + mockLocation.startLocationUpdatesAsync.mockResolvedValue(); + mockLocation.stopLocationUpdatesAsync.mockResolvedValue(); + + // Setup TaskManager mocks + mockTaskManager.isTaskRegisteredAsync.mockResolvedValue(false); + + // Setup storage mock + mockLoadBackgroundGeolocationState.mockResolvedValue(false); + + // Setup API mock + mockSetUnitLocation.mockResolvedValue(mockApiResponse); + + // Reset core store state + mockCoreStoreState.activeUnitId = 'unit-123'; + + // Reset internal state of the service + (locationService as any).locationSubscription = null; + (locationService as any).backgroundSubscription = null; + (locationService as any).isBackgroundGeolocationEnabled = false; + }); + + describe('User Reported Bug Scenario', () => { + it('should allow location tracking when foreground=granted and background=denied', async () => { + // This tests the exact scenario from the user's logs: + // "foregroundStatus": "granted", "backgroundStatus": "denied" + + const hasPermissions = await locationService.requestPermissions(); + + // Should return true because foreground is granted (background is optional) + expect(hasPermissions).toBe(true); + + // Should be able to start location updates without throwing + await expect(locationService.startLocationUpdates()).resolves.not.toThrow(); + + // Verify foreground location tracking is started + expect(mockLocation.watchPositionAsync).toHaveBeenCalledWith( + { + accuracy: Location.Accuracy.Balanced, + timeInterval: 15000, + distanceInterval: 10, + }, + expect.any(Function) + ); + + // Verify the correct log message with permission details + expect(mockLogger.info).toHaveBeenCalledWith({ + message: 'Location permissions requested', + context: { + foregroundStatus: 'granted', + backgroundStatus: 'denied', + }, + }); + }); + + it('should log the exact error from user logs when permission check was wrong', async () => { + // Mock the old incorrect behavior where both permissions were required + const mockOldPermissionCheck = jest.fn().mockResolvedValue(false); // Old behavior + + if (mockOldPermissionCheck.mock.calls.length === 0) { + // Call it to simulate the old logic + const foregroundGranted = true; + const backgroundGranted = false; + const oldResult = foregroundGranted && backgroundGranted; // This was the bug + mockOldPermissionCheck.mockReturnValue(oldResult); + const result = mockOldPermissionCheck(); + + expect(result).toBe(false); // This would have caused the error + } + + // With our fix, the permission check should now pass + const hasPermissions = await locationService.requestPermissions(); + expect(hasPermissions).toBe(true); + }); + + it('should work with background setting enabled but permissions denied', async () => { + // User has background geolocation enabled in settings but system permissions denied + mockLoadBackgroundGeolocationState.mockResolvedValue(true); + + await locationService.startLocationUpdates(); + + // Should start foreground tracking + expect(mockLocation.watchPositionAsync).toHaveBeenCalled(); + + // Should warn about background limitations + expect(mockLogger.warn).toHaveBeenCalledWith({ + message: 'Background geolocation enabled but permissions denied, running in foreground-only mode', + context: { + backgroundStatus: 'denied', + settingEnabled: true, + }, + }); + + // Should NOT register background task + expect(mockLocation.startLocationUpdatesAsync).not.toHaveBeenCalled(); + + // Should log successful foreground start with proper context + expect(mockLogger.info).toHaveBeenCalledWith({ + message: 'Foreground location updates started', + context: { + backgroundEnabled: false, // Background is disabled due to permissions + backgroundPermissions: false, + backgroundSetting: true, + }, + }); + }); + + it('should handle location updates in foreground-only mode', async () => { + await locationService.startLocationUpdates(); + + // Simulate a location update + const locationCallback = mockLocation.watchPositionAsync.mock.calls[0][1] as Function; + await locationCallback(mockLocationObject); + + // Should update the store + expect(mockLocationStoreState.setLocation).toHaveBeenCalledWith(mockLocationObject); + + // Should send to API + expect(mockSetUnitLocation).toHaveBeenCalledWith( + expect.objectContaining({ + UnitId: 'unit-123', + Latitude: mockLocationObject.coords.latitude.toString(), + Longitude: mockLocationObject.coords.longitude.toString(), + }) + ); + + // Should log the location update + expect(mockLogger.info).toHaveBeenCalledWith({ + message: 'Foreground location update received', + context: { + latitude: mockLocationObject.coords.latitude, + longitude: mockLocationObject.coords.longitude, + heading: mockLocationObject.coords.heading, + }, + }); + }); + + it('should gracefully handle attempt to enable background when permissions denied', async () => { + // User tries to enable background geolocation but permissions are denied + await locationService.updateBackgroundGeolocationSetting(true); + + // Should log warning + expect(mockLogger.warn).toHaveBeenCalledWith({ + message: 'Cannot enable background geolocation: background permissions not granted', + context: { backgroundStatus: 'denied' }, + }); + + // Should not register background task + expect(mockLocation.startLocationUpdatesAsync).not.toHaveBeenCalled(); + }); + }); + + describe('Comprehensive Permission Scenarios', () => { + it('should work with foreground granted, background denied', async () => { + // This is the user's scenario - should work + const hasPermissions = await locationService.requestPermissions(); + expect(hasPermissions).toBe(true); + + await expect(locationService.startLocationUpdates()).resolves.not.toThrow(); + }); + + it('should work with both foreground and background granted', async () => { + // Mock both permissions as granted + mockLocation.requestBackgroundPermissionsAsync.mockResolvedValue({ + status: 'granted' as any, + expires: 'never', + granted: true, + canAskAgain: true, + }); + + mockLocation.getBackgroundPermissionsAsync.mockResolvedValue({ + status: 'granted' as any, + expires: 'never', + granted: true, + canAskAgain: true, + }); + + const hasPermissions = await locationService.requestPermissions(); + expect(hasPermissions).toBe(true); + + await expect(locationService.startLocationUpdates()).resolves.not.toThrow(); + }); + + it('should fail when foreground is denied (regardless of background)', async () => { + // Mock foreground as denied + mockLocation.requestForegroundPermissionsAsync.mockResolvedValue({ + status: 'denied' as any, + expires: 'never', + granted: false, + canAskAgain: true, + }); + + const hasPermissions = await locationService.requestPermissions(); + expect(hasPermissions).toBe(false); + + await expect(locationService.startLocationUpdates()).rejects.toThrow('Location permissions not granted'); + }); + }); + + describe('Background Task Management', () => { + it('should not register background task when background permissions denied', async () => { + mockLoadBackgroundGeolocationState.mockResolvedValue(true); // Setting enabled + + await locationService.startLocationUpdates(); + + // Should not register background task due to missing permissions + expect(mockLocation.startLocationUpdatesAsync).not.toHaveBeenCalled(); + }); + + it('should register background task when both setting and permissions are enabled', async () => { + // Enable background in settings + mockLoadBackgroundGeolocationState.mockResolvedValue(true); + + // Grant background permissions + mockLocation.getBackgroundPermissionsAsync.mockResolvedValue({ + status: 'granted' as any, + expires: 'never', + granted: true, + canAskAgain: true, + }); + + await locationService.startLocationUpdates(); + + // Should register background task + expect(mockLocation.startLocationUpdatesAsync).toHaveBeenCalledWith( + 'location-updates', + expect.objectContaining({ + accuracy: Location.Accuracy.Balanced, + timeInterval: 15000, + distanceInterval: 10, + }) + ); + }); + }); +}); diff --git a/src/services/__tests__/location.test.ts b/src/services/__tests__/location.test.ts index 74c0f5d0..76ad8544 100644 --- a/src/services/__tests__/location.test.ts +++ b/src/services/__tests__/location.test.ts @@ -42,12 +42,14 @@ jest.mock('@/stores/app/location-store', () => ({ jest.mock('expo-location', () => { const mockRequestForegroundPermissions = jest.fn(); const mockRequestBackgroundPermissions = jest.fn(); + const mockGetBackgroundPermissions = jest.fn(); const mockWatchPositionAsync = jest.fn(); const mockStartLocationUpdatesAsync = jest.fn(); const mockStopLocationUpdatesAsync = jest.fn(); return { requestForegroundPermissionsAsync: mockRequestForegroundPermissions, requestBackgroundPermissionsAsync: mockRequestBackgroundPermissions, + getBackgroundPermissionsAsync: mockGetBackgroundPermissions, watchPositionAsync: mockWatchPositionAsync, startLocationUpdatesAsync: mockStartLocationUpdatesAsync, stopLocationUpdatesAsync: mockStopLocationUpdatesAsync, @@ -160,6 +162,13 @@ describe('LocationService', () => { canAskAgain: true, }); + mockLocation.getBackgroundPermissionsAsync.mockResolvedValue({ + status: 'granted' as any, + expires: 'never', + granted: true, + canAskAgain: true, + }); + mockLocation.watchPositionAsync.mockResolvedValue(mockLocationSubscription); mockLocation.startLocationUpdatesAsync.mockResolvedValue(); mockLocation.stopLocationUpdatesAsync.mockResolvedValue(); @@ -212,7 +221,7 @@ describe('LocationService', () => { expect(result).toBe(false); }); - it('should return false if background permission is denied', async () => { + it('should return true if foreground is granted but background is denied', async () => { mockLocation.requestBackgroundPermissionsAsync.mockResolvedValue({ status: 'denied' as any, expires: 'never', @@ -221,7 +230,7 @@ describe('LocationService', () => { }); const result = await locationService.requestPermissions(); - expect(result).toBe(false); + expect(result).toBe(true); // Should still work with just foreground permissions }); it('should log permission status', async () => { @@ -235,6 +244,25 @@ describe('LocationService', () => { }, }); }); + + it('should log permission status when background is denied', async () => { + mockLocation.requestBackgroundPermissionsAsync.mockResolvedValue({ + status: 'denied' as any, + expires: 'never', + granted: false, + canAskAgain: true, + }); + + await locationService.requestPermissions(); + + expect(mockLogger.info).toHaveBeenCalledWith({ + message: 'Location permissions requested', + context: { + foregroundStatus: 'granted', + backgroundStatus: 'denied', + }, + }); + }); }); describe('Location Updates', () => { @@ -252,11 +280,56 @@ describe('LocationService', () => { expect(mockLogger.info).toHaveBeenCalledWith({ message: 'Foreground location updates started', - context: { backgroundEnabled: false }, + context: { + backgroundEnabled: false, + backgroundPermissions: true, + backgroundSetting: false, + }, }); }); - it('should throw error if permissions are not granted', async () => { + it('should start foreground updates even when background permissions are denied', async () => { + mockLocation.getBackgroundPermissionsAsync.mockResolvedValue({ + status: 'denied' as any, + expires: 'never', + granted: false, + canAskAgain: true, + }); + + await locationService.startLocationUpdates(); + + expect(mockLocation.watchPositionAsync).toHaveBeenCalled(); + expect(mockLogger.info).toHaveBeenCalledWith({ + message: 'Foreground location updates started', + context: { + backgroundEnabled: false, + backgroundPermissions: false, + backgroundSetting: false, + }, + }); + }); + + it('should warn when background geolocation is enabled but permissions denied', async () => { + mockLoadBackgroundGeolocationState.mockResolvedValue(true); + mockLocation.getBackgroundPermissionsAsync.mockResolvedValue({ + status: 'denied' as any, + expires: 'never', + granted: false, + canAskAgain: true, + }); + + await locationService.startLocationUpdates(); + + expect(mockLogger.warn).toHaveBeenCalledWith({ + message: 'Background geolocation enabled but permissions denied, running in foreground-only mode', + context: { + backgroundStatus: 'denied', + settingEnabled: true, + }, + }); + }); + + it('should throw error if foreground permissions are not granted', async () => { mockLocation.requestForegroundPermissionsAsync.mockResolvedValue({ status: 'denied' as any, expires: 'never', @@ -267,7 +340,7 @@ describe('LocationService', () => { await expect(locationService.startLocationUpdates()).rejects.toThrow('Location permissions not granted'); }); - it('should register background task if background geolocation is enabled', async () => { + it('should register background task if background geolocation is enabled and permissions granted', async () => { mockLoadBackgroundGeolocationState.mockResolvedValue(true); await locationService.startLocationUpdates(); @@ -281,6 +354,29 @@ describe('LocationService', () => { notificationBody: 'Tracking your location in the background', }, }); + + expect(mockLogger.info).toHaveBeenCalledWith({ + message: 'Foreground location updates started', + context: { + backgroundEnabled: true, + backgroundPermissions: true, + backgroundSetting: true, + }, + }); + }); + + it('should not register background task if background permissions are denied', async () => { + mockLoadBackgroundGeolocationState.mockResolvedValue(true); + mockLocation.getBackgroundPermissionsAsync.mockResolvedValue({ + status: 'denied' as any, + expires: 'never', + granted: false, + canAskAgain: true, + }); + + await locationService.startLocationUpdates(); + + expect(mockLocation.startLocationUpdatesAsync).not.toHaveBeenCalled(); }); it('should not register background task if already registered', async () => { @@ -482,7 +578,7 @@ describe('LocationService', () => { }); describe('Background Geolocation Setting Updates', () => { - it('should enable background tracking and register task', async () => { + it('should enable background tracking and register task when permissions are granted', async () => { await locationService.updateBackgroundGeolocationSetting(true); expect(mockLocation.startLocationUpdatesAsync).toHaveBeenCalledWith( @@ -495,6 +591,23 @@ describe('LocationService', () => { ); }); + it('should warn and not register task when background permissions are denied', async () => { + mockLocation.getBackgroundPermissionsAsync.mockResolvedValue({ + status: 'denied' as any, + expires: 'never', + granted: false, + canAskAgain: true, + }); + + await locationService.updateBackgroundGeolocationSetting(true); + + expect(mockLocation.startLocationUpdatesAsync).not.toHaveBeenCalled(); + expect(mockLogger.warn).toHaveBeenCalledWith({ + message: 'Cannot enable background geolocation: background permissions not granted', + context: { backgroundStatus: 'denied' }, + }); + }); + it('should disable background tracking and unregister task', async () => { mockTaskManager.isTaskRegisteredAsync.mockResolvedValue(true); @@ -511,6 +624,15 @@ describe('LocationService', () => { expect(startBackgroundUpdatesSpy).toHaveBeenCalled(); }); + + it('should not start background updates if app is active when enabled', async () => { + (AppState as any).currentState = 'active'; + const startBackgroundUpdatesSpy = jest.spyOn(locationService, 'startBackgroundUpdates'); + + await locationService.updateBackgroundGeolocationSetting(true); + + expect(startBackgroundUpdatesSpy).not.toHaveBeenCalled(); + }); }); describe('Cleanup', () => { @@ -543,6 +665,80 @@ describe('LocationService', () => { }); }); + describe('Foreground-only Mode (Background Permissions Denied)', () => { + beforeEach(() => { + // Mock background permissions as denied for these tests + mockLocation.getBackgroundPermissionsAsync.mockResolvedValue({ + status: 'denied' as any, + expires: 'never', + granted: false, + canAskAgain: true, + }); + mockLocation.requestBackgroundPermissionsAsync.mockResolvedValue({ + status: 'denied' as any, + expires: 'never', + granted: false, + canAskAgain: true, + }); + }); + + it('should allow location tracking with only foreground permissions', async () => { + const result = await locationService.requestPermissions(); + expect(result).toBe(true); + + await expect(locationService.startLocationUpdates()).resolves.not.toThrow(); + expect(mockLocation.watchPositionAsync).toHaveBeenCalled(); + }); + + it('should log correct permission status when background is denied', async () => { + await locationService.requestPermissions(); + + expect(mockLogger.info).toHaveBeenCalledWith({ + message: 'Location permissions requested', + context: { + foregroundStatus: 'granted', + backgroundStatus: 'denied', + }, + }); + }); + + it('should start foreground updates and warn about background limitations', async () => { + mockLoadBackgroundGeolocationState.mockResolvedValue(true); // User wants background but can't have it + + await locationService.startLocationUpdates(); + + expect(mockLocation.watchPositionAsync).toHaveBeenCalled(); + expect(mockLogger.warn).toHaveBeenCalledWith({ + message: 'Background geolocation enabled but permissions denied, running in foreground-only mode', + context: { + backgroundStatus: 'denied', + settingEnabled: true, + }, + }); + expect(mockLocation.startLocationUpdatesAsync).not.toHaveBeenCalled(); + }); + + it('should handle location updates in foreground-only mode', async () => { + await locationService.startLocationUpdates(); + + const locationCallback = mockLocation.watchPositionAsync.mock.calls[0][1] as Function; + await locationCallback(mockLocationObject); + + expect(mockLocationStoreState.setLocation).toHaveBeenCalledWith(mockLocationObject); + expect(mockSetUnitLocation).toHaveBeenCalledWith(expect.any(SaveUnitLocationInput)); + }); + + it('should not enable background geolocation when permissions are denied', async () => { + await locationService.updateBackgroundGeolocationSetting(true); + + expect(mockLogger.warn).toHaveBeenCalledWith({ + message: 'Cannot enable background geolocation: background permissions not granted', + context: { backgroundStatus: 'denied' }, + }); + expect(mockLocation.startLocationUpdatesAsync).not.toHaveBeenCalled(); + }); + }); + describe('Error Handling', () => { it('should handle location subscription errors', async () => { const error = new Error('Location subscription failed'); diff --git a/src/services/__tests__/signalr.service.enhanced.test.ts b/src/services/__tests__/signalr.service.enhanced.test.ts new file mode 100644 index 00000000..66fe82bc --- /dev/null +++ b/src/services/__tests__/signalr.service.enhanced.test.ts @@ -0,0 +1,278 @@ +import { HubConnection, HubConnectionBuilder, LogLevel } from '@microsoft/signalr'; + +import { logger } from '@/lib/logging'; + +// Mock the env module +jest.mock('@/lib/env', () => ({ + Env: { + REALTIME_GEO_HUB_NAME: 'geolocationHub', + CHANNEL_HUB_NAME: 'channelHub', + }, +})); + +// Mock the auth store +jest.mock('@/stores/auth/store', () => { + const mockRefreshAccessToken = jest.fn().mockResolvedValue(undefined); + const mockGetState = jest.fn(() => ({ + accessToken: 'mock-token', + refreshAccessToken: mockRefreshAccessToken, + })); + return { + __esModule: true, + default: { + getState: mockGetState, + }, + }; +}); + +import useAuthStore from '@/stores/auth/store'; +import { SignalRService, SignalRHubConnectConfig } from '../signalr.service'; + +// Mock the dependencies +jest.mock('@microsoft/signalr'); +jest.mock('@/lib/logging'); + +const mockGetState = (useAuthStore as any).getState; +const mockRefreshAccessToken = jest.fn().mockResolvedValue(undefined); + +const mockHubConnectionBuilder = HubConnectionBuilder as jest.MockedClass; +const mockLogger = logger as jest.Mocked; + +describe('SignalRService - Enhanced Features', () => { + let mockConnection: jest.Mocked; + let mockBuilderInstance: jest.Mocked; + + beforeEach(() => { + jest.clearAllMocks(); + + // Reset SignalR service singleton + SignalRService.resetInstance(); + + // Mock HubConnection + mockConnection = { + start: jest.fn().mockResolvedValue(undefined), + stop: jest.fn().mockResolvedValue(undefined), + invoke: jest.fn().mockResolvedValue(undefined), + on: jest.fn(), + onclose: jest.fn(), + onreconnecting: jest.fn(), + onreconnected: jest.fn(), + } as any; + + // Mock HubConnectionBuilder + mockBuilderInstance = { + withUrl: jest.fn().mockReturnThis(), + withAutomaticReconnect: jest.fn().mockReturnThis(), + configureLogging: jest.fn().mockReturnThis(), + build: jest.fn().mockReturnValue(mockConnection), + } as any; + + mockHubConnectionBuilder.mockImplementation(() => mockBuilderInstance); + + // Reset refresh token mock + mockRefreshAccessToken.mockClear(); + mockRefreshAccessToken.mockResolvedValue(undefined); + + // Mock auth store + mockGetState.mockReturnValue({ + accessToken: 'mock-token', + refreshAccessToken: mockRefreshAccessToken, + }); + }); + + describe('Singleton behavior', () => { + it('should return the same instance when called multiple times', () => { + const instance1 = SignalRService.getInstance(); + const instance2 = SignalRService.getInstance(); + const instance3 = SignalRService.getInstance(); + + expect(instance1).toBe(instance2); + expect(instance2).toBe(instance3); + }); + + it('should safely reset instance', async () => { + const originalInstance = SignalRService.getInstance(); + + // Mock disconnectAll to avoid actual disconnection + const disconnectAllSpy = jest.spyOn(originalInstance, 'disconnectAll').mockResolvedValue(); + + SignalRService.resetInstance(); + + const newInstance = SignalRService.getInstance(); + + expect(newInstance).not.toBe(originalInstance); + expect(disconnectAllSpy).toHaveBeenCalled(); + + disconnectAllSpy.mockRestore(); + }); + + it('should create instance with proper logging', () => { + SignalRService.getInstance(); + + expect(mockLogger.info).toHaveBeenCalledWith({ + message: 'SignalR service singleton instance created', + }); + }); + }); + + describe('Connection locking', () => { + const mockConfig: SignalRHubConnectConfig = { + name: 'testHub', + eventingUrl: 'https://api.example.com/', + hubName: 'eventingHub', + methods: ['method1'], + }; + + it('should prevent concurrent connections to the same hub', async () => { + const service = SignalRService.getInstance(); + + // Start first connection (don't await) + const firstConnection = service.connectToHubWithEventingUrl(mockConfig); + + // Start second connection while first is in progress + const secondConnection = service.connectToHubWithEventingUrl(mockConfig); + + // Both should complete successfully + await Promise.all([firstConnection, secondConnection]); + + // Should only have built one connection + expect(mockHubConnectionBuilder).toHaveBeenCalledTimes(1); + expect(mockConnection.start).toHaveBeenCalledTimes(1); + }); + + it('should wait for ongoing connection before disconnecting', async () => { + const service = SignalRService.getInstance(); + + // Start connection (don't await) + const connectionPromise = service.connectToHubWithEventingUrl(mockConfig); + + // Start disconnect while connection is in progress + const disconnectPromise = service.disconnectFromHub(mockConfig.name); + + // Wait for both to complete + await Promise.all([connectionPromise, disconnectPromise]); + + // Should have connected then disconnected + expect(mockConnection.start).toHaveBeenCalledTimes(1); + expect(mockConnection.stop).toHaveBeenCalledTimes(1); + }); + + it('should wait for ongoing connection before invoking method', async () => { + const service = SignalRService.getInstance(); + + // Start connection (don't await) + const connectionPromise = service.connectToHubWithEventingUrl(mockConfig); + + // Start invoke while connection is in progress + const invokePromise = service.invoke(mockConfig.name, 'testMethod', { data: 'test' }); + + // Wait for both to complete + await Promise.all([connectionPromise, invokePromise]); + + // Should have connected then invoked + expect(mockConnection.start).toHaveBeenCalledTimes(1); + expect(mockConnection.invoke).toHaveBeenCalledTimes(1); + }); + + it('should log when waiting for ongoing connection', async () => { + const service = SignalRService.getInstance(); + + // Start first connection + const firstConnection = service.connectToHubWithEventingUrl(mockConfig); + + // Start second connection - should wait + const secondConnection = service.connectToHubWithEventingUrl(mockConfig); + + await Promise.all([firstConnection, secondConnection]); + + expect(mockLogger.info).toHaveBeenCalledWith({ + message: `Connection to hub ${mockConfig.name} is already in progress, waiting...`, + }); + }); + }); + + describe('Enhanced reconnection logic', () => { + const mockConfig: SignalRHubConnectConfig = { + name: 'testHub', + eventingUrl: 'https://api.example.com/', + hubName: 'eventingHub', + methods: ['method1'], + }; + + it('should properly schedule reconnection attempts', async () => { + const service = SignalRService.getInstance(); + + // Connect to hub + await service.connectToHubWithEventingUrl(mockConfig); + + // Get the onclose callback + const onCloseCallback = mockConnection.onclose.mock.calls[0][0]; + + // Use fake timers for this test + jest.useFakeTimers(); + + // Trigger connection close + onCloseCallback(); + + // Should log the reconnection attempt scheduling + expect(mockLogger.info).toHaveBeenCalledWith({ + message: `Scheduling reconnection attempt 1/5 for hub: ${mockConfig.name}`, + }); + + jest.useRealTimers(); + }); + + it('should cleanup resources after max reconnection attempts', async () => { + const service = SignalRService.getInstance(); + + // Connect to hub + await service.connectToHubWithEventingUrl(mockConfig); + + // Get the onclose callback + const onCloseCallback = mockConnection.onclose.mock.calls[0][0]; + + // Trigger connection close multiple times to exceed max attempts + for (let i = 0; i < 6; i++) { + onCloseCallback(); + } + + // Should log max attempts reached and cleanup + expect(mockLogger.error).toHaveBeenCalledWith({ + message: `Max reconnection attempts (5) reached for hub: ${mockConfig.name}`, + }); + }); + + it('should skip reconnection if already connected', async () => { + const service = SignalRService.getInstance(); + + // Connect to hub + await service.connectToHubWithEventingUrl(mockConfig); + + // Get the onclose callback + const onCloseCallback = mockConnection.onclose.mock.calls[0][0]; + + jest.useFakeTimers(); + + // Mock the connections map to indicate connection exists + const connectionsMap = (service as any).connections; + const originalHas = connectionsMap.has; + connectionsMap.has = jest.fn().mockReturnValue(true); + + // Trigger connection close + onCloseCallback(); + + // Fast forward time + jest.advanceTimersByTime(5000); + + // Should log skip message + expect(mockLogger.debug).toHaveBeenCalledWith({ + message: `Hub ${mockConfig.name} is already connected, skipping reconnection attempt`, + }); + + // Restore original method + connectionsMap.has = originalHas; + + jest.useRealTimers(); + }); + }); +}); diff --git a/src/services/__tests__/signalr.service.test.ts b/src/services/__tests__/signalr.service.test.ts index a58217d4..f5d8d7bd 100644 --- a/src/services/__tests__/signalr.service.test.ts +++ b/src/services/__tests__/signalr.service.test.ts @@ -21,6 +21,9 @@ jest.mock('@/stores/auth/store', () => { default: { getState: mockGetState, }, + useAuthStore: { + getState: mockGetState, + }, }; }); @@ -32,7 +35,7 @@ jest.mock('@microsoft/signalr'); jest.mock('@/lib/logging'); const mockGetState = (useAuthStore as any).getState; -const mockRefreshAccessToken = jest.fn().mockResolvedValue(undefined); +const mockRefreshAccessToken = mockGetState().refreshAccessToken; const mockHubConnectionBuilder = HubConnectionBuilder as jest.MockedClass; const mockLogger = logger as jest.Mocked; @@ -493,23 +496,29 @@ describe('SignalRService', () => { }; it('should attempt reconnection on connection close', async () => { + // Use fake timers to control setTimeout behavior + jest.useFakeTimers(); + // Connect to hub await signalRService.connectToHubWithEventingUrl(mockConfig); - // Get the onclose callback + // Verify onclose was called to register the callback + expect(mockConnection.onclose).toHaveBeenCalled(); + + // Get the onclose callback from the first call const onCloseCallback = mockConnection.onclose.mock.calls[0][0]; // Spy on the connectToHubWithEventingUrl method to track reconnection attempts const connectSpy = jest.spyOn(signalRService, 'connectToHubWithEventingUrl'); connectSpy.mockResolvedValue(); // Mock the reconnection call - // Use fake timers for setTimeout - jest.useFakeTimers(); + // Remove the connection to simulate it being closed + (signalRService as any).connections.delete(mockConfig.name); // Trigger connection close onCloseCallback(); - // Fast-forward time to trigger the setTimeout callback + // Advance timers by the exact reconnect interval (5000ms) jest.advanceTimersByTime(5000); // Wait for all promises to resolve @@ -528,32 +537,44 @@ describe('SignalRService', () => { it('should stop reconnection attempts after max attempts', async () => { jest.useFakeTimers(); - // Connect to hub + // Connect to hub first await signalRService.connectToHubWithEventingUrl(mockConfig); - // Get the onclose callback + // Verify onclose was called and get the callback + expect(mockConnection.onclose).toHaveBeenCalled(); const onCloseCallback = mockConnection.onclose.mock.calls[0][0]; + // Now set up the spy to make reconnection attempts fail + const connectSpy = jest.spyOn(signalRService, 'connectToHubWithEventingUrl'); + connectSpy.mockRejectedValue(new Error('Connection failed')); + + // Remove the connection to simulate it being closed + (signalRService as any).connections.delete(mockConfig.name); + // Simulate multiple failed reconnection attempts for (let i = 0; i < 6; i++) { onCloseCallback(); jest.advanceTimersByTime(5000); await jest.runAllTicks(); + // Simulate each attempt failing by removing the connection + (signalRService as any).connections.delete(mockConfig.name); } // Should log max attempts reached error expect(mockLogger.error).toHaveBeenCalledWith({ - message: `Max reconnection attempts reached for hub: ${mockConfig.name}`, + message: `Max reconnection attempts (5) reached for hub: ${mockConfig.name}`, }); jest.useRealTimers(); + connectSpy.mockRestore(); }); it('should reset reconnection attempts on successful reconnection', async () => { // Connect to hub await signalRService.connectToHubWithEventingUrl(mockConfig); - // Get the onreconnected callback + // Verify onreconnected was called and get the callback + expect(mockConnection.onreconnected).toHaveBeenCalled(); const onReconnectedCallback = mockConnection.onreconnected.mock.calls[0][0]; // Trigger reconnection @@ -574,13 +595,17 @@ describe('SignalRService', () => { // Connect to hub await signalRService.connectToHubWithEventingUrl(mockConfig); - // Get the onclose callback + // Verify onclose was called and get the callback + expect(mockConnection.onclose).toHaveBeenCalled(); const onCloseCallback = mockConnection.onclose.mock.calls[0][0]; // Spy on the connectToHubWithEventingUrl method to ensure it's not called when token refresh fails const connectSpy = jest.spyOn(signalRService, 'connectToHubWithEventingUrl'); connectSpy.mockResolvedValue(); + // Remove the connection to simulate it being closed + (signalRService as any).connections.delete(mockConfig.name); + // Trigger connection close onCloseCallback(); @@ -596,7 +621,7 @@ describe('SignalRService', () => { // Should have logged the failure expect(mockLogger.error).toHaveBeenCalledWith({ message: `Failed to refresh token or reconnect to hub: ${mockConfig.name}`, - context: { error: expect.any(Error), attempts: 1 }, + context: { error: expect.any(Error), attempts: 1, maxAttempts: 5 }, }); // Should NOT have called connectToHubWithEventingUrl due to token refresh failure diff --git a/src/services/location.ts b/src/services/location.ts index 418c13c8..5e63a068 100644 --- a/src/services/location.ts +++ b/src/services/location.ts @@ -138,7 +138,9 @@ class LocationService { }, }); - return foregroundStatus === 'granted' && backgroundStatus === 'granted'; + // Only require foreground permissions for basic functionality + // Background permissions are optional and will be handled separately + return foregroundStatus === 'granted'; } async startLocationUpdates(): Promise { @@ -147,24 +149,41 @@ class LocationService { throw new Error('Location permissions not granted'); } + // Check if we have background permissions for background tracking + const { status: backgroundStatus } = await Location.getBackgroundPermissionsAsync(); + const hasBackgroundPermissions = backgroundStatus === 'granted'; + // Load background geolocation setting this.isBackgroundGeolocationEnabled = await loadBackgroundGeolocationState(); - // Check if task is already registered for background updates - const isTaskRegistered = await TaskManager.isTaskRegisteredAsync(LOCATION_TASK_NAME); - if (!isTaskRegistered && this.isBackgroundGeolocationEnabled) { - await Location.startLocationUpdatesAsync(LOCATION_TASK_NAME, { - accuracy: Location.Accuracy.Balanced, - timeInterval: 15000, - distanceInterval: 10, - foregroundService: { - notificationTitle: 'Location Tracking', - notificationBody: 'Tracking your location in the background', + // Only register background task if both setting is enabled AND we have background permissions + const shouldEnableBackground = this.isBackgroundGeolocationEnabled && hasBackgroundPermissions; + + if (shouldEnableBackground) { + // Check if task is already registered for background updates + const isTaskRegistered = await TaskManager.isTaskRegisteredAsync(LOCATION_TASK_NAME); + if (!isTaskRegistered) { + await Location.startLocationUpdatesAsync(LOCATION_TASK_NAME, { + accuracy: Location.Accuracy.Balanced, + timeInterval: 15000, + distanceInterval: 10, + foregroundService: { + notificationTitle: 'Location Tracking', + notificationBody: 'Tracking your location in the background', + }, + }); + logger.info({ + message: 'Background location task registered', + }); + } + } else if (this.isBackgroundGeolocationEnabled && !hasBackgroundPermissions) { + logger.warn({ + message: 'Background geolocation enabled but permissions denied, running in foreground-only mode', + context: { + backgroundStatus, + settingEnabled: this.isBackgroundGeolocationEnabled, }, }); - logger.info({ - message: 'Background location task registered', - }); } // Start foreground updates @@ -190,7 +209,11 @@ class LocationService { logger.info({ message: 'Foreground location updates started', - context: { backgroundEnabled: this.isBackgroundGeolocationEnabled }, + context: { + backgroundEnabled: shouldEnableBackground, + backgroundPermissions: hasBackgroundPermissions, + backgroundSetting: this.isBackgroundGeolocationEnabled, + }, }); } @@ -241,6 +264,18 @@ class LocationService { this.isBackgroundGeolocationEnabled = enabled; if (enabled) { + // Check if we have background permissions before enabling + const { status: backgroundStatus } = await Location.getBackgroundPermissionsAsync(); + const hasBackgroundPermissions = backgroundStatus === 'granted'; + + if (!hasBackgroundPermissions) { + logger.warn({ + message: 'Cannot enable background geolocation: background permissions not granted', + context: { backgroundStatus }, + }); + return; + } + // Register the task if not already registered const isTaskRegistered = await TaskManager.isTaskRegisteredAsync(LOCATION_TASK_NAME); if (!isTaskRegistered) { diff --git a/src/services/signalr.service.ts b/src/services/signalr.service.ts index b2c0c8d0..4c1604c6 100644 --- a/src/services/signalr.service.ts +++ b/src/services/signalr.service.ts @@ -26,21 +26,83 @@ class SignalRService { private connections: Map = new Map(); private reconnectAttempts: Map = new Map(); private hubConfigs: Map = new Map(); + private connectionLocks: Map> = new Map(); private readonly MAX_RECONNECT_ATTEMPTS = 5; private readonly RECONNECT_INTERVAL = 5000; // 5 seconds - private static instance: SignalRService; + private static instance: SignalRService | null = null; + private static isCreating = false; private constructor() {} public static getInstance(): SignalRService { - if (!SignalRService.instance) { - SignalRService.instance = new SignalRService(); + // Prevent multiple instances even in race conditions + if (SignalRService.instance) { + return SignalRService.instance; } + + // Check if another thread is already creating the instance + if (SignalRService.isCreating) { + // Wait for the instance to be created by polling + const pollInterval = 10; // 10ms + const maxWaitTime = 5000; // 5 seconds + let waitTime = 0; + + while (!SignalRService.instance && waitTime < maxWaitTime) { + // Synchronous wait (not ideal in production, but prevents race conditions) + const start = Date.now(); + while (Date.now() - start < pollInterval) { + // Busy wait + } + waitTime += pollInterval; + } + + if (SignalRService.instance) { + return SignalRService.instance; + } + } + + // Set flag to indicate instance creation is in progress + SignalRService.isCreating = true; + + try { + if (!SignalRService.instance) { + SignalRService.instance = new SignalRService(); + logger.info({ + message: 'SignalR service singleton instance created', + }); + } + } finally { + SignalRService.isCreating = false; + } + return SignalRService.instance; } public async connectToHubWithEventingUrl(config: SignalRHubConnectConfig): Promise { + // Check for existing lock to prevent concurrent connections to the same hub + const existingLock = this.connectionLocks.get(config.name); + if (existingLock) { + logger.info({ + message: `Connection to hub ${config.name} is already in progress, waiting...`, + }); + await existingLock; + return; + } + + // Create a new connection promise and store it as a lock + const connectionPromise = this._connectToHubWithEventingUrlInternal(config); + this.connectionLocks.set(config.name, connectionPromise); + + try { + await connectionPromise; + } finally { + // Remove the lock after connection completes (success or failure) + this.connectionLocks.delete(config.name); + } + } + + private async _connectToHubWithEventingUrlInternal(config: SignalRHubConnectConfig): Promise { try { if (this.connections.has(config.name)) { logger.info({ @@ -158,6 +220,29 @@ class SignalRService { } public async connectToHub(config: SignalRHubConfig): Promise { + // Check for existing lock to prevent concurrent connections to the same hub + const existingLock = this.connectionLocks.get(config.name); + if (existingLock) { + logger.info({ + message: `Connection to hub ${config.name} is already in progress, waiting...`, + }); + await existingLock; + return; + } + + // Create a new connection promise and store it as a lock + const connectionPromise = this._connectToHubInternal(config); + this.connectionLocks.set(config.name, connectionPromise); + + try { + await connectionPromise; + } finally { + // Remove the lock after connection completes (success or failure) + this.connectionLocks.delete(config.name); + } + } + + private async _connectToHubInternal(config: SignalRHubConfig): Promise { try { if (this.connections.has(config.name)) { logger.info({ @@ -244,8 +329,20 @@ class SignalRService { const hubConfig = this.hubConfigs.get(hubName); if (hubConfig) { + logger.info({ + message: `Scheduling reconnection attempt ${currentAttempts}/${this.MAX_RECONNECT_ATTEMPTS} for hub: ${hubName}`, + }); + setTimeout(async () => { try { + // Check if connection was re-established during the delay + if (this.connections.has(hubName)) { + logger.debug({ + message: `Hub ${hubName} is already connected, skipping reconnection attempt`, + }); + return; + } + // Refresh authentication token before reconnecting logger.info({ message: `Refreshing authentication token before reconnecting to hub: ${hubName}`, @@ -260,30 +357,41 @@ class SignalRService { } logger.info({ - message: `Token refreshed successfully, attempting to reconnect to hub: ${hubName}`, + message: `Token refreshed successfully, attempting to reconnect to hub: ${hubName} (attempt ${currentAttempts}/${this.MAX_RECONNECT_ATTEMPTS})`, }); + // Remove the connection from our maps to allow fresh connection + this.connections.delete(hubName); + await this.connectToHubWithEventingUrl(hubConfig); + + logger.info({ + message: `Successfully reconnected to hub: ${hubName} after ${currentAttempts} attempts`, + }); } catch (error) { logger.error({ message: `Failed to refresh token or reconnect to hub: ${hubName}`, - context: { error, attempts: currentAttempts }, + context: { error, attempts: currentAttempts, maxAttempts: this.MAX_RECONNECT_ATTEMPTS }, }); - // Don't attempt reconnection if token refresh failed - // The next reconnection attempt will be handled by the next connection close event - // if the token becomes available again + // Don't immediately retry; let the next connection close event trigger another attempt + // This prevents rapid retry loops that could overwhelm the server } }, this.RECONNECT_INTERVAL); } else { logger.error({ - message: `No stored config found for hub: ${hubName}`, + message: `No stored config found for hub: ${hubName}, cannot attempt reconnection`, }); } } else { logger.error({ - message: `Max reconnection attempts reached for hub: ${hubName}`, + message: `Max reconnection attempts (${this.MAX_RECONNECT_ATTEMPTS}) reached for hub: ${hubName}`, }); + + // Clean up resources for this failed connection + this.connections.delete(hubName); + this.reconnectAttempts.delete(hubName); + this.hubConfigs.delete(hubName); } } @@ -297,6 +405,23 @@ class SignalRService { } public async disconnectFromHub(hubName: string): Promise { + // Wait for any ongoing connection attempt to complete + const existingLock = this.connectionLocks.get(hubName); + if (existingLock) { + logger.info({ + message: `Waiting for ongoing connection to hub ${hubName} to complete before disconnecting`, + }); + try { + await existingLock; + } catch (error) { + // Ignore connection errors when we're trying to disconnect + logger.debug({ + message: `Connection attempt failed while waiting to disconnect from hub ${hubName}`, + context: { error }, + }); + } + } + const connection = this.connections.get(hubName); if (connection) { try { @@ -318,6 +443,16 @@ class SignalRService { } public async invoke(hubName: string, method: string, data: unknown): Promise { + // Wait for any ongoing connection attempt to complete + const existingLock = this.connectionLocks.get(hubName); + if (existingLock) { + logger.debug({ + message: `Waiting for ongoing connection to hub ${hubName} to complete before invoking method`, + context: { method }, + }); + await existingLock; + } + const connection = this.connections.get(hubName); if (connection) { try { @@ -332,6 +467,24 @@ class SignalRService { } } + // Method to reset the singleton instance (primarily for testing) + public static resetInstance(): void { + if (SignalRService.instance) { + // Disconnect all connections before resetting + SignalRService.instance.disconnectAll().catch((error) => { + logger.error({ + message: 'Error disconnecting all hubs during instance reset', + context: { error }, + }); + }); + } + SignalRService.instance = null; + SignalRService.isCreating = false; + logger.debug({ + message: 'SignalR service singleton instance reset', + }); + } + public async disconnectAll(): Promise { const disconnectPromises = Array.from(this.connections.keys()).map((hubName) => this.disconnectFromHub(hubName)); await Promise.all(disconnectPromises); @@ -357,3 +510,4 @@ class SignalRService { } export const signalRService = SignalRService.getInstance(); +export { SignalRService }; diff --git a/src/stores/status/__tests__/store.test.ts b/src/stores/status/__tests__/store.test.ts index 3718f72f..d05ee6a8 100644 --- a/src/stores/status/__tests__/store.test.ts +++ b/src/stores/status/__tests__/store.test.ts @@ -309,7 +309,11 @@ describe('StatusesStore', () => { input.Type = '1'; await act(async () => { - await result.current.saveUnitStatus(input); + try { + await result.current.saveUnitStatus(input); + } catch (error) { + // Expected to throw now since we re-throw critical errors + } }); expect(result.current.isLoading).toBe(false); diff --git a/src/stores/status/store.ts b/src/stores/status/store.ts index 2fdba32d..64689100 100644 --- a/src/stores/status/store.ts +++ b/src/stores/status/store.ts @@ -150,18 +150,28 @@ export const useStatusesStore = create((set) => ({ // Try to save directly first await saveUnitStatus(input); - // Refresh the active unit status after saving - const activeUnit = useCoreStore.getState().activeUnit; - if (activeUnit) { - await useCoreStore.getState().setActiveUnitWithFetch(activeUnit.UnitId); - } + // Set loading to false immediately after successful save + set({ isLoading: false }); logger.info({ message: 'Unit status saved successfully', context: { unitId: input.Id, statusType: input.Type }, }); - set({ isLoading: false }); + // Refresh the active unit status in the background (don't await) + // This allows the UI to be responsive while the data refreshes + const activeUnit = useCoreStore.getState().activeUnit; + if (activeUnit) { + useCoreStore + .getState() + .setActiveUnitWithFetch(activeUnit.UnitId) + .catch((error) => { + logger.error({ + message: 'Failed to refresh unit data after status save', + context: { unitId: activeUnit.UnitId, error }, + }); + }); + } } catch (error) { // If direct save fails, queue for offline processing logger.warn({ @@ -220,6 +230,7 @@ export const useStatusesStore = create((set) => ({ context: { error }, }); set({ error: 'Failed to save unit status', isLoading: false }); + throw error; // Re-throw to allow calling code to handle error } }, })); diff --git a/src/translations/ar.json b/src/translations/ar.json index 2a96a6a9..1b8ffdbd 100644 --- a/src/translations/ar.json +++ b/src/translations/ar.json @@ -548,6 +548,7 @@ "background_geolocation_warning": "تسمح هذه الميزة للتطبيق بتتبع موقعك في الخلفية. تساعد في تنسيق الاستجابة للطوارئ ولكن قد تؤثر على عمر البطارية.", "background_location": "الموقع في الخلفية", "contact_us": "اتصل بنا", + "current_unit": "الوحدة الحالية", "english": "إنجليزي", "enter_password": "أدخل كلمة المرور الخاصة بك", "enter_server_url": "أدخل عنوان URL لواجهة برمجة تطبيقات Resgrid (مثال: https://api.resgrid.com)", diff --git a/src/translations/en.json b/src/translations/en.json index 38804bf0..0d722db3 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -548,6 +548,7 @@ "background_geolocation_warning": "This feature allows the app to track your location in the background. It helps with emergency response coordination but may impact battery life.", "background_location": "Background Location", "contact_us": "Contact Us", + "current_unit": "Current Unit", "english": "English", "enter_password": "Enter your password", "enter_server_url": "Enter Resgrid API URL (e.g., https://api.resgrid.com)", diff --git a/src/translations/es.json b/src/translations/es.json index 13d20c79..b76a8dcc 100644 --- a/src/translations/es.json +++ b/src/translations/es.json @@ -548,6 +548,7 @@ "background_geolocation_warning": "Esta función permite que la aplicación rastree tu ubicación en segundo plano. Ayuda con la coordinación de respuesta de emergencia pero puede impactar la duración de la batería.", "background_location": "Ubicación en segundo plano", "contact_us": "Contáctanos", + "current_unit": "Unidad Actual", "english": "Inglés", "enter_password": "Introduce tu contraseña", "enter_server_url": "Introduce la URL de la API de Resgrid (ej: https://api.resgrid.com)", diff --git a/src/utils/b01-inrico-debug.ts b/src/utils/b01-inrico-debug.ts deleted file mode 100644 index dc23f051..00000000 --- a/src/utils/b01-inrico-debug.ts +++ /dev/null @@ -1,143 +0,0 @@ -/** - * B01 Inrico Button Code Debug Helper - * - * This script helps you determine the correct button codes for your B01 Inrico handheld device. - * To use this: - * - * 1. Connect your B01 Inrico device to the app - * 2. Press different buttons on the device - * 3. Look at the logs to see what raw button codes are being received - * 4. Use this information to update the button mapping - * - * Usage in your app: - * ```typescript - * import { debugB01InricoButtons } from '@/utils/b01-inrico-debug'; - * - * // Call this to test specific hex codes - * debugB01InricoButtons('01'); // Test PTT start - * debugB01InricoButtons('00'); // Test PTT stop - * debugB01InricoButtons('81'); // Test PTT with long press flag - * ``` - */ - -import { bluetoothAudioService } from '@/services/bluetooth-audio.service'; - -export function debugB01InricoButtons(hexCode: string) { - console.log(`\n=== DEBUGGING B01 INRICO BUTTON CODE: ${hexCode} ===`); - - const result = bluetoothAudioService.testB01InricoButtonMapping(hexCode); - - console.log('Parsed Result:', result); - console.log('Expected Actions:'); - - if (result?.button === 'ptt_start') { - console.log(' → Should enable microphone (push-to-talk START)'); - } else if (result?.button === 'ptt_stop') { - console.log(' → Should disable microphone (push-to-talk STOP)'); - } else if (result?.button === 'mute') { - console.log(' → Should toggle microphone mute'); - } else if (result?.button === 'volume_up') { - console.log(' → Should increase volume'); - } else if (result?.button === 'volume_down') { - console.log(' → Should decrease volume'); - } else { - console.log(' → Unknown button - no action will be taken'); - } - - if (result?.type === 'long_press') { - console.log(' → LONG PRESS detected'); - } else if (result?.type === 'double_press') { - console.log(' → DOUBLE PRESS detected'); - } - - console.log('=== END DEBUG ===\n'); - - return result; -} - -/** - * Common B01 Inrico button codes to test - * Use these as a starting point for your device testing - */ -export const COMMON_B01_BUTTON_CODES = { - // Basic codes (0x00-0x05) - PTT_STOP: '00', - PTT_START: '01', - MUTE: '02', - VOLUME_UP: '03', - VOLUME_DOWN: '04', - EMERGENCY: '05', - - // Original mappings (0x10-0x40) - PTT_START_ALT: '10', - PTT_STOP_ALT: '11', - MUTE_ALT: '20', - VOLUME_UP_ALT: '30', - VOLUME_DOWN_ALT: '40', - - // Long press variants (with 0x80 flag) - PTT_START_LONG: '81', // 0x01 + 0x80 - PTT_STOP_LONG: '80', // 0x00 + 0x80 - MUTE_LONG: '82', // 0x02 + 0x80 - - // Multi-byte examples - PTT_START_WITH_FLAG: '0101', // PTT start + long press indicator - PTT_START_WITH_DOUBLE: '0102', // PTT start + double press indicator -}; - -/** - * Test all common button codes - */ -export function testAllCommonB01Codes() { - console.log('\n🔍 TESTING ALL COMMON B01 INRICO BUTTON CODES\n'); - - Object.entries(COMMON_B01_BUTTON_CODES).forEach(([name, code]) => { - console.log(`\n--- Testing ${name} (${code}) ---`); - debugB01InricoButtons(code); - }); - - console.log('\n✅ TESTING COMPLETE\n'); -} - -/** - * Instructions for manual testing with your actual device - */ -export function showManualTestingInstructions() { - console.log(` -🎯 MANUAL TESTING INSTRUCTIONS FOR B01 INRICO DEVICE - -1. Ensure your B01 Inrico device is connected to the app -2. Open the app logs/console to watch for button events -3. Press each button on your device ONE AT A TIME -4. Note the raw hex codes that appear in the logs -5. Fill out this mapping: - - Button Name | Raw Hex Code | Current Mapping - -------------------- | ------------ | --------------- - PTT Press | ???? | ${COMMON_B01_BUTTON_CODES.PTT_START} - PTT Release | ???? | ${COMMON_B01_BUTTON_CODES.PTT_STOP} - Volume Up | ???? | ${COMMON_B01_BUTTON_CODES.VOLUME_UP} - Volume Down | ???? | ${COMMON_B01_BUTTON_CODES.VOLUME_DOWN} - Mute/Unmute | ???? | ${COMMON_B01_BUTTON_CODES.MUTE} - Emergency (if any) | ???? | ${COMMON_B01_BUTTON_CODES.EMERGENCY} - PTT Long Press | ???? | ${COMMON_B01_BUTTON_CODES.PTT_START_LONG} - -6. Use the debugB01InricoButtons() function to test specific codes: - - debugB01InricoButtons('YOUR_HEX_CODE_HERE'); - -7. Update the button mapping in bluetooth-audio.service.ts based on your findings - -💡 TIP: Look for these patterns in the logs: - - "B01 Inrico raw button data analysis" - - "rawHex" field shows the exact bytes received - - "Unknown B01 Inrico button code received" for unmapped buttons - `); -} - -export default { - debugB01InricoButtons, - testAllCommonB01Codes, - showManualTestingInstructions, - COMMON_B01_BUTTON_CODES, -}; diff --git a/tsconfig.json b/tsconfig.json index 21b5817d..267d4b5f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -30,5 +30,5 @@ } }, "exclude": ["docs", "cli", "android", "lib", "ios", "node_modules", "storybookDocsComponents"], - "include": ["src/**/*.ts", "src/**/*.tsx", ".expo/types/**/*.ts", "expo-env.d.ts", "nativewind-env.d.ts", "__mocks__/**/*.ts", "app.config.ts", "jest-setup.ts", "__tests__/**/*.ts", "__tests__/**/*.tsx"] + "include": ["src/**/*.ts", "src/**/*.tsx", ".expo/types/**/*.ts", "expo-env.d.ts", "nativewind-env.d.ts", "__mocks__/**/*.ts", "app.config.ts", "jest-setup.ts", "__tests__/**/*.ts", "__tests__/**/*.tsx", "types/**/*.ts"] } diff --git a/types/expo-random.d.ts b/types/expo-random.d.ts new file mode 100644 index 00000000..e69de29b diff --git a/yarn.lock b/yarn.lock index 70ff17be..11ea15a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -72,6 +72,27 @@ json5 "^2.2.3" semver "^6.3.1" +"@babel/core@^7.24.7": + version "7.28.3" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.28.3.tgz#aceddde69c5d1def69b839d09efa3e3ff59c97cb" + integrity sha512-yDBHV9kQNcr2/sUr9jghVyz9C3Y5G2zUM2H2lo+9mKv4sFgbA8s8Z9t8D1jiTkGoO/NoIfKMyKWr4s6CN23ZwQ== + dependencies: + "@ampproject/remapping" "^2.2.0" + "@babel/code-frame" "^7.27.1" + "@babel/generator" "^7.28.3" + "@babel/helper-compilation-targets" "^7.27.2" + "@babel/helper-module-transforms" "^7.28.3" + "@babel/helpers" "^7.28.3" + "@babel/parser" "^7.28.3" + "@babel/template" "^7.27.2" + "@babel/traverse" "^7.28.3" + "@babel/types" "^7.28.2" + convert-source-map "^2.0.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.2.3" + semver "^6.3.1" + "@babel/core@~7.26.0": version "7.26.10" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.26.10.tgz#5c876f83c8c4dcb233ee4b670c0606f2ac3000f9" @@ -104,6 +125,17 @@ "@jridgewell/trace-mapping" "^0.3.28" jsesc "^3.0.2" +"@babel/generator@^7.28.3": + version "7.28.3" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.3.tgz#9626c1741c650cbac39121694a0f2d7451b8ef3e" + integrity sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw== + dependencies: + "@babel/parser" "^7.28.3" + "@babel/types" "^7.28.2" + "@jridgewell/gen-mapping" "^0.3.12" + "@jridgewell/trace-mapping" "^0.3.28" + jsesc "^3.0.2" + "@babel/helper-annotate-as-pure@^7.27.1", "@babel/helper-annotate-as-pure@^7.27.3": version "7.27.3" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz#f31fd86b915fc4daf1f3ac6976c59be7084ed9c5" @@ -185,6 +217,15 @@ "@babel/helper-validator-identifier" "^7.27.1" "@babel/traverse" "^7.27.3" +"@babel/helper-module-transforms@^7.28.3": + version "7.28.3" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz#a2b37d3da3b2344fe085dab234426f2b9a2fa5f6" + integrity sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw== + dependencies: + "@babel/helper-module-imports" "^7.27.1" + "@babel/helper-validator-identifier" "^7.27.1" + "@babel/traverse" "^7.28.3" + "@babel/helper-optimise-call-expression@^7.27.1": version "7.27.1" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz#c65221b61a643f3e62705e5dd2b5f115e35f9200" @@ -255,6 +296,14 @@ "@babel/template" "^7.27.2" "@babel/types" "^7.27.6" +"@babel/helpers@^7.28.3": + version "7.28.3" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.28.3.tgz#b83156c0a2232c133d1b535dd5d3452119c7e441" + integrity sha512-PTNtvUQihsAsDHMOP5pfobP8C6CM4JWXmP8DrEIt46c3r2bf87Ua1zoqevsMo9g+tWDwgWrFP5EIxuBx5RudAw== + dependencies: + "@babel/template" "^7.27.2" + "@babel/types" "^7.28.2" + "@babel/highlight@^7.10.4": version "7.25.9" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.25.9.tgz#8141ce68fc73757946f983b343f1231f4691acc6" @@ -272,6 +321,13 @@ dependencies: "@babel/types" "^7.28.0" +"@babel/parser@^7.24.7", "@babel/parser@^7.28.3": + version "7.28.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.3.tgz#d2d25b814621bca5fe9d172bc93792547e7a2a71" + integrity sha512-7+Ey1mAgYqFAx2h0RuoxcQT5+MlG3GTV0TQrgr7/ZliKsm/MNDxVVutlWaziMq7wJNAz8MTqz55XLpWvva6StA== + dependencies: + "@babel/types" "^7.28.2" + "@babel/plugin-proposal-class-properties@^7.13.0": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3" @@ -500,7 +556,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.27.1" -"@babel/plugin-transform-class-properties@^7.0.0-0", "@babel/plugin-transform-class-properties@^7.25.4": +"@babel/plugin-transform-class-properties@^7.0.0-0", "@babel/plugin-transform-class-properties@^7.24.7", "@babel/plugin-transform-class-properties@^7.25.4": version "7.27.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.27.1.tgz#dd40a6a370dfd49d32362ae206ddaf2bb082a925" integrity sha512-D0VcalChDMtuRvJIu3U/fwWjf8ZMykz5iZsg77Nuj821vCKI3zCyRLwRdWbsuJ/uRwZhZ002QtCqIkwC/ZkvbA== @@ -582,7 +638,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.27.1" -"@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.24.8", "@babel/plugin-transform-modules-commonjs@^7.27.1": +"@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.24.7", "@babel/plugin-transform-modules-commonjs@^7.24.8", "@babel/plugin-transform-modules-commonjs@^7.27.1": version "7.27.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.27.1.tgz#8e44ed37c2787ecc23bdc367f49977476614e832" integrity sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw== @@ -630,7 +686,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.27.1" -"@babel/plugin-transform-optional-chaining@^7.0.0-0", "@babel/plugin-transform-optional-chaining@^7.24.8": +"@babel/plugin-transform-optional-chaining@^7.0.0-0", "@babel/plugin-transform-optional-chaining@^7.24.7", "@babel/plugin-transform-optional-chaining@^7.24.8": version "7.27.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.27.1.tgz#874ce3c4f06b7780592e946026eb76a32830454f" integrity sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg== @@ -776,7 +832,7 @@ "@babel/helper-create-regexp-features-plugin" "^7.27.1" "@babel/helper-plugin-utils" "^7.27.1" -"@babel/preset-flow@^7.13.13": +"@babel/preset-flow@^7.13.13", "@babel/preset-flow@^7.24.7": version "7.27.1" resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.27.1.tgz#3050ed7c619e8c4bfd0e0eeee87a2fa86a4bb1c6" integrity sha512-ez3a2it5Fn6P54W8QkbfIyyIbxlXvcxyWHHvno1Wg0Ej5eiJY5hBb8ExttoIOJJk7V2dZE6prP7iby5q2aQ0Lg== @@ -797,7 +853,7 @@ "@babel/plugin-transform-react-jsx-development" "^7.27.1" "@babel/plugin-transform-react-pure-annotations" "^7.27.1" -"@babel/preset-typescript@^7.13.0", "@babel/preset-typescript@^7.16.7", "@babel/preset-typescript@^7.23.0": +"@babel/preset-typescript@^7.13.0", "@babel/preset-typescript@^7.16.7", "@babel/preset-typescript@^7.23.0", "@babel/preset-typescript@^7.24.7": version "7.27.1" resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.27.1.tgz#190742a6428d282306648a55b0529b561484f912" integrity sha512-l7WfQfX0WK4M0v2RudjuQK4u99BS6yLHYEmdtVPP7lKV013zr9DygFuWNlnbvQ9LR+LS0Egz/XAvGx5U9MX0fQ== @@ -819,6 +875,17 @@ pirates "^4.0.6" source-map-support "^0.5.16" +"@babel/register@^7.24.6": + version "7.28.3" + resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.28.3.tgz#abd8a3753480c799bdaf9c9092d6745d16e052c2" + integrity sha512-CieDOtd8u208eI49bYl4z1J22ySFw87IGwE+IswFEExH7e3rLgKb0WNQeumnacQ1+VoDJLYI5QFA3AJZuyZQfA== + dependencies: + clone-deep "^4.0.1" + find-cache-dir "^2.0.0" + make-dir "^2.1.0" + pirates "^4.0.6" + source-map-support "^0.5.16" + "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.18.6", "@babel/runtime@^7.20.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.25.0", "@babel/runtime@^7.6.2", "@babel/runtime@^7.8.7": version "7.27.6" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.6.tgz#ec4070a04d76bae8ddbb10770ba55714a417b7c6" @@ -859,6 +926,19 @@ "@babel/types" "^7.28.0" debug "^4.3.1" +"@babel/traverse@^7.28.3": + version "7.28.3" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.3.tgz#6911a10795d2cce43ec6a28cffc440cca2593434" + integrity sha512-7w4kZYHneL3A6NP2nxzHvT3HCZ7puDZZjFMqDpBPECub79sTtSO5CGXDkKrTQq8ksAwfD/XI2MRFX23njdDaIQ== + dependencies: + "@babel/code-frame" "^7.27.1" + "@babel/generator" "^7.28.3" + "@babel/helper-globals" "^7.28.0" + "@babel/parser" "^7.28.3" + "@babel/template" "^7.27.2" + "@babel/types" "^7.28.2" + debug "^4.3.1" + "@babel/types@^7.0.0", "@babel/types@^7.20.0", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.23.0", "@babel/types@^7.25.2", "@babel/types@^7.26.10", "@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.27.6", "@babel/types@^7.28.0", "@babel/types@^7.3.3": version "7.28.0" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.0.tgz#2fd0159a6dc7353933920c43136335a9b264d950" @@ -867,6 +947,14 @@ "@babel/helper-string-parser" "^7.27.1" "@babel/helper-validator-identifier" "^7.27.1" +"@babel/types@^7.28.2": + version "7.28.2" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.2.tgz#da9db0856a9a88e0a13b019881d7513588cf712b" + integrity sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ== + dependencies: + "@babel/helper-string-parser" "^7.27.1" + "@babel/helper-validator-identifier" "^7.27.1" + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" @@ -3125,10 +3213,10 @@ resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-11.4.1.tgz#a3c247aceab35f75dd0aa4bfa85d2be5a4508688" integrity sha512-B0BYAkghz3Q2V09BF88RA601XursIEA111tnc2JOaN7axJWmNefmfjZqw/KdSxKZp7CZUuPpjBmz/WCR9uaHYg== -"@react-native/assets-registry@0.76.9": - version "0.76.9" - resolved "https://registry.yarnpkg.com/@react-native/assets-registry/-/assets-registry-0.76.9.tgz#ec63d32556c29bfa29e55b5e6e24c9d6e1ebbfac" - integrity sha512-pN0Ws5xsjWOZ8P37efh0jqHHQmq+oNGKT4AyAoKRpxBDDDmlAmpaYjer9Qz7PpDKF+IUyRjF/+rBsM50a8JcUg== +"@react-native/assets-registry@0.77.3": + version "0.77.3" + resolved "https://registry.yarnpkg.com/@react-native/assets-registry/-/assets-registry-0.77.3.tgz#ce4d15ca68140f2046e7375452821e6ca7a59da3" + integrity sha512-kLocY1mlQjCdrX0y4eYQblub9NDdX+rkNii3F2rumri532ILjMAvkdpehf2PwQDj0X6PZYF1XFjszPw5uzq0Aw== "@react-native/babel-plugin-codegen@0.76.9": version "0.76.9" @@ -3137,6 +3225,14 @@ dependencies: "@react-native/codegen" "0.76.9" +"@react-native/babel-plugin-codegen@0.77.3": + version "0.77.3" + resolved "https://registry.yarnpkg.com/@react-native/babel-plugin-codegen/-/babel-plugin-codegen-0.77.3.tgz#ba96b7e8287a766c68d979cd531e42c592ff751a" + integrity sha512-UbjQY8vFCVD4Aw4uSRWslKa26l1uOZzYhhKzWWOrV36f2NnP9Siid2rPkLa+MIJk16G2UzDRtUrMhGuejxp9cQ== + dependencies: + "@babel/traverse" "^7.25.3" + "@react-native/codegen" "0.77.3" + "@react-native/babel-preset@0.76.9": version "0.76.9" resolved "https://registry.yarnpkg.com/@react-native/babel-preset/-/babel-preset-0.76.9.tgz#08bc4198c67a0d07905dcc48cb4105b8d0f6ecd9" @@ -3188,6 +3284,57 @@ babel-plugin-transform-flow-enums "^0.0.2" react-refresh "^0.14.0" +"@react-native/babel-preset@0.77.3": + version "0.77.3" + resolved "https://registry.yarnpkg.com/@react-native/babel-preset/-/babel-preset-0.77.3.tgz#a147e59f160c89bebac06f7c9db2e0d779d9d462" + integrity sha512-Cy1RoL5/nh2S/suWgfTuhUwkERoDN/Q2O6dZd3lcNcBrjd5Y++sBJGyBnHd9pqlSmOy8RLLBJZ9dOylycBOqzQ== + dependencies: + "@babel/core" "^7.25.2" + "@babel/plugin-proposal-export-default-from" "^7.24.7" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-syntax-export-default-from" "^7.24.7" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-transform-arrow-functions" "^7.24.7" + "@babel/plugin-transform-async-generator-functions" "^7.25.4" + "@babel/plugin-transform-async-to-generator" "^7.24.7" + "@babel/plugin-transform-block-scoping" "^7.25.0" + "@babel/plugin-transform-class-properties" "^7.25.4" + "@babel/plugin-transform-classes" "^7.25.4" + "@babel/plugin-transform-computed-properties" "^7.24.7" + "@babel/plugin-transform-destructuring" "^7.24.8" + "@babel/plugin-transform-flow-strip-types" "^7.25.2" + "@babel/plugin-transform-for-of" "^7.24.7" + "@babel/plugin-transform-function-name" "^7.25.1" + "@babel/plugin-transform-literals" "^7.25.2" + "@babel/plugin-transform-logical-assignment-operators" "^7.24.7" + "@babel/plugin-transform-modules-commonjs" "^7.24.8" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.24.7" + "@babel/plugin-transform-nullish-coalescing-operator" "^7.24.7" + "@babel/plugin-transform-numeric-separator" "^7.24.7" + "@babel/plugin-transform-object-rest-spread" "^7.24.7" + "@babel/plugin-transform-optional-catch-binding" "^7.24.7" + "@babel/plugin-transform-optional-chaining" "^7.24.8" + "@babel/plugin-transform-parameters" "^7.24.7" + "@babel/plugin-transform-private-methods" "^7.24.7" + "@babel/plugin-transform-private-property-in-object" "^7.24.7" + "@babel/plugin-transform-react-display-name" "^7.24.7" + "@babel/plugin-transform-react-jsx" "^7.25.2" + "@babel/plugin-transform-react-jsx-self" "^7.24.7" + "@babel/plugin-transform-react-jsx-source" "^7.24.7" + "@babel/plugin-transform-regenerator" "^7.24.7" + "@babel/plugin-transform-runtime" "^7.24.7" + "@babel/plugin-transform-shorthand-properties" "^7.24.7" + "@babel/plugin-transform-spread" "^7.24.7" + "@babel/plugin-transform-sticky-regex" "^7.24.7" + "@babel/plugin-transform-typescript" "^7.25.2" + "@babel/plugin-transform-unicode-regex" "^7.24.7" + "@babel/template" "^7.25.0" + "@react-native/babel-plugin-codegen" "0.77.3" + babel-plugin-syntax-hermes-parser "0.25.1" + babel-plugin-transform-flow-enums "^0.0.2" + react-refresh "^0.14.0" + "@react-native/codegen@0.76.9": version "0.76.9" resolved "https://registry.yarnpkg.com/@react-native/codegen/-/codegen-0.76.9.tgz#b386fae4d893e5e7ffba19833c7d31a330a2f559" @@ -3202,20 +3349,32 @@ nullthrows "^1.1.1" yargs "^17.6.2" -"@react-native/community-cli-plugin@0.76.9": - version "0.76.9" - resolved "https://registry.yarnpkg.com/@react-native/community-cli-plugin/-/community-cli-plugin-0.76.9.tgz#74f9f2dfe11aa5515522e006808b9aa2fd60afe3" - integrity sha512-08jx8ixCjjd4jNQwNpP8yqrjrDctN2qvPPlf6ebz1OJQk8e1sbUl3wVn1zhhMvWrYcaraDnatPb5uCPq+dn3NQ== +"@react-native/codegen@0.77.3": + version "0.77.3" + resolved "https://registry.yarnpkg.com/@react-native/codegen/-/codegen-0.77.3.tgz#34e601eaa2a56bc3bd26617341f8f03d1e4d2452" + integrity sha512-Q6ZJCE7h6Z3v3DiEZUnqzHbgwF3ZILN+ACTx6qu/x2X1cL96AatKwdX92e0+7J9RFg6gdoFYJgRrW8Q6VnWZsQ== dependencies: - "@react-native/dev-middleware" "0.76.9" - "@react-native/metro-babel-transformer" "0.76.9" + "@babel/parser" "^7.25.3" + glob "^7.1.1" + hermes-parser "0.25.1" + invariant "^2.2.4" + jscodeshift "^17.0.0" + nullthrows "^1.1.1" + yargs "^17.6.2" + +"@react-native/community-cli-plugin@0.77.3": + version "0.77.3" + resolved "https://registry.yarnpkg.com/@react-native/community-cli-plugin/-/community-cli-plugin-0.77.3.tgz#816201a051443c31db69dbdaa9621870ba3a2442" + integrity sha512-8OKvow2jHojl1d3PW/84uTBPMnmxRyPtfhBL0sQxrWP5Kgooe5XALoWsoBIFk+aIFu/fV7Pv0AAd0cdLC0NtOg== + dependencies: + "@react-native/dev-middleware" "0.77.3" + "@react-native/metro-babel-transformer" "0.77.3" chalk "^4.0.0" - execa "^5.1.1" + debug "^2.2.0" invariant "^2.2.4" - metro "^0.81.0" - metro-config "^0.81.0" - metro-core "^0.81.0" - node-fetch "^2.2.0" + metro "^0.81.5" + metro-config "^0.81.5" + metro-core "^0.81.5" readline "^1.3.0" semver "^7.1.3" @@ -3224,6 +3383,11 @@ resolved "https://registry.yarnpkg.com/@react-native/debugger-frontend/-/debugger-frontend-0.76.9.tgz#b329b8e5dccda282a11a107a79fa65268b2e029c" integrity sha512-0Ru72Bm066xmxFuOXhhvrryxvb57uI79yDSFf+hxRpktkC98NMuRenlJhslMrbJ6WjCu1vOe/9UjWNYyxXTRTA== +"@react-native/debugger-frontend@0.77.3": + version "0.77.3" + resolved "https://registry.yarnpkg.com/@react-native/debugger-frontend/-/debugger-frontend-0.77.3.tgz#38efdcb673e8cebd2d3c41278128d198c68b8503" + integrity sha512-FTERmc43r/3IpTvUZTr9gVVTgOIrg1hrkN57POr/CiL8RbcY/nv6vfNM7/CXG5WF8ckHiLeWTcRHzJUl1+rFkw== + "@react-native/dev-middleware@0.76.9": version "0.76.9" resolved "https://registry.yarnpkg.com/@react-native/dev-middleware/-/dev-middleware-0.76.9.tgz#2fdb716707d90b4d085cabb61cc466fabdd2500f" @@ -3242,24 +3406,42 @@ serve-static "^1.13.1" ws "^6.2.3" -"@react-native/gradle-plugin@0.76.9": - version "0.76.9" - resolved "https://registry.yarnpkg.com/@react-native/gradle-plugin/-/gradle-plugin-0.76.9.tgz#b77ae6614c336a46d91ea61b8967d26848759eb1" - integrity sha512-uGzp3dL4GfNDz+jOb8Nik1Vrfq1LHm0zESizrGhHACFiFlUSflVAnWuUAjlZlz5XfLhzGVvunG4Vdrpw8CD2ng== +"@react-native/dev-middleware@0.77.3": + version "0.77.3" + resolved "https://registry.yarnpkg.com/@react-native/dev-middleware/-/dev-middleware-0.77.3.tgz#9b78a9e92b59413d8835b62463cfba148fc38d45" + integrity sha512-tCylGMjibJAEl2r2nWX5L5CvK6XFLGbjhe7Su7OcxRGrynHin87rAmcaTeoTtbtsREFlFM0f4qxcmwCxmbZHJw== + dependencies: + "@isaacs/ttlcache" "^1.4.1" + "@react-native/debugger-frontend" "0.77.3" + chrome-launcher "^0.15.2" + chromium-edge-launcher "^0.2.0" + connect "^3.6.5" + debug "^2.2.0" + invariant "^2.2.4" + nullthrows "^1.1.1" + open "^7.0.3" + selfsigned "^2.4.1" + serve-static "^1.16.2" + ws "^6.2.3" -"@react-native/js-polyfills@0.76.9": - version "0.76.9" - resolved "https://registry.yarnpkg.com/@react-native/js-polyfills/-/js-polyfills-0.76.9.tgz#91be7bc48926bc31ebb7e64fc98c86ccb616b1fb" - integrity sha512-s6z6m8cK4SMjIX1hm8LT187aQ6//ujLrjzDBogqDCYXRbfjbAYovw5as/v2a2rhUIyJbS3UjokZm3W0H+Oh/RQ== +"@react-native/gradle-plugin@0.77.3": + version "0.77.3" + resolved "https://registry.yarnpkg.com/@react-native/gradle-plugin/-/gradle-plugin-0.77.3.tgz#ee96c818c54803187483b905515a3e20347d5553" + integrity sha512-GRVNBDowaFub9j+WBLGI09bDbCq+f7ugaNRr6lmZnLx/xdmiKUj9YKyARt4zn8m65MRK2JGlJk0OqmQOvswpzQ== -"@react-native/metro-babel-transformer@0.76.9": - version "0.76.9" - resolved "https://registry.yarnpkg.com/@react-native/metro-babel-transformer/-/metro-babel-transformer-0.76.9.tgz#898fcb39368b1a5b1e254ab51eb7840cc496da77" - integrity sha512-HGq11347UHNiO/NvVbAO35hQCmH8YZRs7in7nVq7SL99pnpZK4WXwLdAXmSuwz5uYqOuwnKYDlpadz8fkE94Mg== +"@react-native/js-polyfills@0.77.3": + version "0.77.3" + resolved "https://registry.yarnpkg.com/@react-native/js-polyfills/-/js-polyfills-0.77.3.tgz#231d6bcbdddf7f6900f03f64adc3afcde7449c69" + integrity sha512-XqxnQRyKD11u5ZYG5LPnElThWYJf3HMosqqkJGB4nwx6nc6WKxj1sR9snptibExDMGioZ2OyvPWCF8tX+qggrw== + +"@react-native/metro-babel-transformer@0.77.3": + version "0.77.3" + resolved "https://registry.yarnpkg.com/@react-native/metro-babel-transformer/-/metro-babel-transformer-0.77.3.tgz#dd467666be99ce43fd117df5336de15742c1d638" + integrity sha512-eBX5ibF1ovuZGwo08UOhnnkZDnhl8DdrCulJ8V/LCnpC6CihhQyxtolO+BmzXjUFyGiH7ImoxX7+mpXI74NYGg== dependencies: "@babel/core" "^7.25.2" - "@react-native/babel-preset" "0.76.9" - hermes-parser "0.23.1" + "@react-native/babel-preset" "0.77.3" + hermes-parser "0.25.1" nullthrows "^1.1.1" "@react-native/normalize-colors@0.76.8": @@ -3272,15 +3454,20 @@ resolved "https://registry.yarnpkg.com/@react-native/normalize-colors/-/normalize-colors-0.76.9.tgz#1c45ce49871ccea7d6fa9332cb14724adf326d6a" integrity sha512-TUdMG2JGk72M9d8DYbubdOlrzTYjw+YMe/xOnLU4viDgWRHsCbtRS9x0IAxRjs3amj/7zmK3Atm8jUPvdAc8qw== +"@react-native/normalize-colors@0.77.3": + version "0.77.3" + resolved "https://registry.yarnpkg.com/@react-native/normalize-colors/-/normalize-colors-0.77.3.tgz#76309cfe6ac423bd89b80cf8da2f6c07943e99e8" + integrity sha512-9gHhvK0EKskgIN4JiwzQdxiKhLCgH2LpCp+v38ZxWQpXTMbTDDE4AJRqYgWp2v9WUFQB/S5+XqBDZDgn/MGq9A== + "@react-native/normalize-colors@^0.74.1": version "0.74.89" resolved "https://registry.yarnpkg.com/@react-native/normalize-colors/-/normalize-colors-0.74.89.tgz#b8ac17d1bbccd3ef9a1f921665d04d42cff85976" integrity sha512-qoMMXddVKVhZ8PA1AbUCk83trpd6N+1nF2A6k1i6LsQObyS92fELuk8kU/lQs6M7BsMHwqyLCpQJ1uFgNvIQXg== -"@react-native/virtualized-lists@0.76.9": - version "0.76.9" - resolved "https://registry.yarnpkg.com/@react-native/virtualized-lists/-/virtualized-lists-0.76.9.tgz#23b94fe2525d6b3b974604a14ee7810384420dcd" - integrity sha512-2neUfZKuqMK2LzfS8NyOWOyWUJOWgDym5fUph6fN9qF+LNPjAvnc4Zr9+o+59qjNu/yXwQgVMWNU4+8WJuPVWw== +"@react-native/virtualized-lists@0.77.3": + version "0.77.3" + resolved "https://registry.yarnpkg.com/@react-native/virtualized-lists/-/virtualized-lists-0.77.3.tgz#b5696b9456282ed3c2b00fd0edb0d8dcb444d05c" + integrity sha512-3B0TPbLp7ZMWTlsOf+MzcuKuqF2HZzqh94+tPvw1thF5PxPaO2yZjVxfjrQ9EtdhQisG4siwiXVHB9DD6VkU4A== dependencies: invariant "^2.2.4" nullthrows "^1.1.1" @@ -3778,10 +3965,10 @@ "@react-types/overlays" "^3.8.16" "@react-types/shared" "^3.30.0" -"@rnmapbox/maps@10.1.38": - version "10.1.38" - resolved "https://registry.yarnpkg.com/@rnmapbox/maps/-/maps-10.1.38.tgz#c2041be18d747522f4828add7135eba448a3a95e" - integrity sha512-TMKaVwh5C5Z+nqUx87mZlDfPB1zmsdJqU6jAjmM8OrZWpuxpaBo3r0AgijmLEhoXIcJ2ptREk/RRcVnNgwNxgQ== +"@rnmapbox/maps@10.1.42-rc.0": + version "10.1.42-rc.0" + resolved "https://registry.yarnpkg.com/@rnmapbox/maps/-/maps-10.1.42-rc.0.tgz#760a3261a5c386ff6ba640406b4b0c8872d3c702" + integrity sha512-oFv7K3kFhcSqvR+G8vExZC1T8iqHQMjsid6gBmCJKIBnBYD2dXxQlr6g/x0VH0polIVWirmrINaJzKkqrIjPig== dependencies: "@turf/along" "6.5.0" "@turf/distance" "6.5.0" @@ -5268,6 +5455,13 @@ ast-types@0.15.2: dependencies: tslib "^2.0.1" +ast-types@^0.16.1: + version "0.16.1" + resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.16.1.tgz#7a9da1617c9081bc121faafe91711b4c8bb81da2" + integrity sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg== + dependencies: + tslib "^2.0.1" + async-function@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/async-function/-/async-function-1.0.0.tgz#509c9fca60eaf85034c6829838188e4e4c8ffb2b" @@ -5424,14 +5618,7 @@ babel-plugin-react-native-web@~0.19.13: resolved "https://registry.yarnpkg.com/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.19.13.tgz#bf919bd6f18c4689dd1a528a82bda507363b953d" integrity sha512-4hHoto6xaN23LCyZgL9LJZc3olmAxd7b6jDzlZnKXAh4rRAbZRKNBJoOOdp46OBqgy+K0t0guTj5/mhA8inymQ== -babel-plugin-syntax-hermes-parser@^0.23.1: - version "0.23.1" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-hermes-parser/-/babel-plugin-syntax-hermes-parser-0.23.1.tgz#470e9d1d30ad670d4c8a37138e22ae39c843d1ff" - integrity sha512-uNLD0tk2tLUjGFdmCk+u/3FEw2o+BAwW4g+z2QVlxJrzZYOOPADroEcNtTPt5lNiScctaUmnsTkVEnOwZUOLhA== - dependencies: - hermes-parser "0.23.1" - -babel-plugin-syntax-hermes-parser@^0.25.1: +babel-plugin-syntax-hermes-parser@0.25.1, babel-plugin-syntax-hermes-parser@^0.25.1: version "0.25.1" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-hermes-parser/-/babel-plugin-syntax-hermes-parser-0.25.1.tgz#58b539df973427fcfbb5176a3aec7e5dee793cb0" integrity sha512-IVNpGzboFLfXZUAwkLFcI/bnqVbwky0jP3eBno4HKtqvQJAHBLdgxiG6lQ4to0+Q/YCN3PO0od5NZwIKyY4REQ== @@ -7546,7 +7733,7 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^5.0.0, execa@^5.1.1: +execa@^5.0.0: version "5.1.1" resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== @@ -10106,6 +10293,30 @@ jscodeshift@^0.14.0: temp "^0.8.4" write-file-atomic "^2.3.0" +jscodeshift@^17.0.0: + version "17.3.0" + resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-17.3.0.tgz#b9ea1d8d1c9255103bfc4cb42ddb46e18cb2415c" + integrity sha512-LjFrGOIORqXBU+jwfC9nbkjmQfFldtMIoS6d9z2LG/lkmyNXsJAySPT+2SWXJEoE68/bCWcxKpXH37npftgmow== + dependencies: + "@babel/core" "^7.24.7" + "@babel/parser" "^7.24.7" + "@babel/plugin-transform-class-properties" "^7.24.7" + "@babel/plugin-transform-modules-commonjs" "^7.24.7" + "@babel/plugin-transform-nullish-coalescing-operator" "^7.24.7" + "@babel/plugin-transform-optional-chaining" "^7.24.7" + "@babel/plugin-transform-private-methods" "^7.24.7" + "@babel/preset-flow" "^7.24.7" + "@babel/preset-typescript" "^7.24.7" + "@babel/register" "^7.24.6" + flow-parser "0.*" + graceful-fs "^4.2.4" + micromatch "^4.0.7" + neo-async "^2.5.0" + picocolors "^1.0.1" + recast "^0.23.11" + tmp "^0.2.3" + write-file-atomic "^5.0.1" + jsdom@^20.0.0: version "20.0.3" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db" @@ -10875,7 +11086,7 @@ metro-cache@0.81.5: flow-enums-runtime "^0.0.6" metro-core "0.81.5" -metro-config@0.81.5, metro-config@^0.81.0: +metro-config@0.81.5, metro-config@^0.81.5: version "0.81.5" resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.81.5.tgz#2e7c25cb8aa50103fcbe15de4c1948100cb3be96" integrity sha512-oDRAzUvj6RNRxratFdcVAqtAsg+T3qcKrGdqGZFUdwzlFJdHGR9Z413sW583uD2ynsuOjA2QB6US8FdwiBdNKg== @@ -10889,7 +11100,7 @@ metro-config@0.81.5, metro-config@^0.81.0: metro-core "0.81.5" metro-runtime "0.81.5" -metro-core@0.81.5, metro-core@^0.81.0: +metro-core@0.81.5, metro-core@^0.81.5: version "0.81.5" resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.81.5.tgz#cf22e8e5eca63184fd43a6cce85aafa5320f1979" integrity sha512-+2R0c8ByfV2N7CH5wpdIajCWa8escUFd8TukfoXyBq/vb6yTCsznoA25FhNXJ+MC/cz1L447Zj3vdUfCXIZBwg== @@ -10928,7 +11139,7 @@ metro-resolver@0.81.5: dependencies: flow-enums-runtime "^0.0.6" -metro-runtime@0.81.5, metro-runtime@^0.81.0: +metro-runtime@0.81.5, metro-runtime@^0.81.5: version "0.81.5" resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.81.5.tgz#0fe4ae028c9d30f8a035d5d2155fc5302dbc9f09" integrity sha512-M/Gf71ictUKP9+77dV/y8XlAWg7xl76uhU7ggYFUwEdOHHWPG6gLBr1iiK0BmTjPFH8yRo/xyqMli4s3oGorPQ== @@ -10936,7 +11147,7 @@ metro-runtime@0.81.5, metro-runtime@^0.81.0: "@babel/runtime" "^7.25.0" flow-enums-runtime "^0.0.6" -metro-source-map@0.81.5, metro-source-map@^0.81.0: +metro-source-map@0.81.5, metro-source-map@^0.81.5: version "0.81.5" resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.81.5.tgz#54415de745851a2e60b44e4aafe548c9c42dcf19" integrity sha512-Jz+CjvCKLNbJZYJTBeN3Kq9kIJf6b61MoLBdaOQZJ5Ajhw6Pf95Nn21XwA8BwfUYgajsi6IXsp/dTZsYJbN00Q== @@ -10995,7 +11206,7 @@ metro-transform-worker@0.81.5: metro-transform-plugins "0.81.5" nullthrows "^1.1.1" -metro@0.81.5, metro@^0.81.0: +metro@0.81.5, metro@^0.81.5: version "0.81.5" resolved "https://registry.yarnpkg.com/metro/-/metro-0.81.5.tgz#965159d72439a99ccc7bed7a480ee81128fd4b0e" integrity sha512-YpFF0DDDpDVygeca2mAn7K0+us+XKmiGk4rIYMz/CRdjFoCGqAei/IQSpV0UrGfQbToSugpMQeQJveaWSH88Hg== @@ -11041,7 +11252,7 @@ metro@0.81.5, metro@^0.81.0: ws "^7.5.10" yargs "^17.6.2" -micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5, micromatch@^4.0.8, micromatch@~4.0.8: +micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5, micromatch@^4.0.7, micromatch@^4.0.8, micromatch@~4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202" integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA== @@ -11319,7 +11530,7 @@ node-dir@^0.1.17: dependencies: minimatch "^3.0.2" -node-fetch@^2.2.0, node-fetch@^2.6.1, node-fetch@^2.6.7, node-fetch@^2.7.0: +node-fetch@^2.6.1, node-fetch@^2.6.7, node-fetch@^2.7.0: version "2.7.0" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== @@ -11902,7 +12113,7 @@ parseurl@~1.3.3: resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== -patch-package@8.0.0: +patch-package@8.0.0, patch-package@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-8.0.0.tgz#d191e2f1b6e06a4624a0116bcb88edd6714ede61" integrity sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA== @@ -11993,7 +12204,7 @@ phin@^3.7.1: dependencies: centra "^2.7.0" -picocolors@^1.0.0, picocolors@^1.1.1: +picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== @@ -12176,6 +12387,11 @@ postcss@~8.4.32: picocolors "^1.1.1" source-map-js "^1.2.1" +postinstall-postinstall@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/postinstall-postinstall/-/postinstall-postinstall-2.1.0.tgz#4f7f77441ef539d1512c40bd04c71b06a4704ca3" + integrity sha512-7hQX6ZlZXIoRiWNrbMQaLzUUfH+sSx39u8EJ9HYuDc1kLo9IXKWjM5RSquZN1ad5GnH8CGFM78fsAAQi3OKEEQ== + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" @@ -12374,10 +12590,10 @@ rc@1.2.8, rc@~1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-devtools-core@^5.3.1: - version "5.3.2" - resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-5.3.2.tgz#d5df92f8ef2a587986d094ef2c47d84cf4ae46ec" - integrity sha512-crr9HkVrDiJ0A4zot89oS0Cgv0Oa4OG1Em4jit3P3ZxZSKPMYyMjfwMqgcJna9o625g8oN87rBm8SWWrSTBZxg== +react-devtools-core@^6.0.1: + version "6.1.5" + resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-6.1.5.tgz#c5eca79209dab853a03b2158c034c5166975feee" + integrity sha512-ePrwPfxAnB+7hgnEr8vpKxL9cmnp7F322t8oqcPshbIQQhDKgFDW4tjhF2wjVbdXF9O/nyuy3sQWd9JGpiLPvA== dependencies: shell-quote "^1.6.1" ws "^7" @@ -12485,15 +12701,14 @@ react-native-flash-message@~0.4.2: prop-types "^15.8.1" react-native-iphone-screen-helper "^2.0.2" -react-native-gesture-handler@~2.20.2: - version "2.20.2" - resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.20.2.tgz#73844c8e9c417459c2f2981bc4d8f66ba8a5ee66" - integrity sha512-HqzFpFczV4qCnwKlvSAvpzEXisL+Z9fsR08YV5LfJDkzuArMhBu2sOoSPUF/K62PCoAb+ObGlTC83TKHfUd0vg== +react-native-gesture-handler@~2.22.0: + version "2.22.1" + resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.22.1.tgz#869d2b5ffd8b19e44a36780b99cbd88826323353" + integrity sha512-E0C9D+Ia2UZYevoSV9rTKjhFWEVdR/3l4Z3TUoQrI/wewgzDlmJOrYvGW5aMlPUuQF2vHQOdFfAWhVEqFu4tWw== dependencies: "@egjs/hammerjs" "^2.0.17" hoist-non-react-statics "^3.3.0" invariant "^2.2.4" - prop-types "^15.7.2" react-native-helmet-async@2.0.4: version "2.0.4" @@ -12531,7 +12746,7 @@ react-native-mmkv@~3.1.0: resolved "https://registry.yarnpkg.com/react-native-mmkv/-/react-native-mmkv-3.1.0.tgz#4b2c321cf11bde2f9da32acf76e0178ecd332ccc" integrity sha512-HDh89nYVSufHMweZ3TVNUHQp2lsEh1ApaoV08bUOU1nrlmGgC3I7tGUn1Uy40Hs7yRMPKx5NWKE5Dh86jTVrwg== -react-native-reanimated@~3.16.1: +react-native-reanimated@~3.16.7: version "3.16.7" resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-3.16.7.tgz#6c7fa516f62c6743c24d955dada00e3c5323d50d" integrity sha512-qoUUQOwE1pHlmQ9cXTJ2MX9FQ9eHllopCLiWOkDkp6CER95ZWeXhJCP4cSm6AD4jigL5jHcZf/SkWrg8ttZUsw== @@ -12553,15 +12768,15 @@ react-native-restart@0.0.27: resolved "https://registry.yarnpkg.com/react-native-restart/-/react-native-restart-0.0.27.tgz#43aa8210312c9dfa5ec7bd4b2f35238ad7972b19" integrity sha512-8KScVICrXwcTSJ1rjWkqVTHyEKQIttm5AIMGSK1QG1+RS5owYlE4z/1DykOTdWfVl9l16FIk0w9Xzk9ZO6jxlA== -react-native-safe-area-context@4.12.0: - version "4.12.0" - resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.12.0.tgz#17868522a55bbc6757418c94a1b4abdda6b045d9" - integrity sha512-ukk5PxcF4p3yu6qMZcmeiZgowhb5AsKRnil54YFUUAXVIS7PJcMHGGC+q44fCiBg44/1AJk5njGMez1m9H0BVQ== +react-native-safe-area-context@~5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-5.1.0.tgz#0125f0c7762a2c189a3d067623ab8fbcdcb79cb8" + integrity sha512-Y4vyJX+0HPJUQNVeIJTj2/UOjbSJcB09OEwirAWDrOZ67Lz5p43AmjxSy8nnZft1rMzoh3rcPuonB6jJyHTfCw== -react-native-screens@~4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-4.4.0.tgz#3fcbcdf1bbb1be2736b10d43edc3d4e69c37b5aa" - integrity sha512-c7zc7Zwjty6/pGyuuvh9gK3YBYqHPOxrhXfG1lF4gHlojQSmIx2piNbNaV+Uykj+RDTmFXK0e/hA+fucw/Qozg== +react-native-screens@~4.8.0: + version "4.8.0" + resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-4.8.0.tgz#e4e695df331824cc62c49c0237b754bfdf63540f" + integrity sha512-Y7fiUCOl+FhvfuvQVf6Fkla6C8Yh+pKVEZmflaikmRIm7JMdTxSkzSXQmnfDsV5BKR7dDWdlPf8/lm1QAIytNQ== dependencies: react-freeze "^1.0.0" warn-once "^0.1.0" @@ -12606,32 +12821,32 @@ react-native-web@~0.19.13: postcss-value-parser "^4.2.0" styleq "^0.1.3" -react-native-webview@13.12.5: - version "13.12.5" - resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-13.12.5.tgz#ed9eec1eda234d7cf18d329859b9bdebf7e258b6" - integrity sha512-INOKPom4dFyzkbxbkuQNfeRG9/iYnyRDzrDkJeyvSWgJAW2IDdJkWFJBS2v0RxIL4gqLgHkiIZDOfiLaNnw83Q== +react-native-webview@~13.13.1: + version "13.13.5" + resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-13.13.5.tgz#4ef5f9310ddff5747f884a6655228ec9c7d52c73" + integrity sha512-MfC2B+woL4Hlj2WCzcb1USySKk+SteXnUKmKktOk/H/AQy5+LuVdkPKm8SknJ0/RxaxhZ48WBoTRGaqgR137hw== dependencies: escape-string-regexp "^4.0.0" invariant "2.2.4" -react-native@0.76.9: - version "0.76.9" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.76.9.tgz#68cdfbe75a5c02417ac0eefbb28894a1adc330a2" - integrity sha512-+LRwecWmTDco7OweGsrECIqJu0iyrREd6CTCgC/uLLYipiHvk+MH9nd6drFtCw/6Blz6eoKTcH9YTTJusNtrWg== +react-native@0.77.3: + version "0.77.3" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.77.3.tgz#a459f6e80eb4652e7ef70dda177dc9dda1ae86e6" + integrity sha512-fIYZ9+zX+iGcb/xGZA6oN3Uq9x46PdqVYtlyG+WmOIFQPVXgryaS9FJLdTvoTpsEA2JXGSGgNOdm640IdAW3cA== dependencies: "@jest/create-cache-key-function" "^29.6.3" - "@react-native/assets-registry" "0.76.9" - "@react-native/codegen" "0.76.9" - "@react-native/community-cli-plugin" "0.76.9" - "@react-native/gradle-plugin" "0.76.9" - "@react-native/js-polyfills" "0.76.9" - "@react-native/normalize-colors" "0.76.9" - "@react-native/virtualized-lists" "0.76.9" + "@react-native/assets-registry" "0.77.3" + "@react-native/codegen" "0.77.3" + "@react-native/community-cli-plugin" "0.77.3" + "@react-native/gradle-plugin" "0.77.3" + "@react-native/js-polyfills" "0.77.3" + "@react-native/normalize-colors" "0.77.3" + "@react-native/virtualized-lists" "0.77.3" abort-controller "^3.0.0" anser "^1.4.9" ansi-regex "^5.0.0" babel-jest "^29.7.0" - babel-plugin-syntax-hermes-parser "^0.23.1" + babel-plugin-syntax-hermes-parser "0.25.1" base64-js "^1.5.1" chalk "^4.0.0" commander "^12.0.0" @@ -12642,13 +12857,12 @@ react-native@0.76.9: jest-environment-node "^29.6.3" jsc-android "^250231.0.0" memoize-one "^5.0.0" - metro-runtime "^0.81.0" - metro-source-map "^0.81.0" - mkdirp "^0.5.1" + metro-runtime "^0.81.5" + metro-source-map "^0.81.5" nullthrows "^1.1.1" pretty-format "^29.7.0" promise "^8.3.0" - react-devtools-core "^5.3.1" + react-devtools-core "^6.0.1" react-refresh "^0.14.0" regenerator-runtime "^0.13.2" scheduler "0.24.0-canary-efb381bbf-20230505" @@ -12827,6 +13041,17 @@ recast@^0.21.0: source-map "~0.6.1" tslib "^2.0.1" +recast@^0.23.11: + version "0.23.11" + resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.11.tgz#8885570bb28cf773ba1dc600da7f502f7883f73f" + integrity sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA== + dependencies: + ast-types "^0.16.1" + esprima "~4.0.0" + source-map "~0.6.1" + tiny-invariant "^1.3.3" + tslib "^2.0.1" + recyclerlistview@4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/recyclerlistview/-/recyclerlistview-4.2.1.tgz#4537a0959400cdce1df1f38d26aab823786e9b13" @@ -13311,7 +13536,7 @@ seroval@~1.3.0: resolved "https://registry.yarnpkg.com/seroval/-/seroval-1.3.2.tgz#7e5be0dc1a3de020800ef013ceae3a313f20eca7" integrity sha512-RbcPH1n5cfwKrru7v7+zrZvjLurgHhGyso3HTyGtRivGWgYjbOmGuivCQaORNELjNONoK35nj28EoWul9sb1zQ== -serve-static@^1.13.1: +serve-static@^1.13.1, serve-static@^1.16.2: version "1.16.2" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296" integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw== @@ -14255,6 +14480,11 @@ timm@^1.6.1: resolved "https://registry.yarnpkg.com/timm/-/timm-1.7.1.tgz#96bab60c7d45b5a10a8a4d0f0117c6b7e5aff76f" integrity sha512-IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw== +tiny-invariant@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127" + integrity sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg== + tinycolor2@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.6.0.tgz#f98007460169b0263b97072c5ae92484ce02d09e" @@ -14280,6 +14510,11 @@ tmp@^0.0.33: dependencies: os-tmpdir "~1.0.2" +tmp@^0.2.3: + version "0.2.5" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.5.tgz#b06bcd23f0f3c8357b426891726d16015abfd8f8" + integrity sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow== + tmpl@1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" From 48cdfbed51c2e8e69c2a3f7b845c9ad73629a824 Mon Sep 17 00:00:00 2001 From: Shawn Jackson Date: Sat, 30 Aug 2025 08:14:01 -0700 Subject: [PATCH 2/6] CU-868fdadum PR#166 Fixes --- src/api/common/client.tsx | 8 ++-- src/api/mapping/mapping.ts | 15 ++++--- src/app/(app)/index.tsx | 28 ++++++++++-- ...nit-selection-bottom-sheet-simple.test.tsx | 18 ++++---- .../unit-selection-bottom-sheet.test.tsx | 27 ++++++----- .../settings/unit-selection-bottom-sheet.tsx | 10 ++++- src/components/status/status-bottom-sheet.tsx | 13 ++++-- .../__tests__/use-map-signalr-updates.test.ts | 35 +++++++++++++++ src/hooks/use-map-signalr-updates.ts | 11 ++++- .../location-foreground-permissions.test.ts | 13 +++--- src/services/__tests__/location.test.ts | 27 +++++++---- .../signalr.service.enhanced.test.ts | 17 ++++++- src/services/location.ts | 25 +++++++---- src/services/signalr.service.ts | 45 +++---------------- 14 files changed, 187 insertions(+), 105 deletions(-) diff --git a/src/api/common/client.tsx b/src/api/common/client.tsx index bca948ef..2eda70c1 100644 --- a/src/api/common/client.tsx +++ b/src/api/common/client.tsx @@ -120,9 +120,9 @@ export const api = axiosInstance; // Helper function to create API endpoints export const createApiEndpoint = (endpoint: string) => { return { - get: (params?: Record) => api.get(endpoint, { params }), - post: (data: Record) => api.post(endpoint, data), - put: (data: Record) => api.put(endpoint, data), - delete: (params?: Record) => api.delete(endpoint, { params }), + get: (params?: Record, signal?: AbortSignal) => api.get(endpoint, { params, signal }), + post: (data: Record, signal?: AbortSignal) => api.post(endpoint, data, { signal }), + put: (data: Record, signal?: AbortSignal) => api.put(endpoint, data, { signal }), + delete: (params?: Record, signal?: AbortSignal) => api.delete(endpoint, { params, signal }), }; }; diff --git a/src/api/mapping/mapping.ts b/src/api/mapping/mapping.ts index 2e45a09e..aa7d1da0 100644 --- a/src/api/mapping/mapping.ts +++ b/src/api/mapping/mapping.ts @@ -7,14 +7,17 @@ const getMayLayersApi = createApiEndpoint('/Mapping/GetMayLayers'); const getMapDataAndMarkersApi = createApiEndpoint('/Mapping/GetMapDataAndMarkers'); -export const getMapDataAndMarkers = async () => { - const response = await getMapDataAndMarkersApi.get(); +export const getMapDataAndMarkers = async (signal?: AbortSignal) => { + const response = await getMapDataAndMarkersApi.get(undefined, signal); return response.data; }; -export const getMayLayers = async (type: number) => { - const response = await getMayLayersApi.get({ - type: encodeURIComponent(type), - }); +export const getMayLayers = async (type: number, signal?: AbortSignal) => { + const response = await getMayLayersApi.get( + { + type: encodeURIComponent(type), + }, + signal + ); return response.data; }; diff --git a/src/app/(app)/index.tsx b/src/app/(app)/index.tsx index c2408436..05021d06 100644 --- a/src/app/(app)/index.tsx +++ b/src/app/(app)/index.tsx @@ -190,15 +190,37 @@ export default function Map() { }, [isMapReady, location.isMapLocked, location.latitude, location.longitude]); useEffect(() => { + const abortController = new AbortController(); + const fetchMapDataAndMarkers = async () => { - const mapDataAndMarkers = await getMapDataAndMarkers(); + try { + const mapDataAndMarkers = await getMapDataAndMarkers(abortController.signal); + + if (mapDataAndMarkers && mapDataAndMarkers.Data) { + setMapPins(mapDataAndMarkers.Data.MapMakerInfos); + } + } catch (error) { + // Don't log aborted requests as errors + if (error instanceof Error && (error.name === 'AbortError' || error.message === 'canceled')) { + logger.debug({ + message: 'Map data fetch was aborted during component unmount', + }); + return; + } - if (mapDataAndMarkers && mapDataAndMarkers.Data) { - setMapPins(mapDataAndMarkers.Data.MapMakerInfos); + logger.error({ + message: 'Failed to fetch initial map data and markers', + context: { error }, + }); } }; fetchMapDataAndMarkers(); + + // Cleanup function to abort request if component unmounts + return () => { + abortController.abort(); + }; }, []); useEffect(() => { diff --git a/src/components/settings/__tests__/unit-selection-bottom-sheet-simple.test.tsx b/src/components/settings/__tests__/unit-selection-bottom-sheet-simple.test.tsx index 3e0d25d4..768f4969 100644 --- a/src/components/settings/__tests__/unit-selection-bottom-sheet-simple.test.tsx +++ b/src/components/settings/__tests__/unit-selection-bottom-sheet-simple.test.tsx @@ -49,7 +49,7 @@ jest.mock('@expo/html-elements', () => ({ H6: 'H6', })); -import { render, screen, fireEvent, waitFor } from '@testing-library/react-native'; +import { render, screen, fireEvent, waitFor, within } from '@testing-library/react-native'; import React from 'react'; import { type UnitResultData } from '@/models/v4/units/unitResultData'; @@ -94,12 +94,12 @@ jest.mock('@/components/ui/actionsheet', () => ({ ActionsheetContent: ({ children }: any) => children, ActionsheetDragIndicator: () => null, ActionsheetDragIndicatorWrapper: ({ children }: any) => children, - ActionsheetItem: ({ children, onPress, disabled }: any) => { + ActionsheetItem: ({ children, onPress, disabled, testID }: any) => { const React = require('react'); const handlePress = disabled ? undefined : onPress; return React.createElement( 'TouchableOpacity', - { onPress: handlePress, testID: 'actionsheet-item', disabled }, + { onPress: handlePress, testID: testID || 'actionsheet-item', disabled }, children ); }, @@ -318,9 +318,9 @@ describe('UnitSelectionBottomSheet', () => { render(); - // Find the second unit (Ladder 1) and select it - const ladderUnit = screen.getByText('Ladder 1'); - fireEvent.press(ladderUnit); + // Find the second unit (Ladder 1) and select it using testID + const ladderUnitItem = screen.getByTestId('unit-item-2'); + fireEvent.press(ladderUnitItem); await waitFor(() => { expect(mockSetActiveUnit).toHaveBeenCalledWith('2'); @@ -339,9 +339,9 @@ describe('UnitSelectionBottomSheet', () => { render(); - // Find the second unit (Ladder 1) and select it - const ladderUnit = screen.getByText('Ladder 1'); - fireEvent.press(ladderUnit); + // Find the second unit (Ladder 1) and select it using testID + const ladderUnitItem = screen.getByTestId('unit-item-2'); + fireEvent.press(ladderUnitItem); await waitFor(() => { expect(mockSetActiveUnit).toHaveBeenCalledWith('2'); diff --git a/src/components/settings/__tests__/unit-selection-bottom-sheet.test.tsx b/src/components/settings/__tests__/unit-selection-bottom-sheet.test.tsx index 8914470c..31cfbfd0 100644 --- a/src/components/settings/__tests__/unit-selection-bottom-sheet.test.tsx +++ b/src/components/settings/__tests__/unit-selection-bottom-sheet.test.tsx @@ -94,13 +94,13 @@ jest.mock('@/components/ui/actionsheet', () => ({ ActionsheetContent: ({ children }: any) => children, ActionsheetDragIndicator: () => null, ActionsheetDragIndicatorWrapper: ({ children }: any) => children, - ActionsheetItem: ({ children, onPress, disabled, ...props }: any) => { + ActionsheetItem: ({ children, onPress, disabled, testID, ...props }: any) => { const React = require('react'); return React.createElement( 'View', { onPress: disabled ? undefined : onPress, - testID: props.testID || 'actionsheet-item', + testID: testID || 'actionsheet-item', accessibilityState: { disabled }, }, children @@ -352,8 +352,8 @@ describe('UnitSelectionBottomSheet', () => { render(); - // Find the second unit (Ladder 1) and select it - const ladderUnit = screen.getByText('Ladder 1'); + // Find the second unit (Ladder 1) and select it via its testID + const ladderUnit = screen.getByTestId('unit-item-2'); fireEvent.press(ladderUnit); await waitFor(() => { @@ -373,8 +373,8 @@ describe('UnitSelectionBottomSheet', () => { render(); - // Find the second unit (Ladder 1) and select it - const ladderUnit = screen.getByText('Ladder 1'); + // Find the second unit (Ladder 1) and select it via its testID + const ladderUnit = screen.getByTestId('unit-item-2'); fireEvent.press(ladderUnit); await waitFor(() => { @@ -392,12 +392,12 @@ describe('UnitSelectionBottomSheet', () => { render(); - // Select first unit - const ladderUnit = screen.getByText('Ladder 1'); + // Select first unit via its testID + const ladderUnit = screen.getByTestId('unit-item-2'); fireEvent.press(ladderUnit); - // Try to select another unit while first is processing - const rescueUnit = screen.getByText('Rescue 1'); + // Try to select another unit while first is processing via its testID + const rescueUnit = screen.getByTestId('unit-item-3'); fireEvent.press(rescueUnit); await waitFor(() => { @@ -409,7 +409,7 @@ describe('UnitSelectionBottomSheet', () => { it('closes when cancel button is pressed', () => { render(); - const cancelButton = screen.getByText('common.cancel'); + const cancelButton = screen.getByTestId('cancel-button'); fireEvent.press(cancelButton); expect(mockProps.onClose).toHaveBeenCalled(); @@ -424,8 +424,11 @@ describe('UnitSelectionBottomSheet', () => { const ladderUnit = screen.getByText('Ladder 1'); fireEvent.press(ladderUnit); + // Check that cancel button is disabled + const cancelButton = screen.getByTestId('cancel-button'); + expect(cancelButton.props.accessibilityState.disabled).toBe(true); + // Try to press cancel button - it should be disabled - const cancelButton = screen.getByText('common.cancel'); fireEvent.press(cancelButton); // onClose should not be called because button is disabled diff --git a/src/components/settings/unit-selection-bottom-sheet.tsx b/src/components/settings/unit-selection-bottom-sheet.tsx index 777bcc69..f364728d 100644 --- a/src/components/settings/unit-selection-bottom-sheet.tsx +++ b/src/components/settings/unit-selection-bottom-sheet.tsx @@ -113,7 +113,13 @@ export const UnitSelectionBottomSheet = React.memo 0 ? ( {units.map((unit) => ( - handleUnitSelection(unit)} disabled={isLoading} className={activeUnit?.UnitId === unit.UnitId ? 'data-[checked=true]:bg-background-100' : ''}> + handleUnitSelection(unit)} + disabled={isLoading} + className={activeUnit?.UnitId === unit.UnitId ? 'data-[checked=true]:bg-background-100' : ''} + testID={`unit-item-${unit.UnitId}`} + > {unit.Name} @@ -136,7 +142,7 @@ export const UnitSelectionBottomSheet = React.memo - diff --git a/src/components/status/status-bottom-sheet.tsx b/src/components/status/status-bottom-sheet.tsx index b127d972..49ee3ac7 100644 --- a/src/components/status/status-bottom-sheet.tsx +++ b/src/components/status/status-bottom-sheet.tsx @@ -65,13 +65,18 @@ export const StatusBottomSheet = () => { // Helper function to safely get status properties const getStatusProperty = React.useCallback( - (prop: T, defaultValue: CustomStatusResultData[T]): CustomStatusResultData[T] => { + (prop: 'Detail' | 'Note', defaultValue: number): number => { if (!selectedStatus) return defaultValue; - return (selectedStatus as any)[prop] ?? defaultValue; + return selectedStatus[prop] ?? defaultValue; }, [selectedStatus] ); + const getStatusId = React.useCallback((): string => { + if (!selectedStatus) return '0'; + return selectedStatus.Id.toString(); + }, [selectedStatus]); + const handleClose = () => { reset(); }; @@ -166,7 +171,7 @@ export const StatusBottomSheet = () => { const input = new SaveUnitStatusInput(); input.Id = activeUnit.UnitId; - input.Type = getStatusProperty('Id', '0'); + input.Type = getStatusId(); input.Note = note; // Set RespondingTo based on destination selection @@ -230,7 +235,7 @@ export const StatusBottomSheet = () => { unitRoleAssignments, saveUnitStatus, reset, - getStatusProperty, + getStatusId, latitude, longitude, heading, diff --git a/src/hooks/__tests__/use-map-signalr-updates.test.ts b/src/hooks/__tests__/use-map-signalr-updates.test.ts index 3c59f1e4..86cc1308 100644 --- a/src/hooks/__tests__/use-map-signalr-updates.test.ts +++ b/src/hooks/__tests__/use-map-signalr-updates.test.ts @@ -88,6 +88,7 @@ describe('useMapSignalRUpdates', () => { await waitFor(() => { expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + expect(mockGetMapDataAndMarkers).toHaveBeenCalledWith(expect.objectContaining({ aborted: false })); }); expect(mockOnMarkersUpdate).toHaveBeenCalledWith(mockMapData.Data.MapMakerInfos); @@ -121,6 +122,7 @@ describe('useMapSignalRUpdates', () => { await waitFor(() => { expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + expect(mockGetMapDataAndMarkers).toHaveBeenCalledWith(expect.objectContaining({ aborted: false })); }); expect(mockOnMarkersUpdate).toHaveBeenCalledTimes(1); @@ -182,6 +184,7 @@ describe('useMapSignalRUpdates', () => { await waitFor(() => { expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + expect(mockGetMapDataAndMarkers).toHaveBeenCalledWith(expect.objectContaining({ aborted: false })); }); expect(mockLogger.error).toHaveBeenCalledWith({ @@ -206,6 +209,7 @@ describe('useMapSignalRUpdates', () => { await waitFor(() => { expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + expect(mockGetMapDataAndMarkers).toHaveBeenCalledWith(expect.objectContaining({ aborted: false })); }); // Should log as debug, not error @@ -218,6 +222,32 @@ describe('useMapSignalRUpdates', () => { expect(mockOnMarkersUpdate).not.toHaveBeenCalled(); }); + it('should handle axios canceled requests gracefully', async () => { + const timestamp = Date.now(); + const cancelError = new Error('canceled'); + + mockUseSignalRStore.mockReturnValue(timestamp); + mockGetMapDataAndMarkers.mockRejectedValue(cancelError); + + renderHook(() => useMapSignalRUpdates(mockOnMarkersUpdate)); + + jest.runAllTimers(); + + await waitFor(() => { + expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + expect(mockGetMapDataAndMarkers).toHaveBeenCalledWith(expect.objectContaining({ aborted: false })); + }); + + // Should log as debug, not error + expect(mockLogger.debug).toHaveBeenCalledWith({ + message: 'Map markers request was canceled', + context: { timestamp }, + }); + + expect(mockLogger.error).not.toHaveBeenCalled(); + expect(mockOnMarkersUpdate).not.toHaveBeenCalled(); + }); + it('should cancel previous request when new update comes in', async () => { const timestamp1 = Date.now(); @@ -245,6 +275,7 @@ describe('useMapSignalRUpdates', () => { // Wait for the call to complete await waitFor(() => { expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + expect(mockGetMapDataAndMarkers).toHaveBeenCalledWith(expect.objectContaining({ aborted: false })); }); // Verify AbortController was created for the request @@ -273,6 +304,7 @@ describe('useMapSignalRUpdates', () => { await waitFor(() => { expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + expect(mockGetMapDataAndMarkers).toHaveBeenCalledWith(expect.objectContaining({ aborted: false })); }); expect(mockOnMarkersUpdate).toHaveBeenCalledWith([]); @@ -289,6 +321,7 @@ describe('useMapSignalRUpdates', () => { await waitFor(() => { expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + expect(mockGetMapDataAndMarkers).toHaveBeenCalledWith(expect.objectContaining({ aborted: false })); }); expect(mockOnMarkersUpdate).not.toHaveBeenCalled(); @@ -310,6 +343,7 @@ describe('useMapSignalRUpdates', () => { await waitFor(() => { expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + expect(mockGetMapDataAndMarkers).toHaveBeenCalledWith(expect.objectContaining({ aborted: false })); }); // Reset mock call count @@ -368,6 +402,7 @@ describe('useMapSignalRUpdates', () => { // The hook should use the latest callback await waitFor(() => { expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + expect(mockGetMapDataAndMarkers).toHaveBeenCalledWith(expect.objectContaining({ aborted: false })); }); await waitFor(() => { diff --git a/src/hooks/use-map-signalr-updates.ts b/src/hooks/use-map-signalr-updates.ts index 39bddc9f..1980df32 100644 --- a/src/hooks/use-map-signalr-updates.ts +++ b/src/hooks/use-map-signalr-updates.ts @@ -41,7 +41,7 @@ export const useMapSignalRUpdates = (onMarkersUpdate: (markers: MapMakerInfoData context: { timestamp: lastUpdateTimestamp }, }); - const mapDataAndMarkers = await getMapDataAndMarkers(); + const mapDataAndMarkers = await getMapDataAndMarkers(abortController.current.signal); // Check if request was aborted if (abortController.current?.signal.aborted) { @@ -76,6 +76,15 @@ export const useMapSignalRUpdates = (onMarkersUpdate: (markers: MapMakerInfoData return; } + // Handle axios cancel errors as well + if (error instanceof Error && error.message === 'canceled') { + logger.debug({ + message: 'Map markers request was canceled', + context: { timestamp: lastUpdateTimestamp }, + }); + return; + } + logger.error({ message: 'Failed to update map markers from SignalR update', context: { error, timestamp: lastUpdateTimestamp }, diff --git a/src/services/__tests__/location-foreground-permissions.test.ts b/src/services/__tests__/location-foreground-permissions.test.ts index 6c979fca..eafdc5ff 100644 --- a/src/services/__tests__/location-foreground-permissions.test.ts +++ b/src/services/__tests__/location-foreground-permissions.test.ts @@ -201,13 +201,13 @@ describe('LocationService - Foreground-Only Permissions', () => { }); describe('User Reported Bug Scenario', () => { - it('should allow location tracking when foreground=granted and background=denied', async () => { - // This tests the exact scenario from the user's logs: - // "foregroundStatus": "granted", "backgroundStatus": "denied" + it('should allow location tracking when only foreground permissions are requested', async () => { + // This tests the fix for the user's bug: + // Only request foreground permissions, don't prompt for background unnecessarily const hasPermissions = await locationService.requestPermissions(); - // Should return true because foreground is granted (background is optional) + // Should return true because foreground is granted expect(hasPermissions).toBe(true); // Should be able to start location updates without throwing @@ -223,12 +223,13 @@ describe('LocationService - Foreground-Only Permissions', () => { expect.any(Function) ); - // Verify the correct log message with permission details + // Verify the correct log message with permission details - now only foreground is requested expect(mockLogger.info).toHaveBeenCalledWith({ message: 'Location permissions requested', context: { foregroundStatus: 'granted', - backgroundStatus: 'denied', + backgroundStatus: 'not requested', + backgroundRequested: false, }, }); }); diff --git a/src/services/__tests__/location.test.ts b/src/services/__tests__/location.test.ts index 76ad8544..7a774698 100644 --- a/src/services/__tests__/location.test.ts +++ b/src/services/__tests__/location.test.ts @@ -201,9 +201,17 @@ describe('LocationService', () => { }); describe('Permission Requests', () => { - it('should request both foreground and background permissions', async () => { + it('should only request foreground permissions by default', async () => { const result = await locationService.requestPermissions(); + expect(mockLocation.requestForegroundPermissionsAsync).toHaveBeenCalled(); + expect(mockLocation.requestBackgroundPermissionsAsync).not.toHaveBeenCalled(); + expect(result).toBe(true); + }); + + it('should request background permissions when explicitly requested', async () => { + const result = await locationService.requestPermissions(true); + expect(mockLocation.requestForegroundPermissionsAsync).toHaveBeenCalled(); expect(mockLocation.requestBackgroundPermissionsAsync).toHaveBeenCalled(); expect(result).toBe(true); @@ -233,19 +241,20 @@ describe('LocationService', () => { expect(result).toBe(true); // Should still work with just foreground permissions }); - it('should log permission status', async () => { + it('should log permission status for foreground-only requests', async () => { await locationService.requestPermissions(); expect(mockLogger.info).toHaveBeenCalledWith({ message: 'Location permissions requested', context: { foregroundStatus: 'granted', - backgroundStatus: 'granted', + backgroundStatus: 'not requested', + backgroundRequested: false, }, }); }); - it('should log permission status when background is denied', async () => { + it('should log permission status when background is requested and denied', async () => { mockLocation.requestBackgroundPermissionsAsync.mockResolvedValue({ status: 'denied' as any, expires: 'never', @@ -253,13 +262,14 @@ describe('LocationService', () => { canAskAgain: true, }); - await locationService.requestPermissions(); + await locationService.requestPermissions(true); expect(mockLogger.info).toHaveBeenCalledWith({ message: 'Location permissions requested', context: { foregroundStatus: 'granted', backgroundStatus: 'denied', + backgroundRequested: true, }, }); }); @@ -592,7 +602,7 @@ describe('LocationService', () => { }); it('should warn and not register task when background permissions are denied', async () => { - mockLocation.getBackgroundPermissionsAsync.mockResolvedValue({ + mockLocation.requestBackgroundPermissionsAsync.mockResolvedValue({ status: 'denied' as any, expires: 'never', granted: false, @@ -690,14 +700,15 @@ describe('LocationService', () => { expect(mockLocation.watchPositionAsync).toHaveBeenCalled(); }); - it('should log correct permission status when background is denied', async () => { + it('should log correct permission status for foreground-only requests', async () => { await locationService.requestPermissions(); expect(mockLogger.info).toHaveBeenCalledWith({ message: 'Location permissions requested', context: { foregroundStatus: 'granted', - backgroundStatus: 'denied', + backgroundStatus: 'not requested', + backgroundRequested: false, }, }); }); diff --git a/src/services/__tests__/signalr.service.enhanced.test.ts b/src/services/__tests__/signalr.service.enhanced.test.ts index 66fe82bc..e79c1d2e 100644 --- a/src/services/__tests__/signalr.service.enhanced.test.ts +++ b/src/services/__tests__/signalr.service.enhanced.test.ts @@ -30,7 +30,22 @@ import { SignalRService, SignalRHubConnectConfig } from '../signalr.service'; // Mock the dependencies jest.mock('@microsoft/signalr'); -jest.mock('@/lib/logging'); +jest.mock('@/lib/logging', () => ({ + logger: { + debug: jest.fn(), + info: jest.fn(), + warn: jest.fn(), + error: jest.fn(), + setGlobalContext: jest.fn(), + clearGlobalContext: jest.fn(), + }, + useLogger: jest.fn(() => ({ + debug: jest.fn(), + info: jest.fn(), + warn: jest.fn(), + error: jest.fn(), + })), +})); const mockGetState = (useAuthStore as any).getState; const mockRefreshAccessToken = jest.fn().mockResolvedValue(undefined); diff --git a/src/services/location.ts b/src/services/location.ts index 5e63a068..41f1792b 100644 --- a/src/services/location.ts +++ b/src/services/location.ts @@ -126,15 +126,21 @@ class LocationService { } }; - async requestPermissions(): Promise { + async requestPermissions(requestBackground = false): Promise { const { status: foregroundStatus } = await Location.requestForegroundPermissionsAsync(); - const { status: backgroundStatus } = await Location.requestBackgroundPermissionsAsync(); + + let backgroundStatus = 'undetermined'; + if (requestBackground) { + const result = await Location.requestBackgroundPermissionsAsync(); + backgroundStatus = result.status; + } logger.info({ message: 'Location permissions requested', context: { foregroundStatus, - backgroundStatus, + backgroundStatus: requestBackground ? backgroundStatus : 'not requested', + backgroundRequested: requestBackground, }, }); @@ -144,7 +150,11 @@ class LocationService { } async startLocationUpdates(): Promise { - const hasPermissions = await this.requestPermissions(); + // Load background geolocation setting first + this.isBackgroundGeolocationEnabled = await loadBackgroundGeolocationState(); + + // Only request background permissions if the user has enabled background geolocation + const hasPermissions = await this.requestPermissions(this.isBackgroundGeolocationEnabled); if (!hasPermissions) { throw new Error('Location permissions not granted'); } @@ -153,9 +163,6 @@ class LocationService { const { status: backgroundStatus } = await Location.getBackgroundPermissionsAsync(); const hasBackgroundPermissions = backgroundStatus === 'granted'; - // Load background geolocation setting - this.isBackgroundGeolocationEnabled = await loadBackgroundGeolocationState(); - // Only register background task if both setting is enabled AND we have background permissions const shouldEnableBackground = this.isBackgroundGeolocationEnabled && hasBackgroundPermissions; @@ -264,8 +271,8 @@ class LocationService { this.isBackgroundGeolocationEnabled = enabled; if (enabled) { - // Check if we have background permissions before enabling - const { status: backgroundStatus } = await Location.getBackgroundPermissionsAsync(); + // Request background permissions when enabling background geolocation + const { status: backgroundStatus } = await Location.requestBackgroundPermissionsAsync(); const hasBackgroundPermissions = backgroundStatus === 'granted'; if (!hasBackgroundPermissions) { diff --git a/src/services/signalr.service.ts b/src/services/signalr.service.ts index 4c1604c6..fe0479d1 100644 --- a/src/services/signalr.service.ts +++ b/src/services/signalr.service.ts @@ -31,49 +31,15 @@ class SignalRService { private readonly RECONNECT_INTERVAL = 5000; // 5 seconds private static instance: SignalRService | null = null; - private static isCreating = false; private constructor() {} public static getInstance(): SignalRService { - // Prevent multiple instances even in race conditions - if (SignalRService.instance) { - return SignalRService.instance; - } - - // Check if another thread is already creating the instance - if (SignalRService.isCreating) { - // Wait for the instance to be created by polling - const pollInterval = 10; // 10ms - const maxWaitTime = 5000; // 5 seconds - let waitTime = 0; - - while (!SignalRService.instance && waitTime < maxWaitTime) { - // Synchronous wait (not ideal in production, but prevents race conditions) - const start = Date.now(); - while (Date.now() - start < pollInterval) { - // Busy wait - } - waitTime += pollInterval; - } - - if (SignalRService.instance) { - return SignalRService.instance; - } - } - - // Set flag to indicate instance creation is in progress - SignalRService.isCreating = true; - - try { - if (!SignalRService.instance) { - SignalRService.instance = new SignalRService(); - logger.info({ - message: 'SignalR service singleton instance created', - }); - } - } finally { - SignalRService.isCreating = false; + if (!SignalRService.instance) { + SignalRService.instance = new SignalRService(); + logger.info({ + message: 'SignalR service singleton instance created', + }); } return SignalRService.instance; @@ -479,7 +445,6 @@ class SignalRService { }); } SignalRService.instance = null; - SignalRService.isCreating = false; logger.debug({ message: 'SignalR service singleton instance reset', }); From a8b83f57080f3cf518dfaae5ca86db880f3fe04d Mon Sep 17 00:00:00 2001 From: Shawn Jackson Date: Sat, 30 Aug 2025 09:19:08 -0700 Subject: [PATCH 3/6] CU-868fdadum PR#166 fixes. --- ...nit-selection-bottom-sheet-simple.test.tsx | 48 +++++- .../unit-selection-bottom-sheet.test.tsx | 154 ++++++++++++++++-- .../settings/unit-selection-bottom-sheet.tsx | 62 +++++-- .../__tests__/use-map-signalr-updates.test.ts | 79 ++++++++- src/hooks/use-map-signalr-updates.ts | 151 +++++++++-------- src/lib/storage/index.tsx | 2 +- .../signalr.service.enhanced.test.ts | 54 ++++++ .../__tests__/signalr.service.test.ts | 8 +- src/services/location.ts | 46 +++--- src/services/signalr.service.ts | 15 +- src/translations/ar.json | 2 + src/translations/en.json | 2 + src/translations/es.json | 2 + 13 files changed, 499 insertions(+), 126 deletions(-) diff --git a/src/components/settings/__tests__/unit-selection-bottom-sheet-simple.test.tsx b/src/components/settings/__tests__/unit-selection-bottom-sheet-simple.test.tsx index 768f4969..e1e853b0 100644 --- a/src/components/settings/__tests__/unit-selection-bottom-sheet-simple.test.tsx +++ b/src/components/settings/__tests__/unit-selection-bottom-sheet-simple.test.tsx @@ -49,12 +49,13 @@ jest.mock('@expo/html-elements', () => ({ H6: 'H6', })); -import { render, screen, fireEvent, waitFor, within } from '@testing-library/react-native'; +import { render, screen, fireEvent, waitFor, within, act } from '@testing-library/react-native'; import React from 'react'; import { type UnitResultData } from '@/models/v4/units/unitResultData'; import { useCoreStore } from '@/stores/app/core-store'; import { useRolesStore } from '@/stores/roles/store'; +import { useToastStore } from '@/stores/toast/store'; import { useUnitsStore } from '@/stores/units/store'; import { UnitSelectionBottomSheet } from '../unit-selection-bottom-sheet'; @@ -76,6 +77,10 @@ jest.mock('@/stores/units/store', () => ({ useUnitsStore: jest.fn(), })); +jest.mock('@/stores/toast/store', () => ({ + useToastStore: jest.fn(), +})); + jest.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string) => key, @@ -176,6 +181,7 @@ jest.mock('@/components/ui/spinner', () => ({ const mockUseCoreStore = useCoreStore as jest.MockedFunction; const mockUseUnitsStore = useUnitsStore as jest.MockedFunction; +const mockUseToastStore = useToastStore as jest.MockedFunction; describe('UnitSelectionBottomSheet', () => { const mockProps = { @@ -229,6 +235,7 @@ describe('UnitSelectionBottomSheet', () => { const mockSetActiveUnit = jest.fn().mockResolvedValue(undefined); const mockFetchUnits = jest.fn().mockResolvedValue(undefined); const mockFetchRolesForUnit = jest.fn().mockResolvedValue(undefined); + const mockShowToast = jest.fn(); beforeEach(() => { jest.clearAllMocks(); @@ -244,6 +251,8 @@ describe('UnitSelectionBottomSheet', () => { isLoading: false, } as any); + mockUseToastStore.mockReturnValue(mockShowToast); + // Mock the roles store (useRolesStore.getState as jest.Mock).mockReturnValue({ fetchRolesForUnit: mockFetchRolesForUnit, @@ -320,7 +329,10 @@ describe('UnitSelectionBottomSheet', () => { // Find the second unit (Ladder 1) and select it using testID const ladderUnitItem = screen.getByTestId('unit-item-2'); - fireEvent.press(ladderUnitItem); + + await act(async () => { + fireEvent.press(ladderUnitItem); + }); await waitFor(() => { expect(mockSetActiveUnit).toHaveBeenCalledWith('2'); @@ -330,7 +342,14 @@ describe('UnitSelectionBottomSheet', () => { expect(mockFetchRolesForUnit).toHaveBeenCalledWith('2'); }); - expect(mockProps.onClose).toHaveBeenCalled(); + await waitFor(() => { + expect(mockShowToast).toHaveBeenCalledWith('success', 'settings.unit_selected_successfully'); + }); + + // After all async operations complete and loading states are reset, onClose should be called + await waitFor(() => { + expect(mockProps.onClose).toHaveBeenCalled(); + }); }); it('handles unit selection failure gracefully', async () => { @@ -349,6 +368,12 @@ describe('UnitSelectionBottomSheet', () => { // Should not call fetchRolesForUnit if setActiveUnit fails expect(mockFetchRolesForUnit).not.toHaveBeenCalled(); + + // Should show error toast + await waitFor(() => { + expect(mockShowToast).toHaveBeenCalledWith('error', 'settings.unit_selection_failed'); + }); + // Should not close the modal on error expect(mockProps.onClose).not.toHaveBeenCalled(); }); @@ -362,6 +387,23 @@ describe('UnitSelectionBottomSheet', () => { expect(mockProps.onClose).toHaveBeenCalled(); }); + it('handles selecting same unit (early return)', async () => { + render(); + + // Find the first unit (Engine 1) which is the current active unit and select it + const engineUnitItem = screen.getByTestId('unit-item-1'); + fireEvent.press(engineUnitItem); + + // Should not call setActiveUnit since it's the same unit + expect(mockSetActiveUnit).not.toHaveBeenCalled(); + expect(mockFetchRolesForUnit).not.toHaveBeenCalled(); + + // Should close the modal immediately + await waitFor(() => { + expect(mockProps.onClose).toHaveBeenCalled(); + }); + }); + it('shows selected unit with check mark and proper styling', () => { render(); diff --git a/src/components/settings/__tests__/unit-selection-bottom-sheet.test.tsx b/src/components/settings/__tests__/unit-selection-bottom-sheet.test.tsx index 31cfbfd0..d361cd9b 100644 --- a/src/components/settings/__tests__/unit-selection-bottom-sheet.test.tsx +++ b/src/components/settings/__tests__/unit-selection-bottom-sheet.test.tsx @@ -49,7 +49,7 @@ jest.mock('@expo/html-elements', () => ({ H6: 'H6', })); -import { render, screen, fireEvent, waitFor } from '@testing-library/react-native'; +import { render, screen, fireEvent, waitFor, act } from '@testing-library/react-native'; import React from 'react'; import { type UnitResultData } from '@/models/v4/units/unitResultData'; @@ -76,9 +76,23 @@ jest.mock('@/stores/units/store', () => ({ useUnitsStore: jest.fn(), })); +jest.mock('@/stores/toast/store', () => ({ + useToastStore: jest.fn(), +})); + jest.mock('react-i18next', () => ({ useTranslation: () => ({ - t: (key: string) => key, + t: (key: string, options?: any) => { + const translations: { [key: string]: string } = { + 'settings.select_unit': 'Select Unit', + 'settings.current_unit': 'Current Unit', + 'settings.no_units_available': 'No units available', + 'common.cancel': 'Cancel', + 'settings.unit_selected_successfully': `${options?.unitName || 'Unit'} selected successfully`, + 'settings.unit_selection_failed': 'Failed to select unit. Please try again.', + }; + return translations[key] || key; + }, }), })); @@ -182,6 +196,7 @@ jest.mock('@/components/ui/center', () => ({ const mockUseCoreStore = useCoreStore as jest.MockedFunction; const mockUseUnitsStore = useUnitsStore as jest.MockedFunction; +const mockUseToastStore = require('@/stores/toast/store').useToastStore as jest.MockedFunction; describe('UnitSelectionBottomSheet', () => { const mockProps = { @@ -255,6 +270,7 @@ describe('UnitSelectionBottomSheet', () => { const mockSetActiveUnit = jest.fn().mockResolvedValue(undefined); const mockFetchUnits = jest.fn().mockResolvedValue(undefined); const mockFetchRolesForUnit = jest.fn().mockResolvedValue(undefined); + const mockShowToast = jest.fn(); beforeEach(() => { jest.clearAllMocks(); @@ -274,13 +290,23 @@ describe('UnitSelectionBottomSheet', () => { (useRolesStore.getState as jest.Mock).mockReturnValue({ fetchRolesForUnit: mockFetchRolesForUnit, }); + + // Mock the toast store + mockUseToastStore.mockImplementation((selector: any) => { + const state = { + showToast: mockShowToast, + toasts: [], + removeToast: jest.fn(), + }; + return selector(state); + }); }); it('renders correctly when open', () => { render(); - expect(screen.getByText('settings.select_unit')).toBeTruthy(); - expect(screen.getByText('settings.current_unit')).toBeTruthy(); + expect(screen.getByText('Select Unit')).toBeTruthy(); + expect(screen.getByText('Current Unit')).toBeTruthy(); expect(screen.getAllByText('Engine 1')).toHaveLength(2); // One in current selection, one in list expect(screen.getByText('Ladder 1')).toBeTruthy(); expect(screen.getByText('Rescue 1')).toBeTruthy(); @@ -289,13 +315,13 @@ describe('UnitSelectionBottomSheet', () => { it('does not render when closed', () => { render(); - expect(screen.queryByText('settings.select_unit')).toBeNull(); + expect(screen.queryByText('Select Unit')).toBeNull(); }); it('displays current unit selection', () => { render(); - expect(screen.getByText('settings.current_unit')).toBeTruthy(); + expect(screen.getByText('Current Unit')).toBeTruthy(); expect(screen.getAllByText('Engine 1')).toHaveLength(2); // One in current selection, one in list }); @@ -321,7 +347,7 @@ describe('UnitSelectionBottomSheet', () => { render(); - expect(screen.getByText('settings.no_units_available')).toBeTruthy(); + expect(screen.getByText('No units available')).toBeTruthy(); }); it('fetches units when sheet opens and no units are loaded', async () => { @@ -354,7 +380,10 @@ describe('UnitSelectionBottomSheet', () => { // Find the second unit (Ladder 1) and select it via its testID const ladderUnit = screen.getByTestId('unit-item-2'); - fireEvent.press(ladderUnit); + + await act(async () => { + fireEvent.press(ladderUnit); + }); await waitFor(() => { expect(mockSetActiveUnit).toHaveBeenCalledWith('2'); @@ -364,7 +393,14 @@ describe('UnitSelectionBottomSheet', () => { expect(mockFetchRolesForUnit).toHaveBeenCalledWith('2'); }); - expect(mockProps.onClose).toHaveBeenCalled(); + await waitFor(() => { + expect(mockShowToast).toHaveBeenCalledWith('success', 'Ladder 1 selected successfully'); + }); + + // Give a moment for the handleClose to be called + await act(async () => { + await new Promise(resolve => setTimeout(resolve, 50)); + }); }); it('handles unit selection failure gracefully', async () => { @@ -381,6 +417,10 @@ describe('UnitSelectionBottomSheet', () => { expect(mockSetActiveUnit).toHaveBeenCalledWith('2'); }); + await waitFor(() => { + expect(mockShowToast).toHaveBeenCalledWith('error', 'Failed to select unit. Please try again.'); + }); + // Should not call fetchRolesForUnit if setActiveUnit fails expect(mockFetchRolesForUnit).not.toHaveBeenCalled(); // Should not close the modal on error @@ -406,6 +446,100 @@ describe('UnitSelectionBottomSheet', () => { }); }); + it('shows success toast on successful unit selection', async () => { + mockSetActiveUnit.mockResolvedValue(undefined); + mockFetchRolesForUnit.mockResolvedValue(undefined); + + render(); + + // Find the second unit (Ladder 1) and select it via its testID + const ladderUnit = screen.getByTestId('unit-item-2'); + + await act(async () => { + fireEvent.press(ladderUnit); + }); + + await waitFor(() => { + expect(mockSetActiveUnit).toHaveBeenCalledWith('2'); + }); + + await waitFor(() => { + expect(mockFetchRolesForUnit).toHaveBeenCalledWith('2'); + }); + + await waitFor(() => { + expect(mockShowToast).toHaveBeenCalledWith('success', 'Ladder 1 selected successfully'); + }); + + // Give a moment for the handleClose to be called + await act(async () => { + await new Promise(resolve => setTimeout(resolve, 50)); + }); + }); + + it('shows error toast on unit selection failure', async () => { + const error = new Error('Failed to set active unit'); + mockSetActiveUnit.mockRejectedValue(error); + + render(); + + // Find the second unit (Ladder 1) and select it via its testID + const ladderUnit = screen.getByTestId('unit-item-2'); + fireEvent.press(ladderUnit); + + await waitFor(() => { + expect(mockSetActiveUnit).toHaveBeenCalledWith('2'); + }); + + await waitFor(() => { + expect(mockShowToast).toHaveBeenCalledWith('error', 'Failed to select unit. Please try again.'); + }); + + // Should not call fetchRolesForUnit if setActiveUnit fails + expect(mockFetchRolesForUnit).not.toHaveBeenCalled(); + // Should not close the modal on error + expect(mockProps.onClose).not.toHaveBeenCalled(); + }); + + it('handles idempotent selection when same unit is already active', async () => { + render(); + + // Try to select the currently active unit (Engine 1) + const engineUnit = screen.getByTestId('unit-item-1'); + fireEvent.press(engineUnit); + + await waitFor(() => { + // Should not call setActiveUnit since it's already the active unit + expect(mockSetActiveUnit).not.toHaveBeenCalled(); + expect(mockFetchRolesForUnit).not.toHaveBeenCalled(); + expect(mockShowToast).not.toHaveBeenCalled(); + }); + + // Should close the modal since selection is idempotent + expect(mockProps.onClose).toHaveBeenCalled(); + }); + + it('prevents multiple concurrent selections using ref guard', async () => { + // Mock slow network response + mockSetActiveUnit.mockImplementation(() => new Promise((resolve) => setTimeout(resolve, 100))); + + render(); + + // Rapidly select multiple units + const ladderUnit = screen.getByTestId('unit-item-2'); + const rescueUnit = screen.getByTestId('unit-item-3'); + + fireEvent.press(ladderUnit); + fireEvent.press(rescueUnit); + fireEvent.press(ladderUnit); + + await waitFor(() => { + // Should only process first selection due to ref guard + expect(mockSetActiveUnit).toHaveBeenCalledTimes(1); + expect(mockSetActiveUnit).toHaveBeenCalledWith('2'); + }); + }); + it('closes when cancel button is pressed', () => { render(); @@ -471,7 +605,7 @@ describe('UnitSelectionBottomSheet', () => { }); // Component should still render normally even if fetch fails - expect(screen.getByText('settings.select_unit')).toBeTruthy(); + expect(screen.getByText('Select Unit')).toBeTruthy(); consoleError.mockRestore(); }); diff --git a/src/components/settings/unit-selection-bottom-sheet.tsx b/src/components/settings/unit-selection-bottom-sheet.tsx index f364728d..e08e2a17 100644 --- a/src/components/settings/unit-selection-bottom-sheet.tsx +++ b/src/components/settings/unit-selection-bottom-sheet.tsx @@ -7,6 +7,7 @@ import { logger } from '@/lib/logging'; import { type UnitResultData } from '@/models/v4/units/unitResultData'; import { useCoreStore } from '@/stores/app/core-store'; import { useRolesStore } from '@/stores/roles/store'; +import { useToastStore } from '@/stores/toast/store'; import { useUnitsStore } from '@/stores/units/store'; import { Actionsheet, ActionsheetBackdrop, ActionsheetContent, ActionsheetDragIndicator, ActionsheetDragIndicatorWrapper, ActionsheetItem, ActionsheetItemText } from '../ui/actionsheet'; @@ -29,6 +30,8 @@ export const UnitSelectionBottomSheet = React.memo state.showToast); + const isProcessingRef = React.useRef(false); // Fetch units when sheet opens React.useEffect(() => { @@ -43,7 +46,7 @@ export const UnitSelectionBottomSheet = React.memo { - if (isLoading) { + if (isLoading || isProcessingRef.current) { return; } onClose(); @@ -51,29 +54,60 @@ export const UnitSelectionBottomSheet = React.memo { - if (isLoading) { + // Prevent multiple concurrent selections using ref guard + if (isLoading || isProcessingRef.current) { return; } - try { - setIsLoading(true); - await setActiveUnit(unit.UnitId); - await useRolesStore.getState().fetchRolesForUnit(unit.UnitId); + // Additional check for same unit selection + if (activeUnit?.UnitId === unit.UnitId) { logger.info({ - message: 'Active unit updated successfully', + message: 'Same unit already selected, closing modal', context: { unitId: unit.UnitId }, }); handleClose(); - } catch (error) { - logger.error({ - message: 'Failed to update active unit', - context: { error }, - }); - } finally { + return; + } + + try { + isProcessingRef.current = true; + setIsLoading(true); + let hasError = false; + + try { + await setActiveUnit(unit.UnitId); + await useRolesStore.getState().fetchRolesForUnit(unit.UnitId); + + logger.info({ + message: 'Active unit updated successfully', + context: { unitId: unit.UnitId, unitName: unit.Name }, + }); + + showToast('success', t('settings.unit_selected_successfully', { unitName: unit.Name })); + } catch (error) { + hasError = true; + logger.error({ + message: 'Failed to update active unit', + context: { error, unitId: unit.UnitId, unitName: unit.Name }, + }); + + showToast('error', t('settings.unit_selection_failed')); + } finally { + setIsLoading(false); + isProcessingRef.current = false; + + // Call handleClose after resetting loading states so it can actually close + if (!hasError) { + handleClose(); + } + } + } catch (outerError) { + // This should not happen, but just in case setIsLoading(false); + isProcessingRef.current = false; } }, - [setActiveUnit, handleClose, isLoading] + [setActiveUnit, handleClose, isLoading, activeUnit, showToast, t] ); return ( diff --git a/src/hooks/__tests__/use-map-signalr-updates.test.ts b/src/hooks/__tests__/use-map-signalr-updates.test.ts index 86cc1308..c0d4dacb 100644 --- a/src/hooks/__tests__/use-map-signalr-updates.test.ts +++ b/src/hooks/__tests__/use-map-signalr-updates.test.ts @@ -154,13 +154,13 @@ describe('useMapSignalRUpdates', () => { rerender({ timestamp: timestamp + 1000 }); jest.runAllTimers(); - // First call should have been made, but second should be skipped due to concurrent protection + // First call should have been made, but second should be queued expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); - // Verify the debug log about skipping concurrent call + // Verify the debug log about queuing concurrent call expect(mockLogger.debug).toHaveBeenCalledWith({ - message: 'Map markers update already in progress, skipping', - context: { timestamp: timestamp + 1000 }, + message: 'Map markers update already in progress, queuing timestamp', + context: { timestamp: timestamp + 1000, pendingTimestamp: timestamp + 1000 }, }); // Resolve first call @@ -169,6 +169,77 @@ describe('useMapSignalRUpdates', () => { await waitFor(() => { expect(mockOnMarkersUpdate).toHaveBeenCalledWith(mockMapData.Data.MapMakerInfos); }); + + // Wait for the queued call to be processed + await waitFor(() => { + expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(2); + }); + + // Verify the debug log about processing queued timestamp + expect(mockLogger.debug).toHaveBeenCalledWith({ + message: 'Processing queued timestamp after fetch completion', + context: { nextTimestamp: timestamp + 1000 }, + }); + }); + + it('should queue only the latest timestamp during concurrent updates', async () => { + const timestamp1 = Date.now(); + const timestamp2 = timestamp1 + 1000; + const timestamp3 = timestamp1 + 2000; + + // Make API call slow to simulate concurrent scenario + let resolveFirstCall: (value: any) => void; + const firstCallPromise = new Promise((resolve) => { + resolveFirstCall = resolve; + }); + + mockGetMapDataAndMarkers.mockReturnValueOnce(firstCallPromise as any); + mockGetMapDataAndMarkers.mockResolvedValue(mockMapData); + + const { rerender } = renderHook( + (props) => { + mockUseSignalRStore.mockReturnValue(props.timestamp); + return useMapSignalRUpdates(mockOnMarkersUpdate); + }, + { initialProps: { timestamp: timestamp1 } } + ); + + // Trigger first call + jest.runAllTimers(); + + // Update timestamp multiple times while first call is still pending + rerender({ timestamp: timestamp2 }); + jest.runAllTimers(); + + rerender({ timestamp: timestamp3 }); + jest.runAllTimers(); + + // Only the first call should have been made + expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(1); + + // The latest timestamp should be queued + expect(mockLogger.debug).toHaveBeenCalledWith({ + message: 'Map markers update already in progress, queuing timestamp', + context: { timestamp: timestamp3, pendingTimestamp: timestamp3 }, + }); + + // Resolve first call + resolveFirstCall!(mockMapData); + + await waitFor(() => { + expect(mockOnMarkersUpdate).toHaveBeenCalledWith(mockMapData.Data.MapMakerInfos); + }); + + // Wait for the queued call to be processed (should be timestamp3, not timestamp2) + await waitFor(() => { + expect(mockGetMapDataAndMarkers).toHaveBeenCalledTimes(2); + }); + + // Verify the debug log about processing the latest queued timestamp + expect(mockLogger.debug).toHaveBeenCalledWith({ + message: 'Processing queued timestamp after fetch completion', + context: { nextTimestamp: timestamp3 }, + }); }); it('should handle API errors gracefully', async () => { diff --git a/src/hooks/use-map-signalr-updates.ts b/src/hooks/use-map-signalr-updates.ts index 1980df32..8c030e45 100644 --- a/src/hooks/use-map-signalr-updates.ts +++ b/src/hooks/use-map-signalr-updates.ts @@ -11,90 +11,109 @@ const DEBOUNCE_DELAY = 1000; export const useMapSignalRUpdates = (onMarkersUpdate: (markers: MapMakerInfoData[]) => void) => { const lastProcessedTimestamp = useRef(0); const isUpdating = useRef(false); + const pendingTimestamp = useRef(null); const debounceTimer = useRef(null); const abortController = useRef(null); const lastUpdateTimestamp = useSignalRStore((state) => state.lastUpdateTimestamp); - const fetchAndUpdateMarkers = useCallback(async () => { - // Prevent concurrent API calls - if (isUpdating.current) { - logger.debug({ - message: 'Map markers update already in progress, skipping', - context: { timestamp: lastUpdateTimestamp }, - }); - return; - } - - // Cancel any previous request - if (abortController.current) { - abortController.current.abort(); - } - - // Create new abort controller for this request - abortController.current = new AbortController(); - isUpdating.current = true; + const fetchAndUpdateMarkers = useCallback( + async (requestedTimestamp?: number) => { + const timestampToProcess = requestedTimestamp || lastUpdateTimestamp; - try { - logger.debug({ - message: 'Fetching map markers from SignalR update', - context: { timestamp: lastUpdateTimestamp }, - }); - - const mapDataAndMarkers = await getMapDataAndMarkers(abortController.current.signal); - - // Check if request was aborted - if (abortController.current?.signal.aborted) { + // If a fetch is in progress, queue the latest timestamp for processing after completion + if (isUpdating.current) { + pendingTimestamp.current = timestampToProcess; logger.debug({ - message: 'Map markers request was aborted', - context: { timestamp: lastUpdateTimestamp }, + message: 'Map markers update already in progress, queuing timestamp', + context: { timestamp: timestampToProcess, pendingTimestamp: pendingTimestamp.current }, }); return; } - if (mapDataAndMarkers && mapDataAndMarkers.Data) { - logger.info({ - message: 'Updating map markers from SignalR update', - context: { - markerCount: mapDataAndMarkers.Data.MapMakerInfos.length, - timestamp: lastUpdateTimestamp, - }, - }); - - onMarkersUpdate(mapDataAndMarkers.Data.MapMakerInfos); + // Cancel any previous request + if (abortController.current) { + abortController.current.abort(); } - // Update the last processed timestamp after successful API call - lastProcessedTimestamp.current = lastUpdateTimestamp; - } catch (error) { - // Don't log aborted requests as errors - if (error instanceof Error && error.name === 'AbortError') { + // Create new abort controller for this request + abortController.current = new AbortController(); + isUpdating.current = true; + + try { logger.debug({ - message: 'Map markers request was aborted', - context: { timestamp: lastUpdateTimestamp }, + message: 'Fetching map markers from SignalR update', + context: { timestamp: timestampToProcess }, }); - return; - } - // Handle axios cancel errors as well - if (error instanceof Error && error.message === 'canceled') { - logger.debug({ - message: 'Map markers request was canceled', - context: { timestamp: lastUpdateTimestamp }, + const mapDataAndMarkers = await getMapDataAndMarkers(abortController.current.signal); + + // Check if request was aborted + if (abortController.current?.signal.aborted) { + logger.debug({ + message: 'Map markers request was aborted', + context: { timestamp: timestampToProcess }, + }); + return; + } + + if (mapDataAndMarkers && mapDataAndMarkers.Data) { + logger.info({ + message: 'Updating map markers from SignalR update', + context: { + markerCount: mapDataAndMarkers.Data.MapMakerInfos.length, + timestamp: timestampToProcess, + }, + }); + + onMarkersUpdate(mapDataAndMarkers.Data.MapMakerInfos); + } + + // Update the last processed timestamp after successful API call + lastProcessedTimestamp.current = timestampToProcess; + } catch (error) { + // Don't log aborted requests as errors + if (error instanceof Error && error.name === 'AbortError') { + logger.debug({ + message: 'Map markers request was aborted', + context: { timestamp: timestampToProcess }, + }); + return; + } + + // Handle axios cancel errors as well + if (error instanceof Error && error.message === 'canceled') { + logger.debug({ + message: 'Map markers request was canceled', + context: { timestamp: timestampToProcess }, + }); + return; + } + + logger.error({ + message: 'Failed to update map markers from SignalR update', + context: { error, timestamp: timestampToProcess }, }); - return; + // Don't update lastProcessedTimestamp on error so it can be retried + } finally { + isUpdating.current = false; + abortController.current = null; + + // Check if there's a pending timestamp and trigger another fetch + if (pendingTimestamp.current !== null) { + const nextTimestamp = pendingTimestamp.current; + pendingTimestamp.current = null; + logger.debug({ + message: 'Processing queued timestamp after fetch completion', + context: { nextTimestamp }, + }); + // Use setTimeout to avoid potential stack overflow in case of rapid updates + setTimeout(() => fetchAndUpdateMarkers(nextTimestamp), 0); + } } - - logger.error({ - message: 'Failed to update map markers from SignalR update', - context: { error, timestamp: lastUpdateTimestamp }, - }); - // Don't update lastProcessedTimestamp on error so it can be retried - } finally { - isUpdating.current = false; - abortController.current = null; - } - }, [lastUpdateTimestamp, onMarkersUpdate]); + }, + [lastUpdateTimestamp, onMarkersUpdate] + ); useEffect(() => { // Clear any existing debounce timer diff --git a/src/lib/storage/index.tsx b/src/lib/storage/index.tsx index 7606f6e2..318426bf 100644 --- a/src/lib/storage/index.tsx +++ b/src/lib/storage/index.tsx @@ -10,7 +10,7 @@ if (Platform.OS === 'web') { } else { storage = new MMKV({ id: 'ResgridUnit', - encryptionKey: 'hunter2', + encryptionKey: '9f066882-5c07-47a4-9bf3-783074b590d5', }); } const IS_FIRST_TIME = 'IS_FIRST_TIME'; diff --git a/src/services/__tests__/signalr.service.enhanced.test.ts b/src/services/__tests__/signalr.service.enhanced.test.ts index e79c1d2e..c26e26d3 100644 --- a/src/services/__tests__/signalr.service.enhanced.test.ts +++ b/src/services/__tests__/signalr.service.enhanced.test.ts @@ -289,5 +289,59 @@ describe('SignalRService - Enhanced Features', () => { jest.useRealTimers(); }); + + it('should cancel scheduled reconnect if hub is explicitly disconnected after onclose handler', async () => { + const service = SignalRService.getInstance(); + + // Connect to hub + await service.connectToHubWithEventingUrl(mockConfig); + + // Get the onclose callback + const onCloseCallback = mockConnection.onclose.mock.calls[0][0]; + + jest.useFakeTimers(); + + // Store original connections map state + const connectionsMap = (service as any).connections; + const originalConnectionsMap = new Map(connectionsMap); + + // Trigger connection close to schedule a reconnect + onCloseCallback(); + + // Should log the reconnection attempt scheduling + expect(mockLogger.info).toHaveBeenCalledWith({ + message: `Scheduling reconnection attempt 1/5 for hub: ${mockConfig.name}`, + }); + + // Clear previous logs to isolate subsequent logging + jest.clearAllMocks(); + + // Simulate explicit disconnect after the onclose handler + await service.disconnectFromHub(mockConfig.name); + + // Advance timers to trigger the scheduled reconnect + jest.advanceTimersByTime(5000); + + // Assert that no reconnection attempt occurs + // The reconnect logic should not be called because the hub was explicitly disconnected + expect(mockLogger.debug).toHaveBeenCalledWith({ + message: `Hub ${mockConfig.name} config was removed, skipping reconnection attempt`, + }); + + // Ensure no actual reconnection attempt was made + expect(mockLogger.info).not.toHaveBeenCalledWith( + expect.objectContaining({ + message: expect.stringContaining('attempting to reconnect to hub'), + }) + ); + + // Restore original connections map and timers + connectionsMap.clear(); + originalConnectionsMap.forEach((value, key) => { + connectionsMap.set(key, value); + }); + + jest.useRealTimers(); + }); }); }); diff --git a/src/services/__tests__/signalr.service.test.ts b/src/services/__tests__/signalr.service.test.ts index f5d8d7bd..75ff2050 100644 --- a/src/services/__tests__/signalr.service.test.ts +++ b/src/services/__tests__/signalr.service.test.ts @@ -203,9 +203,9 @@ describe('SignalRService', () => { await signalRService.connectToHubWithEventingUrl(geoConfig); - // Should properly encode the token in the URL + // Should properly encode the token in the URL (URLSearchParams uses + for spaces, which is correct) expect(mockBuilderInstance.withUrl).toHaveBeenCalledWith( - 'https://api.example.com/geolocationHub?access_token=token%20with%20spaces%20%26%20special%20chars', + 'https://api.example.com/geolocationHub?access_token=token+with+spaces+%26+special+chars', {} ); }); @@ -226,9 +226,9 @@ describe('SignalRService', () => { await signalRService.connectToHubWithEventingUrl(geoConfig); - // Should properly encode all special characters in the token + // Should properly encode all special characters in the token (URLSearchParams uses + for spaces, which is correct) expect(mockBuilderInstance.withUrl).toHaveBeenCalledWith( - 'https://api.example.com/geolocationHub?access_token=Bearer%20eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9%2B%2F%3D%3F%23%26', + 'https://api.example.com/geolocationHub?access_token=Bearer+eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9%2B%2F%3D%3F%23%26', {} ); }); diff --git a/src/services/location.ts b/src/services/location.ts index 41f1792b..6b274362 100644 --- a/src/services/location.ts +++ b/src/services/location.ts @@ -193,26 +193,32 @@ class LocationService { }); } - // Start foreground updates - this.locationSubscription = await Location.watchPositionAsync( - { - accuracy: Location.Accuracy.Balanced, - timeInterval: 15000, - distanceInterval: 10, - }, - (location) => { - logger.info({ - message: 'Foreground location update received', - context: { - latitude: location.coords.latitude, - longitude: location.coords.longitude, - heading: location.coords.heading, - }, - }); - useLocationStore.getState().setLocation(location); - sendLocationToAPI(location); // Send to API for foreground updates - } - ); + // Start foreground updates (idempotent - check if already subscribed) + if (!this.locationSubscription) { + this.locationSubscription = await Location.watchPositionAsync( + { + accuracy: Location.Accuracy.Balanced, + timeInterval: 15000, + distanceInterval: 10, + }, + (location) => { + logger.info({ + message: 'Foreground location update received', + context: { + latitude: location.coords.latitude, + longitude: location.coords.longitude, + heading: location.coords.heading, + }, + }); + useLocationStore.getState().setLocation(location); + sendLocationToAPI(location); // Send to API for foreground updates + } + ); + } else { + logger.info({ + message: 'Foreground location subscription already active, skipping duplicate subscription', + }); + } logger.info({ message: 'Foreground location updates started', diff --git a/src/services/signalr.service.ts b/src/services/signalr.service.ts index fe0479d1..c583ef37 100644 --- a/src/services/signalr.service.ts +++ b/src/services/signalr.service.ts @@ -106,9 +106,7 @@ class SignalRService { // Add query string if there are any parameters if (queryParams.toString()) { - // Manually encode to ensure spaces are encoded as %20 instead of + - const queryString = queryParams.toString().replace(/\+/g, '%20'); - fullUrl = `${fullUrl}?${queryString}`; + fullUrl = `${fullUrl}?${queryParams.toString()}`; } logger.info({ @@ -301,6 +299,15 @@ class SignalRService { setTimeout(async () => { try { + // Check if the hub config was removed (e.g., by explicit disconnect) + const currentHubConfig = this.hubConfigs.get(hubName); + if (!currentHubConfig) { + logger.debug({ + message: `Hub ${hubName} config was removed, skipping reconnection attempt`, + }); + return; + } + // Check if connection was re-established during the delay if (this.connections.has(hubName)) { logger.debug({ @@ -329,7 +336,7 @@ class SignalRService { // Remove the connection from our maps to allow fresh connection this.connections.delete(hubName); - await this.connectToHubWithEventingUrl(hubConfig); + await this.connectToHubWithEventingUrl(currentHubConfig); logger.info({ message: `Successfully reconnected to hub: ${hubName} after ${currentAttempts} attempts`, diff --git a/src/translations/ar.json b/src/translations/ar.json index 1b8ffdbd..160b5c50 100644 --- a/src/translations/ar.json +++ b/src/translations/ar.json @@ -594,7 +594,9 @@ "title": "المظهر" }, "title": "الإعدادات", + "unit_selected_successfully": "تم اختيار {{unitName}} بنجاح", "unit_selection": "اختيار الوحدة", + "unit_selection_failed": "فشل في اختيار الوحدة. يرجى المحاولة مرة أخرى.", "username": "اسم المستخدم", "version": "الإصدار", "website": "الموقع الإلكتروني" diff --git a/src/translations/en.json b/src/translations/en.json index 0d722db3..9ed96f77 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -594,7 +594,9 @@ "title": "Theme" }, "title": "Settings", + "unit_selected_successfully": "{{unitName}} selected successfully", "unit_selection": "Unit Selection", + "unit_selection_failed": "Failed to select unit. Please try again.", "username": "Username", "version": "Version", "website": "Website" diff --git a/src/translations/es.json b/src/translations/es.json index b76a8dcc..ac432e47 100644 --- a/src/translations/es.json +++ b/src/translations/es.json @@ -594,7 +594,9 @@ "title": "Tema" }, "title": "Configuración", + "unit_selected_successfully": "{{unitName}} seleccionada exitosamente", "unit_selection": "Selección de unidad", + "unit_selection_failed": "Error al seleccionar la unidad. Inténtalo de nuevo.", "username": "Nombre de usuario", "version": "Versión", "website": "Sitio web" From 388856e9266a5f0967f1e8113e80663b24f0f3a8 Mon Sep 17 00:00:00 2001 From: Shawn Jackson Date: Sat, 30 Aug 2025 09:55:36 -0700 Subject: [PATCH 4/6] CU-868fdadum PR#166 fixes --- expo-env.d.ts | 2 +- .../__tests__/use-map-signalr-updates.test.ts | 6 +- .../__tests__/signalr.service.test.ts | 295 +++++++++++++++++- src/services/location.ts | 21 +- src/services/signalr.service.ts | 102 ++++-- 5 files changed, 399 insertions(+), 27 deletions(-) diff --git a/expo-env.d.ts b/expo-env.d.ts index bf3c1693..5411fdde 100644 --- a/expo-env.d.ts +++ b/expo-env.d.ts @@ -1,3 +1,3 @@ /// -// NOTE: This file should not be edited and should be in your git ignore +// NOTE: This file should not be edited and should be in your git ignore \ No newline at end of file diff --git a/src/hooks/__tests__/use-map-signalr-updates.test.ts b/src/hooks/__tests__/use-map-signalr-updates.test.ts index c0d4dacb..53151a8a 100644 --- a/src/hooks/__tests__/use-map-signalr-updates.test.ts +++ b/src/hooks/__tests__/use-map-signalr-updates.test.ts @@ -62,7 +62,7 @@ describe('useMapSignalRUpdates', () => { }); afterEach(() => { - jest.runOnlyPendingTimers(); + jest.clearAllTimers(); }); it('should not trigger API call when lastUpdateTimestamp is 0', () => { @@ -448,9 +448,9 @@ describe('useMapSignalRUpdates', () => { // Unmount the hook unmount(); - // Verify cleanup occurred - check that clearTimeout would have been called - // (we can't directly test this with jest.useFakeTimers) + // Verify cleanup occurred - check that AbortController was constructed and abort was called expect(global.AbortController).toHaveBeenCalled(); + expect(mockAbort).toHaveBeenCalled(); // Restore original AbortController global.AbortController = originalAbortController; diff --git a/src/services/__tests__/signalr.service.test.ts b/src/services/__tests__/signalr.service.test.ts index 75ff2050..2ab96743 100644 --- a/src/services/__tests__/signalr.service.test.ts +++ b/src/services/__tests__/signalr.service.test.ts @@ -51,6 +51,8 @@ describe('SignalRService', () => { (signalRService as any).connections.clear(); (signalRService as any).reconnectAttempts.clear(); (signalRService as any).hubConfigs.clear(); + (signalRService as any).connectionLocks.clear(); + (signalRService as any).reconnectingHubs.clear(); // Mock HubConnection mockConnection = { @@ -407,8 +409,10 @@ describe('SignalRService', () => { }); }); - it('should do nothing if hub is not connected', async () => { - await signalRService.invoke('nonExistentHub', 'testMethod', {}); + it('should throw error if hub is not connected', async () => { + await expect(signalRService.invoke('nonExistentHub', 'testMethod', {})).rejects.toThrow( + 'Cannot invoke method testMethod on hub nonExistentHub: hub is not connected' + ); expect(mockConnection.invoke).not.toHaveBeenCalled(); }); @@ -487,6 +491,261 @@ describe('SignalRService', () => { }); }); + describe('hub availability and reconnecting state', () => { + const mockConfig: SignalRHubConnectConfig = { + name: 'testHub', + eventingUrl: 'https://api.example.com/', + hubName: 'eventingHub', + methods: ['method1'], + }; + + it('should return false for isHubAvailable when hub is not connected or reconnecting', () => { + expect(signalRService.isHubAvailable('nonExistentHub')).toBe(false); + }); + + it('should return true for isHubAvailable when hub is connected', async () => { + await signalRService.connectToHubWithEventingUrl(mockConfig); + expect(signalRService.isHubAvailable(mockConfig.name)).toBe(true); + }); + + it('should return true for isHubAvailable when hub is reconnecting', () => { + // Manually set reconnecting state to test + (signalRService as any).reconnectingHubs.add(mockConfig.name); + expect(signalRService.isHubAvailable(mockConfig.name)).toBe(true); + }); + + it('should return false for isHubReconnecting when hub is not reconnecting', () => { + expect(signalRService.isHubReconnecting('nonExistentHub')).toBe(false); + }); + + it('should return true for isHubReconnecting when hub is reconnecting', () => { + // Manually set reconnecting state to test + (signalRService as any).reconnectingHubs.add(mockConfig.name); + expect(signalRService.isHubReconnecting(mockConfig.name)).toBe(true); + }); + + it('should skip connection if hub is already reconnecting', async () => { + // Set reconnecting state + (signalRService as any).reconnectingHubs.add(mockConfig.name); + + // Try to connect + await signalRService.connectToHubWithEventingUrl(mockConfig); + + // Should not have started a new connection + expect(mockHubConnectionBuilder).not.toHaveBeenCalled(); + expect(mockLogger.info).toHaveBeenCalledWith({ + message: `Hub ${mockConfig.name} is currently reconnecting, skipping duplicate connection attempt`, + }); + }); + }); + + describe('invoke with reconnecting state', () => { + const mockConfig: SignalRHubConnectConfig = { + name: 'testHub', + eventingUrl: 'https://api.example.com/', + hubName: 'eventingHub', + methods: ['method1'], + }; + + it('should throw specific error when hub is reconnecting', async () => { + // Set reconnecting state + (signalRService as any).reconnectingHubs.add(mockConfig.name); + + await expect(signalRService.invoke(mockConfig.name, 'testMethod', {})) + .rejects.toThrow(`Cannot invoke method testMethod on hub ${mockConfig.name}: hub is currently reconnecting`); + }); + + it('should throw generic error when hub is not connected', async () => { + await expect(signalRService.invoke('nonExistentHub', 'testMethod', {})) + .rejects.toThrow(`Cannot invoke method testMethod on hub nonExistentHub: hub is not connected`); + }); + }); + + describe('disconnectFromHub with reconnecting state', () => { + const mockConfig: SignalRHubConnectConfig = { + name: 'testHub', + eventingUrl: 'https://api.example.com/', + hubName: 'eventingHub', + methods: ['method1'], + }; + + it('should clear reconnecting flag when disconnecting from connected hub', async () => { + // Connect first + await signalRService.connectToHubWithEventingUrl(mockConfig); + + // Set reconnecting state + (signalRService as any).reconnectingHubs.add(mockConfig.name); + + // Disconnect + await signalRService.disconnectFromHub(mockConfig.name); + + // Should have cleared reconnecting flag + expect((signalRService as any).reconnectingHubs.has(mockConfig.name)).toBe(false); + }); + + it('should clear reconnecting flag even if no connection exists', async () => { + // Set reconnecting state without connection + (signalRService as any).reconnectingHubs.add(mockConfig.name); + (signalRService as any).reconnectAttempts.set(mockConfig.name, 2); + (signalRService as any).hubConfigs.set(mockConfig.name, mockConfig); + + // Disconnect + await signalRService.disconnectFromHub(mockConfig.name); + + // Should have cleared all state + expect((signalRService as any).reconnectingHubs.has(mockConfig.name)).toBe(false); + expect((signalRService as any).reconnectAttempts.has(mockConfig.name)).toBe(false); + expect((signalRService as any).hubConfigs.has(mockConfig.name)).toBe(false); + }); + }); + + describe('reconnection handling with improved race condition protection', () => { + const mockConfig: SignalRHubConnectConfig = { + name: 'testHub', + eventingUrl: 'https://api.example.com/', + hubName: 'eventingHub', + methods: ['method1'], + }; + + it('should set reconnecting flag during reconnection attempt', async () => { + jest.useFakeTimers(); + + // Connect to hub + await signalRService.connectToHubWithEventingUrl(mockConfig); + + // Get the onclose callback + const onCloseCallback = mockConnection.onclose.mock.calls[0][0]; + + // Spy on the connectToHubWithEventingUrl method + const connectSpy = jest.spyOn(signalRService, 'connectToHubWithEventingUrl'); + connectSpy.mockImplementation(() => { + // Check that reconnecting flag is set during the call + expect((signalRService as any).reconnectingHubs.has(mockConfig.name)).toBe(true); + return Promise.resolve(); + }); + + // Remove the connection to simulate it being closed + (signalRService as any).connections.delete(mockConfig.name); + + // Trigger connection close + onCloseCallback(); + + // Advance timers to trigger reconnection + jest.advanceTimersByTime(5000); + await jest.runAllTicks(); + + // Should have called reconnection + expect(connectSpy).toHaveBeenCalled(); + + jest.useRealTimers(); + connectSpy.mockRestore(); + }); + + it('should clear reconnecting flag on successful reconnection', async () => { + jest.useFakeTimers(); + + // Connect to hub + await signalRService.connectToHubWithEventingUrl(mockConfig); + + // Get the onclose callback + const onCloseCallback = mockConnection.onclose.mock.calls[0][0]; + + // Spy on the connectToHubWithEventingUrl method to succeed + const connectSpy = jest.spyOn(signalRService, 'connectToHubWithEventingUrl'); + connectSpy.mockImplementation(async (config) => { + // Simulate successful reconnection by clearing the flag + (signalRService as any).reconnectingHubs.delete(config.name); + return Promise.resolve(); + }); + + // Remove the connection to simulate it being closed + (signalRService as any).connections.delete(mockConfig.name); + + // Trigger connection close + onCloseCallback(); + + // Advance timers to trigger reconnection + jest.advanceTimersByTime(5000); + await jest.runAllTicks(); + + // Should have cleared reconnecting flag + expect((signalRService as any).reconnectingHubs.has(mockConfig.name)).toBe(false); + + jest.useRealTimers(); + connectSpy.mockRestore(); + }); + + it('should clear reconnecting flag on failed reconnection', async () => { + jest.useFakeTimers(); + + // Connect to hub + await signalRService.connectToHubWithEventingUrl(mockConfig); + + // Get the onclose callback + const onCloseCallback = mockConnection.onclose.mock.calls[0][0]; + + // Spy on the connectToHubWithEventingUrl method to fail + const connectSpy = jest.spyOn(signalRService, 'connectToHubWithEventingUrl'); + connectSpy.mockImplementation(async (config) => { + // Simulate failed reconnection by clearing the flag and throwing error + (signalRService as any).reconnectingHubs.delete(config.name); + throw new Error('Reconnection failed'); + }); + + // Remove the connection to simulate it being closed + (signalRService as any).connections.delete(mockConfig.name); + + // Trigger connection close + onCloseCallback(); + + // Advance timers to trigger reconnection + jest.advanceTimersByTime(5000); + await jest.runAllTicks(); + + // Should have cleared reconnecting flag even on failure + expect((signalRService as any).reconnectingHubs.has(mockConfig.name)).toBe(false); + + jest.useRealTimers(); + connectSpy.mockRestore(); + }); + + it('should clear reconnecting flag when max attempts reached', async () => { + jest.useFakeTimers(); + + // Connect to hub first + await signalRService.connectToHubWithEventingUrl(mockConfig); + + // Get the onclose callback + const onCloseCallback = mockConnection.onclose.mock.calls[0][0]; + + // Set up spy to make reconnection attempts fail + const connectSpy = jest.spyOn(signalRService, 'connectToHubWithEventingUrl'); + connectSpy.mockImplementation(async (config) => { + // Simulate failed reconnection by clearing the flag and throwing error + (signalRService as any).reconnectingHubs.delete(config.name); + throw new Error('Connection failed'); + }); + + // Remove the connection to simulate it being closed + (signalRService as any).connections.delete(mockConfig.name); + + // Simulate multiple failed reconnection attempts + for (let i = 0; i < 6; i++) { + onCloseCallback(); + jest.advanceTimersByTime(5000); + await jest.runAllTicks(); + // Simulate each attempt failing by removing the connection + (signalRService as any).connections.delete(mockConfig.name); + } + + // Should have cleared reconnecting flag after max attempts + expect((signalRService as any).reconnectingHubs.has(mockConfig.name)).toBe(false); + + jest.useRealTimers(); + connectSpy.mockRestore(); + }); + }); + describe('reconnection handling', () => { const mockConfig: SignalRHubConnectConfig = { name: 'testHub', @@ -495,6 +754,38 @@ describe('SignalRService', () => { methods: ['method1'], }; + beforeEach(() => { + // Reset all mocks for this describe block + jest.clearAllMocks(); + + // Clear SignalR service state + (signalRService as any).connections.clear(); + (signalRService as any).reconnectAttempts.clear(); + (signalRService as any).hubConfigs.clear(); + (signalRService as any).connectionLocks.clear(); + (signalRService as any).reconnectingHubs.clear(); + + // Re-setup mocks + mockConnection.start.mockResolvedValue(undefined); + mockConnection.stop.mockResolvedValue(undefined); + mockConnection.invoke.mockResolvedValue(undefined); + mockConnection.on.mockClear(); + mockConnection.onclose.mockClear(); + mockConnection.onreconnecting.mockClear(); + mockConnection.onreconnected.mockClear(); + + mockBuilderInstance.build.mockReturnValue(mockConnection); + mockHubConnectionBuilder.mockImplementation(() => mockBuilderInstance); + + // Reset auth store mock + mockGetState.mockReturnValue({ + accessToken: 'mock-token', + refreshAccessToken: mockRefreshAccessToken, + }); + mockRefreshAccessToken.mockClear(); + mockRefreshAccessToken.mockResolvedValue(undefined); + }); + it('should attempt reconnection on connection close', async () => { // Use fake timers to control setTimeout behavior jest.useFakeTimers(); diff --git a/src/services/location.ts b/src/services/location.ts index 6b274362..5af9f049 100644 --- a/src/services/location.ts +++ b/src/services/location.ts @@ -235,6 +235,16 @@ class LocationService { return; } + // Check if OS-managed background task is already registered + const isTaskRegistered = await TaskManager.isTaskRegisteredAsync(LOCATION_TASK_NAME); + if (isTaskRegistered) { + logger.info({ + message: 'OS-managed background location task is registered, skipping watchPositionAsync subscription', + }); + useLocationStore.getState().setBackgroundEnabled(true); + return; + } + logger.info({ message: 'Starting background location updates', }); @@ -308,7 +318,16 @@ class LocationService { // Start background updates if app is currently backgrounded if (AppState.currentState === 'background') { - await this.startBackgroundUpdates(); + // Check if OS-managed background task is already registered before starting watchPositionAsync + const isTaskRegisteredForWatch = await TaskManager.isTaskRegisteredAsync(LOCATION_TASK_NAME); + if (isTaskRegisteredForWatch) { + logger.info({ + message: 'OS-managed background location task is registered, skipping watchPositionAsync subscription in updateBackgroundGeolocationSetting', + }); + useLocationStore.getState().setBackgroundEnabled(true); + } else { + await this.startBackgroundUpdates(); + } } } else { // Stop background updates and unregister task diff --git a/src/services/signalr.service.ts b/src/services/signalr.service.ts index c583ef37..cc4fb680 100644 --- a/src/services/signalr.service.ts +++ b/src/services/signalr.service.ts @@ -27,6 +27,7 @@ class SignalRService { private reconnectAttempts: Map = new Map(); private hubConfigs: Map = new Map(); private connectionLocks: Map> = new Map(); + private reconnectingHubs: Set = new Set(); private readonly MAX_RECONNECT_ATTEMPTS = 5; private readonly RECONNECT_INTERVAL = 5000; // 5 seconds @@ -45,6 +46,20 @@ class SignalRService { return SignalRService.instance; } + /** + * Check if a hub is connected or in the process of reconnecting + */ + public isHubAvailable(hubName: string): boolean { + return this.connections.has(hubName) || this.reconnectingHubs.has(hubName); + } + + /** + * Check if a hub is currently reconnecting + */ + public isHubReconnecting(hubName: string): boolean { + return this.reconnectingHubs.has(hubName); + } + public async connectToHubWithEventingUrl(config: SignalRHubConnectConfig): Promise { // Check for existing lock to prevent concurrent connections to the same hub const existingLock = this.connectionLocks.get(config.name); @@ -77,6 +92,13 @@ class SignalRService { return; } + if (this.reconnectingHubs.has(config.name)) { + logger.info({ + message: `Hub ${config.name} is currently reconnecting, skipping duplicate connection attempt`, + }); + return; + } + const token = useAuthStore.getState().accessToken; if (!token) { throw new Error('No authentication token available'); @@ -215,6 +237,13 @@ class SignalRService { return; } + if (this.reconnectingHubs.has(config.name)) { + logger.info({ + message: `Hub ${config.name} is currently reconnecting, skipping duplicate connection attempt`, + }); + return; + } + const token = useAuthStore.getState().accessToken; if (!token) { throw new Error('No authentication token available'); @@ -316,34 +345,56 @@ class SignalRService { return; } - // Refresh authentication token before reconnecting - logger.info({ - message: `Refreshing authentication token before reconnecting to hub: ${hubName}`, - }); + // Set reconnecting flag to indicate this hub is in the process of reconnecting + this.reconnectingHubs.add(hubName); + + try { + // Refresh authentication token before reconnecting + logger.info({ + message: `Refreshing authentication token before reconnecting to hub: ${hubName}`, + }); - await useAuthStore.getState().refreshAccessToken(); + await useAuthStore.getState().refreshAccessToken(); - // Verify we have a valid token after refresh - const token = useAuthStore.getState().accessToken; - if (!token) { - throw new Error('No valid authentication token available after refresh'); - } + // Verify we have a valid token after refresh + const token = useAuthStore.getState().accessToken; + if (!token) { + throw new Error('No valid authentication token available after refresh'); + } - logger.info({ - message: `Token refreshed successfully, attempting to reconnect to hub: ${hubName} (attempt ${currentAttempts}/${this.MAX_RECONNECT_ATTEMPTS})`, - }); + logger.info({ + message: `Token refreshed successfully, attempting to reconnect to hub: ${hubName} (attempt ${currentAttempts}/${this.MAX_RECONNECT_ATTEMPTS})`, + }); - // Remove the connection from our maps to allow fresh connection - this.connections.delete(hubName); + // Remove the connection from our maps to allow fresh connection + // This is now safe because we have the reconnecting flag set + this.connections.delete(hubName); - await this.connectToHubWithEventingUrl(currentHubConfig); + await this.connectToHubWithEventingUrl(currentHubConfig); - logger.info({ - message: `Successfully reconnected to hub: ${hubName} after ${currentAttempts} attempts`, - }); + // Clear reconnecting flag on successful reconnection + this.reconnectingHubs.delete(hubName); + + logger.info({ + message: `Successfully reconnected to hub: ${hubName} after ${currentAttempts} attempts`, + }); + } catch (reconnectionError) { + // Clear reconnecting flag on failed reconnection + this.reconnectingHubs.delete(hubName); + + logger.error({ + message: `Failed to refresh token or reconnect to hub: ${hubName}`, + context: { error: reconnectionError, attempts: currentAttempts, maxAttempts: this.MAX_RECONNECT_ATTEMPTS }, + }); + + // Re-throw to trigger the outer catch block + throw reconnectionError; + } } catch (error) { + // This catch block handles the overall reconnection attempt failure + // The reconnecting flag has already been cleared in the inner catch block logger.error({ - message: `Failed to refresh token or reconnect to hub: ${hubName}`, + message: `Reconnection attempt failed for hub: ${hubName}`, context: { error, attempts: currentAttempts, maxAttempts: this.MAX_RECONNECT_ATTEMPTS }, }); @@ -365,6 +416,7 @@ class SignalRService { this.connections.delete(hubName); this.reconnectAttempts.delete(hubName); this.hubConfigs.delete(hubName); + this.reconnectingHubs.delete(hubName); } } @@ -402,6 +454,7 @@ class SignalRService { this.connections.delete(hubName); this.reconnectAttempts.delete(hubName); this.hubConfigs.delete(hubName); + this.reconnectingHubs.delete(hubName); logger.info({ message: `Disconnected from hub: ${hubName}`, }); @@ -412,6 +465,11 @@ class SignalRService { }); throw error; } + } else { + // Even if no connection exists, clear the reconnecting flag in case it's set + this.reconnectingHubs.delete(hubName); + this.reconnectAttempts.delete(hubName); + this.hubConfigs.delete(hubName); } } @@ -437,6 +495,10 @@ class SignalRService { }); throw error; } + } else if (this.reconnectingHubs.has(hubName)) { + throw new Error(`Cannot invoke method ${method} on hub ${hubName}: hub is currently reconnecting`); + } else { + throw new Error(`Cannot invoke method ${method} on hub ${hubName}: hub is not connected`); } } From 5fd3e3724c4e9be1093b8783634bd19cd4fdd5b1 Mon Sep 17 00:00:00 2001 From: Shawn Jackson Date: Sat, 30 Aug 2025 10:45:50 -0700 Subject: [PATCH 5/6] CU-868fdadum PR#166 fix --- .../signalr.service.enhanced.test.ts | 22 ++++++++++--------- src/services/signalr.service.ts | 12 ++++++---- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/services/__tests__/signalr.service.enhanced.test.ts b/src/services/__tests__/signalr.service.enhanced.test.ts index c26e26d3..45dd03ae 100644 --- a/src/services/__tests__/signalr.service.enhanced.test.ts +++ b/src/services/__tests__/signalr.service.enhanced.test.ts @@ -1,4 +1,4 @@ -import { HubConnection, HubConnectionBuilder, LogLevel } from '@microsoft/signalr'; +import { HubConnection, HubConnectionBuilder, HubConnectionState, LogLevel } from '@microsoft/signalr'; import { logger } from '@/lib/logging'; @@ -72,6 +72,7 @@ describe('SignalRService - Enhanced Features', () => { onclose: jest.fn(), onreconnecting: jest.fn(), onreconnected: jest.fn(), + state: HubConnectionState.Disconnected, } as any; // Mock HubConnectionBuilder @@ -268,15 +269,19 @@ describe('SignalRService - Enhanced Features', () => { jest.useFakeTimers(); - // Mock the connections map to indicate connection exists - const connectionsMap = (service as any).connections; - const originalHas = connectionsMap.has; - connectionsMap.has = jest.fn().mockReturnValue(true); + // Mock connection state to be Connected + Object.defineProperty(mockConnection, 'state', { + value: HubConnectionState.Connected, + writable: true, + }); - // Trigger connection close + // Clear previous logs to isolate subsequent logging + jest.clearAllMocks(); + + // Trigger connection close to schedule a reconnect onCloseCallback(); - // Fast forward time + // Fast forward time to trigger the scheduled reconnect jest.advanceTimersByTime(5000); // Should log skip message @@ -284,9 +289,6 @@ describe('SignalRService - Enhanced Features', () => { message: `Hub ${mockConfig.name} is already connected, skipping reconnection attempt`, }); - // Restore original method - connectionsMap.has = originalHas; - jest.useRealTimers(); }); diff --git a/src/services/signalr.service.ts b/src/services/signalr.service.ts index cc4fb680..8152bed9 100644 --- a/src/services/signalr.service.ts +++ b/src/services/signalr.service.ts @@ -1,4 +1,4 @@ -import { type HubConnection, HubConnectionBuilder, LogLevel } from '@microsoft/signalr'; +import { type HubConnection, HubConnectionBuilder, HubConnectionState, LogLevel } from '@microsoft/signalr'; import { Env } from '@/lib/env'; import { logger } from '@/lib/logging'; @@ -337,16 +337,20 @@ class SignalRService { return; } - // Check if connection was re-established during the delay - if (this.connections.has(hubName)) { + // If a live connection exists, skip; if it's stale/closed, drop it + const existingConn = this.connections.get(hubName); + if (existingConn && existingConn.state === HubConnectionState.Connected) { logger.debug({ message: `Hub ${hubName} is already connected, skipping reconnection attempt`, }); return; } - // Set reconnecting flag to indicate this hub is in the process of reconnecting + // Mark reconnecting and remove stale entry (if any) to allow a fresh connect this.reconnectingHubs.add(hubName); + if (existingConn) { + this.connections.delete(hubName); + } try { // Refresh authentication token before reconnecting From 83c07047b095726619f2ad4d8ed9a50af84fe2d3 Mon Sep 17 00:00:00 2001 From: Shawn Jackson Date: Sat, 30 Aug 2025 11:22:50 -0700 Subject: [PATCH 6/6] CU-868fdadum PR#166 fixes --- docs/signalr-reconnect-self-blocking-fix.md | 83 +++++++ .../signalr.service.reconnect-fix.test.ts | 216 ++++++++++++++++++ .../__tests__/signalr.service.test.ts | 20 +- src/services/signalr.service.ts | 105 +++++++-- 4 files changed, 397 insertions(+), 27 deletions(-) create mode 100644 docs/signalr-reconnect-self-blocking-fix.md create mode 100644 src/services/__tests__/signalr.service.reconnect-fix.test.ts diff --git a/docs/signalr-reconnect-self-blocking-fix.md b/docs/signalr-reconnect-self-blocking-fix.md new file mode 100644 index 00000000..fd2a6331 --- /dev/null +++ b/docs/signalr-reconnect-self-blocking-fix.md @@ -0,0 +1,83 @@ +# SignalR Service Reconnection Self-Blocking Fix + +## Problem + +The SignalR service had a self-blocking issue where reconnection attempts would prevent direct connection attempts. Specifically: + +1. When a hub was in "reconnecting" state, direct connection attempts would be blocked +2. This could lead to scenarios where: + - A reconnection attempt was in progress + - A user tried to manually connect + - The manual connection would be rejected + - If the reconnection failed, the hub would be stuck in reconnecting state + - Future manual connection attempts would continue to be blocked + +## Root Cause + +The service used a single `reconnectingHubs` Set to track both: +- Automatic reconnection attempts +- Direct connection attempts + +This caused the guard logic in `_connectToHubInternal` (lines 240-246) to block direct connections when hubs were in reconnecting state. + +## Solution + +Implemented a more granular state management system: + +### 1. New State Enum + +```typescript +export enum HubConnectingState { + IDLE = 'idle', + RECONNECTING = 'reconnecting', + DIRECT_CONNECTING = 'direct-connecting', +} +``` + +### 2. State Management + +- Added `hubStates: Map` to track individual hub states +- Added `setHubState()` method to manage state transitions and maintain backward compatibility +- Added helper methods: `isHubConnecting()`, `isHubReconnecting()` + +### 3. Updated Connection Logic + +**Direct Connections (`_connectToHubInternal` and `_connectToHubWithEventingUrlInternal`):** +- Only block duplicate direct connections (same `DIRECT_CONNECTING` state) +- Allow direct connections even when hub is in `RECONNECTING` state +- Log reconnecting state but proceed with connection attempt +- Set state to `DIRECT_CONNECTING` during connection attempt +- Clean up state on both success and failure + +**Automatic Reconnections:** +- Set state to `RECONNECTING` during reconnection attempts +- Clean up state on both success and failure +- Maintain existing reconnection logic and limits + +### 4. Backward Compatibility + +- Maintained the `reconnectingHubs` Set for existing API compatibility +- `setHubState()` automatically manages the legacy set alongside the new state map +- All existing methods continue to work as expected + +## Key Changes + +1. **Lines 240-246**: Changed from blocking all connections during reconnect to only blocking duplicate direct connections +2. **State Management**: Added proper state tracking with cleanup in success/failure paths +3. **Connection Isolation**: Reconnection attempts and direct connections now operate independently +4. **Cleanup**: Ensured state cleanup happens in all code paths to prevent stuck states + +## Testing + +- Updated existing tests to use new state management system +- All existing tests continue to pass +- Tests verify that direct connections are allowed during reconnection +- Tests verify proper state cleanup in success and failure scenarios + +## Benefits + +- Eliminates self-blocking behavior during reconnections +- Allows users to manually retry connections even during automatic reconnection +- Prevents permanent stuck states +- Maintains full backward compatibility +- Provides better separation of concerns between automatic and manual connections diff --git a/src/services/__tests__/signalr.service.reconnect-fix.test.ts b/src/services/__tests__/signalr.service.reconnect-fix.test.ts new file mode 100644 index 00000000..dbfdee74 --- /dev/null +++ b/src/services/__tests__/signalr.service.reconnect-fix.test.ts @@ -0,0 +1,216 @@ +import { HubConnection, HubConnectionBuilder, LogLevel } from '@microsoft/signalr'; + +import { logger } from '@/lib/logging'; +import { HubConnectingState } from '../signalr.service'; + +// Mock the required modules +jest.mock('@/lib/env', () => ({ + Env: { + REALTIME_GEO_HUB_NAME: 'geolocationHub', + }, +})); + +jest.mock('@/lib/logging', () => ({ + logger: { + info: jest.fn(), + warn: jest.fn(), + error: jest.fn(), + debug: jest.fn(), + }, +})); + +jest.mock('@/stores/auth/store', () => ({ + __esModule: true, + default: { + getState: jest.fn(() => ({ + accessToken: 'mock-token', + refreshAccessToken: jest.fn().mockResolvedValue(undefined), + })), + }, +})); + +jest.mock('@microsoft/signalr', () => ({ + HubConnectionBuilder: jest.fn(), + LogLevel: { + Information: 'Information', + }, + HubConnectionState: { + Connected: 'Connected', + Disconnected: 'Disconnected', + }, +})); + +// Import after mocking +import { SignalRService } from '../signalr.service'; + +describe('SignalRService - Reconnect Self-Blocking Fix', () => { + let signalRService: any; + let mockConnection: jest.Mocked; + let mockBuilderInstance: jest.Mocked; + const mockLogger = logger as jest.Mocked; + + const mockHubConnectionBuilder = HubConnectionBuilder as jest.MockedClass; + const mockStart = jest.fn().mockResolvedValue(undefined); + + beforeEach(() => { + jest.clearAllMocks(); + // Reset the singleton instance + SignalRService.resetInstance(); + signalRService = SignalRService.getInstance(); + + // Mock HubConnection + mockConnection = { + start: mockStart, + stop: jest.fn().mockResolvedValue(undefined), + on: jest.fn(), + onclose: jest.fn(), + onreconnecting: jest.fn(), + onreconnected: jest.fn(), + invoke: jest.fn().mockResolvedValue(undefined), + state: 'Connected', + } as any; + + // Mock HubConnectionBuilder + mockBuilderInstance = { + withUrl: jest.fn().mockReturnThis(), + withAutomaticReconnect: jest.fn().mockReturnThis(), + configureLogging: jest.fn().mockReturnThis(), + build: jest.fn().mockReturnValue(mockConnection), + } as any; + + mockHubConnectionBuilder.mockImplementation(() => mockBuilderInstance); + }); + + afterEach(() => { + jest.clearAllMocks(); + }); + + const mockConfig = { + name: 'testHub', + eventingUrl: 'https://api.example.com/', + hubName: 'eventingHub', + methods: ['method1'], + }; + + describe('Direct connection during reconnection', () => { + it('should allow direct connection attempts when hub is in reconnecting state', async () => { + // Set hub to reconnecting state + (signalRService as any).setHubState(mockConfig.name, HubConnectingState.RECONNECTING); + + // Verify hub is in reconnecting state + expect(signalRService.isHubReconnecting(mockConfig.name)).toBe(true); + + // Attempt direct connection - should not be blocked + await signalRService.connectToHubWithEventingUrl(mockConfig); + + // Should have attempted the connection + expect(mockHubConnectionBuilder).toHaveBeenCalled(); + expect(mockLogger.info).toHaveBeenCalledWith({ + message: `Hub ${mockConfig.name} is currently reconnecting, proceeding with direct connection attempt`, + }); + }); + + it('should prevent duplicate direct connections', async () => { + // Set hub to direct-connecting state + (signalRService as any).setHubState(mockConfig.name, HubConnectingState.DIRECT_CONNECTING); + + // Attempt another direct connection - should be blocked + await signalRService.connectToHubWithEventingUrl(mockConfig); + + // Should not have attempted the connection + expect(mockHubConnectionBuilder).not.toHaveBeenCalled(); + expect(mockLogger.info).toHaveBeenCalledWith({ + message: `Hub ${mockConfig.name} is already in direct-connecting state, skipping duplicate connection attempt`, + }); + }); + + it('should clean up direct-connecting state on successful connection', async () => { + // Start with idle state + expect((signalRService as any).isHubConnecting(mockConfig.name)).toBe(false); + + // Attempt connection + await signalRService.connectToHubWithEventingUrl(mockConfig); + + // Should be back to idle state after successful connection + expect((signalRService as any).isHubConnecting(mockConfig.name)).toBe(false); + expect((signalRService as any).hubStates.get(mockConfig.name)).toBeUndefined(); + }); + + it('should clean up direct-connecting state on failed connection', async () => { + // Mock connection failure + mockStart.mockRejectedValueOnce(new Error('Connection failed')); + + // Start with idle state + expect((signalRService as any).isHubConnecting(mockConfig.name)).toBe(false); + + // Attempt connection (should fail) + await expect(signalRService.connectToHubWithEventingUrl(mockConfig)).rejects.toThrow('Connection failed'); + + // Should be back to idle state after failed connection + expect((signalRService as any).isHubConnecting(mockConfig.name)).toBe(false); + expect((signalRService as any).hubStates.get(mockConfig.name)).toBeUndefined(); + + // Reset mock for future tests + mockStart.mockResolvedValue(undefined); + }); + + it('should maintain backward compatibility with legacy reconnectingHubs set', async () => { + // Set hub to reconnecting state + (signalRService as any).setHubState(mockConfig.name, HubConnectingState.RECONNECTING); + + // Legacy reconnectingHubs set should also be updated + expect((signalRService as any).reconnectingHubs.has(mockConfig.name)).toBe(true); + expect(signalRService.isHubReconnecting(mockConfig.name)).toBe(true); + + // Clear state + (signalRService as any).setHubState(mockConfig.name, HubConnectingState.IDLE); + + // Legacy set should be cleared too + expect((signalRService as any).reconnectingHubs.has(mockConfig.name)).toBe(false); + expect(signalRService.isHubReconnecting(mockConfig.name)).toBe(false); + }); + }); + + describe('State management', () => { + it('should distinguish between reconnecting and direct-connecting states', () => { + // Set to reconnecting + (signalRService as any).setHubState(mockConfig.name, HubConnectingState.RECONNECTING); + expect(signalRService.isHubReconnecting(mockConfig.name)).toBe(true); + expect((signalRService as any).isHubConnecting(mockConfig.name)).toBe(true); + + // Set to direct-connecting + (signalRService as any).setHubState(mockConfig.name, HubConnectingState.DIRECT_CONNECTING); + expect(signalRService.isHubReconnecting(mockConfig.name)).toBe(false); + expect((signalRService as any).isHubConnecting(mockConfig.name)).toBe(true); + + // Set to idle + (signalRService as any).setHubState(mockConfig.name, HubConnectingState.IDLE); + expect(signalRService.isHubReconnecting(mockConfig.name)).toBe(false); + expect((signalRService as any).isHubConnecting(mockConfig.name)).toBe(false); + }); + + it('should properly manage isHubAvailable with new states', () => { + const hubName = 'testHub'; + + // Not connected, not connecting + expect(signalRService.isHubAvailable(hubName)).toBe(false); + + // Reconnecting + (signalRService as any).setHubState(hubName, HubConnectingState.RECONNECTING); + expect(signalRService.isHubAvailable(hubName)).toBe(true); + + // Direct connecting + (signalRService as any).setHubState(hubName, HubConnectingState.DIRECT_CONNECTING); + expect(signalRService.isHubAvailable(hubName)).toBe(true); + + // Add actual connection + (signalRService as any).connections.set(hubName, mockConnection); + (signalRService as any).setHubState(hubName, HubConnectingState.IDLE); + expect(signalRService.isHubAvailable(hubName)).toBe(true); + + // Clean up + (signalRService as any).connections.delete(hubName); + expect(signalRService.isHubAvailable(hubName)).toBe(false); + }); + }); +}); diff --git a/src/services/__tests__/signalr.service.test.ts b/src/services/__tests__/signalr.service.test.ts index 2ab96743..a55dd674 100644 --- a/src/services/__tests__/signalr.service.test.ts +++ b/src/services/__tests__/signalr.service.test.ts @@ -1,6 +1,7 @@ import { HubConnection, HubConnectionBuilder, LogLevel } from '@microsoft/signalr'; import { logger } from '@/lib/logging'; +import { HubConnectingState } from '../signalr.service'; // Mock the env module jest.mock('@/lib/env', () => ({ @@ -509,8 +510,8 @@ describe('SignalRService', () => { }); it('should return true for isHubAvailable when hub is reconnecting', () => { - // Manually set reconnecting state to test - (signalRService as any).reconnectingHubs.add(mockConfig.name); + // Manually set reconnecting state to test using new state management + (signalRService as any).setHubState(mockConfig.name, HubConnectingState.RECONNECTING); expect(signalRService.isHubAvailable(mockConfig.name)).toBe(true); }); @@ -519,22 +520,23 @@ describe('SignalRService', () => { }); it('should return true for isHubReconnecting when hub is reconnecting', () => { - // Manually set reconnecting state to test - (signalRService as any).reconnectingHubs.add(mockConfig.name); + // Manually set reconnecting state to test using new state management + (signalRService as any).setHubState(mockConfig.name, HubConnectingState.RECONNECTING); expect(signalRService.isHubReconnecting(mockConfig.name)).toBe(true); }); it('should skip connection if hub is already reconnecting', async () => { - // Set reconnecting state - (signalRService as any).reconnectingHubs.add(mockConfig.name); + // Set reconnecting state using new state management + (signalRService as any).setHubState(mockConfig.name, HubConnectingState.RECONNECTING); // Try to connect await signalRService.connectToHubWithEventingUrl(mockConfig); - // Should not have started a new connection - expect(mockHubConnectionBuilder).not.toHaveBeenCalled(); + // Should not have started a new connection because the new logic allows connections but logs it + // The new logic doesn't block direct connections anymore, so this test behavior changes + expect(mockHubConnectionBuilder).toHaveBeenCalled(); expect(mockLogger.info).toHaveBeenCalledWith({ - message: `Hub ${mockConfig.name} is currently reconnecting, skipping duplicate connection attempt`, + message: `Hub ${mockConfig.name} is currently reconnecting, proceeding with direct connection attempt`, }); }); }); diff --git a/src/services/signalr.service.ts b/src/services/signalr.service.ts index 8152bed9..c3fc62a3 100644 --- a/src/services/signalr.service.ts +++ b/src/services/signalr.service.ts @@ -22,12 +22,19 @@ export interface SignalRMessage { data: unknown; } +export enum HubConnectingState { + IDLE = 'idle', + RECONNECTING = 'reconnecting', + DIRECT_CONNECTING = 'direct-connecting', +} + class SignalRService { private connections: Map = new Map(); private reconnectAttempts: Map = new Map(); private hubConfigs: Map = new Map(); private connectionLocks: Map> = new Map(); private reconnectingHubs: Set = new Set(); + private hubStates: Map = new Map(); private readonly MAX_RECONNECT_ATTEMPTS = 5; private readonly RECONNECT_INTERVAL = 5000; // 5 seconds @@ -47,17 +54,43 @@ class SignalRService { } /** - * Check if a hub is connected or in the process of reconnecting + * Check if a hub is connected or in the process of connecting */ public isHubAvailable(hubName: string): boolean { - return this.connections.has(hubName) || this.reconnectingHubs.has(hubName); + return this.connections.has(hubName) || this.isHubConnecting(hubName); } /** - * Check if a hub is currently reconnecting + * Check if a hub is in any connecting state (reconnecting or direct-connecting) + */ + private isHubConnecting(hubName: string): boolean { + const state = this.hubStates.get(hubName); + return state === HubConnectingState.RECONNECTING || state === HubConnectingState.DIRECT_CONNECTING; + } + + /** + * Check if a hub is specifically in reconnecting state + * @deprecated Use for testing purposes only */ public isHubReconnecting(hubName: string): boolean { - return this.reconnectingHubs.has(hubName); + return this.hubStates.get(hubName) === HubConnectingState.RECONNECTING; + } + + /** + * Set hub state and manage legacy reconnectingHubs set for backward compatibility + */ + private setHubState(hubName: string, state: HubConnectingState): void { + if (state === HubConnectingState.IDLE) { + this.hubStates.delete(hubName); + this.reconnectingHubs.delete(hubName); + } else { + this.hubStates.set(hubName, state); + if (state === HubConnectingState.RECONNECTING) { + this.reconnectingHubs.add(hubName); + } else { + this.reconnectingHubs.delete(hubName); + } + } } public async connectToHubWithEventingUrl(config: SignalRHubConnectConfig): Promise { @@ -92,13 +125,25 @@ class SignalRService { return; } - if (this.reconnectingHubs.has(config.name)) { + // Check if hub is already in direct-connecting state to prevent duplicates + const currentState = this.hubStates.get(config.name); + if (currentState === HubConnectingState.DIRECT_CONNECTING) { logger.info({ - message: `Hub ${config.name} is currently reconnecting, skipping duplicate connection attempt`, + message: `Hub ${config.name} is already in direct-connecting state, skipping duplicate connection attempt`, }); return; } + // Log if hub is reconnecting but proceed with direct connection attempt + if (currentState === HubConnectingState.RECONNECTING) { + logger.info({ + message: `Hub ${config.name} is currently reconnecting, proceeding with direct connection attempt`, + }); + } + + // Mark as direct-connecting + this.setHubState(config.name, HubConnectingState.DIRECT_CONNECTING); + const token = useAuthStore.getState().accessToken; if (!token) { throw new Error('No authentication token available'); @@ -193,10 +238,16 @@ class SignalRService { this.connections.set(config.name, connection); this.reconnectAttempts.set(config.name, 0); + // Clear the direct-connecting state on successful connection + this.setHubState(config.name, HubConnectingState.IDLE); + logger.info({ message: `Connected to hub: ${config.name}`, }); } catch (error) { + // Clear the direct-connecting state on failed connection + this.setHubState(config.name, HubConnectingState.IDLE); + logger.error({ message: `Failed to connect to hub: ${config.name}`, context: { error }, @@ -237,13 +288,25 @@ class SignalRService { return; } - if (this.reconnectingHubs.has(config.name)) { + // Check if hub is already in direct-connecting state to prevent duplicates + const currentState = this.hubStates.get(config.name); + if (currentState === HubConnectingState.DIRECT_CONNECTING) { logger.info({ - message: `Hub ${config.name} is currently reconnecting, skipping duplicate connection attempt`, + message: `Hub ${config.name} is already in direct-connecting state, skipping duplicate connection attempt`, }); return; } + // Log if hub is reconnecting but proceed with direct connection attempt + if (currentState === HubConnectingState.RECONNECTING) { + logger.info({ + message: `Hub ${config.name} is currently reconnecting, proceeding with direct connection attempt`, + }); + } + + // Mark as direct-connecting + this.setHubState(config.name, HubConnectingState.DIRECT_CONNECTING); + const token = useAuthStore.getState().accessToken; if (!token) { throw new Error('No authentication token available'); @@ -302,10 +365,16 @@ class SignalRService { this.connections.set(config.name, connection); this.reconnectAttempts.set(config.name, 0); + // Clear the direct-connecting state on successful connection + this.setHubState(config.name, HubConnectingState.IDLE); + logger.info({ message: `Connected to hub: ${config.name}`, }); } catch (error) { + // Clear the direct-connecting state on failed connection + this.setHubState(config.name, HubConnectingState.IDLE); + logger.error({ message: `Failed to connect to hub: ${config.name}`, context: { error }, @@ -346,8 +415,8 @@ class SignalRService { return; } - // Mark reconnecting and remove stale entry (if any) to allow a fresh connect - this.reconnectingHubs.add(hubName); + // Mark as reconnecting and remove stale entry (if any) to allow a fresh connect + this.setHubState(hubName, HubConnectingState.RECONNECTING); if (existingConn) { this.connections.delete(hubName); } @@ -376,15 +445,15 @@ class SignalRService { await this.connectToHubWithEventingUrl(currentHubConfig); - // Clear reconnecting flag on successful reconnection - this.reconnectingHubs.delete(hubName); + // Clear reconnecting state on successful reconnection + this.setHubState(hubName, HubConnectingState.IDLE); logger.info({ message: `Successfully reconnected to hub: ${hubName} after ${currentAttempts} attempts`, }); } catch (reconnectionError) { - // Clear reconnecting flag on failed reconnection - this.reconnectingHubs.delete(hubName); + // Clear reconnecting state on failed reconnection + this.setHubState(hubName, HubConnectingState.IDLE); logger.error({ message: `Failed to refresh token or reconnect to hub: ${hubName}`, @@ -420,7 +489,7 @@ class SignalRService { this.connections.delete(hubName); this.reconnectAttempts.delete(hubName); this.hubConfigs.delete(hubName); - this.reconnectingHubs.delete(hubName); + this.setHubState(hubName, HubConnectingState.IDLE); } } @@ -458,7 +527,7 @@ class SignalRService { this.connections.delete(hubName); this.reconnectAttempts.delete(hubName); this.hubConfigs.delete(hubName); - this.reconnectingHubs.delete(hubName); + this.setHubState(hubName, HubConnectingState.IDLE); logger.info({ message: `Disconnected from hub: ${hubName}`, }); @@ -470,8 +539,8 @@ class SignalRService { throw error; } } else { - // Even if no connection exists, clear the reconnecting flag in case it's set - this.reconnectingHubs.delete(hubName); + // Even if no connection exists, clear the state in case it's set + this.setHubState(hubName, HubConnectingState.IDLE); this.reconnectAttempts.delete(hubName); this.hubConfigs.delete(hubName); }