v0.0.21-alpha.0

cef/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rage-fw-cef",
-    "version": "0.0.17-alpha.0",
+    "version": "0.0.21-alpha.0",
     "main": "dist/index.js",
     "types": "dist/src/index.d.ts",
     "files": [
@@ -10,11 +10,11 @@
         "build": "tsup"
     },
     "dependencies": {
-        "rage-fw-shared-types": "workspace:^",
         "rage-rpc": "^0.4.0"
     },
     "peerDependencies": {
-        "@ragempcommunity/types-cef": "^2.1.8"
+        "@ragempcommunity/types-cef": "^2.1.8",
+        "rage-fw-shared-types": "workspace:^"
     },
     "keywords": [],
     "author": "SashaGoncharov19",

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,45 +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'
-
-export type RageFW_CefEvent = keyof RageFW_ICustomCefEvent
-export type RageFW_ServerEvent = keyof RageFW_ICustomServerEvent
-export type RageFW_ClientEvent = keyof RageFW_ICustomClientEvent
-
-export type RageFW_CefArguments<K extends RageFW_CefEvent> = Parameters<
-    RageFW_ICustomCefEvent[K]
->
-
-export type RageFW_CefReturn<K extends RageFW_CefEvent> = ReturnType<
-    RageFW_ICustomCefEvent[K]
->
-
-export type RageFW_CefCallback<K extends keyof RageFW_ICustomCefEvent> = (
-    args: RageFW_CefArguments<K>,
-) => RageFW_CefReturn<K>
-
-export type RageFW_ServerArguments<K extends RageFW_ServerEvent> = Parameters<
-    RageFW_ICustomServerEvent[K]
->
-
-export type RageFW_ServerReturn<K extends RageFW_ServerEvent> = ReturnType<
-    RageFW_ICustomServerEvent[K]
->
-
-export type RageFW_ClientArguments<K extends RageFW_ClientEvent> = Parameters<
-    RageFW_ICustomClientEvent[K]
->
-
-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.17-alpha.0",
+    "version": "0.0.21-alpha.0",
     "main": "dist/index.js",
     "types": "dist/src/index.d.ts",
     "files": [
@@ -10,11 +10,11 @@
         "build": "tsup"
     },
     "dependencies": {
-        "rage-fw-shared-types": "workspace:^",
         "rage-rpc": "^0.4.0"
     },
     "peerDependencies": {
-        "@ragempcommunity/types-client": "^2.1.8"
+        "@ragempcommunity/types-client": "^2.1.8",
+        "rage-fw-shared-types": "workspace:^"
     },
     "keywords": [],
     "author": "SashaGoncharov19",

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

@@ -2,16 +2,40 @@
 
 import 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 for an event, name of which you pass as a generic
+ * These only include custom events
+ */
 export type RageFW_ClientEventArguments<K extends RageFW_ClientEvent> =
     Parameters<RageFW_ICustomClientEvent[K]>
 
+/**
+ * Callback (function) for an event, name of which you pass as a generic
+ * These only include custom events
+ */
 export type RageFW_ClientEventCallback<K extends RageFW_ClientEvent> = (
     args: RageFW_ClientEventArguments<K>,
 ) => RageFW_ClientEventReturn<K>
 
+/**
+ * Return type for an event, name of which you pass as a generic
+ * These only include custom events
+ */
 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,16 +1,39 @@
 /// <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
+ * These only include custom events
+ */
 export type RageFW_ClientServerEvent = keyof RageFW_ICustomServerEvent
 
+/**
+ * Array of arguments for an event, name of which you pass as a generic
+ * These only include custom events
+ */
 export type RageFW_ClientServerEventArguments<
     K extends RageFW_ClientServerEvent,
 > = K extends keyof RageFW_ICustomServerEvent
     ? Parameters<RageFW_ICustomServerEvent[K]>
     : never
 
+/**
+ * Return type for an event, name of which you pass as a generic
+ * These only include custom events
+ */
 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.17-alpha.0",
