tabby-sftp-ui 0.2.6 → 0.2.7

package/README.md

@@ -142,6 +142,10 @@ Then restart Tabby.
 
 ### Changelog
 
+- **0.2.7**
+  - Fix: OS drag-and-drop from Explorer/Finder into the remote pane works reliably on Windows (Electron `webUtils.getPathForFile`, synchronous drop capture).
+  - Fix: Drop data is captured before async connection/path checks so `dataTransfer` is not cleared mid-upload.
+
 - **0.2.6**
   - Fix: Default remote path now detects Linux and Windows correctly (`/home/user`, `/root`, `/C:/Users/user`, etc.).
   - Fix: Uploads work immediately after opening SFTP-UI (no need to change directories first).

package/dist/index.js

@@ -1,13 +1,13 @@
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory(require("@angular/common"), require("@angular/forms"), require("@angular/core"), require("tabby-core"), require("tabby-terminal"), require("path"), require("fs"));
+		module.exports = factory(require("@angular/common"), require("@angular/forms"), require("@angular/core"), require("tabby-core"), require("tabby-terminal"), require("path"), (function webpackLoadOptionalExternalModule() { try { return require("electron"); } catch(e) {} }()), require("fs"));
 	else if(typeof define === 'function' && define.amd)
-		define(["@angular/common", "@angular/forms", "@angular/core", "tabby-core", "tabby-terminal", "path", "fs"], factory);
+		define(["@angular/common", "@angular/forms", "@angular/core", "tabby-core", "tabby-terminal", "path", "electron", "fs"], factory);
 	else {
-		var a = typeof exports === 'object' ? factory(require("@angular/common"), require("@angular/forms"), require("@angular/core"), require("tabby-core"), require("tabby-terminal"), require("path"), require("fs")) : factory(root["@angular/common"], root["@angular/forms"], root["@angular/core"], root["tabby-core"], root["tabby-terminal"], root["path"], root["fs"]);
+		var a = typeof exports === 'object' ? factory(require("@angular/common"), require("@angular/forms"), require("@angular/core"), require("tabby-core"), require("tabby-terminal"), require("path"), (function webpackLoadOptionalExternalModule() { try { return require("electron"); } catch(e) {} }()), require("fs")) : factory(root["@angular/common"], root["@angular/forms"], root["@angular/core"], root["tabby-core"], root["tabby-terminal"], root["path"], root["electron"], root["fs"]);
 		for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];
 	}
