ssh2-sftp-client 9.0.1 → 9.0.2

package/README.md

@@ -1,65 +1,66 @@
-- [Overview](#org19c31e8)
-  - [Version 9.x Changes](#orgc330d84)
-- [Installation](#org7c63f6a)
-- [Basic Usage](#orgb99a07c)
-- [Documentation](#org5550f37)
-  - [Specifying Paths](#org2f0a3a6)
-  - [Methods](#org8d230d5)
-    - [new SftpClient(name) ===> SFTP client object](#orgc8b55d7)
-    - [connect(config) ===> SFTP object](#org42512fb)
-    - [list(path, filter) ==> Array[object]](#orgbe9e165)
-    - [exists(path) ==> boolean](#org14dee5e)
-    - [stat(path) ==> object](#orga0033c0)
-    - [get(path, dst, options) ==> String|Stream|Buffer](#org02a3dc5)
-    - [fastGet(remotePath, localPath, options) ===> string](#orge9f875d)
-    - [put(src, remotePath, options) ==> string](#orgc7941ea)
-    - [fastPut(localPath, remotePath, options) ==> string](#org8f8794d)
-    - [append(input, remotePath, options) ==> string](#org82c75b5)
-    - [mkdir(path, recursive) ==> string](#org42c5eeb)
-    - [rmdir(path, recursive) ==> string](#orgd0aa59d)
-    - [delete(path, noErrorOK) ==> string](#orgb496048)
-    - [rename(fromPath, toPath) ==> string](#org1a2be8f)
-    - [posixRename(fromPath, toPath) ==> string](#org571c0b9)
-    - [chmod(path, mode) ==> string](#org02d64a4)
-    - [realPath(path) ===> string](#org008d567)
-    - [cwd() ==> string](#org7033d28)
-    - [uploadDir(srcDir, dstDir, options) ==> string](#orgfa0102a)
-    - [downloadDir(srcDir, dstDir, options) ==> string](#orgefe6fc6)
-    - [createReadStream(remotePath, options)) ==> stream object](#org783e363)
-    - [createWriteStream(remotePath, options) ==> stream object](#orgf45313d)
-    - [rcopy(srcPath, dstPath) ==> string](#orga31c8c1)
-    - [end() ==> boolean](#org4d02fde)
-    - [Add and Remove Listeners](#orge5769d3)
-- [Platform Quirks & Warnings](#org3e6ddf9)
-  - [Server Capabilities](#org61f0fe5)
-  - [Promises, Events & Managing Exceptions](#orga7d6067)
-    - [Adding Custom Handlers](#orgc08d427)
-  - [Windows Based Servers](#org5439468)
-  - [Don't Re-use SftpClient Objects](#orgae9129c)
-- [FAQ](#org3761660)
-  - [Remote server drops connections with only an end event](#org1e669d1)
-  - [How can I pass writable stream as dst for get method?](#org71d5bab)
-  - [How can I upload files without having to specify a password?](#orgaafc964)
-  - [How can I connect through a Socks Proxy](#orgebf85e2)
-  - [Timeout while waiting for handshake or handshake errors](#org528d9ea)
-  - [How can I limit upload/download speed](#org3b6ff20)
-  - [Connection hangs or fails for larger files](#orgb5e285f)
-- [Examples](#org18ce0c2)
-- [Troubleshooting](#orgf4b6c80)
-  - [Common Errors](#orga419582)
-    - [Not returning the promise in a `then()` block](#orgd5f3557)
-    - [Mixing Promise Chains and Async/Await](#org557d1c5)
-    - [Try/catch and Error Handlers](#org2bf9a3a)
-    - [Server Differences](#org89795d7)
-    - [Avoid Concurrent Operations](#orgbec08b0)
-  - [Debugging Support](#org124cfc9)
-- [Logging Issues](#org5f3c941)
-- [Pull Requests](#org6e82efc)
-- [Contributors](#org680b5c2)
-
-
-
-<a id="org19c31e8"></a>
+- [Overview](#org50de852)
+  - [Version 9.x Changes](#orgaeda8f1)
+- [Installation](#orgf01877e)
+- [Basic Usage](#org5950004)
+- [Documentation](#org5057006)
+  - [Specifying Paths](#org4ef62d6)
+  - [Methods](#org197917e)
+    - [new SftpClient(name) ===> SFTP client object](#orge668bfa)
+    - [connect(config) ===> SFTP object](#orgcf80c45)
+    - [list(path, filter) ==> Array[object]](#org329ff56)
+    - [exists(path) ==> boolean](#orgc52d8a8)
+    - [stat(path) ==> object](#orgcfa8682)
+    - [get(path, dst, options) ==> String|Stream|Buffer](#orgbe46842)
+    - [fastGet(remotePath, localPath, options) ===> string](#org740cf5c)
+    - [put(src, remotePath, options) ==> string](#org429e96a)
+    - [fastPut(localPath, remotePath, options) ==> string](#orgcab50c6)
+    - [append(input, remotePath, options) ==> string](#orgc15d676)
+    - [mkdir(path, recursive) ==> string](#org6fab860)
+    - [rmdir(path, recursive) ==> string](#org520f6bc)
+    - [delete(path, noErrorOK) ==> string](#org1be8ca9)
+    - [rename(fromPath, toPath) ==> string](#org3d89131)
+    - [posixRename(fromPath, toPath) ==> string](#org58dfee5)
+    - [chmod(path, mode) ==> string](#orgb319965)
+    - [realPath(path) ===> string](#orgf665476)
+    - [cwd() ==> string](#org409acd1)
+    - [uploadDir(srcDir, dstDir, options) ==> string](#org668b085)
+    - [downloadDir(srcDir, dstDir, options) ==> string](#org395ac4e)
+    - [createReadStream(remotePath, options)) ==> stream object](#org8a73b83)
+    - [createWriteStream(remotePath, options) ==> stream object](#orgb71fb72)
+    - [rcopy(srcPath, dstPath) ==> string](#org936f530)
+    - [end() ==> boolean](#org62a8323)
+    - [Add and Remove Listeners](#orgd1ebc36)
+- [Platform Quirks & Warnings](#orgdfff943)
+  - [Server Capabilities](#org886fe2e)
+  - [Issues with `fastPut()` and `fastGet()` Methods](#org1719a52)
+  - [Promises, Events & Managing Exceptions](#org42a51fc)
+    - [Adding Custom Handlers](#orgd50a35a)
+  - [Windows Based Servers](#org7b0987f)
+  - [Don't Re-use SftpClient Objects](#orgbe548c2)
+- [FAQ](#orgfddb94b)
+  - [Remote server drops connections with only an end event](#orgbd2a31e)
+  - [How can I pass writable stream as dst for get method?](#org9d72a61)
+  - [How can I upload files without having to specify a password?](#org9fda086)
+  - [How can I connect through a Socks Proxy](#org2ccc5e8)
+  - [Timeout while waiting for handshake or handshake errors](#org5306b6f)
+  - [How can I limit upload/download speed](#org3a77529)
+  - [Connection hangs or fails for larger files](#org68eedc7)
+- [Examples](#orgd436fa7)
+- [Troubleshooting](#orge21d870)
+  - [Common Errors](#org287b86f)
+    - [Not returning the promise in a `then()` block](#org20a99bb)
+    - [Mixing Promise Chains and Async/Await](#org51482b4)
+    - [Try/catch and Error Handlers](#orgb9a556a)
+    - [Server Differences](#org0d148f0)
+    - [Avoid Concurrent Operations](#orgf115391)
+  - [Debugging Support](#orgc7c437f)
+- [Logging Issues](#orgc79ef28)
+- [Pull Requests](#org64bd2a2)
+- [Contributors](#org709b0f9)
+
+
+
+<a id="org50de852"></a>
 
 # Overview
 
@@ -67,17 +68,21 @@ an SFTP client for node.js, a wrapper around [SSH2](https://github.com/mscdex/ss
 
 Documentation on the methods and available options in the underlying modules can be found on the [SSH2](https://github.com/mscdex/ssh2) project pages.
 
-Current stable release is **v9.0.1**.
+Current stable release is **v9.0.2**.
 
 Code has been tested against Node versions 14.19.1, 16.15.0 and 18.1.0
 
 Node versions < 14.x are not supported.
 
 
-<a id="orgc330d84"></a>
+<a id="orgaeda8f1"></a>
 
 ## Version 9.x Changes
 
+-   Change the default end and close handlers not to throw error or reject promises. Previously, an end or close event would cause an error to be raised or a promise to be rejected if the event was deemed to be *unexpected*. However, classification of events as being unexpected was unreliable and didn't add much real value. Both these handlers will now invalidate the sftp connection object and log that the event fired and nothing else.
+-   Changed when event handled flags are reset. Now they are reset after a new set of temporary listeners are added.
+-   Don't throw an error when calling end() if there is no active sftp connection. It does no harm to call end() when there is no connection, so no need to raise an error.
+-   Use nullish coalescing when setting retry parameters instead of or'ing with defaults. Allows setting values to 0.
 -   **Breaking Change**: This version uses syntax not supported in node versions prior to v14. Therefore, node versions less than v14 will not work.
 -   **Breaking Change**: This `list()` method no longer accepts a regular expression for filtering the entries to be returned. You can now specify a filter function instead. The function is called for each item in the list of items to be returned, passing in the item object as its only argument. Essentially, this is just a call to `Array.filter()`, so the filter function should behave in the same way i.e. return true for items to be retained and false for those to be dropped.
 -   **Breaking Change**: The ability to set `autoClose` on read and write streams and the ability to set `end` on `pipe` operations has been removed. These options caused confusion for users and were too easy to get wrong, plus it made the methods overly complicated. For those use-cases where you want to control streams at a low level, two new methods have been added, `createReadStream()` and `createWriteStream()`. However, it should be noted that client code is 100% responsible for managing streams obtained using these methods. Use at your own risk!
@@ -89,7 +94,7 @@ Node versions < 14.x are not supported.
 -   Bumped ssh2 version to 1.11.0
 
 
-<a id="org7c63f6a"></a>
+<a id="orgf01877e"></a>
 
 # Installation
 
@@ -98,7 +103,7 @@ npm install ssh2-sftp-client
 ```
 
 
-<a id="orgb99a07c"></a>
+<a id="org5950004"></a>
 
 # Basic Usage
 
@@ -121,7 +126,7 @@ sftp.connect({
 ```
 
 
-<a id="org5550f37"></a>
+<a id="org5057006"></a>
 
 # Documentation
 
@@ -130,7 +135,7 @@ The connection options are the same as those offered by the underlying SSH2 modu
 All the methods will return a Promise, except for `on()` and `removeListener()`, which are typically only used in special use cases.
 
 
-<a id="org2f0a3a6"></a>
+<a id="org4ef62d6"></a>
 
 ## Specifying Paths
 
@@ -163,12 +168,12 @@ client.put('/home/fred/test.txt', '/remote/dir/test-copy.txt');
 This will copy the local file `test.txt` to the remote file `test-copy.txt` in the directory `/remote/dir`.
 
 
-<a id="org8d230d5"></a>
+<a id="org197917e"></a>
 
 ## Methods
 
 
-<a id="orgc8b55d7"></a>
+<a id="orge668bfa"></a>
 
 ### new SftpClient(name) ===> SFTP client object
 
@@ -207,7 +212,7 @@ Constructor to create a new `ssh2-sftp-client` object. An optional `name` string
     ```
 
 
-<a id="org42512fb"></a>
+<a id="orgcf80c45"></a>
 
 ### connect(config) ===> SFTP object
 
@@ -273,7 +278,7 @@ Connect to an sftp server. Full documentation for connection options is availabl
     ```
 
 
-<a id="orgbe9e165"></a>
+<a id="org329ff56"></a>
 
 ### list(path, filter) ==> Array[object]
 
@@ -344,7 +349,7 @@ Retrieves a directory listing. This method returns a Promise, which once realise
     The *glob*-style matching is very simple. In most cases, you are best off using a real regular expression which will allow you to do more powerful matching and anchor matches to the beginning/end of the string etc.
 
 
-<a id="org14dee5e"></a>
+<a id="orgc52d8a8"></a>
 
 ### exists(path) ==> boolean
 
@@ -380,7 +385,7 @@ Tests to see if remote file or directory exists. Returns type of remote object i
     ```
 
 
-<a id="orga0033c0"></a>
+<a id="orgcfa8682"></a>
 
 ### stat(path) ==> object
 
@@ -431,7 +436,7 @@ Returns the attributes associated with the object pointed to by `path`.
     ```
 
 
-<a id="org02a3dc5"></a>
+<a id="orgbe46842"></a>
 
 ### get(path, dst, options) ==> String|Stream|Buffer
 
@@ -487,7 +492,7 @@ In general, if you're going to pass in a string as the destination, you are bett
     -   **Tip:** See examples file in the Git repository for more examples. You can pass any writeable stream in as the destination. For example, if you pass in `zlib.createGunzip()` writeable stream, you can both download and decompress a gzip file 'on the fly'.
 
 
-<a id="orge9f875d"></a>
+<a id="org740cf5c"></a>
 
 ### fastGet(remotePath, localPath, options) ===> string
 
@@ -530,7 +535,7 @@ Downloads a file at remotePath to localPath using parallel reads for faster thro
     ```
 
 
-<a id="orgc7941ea"></a>
+<a id="org429e96a"></a>
 
 ### put(src, remotePath, options) ==> string
 
@@ -580,7 +585,7 @@ Upload data from local system to remote server. If the `src` argument is a strin
     -   **Tip:** If the src argument is a path string, consider just using `fastPut()`.
 
 
-<a id="org8f8794d"></a>
+<a id="orgcab50c6"></a>
 
 ### fastPut(localPath, remotePath, options) ==> string
 
@@ -624,7 +629,7 @@ Uploads the data in file at `localPath` to a new file on remote server at `remot
     ```
 
 
-<a id="org82c75b5"></a>
+<a id="orgc15d676"></a>
 
 ### append(input, remotePath, options) ==> string
 
@@ -668,7 +673,7 @@ Append the `input` data to an existing remote file. There is no integrity checki
     ```
 
 
-<a id="org42c5eeb"></a>
+<a id="org6fab860"></a>
 
 ### mkdir(path, recursive) ==> string
 
@@ -696,7 +701,7 @@ Create a new directory. If the recursive flag is set to true, the method will cr
     ```
 
 
-<a id="orgd0aa59d"></a>
+<a id="org520f6bc"></a>
 
 ### rmdir(path, recursive) ==> string
 
@@ -726,7 +731,7 @@ Remove a directory. If removing a directory and recursive flag is set to `true`,
     ```
 
 
-<a id="orgb496048"></a>
+<a id="org1be8ca9"></a>
 
 ### delete(path, noErrorOK) ==> string
 
@@ -755,7 +760,7 @@ Delete a file on the remote server.
     ```
 
 
-<a id="org1a2be8f"></a>
+<a id="org3d89131"></a>
 
 ### rename(fromPath, toPath) ==> string
 
@@ -784,7 +789,7 @@ Rename a file or directory from `fromPath` to `toPath`. You must have the necess
     ```
 
 
-<a id="org571c0b9"></a>
+<a id="org58dfee5"></a>
 
 ### posixRename(fromPath, toPath) ==> string
 
@@ -811,7 +816,7 @@ client.connect(config)
 ```
 
 
-<a id="org02d64a4"></a>
+<a id="orgb319965"></a>
 
 ### chmod(path, mode) ==> string
 
@@ -840,7 +845,7 @@ Change the mode (read, write or execute permissions) of a remote file or directo
     ```
 
 
-<a id="org008d567"></a>
+<a id="orgf665476"></a>
 
 ### realPath(path) ===> string
 
@@ -851,14 +856,14 @@ Converts a relative path to an absolute path on the remote server. This method i
 -   **path:** A file path, either relative or absolute. Can handle '.' and '..', but does not expand '~'.
 
 
-<a id="org7033d28"></a>
+<a id="org409acd1"></a>
 
 ### cwd() ==> string
 
 Returns what the server believes is the current remote working directory.
 
 
-<a id="orgfa0102a"></a>
+<a id="org668b085"></a>
 
 ### uploadDir(srcDir, dstDir, options) ==> string
 
@@ -927,7 +932,7 @@ The `useFastput` option is a boolean option. If `true`, the method will use the
     ```
 
 
-<a id="orgefe6fc6"></a>
+<a id="org395ac4e"></a>
 
 ### downloadDir(srcDir, dstDir, options) ==> string
 
@@ -992,7 +997,7 @@ If the `useFastget` property is set to `true`, the method will use `fastGet()` t
     ```
 
 
-<a id="org783e363"></a>
+<a id="org8a73b83"></a>
 
 ### createReadStream(remotePath, options)) ==> stream object
 
@@ -1009,7 +1014,7 @@ Returns a read stream object which is attached to the remote file specified by t
     -   **end:** Postion to stop reading bytes (inclusive).
 
 
-<a id="orgf45313d"></a>
+<a id="orgb71fb72"></a>
 
 ### createWriteStream(remotePath, options) ==> stream object
 
@@ -1024,7 +1029,7 @@ Returns a write stream object which is attached to the remote file specified in
     -   **start:** Byte position to start writing from (inclusive). May require changing flag to 'r+'.
 
 
-<a id="orga31c8c1"></a>
+<a id="org936f530"></a>
 
 ### rcopy(srcPath, dstPath) ==> string
 
@@ -1034,7 +1039,7 @@ Perfrom a remote file copy. The file identified by the `srcPath` argument will b
 -   **dstPath:** Path to where the copy will be creaeted specified as a string
 
 
-<a id="org4d02fde"></a>
+<a id="org62a8323"></a>
 
 ### end() ==> boolean
 
@@ -1058,7 +1063,7 @@ Ends the current client session, releasing the client socket and associated reso
     ```
 
 
-<a id="orge5769d3"></a>
+<a id="orgd1ebc36"></a>
 
 ### Add and Remove Listeners
 
@@ -1079,12 +1084,12 @@ Although normally not required, you can add and remove custom listeners on the s
     Removes the specified listener from the event specified in eventType. Note that the `end()` method automatically removes all listeners from the client object.
 
 
-<a id="org3e6ddf9"></a>
+<a id="orgdfff943"></a>
 
 # Platform Quirks & Warnings
 
 
-<a id="org61f0fe5"></a>
+<a id="org886fe2e"></a>
 
 ## Server Capabilities
 
@@ -1093,7 +1098,16 @@ All SFTP servers and platforms are not equal. Some facilities provided by `ssh2-
 One way to determine whether an issue you are encountering is due to `ssh2-sftp-client` or due to the remote server or server platform is to use a simple CLI sftp program, such as openSSH's sftp command. If you observe the same behaviour using plain `sftp` on the command line, the issue is likely due to server or remote platform limitations. Note that you should not use a GUI sftp client, like `Filezilla` or `winSCP` as such GUI programs often attempt to hide these server and platform incompatibilities and will take additional steps to simulate missing functionality etc. You want to use a CLI program which does as little as possible.
 
 
-<a id="orga7d6067"></a>
+<a id="org1719a52"></a>
+
+## Issues with `fastPut()` and `fastGet()` Methods
+
+The `fastPut()` and `fastGet()` methods are known to be somewhat dependent on SFTP server capabilities. Some SFTP servers just do not work correctly with concurrent connections and some are known to have issues with negotiating packet sizes. These issues can sometimes be resolved by tweaking the options supplied to the methods, such as setting number of concurrent connections or a psecific packet size.
+
+To see an example of the type of issues you can observe with `fastPut()` or `fastGet()`, have a look at [issue 407](https://github.com/theophilusx/ssh2-sftp-client/issues/407), which describes the experiences of one user. Bottom line, when it works, it tends to work well and be significantly faster than using just `get()` or `put()`. However, when developing code to run against different SFTP servers, especially where you are unable to test against each server, you are likely better off just using `get()` and `put()` or structuring your code so that users can select which method to use (this is what `ssh2-sftp-client` does - for example, see the `!downloadDir()` and `uploadDir()` methods.
+
+
+<a id="org42a51fc"></a>
 
 ## Promises, Events & Managing Exceptions
 
@@ -1112,14 +1126,14 @@ The other area where additional events are fired is during the end() call. To de
 In addition to the promise based event handlers, `ssh2-sftp-client` also implements global event handlers which will catch any `error`, `end` or `close` events. Essentially, these global handlers only reset the `sftp` property of the client object, effectively ensuring any subsequent calls are rejected and in the case of an error, send the error to the console.
 
 
-<a id="orgc08d427"></a>
+<a id="orgd50a35a"></a>
 
 ### Adding Custom Handlers
 
 While the above strategies appear to work for the majority of use cases, there are always going to be edge cases which require more flexible or powerful event handling. To support this, the `on()` and `removeListener()` methods are provided. Any event listener added using the `on()` method will be added at the beginning of the list of handlers for that event, ensuring it will be called before any global or promise local events. See the documentation for the `on()` method for details.
 
 
-<a id="org5439468"></a>
+<a id="org7b0987f"></a>
 
 ## Windows Based Servers
 
@@ -1128,7 +1142,7 @@ It appears that when the sftp server is running on Windows, a *ECONNRESET* error
 The best way to avoid this issue is to not re-use client objects. Always generate a new sftp client object for each new connection.
 
 
-<a id="orgae9129c"></a>
+<a id="orgbe548c2"></a>
 
 ## Don't Re-use SftpClient Objects
 
@@ -1137,12 +1151,12 @@ Due to an issue with *ECONNRESET* error signals when connecting to Windows based
 To avoid this problem, don't re-use SftpClient objects. Generate a new SftpClient object for each connection. You can perform multiple actions with a single connection e.g. upload multiple files, download multiple files etc, but after you have called end(), you should not try to re-use the object with a further connect() call. Create a new object instead.
 
 
-<a id="org3761660"></a>
+<a id="orgfddb94b"></a>
 
 # FAQ
 
 
-<a id="org1e669d1"></a>
+<a id="orgbd2a31e"></a>
 
 ## Remote server drops connections with only an end event
 
@@ -1153,7 +1167,7 @@ Clients first make an unauthenticated connection to the SFTP server to begin neg
 One way to avoid this type of issue is to add a delay between connection attempts. It does not need to be a very long delay - just sufficient to permit the previous connection to be authenticated. In fact, the default setting for openSSH is `10:30:60`, so you really just need to have enough delay to ensure that the 1st connection has completed authentication before the 11th connection is attempted.
 
 
-<a id="org71d5bab"></a>
+<a id="org9d72a61"></a>
 
 ## How can I pass writable stream as dst for get method?
 
@@ -1212,7 +1226,7 @@ sftp
 ```
 
 
-<a id="orgaafc964"></a>
+<a id="org9fda086"></a>
 
 ## How can I upload files without having to specify a password?
 
@@ -1247,7 +1261,7 @@ sftp.connect({
 ```
 
 
-<a id="orgebf85e2"></a>
+<a id="org2ccc5e8"></a>
 
 ## How can I connect through a Socks Proxy
 
@@ -1283,7 +1297,7 @@ client.connect({
 ```
 
 
-<a id="org528d9ea"></a>
+<a id="org5306b6f"></a>
 
 ## Timeout while waiting for handshake or handshake errors
 
@@ -1292,7 +1306,7 @@ Some users have encountered the error 'Timeout while waiting for handshake' or '
 When encountering this type of problem, one worthwhile approach is to use openSSH's CLI sftp program with the `-v` switch to raise loggin levels. This will show you what algorithms the CLI is using. You can then use this information to match the names with the accepted algorithm names documented in the `ssh2` README to set the properties in the `algorithms` object.
 
 
-<a id="org3b6ff20"></a>
+<a id="org3a77529"></a>
 
 ## How can I limit upload/download speed
 
@@ -1332,7 +1346,7 @@ try {
 ```
 
 
-<a id="orgb5e285f"></a>
+<a id="org68eedc7"></a>
 
 ## Connection hangs or fails for larger files
 
@@ -1343,14 +1357,14 @@ A symptom of this issue is that you are able to upload small files, but uploadin
 For more explanation, see [issue #342](https://github.com/theophilusx/ssh2-sftp-client/issues/342).
 
 
-<a id="org18ce0c2"></a>
+<a id="orgd436fa7"></a>
 
 # Examples
 
 I have started collecting example scripts in the example directory of the repository. These are mainly scripts I have put together in order to investigate issues or provide samples for users. They are not robust, lack adequate error handling and may contain errors. However, I think they are still useful for helping developers see how the module and API can be used.
 
 
-<a id="orgf4b6c80"></a>
+<a id="orge21d870"></a>
 
 # Troubleshooting
 
@@ -1365,14 +1379,14 @@ Note also that in the repository there are two useful directories. The first is
 The second directory is the validation directory. I have some very simple scripts in this directory which perform basic tasks using only the `ssh2` modules (no `ssh2-sftp-client` module). These can be useful when trying to determine if the issue is with the underlying `ssh2` module or the `ssh2-sftp-client` wrapper module.
 
 
-<a id="orga419582"></a>
+<a id="org287b86f"></a>
 
 ## Common Errors
 
 There are some common errors people tend to make when using Promises or Asyc/Await. These are by far the most common problem found in issues logged against this module. Please check for some of these before logging your issue.
 
 
-<a id="orgd5f3557"></a>
+<a id="org20a99bb"></a>
 
 ### Not returning the promise in a `then()` block
 
@@ -1409,7 +1423,7 @@ Note the `return` statements. These ensure that the Promise returned by the clie
 A common symptom of this type of error is for file uploads or download to fail to complete or for data in those files to be truncated. What is happening is that the connection is being ended before the transfer has completed.
 
 
-<a id="org557d1c5"></a>
+<a id="org51482b4"></a>
 
 ### Mixing Promise Chains and Async/Await
 
@@ -1469,7 +1483,7 @@ async function doSftp() {
 ```
 
 
-<a id="org2bf9a3a"></a>
+<a id="orgb9a556a"></a>
 
 ### Try/catch and Error Handlers
 
@@ -1480,14 +1494,14 @@ The basic problem is that the try/catch block will have completed execution befo
 Error events are essentially asynchronous code. You don't know when such events will fire. Therefore, you cannot use a try/catch block to catch such event errors. Even creating an error handler which then throws an exception won't help as the key problem is that your try/catch block has already executed. There are a number of alternative ways to deal with this situation. However, the key symptom is that you see occasional uncaught error exceptions that cause your script to exit abnormally despite having try/catch blocks in your script. What you need to do is look at your code and find where errors are raised asynchronously and use an event handler or some other mechanism to manage any errors raised.
 
 
-<a id="org89795d7"></a>
+<a id="org0d148f0"></a>
 
 ### Server Differences
 
 Not all SFTP servers are the same. Like most standards, the SFTP protocol has some level of interpretation and allows different levels of compliance. This means there can be differences in behaviour between different servers and code which works with one server will not work the same with another. For example, the value returned by *realpath* for non-existent objects can differ significantly. Some servers will throw an error for a particular operation while others will just return null, some servers support concurrent operations (such as used by fastGet/fastPut) while others will not and of course, the text of error messages can vary significantly. In particular, we have noticed significant differences across different platforms. It is therefore advisable to do comprehensive testing when the SFTP server is moved to a new platform. This includes moving from to a cloud based service even if the underlying platform remains the same. I have noticed that some cloud platforms can generate unexpected events, possibly related to additional functionality or features associated with the cloud implementation. For example, it appears SFTP servers running under Azure will generate an error event when the connection is closed even when the client has requested the connection be terminated. The same SFTP server running natively on Windows does not appear to exhibit such behaviour.
 
 
-<a id="orgbec08b0"></a>
+<a id="orgf115391"></a>
 
 ### Avoid Concurrent Operations
 
@@ -1496,7 +1510,7 @@ Technically, SFTP should be able to perform multiple operations concurrently. As
 If you are going to try and perform concurrent operations, you need to test extensively and ensure you are using data which is large enough that context switching does occur (i.e. the request is not completed in a single run). Some SFTP servers will handle concurrent operations better than others.
 
 
-<a id="org124cfc9"></a>
+<a id="orgc7c437f"></a>
 
 ## Debugging Support
 
@@ -1529,7 +1543,7 @@ If you just want to see debug messages from `ssh2-sftp-client` and exclude debug
 ```
 
 
-<a id="org5f3c941"></a>
+<a id="orgc79ef28"></a>
 
 # Logging Issues
 
@@ -1546,7 +1560,7 @@ I am happy to try and help diagnose and fix any issues you encounter while using
 Perhaps the best assistance is a minimal reproducible example of the issue. Once the issue can be readily reproduced, it can usually be fixed very quickly.
 
 
-<a id="org6e82efc"></a>
+<a id="org64bd2a2"></a>
 
 # Pull Requests
 
@@ -1561,7 +1575,7 @@ This module will adopt a standard semantic versioning policy. Please indicate in
 -   **Bug Fix:** No change to functionality or features. Simple fix of an existing bug.
 
 
-<a id="org680b5c2"></a>
+<a id="org709b0f9"></a>
 
 # Contributors
 

package/README.org

@@ -9,13 +9,25 @@ convenience abstraction as well as a Promise based API.
 Documentation on the methods and available options in the underlying modules can
 be found on the [[https://github.com/mscdex/ssh2][SSH2]] project pages.
 
-Current stable release is *v9.0.1*.
+Current stable release is *v9.0.2*.
 
 Code has been tested against Node versions 14.19.1, 16.15.0 and 18.1.0
 
 Node versions < 14.x are not supported. 
 
 ** Version 9.x Changes
+  - Change the default end and close handlers not to throw error or reject
+    promises. Previously, an end or close event would cause an error to be raised or a
+    promise to be rejected if the event was deemed to be /unexpected/. However,
+    classification of events as being unexpected was unreliable and didn't add much real
+    value. Both these handlers will now invalidate the sftp connection object and log that
+    the event fired and nothing else.
+  - Changed when event handled flags are reset. Now they are reset after a new set of
+    temporary listeners are added.
+  - Don't throw an error when calling end() if there is no active sftp connection. It does
+    no harm to call end() when there is no connection, so no need to raise an error.
+  - Use nullish coalescing when setting retry parameters instead of or'ing with
+    defaults. Allows setting values to 0.  
   - *Breaking Change*: This version uses syntax not supported in node versions
     prior to v14. Therefore, node versions less than v14 will not work.
   - *Breaking Change*: This ~list()~ method no longer accepts a regular expression
@@ -1077,7 +1089,6 @@ services.
 
 #+end_src
 
-
 *** createReadStream(remotePath, options)) ==> stream object
 
   Returns a read stream object which is attached to the remote file specified by
@@ -1190,6 +1201,25 @@ the ~end()~ method automatically removes all listeners from the client object.
    additional steps to simulate missing functionality etc. You want to use a CLI
    program which does as little as possible.
 
+** Issues with ~fastPut()~ and ~fastGet()~ Methods
+
+   The ~fastPut()~ and ~fastGet()~ methods are known to be somewhat dependent on
+   SFTP server capabilities. Some SFTP servers just do not work correctly with
+   concurrent connections and some are known to have issues with negotiating
+   packet sizes. These issues can sometimes be resolved by tweaking the options
+   supplied to the methods, such as setting number of concurrent connections or
+   a psecific packet size.
+
+   To see an example of the type of issues you can observe with ~fastPut()~ or
+   ~fastGet()~, have a look at [[https://github.com/theophilusx/ssh2-sftp-client/issues/407][issue 407]], which describes the experiences of one
+   user. Bottom line, when it works, it tends to work well and be significantly
+   faster than using just ~get()~ or ~put()~. However, when developing code to
+   run against different SFTP servers, especially where you are unable to test
+   against each server, you are likely better off just using ~get()~ and ~put()~
+   or structuring your code so that users can select which method to use (this
+   is what =ssh2-sftp-client= does - for example, see the ~!downloadDir()~ and
+   ~uploadDir()~ methods.
+   
 ** Promises, Events & Managing Exceptions
 
    One of the challenges in providing a Promise based API over a module like

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssh2-sftp-client",
-  "version": "9.0.1",
+  "version": "9.0.2",
   "description": "ssh2 sftp client for node",
   "main": "src/index.js",
   "repository": {

package/src/index.js

@@ -18,7 +18,7 @@ const { errorCode } = require('./constants');
 
 class SftpClient {
   constructor(clientName) {
-    this.version = '9.0.0';
+    this.version = '9.0.2';
     this.client = new Client();
     this.sftp = undefined;
     this.clientName = clientName ? clientName : 'sftp';
@@ -31,7 +31,7 @@ class SftpClient {
     this.debug = undefined;
 
     this.client.on('close', () => {
-      if (this.endCalled || this.closeHandled) {
+      if (this.endCalled || this.errorHandled || this.closeHandled) {
         // we are processing an expected end event or close event handled elsewhere
         this.debugMsg('Global: Ignoring handled close event');
       } else {
@@ -41,7 +41,7 @@ class SftpClient {
     });
 
     this.client.on('end', () => {
-      if (this.endCalled || this.endHandled) {
+      if (this.endCalled || this.errorHandled || this.endHandled) {
         // end event expected or handled elsewhere
         this.debugMsg('Global: Ignoring hanlded end event');
       } else {
@@ -95,26 +95,20 @@ class SftpClient {
     } else {
       switch (err.code) {
         case 'ENOTFOUND':
-          msg =
-            `${name}: ${err.level} error. ` +
-            `Address lookup failed for host ${err.hostname}${retry}`;
+          msg = `${name}: Address lookup failed for host${retry}`;
           break;
         case 'ECONNREFUSED':
-          msg =
-            `${name}: ${err.level} error. Remote host at ` +
-            `${err.address} refused connection${retry}`;
+          msg = `${name}: Remote host refused connection${retry}`;
           break;
         case 'ECONNRESET':
-          msg =
-            `${name}: Remote host has reset the connection: ` +
-            `${err.message}${retry}`;
+          msg = `${name}: Remote host has reset the connection: ${err.message}${retry}`;
           break;
         default:
           msg = `${name}: ${err.message}${retry}`;
       }
       code = err.code ? err.code : errorCode.generic;
     }
-    let newError = new Error(msg);
+    const newError = new Error(msg);
     newError.code = code;
     newError.custom = true;
     this.debugMsg(`${newError.message} (${newError.code})`);
@@ -159,9 +153,7 @@ class SftpClient {
     return new Promise((resolve, reject) => {
       listeners = addTempListeners(this, 'getConnection', reject);
       doReady = () => {
-        this.debugMsg(
-          'getConnection ready listener: got connection - promise resolved'
-        );
+        this.debugMsg('getConnection ready listener: got connection - promise resolved');
         resolve(true);
       };
       this.on('ready', doReady);
@@ -169,7 +161,6 @@ class SftpClient {
     }).finally(() => {
       this.removeListener('ready', doReady);
       removeTempListeners(this, listeners, 'getConnection');
-      this._resetEventFlags();
     });
   }
 
@@ -177,7 +168,6 @@ class SftpClient {
     return new Promise((resolve, reject) => {
       this.client.sftp((err, sftp) => {
         if (err) {
-          this.client.end();
           reject(this.fmtError(err, 'getSftpChannel', err.code));
         } else {
           this.debugMsg('getSftpChannel: SFTP channel established');
@@ -208,10 +198,7 @@ class SftpClient {
       if (config.debug) {
         this.debug = config.debug;
         this.debugMsg('connect: Debugging turned on');
-        this.debugMsg(
-          `ssh2-sftp-client Version: ${this.version} `,
-          process.versions
-        );
+        this.debugMsg(`ssh2-sftp-client Version: ${this.version} `, process.versions);
       }
       if (this.sftp) {
         throw this.fmtError(
@@ -220,10 +207,10 @@ class SftpClient {
           errorCode.connect
         );
       }
-      let retryOpts = {
-        retries: config.retries || 1,
-        factor: config.factor || 2,
-        minTimeout: config.retry_minTimeout || 25000,
+      const retryOpts = {
+        retries: config.retries ?? 1,
+        factor: config.factor ?? 2,
+        minTimeout: config.retry_minTimeout ?? 25000,
       };
       await promiseRetry(retryOpts, async (retry, attempt) => {
         try {
@@ -234,35 +221,26 @@ class SftpClient {
             case 'ENOTFOUND':
             case 'ECONNREFUSED':
             case 'ERR_SOCKET_BAD_PORT':
-              throw err;
-            case undefined: {
-              if (
-                err.message.endsWith(
-                  'All configured authentication methods failed'
-                )
-              ) {
-                throw this.fmtError(
-                  err.message,
-                  'getConnection',
-                  errorCode.badAuth
-                );
-              }
-              retry(err);
-              break;
+            throw err;
+          case undefined: {
+            if (err.message.endsWith('All configured authentication methods failed')) {
+              throw this.fmtError(err.message, 'getConnection', errorCode.badAuth);
             }
-            default:
-              retry(err);
+            retry(err);
+            break;
+          }
+          default:
+            retry(err);
           }
         }
       });
-      let sftp = await this.getSftpChannel();
+      const sftp = await this.getSftpChannel();
       return sftp;
     } catch (err) {
-      this.end();
+      await this.end();
       throw err.custom ? err : this.fmtError(err, 'connect');
     } finally {
       removeTempListeners(this, listeners, 'connect');
-      this._resetEventFlags();
     }
   }
 
@@ -286,9 +264,7 @@ class SftpClient {
             this.debugMsg('_realPath <- ""');
             resolve('');
           } else {
-            reject(
-              this.fmtError(`${err.message} ${rPath}`, 'realPath', err.code)
-            );
+            reject(this.fmtError(`${err.message} ${rPath}`, 'realPath', err.code));
           }
         }
         this.debugMsg(`_realPath <- ${absPath}`);
@@ -309,7 +285,6 @@ class SftpClient {
         : this.fmtError(`${e.message} ${remotePath}`, 'realPath', e.code);
     } finally {
       removeTempListeners(this, listeners, 'realPath');
-      this._resetEventFlags();
     }
   }
 
@@ -336,13 +311,7 @@ class SftpClient {
       this.sftp.stat(aPath, (err, stats) => {
         if (err) {
           if (err.code === 2 || err.code === 4) {
-            reject(
-              this.fmtError(
-                `No such file: ${aPath}`,
-                '_stat',
-                errorCode.notexist
-              )
-            );
+            reject(this.fmtError(`No such file: ${aPath}`, '_stat', errorCode.notexist));
           } else {
             reject(this.fmtError(`${err.message} ${aPath}`, '_stat', err.code));
           }
@@ -380,7 +349,6 @@ class SftpClient {
       throw err.custom ? err : this.fmtError(err, 'stat', err.code);
     } finally {
       removeTempListeners(this, listeners, 'stat');
-      this._resetEventFlags();
     }
   }
 
@@ -437,7 +405,6 @@ class SftpClient {
       throw err.custom ? err : this.fmtError(err, 'exists', err.code);
     } finally {
       removeTempListeners(this, listeners, 'exists');
-      this._resetEventFlags();
     }
   }
 
@@ -458,9 +425,7 @@ class SftpClient {
     return new Promise((resolve, reject) => {
       this.sftp.readdir(remotePath, (err, fileList) => {
         if (err) {
-          reject(
-            this.fmtError(`${err.message} ${remotePath}`, 'list', err.code)
-          );
+          reject(this.fmtError(`${err.message} ${remotePath}`, 'list', err.code));
         } else {
           const reg = /-/gi;
           const newList = fileList.map((item) => {
@@ -497,12 +462,9 @@ class SftpClient {
       haveConnection(this, 'list');
       return await this._list(remotePath, filter);
     } catch (e) {
-      throw e.custom
-        ? e
-        : this.fmtError(`${e.message} ${remotePath}`, 'list', e.code);
+      throw e.custom ? e : this.fmtError(`${e.message} ${remotePath}`, 'list', e.code);
     } finally {
       removeTempListeners(this, listeners, 'list');
-      this._resetEventFlags();
     }
   }
 
@@ -593,12 +555,9 @@ class SftpClient {
       haveConnection(this, 'get');
       return await this._get(remotePath, dst, options);
     } catch (e) {
-      throw e.custom
-        ? e
-        : this.fmtError(`${e.message} ${remotePath}`, 'get', e.code);
+      throw e.custom ? e : this.fmtError(`${e.message} ${remotePath}`, 'get', e.code);
     } finally {
       removeTempListeners(this, listeners, 'get');
-      this._resetEventFlags();
     }
   }
 
@@ -616,9 +575,7 @@ class SftpClient {
     return new Promise((resolve, reject) => {
       this.sftp.fastGet(rPath, lPath, opts, (err) => {
         if (err) {
-          reject(
-            this.fmtError(`${err.message} Remote: ${rPath} Local: ${lPath}`)
-          );
+          reject(this.fmtError(`${err.message} Remote: ${rPath} Local: ${lPath}`));
         }
         resolve(`${rPath} was successfully download to ${lPath}!`);
       });
@@ -632,9 +589,7 @@ class SftpClient {
       haveConnection(this, 'fastGet');
       const ftype = await this.exists(remotePath);
       if (ftype !== '-') {
-        const msg = `${
-          !ftype ? 'No such file ' : 'Not a regular file'
-        } ${remotePath}`;
+        const msg = `${!ftype ? 'No such file ' : 'Not a regular file'} ${remotePath}`;
         throw this.fmtError(msg, 'fastGet', errorCode.badPath);
       }
       const localCheck = haveLocalCreate(localPath);
@@ -650,7 +605,6 @@ class SftpClient {
       throw this.fmtError(err, 'fastGet');
     } finally {
       removeTempListeners(this, listeners, 'fastGet');
-      this._resetEventFlags();
     }
   }
 
@@ -709,7 +663,6 @@ class SftpClient {
       throw e.custom ? e : this.fmtError(e.message, 'fastPut', e.code);
     } finally {
       removeTempListeners(this, listeners, 'fastPut');
-      this._resetEventFlags();
     }
   }
 
@@ -757,9 +710,7 @@ class SftpClient {
         rdr.once('error', (err) => {
           reject(
             this.fmtError(
-              `${err.message} ${
-                typeof lPath === 'string' ? lPath : '<stream>'
-              }`,
+              `${err.message} ${typeof lPath === 'string' ? lPath : '<stream>'}`,
               '_put',
               err.code
             )
@@ -790,7 +741,6 @@ class SftpClient {
       throw e.custom ? e : this.fmtError(e.message, 'put', e.code);
     } finally {
       removeTempListeners(this, listeners, 'put');
-      this._resetEventFlags();
     }
   }
 
@@ -847,7 +797,6 @@ class SftpClient {
       throw e.custom ? e : this.fmtError(e.message, 'append', e.code);
     } finally {
       removeTempListeners(this, listeners, 'append');
-      this._resetEventFlags();
     }
   }
 
@@ -938,7 +887,6 @@ class SftpClient {
       throw this.fmtError(`${err.message}`, 'mkdir', err.code);
     } finally {
       removeTempListeners(this, listeners, 'append');
-      this._resetEventFlags();
     }
   }
 
@@ -979,9 +927,7 @@ class SftpClient {
             }
             const promiseList = [];
             for (const f of files) {
-              promiseList.push(
-                this._delete(`${p}${this.remotePathSep}${f.name}`)
-              );
+              promiseList.push(this._delete(`${p}${this.remotePathSep}${f.name}`));
             }
             await Promise.all(promiseList);
           }
@@ -1017,7 +963,6 @@ class SftpClient {
       throw err.custom ? err : this.fmtError(err.message, 'rmdir', err.code);
     } finally {
       removeTempListeners(this, listeners, 'rmdir');
-      this._resetEventFlags();
     }
   }
 
@@ -1039,9 +984,7 @@ class SftpClient {
           if (notFoundOK && err.code === 2) {
             resolve(`Successfully deleted ${rPath}`);
           } else {
-            reject(
-              this.fmtError(`${err.message} ${rPath}`, 'delete', err.code)
-            );
+            reject(this.fmtError(`${err.message} ${rPath}`, 'delete', err.code));
           }
         }
         resolve(`Successfully deleted ${rPath}`);
@@ -1059,7 +1002,6 @@ class SftpClient {
       throw err.custom ? err : this.fmtError(err.message, 'delete', err.code);
     } finally {
       removeTempListeners(this, listeners, 'delete');
-      this._resetEventFlags();
     }
   }
 
@@ -1100,14 +1042,9 @@ class SftpClient {
     } catch (err) {
       throw err.custom
         ? err
-        : this.fmtError(
-            `${err.message} ${fromPath} ${toPath}`,
-            'rename',
-            err.code
-          );
+        : this.fmtError(`${err.message} ${fromPath} ${toPath}`, 'rename', err.code);
     } finally {
       removeTempListeners(this, listeners, 'rename');
-      this._resetEventFlags();
     }
   }
 
@@ -1149,14 +1086,9 @@ class SftpClient {
     } catch (err) {
       throw err.custom
         ? err
-        : this.fmtError(
-            `${err.message} ${fromPath} ${toPath}`,
-            'posixRename',
-            err.code
-          );
+        : this.fmtError(`${err.message} ${fromPath} ${toPath}`, 'posixRename', err.code);
     } finally {
       removeTempListeners(this, listeners, 'posixRename');
-      this._resetEventFlags();
     }
   }
 
@@ -1193,7 +1125,6 @@ class SftpClient {
         : this.fmtError(`${err.message} ${remotePath}`, 'chmod', err.code);
     } finally {
       removeTempListeners(this, listeners, 'chmod');
-      this._resetEventFlags();
     }
   }
 
@@ -1268,9 +1199,7 @@ class SftpClient {
           }
           this.client.emit('upload', { source: newSrc, destination: newDst });
         } else {
-          this.debugMsg(
-            `uploadDir: File ignored: ${e.name} not a regular file`
-          );
+          this.debugMsg(`uploadDir: File ignored: ${e.name} not a regular file`);
         }
         await Promise.all(fileUploads);
       }
@@ -1293,7 +1222,6 @@ class SftpClient {
       throw err.custom ? err : this.fmtError(err, 'uploadDir');
     } finally {
       removeTempListeners(this, listeners, 'chmod');
-      this._resetEventFlags();
     }
   }
 
@@ -1355,9 +1283,7 @@ class SftpClient {
           }
           this.client.emit('download', { source: newSrc, destination: newDst });
         } else {
-          this.debugMsg(
-            `downloadDir: File ignored: ${f.name} not regular file`
-          );
+          this.debugMsg(`downloadDir: File ignored: ${f.name} not regular file`);
         }
       }
       await Promise.all(downloadFiles);
@@ -1379,7 +1305,6 @@ class SftpClient {
       throw err.custom ? err : this.fmtError(err, 'downloadDir', err.code);
     } finally {
       removeTempListeners(this, listeners, 'downloadDir');
-      this._resetEventFlags();
     }
   }
 
@@ -1404,12 +1329,9 @@ class SftpClient {
       const stream = this.sftp.createReadStream(remotePath, options);
       return stream;
     } catch (err) {
-      throw err.custom
-        ? err
-        : this.fmtError(err.message, 'createReadStream', err.code);
+      throw err.custom ? err : this.fmtError(err.message, 'createReadStream', err.code);
     } finally {
       removeTempListeners(this, listeners, 'createReadStreame');
-      this._resetEventFlags();
     }
   }
 
@@ -1434,12 +1356,9 @@ class SftpClient {
       const stream = this.sftp.createWriteStream(remotePath, options);
       return stream;
     } catch (err) {
-      throw err.custom
-        ? err
-        : this.fmtError(err.message, 'createWriteStream', err.code);
+      throw err.custom ? err : this.fmtError(err.message, 'createWriteStream', err.code);
     } finally {
       removeTempListeners(this, listeners, 'createWriteStream');
-      this._resetEventFlags();
     }
   }
 
@@ -1488,11 +1407,7 @@ class SftpClient {
         );
       }
       if (srcExists !== '-') {
-        throw this.fmtError(
-          `Source not a file ${srcPath}`,
-          'rcopy',
-          errorCode.badPath
-        );
+        throw this.fmtError(`Source not a file ${srcPath}`, 'rcopy', errorCode.badPath);
       }
       const dstPath = await normalizeRemotePath(this, dst);
       const dstExists = await this.exists(dstPath);
@@ -1503,12 +1418,11 @@ class SftpClient {
           errorCode.badPath
         );
       }
-      return await this._rcopy(srcPath, dstPath);
+      return this._rcopy(srcPath, dstPath);
     } catch (err) {
       throw err.custom ? err : this.fmtError(err, 'rcopy');
     } finally {
       removeTempListeners(this, listeners, 'rcopy');
-      this._resetEventFlags();
     }
   }
   /**
@@ -1529,14 +1443,17 @@ class SftpClient {
         resolve(true);
       };
       this.on('close', endCloseHandler);
-      if (haveConnection(this, 'end', reject)) {
+      if (this.client) {
         this.client.end();
+      } else {
+        // no actual connection exists - just resolve
+        this.debugMsg('end: Called when no connection active');
+        resolve(true);
       }
     }).finally(() => {
       removeTempListeners(this, listeners, 'end');
       this.removeListener('close', endCloseHandler);
       this.endCalled = false;
-      this._resetEventFlags();
     });
   }
 }

package/src/utils.js

@@ -10,13 +10,14 @@ const { errorCode } = require('./constants');
  * @throws {Error} Throws new error
  */
 function errorListener(client, name, reject) {
-  let fn = (err) => {
+  const fn = (err) => {
     if (client.endCalled || client.errorHandled) {
       // error already handled or expected - ignore
+      client.debugMsg(`${name} errorListener - ignoring handled error`);
       return;
     }
     client.errorHandled = true;
-    let newError = new Error(`${name}: ${err.message}`);
+    const newError = new Error(`${name}: ${err.message}`);
     newError.code = err.code;
     if (reject) {
       reject(newError);
@@ -28,43 +29,56 @@ function errorListener(client, name, reject) {
 }
 
 function endListener(client, name, reject) {
-  let fn = function () {
-    if (client.endCalled || client.endHandled) {
+  const fn = function () {
+    client.sftp = undefined;
+    if (client.endCalled || client.endHandled || client.errorHandled) {
       // end event already handled - ignore
+      client.debugMsg(`${name} endListener - ignoring handled error`);
       return;
     }
-    client.sftp = undefined;
     client.endHandled = true;
-    let err = new Error(`${name} Unexpected end event raised`);
-    if (reject) {
-      reject(err);
-    } else {
-      throw err;
-    }
+    client.debugMsg(`${name} Unexpected end event - ignoring`);
+    // Don't reject/throw error, just log it and move on
+    // after invalidating the connection
+    // const err = new Error(`${name} Unexpected end event raised`);
+    // if (reject) {
+    //   reject(err);
+    // } else {
+    //   throw err;
+    // }
   };
   return fn;
 }
 
 function closeListener(client, name, reject) {
-  let fn = function () {
-    if (client.endCalled || client.closeHandled) {
+  const fn = function () {
+    client.sftp = undefined;
+    if (
+      client.endCalled ||
+      client.closeHandled ||
+      client.errorHandled ||
+      client.endHandled
+    ) {
       // handled or expected close event - ignore
+      client.debugMsg(`${name} closeListener - ignoring handled error`);
       return;
     }
-    client.sftp = undefined;
     client.closeHandled = true;
-    let err = new Error(`${name}: Unexpected close event raised`);
-    if (reject) {
-      reject(err);
-    } else {
-      throw err;
-    }
+    client.debugMsg(`${name} Unexpected close event raised - ignoring`);
+    // Don't throw/reject on close events. Just invalidate the connection
+    // and move on.
+    // const err = new Error(`${name}: Unexpected close event raised`);
+    // if (reject) {
+    //   reject(err);
+    // } else {
+    //   throw err;
+    // }
   };
   return fn;
 }
 
 function addTempListeners(client, name, reject) {
-  let listeners = {
+  const listeners = {
     end: endListener(client, name, reject),
     close: closeListener(client, name, reject),
     error: errorListener(client, name, reject),
@@ -72,6 +86,7 @@ function addTempListeners(client, name, reject) {
   client.on('end', listeners.end);
   client.on('close', listeners.close);
   client.on('error', listeners.error);
+  client._resetEventFlags();
   return listeners;
 }
 
@@ -106,9 +121,7 @@ function localExists(filePath) {
   } else if (stats.isFile()) {
     return '-';
   } else {
-    let err = new Error(
-      `Bad path: ${filePath}: target must be a file or directory`
-    );
+    const err = new Error(`Bad path: ${filePath}: target must be a file or directory`);
     err.code = errorCode.badPath;
     throw err;
   }
@@ -249,7 +262,7 @@ async function normalizeRemotePath(client, aPath) {
  */
 function haveConnection(client, name, reject) {
   if (!client.sftp) {
-    let newError = new Error(`${name}: No SFTP connection available`);
+    const newError = new Error(`${name}: No SFTP connection available`);
     newError.code = errorCode.connect;
     if (reject) {
       reject(newError);