+    "version": "0.0.21-alpha.0",
     "npmClient": "pnpm"
 }

pnpm-lock.yaml

@@ -33,7 +33,7 @@ importers:
                 version: 8.1.3([email protected])
             prettier:
                 specifier: ^3.3.1
-                version: 3.3.1
+                version: 3.3.2
             rage-rpc:
                 specifier: ^0.4.0
                 version: 0.4.0
@@ -543,112 +543,112 @@ packages:
             }
         engines: { node: ^16.14.0 || >=18.0.0 }
 
-    '@nrwl/[email protected].2':
+    '@nrwl/[email protected].3':
         resolution:
             {
-                integrity: sha512-NWB3OAm6/oHaF2h7isUXpK9J2XF097mfaiENHj1GzH9JwjB2YoFaD7v033er6+Hb6FEZtOPZpVH1kEQjVaYJLA==,
+                integrity: sha512-OL6sc70gR/USasvbYzyYY44Hd5ZCde2UfiA5h8VeAYAJbq+JmtscpvjcnZ7OIsXyYEOxe1rypULElqu/8qpKzQ==,
             }
 
-    '@nrwl/[email protected].2':
+    '@nrwl/[email protected].3':
         resolution:
             {
-                integrity: sha512-G/m3EGXf3m9rM2sQQGpRPD40gfaWR6jFVCsZW66/6FXDo1dMUH5/U5JOBnD6vBdug8txKA1ceWHM74NkAB1QEg==,
+                integrity: sha512-vwo6ogcy6A9vJggDOsHGi1F0cTRqSqRypbgq/EdNuZqL7rGyZB/ctId69/i8dV6cLkl8BJG/4WpEe5BIrMTsjA==,
             }
         hasBin: true
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         resolution:
             {
-                integrity: sha512-6y+th5m1qVc+B0lXmKb3WRcfwNYD2B/bqGn1HiKLu8g6DDVJFn0mT+a872e4OtvgHyubZQm3HnPfjXobChpRuw==,
+                integrity: sha512-if1WwRVexrQBBADObEcxVIivq4QRZWY/nYRhCQy/qfFI6Cu2jBSI6ZQ1uy7to2L2sQPLgn8v2beQZiAeZdIktg==,
             }
         peerDependencies:
             nx: '>= 17 <= 20'
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         resolution:
             {
-                integrity: sha512-AgvsZ0iDA0rklH0TqOIiTrbJysn7WfFFzhLYd1JnxS2Z3GAFPRoE6TxRSSqpTBmFqskrZhZyrjHllOoBD5odFQ==,
+                integrity: sha512-1beJscdMraGgLHpvjyC5FXUzpdQYW8JwnPK0Yj9iti9Vnahtx3PLQHCFOFwoE0KZF9VEL1KsZSSVPljMgW/j+g==,
             }
         engines: { node: '>= 10' }
         cpu: [arm64]
         os: [darwin]
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         resolution:
             {
-                integrity: sha512-YPd9Kmn5/YPYolBVYoficQmp8LFTe/PAI3dQ3NebOGFYw49PFmV0cdB8+4m0q70WCBMwyqo1x6a6MO9CvENkTg==,
+                integrity: sha512-wCpIRThGKL/FebPe+WaFk/V6nk31mMc83APoEyhyS5kAodqeKjb6iPud+QNydtUJ/jsF9aQ/DaHIioKC9wbg8A==,
             }
         engines: { node: '>= 10' }
         cpu: [x64]
         os: [darwin]
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         resolution:
             {
-                integrity: sha512-43hMzFmYyi0aEiGa/VNXChzotL6nFG9hLSZhtpXAO6qyibSqKwlU5PjNyly/7y5gUGl7YfmdpwWwlOIYPSQoVw==,
+                integrity: sha512-ytY18USCyf83wqyUgFaeRO/3zvysJXPJf1Di8czBhiUSroSMB6088OaeqW7SnzdcYNdACZUv0Q6PupXpx3w2Ng==,
             }
         engines: { node: '>= 10' }
         cpu: [x64]
         os: [freebsd]
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         resolution:
             {
-                integrity: sha512-locP8QQWI4NFb7kVe8Fflkpdnf9kw5o/WMROILJLFWlTy59K+NBQkpxRIhoUghJ6yckDxk1Kf2kmvV+xuX4f8Q==,
+                integrity: sha512-FPtqIMzdOzYSSDnLXUpcrflqEsNe6UgpAgYoHLVbWiR47O3qJnpQRDfYUsP7Lv+2C0CBKNXgwPEvmDLXKHcfYg==,
             }
         engines: { node: '>= 10' }
         cpu: [arm]
         os: [linux]
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         resolution:
             {
-                integrity: sha512-uQUZs+56yplEjokgCC3Pv/nUr4v+/bCurc1v/juUH4byqCdvi+Cny7jqws49UELS+QkcTkWGBtajvf8U3JZEbQ==,
+                integrity: sha512-VOuzPD5FBPZmctvXqdB9K1MYVzkV8TgOZFS7Md6ClH7UwJTEOjnMoomYCMM1VlOZV4P0S5E0u/Zere5YWh+ZWw==,
             }
         engines: { node: '>= 10' }
         cpu: [arm64]
         os: [linux]
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         resolution:
             {
-                integrity: sha512-rU6l18ubh0Chv7lkxshgm6o4IKduB+jztUBRR4SuOuTOLJ6okm51AqzdY+vy7esicEL3HnHWSJP/U5PwoAaNsA==,
+                integrity: sha512-qd6QZysktt0D7rNCOlBaV3ME0/J0VwvC1cmdjtZoljwtsX6Zc56AEdfwsgGzsZNU4w+N+BtXxowan3D44iiSzQ==,
             }
         engines: { node: '>= 10' }
         cpu: [arm64]
         os: [linux]
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         resolution:
             {
-                integrity: sha512-rvGP3p0qmzHJu8cUcYnRDyJ1BkVExgmsWmtzyQrHl48+hvNrq805NrP3gTreOxqymRlBEXg7c22fRECI1CV1lA==,
+                integrity: sha512-wE08BstTD65dt6c+9L9bEp98PxFwc7CuaUVX2cZTDFAERBXCMhu7y6Gb1JbiAvfVci4+yLrm+h0E1ieY1wMTXw==,
             }
         engines: { node: '>= 10' }
         cpu: [x64]
         os: [linux]
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         resolution:
             {
-                integrity: sha512-86pfT+z6SWKlJUoRy7MOMjRhrCPgSnAxbcH7jYCkqhokbCIDIv2IFWqMf0zdUqa8HqjRo13X6Jd6PhNYzWwJzw==,
+                integrity: sha512-IA09+NZ0kKPSfK/dXsyjZ8TN+hN/1PcnbdNuUCn1Opmbrdda9GBfzHSDFKXxoA6TVB/j/qnXHKgKxhhVH05TGg==,
             }
         engines: { node: '>= 10' }
         cpu: [x64]
         os: [linux]
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         resolution:
             {
-                integrity: sha512-kJ3G0+nyAgBr5RTkNceC9zl2pekFEu0ec6ceLJ0tfcTwil76Ce3Xnlr0CFFNsre4T1v2RfFIDJL3EaRUXYep0w==,
+                integrity: sha512-fkbcTp+XuxGaL5e4Ve8AjxNEim5Ifdn61ofaxEDMoGjauKvKZBejbLhBFOonCKDqntXsY8D2nDXjhcsdNYxzMg==,
             }
         engines: { node: '>= 10' }
         cpu: [arm64]
         os: [win32]
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         resolution:
             {
-                integrity: sha512-9KKGYFgWfc4jHzHjnIp+DJt750NyG1kA4Q+DWf/UcFA5917UWuAw9rribFPRsqYkcwbu++Uajw5bI5yMLP7ThA==,
+                integrity: sha512-E2q3c504xjFXTY+/iq57DOZmS6CPA8RbFwLf6bCG5wo2BDajxmvU3VCeCSkxqXEwCY7NJSI3PT1V/3vRDzJ3lQ==,
             }
         engines: { node: '>= 10' }
         cpu: [x64]
