fix(sftp): stabilize connections and storage cleanup

Author: bajrangCoder

src/fileSystem/sftp.js

@@ -6,6 +6,9 @@ import Path from "utils/Path";
 import Url from "utils/Url";
 import internalFs from "./internalFs";
 
+let pendingConnection = null;
+let pendingConnectionID = null;
+
 class SftpClient {
 	#MAX_TRY = 3;
 	#hostname;
@@ -19,7 +22,6 @@ class SftpClient {
 	#connectionID;
 	#path;
 	#stat;
-	#retry = 0;
 
 	/**
 	 *
@@ -48,7 +50,7 @@ class SftpClient {
 			},
 		});
 
-		this.#connectionID = `${this.#username}@${this.#hostname}`;
+		this.#connectionID = `${this.#username}@${this.#hostname}:${this.#port}`;
 	}
 
 	setPath(path) {
@@ -398,20 +400,50 @@ class SftpClient {
 	}
 
 	async connect() {
-		await new Promise((resolve, reject) => {
-			const retry = (err) => {
-				if (settings.value.retryRemoteFsAfterFail) {
-					if (++this.#retry > this.#MAX_TRY) {
-						this.#retry = 0;
-						reject(err);
-					} else {
-						this.connect().then(resolve).catch(reject);
-					}
-				} else {
-					reject(err);
-				}
-			};
+		if (pendingConnection) {
+			if (pendingConnectionID === this.#connectionID) {
+				return pendingConnection;
+			}
+			try {
+				await pendingConnection;
+			} catch {
+				// The next profile should still get its own connection attempt.
+			}
+			return this.connect();
+		}
+
+		pendingConnectionID = this.#connectionID;
+		pendingConnection = this.#connectWithRetry();
 
+		try {
+			return await pendingConnection;
+		} finally {
+			if (pendingConnectionID === this.#connectionID) {
+				pendingConnection = null;
+				pendingConnectionID = null;
+			}
+		}
+	}
+
+	async #connectWithRetry() {
+		const attempts = settings.value.retryRemoteFsAfterFail
+			? this.#MAX_TRY + 1
+			: 1;
+		let lastError;
+
+		for (let attempt = 0; attempt < attempts; attempt++) {
+			try {
+				return await this.#connectOnce();
+			} catch (error) {
+				lastError = error;
+			}
+		}
+
+		throw lastError;
+	}
+
+	#connectOnce() {
+		return new Promise((resolve, reject) => {
 			if (this.#authenticationType === "key") {
 				sftp.connectUsingKeyFile(
 					this.#hostname,
@@ -420,7 +452,7 @@ class SftpClient {
 					this.#keyFile,
 					this.#passPhrase,
 					resolve,
-					retry,
+					reject,
 				);
 				return;
 			}
@@ -431,7 +463,7 @@ class SftpClient {
 				this.#username,
 				this.#password,
 				resolve,
-				retry,
+				reject,
 			);
 		});
 	}

src/lib/openFolder.js

@@ -1192,9 +1192,10 @@ openFolder.removeItem = (url) => {
 
 openFolder.removeFolders = (url) => {
 	({ url } = Url.parse(url));
-	const regex = new RegExp("^" + escapeStringRegexp(url));
-	addedFolder.forEach((folder) => {
-		if (regex.test(folder.url)) {
+	// remove() mutates addedFolder, so iterate over a snapshot to avoid skipping
+	// adjacent folders that belong to the same remote storage.
+	[...addedFolder].forEach((folder) => {
+		if (Url.isSameOrDescendant(folder.url, url)) {
 			folder.remove();
 		}
 	});

src/lib/recents.js

@@ -55,7 +55,7 @@ const recents = {
 	removeFolder(url) {
 		({ url } = Url.parse(url));
 		this.folders = this.folders.filter((folder) => {
-			return !new RegExp("^" + escapeStringRegexp(folder.url)).test(url);
+			return !Url.isSameOrDescendant(folder.url, url);
 		});
 	},
 

src/pages/fileBrowser/fileBrowser.js

@@ -1087,7 +1087,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) {
 
 						const confirmation = await confirm(strings.warning, message);
 						if (!confirmation) break;
-						deleteFunction();
+						await deleteFunction();
 						break;
 					}
 
@@ -1219,10 +1219,35 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) {
 				}
 			}
 
-			function removeStorage() {
-				if (url) {
-					recents.removeFolder(url);
-					recents.removeFile(url);
+			async function removeStorage() {
+				const removedStorage = storageList.find(
+					(storage) => storage.uuid === uuid,
+				);
+				const storageUrl = removedStorage?.url || url;
+
+				if (storageUrl) {
+					recents.removeFolder(storageUrl);
+					recents.removeFile(storageUrl);
+					openFolder.removeFolders(storageUrl);
+					helpers.updateUriOfAllActiveFiles(storageUrl, null);
+				}
+				if (
+					storageUrl &&
+					removedStorage &&
+					(removedStorage.storageType === "sftp" ||
+						removedStorage.type === "sftp")
+				) {
+					const { username, hostname, port = 22 } = Url.decodeUrl(storageUrl);
+					const connectionID = `${username}@${hostname}:${port}`;
+					await new Promise((resolve) => {
+						sftp.isConnected((activeConnectionID) => {
+							if (activeConnectionID !== connectionID) {
+								resolve();
+								return;
+							}
+							sftp.close(resolve, resolve);
+						}, resolve);
+					});
 				}
 				storageList = storageList.filter((storage) => {
 					if (storage.uuid !== uuid) {
@@ -1234,13 +1259,12 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) {
 						const keyFile = decodeURIComponent(
 							parsedUrl.query["keyFile"] || "",
 						);
-						if (keyFile) {
-							fsOperation(keyFile).delete();
-						}
+						if (keyFile) fsOperation(keyFile).delete().catch(console.warn);
 					}
 					return false;
 				});
 				localStorage.storageList = JSON.stringify(storageList);
+				acode.exec("save-state");
 				reload();
 			}