refactor: enhance channel message handling with dual-mode support for legacy and target channels

This commit is contained in:
MayaTheShy
2026-03-26 16:19:25 -04:00
parent bdf7a51675
commit ea90a860e9

View File

@@ -579,7 +579,9 @@ parallel.waitForAny(
while true do while true do
local event, side, channel, replyChannel, message = os.pullEvent("modem_message") local event, side, channel, replyChannel, message = os.pullEvent("modem_message")
if channel == STATUS_CHANNEL and type(message) == "table" then -- Uses Channels.match() for dual-mode safety: accepts messages on
-- both legacy (102/103) and target (4212/4213) channels during migration.
if Channels.match('remoteturtle.status', channel) and type(message) == "table" then
if message.type == "status" then if message.type == "status" then
-- Update turtle list -- Update turtle list
local found = false local found = false
@@ -595,7 +597,7 @@ parallel.waitForAny(
addLog("Turtle #" .. message.turtleID .. " connected", colors.lime) addLog("Turtle #" .. message.turtleID .. " connected", colors.lime)
end end
end end
elseif channel == POCKET_CHANNEL and type(message) == "table" then elseif Channels.match('remoteturtle.pocket', channel) and type(message) == "table" then
-- Handle responses from webbridge -- Handle responses from webbridge
if message.type == "webbridge_status" then if message.type == "webbridge_status" then
webbridgeStatus = message.data webbridgeStatus = message.data