ADD - support extended inventory metadata bridges (#23)

* ADD - support extended inventory metadata bridges

* FIX - align inventory contract tests

sky_phone/source/bridge/server/inventory.lua

@@ -1,60 +1,75 @@
+local inventory_adapters = {
+    { name = "jaksam", resource = "jaksam_inventory" },
+    { name = "qs", resource = "qs-inventory" },
+    { name = "ps", resource = "ps-inventory", framework = "qb" },
+    { name = "codem", resource = "codem-inventory" },
+    { name = "tgiann", resource = "tgiann-inventory" },
+    { name = "core", resource = "core_inventory" },
+    { name = "jpr", resource = "jpr-inventory", framework = "qb" },
+    { name = "origen", resource = "origen_inventory" },
+    { name = "ak47", resource = "ak47_inventory" },
+    { name = "one", resource = "one_inventory" },
+    { name = "ox", resource = "ox_inventory" },
+    { name = "mf", resource = "mf-inventory", framework = "esx" },
+    { name = "smx", resource = "smx-inventory", framework = "esx" },
+    { name = "lj", resource = "lj-inventory" },
+    { name = "qb", resource = "qb-inventory" },
+    { name = "hex", resource = "hex_4_inventory", framework = "esx", metadata = false },
+    { name = "esx", resource = "es_extended", framework = "esx", metadata = false },
+}
+
+local inventory_aliases = {
+    ["qb-inv"] = "qb",
+    qbox = "ox",
+}
+local supported_inventories = {}
+for _, adapter in ipairs(inventory_adapters) do
+    inventory_aliases[adapter.resource] = adapter.name
+    supported_inventories[adapter.name] = adapter
+end
+
 local configured_inventory = Config.Bridge.Inventory
+configured_inventory = inventory_aliases[configured_inventory] or configured_inventory
+local framework_name = Bridge.Framework.GetName()
 
 if configured_inventory == "auto" then
-    if GetResourceState("ox_inventory") == "started" then
-        configured_inventory = "ox"
-    elseif GetResourceState("qb-inventory") == "started" then
-        configured_inventory = "qb"
-    elseif GetResourceState("lj-inventory") == "started" then
-        configured_inventory = "lj"
-    elseif GetResourceState("qs-inventory") == "started" then
-        configured_inventory = "qs"
-    elseif GetResourceState("codem-inventory") == "started" then
-        configured_inventory = "codem"
-    elseif GetResourceState("core_inventory") == "started" then
-        configured_inventory = "core"
-    elseif GetResourceState("mf-inventory") == "started" then
-        configured_inventory = "mf"
-    elseif GetResourceState("smx-inventory") == "started" then
-        configured_inventory = "smx"
-    elseif GetResourceState("hex_4_inventory") == "started" then
-        configured_inventory = "hex"
-    elseif Bridge.Framework.GetName() == "esx" then
+    for _, adapter in ipairs(inventory_adapters) do
+        local compatible_framework = not adapter.framework or adapter.framework == framework_name
+        if adapter.name ~= "esx" and compatible_framework and GetResourceState(adapter.resource) == "started" then
+            configured_inventory = adapter.name
+            break
+        end
+    end
+
+    if configured_inventory == "auto" and framework_name == "esx" then
         configured_inventory = "esx"
     end
 end
 
-local supported_inventories = {
-    ox = true,
-    qb = true,
-    lj = true,
-    qs = true,
-    codem = true,
-    core = true,
-    mf = true,
-    smx = true,
-    hex = true,
-    esx = true,
-}
-
-if not supported_inventories[configured_inventory] then
+local selected_adapter = supported_inventories[configured_inventory]
+if not selected_adapter then
     error(("[sky_phone] Unsupported or unavailable inventory '%s'. Configure a supported inventory adapter."):format(tostring(configured_inventory)))
 end
+if GetResourceState(selected_adapter.resource) ~= "started" then
+    error(("[sky_phone] Inventory '%s' is configured, but resource '%s' is not started.")
+        :format(tostring(configured_inventory), selected_adapter.resource))
+end
+if selected_adapter.framework and selected_adapter.framework ~= framework_name then
+    error(("[sky_phone] Inventory '%s' is only supported with framework '%s'.")
+        :format(tostring(configured_inventory), selected_adapter.framework))
+end
 
 Bridge.Inventory.Name = configured_inventory
 
-if configured_inventory == "hex" or configured_inventory == "esx" then
-    if Bridge.Framework.GetName() ~= "esx" then
-        Bridge.Inventory.ConfigurationError =
-            ("[sky_phone] Inventory '%s' is only supported with ESX."):format(configured_inventory)
-    elseif Config.Phone.Unique ~= false or Config.Sim.Enabled ~= false then
+if selected_adapter.metadata == false then
+    if Config.Phone.Unique ~= false or Config.Sim.Enabled ~= false then
         Bridge.Inventory.ConfigurationError = ("[sky_phone] Inventory '%s' cannot store unique phone or physical SIM metadata. Set Config.Phone.Unique = false and Config.Sim.Enabled = false, or configure a metadata-capable inventory.")
             :format(configured_inventory)
     end
 end
 
-function Bridge.Inventory.NormalizeItem(item, metadata_field)
-    if not item then
+function Bridge.Inventory.NormalizeItem(item, metadata_field, fallback_slot)
+    if type(item) ~= "table" then
         return nil
     end
 
@@ -63,11 +78,15 @@ function Bridge.Inventory.NormalizeItem(item, metadata_field)
         metadata = item.metadata or item.info
     end
 
+    local slot = item.slot or item.id or fallback_slot
+    local numeric_slot = tonumber(slot)
+    local count = tonumber(item.count or item.amount or item.quantity) or 0
+
     return {
-        name = item.name,
-        slot = item.slot or item.id,
-        count = tonumber(item.count or item.amount) or 0,
-        amount = tonumber(item.amount or item.count) or 0,
+        name = item.name or item.item,
+        slot = numeric_slot or slot,
+        count = count,
+        amount = count,
         metadata = type(metadata) == "table" and metadata or {},
     }
 end
@@ -84,3 +103,13 @@ function Bridge.Inventory.MetadataMatches(actual, expected)
     end
     return true
 end
+
+function Bridge.Inventory.ResolveUsableItem(...)
+    for index = select("#", ...), 1, -1 do
+        local candidate = select(index, ...)
+        if type(candidate) == "table" and (candidate.name or candidate.item) then
+            return candidate
+        end
+    end
+    return nil
+end

sky_phone/source/bridge/server/inventory/ak47.lua

@@ -0,0 +1,87 @@
+if Bridge.Inventory.Name ~= "ak47" then
+    return
+end
+
+local inventory = exports["ak47_inventory"]
+
+local function normalize(item, fallback_slot)
+    local normalized = Bridge.Inventory.NormalizeItem(item, "info", fallback_slot)
+    if not normalized or not normalized.name or normalized.amount < 1 then
+        return nil
+    end
+    return normalized
+end
+
+function Bridge.Inventory.GetResourceName()
+    return "ak47_inventory"
+end
+
+function Bridge.Inventory.GetSlot(source, slot_id)
+    local identifier = Bridge.Framework.GetIdentifier(source)
+    local numeric_slot = tonumber(slot_id)
+    if not identifier or not numeric_slot then
+        return nil
+    end
+    return normalize(inventory:GetSlot(identifier, numeric_slot), numeric_slot)
+end
+
+function Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
+    local identifier = Bridge.Framework.GetIdentifier(source)
+    if not identifier then
+        return {}
+    end
+
+    local matches = {}
+    local filter_metadata = type(metadata) == "table" and metadata or nil
+    for index, item in pairs(inventory:GetSlotsWithItem(identifier, item_name, filter_metadata, filter_metadata ~= nil) or {}) do
+        local normalized = normalize(item, tonumber(index) or index)
+        if normalized and normalized.name == item_name
+            and Bridge.Inventory.MetadataMatches(normalized.metadata, metadata) then
+            matches[#matches + 1] = normalized
+        end
+    end
+    return matches
+end
+
+function Bridge.Inventory.SetSlotMetadata(source, slot_id, metadata)
+    local identifier = Bridge.Framework.GetIdentifier(source)
+    local slot = identifier and Bridge.Inventory.GetSlot(source, slot_id) or nil
+    if not slot then
+        return false
+    end
+
+    local requested_metadata = type(metadata) == "table" and metadata or {}
+    inventory:SetItemInfo(identifier, slot.slot, requested_metadata)
+    local updated = Bridge.Inventory.GetSlot(source, slot.slot)
+    return updated and Bridge.Inventory.MetadataMatches(updated.metadata, requested_metadata) or false
+end
+
+function Bridge.Inventory.CanCarryItem(source, item_name, count)
+    return inventory:CanAddItem(source, item_name, count) == true
+end
+
+function Bridge.Inventory.AddItem(source, item_name, count, slot, metadata)
+    if not Bridge.Inventory.CanCarryItem(source, item_name, count, metadata) then
+        return false
+    end
+    return inventory:AddItem(source, item_name, count, slot, metadata or {}) == true
+end
+
+function Bridge.Inventory.RemoveItem(source, item_name, count, slot, metadata)
+    if metadata and not slot then
+        local slots = Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
+        slot = slots[1] and slots[1].slot or nil
+        if not slot then
+            return 0
+        end
+    end
+
+    local removed = inventory:RemoveItem(source, item_name, count, slot)
+    return removed ~= false and count or 0
+end
+
+function Bridge.Inventory.RegisterUsableItem(item_name, callback)
+    return Bridge.Framework.RegisterUsableItem(item_name, function(source, ...)
+        callback(source, normalize(Bridge.Inventory.ResolveUsableItem(...)))
+    end)
+end

sky_phone/source/bridge/server/inventory/codem.lua

@@ -9,7 +9,8 @@ local function normalize(item)
 end
 
 local function get_inventory(source)
-    return inventory:GetInventory(false, source) or {}
+    local identifier = Bridge.Framework.GetIdentifier(source)
+    return identifier and inventory:GetInventory(identifier, source) or {}
 end
 
 function Bridge.Inventory.GetResourceName()
@@ -27,9 +28,14 @@ end
 
 function Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
     local matches = {}
-    for _, item in pairs(get_inventory(source)) do
+    local items = inventory:GetItemsByName(source, item_name) or {}
+    if items.name then
+        items = { items }
+    end
+    for _, item in pairs(items) do
         local normalized = normalize(item)
-        if normalized.name == item_name and Bridge.Inventory.MetadataMatches(normalized.metadata, metadata) then
+        if normalized and normalized.name == item_name
+            and Bridge.Inventory.MetadataMatches(normalized.metadata, metadata) then
             matches[#matches + 1] = normalized
         end
     end
@@ -66,7 +72,7 @@ function Bridge.Inventory.RemoveItem(source, item_name, count, slot, metadata)
 end
 
 function Bridge.Inventory.RegisterUsableItem(item_name, callback)
-    return Bridge.Framework.RegisterUsableItem(item_name, function(source, item)
-        callback(source, normalize(item))
+    return Bridge.Framework.RegisterUsableItem(item_name, function(source, ...)
+        callback(source, normalize(Bridge.Inventory.ResolveUsableItem(...)))
     end)
 end

sky_phone/source/bridge/server/inventory/core.lua

@@ -39,11 +39,15 @@ end
 
 function Bridge.Inventory.SetSlotMetadata(source, slot_id, metadata)
     local numeric_slot = tonumber(slot_id)
-    if not numeric_slot then
+    local slot = numeric_slot and Bridge.Inventory.GetSlot(source, numeric_slot) or nil
+    if not slot then
         return false
     end
-    inventory:setMetadata(source, numeric_slot, metadata or {})
-    return true
+
+    local requested_metadata = type(metadata) == "table" and metadata or {}
+    inventory:setMetadata(source, numeric_slot, requested_metadata)
+    local updated = Bridge.Inventory.GetSlot(source, numeric_slot)
+    return updated and Bridge.Inventory.MetadataMatches(updated.metadata, requested_metadata) or false
 end
 
 function Bridge.Inventory.CanCarryItem()

sky_phone/source/bridge/server/inventory/jaksam.lua

@@ -0,0 +1,94 @@
+if Bridge.Inventory.Name ~= "jaksam" then
+    return
+end
+
+local inventory = exports["jaksam_inventory"]
+
+local function normalize(item)
+    local normalized = Bridge.Inventory.NormalizeItem(item)
+    if not normalized or not normalized.name or normalized.amount < 1 then
+        return nil
+    end
+    return normalized
+end
+
+local function get_inventory(source)
+    local player_inventory = inventory:getInventory(source)
+    return type(player_inventory) == "table" and type(player_inventory.items) == "table"
+        and player_inventory.items or {}
+end
+
+function Bridge.Inventory.GetResourceName()
+    return "jaksam_inventory"
+end
+
+function Bridge.Inventory.GetSlot(source, slot_id)
+    for index, item in pairs(get_inventory(source)) do
+        local normalized = normalize(item)
+        local item_slot = normalized and (normalized.slot or tonumber(index)) or nil
+        if tostring(item_slot) == tostring(slot_id) then
+            normalized.slot = item_slot
+            return normalized
+        end
+    end
+    return nil
+end
+
+function Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
+    local matches = {}
+    for index, item in pairs(get_inventory(source)) do
+        local normalized = normalize(item)
+        if normalized and normalized.name == item_name
+            and Bridge.Inventory.MetadataMatches(normalized.metadata, metadata) then
+            normalized.slot = normalized.slot or tonumber(index) or index
+            matches[#matches + 1] = normalized
+        end
+    end
+    return matches
+end
+
+function Bridge.Inventory.SetSlotMetadata(source, slot_id, metadata)
+    local slot = Bridge.Inventory.GetSlot(source, slot_id)
+    if not slot then
+        return false
+    end
+
+    local requested_metadata = type(metadata) == "table" and metadata or {}
+    local success = inventory:setItemMetadataInSlot(source, slot.slot, requested_metadata)
+    if success ~= true then
+        return false
+    end
+    local updated = Bridge.Inventory.GetSlot(source, slot.slot)
+    return updated and Bridge.Inventory.MetadataMatches(updated.metadata, requested_metadata) or false
+end
+
+function Bridge.Inventory.CanCarryItem(source, item_name, count)
+    return inventory:canCarryItem(source, item_name, count) == true
+end
+
+function Bridge.Inventory.AddItem(source, item_name, count, slot, metadata)
+    if not Bridge.Inventory.CanCarryItem(source, item_name, count, metadata) then
+        return false
+    end
+    local success = inventory:addItem(source, item_name, count, metadata or {}, slot)
+    return success == true
+end
+
+function Bridge.Inventory.RemoveItem(source, item_name, count, slot, metadata)
+    if metadata and not slot then
+        local slots = Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
+        slot = slots[1] and slots[1].slot or nil
+        if not slot then
+            return 0
+        end
+    end
+    local success = inventory:removeItem(source, item_name, count, nil, slot)
+    return success == true and count or 0
+end
+
+function Bridge.Inventory.RegisterUsableItem(item_name, callback)
+    inventory:registerUsableItem(item_name, function(source, ...)
+        callback(source, normalize(Bridge.Inventory.ResolveUsableItem(...)))
+    end)
+    return true
+end

sky_phone/source/bridge/server/inventory/jpr.lua

@@ -0,0 +1,109 @@
+if Bridge.Inventory.Name ~= "jpr" then
+    return
+end
+
+if Bridge.Framework.GetName() ~= "qb" then
+    error("[sky_phone] jpr-inventory is only supported with QBCore.")
+end
+
+local inventory = exports["jpr-inventory"]
+local QBCore = exports["qb-core"]:GetCoreObject()
+
+local function normalize(item, fallback_slot)
+    local normalized = Bridge.Inventory.NormalizeItem(item, "info", fallback_slot)
+    if not normalized or not normalized.name or normalized.amount < 1 then
+        return nil
+    end
+    return normalized
+end
+
+local function get_inventory(source)
+    local player = QBCore.Functions.GetPlayer(tonumber(source))
+    return player and player.PlayerData.items or {}
+end
+
+local function restore_slot(source, slot, metadata)
+    local restored = inventory:AddItem(source, slot.name, slot.amount, slot.slot, metadata, "sky_phone:metadata-rollback")
+    if not restored then
+        Bridge.Debug(
+            "error",
+            "[sky_phone] jpr-inventory could not restore item '%s' in slot %s after a metadata update failed.",
+            tostring(slot.name),
+            tostring(slot.slot)
+        )
+    end
+    return restored == true
+end
+
+function Bridge.Inventory.GetResourceName()
+    return "jpr-inventory"
+end
+
+function Bridge.Inventory.GetSlot(source, slot_id)
+    local numeric_slot = tonumber(slot_id)
+    return numeric_slot and normalize(inventory:GetItemBySlot(source, numeric_slot), numeric_slot) or nil
+end
+
+function Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
+    local matches = {}
+    for index, item in pairs(get_inventory(source)) do
+        local normalized = normalize(item, tonumber(index) or index)
+        if normalized and normalized.name == item_name
+            and Bridge.Inventory.MetadataMatches(normalized.metadata, metadata) then
+            normalized.slot = normalized.slot or tonumber(index) or index
+            matches[#matches + 1] = normalized
+        end
+    end
+    return matches
+end
+
+function Bridge.Inventory.SetSlotMetadata(source, slot_id, metadata)
+    local slot = Bridge.Inventory.GetSlot(source, slot_id)
+    if not slot or slot.amount < 1 then
+        return false
+    end
+
+    local previous_metadata = slot.metadata
+    local requested_metadata = type(metadata) == "table" and metadata or {}
+    if inventory:RemoveItem(source, slot.name, slot.amount, slot.slot, "sky_phone:metadata-update") ~= true then
+        return false
+    end
+    if inventory:AddItem(source, slot.name, slot.amount, slot.slot, requested_metadata, "sky_phone:metadata-update") ~= true then
+        restore_slot(source, slot, previous_metadata)
+        return false
+    end
+
+    local updated = Bridge.Inventory.GetSlot(source, slot.slot)
+    if updated and Bridge.Inventory.MetadataMatches(updated.metadata, requested_metadata) then
+        return true
+    end
+
+    inventory:RemoveItem(source, slot.name, slot.amount, slot.slot, "sky_phone:metadata-rollback")
+    restore_slot(source, slot, previous_metadata)
+    return false
+end
+
+function Bridge.Inventory.CanCarryItem()
+    return true
+end
+
+function Bridge.Inventory.AddItem(source, item_name, count, slot, metadata)
+    return inventory:AddItem(source, item_name, count, slot, metadata or {}, "sky_phone") == true
+end
+
+function Bridge.Inventory.RemoveItem(source, item_name, count, slot, metadata)
+    if metadata and not slot then
+        local slots = Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
+        slot = slots[1] and slots[1].slot or nil
+        if not slot then
+            return 0
+        end
+    end
+    return inventory:RemoveItem(source, item_name, count, slot, "sky_phone") == true and count or 0
+end
+
+function Bridge.Inventory.RegisterUsableItem(item_name, callback)
+    return Bridge.Framework.RegisterUsableItem(item_name, function(source, ...)
+        callback(source, normalize(Bridge.Inventory.ResolveUsableItem(...)))
+    end)
+end

sky_phone/source/bridge/server/inventory/one.lua

@@ -0,0 +1,76 @@
+if Bridge.Inventory.Name ~= "one" then
+    return
+end
+
+local inventory = exports.one_inventory
+
+local function normalize(item, fallback_slot)
+    local normalized = Bridge.Inventory.NormalizeItem(item, nil, fallback_slot)
+    if not normalized or not normalized.name or normalized.amount < 1 then
+        return nil
+    end
+    return normalized
+end
+
+function Bridge.Inventory.GetResourceName()
+    return "one_inventory"
+end
+
+function Bridge.Inventory.GetSlot(source, slot_id)
+    local numeric_slot = tonumber(slot_id)
+    return numeric_slot and normalize(inventory:GetSlot(source, numeric_slot), numeric_slot) or nil
+end
+
+function Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
+    local matches = {}
+    for index, item in pairs(inventory:SearchInventory(source, item_name, metadata) or {}) do
+        local normalized = normalize(item, tonumber(index) or index)
+        if normalized and normalized.name == item_name
+            and Bridge.Inventory.MetadataMatches(normalized.metadata, metadata) then
+            matches[#matches + 1] = normalized
+        end
+    end
+    return matches
+end
+
+function Bridge.Inventory.SetSlotMetadata(source, slot_id, metadata)
+    local slot = Bridge.Inventory.GetSlot(source, slot_id)
+    if not slot then
+        return false
+    end
+
+    local requested_metadata = type(metadata) == "table" and metadata or {}
+    if inventory:SetItemMetadata(source, slot.slot, requested_metadata) ~= true then
+        return false
+    end
+    local updated = Bridge.Inventory.GetSlot(source, slot.slot)
+    return updated and Bridge.Inventory.MetadataMatches(updated.metadata, requested_metadata) or false
+end
+
+function Bridge.Inventory.CanCarryItem(source, item_name, count)
+    return inventory:CanCarryItem(source, item_name, count) == true
+end
+
+function Bridge.Inventory.AddItem(source, item_name, count, slot, metadata)
+    if not Bridge.Inventory.CanCarryItem(source, item_name, count, metadata) then
+        return false
+    end
+    return inventory:AddItem(source, item_name, count, metadata or {}, slot) == true
+end
+
+function Bridge.Inventory.RemoveItem(source, item_name, count, slot, metadata)
+    if metadata and not slot then
+        local slots = Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
+        slot = slots[1] and slots[1].slot or nil
+        if not slot then
+            return 0
+        end
+    end
+    return inventory:RemoveItem(source, item_name, count, metadata, slot) == true and count or 0
+end
+
+function Bridge.Inventory.RegisterUsableItem(item_name, callback)
+    return Bridge.Framework.RegisterUsableItem(item_name, function(source, ...)
+        callback(source, normalize(Bridge.Inventory.ResolveUsableItem(...)))
+    end)
+end

sky_phone/source/bridge/server/inventory/origen.lua

@@ -0,0 +1,88 @@
+if Bridge.Inventory.Name ~= "origen" then
+    return
+end
+
+local inventory = exports.origen_inventory
+
+local function normalize(item)
+    local normalized = Bridge.Inventory.NormalizeItem(item)
+    if not normalized or not normalized.name or normalized.amount < 1 then
+        return nil
+    end
+    return normalized
+end
+
+local function get_inventory(source)
+    local player_inventory = inventory:GetInventory(source)
+    return type(player_inventory) == "table" and type(player_inventory.inventory) == "table"
+        and player_inventory.inventory or {}
+end
+
+function Bridge.Inventory.GetResourceName()
+    return "origen_inventory"
+end
+
+function Bridge.Inventory.GetSlot(source, slot_id)
+    for index, item in pairs(get_inventory(source)) do
+        local normalized = normalize(item)
+        local item_slot = normalized and (normalized.slot or tonumber(index)) or nil
+        if tostring(item_slot) == tostring(slot_id) then
+            normalized.slot = item_slot
+            return normalized
+        end
+    end
+    return nil
+end
+
+function Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
+    local matches = {}
+    for index, item in pairs(get_inventory(source)) do
+        local normalized = normalize(item)
+        if normalized and normalized.name == item_name
+            and Bridge.Inventory.MetadataMatches(normalized.metadata, metadata) then
+            normalized.slot = normalized.slot or tonumber(index) or index
+            matches[#matches + 1] = normalized
+        end
+    end
+    return matches
+end
+
+function Bridge.Inventory.SetSlotMetadata(source, slot_id, metadata)
+    local slot = Bridge.Inventory.GetSlot(source, slot_id)
+    if not slot then
+        return false
+    end
+
+    local requested_metadata = type(metadata) == "table" and metadata or {}
+    inventory:setMetadata(source, slot.slot, requested_metadata)
+    local updated = Bridge.Inventory.GetSlot(source, slot.slot)
+    return updated and Bridge.Inventory.MetadataMatches(updated.metadata, requested_metadata) or false
+end
+
+function Bridge.Inventory.CanCarryItem(source, item_name, count)
+    return inventory:canCarryItem(source, item_name, count) == true
+end
+
+function Bridge.Inventory.AddItem(source, item_name, count, slot, metadata)
+    if not Bridge.Inventory.CanCarryItem(source, item_name, count, metadata) then
+        return false
+    end
+    return inventory:addItem(source, item_name, count, metadata or {}, slot, false) == true
+end
+
+function Bridge.Inventory.RemoveItem(source, item_name, count, slot, metadata)
+    if metadata and not slot then
+        local slots = Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
+        slot = slots[1] and slots[1].slot or nil
+        if not slot then
+            return 0
+        end
+    end
+    return inventory:removeItem(source, item_name, count, nil, slot, false) == true and count or 0
+end
+
+function Bridge.Inventory.RegisterUsableItem(item_name, callback)
+    return Bridge.Framework.RegisterUsableItem(item_name, function(source, ...)
+        callback(source, normalize(Bridge.Inventory.ResolveUsableItem(...)))
+    end)
+end

sky_phone/source/bridge/server/inventory/ox.lua

@@ -44,8 +44,10 @@ function Bridge.Inventory.SetSlotMetadata(source, slot_id, metadata)
         return false
     end
 
-    inventory:SetMetadata(source, tonumber(slot_id), metadata or {})
-    return true
+    local requested_metadata = type(metadata) == "table" and metadata or {}
+    inventory:SetMetadata(source, tonumber(slot_id), requested_metadata)
+    local updated = Bridge.Inventory.GetSlot(source, slot_id)
+    return updated and Bridge.Inventory.MetadataMatches(updated.metadata, requested_metadata) or false
 end
 
 function Bridge.Inventory.CanCarryItem(source, item_name, count, metadata)

sky_phone/source/bridge/server/inventory/ps.lua

@@ -0,0 +1,109 @@
+if Bridge.Inventory.Name ~= "ps" then
+    return
+end
+
+if Bridge.Framework.GetName() ~= "qb" then
+    error("[sky_phone] ps-inventory is only supported with QBCore.")
+end
+
+local inventory = exports["ps-inventory"]
+local QBCore = exports["qb-core"]:GetCoreObject()
+
+local function normalize(item, fallback_slot)
+    local normalized = Bridge.Inventory.NormalizeItem(item, "info", fallback_slot)
+    if not normalized or not normalized.name or normalized.amount < 1 then
+        return nil
+    end
+    return normalized
+end
+
+local function get_inventory(source)
+    local player = QBCore.Functions.GetPlayer(tonumber(source))
+    return player and player.PlayerData.items or {}
+end
+
+local function restore_slot(source, slot, metadata)
+    local restored = inventory:AddItem(source, slot.name, slot.amount, slot.slot, metadata)
+    if not restored then
+        Bridge.Debug(
+            "error",
+            "[sky_phone] ps-inventory could not restore item '%s' in slot %s after a metadata update failed.",
+            tostring(slot.name),
+            tostring(slot.slot)
+        )
+    end
+    return restored == true
+end
+
+function Bridge.Inventory.GetResourceName()
+    return "ps-inventory"
+end
+
+function Bridge.Inventory.GetSlot(source, slot_id)
+    local numeric_slot = tonumber(slot_id)
+    return numeric_slot and normalize(inventory:GetItemBySlot(source, numeric_slot), numeric_slot) or nil
+end
+
+function Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
+    local matches = {}
+    for index, item in pairs(get_inventory(source)) do
+        local normalized = normalize(item, tonumber(index) or index)
+        if normalized and normalized.name == item_name
+            and Bridge.Inventory.MetadataMatches(normalized.metadata, metadata) then
+            normalized.slot = normalized.slot or tonumber(index) or index
+            matches[#matches + 1] = normalized
+        end
+    end
+    return matches
+end
+
+function Bridge.Inventory.SetSlotMetadata(source, slot_id, metadata)
+    local slot = Bridge.Inventory.GetSlot(source, slot_id)
+    if not slot or slot.amount < 1 then
+        return false
+    end
+
+    local previous_metadata = slot.metadata
+    local requested_metadata = type(metadata) == "table" and metadata or {}
+    if inventory:RemoveItem(source, slot.name, slot.amount, slot.slot) ~= true then
+        return false
+    end
+    if inventory:AddItem(source, slot.name, slot.amount, slot.slot, requested_metadata) ~= true then
+        restore_slot(source, slot, previous_metadata)
+        return false
+    end
+
+    local updated = Bridge.Inventory.GetSlot(source, slot.slot)
+    if updated and Bridge.Inventory.MetadataMatches(updated.metadata, requested_metadata) then
+        return true
+    end
+
+    inventory:RemoveItem(source, slot.name, slot.amount, slot.slot)
+    restore_slot(source, slot, previous_metadata)
+    return false
+end
+
+function Bridge.Inventory.CanCarryItem()
+    return true
+end
+
+function Bridge.Inventory.AddItem(source, item_name, count, slot, metadata)
+    return inventory:AddItem(source, item_name, count, slot, metadata or {}) == true
+end
+
+function Bridge.Inventory.RemoveItem(source, item_name, count, slot, metadata)
+    if metadata and not slot then
+        local slots = Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
+        slot = slots[1] and slots[1].slot or nil
+        if not slot then
+            return 0
+        end
+    end
+    return inventory:RemoveItem(source, item_name, count, slot) == true and count or 0
+end
+
+function Bridge.Inventory.RegisterUsableItem(item_name, callback)
+    return Bridge.Framework.RegisterUsableItem(item_name, function(source, ...)
+        callback(source, normalize(Bridge.Inventory.ResolveUsableItem(...)))
+    end)
+end

sky_phone/source/bridge/server/inventory/tgiann.lua

@@ -0,0 +1,75 @@
+if Bridge.Inventory.Name ~= "tgiann" then
+    return
+end
+
+local inventory = exports["tgiann-inventory"]
+
+local function normalize(item, fallback_slot)
+    local normalized = Bridge.Inventory.NormalizeItem(item, "info", fallback_slot)
+    if not normalized or not normalized.name or normalized.amount < 1 then
+        return nil
+    end
+    return normalized
+end
+
+function Bridge.Inventory.GetResourceName()
+    return "tgiann-inventory"
+end
+
+function Bridge.Inventory.GetSlot(source, slot_id)
+    local numeric_slot = tonumber(slot_id)
+    return numeric_slot and normalize(inventory:GetItemBySlot(source, numeric_slot), numeric_slot) or nil
+end
+
+function Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
+    local matches = {}
+    for index, item in pairs(inventory:GetPlayerItems(source) or {}) do
+        local normalized = normalize(item, tonumber(index) or index)
+        if normalized and normalized.name == item_name
+            and Bridge.Inventory.MetadataMatches(normalized.metadata, metadata) then
+            normalized.slot = normalized.slot or tonumber(index) or index
+            matches[#matches + 1] = normalized
+        end
+    end
+    return matches
+end
+
+function Bridge.Inventory.SetSlotMetadata(source, slot_id, metadata)
+    local slot = Bridge.Inventory.GetSlot(source, slot_id)
+    if not slot then
+        return false
+    end
+
+    local requested_metadata = type(metadata) == "table" and metadata or {}
+    inventory:UpdateItemMetadata(source, slot.name, slot.slot, requested_metadata)
+    local updated = Bridge.Inventory.GetSlot(source, slot.slot)
+    return updated and Bridge.Inventory.MetadataMatches(updated.metadata, requested_metadata) or false
+end
+
+function Bridge.Inventory.CanCarryItem(source, item_name, count)
+    return inventory:CanCarryItem(source, item_name, count) == true
+end
+
+function Bridge.Inventory.AddItem(source, item_name, count, slot, metadata)
+    if not Bridge.Inventory.CanCarryItem(source, item_name, count, metadata) then
+        return false
+    end
+    return inventory:AddItem(source, item_name, count, slot, metadata or {}) == true
+end
+
+function Bridge.Inventory.RemoveItem(source, item_name, count, slot, metadata)
+    if metadata and not slot then
+        local slots = Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
+        slot = slots[1] and slots[1].slot or nil
+        if not slot then
+            return 0
+        end
+    end
+    return inventory:RemoveItem(source, item_name, count, slot, metadata) == true and count or 0
+end
+
+function Bridge.Inventory.RegisterUsableItem(item_name, callback)
+    return Bridge.Framework.RegisterUsableItem(item_name, function(source, ...)
+        callback(source, normalize(Bridge.Inventory.ResolveUsableItem(...)))
+    end)
+end