Skip to content

Refactor config and fix bug where room ID is removed #34

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
nbolton merged 2 commits into from
Jun 16, 2025
Merged

Refactor config and fix bug where room ID is removed #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aa16f1
refactor: rename command from 'showRoomId' to 'configure' for clarity
nbolton Jun 16, 2025
378538d
fix: Dismissing room ID causes empty room ID in config
nbolton Jun 16, 2025
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"title": "Multi-Build: Reconnect"
},
{
"command": "multiBuild.showRoomId",
"title": "Multi-Build: Show/Edit Room ID"
"command": "multiBuild.configure",
"title": "Multi-Build: Configure"
}
],
"configuration": {
Expand Down
29 changes: 18 additions & 11 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const serverConfigKey = "multiBuild.server";
const syncDataConfigKey = "multiBuild.syncData";
const reconnectCommand = `multiBuild.reconnect`;
const syncCommand = `multiBuild.sync`;
const showRoomIdCommand = "multiBuild.showRoomId";
const configureCommand = "multiBuild.configure";
const defaultBaseUrl = "wss://multi-build-server.symless.workers.dev";
const keepAliveIntervalMillis = 10000; // 10 seconds

Expand All @@ -20,6 +20,11 @@ var activeSocket: WebSocket | undefined;
var keepAlive: NodeJS.Timeout | undefined;
var connected = false;

interface ServerConfig {
baseUrl: string;
roomId: string | null;
}

export function activate(context: vscode.ExtensionContext) {
init().catch((error) => {
handleError(error);
Expand Down Expand Up @@ -49,18 +54,21 @@ export function activate(context: vscode.ExtensionContext) {

// Register command to show and edit the current room ID
context.subscriptions.push(
vscode.commands.registerCommand(showRoomIdCommand, async () => {
const config = await getServerConfig();
const roomId = await showRoomIdPrompt(config.roomId);
if (roomId !== config.roomId) {
await updateServerConfig({ ...config, roomId });
} else {
vscode.window.showInformationMessage(`${extensionName}: Room ID did not change`);
}
vscode.commands.registerCommand(configureCommand, async () => {
await configure(await getServerConfig());
}),
);
}

async function configure(config: ServerConfig) {
const roomId = await showRoomIdPrompt(config.roomId);
if (roomId) {
await updateServerConfig({ ...config, roomId });
} else {
vscode.window.showErrorMessage(`${extensionName}: No room ID provided`);
}
}

export function deactivate() {
try {
stopConfigWatcher();
Expand All @@ -82,8 +90,7 @@ async function init() {
console.log(`${logTag} Server config:`, config);

if (!config.roomId) {
const roomId = await showRoomIdPrompt(config.roomId);
await updateServerConfig({ ...config, roomId });
await configure(config);
} else {
console.log(`${logTag} Using existing room ID: ${config.roomId}`);
}
Expand Down