diff --git a/handlers.lua b/handlers.lua index 20b2964..877f9de 100644 --- a/handlers.lua +++ b/handlers.lua @@ -74,29 +74,21 @@ function handlers.handlePasswordInput() local event = { os.pullEvent() } local eventType = event[1] - utils.log("DEBUG: Password handler received event: " .. tostring(eventType)) - -- Handle GDO events if eventType == "transceiver_transmission_received" then -- Pass to GDO handler - utils.log("DEBUG: Processing GDO transmission in password handler") handlers.handleGDOTransmission(table.unpack(event)) -- Continue loop to check iris state elseif eventType == "stargate_message_received" then -- Pass to message handler handlers.handleMessage(table.unpack(event)) - utils.log("DEBUG: Message in password handler: " .. tostring(state.lastReceivedMessage)) -- Check if iris opened (via password or GDO) if state.lastReceivedMessage == "IRIS_OPEN" or state.lastReceivedMessage == "GDO_IRIS_OPEN" then - utils.log("Received iris open confirmation: " .. state.lastReceivedMessage) + utils.debug("Password handler: Received " .. state.lastReceivedMessage) state.lastReceivedMessage = nil - utils.log("DEBUG: Setting enteringPassword to false") state.enteringPassword = false - utils.log("DEBUG: state.enteringPassword is now: " .. tostring(state.enteringPassword)) - utils.log("DEBUG: About to return IRIS_OPENED from password handler") - local returnValue = "IRIS_OPENED" - utils.log("DEBUG: Return value set to: " .. returnValue) - return returnValue + utils.debug("Password handler: About to return IRIS_OPENED") + return "IRIS_OPENED" end elseif eventType == "monitor_touch" then local x, y = event[3], event[4] @@ -133,16 +125,12 @@ function handlers.handlePasswordInput() end end - utils.log("DEBUG: Exited password entry loop") - -- If we got here with a password, send it if password ~= "" then utils.sendPasswordAttempt(password) - utils.log("DEBUG: Returning password: " .. password) return password end - utils.log("DEBUG: Returning nil from password handler") return nil end diff --git a/startup.lua b/startup.lua index 4c94dc9..4b791c2 100644 --- a/startup.lua +++ b/startup.lua @@ -253,7 +253,10 @@ local function GetGDOTransmission() end local function HandlePasswordEntry() - return handlers.handlePasswordInput() + utils.debug("HandlePasswordEntry: Calling handlers.handlePasswordInput()") + local result = handlers.handlePasswordInput() + utils.debug("HandlePasswordEntry: handlers.handlePasswordInput() returned: " .. tostring(result)) + return result end local function HandleIncomingPasswordRequest(password) @@ -744,9 +747,6 @@ local function handleOutgoingDial() local message = state.lastReceivedMessage state.lastReceivedMessage = nil - -- DEBUG: Print all messages received - print("DEBUG: Message received: " .. tostring(message)) - utils.log("DEBUG: Message received: " .. tostring(message)) utils.debug("Received: " .. tostring(message)) if message and message:sub(1, 6) == "SGCS_V" then @@ -772,18 +772,13 @@ local function handleOutgoingDial() else -- Timeout - if we got a version message, assume no password required if state.remoteHasComputer and (os.clock() - lastMessageTime) > 0.5 then - print("DEBUG: Breaking - got version, no password request after 0.5s") break -- No more messages coming elseif not state.remoteHasComputer and (os.clock() - startTime) > 1 then - print("DEBUG: Breaking - no version message after 1s") break -- No computer at remote gate end end end - print("DEBUG: Message collection complete. remoteHasComputer=" .. - tostring(state.remoteHasComputer) .. ", remotePasswordRequired=" .. tostring(state.remotePasswordRequired)) - -- Check if remote iris is closed using transceiver local remoteIrisState = nil if transceiver then @@ -811,15 +806,19 @@ local function handleOutgoingDial() local result = HandlePasswordEntry() - utils.log("DEBUG: HandlePasswordEntry returned: " .. tostring(result)) + utils.debug("HandlePasswordEntry returned: " .. tostring(result)) + utils.debug("Type of result: " .. type(result)) + utils.debug("result == 'IRIS_OPENED': " .. tostring(result == "IRIS_OPENED")) -- Check if iris opened during password entry (via GDO) if result == "IRIS_OPENED" then + utils.debug("Setting connectionSafe=true after IRIS_OPENED") utils.log("Iris opened during password entry (via GDO or message)") connectionSafe = true -- Show success message briefly display.showPasswordResult(true) sleep(1) + utils.debug("After success display, connectionSafe=" .. tostring(connectionSafe)) elseif result then -- Password was entered, send it utils.debug("Sent: IRIS_PASSWORD:" .. result) @@ -850,10 +849,8 @@ local function handleOutgoingDial() -- Re-check iris state after password/GDO attempt if transceiver then remoteIrisState = transceiver.checkConnectedShielding() - utils.log("Re-checked remote iris state: " .. tostring(remoteIrisState)) if not remoteIrisState or remoteIrisState == 0 then connectionSafe = true - utils.log("Remote iris confirmed open") end end end @@ -889,6 +886,7 @@ local function handleOutgoingDial() -- Only open local iris if connection is safe if connectionSafe and config.irisEnabled then + utils.debug("Opening local iris NOW") utils.log("Connection safe - opening local iris") -- Wait 2 seconds to avoid voiding the iris sleep(2) diff --git a/utils.lua b/utils.lua index 78954a5..aa7aeb6 100644 --- a/utils.lua +++ b/utils.lua @@ -26,7 +26,7 @@ function utils.log(message) local logEntry = "[" .. timestamp .. "] " .. message -- Write to console - print(logEntry) + -- print(logEntry) -- TEMPORARILY DISABLED -- Write to file local file = fs.open(config.logFile, "a")