Skip to content

copy normalizeConnectArgs from node 6 #23

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
lee-elenbaas wants to merge 3 commits into
base: master
Choose a base branch
from
Open

copy normalizeConnectArgs from node 6 #23

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5e59f3
copy normalizeConnectArgs from node 6
Oct 27, 2016
2fc008d
fix isPipeName dependancy
Oct 27, 2016
7039cb6
typo
Oct 27, 2016
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
24 changes: 23 additions & 1 deletion lib/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
var net = require('net'),
normalizeConnectArgs = net._normalizeConnectArgs,
dns = require('dns'),
util = require('util'),
inherits = util.inherits,
Expand All @@ -11,6 +10,29 @@ var Parser = require('./client.parser'),
var CMD = require('./constants').CMD,
ATYP = require('./constants').ATYP;

function normalizeConnectArgs(args) {
var options = {};

if (args.length === 0) {
return [options];
} else if (args[0] !== null && typeof args[0] === 'object') {
// connect(options, [cb])
options = args[0];
} else if (typeof args[0] === 'string' && !(Number(args[0]) >= 0)) {
// connect(path, [cb]);
options.path = args[0];
} else {
// connect(port, [host], [cb])
options.port = args[0];
if (args.length > 1 && typeof args[1] === 'string') {
options.host = args[1];
}
}

var cb = args[args.length - 1];
return typeof cb === 'function' ? [options, cb] : [options];
}

function Client(options) {
if (!(this instanceof Client))
return new Client(options);
Expand Down