pino-socket
Advanced tools
Comparing version 1.0.1 to 2.0.0
@@ -58,3 +58,3 @@ 'use strict' | ||
socket = net.createConnection( | ||
{host: options.address, port: options.port}, | ||
{ host: options.address, port: options.port }, | ||
() => { | ||
@@ -64,3 +64,3 @@ connecting = false | ||
if (cb) cb(null, connected) | ||
inputStream.pipe(outputStream, {end: false}) | ||
inputStream.pipe(outputStream, { end: false }) | ||
inputStream.resume() | ||
@@ -74,2 +74,3 @@ } | ||
connected = false | ||
connecting = false | ||
inputStream.pause() | ||
@@ -76,0 +77,0 @@ inputStream.unpipe(outputStream) |
@@ -24,4 +24,4 @@ 'use strict' | ||
process.stdin.pipe(writableStream, {end: false}) | ||
process.stdin.pipe(writableStream, { end: false }) | ||
return writableStream | ||
} |
{ | ||
"name": "pino-socket", | ||
"version": "1.0.1", | ||
"version": "2.0.0", | ||
"description": "A pino 'transport' for writing to a tcp or udp socket", | ||
@@ -9,3 +9,4 @@ "homepage": "https://github.com/pinojs/pino-socket", | ||
"scripts": { | ||
"test": "gulp test" | ||
"test": "standard && mocha --ui qunit -R dot test", | ||
"cov": "nyc mocha --ui qunit -R dot test" | ||
}, | ||
@@ -26,20 +27,16 @@ "bin": { | ||
"devDependencies": { | ||
"chai": "^3.5.0", | ||
"gulp": "^3.9.1", | ||
"gulp-istanbul": "^1.1.1", | ||
"gulp-load-plugins": "^1.4.0", | ||
"gulp-mocha": "^3.0.1", | ||
"gulp-standard": "^8.0.2", | ||
"istanbul": "^0.4.5", | ||
"mocha": "^3.2.0", | ||
"pino": "^3.0.5", | ||
"pre-commit": "^1.1.3" | ||
"chai": "^4.2.0", | ||
"mocha": "^6.0.2", | ||
"nyc": "^13.3.0", | ||
"pino": "^5.11.1", | ||
"pre-commit": "^1.1.3", | ||
"standard": "^12.0.1" | ||
}, | ||
"dependencies": { | ||
"backoff": "^2.5.0", | ||
"nopt": "^3.0.6", | ||
"pump": "^1.0.1", | ||
"split2": "^2.0.1", | ||
"through2": "^2.0.3" | ||
"nopt": "^4.0.1", | ||
"pump": "^3.0.0", | ||
"split2": "^3.1.0", | ||
"through2": "^3.0.1" | ||
} | ||
} |
@@ -12,5 +12,7 @@ 'use strict' | ||
const socket = net.createServer((connection) => { | ||
connection.on('data', (data) => msgHandler(data.toString())) | ||
connection.on('data', (data) => { | ||
msgHandler(data.toString()) | ||
}) | ||
}) | ||
socket.listen((err) => { | ||
socket.listen(0, '127.0.0.1', (err) => { | ||
if (err) { | ||
@@ -29,3 +31,3 @@ return reject(err) | ||
socket.on('error', (err) => console.log(`socket error: ${err.message}`)) | ||
socket.bind({address: '127.0.0.1'}, () => resolve(socket)) | ||
socket.bind({ address: '127.0.0.1' }, () => resolve(socket)) | ||
}) | ||
@@ -42,2 +44,3 @@ } | ||
const logit = spawn('node', [`${__dirname}/fixtures/logit.js`]) | ||
logit.unref() | ||
const psock = spawn( | ||
@@ -47,10 +50,6 @@ 'node', | ||
) | ||
psock.unref() | ||
logit.stdout.on('data', (data) => psock.stdin.write(data)) | ||
logit.stderr.on('data', (data) => console.log(`logit err: ${data}`)) | ||
psock.stderr.on('data', (data) => console.log(`psock err: ${data}`)) | ||
logit.on('close', () => psock.stdin.end( | ||
setImmediate.bind(null, psock.kill) | ||
)) | ||
}) | ||
@@ -93,3 +92,3 @@ .catch(done) | ||
} finally { | ||
socket.end() | ||
socket.close() | ||
socket.unref() | ||
@@ -96,0 +95,0 @@ } |
@@ -11,2 +11,3 @@ 'use strict' | ||
const server = net.createServer() | ||
server.unref() | ||
server.listen(() => { | ||
@@ -22,8 +23,6 @@ const scriptPath = path.join(__dirname, 'fixtures', 'issue5.js') | ||
psock.stdout.on('close', () => { | ||
server.close(() => { | ||
expect(output.length > 0) | ||
done() | ||
}) | ||
expect(output.length > 0) | ||
done() | ||
}) | ||
}) | ||
}) |
@@ -9,10 +9,14 @@ 'use strict' | ||
test('loads settings from a file (switches take precedence)', function (done) { | ||
let messages = [] | ||
const server = net.createServer((connection) => { | ||
connection.on('data', (data) => { | ||
const lines = data.toString().split('\n').filter((l) => l !== '\n' && l !== '') | ||
messages = messages.concat(lines) | ||
connection.once('data', (data) => { | ||
expect(data + '').to.equal('log 1\n') | ||
finished() | ||
}) | ||
}) | ||
function finished () { | ||
server.close() | ||
server.unref() | ||
done() | ||
} | ||
server.listen(0, '127.0.0.1', () => { | ||
@@ -25,20 +29,7 @@ const address = server.address().address | ||
) | ||
psock.unref() | ||
setTimeout(() => { | ||
psock.stdin.write('log 1\n') | ||
}, 50) | ||
setTimeout(() => { | ||
psock.stdin.write('log 2\n') | ||
}, 100) | ||
setTimeout(finished, 150) | ||
function finished (err) { | ||
if (err) return done(err) | ||
expect(messages.length).to.equal(2) | ||
psock.kill() | ||
server.close() | ||
server.unref() | ||
done() | ||
} | ||
}) | ||
}) |
'use strict' | ||
/* eslint-env node, mocha */ | ||
const path = require('path') | ||
const fork = require('child_process').fork | ||
const net = require('net') | ||
const spawn = require('child_process').spawn | ||
const expect = require('chai').expect | ||
function startServer ({ address, port, next }) { | ||
const socket = net.createServer((connection) => { | ||
connection.on('data', (data) => { | ||
next({ action: 'data', data }) | ||
connection.destroy() | ||
}) | ||
}) | ||
socket.listen(port || 0, address || '127.0.0.1', () => { | ||
next({ | ||
action: 'started', | ||
address: socket.address().address, | ||
port: socket.address().port | ||
}) | ||
}) | ||
return socket | ||
} | ||
test('tcp reconnect', function testTcpReconnect (done) { | ||
const serverScript = path.join(__dirname, 'fixtures', 'server.js') | ||
let msgCount = 0 | ||
@@ -16,4 +33,4 @@ let address | ||
let server = fork(serverScript) | ||
server.on('message', (msg) => { | ||
let server = startServer({ next }) | ||
function next (msg) { | ||
switch (msg.action) { | ||
@@ -24,14 +41,13 @@ case 'started': | ||
case 'data': | ||
server.removeAllListeners('message') | ||
msgCount += 1 | ||
server.kill() | ||
psock.stdin.write('log 2\n') // dropped due to paused stdin | ||
setImmediate(secondServer) | ||
server.close(() => { | ||
psock.stdin.write('log 2\n') // dropped due to paused stdin | ||
setImmediate(secondServer) | ||
}) | ||
} | ||
}) | ||
server.send({action: 'startServer'}) | ||
} | ||
function secondServer () { | ||
server = fork(serverScript) | ||
server.on('message', (msg) => { | ||
server = startServer({ address, port, next }) | ||
function next (msg) { | ||
switch (msg.action) { | ||
@@ -44,8 +60,7 @@ case 'started': | ||
expect(msgCount).to.equal(2) | ||
server.kill() | ||
server.close() | ||
psock.kill() | ||
done() | ||
} | ||
}) | ||
server.send({action: 'startServer', address, port}) | ||
} | ||
} | ||
@@ -63,6 +78,5 @@ | ||
setTimeout(() => | ||
psock.stdin.write('log 1\n'), | ||
50 | ||
) | ||
setTimeout(() => { | ||
psock.stdin.write('log 1\n') | ||
}, 50) | ||
} | ||
@@ -73,5 +87,5 @@ | ||
psock.stdin.write('log 3\n'), | ||
100 | ||
100 | ||
) | ||
} | ||
}) |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
6
584
22248
20
15
+ Addednopt@4.0.3(transitive)
+ Addedos-homedir@1.0.2(transitive)
+ Addedos-tmpdir@1.0.2(transitive)
+ Addedosenv@0.1.5(transitive)
+ Addedpump@3.0.2(transitive)
+ Addedreadable-stream@3.6.2(transitive)
+ Addedsafe-buffer@5.2.1(transitive)
+ Addedsplit2@3.2.2(transitive)
+ Addedstring_decoder@1.3.0(transitive)
+ Addedthrough2@3.0.2(transitive)
- Removedcore-util-is@1.0.3(transitive)
- Removedisarray@1.0.0(transitive)
- Removednopt@3.0.6(transitive)
- Removedprocess-nextick-args@2.0.1(transitive)
- Removedpump@1.0.3(transitive)
- Removedreadable-stream@2.3.8(transitive)
- Removedsafe-buffer@5.1.2(transitive)
- Removedsplit2@2.2.0(transitive)
- Removedstring_decoder@1.1.1(transitive)
- Removedthrough2@2.0.5(transitive)
- Removedxtend@4.0.2(transitive)
Updatednopt@^4.0.1
Updatedpump@^3.0.0
Updatedsplit2@^3.1.0
Updatedthrough2@^3.0.1