v0.0.17-alpha.0

cef/package.json

@@ -0,0 +1,23 @@
+{
+    "name": "rage-fw-cef",
+    "version": "0.0.17-alpha.0",
+    "main": "dist/index.js",
+    "types": "dist/src/index.d.ts",
+    "files": [
+        "dist/**/*"
+    ],
+    "scripts": {
+        "build": "tsup"
+    },
+    "dependencies": {
+        "rage-fw-shared-types": "workspace:^",
+        "rage-rpc": "^0.4.0"
+    },
+    "peerDependencies": {
+        "@ragempcommunity/types-cef": "^2.1.8"
+    },
+    "keywords": [],
+    "author": "SashaGoncharov19",
+    "license": "MIT",
+    "description": "CEF side for rage-fw"
+}

cef/src/index.ts

@@ -0,0 +1,48 @@
+import rpc from 'rage-rpc'
+
+import {
+    RageFW_CefArguments,
+    RageFW_CefCallback,
+    RageFW_CefReturn,
+    RageFW_ClientArguments,
+    RageFW_ClientReturn,
+    RageFW_ServerArguments,
+    RageFW_ServerReturn,
+    RageFW_ICustomCefEvent,
+    RageFW_ICustomClientEvent,
+    RageFW_ICustomServerEvent,
+} from './types'
+
+class Cef {
+    public register<EventName extends keyof RageFW_ICustomCefEvent>(
+        eventName: EventName,
+        callback: RageFW_CefCallback<EventName>,
+    ): void {
+        rpc.register(eventName, callback)
+    }
+
+    public trigger<EventName extends keyof RageFW_ICustomCefEvent>(
+        eventName: EventName,
+        args: 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>,
+    ): Promise<RageFW_ServerReturn<EventName>> {
+        return rpc.callServer(eventName, args)
+    }
+
+    public triggerClient<EventName extends keyof RageFW_ICustomClientEvent>(
+        eventName: EventName,
+        args: RageFW_ClientArguments<EventName>,
+    ): Promise<RageFW_ClientReturn<EventName>> {
+        return rpc.callClient(eventName, args)
+    }
+}
+
+export const fw = {
+    event: new Cef(),
+}

cef/src/types/index.ts

@@ -0,0 +1,45 @@
+/// <reference types="@ragempcommunity/types-cef" />
+
+import type {
+    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/tsconfig.json

@@ -0,0 +1,25 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "display": "Base",
+  "exclude": [
+    "node_modules"
+  ],
+  "compilerOptions": {
+    "incremental": false,
+    "composite": false,
+    "target": "ES2022",
+    "experimentalDecorators": true,
+    "moduleDetection": "auto",
+    "module": "CommonJS",
+    "resolveJsonModule": true,
+    "declaration": false,
+    "declarationMap": false,
+    "sourceMap": false,
+    "downlevelIteration": false,
+    "inlineSourceMap": false,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true
+  }
+}

cef/tsup.config.ts

@@ -0,0 +1,12 @@
+import { defineConfig } from 'tsup'
+
+export default defineConfig({
+    entry: ['src/index.ts'],
+    outDir: './dist',
+    format: ['cjs'],
+    noExternal: ['rage-rpc'],
+    experimentalDts: true,
+    splitting: false,
+    sourcemap: false,
+    clean: true,
+})

client/package.json

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

client/src/index.ts

@@ -1,12 +1,17 @@
 import rpc from 'rage-rpc'
 
