Skip to content

fix: collapse duplicate debuggerSession state to single source #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
failfmi merged 1 commit into from
Apr 30, 2026
Merged

fix: collapse duplicate debuggerSession state to single source #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 10 additions & 15 deletions src/extension.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const { TreeView } = require('./managers/treeView');
const { StateMonitor } = require('./managers/stateMonitor');


const { setDebuggerSession, clearDebuggerSession } = require('./managers/sessionManager');
const { getDebuggerSession, setDebuggerSession, clearDebuggerSession } = require('./managers/sessionManager');

const { isSessionRunning } = require('./debug');
const { safeReadDir } = require('./projectStructure');
Expand All @@ -21,8 +21,6 @@ const crypto = require('crypto');
const fs = require('fs');
const { log, error } = require('./logger');

// TODO(lime): duplicate debuggerSession state — also tracked in sessionManager.js. Collapse to one source of truth
let debuggerSession = null;
let debuggerDisposables = [];
let stateMonitor = null;
let engaged = false;
Expand Down Expand Up @@ -180,21 +178,19 @@ async function activate(context) {
return;
}

const sessionStateInstance = createSessionState();
setDebuggerSession(sessionStateInstance);
debuggerSession = sessionStateInstance;

debuggerSession.tcpPort = globalState.tcpPort;
const session = createSessionState();
session.tcpPort = globalState.tcpPort;
setDebuggerSession(session);

try {
log('Starting debug session...');
const scanned = await scanDeployDirectory(debuggerSession);
const scanned = await scanDeployDirectory(session);
if (!scanned) return;
log('Scanned deploy directory:', JSON.stringify(debuggerSession.executablesPaths));
log('Program ID map:', JSON.stringify(debuggerSession.programIdToHash));
log('Hash to name map:', JSON.stringify(debuggerSession.programHashToProgramName));
log('Scanned deploy directory:', JSON.stringify(session.executablesPaths));
log('Program ID map:', JSON.stringify(session.programIdToHash));
log('Hash to name map:', JSON.stringify(session.programHashToProgramName));

log('Starting port listener on port:', debuggerSession.tcpPort);
log('Starting port listener on port:', session.tcpPort);
await startPortDebugListener();
} catch (err) {
error('Error:', err);
Expand Down Expand Up @@ -233,11 +229,10 @@ async function deactivate() {
}

async function startPortDebugListener() {
await portManager.listenAndStartDebugForPort(debuggerSession.tcpPort);
await portManager.listenAndStartDebugForPort(getDebuggerSession().tcpPort);
}

function cleanupDebuggerSession() {
debuggerSession = null;
clearDebuggerSession();
stateMonitor?.tick();
}
Expand Down
1 change: 0 additions & 1 deletion src/managers/sessionManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

// Manages the state of the current debugging session
// Allows setting, getting, and clearing the session state
// TODO(lime): duplicate debuggerSession state — also tracked as a module-level let in extension.js. Collapse to one source of truth
let debuggerSession = null;

function getDebuggerSession() { return debuggerSession; }
Expand Down
Loading