v0.0.23-alpha.0

cef/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rage-fw-cef",
-    "version": "0.0.21-alpha.0",
+    "version": "0.0.23-alpha.0",
     "main": "dist/index.js",
     "types": "dist/src/index.d.ts",
     "files": [

cef/src/index.ts

@@ -21,7 +21,9 @@ class Cef {
         eventName: EventName,
         callback: RageFW_CefCallback<EventName>,
     ): void {
-        rpc.register(eventName, callback)
+        if ('mp' in window) {
+            rpc.register(eventName, callback)
+        }
     }
 
     public trigger<EventName extends keyof RageFW_ICustomCefEvent>(
@@ -30,7 +32,13 @@ class Cef {
             ? [RageFW_CefArguments<EventName>]
             : []
     ): Promise<RageFW_CefReturn<EventName>> {
-        return rpc.call(eventName, args)
+        if ('mp' in window) {
+            return rpc.call(eventName, args)
+        }
+
+        return Promise.reject(
+            'RageFW was started in window which not contain global variable MP!',
+        )
     }
 
     public triggerServer<EventName extends keyof RageFW_ICustomServerEvent>(
@@ -39,7 +47,13 @@ class Cef {
             ? [RageFW_ServerArguments<EventName>]
             : []
     ): Promise<RageFW_ServerReturn<EventName>> {
-        return rpc.callServer(eventName, args)
+        if ('mp' in window) {
+            return rpc.callServer(eventName, args)
+        }
+
+        return Promise.reject(
+            'RageFW was started in window which not contain global variable MP!',
+        )
     }
 
     public triggerClient<EventName extends keyof RageFW_ICustomClientEvent>(
@@ -48,7 +62,13 @@ class Cef {
             ? [RageFW_ClientArguments<EventName>]
             : []
     ): Promise<RageFW_ClientReturn<EventName>> {
-        return rpc.callClient(eventName, args)
+        if ('mp' in window) {
+            return rpc.callClient(eventName, args)
+        }
+
+        return Promise.reject(
+            'RageFW was started in window which not contain global variable MP!',
+        )
     }
 }
 

client/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rage-fw-client",
-    "version": "0.0.21-alpha.0",
+    "version": "0.0.23-alpha.0",
     "main": "dist/index.js",
     "types": "dist/src/index.d.ts",
     "files": [

client/src/types/client.ts

@@ -4,16 +4,22 @@ import type { RageFW_ICustomClientEvent } from 'rage-fw-shared-types'
 
 /**
  * Union of all available client event names
- * These only include custom events
+ * These include custom and system events
  */
-export type RageFW_ClientEvent = keyof RageFW_ICustomClientEvent
+export type RageFW_ClientEvent =
+    | keyof RageFW_ICustomClientEvent
+    | keyof IClientEvents
 
 /**
  * Array of arguments 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_ClientEventArguments<K extends RageFW_ClientEvent> =
-    Parameters<RageFW_ICustomClientEvent[K]>
+    K extends keyof RageFW_ICustomClientEvent
+        ? Parameters<RageFW_ICustomClientEvent[K]>
+        : K extends keyof IClientEvents
+          ? Parameters<IClientEvents[K]>
+          : never
 
 /**
  * Callback (function) for an event, name of which you pass as a generic

lerna.json

@@ -1,5 +1,5 @@
 {
     "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-    "version": "0.0.21-alpha.0",
+    "version": "0.0.23-alpha.0",
     "npmClient": "pnpm"
 }

server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rage-fw-server",
-    "version": "0.0.21-alpha.0",
+    "version": "0.0.23-alpha.0",
     "main": "dist/index.js",
     "types": "dist/src/index.d.ts",
     "files": [

server/src/index.ts

@@ -34,7 +34,7 @@ class Server {
         rpc.register(
             eventName,
             async (args: RageFW_ServerEventArguments<EventName>, info) => {
-                callback(info.player as PlayerMp, args)
+                callback([info.player as PlayerMp, ...args])
             },
         )
     }
@@ -43,7 +43,11 @@ class Server {
         eventName: EventName,
         callback: RageFW_ServerEventCallbackNative<EventName>,
     ): void {
-        mp.events.add(eventName, callback)
+        mp.events.add(
+            eventName,
+            (...args: Parameters<IServerEvents[EventName]>) =>
+                callback([...args]),
+        )
     }
 
     public register<EventName extends RageFW_ServerEvent>(

server/src/types/server.ts

@@ -54,8 +54,7 @@ export type RageFW_ServerEventReturn<K extends RageFW_ServerEvent> =
 export type RageFW_ServerEventCallbackCustom<
     K extends keyof RageFW_ICustomServerEvent = keyof RageFW_ICustomServerEvent,
 > = (
-    player: PlayerMp,
+    payload: [player: PlayerMp, ...args: RageFW_ServerEventArguments<K>],
-    args: RageFW_ServerEventArguments<K>,
 ) => RageFW_ServerEventReturn<K>
 
 /**
@@ -64,7 +63,7 @@ export type RageFW_ServerEventCallbackCustom<
  */
 export type RageFW_ServerEventCallbackNative<
     K extends keyof IServerEvents = keyof IServerEvents,
-> = IServerEvents[K]
+> = (payload: Parameters<IServerEvents[K]>) => ReturnType<IServerEvents[K]>
 
 export type _ServerEventHasArgs<
     EventName extends keyof RageFW_ICustomServerEvent,

shared-types/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rage-fw-shared-types",
-    "version": "0.0.21-alpha.0",
+    "version": "0.0.23-alpha.0",
     "types": "types/types/index.d.ts",
     "files": [
         "types/**/*"

shared-types/types/types/index.d.ts

@@ -3,7 +3,5 @@ declare module 'rage-fw-shared-types' {
 
     export interface RageFW_ICustomClientEvent {}
 
-    export interface RageFW_ICustomCefEvent {
+    export interface RageFW_ICustomCefEvent {}
-        test(test: string): void
-    }
 }