From 87fba5c9553468b1fa7f886d4b383b85a79ebc5e Mon Sep 17 00:00:00 2001 From: David Kebler Date: Sun, 8 Dec 2019 14:54:40 -0800 Subject: [PATCH] 0.3.11 update/change to new event names connection:consumer and log (from status) --- package.json | 2 +- src/socket.js | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 97b80a3..117c516 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@uci/websocket", - "version": "0.3.10", + "version": "0.3.11", "description": "JSON packet host websocket server", "main": "src", "scripts": { diff --git a/src/socket.js b/src/socket.js index 9ea27bb..0181dd7 100644 --- a/src/socket.js +++ b/src/socket.js @@ -81,19 +81,19 @@ class Socket extends Server { this.on('error', err => { this.errorCount +=1 // log errors here this.errors.push(err) - if(this.errorCount>2) this.emit('status', {level:'warn',msg:'something bad maybe going on, 3 errors', errors:this.errors}) + if(this.errorCount>2) this.emit('log', {level:'warn',msg:'something bad maybe going on, 3 errors', errors:this.errors}) if(this.errorCount>5) { let errors = {level:'fatal',msg:'something fatal is going on, 6 errors', errors:this.errors} log.fatal(errors) this.listening=false - this.emit('status', {active:this.active}) - this.emit('status', errors) + this.emit('log', {active:this.active}) + this.emit('log', errors) } }) this.wss = new WSS({server:this}) this.wss.on('error', err => {this.emit('error', err)}) // bubble up errors this.wss.on('connection', this._connectionHandler.bind(this)) - this.emit('status',{active:this.active}) + this.emit('log',{active:this.active}) resolve(`websocket ready and listening at ${this.address().address}:${this.address().port}`) }) super.listen(this.opts) @@ -161,7 +161,7 @@ class Socket extends Server { removeconsumer (id) { let consumer = this.consumers.get(id) - this.emit('consumer-connection',{state:'disconnected', id:consumer.id, name:consumer.name, socketSide:true}) + this.emit('connection:consumer',{state:'disconnected', name:consumer.name}) clearInterval(consumer._ping) consumer.removeAllListeners() log.warn({msg:`consumer ${id}:${consumer.name} removed from server tracking`, id:id, name:consumer.name, curconsumerCount:this.consumers.size}) @@ -257,8 +257,7 @@ class Socket extends Server { this._send(consumer,this.opts.conPacket) // send a packet command on to consumer on connection } - this.emit('consumer-connection',{state:'connected', consumer:consumer}) - this.emit('status',{level:'info', msg:'a consumer connected', name:consumer.name, id:consumer.id}) + this.emit('connection:consumer',{state:'connected', name:consumer.name, id:consumer.id}) consumer._ping = setInterval( () => { consumer.ping(JSON.stringify({pingInterval:this.pingInterval}))