versions changes / code improvements

This commit is contained in:
Oleksandr Honcharov
2025-01-28 16:53:44 +02:00
parent d56c52abf5
commit 593f4650a3
10 changed files with 212 additions and 203 deletions
+1 -3
View File
@@ -14,9 +14,7 @@
],
"devDependencies": {
"@microsoft/api-extractor": "^7.47.9",
"@types/node": "catalog:",
"prettier": "^3.3.2",
"tsup": "^8.3.0"
"@types/node": "catalog:"
},
"peerDependencies": {
"typescript": "^5"
+1 -1
View File
@@ -24,7 +24,7 @@ export class Browser extends Wrapper {
* NOT INTENDED FOR OUT-OF-CONTEXT USE
*/
public _resolveEmitDestination(dataRaw: string) {
let state = Utils.prepareExecution(dataRaw)
const state = Utils.prepareExecution(dataRaw)
switch (state.calledTo) {
case Environment.BROWSER:
+9 -11
View File
@@ -91,7 +91,7 @@ class Rpc extends Wrapper {
*/
public register<
CallbackArguments extends unknown[] = unknown[],
CallbackReturn extends unknown = unknown,
CallbackReturn = unknown,
EventName extends string = string,
>(
eventName: EventName,
@@ -155,7 +155,7 @@ class Rpc extends Wrapper {
public async callClient<
Arguments extends unknown[] = unknown[],
EventName extends string = string,
Return extends unknown = unknown,
Return = unknown,
>(eventName: EventName, args?: Arguments): Promise<Return>
/**
* Calls a client-side event from server or browser
@@ -178,7 +178,7 @@ class Rpc extends Wrapper {
public async callClient<
Arguments extends unknown[] = unknown[],
EventName extends string = string,
Return extends unknown = unknown,
Return = unknown,
>(player: PlayerMp, eventName: EventName, args?: Arguments): Promise<Return>
public async callClient(
playerOrEventName: PlayerMp | string,
@@ -282,7 +282,7 @@ class Rpc extends Wrapper {
public async callServer<
Arguments extends unknown[] = unknown[],
EventName extends string = string,
Return extends unknown = unknown,
Return = unknown,
>(eventName: EventName, args?: Arguments): Promise<Return> {
this.log('callServer', eventName, args)
if (this.forceBrowserDevMode_)
@@ -337,7 +337,7 @@ class Rpc extends Wrapper {
public async callBrowser<
Arguments extends unknown[] = unknown[],
EventName extends string = string,
Return extends unknown = unknown,
Return = unknown,
>(eventName: EventName, args?: Arguments): Promise<Return>
/**
* Calls a browser-side event from server or client
@@ -360,7 +360,7 @@ class Rpc extends Wrapper {
public async callBrowser<
Arguments extends unknown[] = unknown[],
EventName extends string = string,
Return extends unknown = unknown,
Return = unknown,
>(player: PlayerMp, eventName: EventName, args?: Arguments): Promise<Return>
public async callBrowser(
playerOrEventName: PlayerMp | string,
@@ -446,14 +446,14 @@ class Rpc extends Wrapper {
public async call<
Arguments extends unknown[] = unknown[],
EventName extends string = string,
Return extends unknown = unknown,
Return = unknown,
>(eventName: EventName, args?: Arguments): Promise<Return> {
this.log('call', eventName, args)
if (this.forceBrowserDevMode_)
return undefined as unknown as Promise<Return>
Utils.errorUnknownEnvironment(this.environment_)
let state: RPCState = {
const state: RPCState = {
uuid: Utils.generateUUID(),
eventName,
calledTo: this.environment_,
@@ -469,9 +469,7 @@ class Rpc extends Wrapper {
/**
* redirects an event in cases of it calling its own environment
*/
private async callSelf<Return extends unknown = unknown>(
state: RPCState,
): Promise<Return> {
private async callSelf<Return = unknown>(state: RPCState): Promise<Return> {
state = this.verifyEvent_(state)
if (state.knownError) {
this.triggerError_(state, state.knownError)
+3 -3
View File
@@ -1,8 +1,8 @@
import { Wrapper } from './wrapper'
import {
type PlayerMp,
Environment,
Events,
type PlayerMp,
RPCEventType,
RPCState,
RpcWrapperConfig,
@@ -20,7 +20,7 @@ export class Server extends Wrapper {
) {
super(options)
if (!!options.forceBrowserDevMode) return
if (options.forceBrowserDevMode) return
// specific event to save player in context as it is not available on server -> server calls
mp.events.add(
@@ -35,7 +35,7 @@ export class Server extends Wrapper {
* NOT INTENDED FOR OUT-OF-CONTEXT USE
*/
public _resolveEmitDestination(player: PlayerMp, dataRaw: string) {
let state = Utils.prepareExecution(dataRaw)
const state = Utils.prepareExecution(dataRaw)
switch (state.calledTo) {
case Environment.SERVER:
+1 -1
View File
@@ -29,7 +29,7 @@ export class Wrapper {
// checks if event is available (registered) in current environment
protected verifyEvent_(data: string | RPCState): RPCState {
let rpcData =
const rpcData =
typeof data === 'string' ? Utils.prepareExecution(data) : data
if (!this.state_[rpcData.eventName]) {