Skip to content

Commit 1e07eb7

Browse files
committed
pass sender uuid to local/global message event fns
1 parent 3b7a6b0 commit 1e07eb7

File tree

2 files changed

+23
-8
lines changed

2 files changed

+23
-8
lines changed

src/client/client.ts

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type { Buffer } from 'node:buffer'
55
import { deserializeMessage, serializeMessage } from '../codec.js'
66
import { Instruction } from '../index.js'
77
import type { IncomingMessage, Message, Vector3 } from '../interfaces.js'
8-
import type { MessagePayload } from './methodParams.js'
8+
import type { MessagePayload } from './interfaces.js'
99

1010
/* eslint-disable @typescript-eslint/ban-types */
1111
interface Events {
@@ -16,8 +16,17 @@ interface Events {
1616

1717
peerConnect: [uuid: string]
1818
peerDisconnect: [uuid: string]
19-
localMessage: [worldName: string, position: Vector3, payload: MessagePayload]
20-
globalMessage: [worldName: string, payload: MessagePayload]
19+
localMessage: [
20+
senderUuid: string,
21+
worldName: string,
22+
position: Vector3,
23+
payload: MessagePayload
24+
]
25+
globalMessage: [
26+
senderUuid: string,
27+
worldName: string,
28+
payload: MessagePayload
29+
]
2130
recordReply: []
2231
}
2332
/* eslint-enable @typescript-eslint/ban-types */
@@ -253,16 +262,22 @@ export class Client extends EventEmitter<Events> {
253262
throw new Error('invalid local message')
254263
}
255264

256-
this.emit('localMessage', message.worldName, message.position, {
257-
parameter: message.parameter,
258-
flex: message.flex,
259-
})
265+
this.emit(
266+
'localMessage',
267+
message.senderUuid,
268+
message.worldName,
269+
message.position,
270+
{
271+
parameter: message.parameter,
272+
flex: message.flex,
273+
}
274+
)
260275

261276
break
262277
}
263278

264279
case Instruction.GlobalMessage: {
265-
this.emit('globalMessage', message.worldName, {
280+
this.emit('globalMessage', message.senderUuid, message.worldName, {
266281
parameter: message.parameter,
267282
flex: message.flex,
268283
})

0 commit comments

Comments
 (0)