From fafcdb50a8742643bef880977bb5b6a6bad52630 Mon Sep 17 00:00:00 2001 From: Danya H Date: Mon, 30 Sep 2024 20:39:20 +0100 Subject: [PATCH] upd - moved browser to player instance - logger accepts multiple arguments - changed error messages --- cef/src/index.ts | 9 ++++++--- cef/src/types/client.ts | 2 +- client/src/core/browser.ts | 8 -------- client/src/core/index.ts | 1 - client/src/core/logger.ts | 12 ++++++------ client/src/core/player.ts | 2 +- client/src/index.ts | 3 +-- client/src/types/client.ts | 2 +- server/src/core/logger.ts | 12 ++++++------ shared-types/types/types/index.d.ts | 4 +++- 10 files changed, 25 insertions(+), 30 deletions(-) delete mode 100644 client/src/core/browser.ts diff --git a/cef/src/index.ts b/cef/src/index.ts index c451d49..539f5e2 100644 --- a/cef/src/index.ts +++ b/cef/src/index.ts @@ -37,7 +37,7 @@ class Cef { } return Promise.reject( - 'RageFW was started in window which not contain global variable MP!', + 'RageFW was started in window which does not contain MP', ) } @@ -52,7 +52,7 @@ class Cef { } return Promise.reject( - 'RageFW was started in window which not contain global variable MP!', + 'RageFW was started in window which does not contain MP', ) } @@ -67,7 +67,7 @@ class Cef { } return Promise.reject( - 'RageFW was started in window which not contain global variable MP!', + 'RageFW was started in window which does not contain MP', ) } } @@ -75,3 +75,6 @@ class Cef { export const fw = { event: new Cef(), } +;(async () => { + await fw.event.triggerClient('cefReady') +})() diff --git a/cef/src/types/client.ts b/cef/src/types/client.ts index 10b3f02..0560aab 100644 --- a/cef/src/types/client.ts +++ b/cef/src/types/client.ts @@ -4,7 +4,7 @@ export type { RageFW_ICustomClientEvent } from 'rage-fw-shared-types' /** * Union of all available client event names - * These only include custom events + * These only include custom events and some extras from RageFW */ export type RageFW_ClientEvent = keyof RageFW_ICustomClientEvent diff --git a/client/src/core/browser.ts b/client/src/core/browser.ts deleted file mode 100644 index c348127..0000000 --- a/client/src/core/browser.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Player } from './' - -export class Browser extends Player { - public registerBrowser(browser: BrowserMp) { - this.browser = browser - return browser - } -} diff --git a/client/src/core/index.ts b/client/src/core/index.ts index 95f461a..cde62c3 100644 --- a/client/src/core/index.ts +++ b/client/src/core/index.ts @@ -1,4 +1,3 @@ export * from './client' export * from './player' -export * from './browser' export * from './logger' diff --git a/client/src/core/logger.ts b/client/src/core/logger.ts index 6079d7c..99c3fe6 100644 --- a/client/src/core/logger.ts +++ b/client/src/core/logger.ts @@ -1,19 +1,19 @@ export class Logger { - public error(message: unknown) { + public error(...message: unknown[]) { mp.console.logError( - `[${new Date().toLocaleTimeString()}] [ERROR] ${message}`, + `[${new Date().toLocaleTimeString()}] [ERROR] ${message.join(' ')}`, ) } - public warn(message: unknown) { + public warn(...message: unknown[]) { mp.console.logWarning( - `[${new Date().toLocaleTimeString()}] [WARN] ${message}`, + `[${new Date().toLocaleTimeString()}] [WARN] ${message.join(' ')}`, ) } - public info(message: unknown) { + public info(...message: unknown[]) { mp.console.logInfo( - `[${new Date().toLocaleTimeString()}] [INFO] ${message}`, + `[${new Date().toLocaleTimeString()}] [INFO] ${message.join(' ')}`, ) } } diff --git a/client/src/core/player.ts b/client/src/core/player.ts index cd1ebba..9d879a9 100644 --- a/client/src/core/player.ts +++ b/client/src/core/player.ts @@ -43,7 +43,7 @@ export class Player { : [] ): Promise> { if (!this.browser) - throw new Error('You need to initialize browser first!') + throw new Error('You need to initialize browser first') return rpc.callBrowser(this.browser, eventName, args) } } diff --git a/client/src/index.ts b/client/src/index.ts index a82447d..d6c1455 100644 --- a/client/src/index.ts +++ b/client/src/index.ts @@ -1,9 +1,8 @@ -import { Browser, Client, Logger, Player } from './core' +import { Client, Logger, Player } from './core' export const fw = { event: new Client(), player: new Player(), - browser: new Browser(), system: { log: new Logger(), }, diff --git a/client/src/types/client.ts b/client/src/types/client.ts index 804752b..d03c660 100644 --- a/client/src/types/client.ts +++ b/client/src/types/client.ts @@ -36,7 +36,7 @@ export type RageFW_ClientCallback = ( export type RageFW_ClientReturn = K extends keyof RageFW_ICustomClientEvent ? ReturnType - : never + : void export type _ClientEventHasArgs< EventName extends keyof RageFW_ICustomClientEvent, diff --git a/server/src/core/logger.ts b/server/src/core/logger.ts index 17e4c23..bd656ab 100644 --- a/server/src/core/logger.ts +++ b/server/src/core/logger.ts @@ -23,15 +23,15 @@ export class Logger { ), }) - public info(message: unknown) { - this.systemLogger.info(message) + public info(...message: unknown[]) { + this.systemLogger.info(message.join(' ')) } - public warn(message: unknown) { - this.systemLogger.warn(message) + public warn(...message: unknown[]) { + this.systemLogger.warn(message.join(' ')) } - public error(message: unknown) { - this.systemLogger.error(message) + public error(...message: unknown[]) { + this.systemLogger.error(message.join(' ')) } } diff --git a/shared-types/types/types/index.d.ts b/shared-types/types/types/index.d.ts index a65c140..9bccdd8 100644 --- a/shared-types/types/types/index.d.ts +++ b/shared-types/types/types/index.d.ts @@ -1,7 +1,9 @@ declare module 'rage-fw-shared-types' { export interface RageFW_ICustomServerEvent {} - export interface RageFW_ICustomClientEvent {} + export interface RageFW_ICustomClientEvent { + cefReady(): void + } export interface RageFW_ICustomCefEvent {} }