fix: add new kind of keyboard

and make sure to wait a bit in between ecp key invocations too for stability
headspinio · Jan 22, 2024 · 7b3e21d · 7b3e21d
1 parent 5320448
commit 7b3e21d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/commands/element.js b/lib/commands/element.js
@@ -328,7 +328,9 @@ function nodeIsFocused (n, strict = false) {
 }
 
 export async function setValue (text, elId) {
+  const oldCooldown = this.opts.keyCooldown;
   let action = this.setValueByEcp.bind(this);
+  this.opts.keyCooldown = 500; // if it's 0, sometimes sending keys via ECP clobbers each other
 
   let chars = text;
   // if we got a string rather than an array of chars, split it up
@@ -337,11 +339,10 @@ export async function setValue (text, elId) {
   }
 
   if (this.opts.typeIndividualKeys) {
+    this.opts.keyCooldown = 0;
     action = this.setValueByKeyboard.bind(this);
   }
 
-  const oldCooldown = this.opts.keyCooldown;
-  this.opts.keyCooldown = 0;
   try {
     await this.performActionWithKeyboard(async () => await action(chars), elId);
   } finally {
@@ -351,8 +352,9 @@ export async function setValue (text, elId) {
 
 export async function performActionWithKeyboard (action, elId) {
   const kbSelector = '//StdDlgKeyboardItem[@focused="true"] | ' +
-                     '//Keyboard[@focused="true"] | ' +
-                     '//CustomKeyboard';
+    '//Keyboard[@focused="true"] | ' +
+    '//CustomKeyboard | ' +
+    '//BetaCustomKeyboard';
   try {
     await this.findElOrEls('xpath', kbSelector, false);
   } catch (ign) {

diff --git a/lib/commands/roku.js b/lib/commands/roku.js
@@ -77,6 +77,7 @@ export async function executeRoku (rokuCommand, opts = /** @type {TOpts} */({}))
 export async function roku_pressKey ({key}) {
   await this.rokuEcp(`/keypress/${key}`);
   if (this.opts.keyCooldown) {
+    this.log.debug(`Waiting ${this.opts.keyCooldown}ms`);
     await B.delay(this.opts.keyCooldown);
   }
   this._cachedSourceDirty = true;