Skip to content

Commit

Permalink
refactor(streaming): change error message and default timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
thelindat committed Oct 5, 2024
1 parent a2a7114 commit e61febf
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion imports/requestAudioBank/client.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
function lib.requestAudioBank(audioBank, timeout)
return lib.waitFor(function()
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

return lib.requestAudioBank
8 changes: 3 additions & 5 deletions imports/streamingRequest/client.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@ function lib.streamingRequest(request, hasLoaded, assetType, asset, timeout, ...

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()
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)
if hasLoaded(asset) then return asset end
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

return lib.streamingRequest
4 changes: 2 additions & 2 deletions package/client/resource/streaming/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function streamingRequest<T extends string | number>(
hasLoaded: Function,
assetType: string,
asset: T,
timeout: number = 1000,
timeout: number = 30000,
...args: any
) {
if (hasLoaded(asset)) return asset;
Expand All @@ -16,7 +16,7 @@ function streamingRequest<T extends string | number>(
() => {
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
);
}
Expand Down

0 comments on commit e61febf

Please sign in to comment.