From 70df94afa27063831470626bd2374608b75d3ab3 Mon Sep 17 00:00:00 2001 From: Danya H Date: Wed, 11 Sep 2024 23:53:23 +0100 Subject: [PATCH] fix: microchanges --- cef/src/types/cef.ts | 2 +- client/src/core/client.ts | 4 ++-- client/src/types/client.ts | 2 +- server/src/core/server.ts | 2 +- server/src/types/server.ts | 6 ++++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cef/src/types/cef.ts b/cef/src/types/cef.ts index f564053..cc0fc78 100644 --- a/cef/src/types/cef.ts +++ b/cef/src/types/cef.ts @@ -30,7 +30,7 @@ export type RageFW_CefReturn = ReturnType< */ export type RageFW_CefCallback = ( args: RageFW_CefArgs, -) => RageFW_CefReturn +) => Promise> export type _CefEventHasArgs = keyof RageFW_ICustomCefEvent extends never diff --git a/client/src/core/client.ts b/client/src/core/client.ts index b50a126..f43e0ed 100644 --- a/client/src/core/client.ts +++ b/client/src/core/client.ts @@ -7,8 +7,8 @@ export class Client { eventName: EventName, callback: RageFW_ClientCallback, ): void { - rpc.register(eventName, data => { - return callback(data) + rpc.register(eventName, async data => { + return await callback(data) }) } diff --git a/client/src/types/client.ts b/client/src/types/client.ts index 6654dd0..804752b 100644 --- a/client/src/types/client.ts +++ b/client/src/types/client.ts @@ -27,7 +27,7 @@ export type RageFW_ClientArgs = */ export type RageFW_ClientCallback = ( args: RageFW_ClientArgs, -) => RageFW_ClientReturn +) => Promise> /** * Return type for an event, name of which you pass as a generic diff --git a/server/src/core/server.ts b/server/src/core/server.ts index 1e9b81c..464aca1 100644 --- a/server/src/core/server.ts +++ b/server/src/core/server.ts @@ -24,7 +24,7 @@ export class Server { rpc.register( eventName, async (args: RageFW_ServerArgs, info) => { - callback([info.player as PlayerMp, ...args]) + await callback([info.player as PlayerMp, ...args]) }, ) } diff --git a/server/src/types/server.ts b/server/src/types/server.ts index 9939769..76793a1 100644 --- a/server/src/types/server.ts +++ b/server/src/types/server.ts @@ -55,7 +55,7 @@ export type RageFW_ServerCallbackCustom< K extends keyof RageFW_ICustomServerEvent = keyof RageFW_ICustomServerEvent, > = ( payload: [player: PlayerMp, ...args: RageFW_ServerArgs], -) => RageFW_ServerReturn +) => Promise> /** * Array of arguments for an event, name of which you pass as a generic @@ -63,7 +63,9 @@ export type RageFW_ServerCallbackCustom< */ export type RageFW_ServerCallbackNative< K extends keyof IServerEvents = keyof IServerEvents, -> = (payload: Parameters) => ReturnType +> = ( + payload: Parameters, +) => Promise> export type _ServerEventHasArgs = EventName extends keyof RageFW_ICustomServerEvent