@@ -2197,6 +2197,13 @@ packages:
             }
         engines: { node: '>=10' }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==,
+            }
+        engines: { node: '>=10' }
+
     [email protected]:
         resolution:
             {
@@ -2444,6 +2451,13 @@ packages:
             }
         engines: { node: '>=10' }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==,
+            }
+        engines: { node: '>=10' }
+
     [email protected]:
         resolution:
             {
@@ -2924,6 +2938,13 @@ packages:
             }
         engines: { node: '>=8' }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==,
+            }
+        engines: { node: '>=8' }
+
     [email protected]:
         resolution:
             {
@@ -3393,6 +3414,12 @@ packages:
                 integrity: sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==,
             }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==,
+            }
+
     [email protected]:
         resolution:
             {
@@ -3768,10 +3795,10 @@ packages:
         engines: { node: ^12.13.0 || ^14.15.0 || >=16.0.0 }
         deprecated: This package is no longer supported.
 
-    [email protected].2:
+    [email protected].3:
         resolution:
             {
-                integrity: sha512-Tg3REVykwKmVBCsroeCE/KhHAJx3e/m0FgNZWXJhn3EEh01qhdsVfWpM/ecawin73or7YcvB/99S8vVPU1nczg==,
+                integrity: sha512-SvxFgk9PD2m6tXEaqB6DENOpe4jhov/Ili/2JmOnPAAIGUR6H9WajCzVuHfq3bvQxmGRvkQQRv/rfvAuLTme3g==,
             }
         hasBin: true
         peerDependencies:
@@ -4129,10 +4156,10 @@ packages:
             }
         engines: { node: '>= 0.8.0' }
 
