mos-connection
Advanced tools
Comparing version 0.5.2 to 0.5.3
@@ -5,2 +5,12 @@ # Change Log | ||
<a name="0.5.3"></a> | ||
## [0.5.3](https://github.com/nrkno/tv-automation-mos-connection/compare/0.5.2...0.5.3) (2018-08-21) | ||
### Bug Fixes | ||
* proper bubbling of error & warning events ([5d14e55](https://github.com/nrkno/tv-automation-mos-connection/commit/5d14e55)) | ||
<a name="0.5.2"></a> | ||
@@ -7,0 +17,0 @@ ## [0.5.2](https://github.com/nrkno/tv-automation-mos-connection/compare/0.5.1...0.5.2) (2018-08-20) |
@@ -354,3 +354,5 @@ "use strict"; | ||
// when starting up, we might get half a message, let's ignore this error then | ||
console.log('Strange XML-message upon startup'); | ||
let a = Math.min(20, Math.floor(messageString.length / 2)); | ||
console.log('Strange XML-message upon startup: "' + messageString.slice(0, a) + '[...]' + messageString.slice(-a) + '" (length: ' + messageString.length + ')'); | ||
console.log('error', e); | ||
} | ||
@@ -357,0 +359,0 @@ else { |
@@ -36,2 +36,8 @@ "use strict"; | ||
}); | ||
client.on('warning', (str) => { | ||
this.emit('warning', 'MosSocketClient: ' + str); | ||
}); | ||
client.on('error', (str) => { | ||
this.emit('error', 'MosSocketClient: ' + str); | ||
}); | ||
} | ||
@@ -38,0 +44,0 @@ /** */ |
@@ -61,2 +61,8 @@ "use strict"; | ||
}); | ||
primary.on('warning', (str) => { | ||
this.emit('warning', 'primary: ' + str); | ||
}); | ||
primary.on('error', (str) => { | ||
this.emit('error', 'primary: ' + str); | ||
}); | ||
primary.createClient(MosConnection.nextSocketID, MosConnection.CONNECTION_PORT_LOWER, 'lower'); | ||
@@ -70,2 +76,8 @@ primary.createClient(MosConnection.nextSocketID, MosConnection.CONNECTION_PORT_UPPER, 'upper'); | ||
}); | ||
secondary.on('warning', (str) => { | ||
this.emit('warning', 'secondary: ' + str); | ||
}); | ||
secondary.on('error', (str) => { | ||
this.emit('error', 'secondary: ' + str); | ||
}); | ||
secondary.createClient(MosConnection.nextSocketID, MosConnection.CONNECTION_PORT_LOWER, 'lower'); | ||
@@ -72,0 +84,0 @@ secondary.createClient(MosConnection.nextSocketID, MosConnection.CONNECTION_PORT_UPPER, 'upper'); |
@@ -754,3 +754,4 @@ "use strict"; | ||
if (this._currentConnection) { | ||
console.log('exec command', message); | ||
if (this._debug) | ||
console.log('exec command', message); | ||
if (!this._currentConnection.connected) { | ||
@@ -765,3 +766,4 @@ return this.switchConnections(message); | ||
}).catch((e) => { | ||
console.log('errored', e); | ||
if (this._debug) | ||
console.log('errored', e); | ||
if (this._primaryConnection && this._secondaryConnection && !resend) { | ||
@@ -781,3 +783,4 @@ return this.switchConnections(message); | ||
if (this._currentConnection && this._primaryConnection && this._secondaryConnection) { | ||
console.log('swithcing conn'); | ||
if (this._debug) | ||
console.log('swithcing connection'); | ||
this._currentConnection = this._currentConnection === this._primaryConnection ? this._secondaryConnection : this._primaryConnection; | ||
@@ -788,3 +791,4 @@ if (!this._currentConnection.connected) | ||
if (message) { | ||
console.log('resending msg'); | ||
if (this._debug) | ||
console.log('resending msg'); | ||
p = this.executeCommand(message, true).catch((e) => { | ||
@@ -791,0 +795,0 @@ if (e === 'Main server available') { |
{ | ||
"name": "mos-connection", | ||
"version": "0.5.2", | ||
"version": "0.5.3", | ||
"description": "MOS compliant TCP/IP Socket connection.", | ||
@@ -5,0 +5,0 @@ "main": "dist/index.js", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
320442
4390