Fix peer create and destroy actions causing logging bugs

packages/client-core/src/systems/LoadingUISystem.tsx

@@ -14,6 +14,7 @@ import {
 } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions'
 import { removeEntity } from '@etherealengine/engine/src/ecs/functions/EntityFunctions'
 import { defineSystem } from '@etherealengine/engine/src/ecs/functions/SystemFunctions'
+import { WorldState } from '@etherealengine/engine/src/networking/interfaces/WorldState'
 import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent'
 import { setVisibleComponent } from '@etherealengine/engine/src/scene/components/VisibleComponent'
 import { ObjectLayers } from '@etherealengine/engine/src/scene/constants/ObjectLayers'
@@ -119,16 +120,25 @@ const execute = () => {
       transition.setState('OUT')
   }
 
+  const mediaNetwork = Engine.instance.mediaNetwork
+  const worldState = getState(WorldState)
+
   for (const action of peerCreatedQueue()) {
     const selfUser = getState(AuthState).user
-    if (action.peer.peerID !== 'server' && action.peer.userId !== selfUser.id)
-      NotificationService.dispatchNotify(`${action.name} ${t('common:toast.joined')}`, { variant: 'default' })
+    const peerUser = mediaNetwork.peers.get(action.peerID)
+    if (action.peerID !== 'server' && peerUser && peerUser.userId !== selfUser.id) {
+      const name = worldState.userNames[peerUser.userId]
+      NotificationService.dispatchNotify(`${name} ${t('common:toast.joined')}`, { variant: 'default' })
+    }
   }
 
   for (const action of peerDestroyedQueue()) {
     const selfUser = getState(AuthState).user
-    if (action.peer.peerID !== 'server' && action.peer.userId !== selfUser.id)
-      NotificationService.dispatchNotify(`${action.name} ${t('common:toast.left')}`, { variant: 'default' })
+    const peerUser = mediaNetwork.peers.get(action.peerID)
+    if (action.peerID !== 'server' && peerUser && peerUser.userId !== selfUser.id) {
+      const name = worldState.userNames[peerUser.userId]
+      NotificationService.dispatchNotify(`${name} ${t('common:toast.left')}`, { variant: 'default' })
+    }
   }
 
   if (transition.state === 'OUT' && transition.alpha === 0) {

packages/engine/src/ecs/classes/EngineState.ts

@@ -1,6 +1,6 @@
 import { defineAction, defineState, getMutableState, useState } from '@etherealengine/hyperflux'
 
-import { matches, matchesEntity, Validator } from '../../common/functions/MatchesUtils'
+import { matches, matchesEntity, matchesPeerID, Validator } from '../../common/functions/MatchesUtils'
 import { NetworkPeer } from '../../networking/interfaces/NetworkPeer'
 import { Entity } from './Entity'
 
@@ -154,13 +154,11 @@ export class EngineActions {
 
   static peerCreated = defineAction({
     type: 'ee.engine.Engine.PEER_CREATED' as const,
-    peer: matches.any as Validator<unknown, NetworkPeer>,
-    name: matches.string
+    peerID: matchesPeerID
   })
 
   static peerDestroyed = defineAction({
     type: 'ee.engine.Engine.PEER_DESTROYED' as const,
-    peer: matches.any as Validator<unknown, NetworkPeer>,
-    name: matches.string
+    peerID: matchesPeerID
   })
 }

packages/engine/src/networking/functions/NetworkPeerFunctions.ts

@@ -47,7 +47,7 @@ function createPeer(
   worldState.userNames[userID].set(name)
 
   if (network.topic === 'world') {
-    dispatchAction(EngineActions.peerCreated({ peer: network.peers.get(peerID)!, name: name ?? '' }))
+    dispatchAction(EngineActions.peerCreated({ peerID }))
   }
 }
 
@@ -58,9 +58,7 @@ function destroyPeer(network: Network, peerID: PeerID) {
   if (userID === Engine.instance.userId) return console.warn(`[NetworkPeerFunctions]: tried to remove local client`)
 
   if (network.topic === 'world') {
-    const worldState = getState(WorldState)
-    const name = worldState.userNames[userID]
-    dispatchAction(EngineActions.peerDestroyed({ peer: network.peers.get(peerID)!, name: name ?? '' }))
+    dispatchAction(EngineActions.peerDestroyed({ peerID }))
   }
 
   network.peers.delete(peerID)