v0.0.22-alpha.0

cef/package.json

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

cef/src/index.ts

@@ -1,16 +1,19 @@
 import rpc from 'rage-rpc'
 
 import {
+    _CefEventHasArgs,
+    _ClientEventHasArgs,
+    _ServerEventHasArgs,
     RageFW_CefArguments,
     RageFW_CefCallback,
     RageFW_CefReturn,
     RageFW_ClientArguments,
     RageFW_ClientReturn,
-    RageFW_ServerArguments,
-    RageFW_ServerReturn,
     RageFW_ICustomCefEvent,
     RageFW_ICustomClientEvent,
     RageFW_ICustomServerEvent,
+    RageFW_ServerArguments,
+    RageFW_ServerReturn,
 } from './types'
 
 class Cef {
@@ -23,21 +26,27 @@ class Cef {
 
     public trigger<EventName extends keyof RageFW_ICustomCefEvent>(
         eventName: EventName,
-        args: RageFW_CefArguments<EventName>,
+        ...args: _CefEventHasArgs<EventName> extends true
+            ? [RageFW_CefArguments<EventName>]
+            : []
     ): Promise<RageFW_CefReturn<EventName>> {
         return rpc.call(eventName, args)
     }
 
     public triggerServer<EventName extends keyof RageFW_ICustomServerEvent>(
         eventName: EventName,
-        args: RageFW_ServerArguments<EventName>,
+        ...args: _ServerEventHasArgs<EventName> extends true
+            ? [RageFW_ServerArguments<EventName>]
+            : []
     ): Promise<RageFW_ServerReturn<EventName>> {
         return rpc.callServer(eventName, args)
     }
 
     public triggerClient<EventName extends keyof RageFW_ICustomClientEvent>(
         eventName: EventName,
-        args: RageFW_ClientArguments<EventName>,
+        ...args: _ClientEventHasArgs<EventName> extends true
+            ? [RageFW_ClientArguments<EventName>]
+            : []
     ): Promise<RageFW_ClientReturn<EventName>> {
         return rpc.callClient(eventName, args)
     }

cef/src/types/cef.ts

@@ -0,0 +1,39 @@
+import { RageFW_ICustomCefEvent } from 'rage-fw-shared-types'
+export { RageFW_ICustomCefEvent } from 'rage-fw-shared-types'
+
+/**
+ * Union of all available cef event names
+ * These only include custom events
+ */
+export type RageFW_CefEvent = keyof RageFW_ICustomCefEvent
+
+/**
+ * Array of arguments of an event you pass as a generic
+ * These only include custom cef events
+ */
+export type RageFW_CefArguments<K extends RageFW_CefEvent> = Parameters<
+    RageFW_ICustomCefEvent[K]
+>
+
+/**
+ * Return type of event you pass as a generic
+ * These only include custom cef events
+ */
+export type RageFW_CefReturn<K extends RageFW_CefEvent> = ReturnType<
+    RageFW_ICustomCefEvent[K]
+>
+
+/**
+ * Callback (function) of event you pass as a generic
+ * These only include custom cef events
+ */
+export type RageFW_CefCallback<K extends keyof RageFW_ICustomCefEvent> = (
+    args: RageFW_CefArguments<K>,
+) => RageFW_CefReturn<K>
+
+export type _CefEventHasArgs<EventName extends keyof RageFW_ICustomCefEvent> =
+    keyof RageFW_ICustomCefEvent extends never
+        ? false
+        : Parameters<RageFW_ICustomCefEvent[EventName]>[0] extends undefined
+          ? false
+          : true

cef/src/types/client.ts

@@ -0,0 +1,32 @@
+import type { RageFW_ICustomClientEvent } from 'rage-fw-shared-types'
+export type { RageFW_ICustomClientEvent } from 'rage-fw-shared-types'
+
+/**
+ * Union of all available client event names
+ * These only include custom events
+ */
+export type RageFW_ClientEvent = keyof RageFW_ICustomClientEvent
+
+/**
+ * Array of arguments of event you pass as a generic
+ * These only include custom client events
+ */
+export type RageFW_ClientArguments<K extends RageFW_ClientEvent> = Parameters<
+    RageFW_ICustomClientEvent[K]
+>
+
+/**
+ * Return type of event you pass as a generic
+ * These only include custom client events
+ */
+export type RageFW_ClientReturn<K extends RageFW_ClientEvent> = ReturnType<
+    RageFW_ICustomClientEvent[K]
+>
+
+export type _ClientEventHasArgs<
+    EventName extends keyof RageFW_ICustomClientEvent,
+> = keyof RageFW_ICustomClientEvent extends never
+    ? false
+    : Parameters<RageFW_ICustomClientEvent[EventName]>[0] extends undefined
+      ? false
+      : true

cef/src/types/index.ts

@@ -1,87 +1,3 @@
-/// <reference types="@ragempcommunity/types-cef" />
+export * from './cef'
-
+export * from './client'
-import type {
+export * from './server'
-    RageFW_ICustomCefEvent,
-    RageFW_ICustomClientEvent,
-    RageFW_ICustomServerEvent,
-} from 'rage-fw-shared-types'
-
-export type {
-    RageFW_ICustomCefEvent,
-    RageFW_ICustomServerEvent,
-    RageFW_ICustomClientEvent,
-} from 'rage-fw-shared-types'
-
-/**
- * Union of all available cef event names
- * These only include custom events
- */
-export type RageFW_CefEvent = keyof RageFW_ICustomCefEvent
-
-/**
- * Union of all available server event names
- * These only include custom events
- */
-export type RageFW_ServerEvent = keyof RageFW_ICustomServerEvent
-
-/**
- * Union of all available client event names
- * These only include custom events
- */
-export type RageFW_ClientEvent = keyof RageFW_ICustomClientEvent
-
-/**
- * Array of arguments of an event you pass as a generic
- * These only include custom cef events
- */
-export type RageFW_CefArguments<K extends RageFW_CefEvent> = Parameters<
-    RageFW_ICustomCefEvent[K]
->
-
-/**
- * Return type of event you pass as a generic
- * These only include custom cef events
- */
-export type RageFW_CefReturn<K extends RageFW_CefEvent> = ReturnType<
-    RageFW_ICustomCefEvent[K]
->
-
-/**
- * Callback (function) of event you pass as a generic
- * These only include custom cef events
- */
-export type RageFW_CefCallback<K extends keyof RageFW_ICustomCefEvent> = (
-    args: RageFW_CefArguments<K>,
-) => RageFW_CefReturn<K>
-
-/**
- * Array of arguments of event you pass as a generic
- * These only include custom server events
- */
-export type RageFW_ServerArguments<K extends RageFW_ServerEvent> = Parameters<
-    RageFW_ICustomServerEvent[K]
->
-
-/**
- * Return type of event you pass as a generic
- * These only include custom server events
- */
-export type RageFW_ServerReturn<K extends RageFW_ServerEvent> = ReturnType<
-    RageFW_ICustomServerEvent[K]
->
-
-/**
- * Array of arguments of event you pass as a generic
- * These only include custom client events
- */
-export type RageFW_ClientArguments<K extends RageFW_ClientEvent> = Parameters<
-    RageFW_ICustomClientEvent[K]
->
-
-/**
- * Return type of event you pass as a generic
- * These only include custom client events
- */
-export type RageFW_ClientReturn<K extends RageFW_ClientEvent> = ReturnType<
-    RageFW_ICustomClientEvent[K]
->

cef/src/types/server.ts

@@ -0,0 +1,32 @@
+import type { RageFW_ICustomServerEvent } from 'rage-fw-shared-types'
+export type { RageFW_ICustomServerEvent } from 'rage-fw-shared-types'
+
+/**
+ * Union of all available server event names
+ * These only include custom events
+ */
+export type RageFW_ServerEvent = keyof RageFW_ICustomServerEvent
+
+/**
+ * Array of arguments of event you pass as a generic
+ * These only include custom server events
+ */
+export type RageFW_ServerArguments<K extends RageFW_ServerEvent> = Parameters<
+    RageFW_ICustomServerEvent[K]
+>
+
+/**
+ * Return type of event you pass as a generic
+ * These only include custom server events
+ */
+export type RageFW_ServerReturn<K extends RageFW_ServerEvent> = ReturnType<
+    RageFW_ICustomServerEvent[K]
+>
+
+export type _ServerEventHasArgs<
+    EventName extends keyof RageFW_ICustomServerEvent,
+> = keyof RageFW_ICustomServerEvent extends never
+    ? false
+    : Parameters<RageFW_ICustomServerEvent[EventName]>[0] extends undefined
+      ? false
+      : true

client/package.json

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

client/src/index.ts

@@ -3,14 +3,21 @@ import rpc from 'rage-rpc'
 import Logger from './logger'
 
 import {
-    RageFW_ClientEventCallback,
+    _CefEventHasArgs,
+    _ClientEventHasArgs,
+    _ServerEventHasArgs,
+    RageFW_CefArgs,
+    RageFW_CefEvent,
+    RageFW_CefReturn,
     RageFW_ClientEvent,
+    RageFW_ClientEventArguments,
+    RageFW_ClientEventCallback,
+    RageFW_ClientEventReturn,
     RageFW_ClientServerEvent,
     RageFW_ClientServerEventArguments,
     RageFW_ClientServerEventReturn,
-    RageFW_ClientEventArguments,
-    RageFW_ClientEventReturn,
 } from './types'
+
 import type { RageFW_ICustomClientEvent } from 'rage-fw-shared-types'
 
 class Client {
@@ -28,27 +35,52 @@ class Client {
     ): void {
         rpc.unregister(eventName)
     }
-
-    public trigger<EventName extends keyof RageFW_ICustomClientEvent>(
-        eventName: EventName,
-        args: RageFW_ClientEventArguments<EventName>,
-    ): Promise<RageFW_ClientEventReturn<EventName>> {
-        return rpc.call<RageFW_ClientEventReturn<EventName>>(eventName, args)
-    }
 }
 
 class Player {
+    public browser: BrowserMp | undefined
+
+    public trigger<EventName extends keyof RageFW_ICustomClientEvent>(
+        eventName: EventName,
+        ...args: _ClientEventHasArgs<EventName> extends true
+            ? [RageFW_ClientEventArguments<EventName>]
+            : []
+    ): Promise<RageFW_ClientEventReturn<EventName>> {
+        return rpc.call<RageFW_ClientEventReturn<EventName>>(eventName, args)
+    }
+
     public triggerServer<EventName extends RageFW_ClientServerEvent>(
         eventName: EventName,
-        args: RageFW_ClientServerEventArguments<EventName>,
+        ...args: _ServerEventHasArgs<EventName> extends true
+            ? [RageFW_ClientServerEventArguments<EventName>]
+            : []
     ): Promise<RageFW_ClientServerEventReturn<EventName>> {
         return rpc.callServer(eventName, args)
     }
+
+    public triggerBrowser<EventName extends RageFW_CefEvent>(
+        eventName: EventName,
+        ...args: _CefEventHasArgs<EventName> extends true
+            ? [RageFW_CefArgs<EventName>]
+            : []
+    ): Promise<RageFW_CefReturn<EventName>> {
+        if (!this.browser)
+            throw new Error('You need to initialize browser first!')
+        return rpc.callBrowser(this.browser, eventName, args)
+    }
+}
+
+class Browser extends Player {
+    public registerBrowser(browser: BrowserMp) {
+        this.browser = browser
+        return browser
+    }
 }
 
 export const fw = {
     event: new Client(),
     player: new Player(),
+    browser: new Browser(),
     system: {
         log: new Logger(),
     },

client/src/types/browser.ts

@@ -0,0 +1,20 @@
+/// <reference types="@ragempcommunity/types-client" />
+
+import type { RageFW_ICustomCefEvent } from 'rage-fw-shared-types'
+
+export type RageFW_CefEvent = keyof RageFW_ICustomCefEvent
+
+export type RageFW_CefArgs<K extends RageFW_CefEvent> = Parameters<
+    RageFW_ICustomCefEvent[K]
+>
+
+export type RageFW_CefReturn<K extends RageFW_CefEvent> = ReturnType<
+    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

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
@@ -31,3 +37,11 @@ export type RageFW_ClientEventReturn<K extends RageFW_ClientEvent> =
     K extends keyof RageFW_ICustomClientEvent
         ? ReturnType<RageFW_ICustomClientEvent[K]>
         : never
+
+export type _ClientEventHasArgs<
+    EventName extends keyof RageFW_ICustomClientEvent,
+> = keyof RageFW_ICustomClientEvent extends never
+    ? false
+    : Parameters<RageFW_ICustomClientEvent[EventName]>[0] extends undefined
+      ? false
+      : true

client/src/types/index.ts

@@ -1,2 +1,3 @@
 export * from './client'
-export * from './server'
+export * from './server'
+export * from './browser'

client/src/types/server.ts

@@ -1,6 +1,9 @@
 /// <reference types="@ragempcommunity/types-client" />
 
-import type { RageFW_ICustomServerEvent } from 'rage-fw-shared-types'
+import type {
+    RageFW_ICustomClientEvent,
+    RageFW_ICustomServerEvent,
+} from 'rage-fw-shared-types'
 
 /**
  * Union of all available server event names callable from client
@@ -26,3 +29,11 @@ export type RageFW_ClientServerEventReturn<K extends RageFW_ClientServerEvent> =
     K extends keyof RageFW_ICustomServerEvent
         ? ReturnType<RageFW_ICustomServerEvent[K]>
         : never
+
+export type _ServerEventHasArgs<
+    EventName extends keyof RageFW_ICustomServerEvent,
+> = keyof RageFW_ICustomClientEvent extends never
+    ? false
+    : Parameters<RageFW_ICustomServerEvent[EventName]>[0] extends undefined
+      ? false
+      : true

lerna.json

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

server/package.json

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

server/src/index.ts

@@ -3,10 +3,16 @@ import rpc from 'rage-rpc'
 import Logger from './logger'
 
 import {
+    _CefEventHasArgs,
+    _ClientEventHasArgs,
+    _ServerEventHasArgs,
+    RageFW_CefArgs,
+    RageFW_CefEvent,
+    RageFW_CefReturn,
     RageFW_ClientEvent,
-    RageFW_ClientEventArguments,
-    RageFW_ClientEventReturn,
     RageFW_ICustomServerEvent,
+    RageFW_ServerClientEventArguments,
+    RageFW_ServerClientEventReturn,
     RageFW_ServerEvent,
     RageFW_ServerEventArguments,
     RageFW_ServerEventCallback,
@@ -28,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])
             },
         )
     }
@@ -37,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>(
@@ -99,9 +109,11 @@ class Server {
         }
     }
 
-    private trigger<EventName extends keyof RageFW_ICustomServerEvent>(
+    public trigger<EventName extends keyof RageFW_ICustomServerEvent>(
         eventName: EventName,
-        args: RageFW_ServerEventArguments<EventName>,
+        ...args: _ServerEventHasArgs<EventName> extends true
+            ? [RageFW_ServerEventArguments<EventName>]
+            : []
     ): Promise<RageFW_ServerEventReturn<EventName>> {
         return rpc.call<RageFW_ServerEventReturn<EventName>>(eventName, args)
     }
@@ -111,10 +123,22 @@ class Player {
     public triggerClient<EventName extends RageFW_ClientEvent>(
         player: PlayerMp,
         eventName: EventName,
-        args: RageFW_ClientEventArguments<EventName>,
+        ...args: _ClientEventHasArgs<EventName> extends true
-    ): Promise<RageFW_ClientEventReturn<EventName>> {
+            ? [RageFW_ServerClientEventArguments<EventName>]
+            : []
+    ): Promise<RageFW_ServerClientEventReturn<EventName>> {
         return rpc.callClient(player, eventName, args)
     }
+
+    public triggerBrowser<EventName extends RageFW_CefEvent>(
+        player: PlayerMp,
+        eventName: EventName,
+        ...args: _CefEventHasArgs<EventName> extends true
+            ? [RageFW_CefArgs<EventName>]
+            : []
+    ): Promise<RageFW_CefReturn<EventName>> {
+        return rpc.callBrowsers(player, eventName, args)
+    }
 }
 
 export const fw = {
@@ -124,3 +148,7 @@ export const fw = {
         log: new Logger(),
     },
 }
+
+fw.system.log.info(
+    'Working on Rage Framework. RageFW © Powered by Entity Seven Group',
+)

server/src/types/browser.ts

@@ -0,0 +1,18 @@
+import type { RageFW_ICustomCefEvent } from 'rage-fw-shared-types'
+
+export type RageFW_CefEvent = keyof RageFW_ICustomCefEvent
+
+export type RageFW_CefArgs<K extends RageFW_CefEvent> = Parameters<
+    RageFW_ICustomCefEvent[K]
+>
+
+export type RageFW_CefReturn<K extends RageFW_CefEvent> = ReturnType<
+    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

server/src/types/client.ts

@@ -12,7 +12,7 @@ export type RageFW_ClientEvent = keyof RageFW_ICustomClientEvent
  * Array of arguments of an event you pass as a generic
  * These only include custom events
  */
-export type RageFW_ClientEventArguments<K extends RageFW_ClientEvent> =
+export type RageFW_ServerClientEventArguments<K extends RageFW_ClientEvent> =
     K extends RageFW_ClientEvent
         ? Parameters<RageFW_ICustomClientEvent[K]>
         : never
@@ -21,7 +21,15 @@ export type RageFW_ClientEventArguments<K extends RageFW_ClientEvent> =
  * Return type of event you pass as a generic
  * These only include custom events
  */
-export type RageFW_ClientEventReturn<K extends RageFW_ClientEvent> =
+export type RageFW_ServerClientEventReturn<K extends RageFW_ClientEvent> =
     K extends RageFW_ClientEvent
         ? ReturnType<RageFW_ICustomClientEvent[K]>
         : never
+
+export type _ClientEventHasArgs<
+    EventName extends keyof RageFW_ICustomClientEvent,
+> = keyof RageFW_ICustomClientEvent extends never
+    ? false
+    : Parameters<RageFW_ICustomClientEvent[EventName]>[0] extends undefined
+      ? false
+      : true

server/src/types/index.ts

@@ -1,2 +1,3 @@
 export * from './client'
 export * from './server'
+export * from './browser'

server/src/types/server.ts

@@ -1,6 +1,9 @@
 /// <reference types="@ragempcommunity/types-server" />
 
-import type { RageFW_ICustomServerEvent } from 'rage-fw-shared-types'
+import type {
+    RageFW_ICustomClientEvent,
+    RageFW_ICustomServerEvent,
+} from 'rage-fw-shared-types'
 export type { RageFW_ICustomServerEvent } from 'rage-fw-shared-types'
 
 /**
@@ -17,9 +20,9 @@ export type RageFW_ServerEvent =
  */
 export type RageFW_ServerEventArguments<K extends RageFW_ServerEvent> =
     K extends keyof RageFW_ICustomServerEvent
-        ? Parameters<RageFW_ServerEventCallbackCustom<K>>
+        ? Parameters<RageFW_ICustomServerEvent[K]>
         : K extends keyof IServerEvents
-          ? Parameters<RageFW_ServerEventCallbackNative<K>>
+          ? Parameters<IServerEvents[K]>
           : never
 
 /**
@@ -51,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>
 
 /**
@@ -61,4 +63,12 @@ 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,
+> = keyof RageFW_ICustomClientEvent extends never
+    ? false
+    : Parameters<RageFW_ICustomServerEvent[EventName]>[0] extends undefined
+      ? false
+      : true

shared-types/package.json

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