fix send returns

RSamaium · Nov 22, 2023 · 7007559 · 7007559
1 parent ee1c9d5
commit 7007559
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/sync-server/src/index.ts b/sync-server/src/index.ts
@@ -6,6 +6,7 @@ import { User } from './user'
 import { Transmitter } from './transmitter'
 import MockSocketIo from './testing/mock-socket'
 import { Utils } from './utils'
+import { Transport } from './transports/socket'
 
 export {
     World,
@@ -20,5 +21,6 @@ export {
     User,
     Transmitter,
     MockSocketIo,
-    Utils
+    Utils,
+    Transport
 }
diff --git a/sync-server/src/room.ts b/sync-server/src/room.ts
@@ -122,7 +122,8 @@ export class Room {
             ...this.memoryTotalObject,
             join: firstJoin
         }, <string>room.id)
-        Transmitter.emit(userProxy, packet, room)
+
+        await Transmitter.emit(userProxy, packet, room)
 
         return true
     }

diff --git a/sync-server/src/world.ts b/sync-server/src/world.ts
@@ -143,8 +143,8 @@ export class WorldClass {
      * 
      * @method send()
      */
-    send(): void {
-        this.rooms.forEach((room: any, id: string) => {
+    async send(): Promise<void> {
+        for (let [_, room] of this.rooms) {
             const obj = room.$currentState()
             if (Object.keys(obj).length == 0) {
                 return
@@ -155,12 +155,12 @@ export class WorldClass {
                 const packets = Transmitter.getPackets(room)
                 if (packets) {
                     for (let packet of packets) {
-                        Transmitter.emit(user, packet, room)
+                        await Transmitter.emit(user, packet, room)
                     }
                 }
             }
             room.$clearCurrentState()
-        })
+        }
         Transmitter.clear()
     }
 
@@ -170,9 +170,13 @@ export class WorldClass {
      * @method connectUser()
      * @param {object} socket 
      * @param {id} userId 
+     * @param {object} options
+     *  - getUserInstance: function that returns a new instance of the user
      * @returns {User}
      */
-    connectUser<T = User>(socket, id: string): T {
+    connectUser<T = User>(socket, id: string, options: {
+        getUserInstance?: any
+    } = {}): T {
         const existingUser = this.getUser(id, false)
         if (existingUser) {
             if (existingUser._timeoutDisconnect) {
@@ -183,7 +187,7 @@ export class WorldClass {
             existingUser.$state = UserState.Connected
             return existingUser as any
         }
-        const user = new this.userClass()
+        const user = options.getUserInstance?.(socket) ?? new this.userClass()
         user.id = id
         socket.emit('uid', id)
         this.setUser(user, socket)
@@ -200,7 +204,7 @@ export class WorldClass {
     disconnectUser(userId: string): Promise<void> {
         return new Promise((resolve: any, reject) => {
             const user = this.getUser(userId)
-        
+
             if (!user) return resolve()
 
             user.$state = UserState.Disconnected

diff --git a/sync-server/tests/user.spec.ts b/sync-server/tests/user.spec.ts
@@ -138,7 +138,7 @@ test('Change Room', () => {
         await World.joinRoom(room1.id, CLIENT_ID)
         user = World.getUser(CLIENT_ID)
         user.position = {x: 10, y: 10}
-        World.send()
+        await World.send()
 
         await World.leaveRoom(room1.id, CLIENT_ID)
 
@@ -147,10 +147,10 @@ test('Change Room', () => {
         user = World.getUser(CLIENT_ID)
         user.position.x = 20
         user.position.y = 20
-        World.send()
+        await World.send()
     })
 })
 
-// afterEach(() => {
-//     World.clear()
-// })
+afterEach(() => {
+    World.clear()
+})