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): implement callback validation

Browse Source 
Prevent callbacks from being overwritten by other resources.
Throw an immediate error if the callback does not exist.
This commit is contained in:
Linden
2025-02-03 15:41:58 +11:00
parent 7dc8fb544c
commit b726faea2d
5 changed files with 110 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
package/client/resource/callback/index.ts
View File

@@ -5,9 +5,12 @@ const callbackTimeout = GetConvarInt('ox:callbackTimeout', 300000);
onNet(`__ox_cb_${cache.resource}`, (key: string, ...args: any) => {
const resolve = pendingCallbacks[key];
if (!resolve) return;
delete pendingCallbacks[key];
return resolve && resolve(...args);
resolve(args);
});
const eventTimers: Record<string, number> = {};
@@ -37,16 +40,23 @@ export function triggerServerCallback<T = unknown>(
key = `${eventName}:${Math.floor(Math.random() * (100000 + 1))}`;
} while (pendingCallbacks[key]);
emitNet(`ox_lib:validateCallback`, eventName, cache.resource, key);
emitNet(`__ox_cb_${eventName}`, cache.resource, key, ...args);
return new Promise<T>((resolve, reject) => {
pendingCallbacks[key] = resolve;
pendingCallbacks[key] = (args) => {
if (args[0] === 'cb_invalid') reject(`callback '${eventName} does not exist`);
resolve(args);
};
setTimeout(reject, callbackTimeout, `callback event '${key}' timed out`);
});
}
export function onServerCallback(eventName: string, cb: (...args: any[]) => any) {
exports.ox_lib.setValidCallback(eventName, true)
onNet(`__ox_cb_${eventName}`, async (resource: string, key: string, ...args: any[]) => {
let response: any;

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

@@ -5,9 +5,12 @@ const callbackTimeout = GetConvarInt('ox:callbackTimeout', 300000);
onNet(`__ox_cb_${cache.resource}`, (key: string, ...args: any) => {
const resolve = pendingCallbacks[key];
if (!resolve) return;
delete pendingCallbacks[key];
return resolve && resolve(...args);
resolve(args);
});
export function triggerClientCallback<T = unknown>(
@@ -21,16 +24,23 @@ export function triggerClientCallback<T = unknown>(
key = `${eventName}:${Math.floor(Math.random() * (100000 + 1))}:${playerId}`;
} while (pendingCallbacks[key]);
emitNet(`ox_lib:validateCallback`, playerId, eventName, cache.resource, key);
emitNet(`__ox_cb_${eventName}`, playerId, cache.resource, key, ...args);
return new Promise<T>((resolve, reject) => {
pendingCallbacks[key] = resolve;
pendingCallbacks[key] = (args) => {
if (args[0] === 'cb_invalid') reject(`callback '${eventName} does not exist`);
resolve(args);
};
setTimeout(reject, callbackTimeout, `callback event '${key}' timed out`);
});
}
export function onClientCallback(eventName: string, cb: (playerId: number, ...args: any[]) => any) {
exports.ox_lib.setValidCallback(eventName, true)
onNet(`__ox_cb_${eventName}`, async (resource: string, key: string, ...args: any[]) => {
const src = source;
let response: any;