Skip to content

Connection: Add option to specify keep-alive behaviour on connect. #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
peterkooijmans wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Connection: Add option to specify keep-alive behaviour on connect. #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b23fde8
Connection: Add option to specify keep-alive behaviour on connect.
peterkooijmans Sep 6, 2017
9f8b8b6
Connection: call socket.destory when destory method is called.
May 28, 2018
e48817d
Fix timezone problem in tests.
May 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions lib/connection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ var FTP = module.exports = function() {
secureOptions: undefined,
connTimeout: undefined,
pasvTimeout: undefined,
aliveTimeout: undefined
aliveTimeout: undefined,
keepAlive: undefined
};
this.connected = false;
};
Expand All @@ -97,6 +98,7 @@ FTP.prototype.connect = function(options) {
this.options.connTimeout = options.connTimeout || 10000;
this.options.pasvTimeout = options.pasvTimeout || 10000;
this.options.aliveTimeout = options.keepalive || 10000;
this.options.keepAlive = options.keepAlive || false;

if (typeof options.debug === 'function')
this._debug = options.debug;
Expand All @@ -106,7 +108,7 @@ FTP.prototype.connect = function(options) {
socket = new Socket();

socket.setTimeout(0);
socket.setKeepAlive(true);
socket.setKeepAlive(this.options.keepAlive);

this._parser = new Parser({ debug: debug });
this._parser.on('response', function(code, text) {
Expand Down Expand Up @@ -321,6 +323,10 @@ FTP.prototype.end = function() {
};

FTP.prototype.destroy = function() {
if (this._pasvSock && this._pasvSock.writable)
this._pasvSock.destroy();
if (this._socket && this._socket.writable)
this._socket.destroy();
this._reset();
};

Expand Down Expand Up @@ -743,12 +749,12 @@ FTP.prototype.rmdir = function(path, recursive, cb) { // RMD is optional
if (!recursive) {
return this._send('RMD ' + path, cb);
}

var self = this;
this.list(path, function(err, list) {
if (err) return cb(err);
var idx = 0;

// this function will be called once per listing entry
var deleteNextEntry;
deleteNextEntry = function(err) {
Expand All @@ -760,9 +766,9 @@ FTP.prototype.rmdir = function(path, recursive, cb) { // RMD is optional
return self.rmdir(path, cb);
}
}

var entry = list[idx++];

// get the path to the file
var subpath = null;
if (entry.name[0] === '/') {
Expand All @@ -776,7 +782,7 @@ FTP.prototype.rmdir = function(path, recursive, cb) { // RMD is optional
subpath = path + '/' + entry.name
}
}

// delete the entry (recursively) according to its type
if (entry.type === 'd') {
if (entry.name === "." || entry.name === "..") {
Expand Down
16 changes: 8 additions & 8 deletions test/test-parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var group = path.basename(__filename, '.js') + '/';
owner: 'root',
group: 'root',
size: 4096,
date: new Date('2012-12-21T00:00')
date: new Date('2012-12-21T00:00Z')
},
what: 'Normal directory'
},
Expand All @@ -34,7 +34,7 @@ var group = path.basename(__filename, '.js') + '/';
owner: 'owner',
group: 'group',
size: 0,
date: new Date('2012-08-31T00:00')
date: new Date('2012-08-31T00:00Z')
},
what: 'Normal directory #2'
},
Expand All @@ -49,7 +49,7 @@ var group = path.basename(__filename, '.js') + '/';
owner: 'owner',
group: 'group',
size: 7045120,
date: new Date('2012-09-02T00:00')
date: new Date('2012-09-02T00:00Z')
},
what: 'Normal file'
},
Expand All @@ -64,7 +64,7 @@ var group = path.basename(__filename, '.js') + '/';
owner: 'owner',
group: 'group',
size: 7045120,
date: new Date('2012-09-02T00:00')
date: new Date('2012-09-02T00:00Z')
},
what: 'File with ACL set'
},
Expand All @@ -79,7 +79,7 @@ var group = path.basename(__filename, '.js') + '/';
owner: 'root',
group: 'root',
size: 4096,
date: new Date('2012-05-19T00:00')
date: new Date('2012-05-19T00:00Z')
},
what: 'Directory with sticky bit and executable for others'
},
Expand All @@ -94,7 +94,7 @@ var group = path.basename(__filename, '.js') + '/';
owner: 'root',
group: 'root',
size: 4096,
date: new Date('2012-05-19T00:00')
date: new Date('2012-05-19T00:00Z')
},
what: 'Directory with sticky bit and executable for others #2'
},
Expand All @@ -109,7 +109,7 @@ var group = path.basename(__filename, '.js') + '/';
owner: 'root',
group: 'root',
size: 4096,
date: new Date('2012-05-19T00:00')
date: new Date('2012-05-19T00:00Z')
},
what: 'Directory with sticky bit and not executable for others'
},
Expand All @@ -124,7 +124,7 @@ var group = path.basename(__filename, '.js') + '/';
owner: 'root',
group: 'root',
size: 4096,
date: new Date('2012-05-19T00:00')
date: new Date('2012-05-19T00:00Z')
},
what: 'Directory with sticky bit and not executable for others #2'
},
Expand Down