-import type {
+import Logger from './logger'
+
+import {
     RageFW_ClientEventCallback,
     RageFW_ClientEvent,
     RageFW_ClientServerEvent,
     RageFW_ClientServerEventArguments,
     RageFW_ClientServerEventReturn,
+    RageFW_ClientEventArguments,
+    RageFW_ClientEventReturn,
 } from './types'
+import type { RageFW_ICustomClientEvent } from 'rage-fw-shared-types'
 
 class Client {
     public register<EventName extends RageFW_ClientEvent>(
@@ -17,6 +22,19 @@ class Client {
             return callback(data)
         })
     }
+
+    public unregister<EventName extends RageFW_ClientEvent>(
+        eventName: EventName,
+    ): 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 {
@@ -31,7 +49,7 @@ class Player {
 export const fw = {
     event: new Client(),
     player: new Player(),
+    system: {
+        log: new Logger(),
+    },
 }
-
-fw.player.triggerServer('customServerEvent', ['wer'])
-fw.event.register('customClientEvent', ([arg1]) => true)

client/src/logger.ts

@@ -0,0 +1,19 @@
+export default class Logger {
+    public error(message: unknown) {
+        mp.console.logError(
+            `[${new Date().toLocaleTimeString()}] [ERROR] ${message}`,
+        )
+    }
+
+    public warn(message: unknown) {
+        mp.console.logWarning(
+            `[${new Date().toLocaleTimeString()}] [WARN] ${message}`,
+        )
+    }
+
+    public info(message: unknown) {
+        mp.console.logInfo(
+            `[${new Date().toLocaleTimeString()}] [INFO] ${message}`,
+        )
+    }
+}

client/src/types/client.ts

@@ -4,8 +4,11 @@ import type { RageFW_ICustomClientEvent } from 'rage-fw-shared-types'
 
 export type RageFW_ClientEvent = keyof RageFW_ICustomClientEvent
 
+export type RageFW_ClientEventArguments<K extends RageFW_ClientEvent> =
+    Parameters<RageFW_ICustomClientEvent[K]>
+
 export type RageFW_ClientEventCallback<K extends RageFW_ClientEvent> = (
-    args: Parameters<RageFW_ICustomClientEvent[K]>,
+    args: RageFW_ClientEventArguments<K>,
 ) => RageFW_ClientEventReturn<K>
 
 export type RageFW_ClientEventReturn<K extends RageFW_ClientEvent> =

client/tsconfig.json

@@ -9,7 +9,6 @@
     "composite": false,
     "target": "ES2022",
     "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
     "moduleDetection": "auto",
     "module": "CommonJS",
     "resolveJsonModule": true,

client/tsup.config.ts

@@ -5,7 +5,7 @@ export default defineConfig({
     outDir: './dist',
     format: ['cjs'],
     noExternal: ['rage-rpc'],
-    dts: true,
+    experimentalDts: true,
     splitting: false,
     sourcemap: false,
     clean: true,

lerna.json

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

package.json

@@ -17,10 +17,8 @@
     "prettier": "^3.3.1",
     "rage-rpc": "^0.4.0",
     "tsup": "^8.1.0",
-    "typescript": "^5.4.5"
+    "typescript": "^5.4.5",
+    "winston": "^3.13.0"
   },
-  "type": "module",
-  "devDependencies": {
-
-  }
+  "type": "module"
 }

pnpm-lock.yaml

@@ -43,6 +43,21 @@ importers:
             typescript:
                 specifier: ^5.4.5
                 version: 5.4.5
+            winston:
+                specifier: ^3.13.0
+                version: 3.13.0
+
+    cef:
+        dependencies:
+            '@ragempcommunity/types-cef':
+                specifier: ^2.1.8
+                version: 2.1.8
+            rage-fw-shared-types:
+                specifier: workspace:^
+                version: link:../shared-types
+            rage-rpc:
+                specifier: ^0.4.0
+                version: 0.4.0
 
     client:
         dependencies:
@@ -68,8 +83,6 @@ importers:
                 specifier: ^0.4.0
                 version: 0.4.0
 
-    shared: {}
-
     shared-types: {}
 
 packages:
@@ -94,6 +107,19 @@ packages:
             }
         engines: { node: '>=6.9.0' }
 
+    '@colors/[email protected]':
+        resolution:
+            {
+                integrity: sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==,
+            }
+        engines: { node: '>=0.1.90' }
+
+    '@dabh/[email protected]':
+        resolution:
+            {
+                integrity: sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==,
+            }
+
     '@esbuild/[email protected]':
         resolution:
             {
@@ -1061,6 +1087,12 @@ packages:
                 integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==,
             }
 
+    '@types/[email protected]':
+        resolution:
+            {
+                integrity: sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==,
+            }
+
     '@typescript-eslint/[email protected]':
         resolution:
             {
@@ -1694,6 +1726,12 @@ packages:
                 integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==,
             }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==,
+            }
+
     [email protected]:
         resolution:
             {
@@ -1701,6 +1739,18 @@ packages:
             }
         hasBin: true
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==,
+            }
+
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==,
+            }
+
     [email protected]:
         resolution:
             {
@@ -1988,6 +2038,12 @@ packages:
                 integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==,
             }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==,