-    [email protected].1:
+    [email protected].2:
         resolution:
             {
-                integrity: sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==,
+                integrity: sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==,
             }
         engines: { node: '>=14' }
         hasBin: true
@@ -5496,7 +5523,7 @@ snapshots:
     '@lerna/[email protected]([email protected])([email protected])':
         dependencies:
             '@npmcli/run-script': 7.0.2
-            '@nx/devkit': 19.2.2([email protected].2)
+            '@nx/devkit': 19.2.3([email protected].3)
             '@octokit/plugin-enterprise-rest': 6.0.1
             '@octokit/rest': 19.0.11([email protected])
             byte-size: 8.1.1
@@ -5533,7 +5560,7 @@ snapshots:
             npm-packlist: 5.1.1
             npm-registry-fetch: 14.0.5
             npmlog: 6.0.2
-            nx: 19.2.2
+            nx: 19.2.3
             p-map: 4.0.0
             p-map-series: 2.1.0
             p-queue: 6.6.2
@@ -5586,7 +5613,7 @@ snapshots:
             '@rushstack/terminal': 0.13.0
             '@rushstack/ts-command-line': 4.22.0
             lodash: 4.17.21
-            minimatch: 3.0.5
+            minimatch: 3.0.8
             resolve: 1.22.8
             semver: 7.5.4
             source-map: 0.6.1
@@ -5665,62 +5692,62 @@ snapshots:
         transitivePeerDependencies:
             - supports-color
 
-    '@nrwl/[email protected].2([email protected].2)':
+    '@nrwl/[email protected].3([email protected].3)':
         dependencies:
-            '@nx/devkit': 19.2.2([email protected].2)
+            '@nx/devkit': 19.2.3([email protected].3)
         transitivePeerDependencies:
             - nx
 
-    '@nrwl/[email protected].2':
+    '@nrwl/[email protected].3':
         dependencies:
-            nx: 19.2.2
+            nx: 19.2.3
             tslib: 2.6.3
         transitivePeerDependencies:
             - '@swc-node/register'
             - '@swc/core'
             - debug
 