-})(global, (__WEBPACK_EXTERNAL_MODULE__angular_common__, __WEBPACK_EXTERNAL_MODULE__angular_forms__, __WEBPACK_EXTERNAL_MODULE__angular_core__, __WEBPACK_EXTERNAL_MODULE_tabby_core__, __WEBPACK_EXTERNAL_MODULE_tabby_terminal__, __WEBPACK_EXTERNAL_MODULE_path__, __WEBPACK_EXTERNAL_MODULE_fs__) => {
+})(global, (__WEBPACK_EXTERNAL_MODULE__angular_common__, __WEBPACK_EXTERNAL_MODULE__angular_forms__, __WEBPACK_EXTERNAL_MODULE__angular_core__, __WEBPACK_EXTERNAL_MODULE_tabby_core__, __WEBPACK_EXTERNAL_MODULE_tabby_terminal__, __WEBPACK_EXTERNAL_MODULE_path__, __WEBPACK_EXTERNAL_MODULE_electron__, __WEBPACK_EXTERNAL_MODULE_fs__) => {
 return /******/ (() => { // webpackBootstrap
 /******/ 	"use strict";
 /******/ 	var __webpack_modules__ = ({
@@ -532,6 +532,9 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
     }
     onDragOver(ev) {
         ev.preventDefault();
+        if (ev.dataTransfer) {
+            ev.dataTransfer.dropEffect = 'copy';
+        }
     }
     onLocalMouseDown(entry, event) {
         if (event.button === 2) {
@@ -681,6 +684,7 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
     async onDropOnRemote(ev) {
         ev.preventDefault();
         this.remoteDropActive = false;
+        const captured = this.captureDropData(ev);
         await this.waitForConnection();
         if (!this.connected || !this.sftpSession) {
             return;
@@ -690,10 +694,9 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
             return;
         }
         // Drag & drop from OS file manager (Explorer/Finder) into the remote pane
-        const osPaths = this.getDroppedOsPaths(ev);
-        if (osPaths.length) {
+        if (captured.osPaths.length) {
             try {
-                for (const p of osPaths) {
+                for (const p of captured.osPaths) {
                     const baseName = path__WEBPACK_IMPORTED_MODULE_0__.basename(p);
                     const existing = this.remoteEntries.find(e => e.name === baseName);
                     if (existing) {
@@ -713,73 +716,85 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
             }
             return;
         }
-        // Fallback: use Tabby's native drag parser (supports directories and HTMLFileUpload)
-        try {
-            const dirUpload = await this.platform.startUploadFromDragEvent?.(ev, true);
-            if (dirUpload && this.sftpSession) {
-                await this.uploadDirectoryUploadToRemote(this.remotePath, dirUpload);
-                await this.refreshRemote();
-                return;
+        const raw = captured.internalPayload;
+        if (raw) {
+            let payload;
+            try {
+                payload = JSON.parse(raw);
             }
-        }
-        catch (e) {
-            console.error('[SFTP-UI] startUploadFromDragEvent failed', e);
-        }
-        const raw = ev.dataTransfer?.getData('application/x-tabby-sftp-ui');
-        if (!raw) {
-            return;
-        }
-        let payload;
-        try {
-            payload = JSON.parse(raw);
-        }
-        catch {
-            return;
-        }
-        try {
-            if (payload.kind === 'local-file') {
-                const targetRemotePath = path__WEBPACK_IMPORTED_MODULE_0__.posix.join(this.remotePath, payload.name);
-                const existsOnRemote = this.remoteEntries.some(e => e.name === payload.name);
-                if (existsOnRemote) {
-                    const ok = await this.showReplaceConfirm(`Replace existing "${payload.name}" on remote?`);
-                    if (!ok) {
-                        return;
-                    }
-                    await this.deleteRemotePathRecursive(targetRemotePath);
-                }
-                const upload = new _local_transfers__WEBPACK_IMPORTED_MODULE_7__.LocalPathFileUpload(payload.fullPath);
-                this.trackTransfer(upload, 'upload', targetRemotePath, payload.fullPath);
-                await this.sftpSession.upload(targetRemotePath, upload);
-                await this.refreshRemote();
-                return;
+            catch {
+                payload = null;
             }
-            if (payload.kind === 'local-paths') {
-                for (const p of payload.paths) {
-                    const targetRemotePath = path__WEBPACK_IMPORTED_MODULE_0__.posix.join(this.remotePath, p.name);
-                    const existsOnRemote = this.remoteEntries.some(e => e.name === p.name);
+            try {
+                if (payload && payload.kind === 'local-file') {
+                    const targetRemotePath = path__WEBPACK_IMPORTED_MODULE_0__.posix.join(this.remotePath, payload.name);
+                    const existsOnRemote = this.remoteEntries.some(e => e.name === payload.name);
                     if (existsOnRemote) {
-                        const ok = await this.showReplaceConfirm(`Replace existing "${p.name}" on remote?`);
+                        const ok = await this.showReplaceConfirm(`Replace existing "${payload.name}" on remote?`);
                         if (!ok) {
-                            continue;
+                            return;
                         }
                         await this.deleteRemotePathRecursive(targetRemotePath);
                     }
-                    // uploadLocalPathToRemote handles both files and directories
-                    await this.uploadLocalPathToRemote(this.remotePath, p.fullPath);
+                    const upload = new _local_transfers__WEBPACK_IMPORTED_MODULE_7__.LocalPathFileUpload(payload.fullPath);
+                    this.trackTransfer(upload, 'upload', targetRemotePath, payload.fullPath);
+                    await this.sftpSession.upload(targetRemotePath, upload);
+                    await this.refreshRemote();
+                    return;
                 }
+                if (payload && payload.kind === 'local-paths') {
+                    for (const p of payload.paths) {
+                        const targetRemotePath = path__WEBPACK_IMPORTED_MODULE_0__.posix.join(this.remotePath, p.name);
+                        const existsOnRemote = this.remoteEntries.some(e => e.name === p.name);
+                        if (existsOnRemote) {
+                            const ok = await this.showReplaceConfirm(`Replace existing "${p.name}" on remote?`);
+                            if (!ok) {
+                                continue;
+                            }
+                            await this.deleteRemotePathRecursive(targetRemotePath);
+                        }
+                        // uploadLocalPathToRemote handles both files and directories
+                        await this.uploadLocalPathToRemote(this.remotePath, p.fullPath);
+                    }
+                    await this.refreshRemote();
+                    return;
+                }
+            }
+            catch (e) {
+                console.error('[SFTP-UI] Upload failed', e);
+            }
+        }
+        // Fallback: use Tabby's native drag parser (supports directories and HTMLFileUpload)
+        try {
+            const dirUpload = captured.dirUploadPromise ? await captured.dirUploadPromise : null;
+            const childCount = this.countDirectoryUploadItems(dirUpload);
+            if (dirUpload && childCount > 0 && this.sftpSession) {
+                await this.uploadDirectoryUploadToRemote(this.remotePath, dirUpload);
                 await this.refreshRemote();
                 return;
             }
         }
         catch (e) {
-            console.error('[SFTP-UI] Upload failed', e);
+            console.error('[SFTP-UI] startUploadFromDragEvent failed', e);
+        }
+        if (captured.files.length > 0) {
+            try {
+                const uploaded = await this.uploadDroppedFilesToRemote(captured.files, this.remotePath);
+                if (uploaded > 0) {
+                    await this.refreshRemote();
+                }
+            }
+            catch (e) {
+                console.error('[SFTP-UI] Blob upload failed', e);
+            }
         }
     }
     async onDropOnLocal(ev) {
         ev.preventDefault();
         this.localDropActive = false;
+        const captured = this.captureDropData(ev);
         // 1) Tabby's internal drag (remote -> local download)
-        const rawInternal = ev.dataTransfer?.getData('application/x-tabby-sftp-ui');
+        const rawInternal = captured.internalPayload;
         if (rawInternal) {
             let payload;
             try {
@@ -863,10 +878,9 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
             }
         }
         // Drag & drop from OS file manager into the local pane (copy into current local folder)
-        const osPaths = this.getDroppedOsPaths(ev);
-        if (osPaths.length) {
+        if (captured.osPaths.length) {
             try {
-                for (const p of osPaths) {
+                for (const p of captured.osPaths) {
                     const baseName = path__WEBPACK_IMPORTED_MODULE_0__.basename(p);
                     const destPath = path__WEBPACK_IMPORTED_MODULE_0__.join(this.localPath, baseName);
                     if (fs__WEBPACK_IMPORTED_MODULE_3__.existsSync(destPath)) {
@@ -886,8 +900,8 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
         }
         // Fallback: use Tabby's native drag parser, then write files to disk
         try {
-            const dirUpload = await this.platform.startUploadFromDragEvent?.(ev, true);
-            if (dirUpload) {
+            const dirUpload = captured.dirUploadPromise ? await captured.dirUploadPromise : null;
+            if (dirUpload && this.countDirectoryUploadItems(dirUpload) > 0) {
                 await this.writeDirectoryUploadToLocal(this.localPath, dirUpload);
                 await this.refreshLocal();
                 return;
@@ -896,7 +910,7 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
         catch (e) {
             console.error('[SFTP-UI] startUploadFromDragEvent (local) failed', e);
         }
-        const raw = ev.dataTransfer?.getData('application/x-tabby-sftp-ui');
+        const raw = captured.internalPayload;
         if (!raw) {
             return;
         }
@@ -1067,11 +1081,85 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
             }
         }
     }
+    getElectronWebUtils() {
+        try {
+            const electron = __webpack_require__(/*! electron */ "electron");
+            return electron?.webUtils ?? null;
+        }
+        catch {
+            return null;
+        }
+    }
+    countDirectoryUploadItems(dirUpload) {
+        const childrens = dirUpload?.getChildrens?.() ?? [];
+        let count = 0;
+        for (const item of childrens) {
+            if (typeof item?.getChildrens === 'function') {
+                count += this.countDirectoryUploadItems(item);
+            }
+            else {
+                count++;
+            }
+        }
+        return count;
+    }
+    captureDropData(ev) {
+        const dt = ev.dataTransfer;
+        const types = dt ? Array.from(dt.types) : [];
+        const files = dt?.files?.length ? Array.from(dt.files) : [];
+        const uriList = dt?.getData('text/uri-list') || '';
+        const textPlain = dt?.getData('text/plain') || '';
+        const internalPayload = dt?.getData('application/x-tabby-sftp-ui') || '';
+        const localMovePayload = dt?.getData('application/x-tabby-sftp-ui-local-move') || '';
+        const osPaths = this.resolveDroppedOsPaths(files, uriList, textPlain);
+        let dirUploadPromise = null;
+        try {
+            const promise = this.platform.startUploadFromDragEvent?.(ev, true);
+            if (promise) {
+                dirUploadPromise = promise;
+            }
+        }
+        catch {
+            // ignore
+        }
+        return { types, files, osPaths, internalPayload, localMovePayload, dirUploadPromise };
+    }
+    async uploadDroppedFilesToRemote(files, remoteDir) {
+        if (!this.sftpSession) {
+            return 0;
+        }
+        if (!files.length) {
+            return 0;
+        }
+        let uploaded = 0;
+        for (const file of files) {
+            const upload = new tabby_core__WEBPACK_IMPORTED_MODULE_6__.HTMLFileUpload(file);
+            const name = upload.getName();
+            const existing = this.remoteEntries.find(e => e.name === name);
+            if (existing) {
+                const ok = await this.showReplaceConfirm(`Replace existing "${name}" on remote?`);
+                if (!ok) {
+                    continue;
+                }
+                const remoteTarget = path__WEBPACK_IMPORTED_MODULE_0__.posix.join(remoteDir, name);
+                await this.deleteRemotePathRecursive(remoteTarget);
+            }
+            const targetRemotePath = path__WEBPACK_IMPORTED_MODULE_0__.posix.join(remoteDir, name);
+            this.trackTransfer(upload, 'upload', targetRemotePath, name);
+            await this.sftpSession.upload(targetRemotePath, upload);
+            uploaded++;
+        }
+        return uploaded;
+    }
     getDroppedOsPaths(ev) {
         const dt = ev.dataTransfer;
         if (!dt) {
             return [];
         }
+        const files = dt.files?.length ? Array.from(dt.files) : [];
+        return this.resolveDroppedOsPaths(files, dt.getData('text/uri-list') || '', dt.getData('text/plain') || '');
+    }
+    resolveDroppedOsPaths(files, uriList, textPlain) {
         const isWin = os__WEBPACK_IMPORTED_MODULE_1__.platform() === 'win32';
         const isLocalPath = (p) => {
             if (isWin) {
@@ -1080,15 +1168,34 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
             }
             return p.startsWith('/');
         };
-        // 1) Electron-style File.path
-        const filePaths = Array.from(dt.files ?? [])
+        const dedupePaths = (paths) => {
+            return [...new Set(paths)];
+        };
+        // 1) Electron-style File.path (legacy)
+        const legacyFilePaths = dedupePaths(files
             .map(f => f.path)
-            .filter((p) => Boolean(p));
-        if (filePaths.length) {
-            return filePaths;
+            .filter((p) => Boolean(p && isLocalPath(p))));
+        if (legacyFilePaths.length) {
+            return legacyFilePaths;
+        }
+        // 1b) Electron webUtils.getPathForFile (modern Electron / Tabby)
+        const webUtils = this.getElectronWebUtils();
+        if (webUtils && files.length) {
+            const webUtilsPaths = dedupePaths(files
+                .map(f => {
+                try {
+                    return webUtils.getPathForFile(f);
+                }
+                catch {
+                    return '';
+                }
+            })
+                .filter(p => p && isLocalPath(p)));
+            if (webUtilsPaths.length) {
+                return webUtilsPaths;
+            }
         }
         // 2) Sometimes paths are exposed as URIs
-        const uriList = dt.getData('text/uri-list') || '';
         const uris = uriList
             .split(/\r?\n/g)
             .map(x => x.trim())
@@ -1116,8 +1223,7 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
             return uris;
         }
         // 3) Plain text sometimes contains a local path
-        const text = dt.getData('text/plain') || '';
-        const textLines = text.split(/\r?\n/g).map(x => x.trim()).filter(Boolean);
+        const textLines = textPlain.split(/\r?\n/g).map(x => x.trim()).filter(Boolean);
         const textPaths = textLines
             .map(x => {
             if (x.startsWith('file://')) {
@@ -3286,6 +3392,18 @@ module.exports = __WEBPACK_EXTERNAL_MODULE__angular_forms__;
 
 /***/ },
 
+/***/ "electron"
+/*!***************************!*\
+  !*** external "electron" ***!
+  \***************************/
+(module) {
+
+if(typeof __WEBPACK_EXTERNAL_MODULE_electron__ === 'undefined') { var e = new Error("Cannot find module 'electron'"); e.code = 'MODULE_NOT_FOUND'; throw e; }
+
+module.exports = __WEBPACK_EXTERNAL_MODULE_electron__;
+
+/***/ },
+
 /***/ "fs"
 /*!*********************!*\
   !*** external "fs" ***!