chore: Avoid throwing generic error for an unknown execute script name

appium · Feb 3, 2025 · 1e7d726 · 1e7d726
1 parent ceea113
commit 1e7d726
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/lib/commands/execute.js b/lib/commands/execute.js
@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import { errors } from 'appium/driver';
 import { POWER_SHELL_FEATURE } from '../constants';
 
 const POWER_SHELL_SCRIPT = 'powerShell';
@@ -13,18 +12,19 @@ const EXECUTE_SCRIPT_PREFIX = 'windows:';
  * @returns {Promise<any>}
  */
 export async function execute (script, args) {
-  if (_.startsWith(script, EXECUTE_SCRIPT_PREFIX)) {
-    this.log.info(`Executing extension command '${script}'`);
-    const formattedScript = script.trim().replace(/^windows:\s*/, `${EXECUTE_SCRIPT_PREFIX} `);
-    const preprocessedArgs = preprocessExecuteMethodArgs(args);
-    return await this.executeMethod(formattedScript, [preprocessedArgs]);
-  } else if (script === POWER_SHELL_SCRIPT) {
+  if (script === POWER_SHELL_SCRIPT) {
     this.assertFeatureEnabled(POWER_SHELL_FEATURE);
     return await this.execPowerShell(
       /** @type {import('./powershell').ExecPowerShellOptions} */ (preprocessExecuteMethodArgs(args))
     );
   }
-  throw new errors.NotImplementedError();
+
+  this.log.info(`Executing extension command '${script}'`);
+  const formattedScript = _.isString(script)
+    ? script.trim().replace(/^windows:\s*/, `${EXECUTE_SCRIPT_PREFIX} `)
+    : '';
+  const preprocessedArgs = preprocessExecuteMethodArgs(args);
+  return await this.executeMethod(formattedScript, [preprocessedArgs]);
 }
 
 /**