-    '@nx/[email protected].2([email protected].2)':
+    '@nx/[email protected].3([email protected].3)':
         dependencies:
-            '@nrwl/devkit': 19.2.2([email protected].2)
+            '@nrwl/devkit': 19.2.3([email protected].3)
             ejs: 3.1.10
             enquirer: 2.3.6
             ignore: 5.3.1
             minimatch: 9.0.3
-            nx: 19.2.2
+            nx: 19.2.3
             semver: 7.6.2
             tmp: 0.2.3
             tslib: 2.6.3
             yargs-parser: 21.1.1
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         optional: true
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         optional: true
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         optional: true
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         optional: true
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         optional: true
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         optional: true
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         optional: true
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         optional: true
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         optional: true
 
-    '@nx/[email protected].2':
+    '@nx/[email protected].3':
         optional: true
 
     '@octokit/[email protected]': {}
@@ -6685,6 +6712,18 @@ snapshots:
             signal-exit: 3.0.7
             strip-final-newline: 2.0.0
 
+    [email protected]:
+        dependencies:
+            cross-spawn: 7.0.3
+            get-stream: 6.0.1
+            human-signals: 2.1.0
+            is-stream: 2.0.1
+            merge-stream: 2.0.0
+            npm-run-path: 4.0.1
+            onetime: 5.1.2
+            signal-exit: 3.0.7
+            strip-final-newline: 2.0.0
+
     [email protected]: {}
 
     [email protected]:
@@ -6825,6 +6864,8 @@ snapshots:
 
     [email protected]: {}
 
+    [email protected]: {}
+
     [email protected]:
         dependencies:
             dargs: 7.0.0
@@ -7116,6 +7157,8 @@ snapshots:
 
     [email protected]: {}
 
+    [email protected]: {}
+
     [email protected]:
         dependencies:
             text-extensions: 1.9.0
@@ -7143,13 +7186,13 @@ snapshots:
     [email protected]:
         dependencies:
             async: 3.2.5
-            chalk: 4.1.2
+            chalk: 4.1.0
             filelist: 1.0.4
             minimatch: 3.1.2
 
     [email protected]:
         dependencies:
-            chalk: 4.1.2
+            chalk: 4.1.0
             diff-sequences: 29.6.3
             jest-get-type: 29.6.3
             pretty-format: 29.7.0
@@ -7217,7 +7260,7 @@ snapshots:
         dependencies:
             '@lerna/create': 8.1.3([email protected])([email protected])
             '@npmcli/run-script': 7.0.2
-            '@nx/devkit': 19.2.2([email protected].2)
+            '@nx/devkit': 19.2.3([email protected].3)
             '@octokit/plugin-enterprise-rest': 6.0.1
             '@octokit/rest': 19.0.11([email protected])
             byte-size: 8.1.1
@@ -7260,7 +7303,7 @@ snapshots:
             npm-packlist: 5.1.1
             npm-registry-fetch: 14.0.5
             npmlog: 6.0.2
-            nx: 19.2.2
+            nx: 19.2.3
             p-map: 4.0.0
             p-map-series: 2.1.0
             p-pipe: 3.1.0
@@ -7474,6 +7517,10 @@ snapshots:
         dependencies:
             brace-expansion: 1.1.11
 
+    [email protected]:
+        dependencies:
+            brace-expansion: 1.1.11
+
     [email protected]:
         dependencies:
             brace-expansion: 1.1.11
@@ -7564,7 +7611,7 @@ snapshots:
             array-differ: 3.0.0
             array-union: 2.1.0
             arrify: 2.0.1
-            minimatch: 3.1.2
+            minimatch: 3.0.5
 
     [email protected]: {}
 
@@ -7729,14 +7776,14 @@ snapshots:
             gauge: 4.0.4
             set-blocking: 2.0.0
 
-    [email protected].2:
+    [email protected].3:
         dependencies:
