client / server ragempcommunity types peerDependency

client/package.json

@@ -1,8 +1,8 @@
 {
     "name": "rage-fw-client",
-    "version": "0.0.14-alpha.0",
+    "version": "0.0.15-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

@@ -32,6 +32,3 @@ export const fw = {
     event: new Client(),
     player: new Player(),
 }
-
-fw.player.triggerServer('customServerEvent', ['wer'])
-fw.event.register('customClientEvent', ([arg1]) => 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.15-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"
 }

server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rage-fw-server",
-    "version": "0.0.14-alpha.0",
+    "version": "0.0.15-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,5 +1,7 @@
 import rpc from 'rage-rpc'
 
+import Logger from './logger'
+
 import type {
     RageFW_ClientEvent,
     RageFW_ClientEventArguments,
@@ -51,7 +53,7 @@ class Server {
         } else {
             this.registerCustom(
                 eventName,
-                callback as RageFW_ServerEventCallbackCustom,
+                callback as unknown as RageFW_ServerEventCallbackCustom,
             )
         }
     }
@@ -69,7 +71,7 @@ class Server {
                 } else {
                     this.registerCustom(
                         eventName as keyof RageFW_ICustomServerEvent,
-                        callback as RageFW_ServerEventCallbackCustom,
+                        callback as unknown as RageFW_ServerEventCallbackCustom,
                     )
                 }
             },
@@ -90,11 +92,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)
+    }
+}

shared-types/package.json

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

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

@@ -1,10 +1,5 @@
 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 {}
 }

shared/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rage-fw-shared",
-    "version": "0.0.14-alpha.0",
+    "version": "0.0.15-alpha.0",
     "type": "module",
     "main": "index.d.ts",
     "files": [