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

runtime/lua/socket.lua

@@ -37,7 +37,7 @@ function _M.bind(host, port, backlog)
             sock, err = socket.tcp6()
         end
         if not sock then return nil, err end
-        sock:setoption("reuseaddr", true)
+        -- sock:setoption("reuseaddr", true)
         res, err = sock:bind(alt.addr, port)
         if not res then
             sock:close()

spec/System/TestTradeQueryCurrency_spec.lua

@@ -1,54 +1,58 @@
 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)

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()

src/Classes/CalcSectionControl.lua

@@ -246,7 +246,7 @@ function CalcSectionClass:Draw(viewPort, noTooltip)
 			DrawString(x + 3, lineY + 3, "LEFT", 16, "VAR BOLD", textColor..subSec.label..":")
 			if subSec.data.extra then
 				local x = x + 3 + DrawStringWidth(16, "VAR BOLD", subSec.label) + 10
-				DrawString(x, lineY + 3, "LEFT", 16, "VAR", "^7"..self:FormatStr(subSec.data.extra, actor))
+				DrawString(x, lineY + 3, "LEFT", 16, "VAR", "^7"..formatCalcStr(subSec.data.extra, actor))
 			end
 		end
 		-- Draw line below label
@@ -301,7 +301,7 @@ function CalcSectionClass:Draw(viewPort, noTooltip)
 							end
 							local textSize = rowData.textSize or 14
 							SetViewport(colData.x + 3, colData.y, colData.width - 4, colData.height)
-							DrawString(1, 9 - textSize/2, "LEFT", textSize, "VAR", "^7"..self:FormatStr(colData.format, actor, colData))
+							DrawString(1, 9 - textSize/2, "LEFT", textSize, "VAR", "^7"..formatCalcStr(colData.format, actor, colData))
 							SetViewport()
 						end
 					end