From e87aa8d74dece529c24bf2c2bbe0a0138786ce53 Mon Sep 17 00:00:00 2001
From: Jim Shield <gothicjim@gmail.com>
Date: Thu, 26 Jun 2025 23:15:33 +0100
Subject: [PATCH] Fix server lag when loading scripts

This was my bad, set up functions that requested the cache from server, didn't realise it was duplicating it and spamming it

This moves the requests to a separate file and uses an export instead

Also hopefully fixes ox_lib images being an arse
---
 clientFrameworkCache.lua | 32 +++++++++++++++++
 fxmanifest.lua           |  1 +
 shared/coreloader.lua    | 78 ++++++++++++++++++----------------------
 3 files changed, 68 insertions(+), 43 deletions(-)
 create mode 100644 clientFrameworkCache.lua

diff --git a/clientFrameworkCache.lua b/clientFrameworkCache.lua
new file mode 100644
index 0000000..52ada99
--- /dev/null
+++ b/clientFrameworkCache.lua
@@ -0,0 +1,32 @@
+if _G.__bridge_cache_loaded then return end
+_G.__bridge_cache_loaded = true
+
+_G.BridgeCache = {
+    hasCache = false,
+    data = nil,
+    queue = {},
+}
+
+RegisterNetEvent("jim_bridge:receiveCache", function(data)
+    if _G.BridgeCache.hasCache then return end
+    _G.BridgeCache.data = data
+    _G.BridgeCache.hasCache = true
+
+    for _, cb in ipairs(_G.BridgeCache.queue) do
+        cb(data)
+    end
+    _G.BridgeCache.queue = nil
+end)
+
+-- Only send the request ONCE per client session
+TriggerServerEvent("jim_bridge:requestCache")
+
+-- Exported async function
+function GetBridgeCache(callback)
+    if _G.BridgeCache.hasCache then
+        callback(_G.BridgeCache.data)
+    else
+        table.insert(_G.BridgeCache.queue, callback)
+    end
+end
+exports("GetBridgeCache", GetBridgeCache)
\ No newline at end of file
diff --git a/fxmanifest.lua b/fxmanifest.lua
index af47220..1b377bf 100644
--- a/fxmanifest.lua
+++ b/fxmanifest.lua
@@ -22,5 +22,6 @@ server_scripts {
 }
 
 client_scripts {
+    'clientFrameworkCache.lua',
     'ui_modules/*.lua'
 }
\ No newline at end of file
diff --git a/shared/coreloader.lua b/shared/coreloader.lua
index 0631c25..b9a37cd 100644
--- a/shared/coreloader.lua
+++ b/shared/coreloader.lua
@@ -64,49 +64,41 @@ if IsDuplicityVersion() then
     debugPrint("^6Bridge^7: ^2Shared cache successfully loaded from export^7.")
     --print(countTable(Items), countTable(Vehicles), countTable(Jobs))
 else
-    local hasCache = false
-    -- 🔹 Client Side: Request from server
-    cache = {}
+    -- Shared bridge cache - prevent duplicate listeners
+    exports["jim_bridge"]:GetBridgeCache(function(cache)
+        Items = cache.Items or {}
+        Vehicles = cache.Vehicles or {}
+        Jobs = cache.Jobs or {}
+        Gangs = cache.Gangs or {}
+        InventoryWeight = cache.InventoryWeight or InventoryWeight
+        InventorySlots = cache.InventorySlots or 50
 
-    RegisterNetEvent("jim_bridge:receiveCache", function(data)
-        if not hasCache then
-            cache = data
-            hasCache = true
-        else
-            return
-        end
-    end)
-
-    TriggerServerEvent("jim_bridge:requestCache")
-
-    while not cache or not next(cache) do Wait(50) end
-    Items = cache.Items or {}
-    Vehicles = cache.Vehicles or {}
-    Jobs = cache.Jobs or {}
-    Gangs = cache.Gangs or {}
-    InventoryWeight = cache.InventoryWeight or InventoryWeight
-    InventorySlots = cache.InventorySlots or 50
-
-    if isStarted(ESXExport) then
-        for _, v in pairs(Vehicles) do
-            Vehicles[v.model] = {
-                model = v.model,
-                hash = v.hash,
-                price = v.price,
-                name = v.name,
-                brand = GetMakeNameFromVehicleModel(v.model):lower():gsub("^%l", string.upper)
-            }
-        end
-    end
-    if isStarted(OXInv) then
-        for k, v in pairsByKeys(Items) do
-            local tempInfo = exports[OXInv]:Items(k)
-            if tempInfo and tempInfo.client then
-                Items[k].image = (tempInfo.client and tempInfo.client.image) and tempInfo.client.image:gsub("nui://"..OXInv.."/web/images/", "") or k..".png"
-                Items[k].hunger = tempInfo.client and tempInfo.client.hunger
-                Items[k].thirst = tempInfo.client and tempInfo.client.thirst
+        CreateThread(function()
+            if isStarted(ESXExport) then
+                for _, v in pairs(Vehicles) do
+                    Vehicles[v.model] = {
+                        model = v.model,
+                        hash = v.hash,
+                        price = v.price,
+                        name = v.name,
+                        brand = GetMakeNameFromVehicleModel(v.model):lower():gsub("^%l", string.upper)
+                    }
+                end
             end
-        end
-    end
-    debugPrint("^6Bridge^7: ^2Shared cache successfully loaded from export^7.")
+
+            if isStarted(OXInv) then
+                for k, v in pairs(Items) do
+                    local tempInfo = exports[OXInv]:Items(k)
+                    Items[k].image = k..".png" -- Set default image
+                    if tempInfo and tempInfo.client then -- if client info, check for hard set image
+                        Items[k].image = (tempInfo.client.image) and tempInfo.client.image:gsub("nui://"..OXInv.."/web/images/", "") or Items[k].image
+                        Items[k].hunger = tempInfo.client.hunger
+                        Items[k].thirst = tempInfo.client.thirst
+                    end
+                end
+            end
+        end)
+
+        debugPrint("^6Bridge^7: ^2Shared cache successfully loaded from export^7.")
+    end)
 end