Merge branch 'leader' into copilot/reduce-ai-slop

Author: arii

app/client/experimental/components/ExperimentalAnalyticsPage.tsx

@@ -47,7 +47,6 @@ const ExperimentalAnalyticsPage = () => {
     isInitialized,
     duration,
     startWorkout,
-    pauseWorkout,
     resumeWorkout,
     endWorkout,
     addHrData,
@@ -78,6 +77,18 @@ const ExperimentalAnalyticsPage = () => {
     }
   }, [isInitialized, activeSession?.endTime]) // Reload when session ends
 
+  // Effect to handle the end of a workout session
+  useEffect(() => {
+    if (status === 'finished') {
+      const reloadSessions = async () => {
+        const sessions = await workoutSessionStorage.getAllSessions()
+        setAllSessions(sessions.sort((a, b) => b.startTime - a.startTime))
+        setView('list')
+      }
+      reloadSessions()
+    }
+  }, [status])
+
   // Send user metadata when WebSocket connects
   useEffect(() => {
     if (connectionStatus === 'Connected') {
@@ -135,20 +146,12 @@ const ExperimentalAnalyticsPage = () => {
     setView('active')
   }, [startWorkout, reset, userSettings])
 
-  const handlePauseWorkout = useCallback(() => {
-    pauseWorkout()
-  }, [pauseWorkout])
-
   const handleResumeWorkout = useCallback(() => {
     resumeWorkout()
   }, [resumeWorkout])
 
-  const handleEndWorkout = useCallback(async () => {
-    await endWorkout() // Await to ensure session is persisted
-    // Reload sessions after ending
-    const sessions = await workoutSessionStorage.getAllSessions()
-    setAllSessions(sessions.sort((a, b) => b.startTime - a.startTime))
-    setView('list')
+  const handleEndWorkout = useCallback(() => {
+    endWorkout()
   }, [endWorkout])
 
   const handleViewSession = useCallback((session: WorkoutSessionData) => {
@@ -205,7 +208,7 @@ const ExperimentalAnalyticsPage = () => {
               </Button>
             )}
             {status === 'running' && (
-              <Button variant="outlined" onClick={handlePauseWorkout}>
+              <Button variant="outlined" onClick={handleEndWorkout}>
                 Pause
               </Button>
             )}
@@ -215,15 +218,10 @@ const ExperimentalAnalyticsPage = () => {
                   Resume
                 </Button>
                 <Button variant="outlined" onClick={handleEndWorkout}>
-                  End Workout
+                  Finish Workout
                 </Button>
               </>
             )}
-            {status === 'running' && (
-              <Button variant="outlined" onClick={handleEndWorkout}>
-                End Workout
-              </Button>
-            )}
             <Button variant="text" onClick={() => setView('list')}>
               View History
             </Button>

components/Spotify/PlaylistDetails.tsx

@@ -110,7 +110,7 @@ const PlaylistDetails: React.FC<PlaylistDetailsProps> = ({
                   />
                   <ListItemText
                     primary={track.name}
-                    secondary={`${(track.artists || []).map((a) => a.name).join(', ')} - ${track.album?.name || 'Unknown Album'}`}
+                    secondary={`${Array.isArray(track.artists) ? track.artists.map((a) => a.name).join(', ') : track.artists} - ${track.album?.name || 'Unknown Album'}`}
                   />
                 </ListItemButton>
               </ListItem>

hooks/useBluetoothHRM.race.test.ts

@@ -4,6 +4,7 @@
 import { renderHook, act } from '@testing-library/react'
 import useBluetoothHRM from './useBluetoothHRM'
 import { mockBluetooth } from '@/tests/unit/mocks/webBluetooth'
+import * as cookieUtils from '@/utils/cookies'
 
 // Mock the WebSocket context
 jest.mock('@/context/WebSocketContext', () => ({
@@ -13,6 +14,14 @@ jest.mock('@/context/WebSocketContext', () => ({
   }),
 }))
 
+// Mock cookie utilities
+jest.mock('@/utils/cookies', () => ({
+  getCookie: jest.fn(),
+  setCookie: jest.fn(),
+}))
+
+const mockedCookieUtils = cookieUtils as jest.Mocked<typeof cookieUtils>
+
 describe('useBluetoothHRM Race Conditions', () => {
   const originalNavigator = global.navigator
   let mockRequestDevice: jest.Mock
@@ -152,4 +161,43 @@ describe('useBluetoothHRM Race Conditions', () => {
     // The final status should be connected
     expect(result.current.isConnected).toBe(true)
   })
+
+  it('should only attempt to connect once when autoConnect is called multiple times concurrently', async () => {
+    // Simulate that a device has been previously connected and its ID is saved
+    mockedCookieUtils.getCookie.mockReturnValue('test-device-id')
+
+    // Simulate that the device is available to be re-connected to
+    const mockSavedDevice = {
+      id: 'test-device-id',
+      name: 'Saved HRM',
+      gatt: {
+        connect: mockGattConnect,
+      },
+    }
+    Object.defineProperty(global.navigator, 'bluetooth', {
+      value: {
+        ...mockBluetooth,
+        getDevices: jest.fn().mockResolvedValue([mockSavedDevice]),
+      },
+      writable: true,
+    })
+
+    const { result } = renderHook(() => useBluetoothHRM())
+
+    // Act: Call autoConnect multiple times in parallel to simulate a race condition
+    await act(async () => {
+      const autoConnectPromises = [
+        result.current.autoConnect(),
+        result.current.autoConnect(),
+        result.current.autoConnect(),
+      ]
+      // We don't care about the result of the promises, just that they complete
+      await Promise.allSettled(autoConnectPromises)
+    })
+
+    // Assert: Check that gatt.connect was only called once, proving the lock works
+    expect(mockGattConnect).toHaveBeenCalledTimes(1)
+    // The final status should be connected
+    expect(result.current.isConnected).toBe(true)
+  })
 })

hooks/useBluetoothHRM.ts

@@ -753,7 +753,12 @@ const useBluetoothHRM = (props: UseBluetoothHRMProps = {}) => {
   const autoConnect = useCallback(async (): Promise<void> => {
     // Try to auto-connect to a saved device. This is a critical function for user experience.
     // We want it to succeed silently if possible, but still provide feedback if it fails.
+    if (isConnecting.current) {
+      logger.info('Auto-connect call ignored, connection already in progress.')
+      return
+    }
     try {
+      isConnecting.current = true // Set lock immediately after guard
       logger.info('Starting auto-connect to saved device...')
       setStatus(BluetoothConnectionStatus.CONNECTING)
       setCustomStatusMessage(BLUETOOTH_MESSAGES.connectingToSavedDevice)
@@ -769,6 +774,8 @@ const useBluetoothHRM = (props: UseBluetoothHRMProps = {}) => {
       // Set status back to allow manual connection
       setStatus(BluetoothConnectionStatus.DISCONNECTED)
       setCustomStatusMessage(BLUETOOTH_MESSAGES.autoConnectFailed)
+    } finally {
+      isConnecting.current = false // Ensure lock is always released
     }
   }, [connectAndStream])
 

hooks/useCalorieTracker.ts

@@ -72,41 +72,44 @@ export const useCalorieTracker = ({ age, weightKg }: CalorieTrackerProps) => {
 
   const processHeartRate = useCallback((hr: number) => {
     const now = Date.now()
-    if (lastTimestampRef.current) {
-      const dtSeconds = (now - lastTimestampRef.current) / 1000
-      /**
-       * Time gap validation: Only process heart rate data if the gap is between 0 and 10 seconds.
-       *
-       * Rationale:
-       * - Gaps > 10 seconds likely indicate paused tracking, device disconnection, or other interruptions
-       * - Calculating calories over large gaps would produce inaccurate results
-       * - This threshold balances tolerance for normal variation while filtering out invalid data
-       *
-       * Configuration: If you need to adjust this threshold (e.g., for different update intervals),
-       * consider making it a configurable parameter.
-       */
-      if (dtSeconds > 0 && dtSeconds < 10) {
-        const dtMinutes = dtSeconds / 60
-        const caloriesPerSecond =
-          estimateCaloriesBurned({
-            heartRate: hr,
-            age: ageRef.current,
-            weightKg: weightKgRef.current,
-            durationMinutes: dtMinutes,
-          }) / dtSeconds
+    // On the first call, lastTimestampRef.current is null.
+    // Record a data point with zero calories to avoid gaps at the start.
+    if (!lastTimestampRef.current) {
+      dispatch({
+        type: 'PROCESS_HR',
+        payload: {
+          hr,
+          caloriesBurnedThisInterval: 0,
+          now,
+          caloriesPerSecond: 0,
+        },
+      })
+      lastTimestampRef.current = now
+      return
+    }
 
-        const caloriesBurnedThisInterval = caloriesPerSecond * dtSeconds
+    const dtSeconds = (now - lastTimestampRef.current) / 1000
+    if (dtSeconds > 0 && dtSeconds < 10) {
+      const dtMinutes = dtSeconds / 60
+      const caloriesPerSecond =
+        estimateCaloriesBurned({
+          heartRate: hr,
+          age: ageRef.current,
+          weightKg: weightKgRef.current,
+          durationMinutes: dtMinutes,
+        }) / dtSeconds
 
-        dispatch({
-          type: 'PROCESS_HR',
-          payload: {
-            hr,
-            caloriesBurnedThisInterval,
-            now,
-            caloriesPerSecond,
-          },
-        })
-      }
+      const caloriesBurnedThisInterval = caloriesPerSecond * dtSeconds
+
+      dispatch({
+        type: 'PROCESS_HR',
+        payload: {
+          hr,
+          caloriesBurnedThisInterval,
+          now,
+          caloriesPerSecond,
+        },
+      })
     }
     lastTimestampRef.current = now
   }, [])

hooks/useWorkoutSessionManager.ts

@@ -23,7 +23,6 @@ interface SessionManagerState {
 type SessionManagerAction =
   | { type: 'SET_SESSION'; payload: WorkoutSessionData }
   | { type: 'START'; payload: { age: number; weight: number; maxHr?: number } }
-  | { type: 'PAUSE' }
   | { type: 'RESUME' }
   | { type: 'END' }
   | { type: 'RESET' }
@@ -74,14 +73,6 @@ function sessionManagerReducer(
         status: 'running',
       }
     }
-    case 'PAUSE': {
-      if (!state.session) return state
-      return {
-        ...state,
-        session: { ...state.session, status: 'paused' },
-        status: 'paused',
-      }
-    }
     case 'RESUME': {
       if (!state.session) return state
       return {
@@ -92,14 +83,17 @@ function sessionManagerReducer(
     }
     case 'END': {
       if (!state.session) return state
+      // If running, transition to 'paused'. If paused, transition to 'finished'.
+      const nextStatus = state.status === 'running' ? 'paused' : 'finished'
       return {
         ...state,
         session: {
           ...state.session,
-          status: 'finished',
-          endTime: Date.now(),
+          status: nextStatus,
+          // Only set endTime when the session is truly finished
+          endTime: nextStatus === 'finished' ? Date.now() : null,
         },
-        status: 'finished',
+        status: nextStatus,
       }
     }
     case 'RESET': {
@@ -169,7 +163,7 @@ export const useWorkoutSessionManager = () => {
     if (state.session) {
       workoutSessionStorage.saveSession(state.session)
     }
-  }, [state.session])
+  }, [state.session, state.session?.status])
 
   const startWorkout = useCallback(
     (age: number, weight: number, maxHr?: number) => {
@@ -178,27 +172,13 @@ export const useWorkoutSessionManager = () => {
     []
   )
 
-  const pauseWorkout = useCallback(() => {
-    dispatch({ type: 'PAUSE' })
-  }, [])
-
   const resumeWorkout = useCallback(() => {
     dispatch({ type: 'RESUME' })
   }, [])
 
-  const endWorkout = useCallback(async () => {
+  const endWorkout = useCallback(() => {
     dispatch({ type: 'END' })
-    // Ensure the ended session is persisted before returning
-    // This prevents race conditions when fetching session list immediately after
-    if (state.session) {
-      const endedSession = {
-        ...state.session,
-        status: 'finished' as const,
-        endTime: Date.now(),
-      }
-      await workoutSessionStorage.saveSession(endedSession)
-    }
-  }, [state.session])
+  }, [])
 
   const resetWorkout = useCallback(async () => {
     if (state.session) {
@@ -234,7 +214,6 @@ export const useWorkoutSessionManager = () => {
     isInitialized,
     duration,
     startWorkout,
-    pauseWorkout,
     resumeWorkout,
     endWorkout,
     resetWorkout,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hrm",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "private": true,
   "type": "module",
   "_moduleAliases": {