Fix async connection method in RpgClientEngine

packages/client/src/RpgClientEngine.ts

@@ -340,7 +340,7 @@ export class RpgClientEngine {
             }
             // @ts-ignore
             const envUrl = this.envs.VITE_SERVER_URL
-            this.connection(
+            await this.connection(
                 serverUri.url ? serverUri.url + ':' + serverUri.port :
                     envUrl ? envUrl : undefined
             )
@@ -427,7 +427,7 @@ export class RpgClientEngine {
      * @returns {void}
      * @memberof RpgClientEngine
      */
-    connection(uri?: string) {
+    async connection(uri?: string) {
         const { standalone } = this.gameEngine
 
         this._serverUrl = uri || ''
@@ -662,7 +662,7 @@ export class RpgClientEngine {
         RpgGui._setSocket(this.socket)
 
         if (standalone) {
-            this.socket.connection({
+            await this.socket.connection({
                 auth: {
                     token: this.session
                 }

packages/common/src/Plugin.ts

@@ -8,6 +8,7 @@ export type Plugin = PluginSides | [PluginSides, any]
 export enum HookServer {
     Start = 'Server.Start',
     Step = "Server.Step",
+    Auth = "Server.Auth",
     PlayerConnected = 'Server.onConnected',
     PlayerDisconnected = 'Server.onDisconnected',
     AddMap = 'Server.AddMap',

packages/sample2/main/server.ts

@@ -1,6 +1,9 @@
 import { RpgServerEngine } from "@rpgjs/server"
 
 export default {
+    auth(engine: RpgServerEngine, socket) {
+
+    },
     onStart(engine: RpgServerEngine) {
 
     }

packages/server/src/RpgServer.ts

@@ -25,6 +25,15 @@ export interface RpgServerEngineHooks {
      * @memberof RpgServerEngineHooks
      */
     onStep?: (server: RpgServerEngine) => any
+
+    /**
+     *  
+     * 
+     * @param server 
+     * @param socket 
+     * @returns 
+     */
+    auth?: (server: RpgServerEngine, socket: any) => Promise<string> | string | never
 }
 
 export interface RpgPlayerHooks {
@@ -239,7 +248,6 @@ export interface RpgServer {
         player?: string[],
         engine?: string[]
     }
-
     /**
      * Adding sub-modules
      *

packages/server/src/entry-point.ts

@@ -63,7 +63,8 @@ export default async function (modules: ModuleType[], options: RpgServerEntryPoi
 
     const relationsEngine = {
         onStart: HookServer.Start,
-        onStep: HookServer.Step
+        onStep: HookServer.Step,
+        auth: HookServer.Auth
     }
 
     const { playerProps } = await loadModules(modules, {

packages/server/src/server.ts

@@ -249,12 +249,15 @@ export class RpgServerEngine {
     }
 
     private transport(io): Transport {
-        const timeoutDisconnect = 0
+        const timeoutDisconnect = this.globalConfig.timeoutDisconnect ?? 0
         const transport = new Transport(io, {
             timeoutDisconnect,
-            auth: (socket) => {
-                //console.log( socket.handshake.auth)
-                return Utils.generateUID()
+            auth: async (socket) => {
+                const val = await RpgPlugin.emit(HookServer.Auth, [this, socket], true)
+                if (val.length == 0) {
+                    return Utils.generateUID()
+                }
+                return val[val.length-1]
             }
         })
         this.world.timeoutDisconnect = timeoutDisconnect

packages/standalone/package.json

@@ -13,7 +13,7 @@
     "@rpgjs/client": "^4.1.3",
     "@rpgjs/common": "^4.1.3",
     "@rpgjs/server": "^4.1.3",
-    "simple-room": "^3.0.5"
+    "simple-room": "^3.0.6"
   },
   "devDependencies": {
     "@rpgjs/compiler": "^4.1.3",

tests/unit-tests/specs/server-hooks.spec.ts

@@ -0,0 +1,76 @@
+import {_beforeEach} from './beforeEach'
+import { RpgMap, RpgModule, RpgPlayer, RpgServer, RpgServerEngine } from '@rpgjs/server'
+import { clear, testing } from '@rpgjs/testing'
+import { test, afterEach, expect, vi, describe } from 'vitest'
+
+test('Test onStart Hook', async () => {
+    const onStart = vi.fn()
+
+    @RpgModule<RpgServer>({
+        engine: {
+            onStart
+        }
+    })
+    class RpgServerModule {}
+
+    await _beforeEach([{
+        server: RpgServerModule
+    }])
+
+    expect(onStart).toHaveBeenCalled()
+    expect(onStart).toHaveBeenCalledWith(expect.any(RpgServerEngine))
+})
+
+test('Test onStep Hook', async () => {
+    const onStep = vi.fn()
+
+    @RpgModule<RpgServer>({
+        engine: {
+            onStep
+        }
+    })
+    class RpgServerModule {}
+
+    await _beforeEach([{
+        server: RpgServerModule
+    }])
+
+    expect(onStep).toHaveBeenCalled()
+    expect(onStep).toHaveBeenCalledWith(expect.any(RpgServerEngine))
+})
+
+describe('Test auth Hook', () => {
+
+    async function createAuthTest(auth) {
+
+        @RpgModule<RpgServer>({
+            engine: {
+                auth
+            }
+        })
+        class RpgServerModule {}
+
+        const { player } = await _beforeEach([{
+            server: RpgServerModule
+        }])
+
+        expect(auth).toHaveBeenCalled()
+        expect(auth).toHaveBeenCalledWith(expect.any(RpgServerEngine), expect.anything())
+        expect(auth).toHaveReturnedWith('test')
+        expect(player.id).toBe('test')
+    }
+
+    test('Test auth Hook', async () => {
+        const auth = vi.fn().mockReturnValue('test')
+        await createAuthTest(auth)
+    })
+
+    test('Test auth Hook with Promise', async () => {
+        const auth = vi.fn().mockResolvedValue('test')
+        await createAuthTest(auth)
+    })
+})
+
+afterEach(() => {
+    clear()
+})