FumeNodes/ox_lib
1
0
Fork 0
mirror of https://github.com/CommunityOx/ox_lib.git synced 2026-08-17 06:56:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(callback): add timeout to callback events

Browse Source 
Should help when people await broken or unregistered events.
Defaults to 60 seconds, adjusted with convar ox:callbackTimeout.
This commit is contained in:
Linden
2024-05-03 15:49:33 +10:00
parent 8bb0587b39
commit 2166b076da
4 changed files with 76 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
package/server/resource/callback/index.ts
View File

@@ -1,9 +1,12 @@
import { cache } from '../cache';
const activeEvents: Record<string, (...args: any[]) => void> = {};
const pendingCallbacks: Record<string, (...args: any[]) => void> = {};
const callbackTimeout = GetConvarInt('ox:callbackTimeout', 60000);
onNet(`__ox_cb_${cache.resource}`, (key: string, ...args: any) => {
const resolve = activeEvents[key];
const resolve = pendingCallbacks[key];
delete pendingCallbacks[key];
return resolve && resolve(...args);
});
@@ -16,12 +19,14 @@ export function triggerClientCallback<T = unknown>(
do {
key = `${eventName}:${Math.floor(Math.random() * (100000 + 1))}:${playerId}`;
} while (activeEvents[key]);
} while (pendingCallbacks[key]);
emitNet(`__ox_cb_${eventName}`, playerId, cache.resource, key, ...args);
return new Promise<T>((resolve) => {
activeEvents[key] = resolve;
return new Promise<T>((resolve, reject) => {
pendingCallbacks[key] = resolve;
setTimeout(reject, callbackTimeout, `callback event '${key}' timed out`);
});
}