entityseven/rage-framework
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

server triggerBrowser typization improvement

Browse Source
This commit is contained in:
Oleksandr Honcharov 2024-06-13 04:54:29 +03:00
parent c94bab24f2
commit 7a506a02e2
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/index.ts
View File

@ -6,6 +6,7 @@ import {
RageFW_CefArgs, RageFW_CefArgs,
RageFW_CefEvent, RageFW_CefEvent,
RageFW_CefReturn, RageFW_CefReturn,
_CefEventHasArgs,
_ClientEventHasArgs, _ClientEventHasArgs,
_ServerEventHasArgs, _ServerEventHasArgs,
RageFW_ClientEvent, RageFW_ClientEvent,
@ -128,7 +129,9 @@ class Player {
public triggerBrowser<EventName extends RageFW_CefEvent>( public triggerBrowser<EventName extends RageFW_CefEvent>(
player: PlayerMp, player: PlayerMp,
eventName: EventName, eventName: EventName,
args: RageFW_CefArgs<EventName>, ...args: _CefEventHasArgs<EventName> extends true
? [RageFW_CefArgs<EventName>]
: []
): Promise<RageFW_CefReturn<EventName>> { ): Promise<RageFW_CefReturn<EventName>> {
return rpc.callBrowsers(player, eventName, args) return rpc.callBrowsers(player, eventName, args)
} }

7
server/src/types/browser.ts
View File

@ -9,3 +9,10 @@ export type RageFW_CefArgs<K extends RageFW_CefEvent> = Parameters<
export type RageFW_CefReturn<K extends RageFW_CefEvent> = ReturnType< export type RageFW_CefReturn<K extends RageFW_CefEvent> = ReturnType<
RageFW_ICustomCefEvent[K] RageFW_ICustomCefEvent[K]
> >
export type _CefEventHasArgs<EventName extends keyof RageFW_ICustomCefEvent> =
keyof RageFW_ICustomCefEvent extends never
? false
: Parameters<RageFW_ICustomCefEvent[EventName]>[0] extends undefined
? false
: true