From e61febf7de7d3e931f91bc51be2ce3f89536f164 Mon Sep 17 00:00:00 2001
From: Linden <65407488+thelindat@users.noreply.github.com>
Date: Sun, 6 Oct 2024 03:25:17 +1100
Subject: [PATCH] refactor(streaming): change error message and default timeout

---
 imports/requestAudioBank/client.lua        | 2 +-
 imports/streamingRequest/client.lua        | 8 +++-----
 package/client/resource/streaming/index.ts | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/imports/requestAudioBank/client.lua b/imports/requestAudioBank/client.lua
index b5fbb8c..419681d 100644
--- a/imports/requestAudioBank/client.lua
+++ b/imports/requestAudioBank/client.lua
@@ -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
diff --git a/imports/streamingRequest/client.lua b/imports/streamingRequest/client.lua
index 1238b77..0a72b12 100644
--- a/imports/streamingRequest/client.lua
+++ b/imports/streamingRequest/client.lua
@@ -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
diff --git a/package/client/resource/streaming/index.ts b/package/client/resource/streaming/index.ts
index 1e68f22..963dc36 100644
--- a/package/client/resource/streaming/index.ts
+++ b/package/client/resource/streaming/index.ts
@@ -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;
@@ -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
   );
 }