From 129a1d1f454b7688910d3abf23e7ccf5e8fd6229 Mon Sep 17 00:00:00 2001 From: Gunther Brunner Date: Tue, 27 May 2014 19:24:09 +0900 Subject: [PATCH] Don't die when sending a unknown key. --- lib/roles/device/plugins/service.js | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/lib/roles/device/plugins/service.js b/lib/roles/device/plugins/service.js index cd8d8662..5d5102ea 100644 --- a/lib/roles/device/plugins/service.js +++ b/lib/roles/device/plugins/service.js @@ -493,39 +493,36 @@ module.exports = syrup.serial() ]) }) .on(wire.KeyDownMessage, function(channel, message) { - var key = keyutil.namedKey(message.key) - if (key) { + try { keyEvent({ event: apk.wire.KeyEvent.DOWN - , keyCode: key + , keyCode: keyutil.namedKey(message.key) }) } - else { - log.warn('Ignoring unknown key "%s"', message.key) + catch(e) { + log.warn(e.message) } }) .on(wire.KeyUpMessage, function(channel, message) { - var key = keyutil.namedKey(message.key) - if (key) { + try { keyEvent({ event: apk.wire.KeyEvent.UP - , keyCode: key + , keyCode: keyutil.namedKey(message.key) }) } - else { - log.warn('Ignoring unknown key "%s"', message.key) + catch(e) { + log.warn(e.message) } }) .on(wire.KeyPressMessage, function(channel, message) { - var key = keyutil.namedKey(message.key) - if (key) { + try { keyEvent({ event: apk.wire.KeyEvent.PRESS - , keyCode: key + , keyCode: keyutil.namedKey(message.key) }) } - else { - log.warn('Ignoring unknown key "%s"', message.key) + catch(e) { + log.warn(e.message) } }) .on(wire.TypeMessage, function(channel, message) {