- typed server inner rpc
- client minor fixes
- sharing browser with rpc on client
This commit is contained in:
2024-10-28 17:30:28 +00:00
parent 3bbf1e2209
commit cbbf4f38e6
12 changed files with 98 additions and 160 deletions
+1 -1
View File
@@ -18,7 +18,7 @@ export class Client {
public unregister<EventName extends T.RageFW_ClientEvent>(
eventName: EventName,
): Client {
rpc.unregister(eventName)
rpc.unregister<EventName>(eventName)
return this
}
+15 -9
View File
@@ -2,47 +2,53 @@ import { rpc } from './rpc'
import type * as T from '../types'
export class Player {
public browser: BrowserMp | undefined
private _browser: BrowserMp | undefined = undefined
public trigger<EventName extends keyof T.RageFW_ICustomClientEvent>(
set browser(browser: BrowserMp) {
this._browser = browser
rpc.browser = browser
}
public async trigger<EventName extends keyof T.RageFW_ICustomClientEvent>(
eventName: EventName,
...args: T._ClientEventHasArgs<EventName> extends true
? [T.RageFW_ClientArgs<EventName>]
: []
): Promise<T.RageFW_ClientReturn<EventName>> {
return rpc.call<
return await rpc.call<
typeof args,
EventName,
T.RageFW_ClientReturn<EventName>
>(eventName, args)
}
public triggerServer<EventName extends T.RageFW_ServerEvent>(
public async triggerServer<EventName extends T.RageFW_ServerEvent>(
eventName: EventName,
...args: T._ServerEventHasArgs<EventName> extends true
? [T.RageFW_ServerArgs<EventName>]
: []
): Promise<T.RageFW_ClientServerReturn<EventName>> {
return rpc.callServer<
return await rpc.callServer<
typeof args,
EventName,
T.RageFW_ClientServerReturn<EventName>
>(eventName, args)
}
public triggerBrowser<EventName extends T.RageFW_CefEvent>(
public async triggerBrowser<EventName extends T.RageFW_CefEvent>(
eventName: EventName,
...args: T._CefEventHasArgs<EventName> extends true
? [T.RageFW_CefArgs<EventName>]
: []
): Promise<T.RageFW_CefReturn<EventName>> {
if (!this.browser)
if (!this._browser)
throw new Error('You need to initialize browser first')
return rpc.callBrowser<
return await rpc.callBrowser<
typeof args,
EventName,
T.RageFW_CefReturn<EventName>
>(this.browser, eventName, args)
>(eventName, args)
}
}