+            }
+
     [email protected]:
         resolution:
             {
@@ -2185,6 +2241,12 @@ packages:
                 integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==,
             }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==,
+            }
+
     [email protected]:
         resolution:
             {
@@ -2253,6 +2315,12 @@ packages:
                 integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==,
             }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==,
+            }
+
     [email protected]:
         resolution:
             {
@@ -2733,6 +2801,12 @@ packages:
                 integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==,
             }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==,
+            }
+
     [email protected]:
         resolution:
             {
@@ -3060,6 +3134,12 @@ packages:
             }
         engines: { node: '>=0.10.0' }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==,
+            }
+
     [email protected]:
         resolution:
             {
@@ -3182,6 +3262,13 @@ packages:
             }
         engines: { node: '>=10' }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-1ulHeNPp6k/LD8H91o7VYFBng5i1BDE7HoKxVbZiGFidS1Rj65qcywLxX+pVfAPoQJEjRdvKcusKwOupHCVOVQ==,
+            }
+        engines: { node: '>= 12.0.0' }
+
     [email protected]:
         resolution:
             {
@@ -3709,6 +3796,12 @@ packages:
                 integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==,
             }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==,
+            }
+
     [email protected]:
         resolution:
             {
@@ -4357,6 +4450,13 @@ packages:
                 integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==,
             }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==,
+            }
+        engines: { node: '>=10' }
+
     [email protected]:
         resolution:
             {
@@ -4441,6 +4541,12 @@ packages:
             }
         engines: { node: ^16.14.0 || >=18.0.0 }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==,
+            }
+
     [email protected]:
         resolution:
             {
@@ -4559,6 +4665,12 @@ packages:
             }
         engines: { node: ^12.13.0 || ^14.15.0 || >=16.0.0 }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==,
+            }
+
     [email protected]:
         resolution:
             {
@@ -4713,6 +4825,12 @@ packages:
             }
         engines: { node: '>=0.10' }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==,
+            }
+
     [email protected]:
         resolution:
             {
@@ -4791,6 +4909,13 @@ packages:
             }
         engines: { node: '>=8' }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==,