-            '@nrwl/tao': 19.2.2
+            '@nrwl/tao': 19.2.3
             '@yarnpkg/lockfile': 1.1.0
             '@yarnpkg/parsers': 3.0.0-rc.46
             '@zkochan/js-yaml': 0.0.7
             axios: 1.7.2
-            chalk: 4.1.2
+            chalk: 4.1.0
             cli-cursor: 3.1.0
             cli-spinners: 2.6.1
             cliui: 8.0.1
@@ -7766,16 +7813,16 @@ snapshots:
             yargs: 17.7.2
             yargs-parser: 21.1.1
         optionalDependencies:
-            '@nx/nx-darwin-arm64': 19.2.2
+            '@nx/nx-darwin-arm64': 19.2.3
-            '@nx/nx-darwin-x64': 19.2.2
+            '@nx/nx-darwin-x64': 19.2.3
-            '@nx/nx-freebsd-x64': 19.2.2
+            '@nx/nx-freebsd-x64': 19.2.3
-            '@nx/nx-linux-arm-gnueabihf': 19.2.2
+            '@nx/nx-linux-arm-gnueabihf': 19.2.3
-            '@nx/nx-linux-arm64-gnu': 19.2.2
+            '@nx/nx-linux-arm64-gnu': 19.2.3
-            '@nx/nx-linux-arm64-musl': 19.2.2
+            '@nx/nx-linux-arm64-musl': 19.2.3
-            '@nx/nx-linux-x64-gnu': 19.2.2
+            '@nx/nx-linux-x64-gnu': 19.2.3
-            '@nx/nx-linux-x64-musl': 19.2.2
+            '@nx/nx-linux-x64-musl': 19.2.3
-            '@nx/nx-win32-arm64-msvc': 19.2.2
+            '@nx/nx-win32-arm64-msvc': 19.2.3
-            '@nx/nx-win32-x64-msvc': 19.2.2
+            '@nx/nx-win32-x64-msvc': 19.2.3
         transitivePeerDependencies:
             - debug
 
@@ -7811,7 +7858,7 @@ snapshots:
     [email protected]:
         dependencies:
             bl: 4.1.0
-            chalk: 4.1.2
+            chalk: 4.1.0
             cli-cursor: 3.1.0
             cli-spinners: 2.6.1
             is-interactive: 1.0.0
@@ -7980,7 +8027,7 @@ snapshots:
 
     [email protected]: {}
 
-    [email protected].1: {}
+    [email protected].2: {}
 
     [email protected]:
         dependencies:
@@ -8447,7 +8494,7 @@ snapshots:
             chokidar: 3.6.0
             debug: 4.3.5
             esbuild: 0.21.5
-            execa: 5.0.0
+            execa: 5.1.1
             globby: 11.1.0
             joycon: 3.1.1
             postcss-load-config: 4.0.2
@@ -8583,7 +8630,7 @@ snapshots:
             '@colors/colors': 1.6.0
             '@dabh/diagnostics': 2.0.3
             async: 3.2.5
-            is-stream: 2.0.0
+            is-stream: 2.0.1
             logform: 2.6.0
             one-time: 1.0.0
             readable-stream: 3.6.2

readme.md

@@ -0,0 +1,20 @@
+# Rage Framework (RageFW)
+RageFW is a type-safe framework for developing Rage:MP servers. Designed with developers in mind, RageFW brings structure and efficiency to your Rage:MP servers, ensuring robust and maintainable code
+
+## Features
+ - **Type-Safe Development:** Eliminate runtime errors and enhance code reliability with RageFW comprehensive type safety, making your RP server's development smoother than a Sunday drive through Los Santos
+
+ - **Wrapped RPC client:** Communicate effortlessly between server, client and cef with RPC system, wrapped in a cozy custom-typed blanket for your peace of mind
+
+ - **Logging System:** Keep track of server activities and debug like a pro with our built-in, feature-rich logging system. After all, even virtual cops need evidence
+
+## Getting Started
+*soon*
+
+## Contributing
+Join our community of developers and contribute to the ongoing development of RageFW. At the moment the only way to contribute is opening issues 
+
+## Support
+Need help? Reach out via our community forums or contact us directly through our support channels. We're committed to help you as we can
+
+> *RageFW - because in the world of GTA:RP, nobody has time for type errors*

