[CopyFilesOverSSH] Addressed code review points

microsoft · Jul 22, 2020 · 4a70555 · 4a70555
1 parent bf58c19
commit 4a70555
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 109 deletions.
diff --git a/Tasks/CopyFilesOverSSHV0/copyfilesoverssh.ts b/Tasks/CopyFilesOverSSHV0/copyfilesoverssh.ts
@@ -222,7 +222,7 @@ async function run() {
                     let targetPath = path.posix.join(targetFolder, relativePath);
 
                     if (!path.isAbsolute(targetPath)) {
-                        targetPath = './' + targetPath
+                        targetPath = `./${targetPath}`;
                     }
 
                     console.log(tl.loc('StartedFileCopy', fileToCopy, targetPath));

diff --git a/Tasks/CopyFilesOverSSHV0/package-lock.json b/Tasks/CopyFilesOverSSHV0/package-lock.json
diff --git a/Tasks/CopyFilesOverSSHV0/sshhelper.ts b/Tasks/CopyFilesOverSSHV0/sshhelper.ts
@@ -53,6 +53,19 @@ export class SshHelper {
         await defer.promise;
     }
 
+    /**
+     * Change path separator for Windows-based platforms
+     * See https://github.com/spmjs/node-scp2/blob/master/lib/client.js#L319
+     * 
+     * @param filePath 
+     */
+    private unixyPath(filePath) {
+        if (process.platform === 'win32') {
+            return filePath.replace(/\\/g, '/');
+        }
+        return filePath;
+    }
+
     /**
      * Sets up the SSH connection
      */
@@ -72,6 +85,9 @@ export class SshHelper {
     async closeConnection() {
         try {
             if (this.sftpClient) {
+                this.sftpClient.on('error', (err) => {
+                    tl.debug('sftpClient: Ignoring error diconnecting: ' + err);
+                }); // ignore logout errors; see: https://github.com/mscdex/node-imap/issues/695
                 await this.sftpClient.end();
                 this.sftpClient = null;
             }
@@ -98,9 +114,7 @@ export class SshHelper {
      * @returns {Promise<string>}
      */
     async uploadFile(sourceFile: string, dest: string) : Promise<string> {
-        if (process.platform === 'win32') {
-            dest = dest.replace(/\\/g, '/');
-        }
+        dest = this.unixyPath(dest);
 
         tl.debug('Upload ' + sourceFile + ' to ' + dest + ' on remote machine.');
 
@@ -142,7 +156,7 @@ export class SshHelper {
         if(!this.sftpClient) {
             defer.reject(tl.loc('ConnectionNotSetup'));
         }
-        if (await this.sftpClient.stat(path)) {
+        if (await this.sftpClient.exsts(path)) {
             //path exists
             defer.resolve(true);
         } else {