diff --git a/package/client/resource/callback/index.ts b/package/client/resource/callback/index.ts index 033b8b1..9b18b42 100644 --- a/package/client/resource/callback/index.ts +++ b/package/client/resource/callback/index.ts @@ -1,6 +1,6 @@ import { cache } from '../cache'; -const activeEvents: Record = {}; +const activeEvents: Record void> = {}; onNet(`__ox_cb_${cache.resource}`, (key: string, ...args: any) => { const resolve = activeEvents[key]; @@ -21,7 +21,11 @@ export function eventTimer(eventName: string, delay: number | null) { return true; } -export function triggerServerCallback(eventName: string, delay: number | null, ...args: any) { +export function triggerServerCallback( + eventName: string, + delay: number | null, + ...args: any +): Promise | void { if (!eventTimer(eventName, delay)) return; let key: string; @@ -32,13 +36,13 @@ export function triggerServerCallback(eventName: string, delay: number | null, . emitNet(`__ox_cb_${eventName}`, cache.resource, key, ...args); - return new Promise((resolve) => { + return new Promise((resolve) => { activeEvents[key] = resolve; }); } -export function onServerCallback(eventName: string, cb: (...args: any) => any) { - onNet(`__ox_cb_${eventName}`, (resource: string, key: string, ...args: any) => { +export function onServerCallback(eventName: string, cb: (...args) => any) { + onNet(`__ox_cb_${eventName}`, (resource: string, key: string, ...args) => { let response: any; try { diff --git a/package/server/resource/callback/index.ts b/package/server/resource/callback/index.ts index 6b99036..d1e9a6c 100644 --- a/package/server/resource/callback/index.ts +++ b/package/server/resource/callback/index.ts @@ -1,13 +1,17 @@ import { cache } from '../cache'; -const activeEvents: Record = {}; +const activeEvents: Record void> = {}; onNet(`__ox_cb_${cache.resource}`, (key: string, ...args: any) => { const resolve = activeEvents[key]; return resolve && resolve(...args); }); -export function triggerClientCallback(eventName: string, playerId: number, ...args: any) { +export function triggerClientCallback( + eventName: string, + playerId: number, + ...args: any +): Promise | void { let key: string; do { @@ -16,13 +20,13 @@ export function triggerClientCallback(eventName: string, playerId: number, ...ar emitNet(`__ox_cb_${eventName}`, playerId, cache.resource, key, ...args); - return new Promise((resolve) => { + return new Promise((resolve) => { activeEvents[key] = resolve; }); } -export function onClientCallback(eventName: string, cb: (playerId: number, ...args: any) => any) { - onNet(`__ox_cb_${eventName}`, (resource: string, key: string, ...args: any) => { +export function onClientCallback(eventName: string, cb: (playerId: number, ...args) => any) { + onNet(`__ox_cb_${eventName}`, (resource: string, key: string, ...args) => { const src = source; let response: any;