fix(realtime): transform paylaod on join and leave, fix tests

Author: GuzekAlan

packages/core/realtime-js/src/phoenix/presenceAdapter.ts

@@ -1,6 +1,7 @@
 import { Presence } from '@supabase/phoenix'
 import type { PresenceState, PresenceStates } from './types'
 import type {
+  RealtimePresenceJoinPayload,
   RealtimePresenceOptions,
   RealtimePresenceState,
   Presence as RealtimePresenceType,
@@ -61,23 +62,15 @@ export default class PresenceAdapter {
 
     return Object.getOwnPropertyNames(state).reduce((newState, key) => {
       const presences = state[key]
-
-      newState[key] = presences.metas.map((presence) => {
-        presence['presence_ref'] = presence['phx_ref']
-
-        delete presence['phx_ref']
-        delete presence['phx_ref_prev']
-
-        return presence
-      }) as RealtimePresenceType[]
+      newState[key] = transformState(presences)
 
       return newState
     }, {} as RealtimePresenceState)
   }
 
   static onJoinPayload(key: string, currentPresence: PresenceState, newPresence: PresenceState) {
     const currentPresences = parseCurrentPresences(currentPresence)
-    const newPresences = newPresence['metas']
+    const newPresences = transformState(newPresence)
 
     return {
       event: 'join',
@@ -89,7 +82,7 @@ export default class PresenceAdapter {
 
   static onLeavePayload(key: string, currentPresence: PresenceState, leftPresence: PresenceState) {
     const currentPresences = parseCurrentPresences(currentPresence)
-    const leftPresences = leftPresence['metas']
+    const leftPresences = transformState(leftPresence)
 
     return {
       event: 'leave',
@@ -100,6 +93,17 @@ export default class PresenceAdapter {
   }
 }
 
+function transformState(presences: PresenceState) {
+  return presences.metas.map((presence) => {
+    presence['presence_ref'] = presence['phx_ref']
+
+    delete presence['phx_ref']
+    delete presence['phx_ref_prev']
+
+    return presence
+  }) as RealtimePresenceType[]
+}
+
 function cloneState(state: PresenceStates): PresenceStates {
   return JSON.parse(JSON.stringify(state))
 }
@@ -109,5 +113,5 @@ function phoenixPresenceOptions(opts?: RealtimePresenceOptions) {
 }
 
 function parseCurrentPresences(currentPresences?: PresenceState) {
-  return currentPresences?.metas || []
+  return currentPresences?.metas ? transformState(currentPresences) : []
 }

packages/core/realtime-js/test/RealtimeChannel.presence.test.ts

@@ -79,7 +79,7 @@ describe('Presence state management', () => {
         currentPresences: [],
         event: 'join',
         key: 'user-123',
-        newPresences: [{ phx_ref: 'phoenix_ref', name: 'John', user_id: 'user-123' }],
+        newPresences: [{ presence_ref: 'phoenix_ref', name: 'John', user_id: 'user-123' }],
       })
     )
   })
@@ -127,7 +127,7 @@ describe('Presence state management', () => {
         currentPresences: [],
         event: 'leave',
         key: 'user-123',
-        leftPresences: [{ phx_ref: 'phoenix_ref', name: 'John', user_id: 'user-123' }],
+        leftPresences: [{ presence_ref: 'phoenix_ref', name: 'John', user_id: 'user-123' }],
       })
     )
   })
@@ -200,7 +200,7 @@ describe('Presence state management', () => {
         currentPresences: [],
         event: 'join',
         key: 'user-123',
-        newPresences: [{ phx_ref: 'phoenix_ref', name: 'John', user_id: 'user-123' }],
+        newPresences: [{ presence_ref: 'phoenix_ref', name: 'John', user_id: 'user-123' }],
       })
     )
   })