refactor(streaming): change error message and default timeout

This commit is contained in:
Linden
2024-10-06 03:25:17 +11:00
parent a2a7114986
commit e61febf7de
3 changed files with 6 additions and 8 deletions

View File

@@ -5,7 +5,7 @@
function lib.requestAudioBank(audioBank, timeout) function lib.requestAudioBank(audioBank, timeout)
return lib.waitFor(function() return lib.waitFor(function()
if RequestScriptAudioBank(audioBank, false) then return audioBank end if RequestScriptAudioBank(audioBank, false) then return audioBank end
end, ("failed to load audiobank '%s'"):format(audioBank), timeout or 500) end, ("failed to load audiobank '%s' - this may be caused by\n- too many loaded assets\n- oversized, invalid, or corrupted assets"):format(audioBank), timeout or 30000)
end end
return lib.requestAudioBank return lib.requestAudioBank

View File

@@ -12,12 +12,10 @@ function lib.streamingRequest(request, hasLoaded, assetType, asset, timeout, ...
request(asset, ...) request(asset, ...)
-- i hate fivem developers
lib.print.verbose(("Loading %s '%s' - remember to release it when done."):format(assetType, asset))
return lib.waitFor(function() return lib.waitFor(function()
if hasLoaded(asset) then return asset end if hasLoaded(asset) then return asset end
end, ("failed to load %s '%s' - this is likely caused by unreleased assets"):format(assetType, asset), timeout or 10000) end, ("failed to load %s '%s' - this may be caused by\n- too many loaded assets\n- oversized, invalid, or corrupted assets"):format(assetType, asset),
timeout or 30000)
end end
return lib.streamingRequest return lib.streamingRequest

View File

@@ -5,7 +5,7 @@ function streamingRequest<T extends string | number>(
hasLoaded: Function, hasLoaded: Function,
assetType: string, assetType: string,
asset: T, asset: T,
timeout: number = 1000, timeout: number = 30000,
...args: any ...args: any
) { ) {
if (hasLoaded(asset)) return asset; if (hasLoaded(asset)) return asset;
@@ -16,7 +16,7 @@ function streamingRequest<T extends string | number>(
() => { () => {
if (hasLoaded(asset)) return asset; if (hasLoaded(asset)) return asset;
}, },
`failed to load ${assetType} '${asset}'`, `failed to load ${assetType} '${asset}' - this may be caused by\n- too many loaded assets\n- oversized, invalid, or corrupted assets`,
timeout timeout
); );
} }