entityseven/fivem-rpc
2
0
Fork 0
mirror of https://github.com/rilaxik/fivem-rpc.git synced 2026-09-28 01:29:13 +00:00
Code Issues Packages Releases Activity

feat(rpc): extract _pending* maps to Pending util

Browse Source
This commit is contained in:
rilaxik
2026-09-28 02:05:40 +01:00
parent 46933c1656
commit 79faa3b23c
6 changed files with 99 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpc/src/core/client.ts
+6 -30
View File
@@ -20,19 +20,13 @@ import { Wrapper } from './wrapper'
export class RPCInstanceClient extends Wrapper {
private readonly _emitterServer: Emitter
private readonly _pendingServer: Emitter
private readonly _emitterWeb: Emitter
private readonly _pendingWeb: Emitter
private readonly _pendingWebToServer: Emitter
constructor(props: RPCConfig<'client'>) {
super(props)
this._emitterServer = new Emitter()
this._pendingServer = new Emitter()
this._emitterWeb = new Emitter()
this._pendingWeb = new Emitter()
this._pendingWebToServer = new Emitter()
this.console.log('[RPC] Initialized Client')
@@ -93,17 +87,8 @@ export class RPCInstanceClient extends Wrapper {
}
}
if (payload.type === 'response') {
if (payload.calledTo === 'client') {
await this._pendingServer.emit(
payload.uuid,
...(payload.data && payload.data.length > 0 ? payload.data : []),
)
}
if (payload.calledTo === 'webview') {
await this._pendingWebToServer.emit(
payload.uuid,
...(payload.data && payload.data.length > 0 ? payload.data : []),
)
if (payload.calledTo === 'client' || payload.calledTo === 'webview') {
this.resolvePending(payload)
}
}
}
@@ -126,18 +111,13 @@ export class RPCInstanceClient extends Wrapper {
payload.player = GetPlayerServerId(PlayerId())
emitNet(RPCEvents.LISTENER_WEB, stringify(payload))
return new Promise(res => {
this._pendingWebToServer.once(payload.uuid, res)
})
return this._pending.wait(payload.uuid)
}
}
if (payload.type === 'response') {
if (payload.calledTo === 'client') {
await this._pendingWeb.emit(
payload.uuid,
...(payload.data && payload.data.length > 0 ? payload.data : []),
)
this.resolvePending(payload)
return { status: 'ok' }
}
@@ -202,9 +182,7 @@ export class RPCInstanceClient extends Wrapper {
emitNet(RPCEvents.LISTENER_CLIENT, stringify(payload))
return new Promise<Awaited<Response>>(res => {
this._pendingServer.once(payload.uuid, res)
})
return this._pending.wait<Awaited<Response>>(payload.uuid)
}
// ===== WEBVIEW =====
@@ -261,9 +239,7 @@ export class RPCInstanceClient extends Wrapper {
data: payload,
})
return new Promise<Awaited<Response>>(res => {
this._pendingWeb.once(payload.uuid, res)
})
return this._pending.wait<Awaited<Response>>(payload.uuid)
}
// ===== SELF =====
rpc/src/core/server.ts
+4 -18
View File
@@ -15,17 +15,13 @@ import { Wrapper } from './wrapper'
export class RPCInstanceServer extends Wrapper {
private readonly _emitterClient: Emitter
private readonly _pendingClient: Emitter
private readonly _emitterWeb: Emitter
private readonly _pendingWeb: Emitter
constructor(props: RPCConfig<'server'>) {
super(props)
this._emitterClient = new Emitter()
this._pendingClient = new Emitter()
this._emitterWeb = new Emitter()
this._pendingWeb = new Emitter()
this.console.log('[RPC] Initialized Server')
@@ -78,10 +74,7 @@ export class RPCInstanceServer extends Wrapper {
emitNet(RPCEvents.LISTENER_SERVER, response.player, stringify(response))
}
if (payload.type === 'response') {
await this._pendingClient.emit(
payload.uuid,
...(payload.data && payload.data.length > 0 ? payload.data : []),
)
this.resolvePending(payload)
}
}
}
@@ -129,10 +122,7 @@ export class RPCInstanceServer extends Wrapper {
emitNet(RPCEvents.LISTENER_SERVER, response.player, stringify(response))
}
if (payload.type === 'response') {
await this._pendingWeb.emit(
payload.uuid,
...(payload.data && payload.data.length > 0 ? payload.data : []),
)
this.resolvePending(payload)
}
}
}
@@ -193,9 +183,7 @@ export class RPCInstanceServer extends Wrapper {
emitNet(RPCEvents.LISTENER_SERVER, player, stringify(payload))
return new Promise<Awaited<Response>>(res => {
this._pendingClient.once(payload.uuid, res)
})
return this._pending.wait<Awaited<Response>>(payload.uuid)
}
public async emitClientEveryone<
@@ -272,9 +260,7 @@ export class RPCInstanceServer extends Wrapper {
emitNet(RPCEvents.LISTENER_SERVER, player, stringify(payload))
return new Promise<Awaited<Response>>(res => {
this._pendingWeb.once(payload.uuid, res)
})
return this._pending.wait<Awaited<Response>>(payload.uuid)
}
// ===== SELF =====
rpc/src/core/webview.ts
+12 -2
View File
@@ -144,7 +144,7 @@ export class RPCInstanceWebview extends Wrapper {
type: 'event',
}
return await this._createHttpClientRequest<Awaited<Response>>(payload)
return this._request<Awaited<Response>>(payload)
}
// ===== SERVER =====
@@ -196,7 +196,7 @@ export class RPCInstanceWebview extends Wrapper {
type: 'event',
}
return await this._createHttpClientRequest<Awaited<Response>>(payload)
return this._request<Awaited<Response>>(payload)
}
// ===== SELF =====
@@ -264,6 +264,16 @@ export class RPCInstanceWebview extends Wrapper {
// ===== UTILS =====
/** Sends an event to the client and waits for its response (with timeout) */
private _request<R>(payload: RPCState): Promise<R> {
const response = this._pending.wait<R>(payload.uuid)
this._createHttpClientRequest(payload).then(
data => this._pending.resolve(payload.uuid, data),
(error: Error) => this._pending.reject(payload.uuid, error),
)
return response
}
private async _createHttpClientRequest<R>(
data: RPCStateRaw | RPCState,
): Promise<R> {
rpc/src/core/wrapper.ts
+13
View File
@@ -1,5 +1,6 @@
import { Emitter } from '../utils/emitter'
import { parse } from '../utils/funcs'
import { Pending } from '../utils/pending'
import {
type RPCConfig,
type RPCEnvironment,
@@ -11,16 +12,28 @@ import {
export class Wrapper {
protected env: RPCEnvironment
protected _emitterLocal: Emitter
protected _pending: Pending
protected debug: boolean
protected console: Console
constructor(cfg: RPCConfig<RPCEnvironment>) {
this.env = cfg.env
this._emitterLocal = new Emitter()
this._pending = new Pending(cfg.timeout ?? 5000)
this.debug = cfg.debug ?? false
this.console = console
}
/** Settles the call waiting for this response; ignores late or unexpected ones */
protected resolvePending(payload: RPCState): void {
const found = this._pending.resolve(payload.uuid, payload.data?.[0])
if (!found && this.debug) {
this.console.log(
`[RPC]:ignored response ${payload.event} ${payload.uuid} (no pending call, possibly timed out)`,
)
}
}
protected verifyEvent(state: Emitter, data: RPCStateRaw | RPCState) {
const rpcData = typeof data === 'string' ? parse(data) : data