Merge pull request #8 from KarmaProd/master

Fixing Issue #6 (Connection not closed)
teastman · Dec 23, 2021 · ecfb606 · ecfb606
2 parents aec2936 + bbe18b8
commit ecfb606
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/ftp-download.js b/ftp-download.js
@@ -44,7 +44,6 @@ module.exports = function (RED) {
     function FtpDownloadNode(n) {
         RED.nodes.createNode(this, n);
 
-        const conn = new ftp();
         const flow = this.context().flow;
         const global = this.context().global;
         const node = this;
@@ -60,7 +59,8 @@ module.exports = function (RED) {
         let directory = "";
 
         node.on('input', (msg) => {
-
+            const conn = new ftp();
+
             // Load the files list from the appropriate variable.
             try {
                 switch (node.filesType) {
@@ -121,6 +121,7 @@ module.exports = function (RED) {
                 promise
                     .then((filePaths)=> {
                         msg[node.output] = filePaths;
+                        conn.end();
                         node.send(msg);
                     })
                     .catch((err) => {
@@ -185,7 +186,8 @@ module.exports = function (RED) {
 
         node.on('close', () => {
             try {
-                conn.destroy();
+                // conn.destroy();
+                // Line removed since connection should be already closed
             }
             catch (err) {
                 // Do nothing as the node is closed anyway.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-ftp-download",
-  "version": "1.0.4",
+  "version": "1.0.4.2",
   "description": "A Node-RED node for FTP downloading.",
   "dependencies": {
     "ftp": "0.x"