upd core

- typed server inner rpc
- client minor fixes
- sharing browser with rpc on client

client/src/core/client.ts

@@ -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
     }

client/src/core/player.ts

@@ -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)
     }
 }
 

client/src/types/client.ts

@@ -25,7 +25,7 @@ export type RageFW_ClientArgs<K extends RageFW_ClientEvent> =
 
 /**
  * Return type for an event, name of which you pass as a generic
- * These only include custom events
+ * These include custom and system events
  */
 export type RageFW_ClientReturn<K extends RageFW_ClientEvent> =
     K extends keyof RageFW_ICustomClientEvent
@@ -36,7 +36,7 @@ export type RageFW_ClientReturn<K extends RageFW_ClientEvent> =
 
 /**
  * Callback (function) for an event, name of which you pass as a generic
- * These only include custom events
+ * These include custom and system events
  */
 export type RageFW_ClientCallback<K extends RageFW_ClientEvent> = (
     ...args: RageFW_ClientArgs<K>