Skip to content

Commit

Permalink
set defaults further down the stack
Browse files Browse the repository at this point in the history
  • Loading branch information
pghalliday committed Mar 26, 2018
1 parent f81a34b commit 102d90f
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 35 deletions.
4 changes: 1 addition & 3 deletions lib/cli/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ module.exports = function cli(argv) {
process.stdout.write((0, _options.help)());
process.exit(1);
}
return (0, _.listen)(Object.assign({}, opts, {
out: process.stdout
})).catch(function (error) {
return (0, _.listen)(opts).catch(function (error) {
console.error(error.stack);
});
};
56 changes: 29 additions & 27 deletions lib/listen.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,64 +4,66 @@ Object.defineProperty(exports, "__esModule", {
value: true
});

var _net = require('net');

var _promisify = require('./utils/promisify');

var _promisify2 = _interopRequireDefault(_promisify);

var _socket = require('./utils/socket');

var _socket2 = _interopRequireDefault(_socket);

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }

exports.default = function () {
var listen = function () {
var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref) {
var workingDir = _ref.workingDir,
name = _ref.name,
out = _ref.out;
var out = _ref.out,
workingDir = _ref.workingDir,
name = _ref.name;

var server, _listen, _close;

return regeneratorRuntime.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
// istanbul ignore next
out = out || process.stdout;
server = (0, _net.createServer)(function (client) {
client.on('data', out.write.bind(out));
});
_listen = (0, _promisify2.default)(server.listen.bind(server));
_close = (0, _promisify2.default)(server.close.bind(server));
_context.t0 = _listen;
_context.next = 6;
_context.next = 7;
return (0, _socket2.default)({
workingDir: workingDir,
name: name,
server: true
});

case 6:
case 7:
_context.t1 = _context.sent;
_context.next = 9;
_context.next = 10;
return (0, _context.t0)(_context.t1);

case 9:
case 10:
return _context.abrupt('return', _close);

case 10:
case 11:
case 'end':
return _context.stop();
}
}
}, _callee, this);
}));

function listen(_x) {
return function listen(_x) {
return _ref2.apply(this, arguments);
}
};
}();

var _net = require('net');

var _promisify = require('./utils/promisify');

var _promisify2 = _interopRequireDefault(_promisify);

var _socket = require('./utils/socket');

var _socket2 = _interopRequireDefault(_socket);

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }

return listen;
}();
exports.default = listen;
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "echo-it",
"version": "1.0.1",
"version": "1.0.2",
"description": "Named echo servers for targeting messages",
"main": "lib/index.js",
"bin": "bin/index.js",
Expand Down
4 changes: 1 addition & 3 deletions src/cli/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ module.exports = function cli(argv) {
process.stdout.write(help());
process.exit(1);
}
return listen(Object.assign({}, opts, {
out: process.stdout,
}))
return listen(opts)
.catch((error) => {
console.error(error.stack);
});
Expand Down
10 changes: 9 additions & 1 deletion src/listen.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ import {createServer} from 'net';
import promisify from './utils/promisify';
import getSocket from './utils/socket';

export default async function listen({workingDir, name, out}) {
async function listen({
out,
workingDir,
name,
}) {
// istanbul ignore next
out = out || process.stdout;
const server = createServer((client) => {
client.on('data', out.write.bind(out));
});
Expand All @@ -15,3 +21,5 @@ export default async function listen({workingDir, name, out}) {
}));
return _close;
}

export default listen;

0 comments on commit 102d90f

Please sign in to comment.