+            }
+        engines: { node: '>= 14.0.0' }
+
     [email protected]:
         resolution:
             {
@@ -5065,6 +5190,20 @@ packages:
                 integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==,
             }
 
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-ajBj65K5I7denzer2IYW6+2bNIVqLGDHqDw3Ow8Ohh+vdW+rv4MZ6eiDvHoKhfJFZ2auyN8byXieDDJ96ViONg==,
+            }
+        engines: { node: '>= 12.0.0' }
+
+    [email protected]:
+        resolution:
+            {
+                integrity: sha512-rwidmA1w3SE4j0E5MuIufFhyJPBDG7Nu71RkZor1p2+qHvJSZ9GYDA81AyleQcZbh/+V6HjeBdfnTZJm9rSeQQ==,
+            }
+        engines: { node: '>= 12.0.0' }
+
     [email protected]:
         resolution:
             {
@@ -5210,6 +5349,14 @@ snapshots:
             js-tokens: 4.0.0
             picocolors: 1.0.1
 
+    '@colors/[email protected]': {}
+
+    '@dabh/[email protected]':
+        dependencies:
+            colorspace: 1.1.4
+            enabled: 2.0.0
+            kuler: 2.0.0
+
     '@esbuild/[email protected]':
         optional: true
 
@@ -5827,6 +5974,8 @@ snapshots:
 
     '@types/[email protected]': {}
 
+    '@types/[email protected]': {}
+
     '@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])':
         dependencies:
             '@eslint-community/regexpp': 4.10.1
@@ -6219,8 +6368,23 @@ snapshots:
 
     [email protected]: {}
 
+    [email protected]:
+        dependencies:
+            color-name: 1.1.4
+            simple-swizzle: 0.2.2
+
     [email protected]: {}
 
+    [email protected]:
+        dependencies:
+            color-convert: 1.9.3
+            color-string: 1.9.1
+
+    [email protected]:
+        dependencies:
+            color: 3.2.1
+            text-hex: 1.0.0
+
     [email protected]:
         dependencies:
             strip-ansi: 6.0.1
@@ -6380,6 +6544,8 @@ snapshots:
 
     [email protected]: {}
 
+    [email protected]: {}
+
     [email protected]:
         dependencies:
             iconv-lite: 0.6.3
@@ -6545,6 +6711,8 @@ snapshots:
         dependencies:
             reusify: 1.0.4
 
+    [email protected]: {}
+
     [email protected]:
         dependencies:
             escape-string-regexp: 1.0.5
@@ -6585,6 +6753,8 @@ snapshots:
 
     [email protected]: {}
 
+    [email protected]: {}
+
     [email protected]: {}
 
     [email protected]:
@@ -6898,6 +7068,8 @@ snapshots:
 
     [email protected]: {}
 
+    [email protected]: {}
+
     [email protected]:
         dependencies:
             binary-extensions: 2.3.0
@@ -7039,6 +7211,8 @@ snapshots:
 
     [email protected]: {}
 
+    [email protected]: {}
+
     [email protected]([email protected]):
         dependencies:
             '@lerna/create': 8.1.3([email protected])([email protected])
@@ -7196,6 +7370,15 @@ snapshots:
             chalk: 4.1.2
             is-unicode-supported: 0.1.0
 
+    [email protected]:
+        dependencies:
+            '@colors/colors': 1.6.0
+            '@types/triple-beam': 1.3.5
+            fecha: 4.2.3
+            ms: 2.1.3
+            safe-stable-stringify: 2.4.3
+            triple-beam: 1.4.1
+
     [email protected]: {}
 
     [email protected]:
@@ -7602,6 +7785,10 @@ snapshots:
         dependencies:
             wrappy: 1.0.2
 
+    [email protected]:
+        dependencies:
+            fn.name: 1.1.0
+
     [email protected]:
         dependencies:
             mimic-fn: 2.1.0
@@ -7981,6 +8168,8 @@ snapshots:
 
     [email protected]: {}
 
+    [email protected]: {}
+
     [email protected]: {}
 
     [email protected]: {}
@@ -8028,6 +8217,10 @@ snapshots:
         transitivePeerDependencies:
             - supports-color
 
+    [email protected]:
+        dependencies:
+            is-arrayish: 0.3.2
+
     [email protected]: {}
 
     [email protected]: {}
@@ -8097,6 +8290,8 @@ snapshots:
         dependencies:
             minipass: 3.3.6
 
+    [email protected]: {}
+
     [email protected]: {}
 
     [email protected]:
@@ -8190,6 +8385,8 @@ snapshots:
 
     [email protected]: {}
 
+    [email protected]: {}
+
     [email protected]: {}
 
     [email protected]:
@@ -8227,6 +8424,8 @@ snapshots:
 
     [email protected]: {}
 
+    [email protected]: {}
+
     [email protected]([email protected]):
         dependencies:
             typescript: 5.4.5
@@ -8373,6 +8572,26 @@ snapshots:
         dependencies:
             string-width: 4.2.3
 
+    [email protected]:
+        dependencies:
+            logform: 2.6.0
+            readable-stream: 3.6.2
+            triple-beam: 1.4.1
+
+    [email protected]:
+        dependencies:
+            '@colors/colors': 1.6.0
+            '@dabh/diagnostics': 2.0.3
+            async: 3.2.5
+            is-stream: 2.0.0
+            logform: 2.6.0
+            one-time: 1.0.0
+            readable-stream: 3.6.2
+            safe-stable-stringify: 2.4.3
+            stack-trace: 0.0.10
+            triple-beam: 1.4.1
+            winston-transport: 4.7.0
+
     [email protected]: {}
 
     [email protected]: {}

pnpm-workspace.yaml

@@ -1,5 +1,5 @@
 packages:
   - "server"
   - "client"
-  - "shared"
+  - "cef"
   - "shared-types"

server/package.json

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

server/src/index.ts

@@ -1,14 +1,18 @@
 import rpc from 'rage-rpc'
 
-import type {
+import Logger from './logger'
+
+import {
     RageFW_ClientEvent,
     RageFW_ClientEventArguments,
     RageFW_ClientEventReturn,
     RageFW_ICustomServerEvent,
     RageFW_ServerEvent,
+    RageFW_ServerEventArguments,
     RageFW_ServerEventCallback,
     RageFW_ServerEventCallbackCustom,
     RageFW_ServerEventCallbackNative,
+    RageFW_ServerEventReturn,
 } from './types'
 import { nativeEvents } from './native.events'
 
@@ -23,10 +27,7 @@ class Server {
     ): void {
         rpc.register(
             eventName,
-            async (
-                args: Parameters<RageFW_ICustomServerEvent[EventName]>,
-                info,
-            ) => {
+            async (args: RageFW_ServerEventArguments<EventName>, info) => {
                 callback(info.player as PlayerMp, args)
             },
         )
@@ -51,7 +52,7 @@ class Server {
         } else {
             this.registerCustom(
                 eventName,
-                callback as RageFW_ServerEventCallbackCustom,
+                callback as unknown as RageFW_ServerEventCallbackCustom,
             )
         }
     }
@@ -69,12 +70,41 @@ class Server {
                 } else {
                     this.registerCustom(
                         eventName as keyof RageFW_ICustomServerEvent,
-                        callback as RageFW_ServerEventCallbackCustom,
+                        callback as unknown as RageFW_ServerEventCallbackCustom,
                     )
                 }
             },
         )
     }
