Merge remote-tracking branch 'origin/master'

cef/package.json

@@ -0,0 +1,23 @@
+{
+    "name": "rage-fw-cef",
+    "version": "0.0.16-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,15 @@
+import rpc from 'rage-rpc'
+
+class Cef {
+    public register() {}
+
+    public trigger() {}
+
+    public triggerServer() {}
+
+    public triggerClient() {}
+}
+
+export const fw = {
+    event: new Cef(),
+}

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": true,
+    "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.16-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/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.16-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",
+  "type": "module"
-  "devDependencies": {
-
-  }
 }

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.16-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 (
+            async (args: RageFW_ServerEventArguments<EventName>, info) => {
-                args: Parameters<RageFW_ICustomServerEvent[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<
+export type RageFW_ServerEventArguments<K extends RageFW_ServerEvent> =
-    K extends keyof RageFW_ICustomServerEvent = keyof RageFW_ICustomServerEvent,
+    K extends keyof RageFW_ICustomServerEvent
-> = (
+        ? Parameters<RageFW_ServerEventCallbackCustom<K>>
-    player: PlayerMp,
+        : K extends keyof IServerEvents
-    args: Parameters<RageFW_ICustomServerEvent[K]>,
+          ? Parameters<RageFW_ServerEventCallbackNative<K>>
-) => ReturnType<RageFW_ICustomServerEvent[K]>
+          : never
-
-export type RageFW_ServerEventCallbackNative<
-    K extends keyof IServerEvents = keyof IServerEvents,
-> = IServerEvents[K]
 
 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.16-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 {
+    export interface RageFW_ICustomServerEvent {}
-        customServerEvent(customArgs: string): boolean
-        customServerEvent2(...customArgs2: number[]): void
-    }
 
-    export interface RageFW_ICustomClientEvent {
+    export interface RageFW_ICustomClientEvent {}
-        customClientEvent(clientArgs: string): boolean
+
-    }
+    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"
-}