server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rage-fw-server",
-    "version": "0.0.17-alpha.0",
+    "version": "0.0.21-alpha.0",
     "main": "dist/index.js",
     "types": "dist/src/index.d.ts",
     "files": [
@@ -10,11 +10,11 @@
         "build": "tsup"
     },
     "dependencies": {
-        "rage-fw-shared-types": "workspace:^",
         "rage-rpc": "^0.4.0"
     },
     "peerDependencies": {
-        "@ragempcommunity/types-server": "^2.1.8"
+        "@ragempcommunity/types-server": "^2.1.8",
+        "rage-fw-shared-types": "workspace:^"
     },
     "keywords": [],
     "author": "SashaGoncharov19",

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,
@@ -99,9 +105,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 +119,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 +144,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

@@ -2,14 +2,34 @@
 
 import 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
 
-export type RageFW_ClientEventArguments<K extends RageFW_ClientEvent> =
+/**
+ * Array of arguments of an event you pass as a generic
+ * These only include custom events
+ */
+export type RageFW_ServerClientEventArguments<K extends RageFW_ClientEvent> =
     K extends RageFW_ClientEvent
         ? Parameters<RageFW_ICustomClientEvent[K]>
         : never
 
-export type RageFW_ClientEventReturn<K extends RageFW_ClientEvent> =
+/**
+ * Return type of event you pass as a generic
+ * These only include custom events
+ */
+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,19 +1,34 @@
 /// <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'
 
+/**
+ * Union of all available server event names
+ * These also include system events
+ */
 export type RageFW_ServerEvent =
     | keyof RageFW_ICustomServerEvent
     | keyof IServerEvents
 
+/**
+ * Array of arguments for an event, name of which you pass as a generic
+ * These also include system events
+ */
 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
 
+/**
+ * Callback (function) for an event, name of which you pass as a generic
+ * These include system and custom events
+ */
 export type RageFW_ServerEventCallback<K extends RageFW_ServerEvent> =
     K extends keyof RageFW_ICustomServerEvent
         ? RageFW_ServerEventCallbackCustom<K>
@@ -21,6 +36,10 @@ export type RageFW_ServerEventCallback<K extends RageFW_ServerEvent> =
           ? RageFW_ServerEventCallbackNative<K>
           : never
 
+/**
+ * Return type for an event, name of which you pass as a generic
+ * These include system and custom events
+ */
 export type RageFW_ServerEventReturn<K extends RageFW_ServerEvent> =
     K extends keyof RageFW_ICustomServerEvent
         ? ReturnType<RageFW_ICustomServerEvent[K]>
@@ -28,6 +47,10 @@ export type RageFW_ServerEventReturn<K extends RageFW_ServerEvent> =
           ? ReturnType<IServerEvents[K]>
           : never
 
+/**
+ * Array of arguments for an event, name of which you pass as a generic
+ * These only include custom events
+ */
 export type RageFW_ServerEventCallbackCustom<
     K extends keyof RageFW_ICustomServerEvent = keyof RageFW_ICustomServerEvent,
 > = (
@@ -35,6 +58,18 @@ export type RageFW_ServerEventCallbackCustom<
     args: RageFW_ServerEventArguments<K>,
 ) => RageFW_ServerEventReturn<K>
 
+/**
+ * Array of arguments for an event, name of which you pass as a generic
+ * These only include system events
+ */
 export type RageFW_ServerEventCallbackNative<
     K extends keyof IServerEvents = keyof IServerEvents,
 > = 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.17-alpha.0",
+    "version": "0.0.21-alpha.0",
     "types": "types/types/index.d.ts",
     "files": [
         "types/**/*"

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

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