+
+    private unregisterCustom<EventName extends keyof RageFW_ICustomServerEvent>(
+        eventName: EventName,
+    ): void {
+        rpc.unregister(eventName)
+    }
+
+    private unregisterNative<EventName extends keyof IServerEvents>(
+        eventName: EventName,
+    ): void {
+        mp.events.remove(eventName)
+    }
+
+    public unregister<EventName extends RageFW_ServerEvent>(
+        eventName: EventName,
+    ): void {
+        if (this.isNativeEvent(eventName)) {
+            this.unregisterNative(eventName)
+        } else {
+            this.unregisterCustom(eventName)
+        }
+    }
+
+    private trigger<EventName extends keyof RageFW_ICustomServerEvent>(
+        eventName: EventName,
+        args: RageFW_ServerEventArguments<EventName>,
+    ): Promise<RageFW_ServerEventReturn<EventName>> {
+        return rpc.call<RageFW_ServerEventReturn<EventName>>(eventName, args)
+    }
 }
 
 class Player {
@@ -90,11 +120,7 @@ class Player {
 export const fw = {
     event: new Server(),
     player: new Player(),
+    system: {
+        log: new Logger(),
+    },
 }
-
-fw.event.register('customServerEvent', (player, args) => true)
-fw.event.register('playerDeath', (player, args, killer) => {})
-
-fw.event.registerMany({
-    trailerAttached: (vehicle, trailer) => undefined,
-})

server/src/logger.ts

@@ -0,0 +1,36 @@
+import winston, { format } from 'winston'
+const { timestamp, printf, colorize } = format
+
+export default class Logger {
+    private format = printf(({ message, level, timestamp }) => {
+        return `[${new Date(timestamp).toLocaleTimeString()}] [${level}]: ${message}`
+    })
+
+    private systemLogger = winston.createLogger({
+        transports: [new winston.transports.Console()],
+        format: format.combine(
+            colorize({
+                level: true,
+                colors: {
+                    error: 'red',
+                    warn: 'yellow',
+                    info: 'white',
+                },
+            }),
+            timestamp(),
+            this.format,
+        ),
+    })
+
+    public info(message: unknown) {
+        this.systemLogger.info(message)
+    }
+
+    public warn(message: unknown) {
+        this.systemLogger.warn(message)
+    }
+
+    public error(message: unknown) {
+        this.systemLogger.error(message)
+    }
+}

server/src/types/server.ts

@@ -7,16 +7,12 @@ export type RageFW_ServerEvent =
     | keyof RageFW_ICustomServerEvent
     | keyof IServerEvents
 
-export type RageFW_ServerEventCallbackCustom<
-    K extends keyof RageFW_ICustomServerEvent = keyof RageFW_ICustomServerEvent,
-> = (
-    player: PlayerMp,
-    args: Parameters<RageFW_ICustomServerEvent[K]>,
-) => ReturnType<RageFW_ICustomServerEvent[K]>
-
-export type RageFW_ServerEventCallbackNative<
-    K extends keyof IServerEvents = keyof IServerEvents,
-> = IServerEvents[K]
+export type RageFW_ServerEventArguments<K extends RageFW_ServerEvent> =
+    K extends keyof RageFW_ICustomServerEvent
+        ? Parameters<RageFW_ServerEventCallbackCustom<K>>
+        : K extends keyof IServerEvents
+          ? Parameters<RageFW_ServerEventCallbackNative<K>>
+          : never
 
 export type RageFW_ServerEventCallback<K extends RageFW_ServerEvent> =
     K extends keyof RageFW_ICustomServerEvent
@@ -24,3 +20,21 @@ export type RageFW_ServerEventCallback<K extends RageFW_ServerEvent> =
         : K extends keyof IServerEvents
           ? RageFW_ServerEventCallbackNative<K>
           : never
+
+export type RageFW_ServerEventReturn<K extends RageFW_ServerEvent> =
+    K extends keyof RageFW_ICustomServerEvent
+        ? ReturnType<RageFW_ICustomServerEvent[K]>
+        : K extends keyof IServerEvents
+          ? ReturnType<IServerEvents[K]>
+          : never
+
+export type RageFW_ServerEventCallbackCustom<
+    K extends keyof RageFW_ICustomServerEvent = keyof RageFW_ICustomServerEvent,
+> = (
+    player: PlayerMp,
+    args: RageFW_ServerEventArguments<K>,
+) => RageFW_ServerEventReturn<K>
+
+export type RageFW_ServerEventCallbackNative<
+    K extends keyof IServerEvents = keyof IServerEvents,
+> = IServerEvents[K]

shared-types/package.json

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

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

@@ -1,10 +1,7 @@
 declare module 'rage-fw-shared-types' {
-    export interface RageFW_ICustomServerEvent {
-        customServerEvent(customArgs: string): boolean
-        customServerEvent2(...customArgs2: number[]): void
-    }
+    export interface RageFW_ICustomServerEvent {}
 
-    export interface RageFW_ICustomClientEvent {
-        customClientEvent(clientArgs: string): boolean
-    }
+    export interface RageFW_ICustomClientEvent {}
+
+    export interface RageFW_ICustomCefEvent {}
 }

shared/package.json

@@ -1,17 +0,0 @@
-{
-    "name": "rage-fw-shared",
-    "version": "0.0.14-alpha.0",
-    "type": "module",
-    "main": "index.d.ts",
-    "files": [
-        "index.d.ts"
-    ],
-    "scripts": {
-        "test": "tsup"
-    },
-    "keywords": [],
-    "author": "SashaGoncharov19",
-    "license": "MIT",
-    "description": "Shared client types for rage-fw",
-    "gitHead": "053e4fd12aa120d53e11e0d2009c0df78c1a2ad0"
-}