homebridge-sharp-aquos-tv 3.0.2 → 3.0.3

package/index.js

@@ -23,10 +23,7 @@ var cachedAccessories = [];
 var didFinishLaunching = false;
 
 /* Variables for telnet polling system */
-var g_powerState = [false,false,false];
-var g_volLevel = [0,0,0];
-var g_muteState = [false,false,false];
-var g_inputID = [null,null,null];
+var g_powerState = false;
 
 module.exports = (homebridge) => {
 	Service = homebridge.hap.Service;
@@ -43,6 +40,7 @@ exports.logDebug = function(string) {
 	else
 		g_log.warn(string);
 }
+
 function logDebug(string) {
 	if (!debugToInfo)
 		g_log.debug(string);
@@ -50,6 +48,7 @@ function logDebug(string) {
 		g_log.warn(string);
 }
 
+
 class sharpClient {
 	constructor(log, config, api) {
 		g_log = log;
@@ -151,11 +150,8 @@ class tv {
 		this.disabletv = false;
 		this.pollingTimeout = false;
 
-		this.poweredOn = [false,false,false];
-		this.currentInputID = [null,null,null];
-		this.volDisp = [null,null,null];
-		this.volumeLevel = [30,30,30];
-		this.muteState = [false,false,false];
+		this.poweredOn = false;
+		this.currentInputID = null;
 
 		this.startConfiguration();
 		//start polling
@@ -206,43 +202,39 @@ class tv {
 	 * This will start a polling loop that goes on forever and updates
 	 * the on characteristic periodically.
 	 */
-	pollForUpdates(zone) {
-		// if (traceOn)
-		// 	logDebug('DEBUG: pollForUpdates zone: ' + zone + ': ' + this.ip);
+	pollForUpdates() {
 
-		/* Make sure that no poll is happening just after switch in input/power */
+		/* Make sure no poll is happening just after switch in input/power */
 		if (this.pollingTimeout) {
 			this.pollingTimeout = false;
 			return;
 		}
 
-		var that = this;
-		this.send('POWR?   ');
-		this.send('IAVD?   ');
-		this.send('RSPW2   '); //ensure TV can be turned on from IP control
-
+		// send all poll commands at once, as responses will be batched
+		this.send(['RSPW2   ','POWR?   ','IAVD?   ']); //ensure TV can be turned on from IP control, query power, query input
+		// response will be OK\rpowerstate\rinputID
 	}
 
 
 	/*
 	 * Used to update the state of all. Disable polling for one poll.
 	 */
-	updateStates(that, stateInfo, curName) {
+	updateStates(stateInfo, curName) {
 		if (curName)
-			that.pollingTimeout = true;
+			this.pollingTimeout = true;
 
 		if (traceOn)
 			logDebug(stateInfo);
 
 		if (stateInfo.power === true || stateInfo.power === false)
-			that.poweredOn[stateInfo.zone-1] = stateInfo.power;
+			this.poweredOn = stateInfo.power;
 
 		if (stateInfo.inputID)
-			that.currentInputID[stateInfo.zone-1] = stateInfo.inputID;
+			this.currentInputID = stateInfo.inputID;
 
-		for (let i in that.tvAccessories) {
-			if (that.tvAccessories[i].getName() != curName) {
-				that.tvAccessories[i].settvState(stateInfo);
+		for (let i in this.tvAccessories) {
+			if (this.tvAccessories[i].getName() != curName) {
+				this.tvAccessories[i].settvState(stateInfo);
 			}
 		}
 	}
@@ -268,10 +260,12 @@ class tv {
       }
 
       send(cmd) {
-		if (this.telnet == null)
-		this.connect();
-	        this.telnet.send(cmd).then(
-			res => { this.responseHandler(cmd,res.slice(0, -1)) }).catch(
+		// connect if we are not connected
+		if (this.telnet == null) this.connect();
+		// send command and await response if one is expected
+		logDebug('sendng ' + cmd);
+		this.telnet.send(cmd.join('\r')).then(
+			res => { this.responseHandler(res.slice(0, -1)) }).catch(
 			error => {
 				logDebug(error);
 				this.telnet=null;
@@ -279,28 +273,23 @@ class tv {
 		);
       }
 
-      responseHandler(cmd,res) {
-
-            logDebug('Received response for ' + cmd + res);
-	    res=res.split('\r')
-            switch (cmd) {
-                case 'POWR?   ':
-    		case 'IAVD?   ':
-			if (res[0] === '1')
-				g_powerState[0] = true;
-			else if (res[0] === '0')
-				g_powerState[0] = false;
-			let stateInfo = {
-				zone: 1,
-				power: g_powerState[0],
-				inputID: res[1],
-			}
-			logDebug(stateInfo);
-			if (!this.pollingTimeout)
-				this.updateStates(this, stateInfo, null);
-			this.telnet.end().then( () => { this.telnet = null; } )
-
-		break;
+      responseHandler(res) {
+	    	res=res.split('\r')
+			logDebug('response ' + res);
+            if (res.length == 3) { //response to poll will be ['OK',power,input]
+				// so get power and input now
+				if (res[1] === '1')
+					g_powerState = true;
+				else if (res[1] === '0')
+					g_powerState = false;
+				let stateInfo = {
+					power: g_powerState,
+					inputID: res[2],
+				}
+				logDebug(stateInfo);
+				if (!this.pollingTimeout) this.updateStates(stateInfo, null);
+				// if connection closed, dispose of client
+				this.telnet.end().then( () => { this.telnet = null; } )
         }
     }
 }
@@ -319,10 +308,7 @@ class tvClient {
 		this.name = device.name || 'Sharp TV';
 		this.ip = device.ip;
 		this.inputs = device.inputs;
-		this.zone = device.zone || 1;
-		this.zone = 1;
 
-		this.iterator = this.zone - 1;
 		this.defaultInputID = device.defaultInputID;
 
 		/* setup variables */
@@ -342,8 +328,8 @@ class tvClient {
 	setupTvService() {
 		logDebug('setupTvService: ' + this.name);
 
-		this.tvAccesory = new Accessory(this.name, UUIDGen.generate(this.ip+this.name+"tvService"));
-		this.tvAccesory.category = this.api.hap.Categories.TELEVISION;
+		this.tvAccessory = new Accessory(this.name, UUIDGen.generate(this.ip+this.name+"tvService"));
+		this.tvAccessory.category = this.api.hap.Categories.TELEVISION;
 
 		this.tvService = new Service.Television(this.name, 'tvService');
 		this.tvService
@@ -360,7 +346,7 @@ class tvClient {
 				this.setAppSwitchState(true, callback, this.inputIDs[inputIdentifier]);
 			})
 			.on('get', this.getAppSwitchState.bind(this));
-		this.tvAccesory
+		this.tvAccessory
 			.getService(Service.AccessoryInformation)
 			.setCharacteristic(Characteristic.Manufacturer, this.manufacturer)
 			.setCharacteristic(Characteristic.Model, this.modelName)
@@ -370,13 +356,13 @@ class tvClient {
 			.getCharacteristic(Characteristic.RemoteKey)
 			.on('set', this.remoteKeyPress.bind(this));
 
-		this.tvAccesory.addService(this.tvService);
+		this.tvAccessory.addService(this.tvService);
 
 		this.setupTvSpeakerService();
 		this.setupInputSourcesService();
 
 		logDebug('PublishExternalAccessories: '+ this.name);
-		this.api.publishExternalAccessories(pluginName, [this.tvAccesory]);
+		this.api.publishExternalAccessories(pluginName, [this.tvAccessory]);
 	}
 
 	setupTvSpeakerService() {
@@ -393,7 +379,7 @@ class tvClient {
 		this.tvSpeakerService
 			.getCharacteristic(Characteristic.Mute)
 			.on('set', this.setMute.bind(this));
-		this.tvAccesory.addService(this.tvSpeakerService);
+		this.tvAccessory.addService(this.tvSpeakerService);
 		this.tvService.addLinkedService(this.tvSpeakerService);
 	}
 
@@ -438,7 +424,7 @@ class tvClient {
 					.setCharacteristic(Characteristic.Identifier, i)
 					.setCharacteristic(Characteristic.ConfiguredName, inputName)
 					.setCharacteristic(Characteristic.IsConfigured, Characteristic.IsConfigured.CONFIGURED)
-					.setCharacteristic(Characteristic.InputSourceType, Characteristic.InputSourceType.APPLICATION)
+					//setCharacteristic(Characteristic.InputSourceType, Characteristic.InputSourceType.APPLICATION)
 					.setCharacteristic(Characteristic.CurrentVisibilityState,
 										Characteristic.CurrentVisibilityState.SHOWN);
 
@@ -449,7 +435,7 @@ class tvClient {
 						callback()
 					});
 
-				this.tvAccesory.addService(tempInput);
+				this.tvAccessory.addService(tempInput);
 				if (!tempInput.linked)
 					this.tvService.addLinkedService(tempInput);
 				this.inputIDs.push(inputID);
@@ -480,14 +466,11 @@ class tvClient {
 	}
 
 	settvState(stateInfo) {
-		if (this.zone != stateInfo.zone)
-			return;
-
 		if (stateInfo.power === true || stateInfo.power === false)
-			this.updatetvState(this.tv.poweredOn[this.iterator]);
+			this.updatetvState(this.tv.poweredOn);
 
 		if (stateInfo.inputID) {
-			if (this.tv.poweredOn[this.iterator]) {
+			if (this.tv.poweredOn) {
 				let inputName = stateInfo.inputID;
 				for (let i = 0; i < this.inputIDs.length; i++) {
 					if (inputName === this.inputIDs[i]) {
@@ -513,7 +496,7 @@ class tvClient {
 		if (traceOn)
 			logDebug('DEBUG: getPowerState: '+ this.name);
 
-		callback(null, this.tv.poweredOn[this.iterator] ? 1 : 0);
+		callback(null, this.tv.poweredOn ? 1 : 0);
 	}
 
 	setPowerState(state, callback) {
@@ -525,12 +508,10 @@ class tvClient {
 		else if (state === 1)
 			state = true;
 			var stateString;
-			if (this.zone == 1)
-				stateString = 'POWR' + (state ? '1   ' : '0   ');
-			this.tv.send(stateString);
+			stateString = 'POWR' + (state ? '1   ' : '0   ');
+			this.tv.send([stateString]);
 			/* Update possible other switches and accessories too */
 			let stateInfo = {
-				zone: this.zone,
 				power: state,
 				inputID: null,
 				masterVol: null,
@@ -541,13 +522,12 @@ class tvClient {
 			callback();
 	}
 
-
 	getAppSwitchState(callback) {
 		if (traceOn)
 			logDebug('DEBUG: getAppSwitchState: ' + this.name);
 
-		if (this.tv.poweredOn[this.iterator]) {
-			let inputName = this.tv.currentInputID[this.iterator];
+		if (this.tv.poweredOn) {
+			let inputName = this.tv.currentInputID;
 			for (let i = 0; i < this.inputIDs.length; i++) {
 				if (inputName === this.inputIDs[i]) {
 					this.tvService
@@ -563,29 +543,22 @@ class tvClient {
 
 	setAppSwitchState(state, callback, inputName) {
 		if (traceOn)
-			logDebug('DEBUG: setAppSwitchState zone: ' + this.name);
+			logDebug('DEBUG: setAppSwitchState: ' + this.name);
 
 		this.inputIDSet = true;
 
 		var inputString;
 		let inputNameN = inputName.replace('/', '%2F');
-		if (this.zone == 1) {
-			inputString = 'IAVD' + inputNameN+'   ';
-		} 
-
-		var that = this;
-
-
+		inputString = 'IAVD' + inputNameN+'   ';
 
-		that.tv.send(inputString);
+		this.tv.send([inputString]);
 
 		/* Update possible other switches and accessories too */
 		let stateInfo = {
-			zone: that.zone,
-			power: that.tv.poweredOn[that.iterator],
+			power: this.tv.poweredOn,
 			inputID: inputName
 		}
-		that.tv.updateStates(that.tv, stateInfo, that.name);
+		this.tv.updateStates(this.tv, stateInfo, this.name);
 
 		callback();
 	}
@@ -593,20 +566,18 @@ class tvClient {
 	setVolume(state, callback) {
 		logDebug('DEBUG: setVolume ' + state + ': ' + this.name);
 
-		var that = this;
-		if (this.tv.poweredOn[this.iterator]) {
+		if (this.tv.poweredOn) {
 			var stateString = state ? 'RCKY32  ' : 'RCKY33  '; //  UP : DOWN
-			that.tv.send(stateString);
+			this.tv.send([stateString]);
 		}
 		callback();
 	}
 
-	setMute(callback) {
+	setMute(state, callback) {
 		logDebug('DEBUG: setMute: ' + this.name);
 
-		var that = this;
-		if (this.tv.poweredOn[this.iterator])
-			that.tv.send('RCKY31  ');
+		if (this.tv.poweredOn)
+			this.tv.send(['RCKY31  ']);
 		callback();
 	}
 
@@ -642,8 +613,8 @@ class tvClient {
 				break;
 		}
 
-		if (ctrlString != '' && this.tv.poweredOn[this.iterator]) {
-				this.tv.send(ctrlString+'  ');
+		if (ctrlString != '' && this.tv.poweredOn) {
+				this.tv.send([ctrlString+'  ']);
 		}
 		callback();
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-sharp-aquos-tv",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "Sharp Aquos TV control",
   "main": "index.js",
   "scripts": {