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

refactor(streamingRequest): internal method for request functions

Browse Source 
- TS package type inference for request functions.
- Type fix for Lua's waitFor callback.
- Lua request functions cannot return nil.
This commit is contained in:
Linden
2024-03-31 16:15:44 +11:00
parent e3ece4f337
commit 0f0c7a6591
10 changed files with 50 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
package/client/resource/streaming/index.ts
View File

@@ -1,13 +1,13 @@
import { waitFor } from '../../';
function streamingRequest(
function streamingRequest<T extends string | number>(
request: Function,
hasLoaded: Function,
assetType: string,
asset: any,
timeout?: number,
asset: T,
timeout: number = 1000,
...args: any
): Promise<any> {
) {
if (hasLoaded(asset)) return asset;
request(asset, ...args);
@@ -16,34 +16,34 @@ function streamingRequest(
() => {
if (hasLoaded(asset)) return asset;
},
`failed to load ${assetType} '${asset}' after ${timeout} ticks`,
timeout || 500
`failed to load ${assetType} '${asset}'`,
timeout
);
}
export const requestAnimDict = (animDict: string, timeout?: number): Promise<string> => {
export const requestAnimDict = (animDict: string, timeout?: number) => {
if (!DoesAnimDictExist(animDict)) throw new Error(`attempted to load invalid animDict '${animDict}'`);
return streamingRequest(RequestAnimDict, HasAnimDictLoaded, 'animDict', animDict, timeout);
};
export const requestAnimSet = (animSet: string, timeout?: number): Promise<string> =>
export const requestAnimSet = (animSet: string, timeout?: number) =>
streamingRequest(RequestAnimSet, HasAnimSetLoaded, 'animSet', animSet, timeout);
export const requestModel = (model: string | number, timeout?: number): Promise<number> => {
export const requestModel = (model: string | number, timeout?: number) => {
if (typeof model !== 'number') model = GetHashKey(model);
if (!IsModelValid(model)) throw new Error(`attempted to load invalid model '${model}'`);
return streamingRequest(RequestModel, HasModelLoaded, 'model', model, timeout);
};
export const requestNamedPtfxAsset = (ptFxName: string, timeout?: number): Promise<string> =>
export const requestNamedPtfxAsset = (ptFxName: string, timeout?: number) =>
streamingRequest(RequestNamedPtfxAsset, HasNamedPtfxAssetLoaded, 'ptFxName', ptFxName, timeout);
export const requestScaleformMovie = (scaleformName: string, timeout?: number): Promise<string> =>
export const requestScaleformMovie = (scaleformName: string, timeout?: number) =>
streamingRequest(RequestScaleformMovie, HasScaleformMovieLoaded, 'scaleformMovie', scaleformName, timeout);
export const requestStreamedTextureDict = (textureDict: string, timeout?: number): Promise<string> =>
export const requestStreamedTextureDict = (textureDict: string, timeout?: number) =>
streamingRequest(RequestStreamedTextureDict, HasStreamedTextureDictLoaded, 'textureDict', textureDict, timeout);
export const requestWeaponAsset = (
@@ -51,7 +51,7 @@ export const requestWeaponAsset = (
timeout?: number,
weaponResourceFlags: number = 31,
extraWeaponComponentFlags: number = 0
): Promise<string | number> =>
) =>
streamingRequest(
RequestWeaponAsset,
HasWeaponAssetLoaded,