#372: Better fix

Author: isc-bsaviano

client/src/extension.ts

@@ -65,6 +65,9 @@ export function getCookies(server: ServerSpec): string[] {
 let objectScriptApi;
 let serverManagerApi: serverManager.ServerManagerAPI;
 
+/** Resolved connection information for each workspace folder */
+const wsFolderServerSpecs: Map<string, ServerSpec> = new Map();
+
 type MakeRESTRequestParams = {
 	method: "GET"|"POST";
 	api: number;
@@ -150,13 +153,17 @@ export async function activate(context: ExtensionContext) {
 
 	// Send custom notifications when the connection or password changes
 	objectScriptApi.onDidChangeConnection()(() => {
+		wsFolderServerSpecs.clear();
 		client.sendNotification("intersystems/server/connectionChange");
 	});
 	const serverManagerExt = extensions.getExtension("intersystems-community.servermanager");
 	if (serverManagerExt !== undefined) {
 		// The server manager extension is installed
 		serverManagerApi = serverManagerExt.isActive ? serverManagerExt.exports : await serverManagerExt.activate();
 		serverManagerApi.onDidChangePassword()((serverName: string) => {
+			for (const [k,v] of wsFolderServerSpecs.entries()) {
+				if (v.serverName == serverName) wsFolderServerSpecs.delete(k);
+			}
 			client.sendNotification("intersystems/server/passwordChange",serverName);
 		});
 	}
@@ -165,7 +172,9 @@ export async function activate(context: ExtensionContext) {
 	context.subscriptions.push(
 		// Register custom request handlers
 		client.onRequest("intersystems/server/resolveFromUri", async (uri: string) => {
-			let serverSpec = objectScriptApi.serverForUri(Uri.parse(uri));
+			const uriObj = Uri.parse(uri);
+			const wsFolderUriString = workspace.getWorkspaceFolder(uriObj)?.uri.toString();
+			let serverSpec = objectScriptApi.serverForUri(uriObj);
 			if (
 				// Server was resolved
 				serverSpec.host !== "" &&
@@ -203,6 +212,9 @@ export async function activate(context: ExtensionContext) {
 				// UnknownUser without a password means "unauthenticated"
 				serverSpec.username = undefined;
 			}
+			if (wsFolderUriString && !wsFolderServerSpecs.has(wsFolderUriString)) {
+				wsFolderServerSpecs.set(wsFolderUriString, serverSpec);
+			}
 			return serverSpec;
 		}),
 		client.onRequest("intersystems/uri/localToVirtual", (uri: string): string => {
@@ -372,7 +384,7 @@ export async function deactivate(): Promise<void> {
 	const loggedOut: Set<string> = new Set();
 	const promises: Promise<any>[] = client ? [client.stop()] : [];
 	for (const f of workspace.workspaceFolders ?? []) {
-		const serverSpec: ServerSpec = objectScriptApi.serverForUri(f.uri);
+		const serverSpec = wsFolderServerSpecs.get(f.uri.toString());
 		if (!serverSpec?.active) continue;
 		const sessionCookie = getCookies(serverSpec).find((c) => c.startsWith("CSPSESSIONID-"));
 		if (!sessionCookie || loggedOut.has(sessionCookie)) continue;

server/src/server.ts

@@ -154,7 +154,7 @@ connection.onNotification("intersystems/server/passwordChange",
 	(serverName: string) => {
 		var invalid: string[] = [];
 		for (let [uri, server] of serverSpecs.entries()) {
-			if (server.serverName = serverName) {
+			if (server.serverName == serverName) {
 				invalid.push(uri);
 			}
 		}
@@ -163,7 +163,7 @@ connection.onNotification("intersystems/server/passwordChange",
 		}
 		var toRemove: ServerSpec | undefined = undefined;
 		for (let server of schemaCaches.keys()) {
-			if (server.serverName = serverName) {
+			if (server.serverName == serverName) {
 				toRemove = server;
 				break;
 			}