Trader tool: OAuth support, match mods by tradeHash (fixes many local and essence mods), add price sorting, add radius jewels, notice when rate limited (#1801)

* port compatible trader tool changes from pob1

* Fix corrupted mods being fractured mods in trade mod generation

* Fix radius jewel weight generation

* Regenerate QueryMods.lua

* convert trade tool mod weight generation to use tradeHash

* wip: change poesessid to bearer token

* Cleanup: remove extra logout button and fix poeapi comments

* Fix trader crash when rate limited on startup

* Use https://poe.ninja/poe2/api/economy/exchange/current/overview for currency rates

* Fix poe.ninja tests

* Fix trader section anchor

* Adjust price scaling factor due to things being in divs (still an abitrary number)

* Clarify price options and rate limit waits, and use Retry-After for rate limiting waits if possible

* rate limiting pls work

* Fix perfect essences not appearing in generated weights, and regenerate querymods.lua

* Fix tradehashes for radius jewels

* Improve rate limit countdown to prevent simplegraphic suspension problems, and to show it on non-429 rate limit. (429 issue solved on GGG's side)

* Fix debug print causing crash, and remove extra debug print

* disable wiping trader controls to fix crash when it is closed and a search tries to add results to controls

* Add note about doing weird filter requirements (e.g. adorned)

* remove whisper for instant buyout items

* make cspell happy

* Fix database radius jewels being nonfunctional

* Fix currency conversion button not being updated after reopening trader panel

* Avoid useless search in "search for" button

* fix api error on invalid token

* disable reuseaddr

* Rework OAuth server launch code to avoid shared port usage

* Remove error code on login and fix hanging item slot controls in tradequery

* Fix QueryMods.lua generation. Change soulcores.lua to export trade hashes in a similar format as previous mod export changes.

* Add note about trade hashes

* Fix curse querymod.lua test

* Clear authorization on 403 to fix outdated scope in trader

* Use enum in mods.lua and format it

* Fix typo in mods.lua

* Fix module being a global variable and compare trade helpers into one file

* Remove forgotten debug prints

* Fix trade hash generation

* add note about radius jewel mods

* Fix rune weight generation and regenerate QueryMods.lua

* Fix whitespace in related files

* Fix error handling on oauth login

* Fix price sum sorting in trade

* Move print call so it doesn't get spammed in tests

---------

Co-authored-by: Wires77 <Wires77@users.noreply.github.com>

Author: vaisest

runtime/lua/socket.lua

@@ -17,53 +17,56 @@ local _M = socket
 -- Exported auxiliar functions
 -----------------------------------------------------------------------------
 function _M.connect4(address, port, laddress, lport)
-    return socket.connect(address, port, laddress, lport, "inet")
+	return socket.connect(address, port, laddress, lport, "inet")
 end
 
 function _M.connect6(address, port, laddress, lport)
-    return socket.connect(address, port, laddress, lport, "inet6")
+	return socket.connect(address, port, laddress, lport, "inet6")
 end
 
 function _M.bind(host, port, backlog)
-    if host == "*" then host = "0.0.0.0" end
-    local addrinfo, err = socket.dns.getaddrinfo(host);
-    if not addrinfo then return nil, err end
-    local sock, res
-    err = "no info on address"
-    for i, alt in base.ipairs(addrinfo) do
-        if alt.family == "inet" then
-            sock, err = socket.tcp4()
-        else
-            sock, err = socket.tcp6()
-        end
-        if not sock then return nil, err end
-        sock:setoption("reuseaddr", true)
-        res, err = sock:bind(alt.addr, port)
-        if not res then
-            sock:close()
-        else
-            res, err = sock:listen(backlog)
-            if not res then
-                sock:close()
-            else
-                return sock
-            end
-        end
-    end
-    return nil, err
+	if host == "*" then host = "0.0.0.0" end
+	local addrinfo, err = socket.dns.getaddrinfo(host);
+	if not addrinfo then return nil, err end
+	local sock, res
+	err = "no info on address"
+	for i, alt in base.ipairs(addrinfo) do
+		if alt.family == "inet" then
+			sock, err = socket.tcp4()
+		else
+			sock, err = socket.tcp6()
+		end
+		if not sock then return nil, err end
+		-- sock:setoption("reuseaddr", true)
+		res, err = sock:bind(alt.addr, port)
+		if not res then
+			sock:close()
+		else
+			res, err = sock:listen(backlog)
+			if not res then
+				sock:close()
+			else
+				return sock
+			end
+		end
+	end
+	return nil, err
 end
 
 _M.try = _M.newtry()
 
 function _M.choose(table)
-    return function(name, opt1, opt2)
-        if base.type(name) ~= "string" then
-            name, opt1, opt2 = "default", name, opt1
-        end
-        local f = table[name or "nil"]
-        if not f then base.error("unknown key (".. base.tostring(name) ..")", 3)
-        else return f(opt1, opt2) end
-    end
+	return function(name, opt1, opt2)
+		if base.type(name) ~= "string" then
+			name, opt1, opt2 = "default", name, opt1
+		end
+		local f = table[name or "nil"]
+		if not f then
+			base.error("unknown key (" .. base.tostring(name) .. ")", 3)
+		else
+			return f(opt1, opt2)
+		end
+	end
 end
 
 -----------------------------------------------------------------------------
@@ -77,68 +80,76 @@ _M.sinkt = sinkt
 _M.BLOCKSIZE = 2048
 
 sinkt["close-when-done"] = function(sock)
-    return base.setmetatable({
-        getfd = function() return sock:getfd() end,
-        dirty = function() return sock:dirty() end
-    }, {
-        __call = function(self, chunk, err)
-            if not chunk then
-                sock:close()
-                return 1
-            else return sock:send(chunk) end
-        end
-    })
+	return base.setmetatable({
+		getfd = function() return sock:getfd() end,
+		dirty = function() return sock:dirty() end
+	}, {
+		__call = function(self, chunk, err)
+			if not chunk then
+				sock:close()
+				return 1
+			else
+				return sock:send(chunk)
+			end
+		end
+	})
 end
 
 sinkt["keep-open"] = function(sock)
-    return base.setmetatable({
-        getfd = function() return sock:getfd() end,
-        dirty = function() return sock:dirty() end
-    }, {
-        __call = function(self, chunk, err)
-            if chunk then return sock:send(chunk)
-            else return 1 end
-        end
-    })
+	return base.setmetatable({
+		getfd = function() return sock:getfd() end,
+		dirty = function() return sock:dirty() end
+	}, {
+		__call = function(self, chunk, err)
+			if chunk then
+				return sock:send(chunk)
+			else
+				return 1
+			end
+		end
+	})
 end
 
 sinkt["default"] = sinkt["keep-open"]
 
 _M.sink = _M.choose(sinkt)
 
 sourcet["by-length"] = function(sock, length)
-    return base.setmetatable({
-        getfd = function() return sock:getfd() end,
-        dirty = function() return sock:dirty() end
-    }, {
-        __call = function()
-            if length <= 0 then return nil end
-            local size = math.min(socket.BLOCKSIZE, length)
-            local chunk, err = sock:receive(size)
-            if err then return nil, err end
-            length = length - string.len(chunk)
-            return chunk
-        end
-    })
+	return base.setmetatable({
+		getfd = function() return sock:getfd() end,
+		dirty = function() return sock:dirty() end
+	}, {
+		__call = function()
+			if length <= 0 then return nil end
+			local size = math.min(socket.BLOCKSIZE, length)
+			local chunk, err = sock:receive(size)
+			if err then return nil, err end
+			length = length - string.len(chunk)
+			return chunk
+		end
+	})
 end
 
 sourcet["until-closed"] = function(sock)
-    local done
-    return base.setmetatable({
-        getfd = function() return sock:getfd() end,
-        dirty = function() return sock:dirty() end
-    }, {
-        __call = function()
-            if done then return nil end
-            local chunk, err, partial = sock:receive(socket.BLOCKSIZE)
-            if not err then return chunk
-            elseif err == "closed" then
-                sock:close()
-                done = 1
-                return partial
-            else return nil, err end
-        end
-    })
+	local done
+	return base.setmetatable({
+		getfd = function() return sock:getfd() end,
+		dirty = function() return sock:dirty() end
+	}, {
+		__call = function()
+			if done then return nil end
+			local chunk, err, partial = sock:receive(socket.BLOCKSIZE)
+			if not err then
+				return chunk
+			elseif err == "closed" then
+				sock:close()
+				done = 1
+				return partial
+			else
+				return nil, err
+			end
+		end
+	})
 end
 
 

spec/System/TestTradeQueryCurrency_spec.lua

@@ -1,65 +1,82 @@
 describe("TradeQuery Currency Conversion", function()
-	local mock_tradeQuery = new("TradeQuery", { itemsTab = {} })
+	local mock_tradeQuery
 
-	-- test case for commit: "Skip callback on errors to prevent incomplete conversions"
-	describe("FetchCurrencyConversionTable", function()
-		-- Pass: Callback not called on error
-		-- Fail: Callback called, indicating partial data risk
-		it("skips callback on error", function()
-			local orig_launch = launch
-			local spy = { called = false }
-			launch = {
-				DownloadPage = function(url, callback, opts)
-					callback(nil, "test error")
-				end
-			}
-			mock_tradeQuery:FetchCurrencyConversionTable(function()
-				spy.called = true
-			end)
-			launch = orig_launch
-			assert.is_false(spy.called)
-		end)
+	before_each(function()
+		mock_tradeQuery = new("TradeQuery", { itemsTab = {} })
 	end)
 
-	describe("ConvertCurrencyToChaos", function()
-		-- Pass: Ceils amount to integer (e.g., 4.9 -> 5)
-		-- Fail: Wrong value or nil, indicating broken rounding/baseline logic, causing inaccurate chaos totals
+	describe("ConvertCurrencyToDivs", function()
+		-- Pass: Calculates price in divs
+		-- Fail: Wrong value or nil, indicating broken rounding/baseline logic
 		it("handles chaos currency", function()
-			mock_tradeQuery.pbCurrencyConversion = { league = { chaos = 1 } }
+			mock_tradeQuery.pbCurrencyConversion = { league = { chaos = 0.1 } }
 			mock_tradeQuery.pbLeague = "league"
-			local result = mock_tradeQuery:ConvertCurrencyToChaos("chaos", 4.9)
-			assert.are.equal(result, 5)
+			local result = mock_tradeQuery:ConvertCurrencyToDivs("chaos", 5)
+			assert.are.equal(result, 0.5)
 		end)
 
 		-- Pass: Returns nil without crash
 		-- Fail: Crashes or wrong value, indicating unhandled currencies, corrupting price conversions
 		it("returns nil for unmapped", function()
-			local result = mock_tradeQuery:ConvertCurrencyToChaos("exotic", 10)
+			local result = mock_tradeQuery:ConvertCurrencyToDivs("exotic", 10)
 			assert.is_nil(result)
 		end)
 	end)
 
 	describe("PriceBuilderProcessPoENinjaResponse", function()
-		-- Pass: Processes without error, restoring map
+		-- Pass: Processes without error, restoring map while adding a notice
 		-- Fail: Corrupts map or crashes, indicating fragile API response handling, breaking future conversions
-		it("handles unmapped currency", function()
+		it("handles empty response", function()
 			local orig_conv = mock_tradeQuery.currencyConversionTradeMap
 			mock_tradeQuery.currencyConversionTradeMap = { div = "id" }
-			local resp = { exotic = 10 }
-			mock_tradeQuery:PriceBuilderProcessPoENinjaResponse(resp)
+			mock_tradeQuery.pbLeague = "league"
+			mock_tradeQuery.pbCurrencyConversion = { league = {} }
+			mock_tradeQuery.controls.pbNotice = { label = "" }
+			local resp = { lines = {  }}
+			mock_tradeQuery:PriceBuilderProcessPoENinjaResponse(resp.lines)
 			-- No crash expected
 			assert.is_true(true)
+			assert.is_true(mock_tradeQuery.controls.pbNotice.label == "No currencies received from PoE Ninja")
+			mock_tradeQuery.currencyConversionTradeMap = orig_conv
+		end)
+
+		-- Pass: Processes without error, restoring map while adding a notice
+		-- Fail: Corrupts map or crashes, indicating fragile API response handling, breaking future conversions
+		it("handles empty response", function()
+			local orig_conv = mock_tradeQuery.currencyConversionTradeMap
+			mock_tradeQuery.currencyConversionTradeMap = { div = "id" }
+			mock_tradeQuery.pbLeague = "league"
+			mock_tradeQuery.pbCurrencyConversion = { league = {} }
+			mock_tradeQuery.controls.pbNotice = { label = "" }
+			local resp = { lines = { { malformedLine = "lol"} }}
+			mock_tradeQuery:PriceBuilderProcessPoENinjaResponse(resp.lines)
+			-- No crash expected
+			assert.is_true(true)
+			assert.is_true(mock_tradeQuery.controls.pbNotice.label == "Currencies not updated: malformed PoE Ninja response")
 			mock_tradeQuery.currencyConversionTradeMap = orig_conv
 		end)
 	end)
 
 	describe("GetTotalPriceString", function()
-		-- Pass: Sums and formats correctly (e.g., "5 chaos, 10 div")
+		-- Pass: Sums and formats correctly (e.g., "5 chaos, 10 div", should be most valuable currency first)
 		-- Fail: Wrong string (e.g., unsorted/missing sums), indicating aggregation bug, misleading users on totals
 		it("aggregates prices", function()
-			mock_tradeQuery.totalPrice = { { currency = "chaos", amount = 5 }, { currency = "div", amount = 10 } }
+			-- check alphabetical sorting
+			mock_tradeQuery.totalPrice = { { currency = "chaos", amount = 5 }, { currency = "div", amount = 10 }, {currency = "exalted", amount = 1} }
+			local result = mock_tradeQuery:GetTotalPriceString()
+			assert.are.equal(result, "1 exalted, 10 div, 5 chaos")
+
+			-- check if they're sorted according to currency value
+			mock_tradeQuery.pbLeague = "league"
+			mock_tradeQuery.pbCurrencyConversion = { league = { chaos = 0.1, exalted = 0.05, div = 1, mirror = 700} }
+			local result = mock_tradeQuery:GetTotalPriceString()
+			assert.are.equal(result, "10 div, 5 chaos, 1 exalted")
+
+			-- check that missing currency values don't crash
+			mock_tradeQuery.pbLeague = "league"
+			mock_tradeQuery.pbCurrencyConversion = { league = { chaos = 0.1, exalted = 0.05, mirror = 700 } }
 			local result = mock_tradeQuery:GetTotalPriceString()
-			assert.are.equal(result, "5 chaos, 10 div")
+			assert.True(true)
 		end)
 	end)
 end)

spec/System/TestTradeQueryGenerator_spec.lua

@@ -5,8 +5,8 @@ describe("TradeQueryGenerator", function()
 		-- Pass: Mod line maps correctly to trade stat entry without error
 		-- Fail: Mapping fails (e.g., no match found), indicating incomplete stat parsing for curse mods, potentially missing curse-enabling items in queries
 		it("handles special curse case", function()
-			local mod = { "You can apply an additional Curse" }
-			local tradeStatsParsed = { result = { [2] = { entries = { { text = "You can apply # additional Curses", id = "id" } } } } }
+			local mod = { tradeHashes = {[30642521] = {"You can apply an additional Curse"}} }
+			local tradeStatsParsed = { result = { [2] = { entries = { { text = "You can apply # additional Curses", id = "explicit.stat_30642521" } } } } }
 			mock_queryGen.modData = { Explicit = true }
 			mock_queryGen:ProcessMod(mod, tradeStatsParsed, 1)
 			-- Simplified assertion; in full impl, check modData

spec/System/TestTradeQueryRequests_spec.lua

@@ -65,6 +65,42 @@ describe("TradeQueryRequests", function()
 			launch = orig_launch
 		end)
 
+		-- Pass: Does not crash on 401, and passes error message
+		-- Fail: Crash, or returned error is wrong
+		it("does not crash on 401", function()
+			local json = '"{"error":"invalid_token","error_description":"The access token provided is invalid or has expired"}"'
+			local header = [[HTTP/1.1 401 Unauthorized
+Date: Fri, 24 Apr 2026 07:30:38 GMT
+Content-Type: application/json
+Transfer-Encoding: chunked
+Connection: keep-alive
+Server: cloudflare
+WWW-Authenticate: Bearer realm="pathofexile:production", error="invalid_token", error_description="The access token provided is invalid or has expired"
+Cache-Control: no-store
+Strict-Transport-Security: max-age=63115200; includeSubDomains; preload]]
+		local orig_launch = launch
+			launch = {
+				DownloadPage = function(url, onComplete, opts)
+					onComplete({ body = json, header = header }, nil)
+				end
+			}
+			table.insert(requests.requestQueue.search, {
+				url = "test",
+				callback = function(body, msg)
+					assert.are.equal(body, json)
+					assert.truthy(msg:find("Response code: 401"))
+				end,
+				retryTime = nil
+			})
+			local function mock_next_time(self, policy, time)
+				return time - 1
+			end
+			mock_limiter.NextRequestTime = mock_next_time
+			requests:ProcessQueue()
+			assert.are.equal(#requests.requestQueue.search, 0)
+			launch = orig_launch
+		end)
+
 		-- Pass: Retries with increasing backoff up to cap, preventing infinite loops
 		-- Fail: No backoff or uncapped, indicating retry bug, risking API bans
 		it("retries on 429 with exponential backoff", function()