appium 2.14.1 → 2.16.0

package/lib/inspector-commands.ts

@@ -0,0 +1,190 @@
+import _ from 'lodash';
+import {
+  METHOD_MAP as BASE_METHOD_MAP,
+  BIDI_COMMANDS as BASE_BIDI_COMMANDS,
+} from '@appium/base-driver';
+import type {
+  ListCommandsResponse,
+  MethodMap,
+  BidiModuleMap,
+  DriverClass,
+  PluginClass,
+  ListExtensionsResponse,
+  PayloadParams,
+  RestCommandItemParam,
+  RestMethodsToCommandsMap,
+  BiDiCommandsMap,
+  BidiMethodParams,
+  BiDiCommandItemParam,
+  BiDiCommandNamesToInfosMap,
+  ExecuteMethodMap,
+} from '@appium/types';
+import type { AppiumDriver } from './appium';
+
+
+export async function listCommands(this: AppiumDriver, sessionId?: string): Promise<ListCommandsResponse> {
+  let driverRestMethodMap: MethodMap<any> = {};
+  let driverBiDiCommands: BidiModuleMap = {};
+  let pluginRestMethodMaps: Record<string, MethodMap<any>> = {};
+  let pluginBiDiCommands: Record<string, BidiModuleMap> = {};
+  if (sessionId) {
+    const driverClass = this.driverForSession(sessionId)?.constructor as (DriverClass | undefined);
+    driverRestMethodMap = driverClass?.newMethodMap ?? {};
+    driverBiDiCommands = driverClass?.newBidiCommands ?? {};
+    const pluginClasses = this.pluginsForSession(sessionId)
+      .map((p) => p.constructor as PluginClass);
+    pluginRestMethodMaps = _.fromPairs(pluginClasses.map((c) => [c.name, c.newMethodMap ?? {}]));
+    pluginBiDiCommands = _.fromPairs(pluginClasses.map((c) => [c.name, c.newBidiCommands ?? {}]));
+  }
+  return {
+    rest: {
+      base: methodMapToRestCommandsInfo(BASE_METHOD_MAP),
+      driver: methodMapToRestCommandsInfo(driverRestMethodMap),
+      plugins: pluginRestMethodMaps ? _.mapValues(pluginRestMethodMaps, methodMapToRestCommandsInfo) : undefined,
+    },
+    bidi: toBiDiCommandsMap(BASE_BIDI_COMMANDS, driverBiDiCommands, pluginBiDiCommands),
+  };
+}
+
+export async function listExtensions(this: AppiumDriver, sessionId?: string): Promise<ListExtensionsResponse> {
+  let driverExecuteMethodMap: ExecuteMethodMap<any> = {};
+  let pluginExecuteMethodMaps: Record<string, ExecuteMethodMap<any>> = {};
+  if (sessionId) {
+    const driverClass = this.driverForSession(sessionId)?.constructor as (DriverClass | undefined);
+    driverExecuteMethodMap = driverClass?.executeMethodMap ?? {};
+    const pluginClasses = this.pluginsForSession(sessionId)
+      .map((p) => p.constructor as PluginClass);
+    pluginExecuteMethodMaps = _.fromPairs(pluginClasses.map((c) => [c.name, c.executeMethodMap ?? {}]));
+  }
+  return {
+    rest: {
+      driver: executeMethodMapToCommandsInfo(driverExecuteMethodMap),
+      plugins: pluginExecuteMethodMaps ? _.mapValues(pluginExecuteMethodMaps, executeMethodMapToCommandsInfo) : undefined,
+    },
+  };
+}
+
+function toRestCommandParams(params: PayloadParams | undefined): RestCommandItemParam[] | undefined {
+  if (!params) {
+    return;
+  }
+
+  const toRestCommandItemParam = (x: any, isRequired: boolean): RestCommandItemParam | undefined => {
+    const isNameAnArray = _.isArray(x);
+    const name = isNameAnArray ? x[0] : x;
+    if (!_.isString(name)) {
+      return;
+    }
+
+    // If parameter names are arrays then this means
+    // either of them is required.
+    // Not sure we could reflect that in here.
+    const required = isRequired && !isNameAnArray;
+    return {
+      name,
+      required,
+    };
+  };
+
+  const requiredParams: RestCommandItemParam[] = (params.required ?? [])
+    .map((name: any) => toRestCommandItemParam(name, true))
+    .filter((x) => !_.isUndefined(x));
+  const optionalParams: RestCommandItemParam[] = (params.optional ?? [])
+    .map((name: any) => toRestCommandItemParam(name, false))
+    .filter((x) => !_.isUndefined(x));
+  return requiredParams.length || optionalParams.length
+    ? [...requiredParams, ...optionalParams]
+    : undefined;
+}
+
+function methodMapToRestCommandsInfo (mm: MethodMap<any>): Record<string, RestMethodsToCommandsMap> {
+  const res: Record<string, RestMethodsToCommandsMap> = {};
+  for (const [uriPath, methods] of _.toPairs(mm)) {
+    const methodsMap = {};
+    for (const [method, spec] of _.toPairs(methods)) {
+      methodsMap[method] = {
+        command: spec.command,
+        deprecated: spec.deprecated,
+        info: spec.info,
+        params: toRestCommandParams(spec.payloadParams),
+      };
+    }
+    res[uriPath] = methodsMap;
+  }
+  return res;
+}
+
+function executeMethodMapToCommandsInfo(emm: ExecuteMethodMap<any>): RestMethodsToCommandsMap {
+  const result: RestMethodsToCommandsMap = {};
+  for (const [name, info] of _.toPairs(emm)) {
+    result[name] = {
+      command: info.command,
+      deprecated: info.deprecated,
+      info: info.info,
+      params: toRestCommandParams(info.params),
+    };
+  }
+  return result;
+}
+
+function toBiDiCommandsMap(
+  baseModuleMap: BidiModuleMap,
+  driverModuleMap: BidiModuleMap,
+  pluginModuleMaps: Record<string, BidiModuleMap>
+): BiDiCommandsMap {
+  const toBiDiCommandParams = (params: BidiMethodParams | undefined): BiDiCommandItemParam[] | undefined => {
+    if (!params) {
+      return;
+    }
+
+    const toBiDiCommandItemParam = (x: any, isRequired: boolean): BiDiCommandItemParam | undefined => {
+      const isNameAnArray = _.isArray(x);
+      const name = isNameAnArray ? x[0] : x;
+      if (!_.isString(name)) {
+        return;
+      }
+
+      // If parameter names are arrays then this means
+      // either of them is required.
+      // Not sure we could reflect that in here.
+      const required = isRequired && !isNameAnArray;
+      return {
+        name,
+        required,
+      };
+    };
+
+    const requiredParams: BiDiCommandItemParam[] = (params.required ?? [])
+      .map((name) => toBiDiCommandItemParam(name, true))
+      .filter((x) => !_.isUndefined(x));
+    const optionalParams: BiDiCommandItemParam[] = (params.optional ?? [])
+      .map((name) => toBiDiCommandItemParam(name, false))
+      .filter((x) => !_.isUndefined(x));
+    return requiredParams.length || optionalParams.length
+      ? [...requiredParams, ...optionalParams]
+      : undefined;
+  };
+
+  const moduleMapToBiDiCommandsInfo = (mm: BidiModuleMap): Record<string, BiDiCommandNamesToInfosMap> => {
+    const res: Record<string, BiDiCommandNamesToInfosMap> = {};
+    for (const [domain, commands] of _.toPairs(mm)) {
+      const commandsMap = {};
+      for (const [name, spec] of _.toPairs(commands)) {
+        commandsMap[name] = {
+          command: spec.command,
+          deprecated: spec.deprecated,
+          info: spec.info,
+          params: toBiDiCommandParams(spec.params),
+        };
+      }
+      res[domain] = commandsMap;
+    }
+    return res;
+  };
+
+  return {
+    base: moduleMapToBiDiCommandsInfo(baseModuleMap),
+    driver: moduleMapToBiDiCommandsInfo(driverModuleMap),
+    plugins: pluginModuleMaps ? _.mapValues(pluginModuleMaps, moduleMapToBiDiCommandsInfo) : undefined,
+  };
+}

package/lib/main.js

@@ -397,8 +397,10 @@ async function main(args) {
     extraMethodMap,
     cliArgs: parsedArgs,
   };
-  if (parsedArgs.keepAliveTimeout) {
-    serverOpts.keepAliveTimeout = parsedArgs.keepAliveTimeout * 1000;
+  for (const timeoutArgName of ['keepAliveTimeout', 'requestTimeout']) {
+    if (_.isInteger(parsedArgs[timeoutArgName])) {
+      serverOpts[timeoutArgName] = parsedArgs[timeoutArgName] * 1000;
+    }
   }
   let server;
   const bidiServer = new WebSocketServer({noServer: true});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium",
-  "version": "2.14.1",
+  "version": "2.16.0",
   "description": "Automation for Apps.",
   "keywords": [
     "automation",
@@ -60,19 +60,14 @@
     "test:unit": "mocha \"./test/unit/**/*.spec.js\""
   },
   "dependencies": {
-    "@appium/base-driver": "^9.14.1",
-    "@appium/base-plugin": "^2.2.52",
-    "@appium/docutils": "^1.0.28",
+    "@appium/base-driver": "^9.16.0",
+    "@appium/base-plugin": "^2.3.1",
+    "@appium/docutils": "^1.0.30",
     "@appium/logger": "^1.6.1",
-    "@appium/schema": "^0.7.1",
-    "@appium/support": "^6.0.2",
-    "@appium/types": "^0.23.0",
+    "@appium/schema": "^0.8.0",
+    "@appium/support": "^6.0.4",
+    "@appium/types": "^0.25.0",
     "@sidvind/better-ajv-errors": "3.0.1",
-    "@types/argparse": "2.0.17",
-    "@types/bluebird": "3.5.42",
-    "@types/semver": "7.5.8",
-    "@types/teen_process": "2.0.4",
-    "@types/wrap-ansi": "3.0.0",
     "ajv": "8.17.1",
     "ajv-formats": "3.0.1",
     "argparse": "2.0.1",
@@ -80,17 +75,16 @@
     "asyncbox": "3.0.0",
     "axios": "1.7.9",
     "bluebird": "3.7.2",
-    "cross-env": "7.0.3",
     "lilconfig": "3.1.3",
     "lodash": "4.17.21",
     "lru-cache": "10.4.3",
     "ora": "5.4.1",
     "package-changed": "3.0.0",
     "resolve-from": "5.0.0",
-    "semver": "7.6.3",
+    "semver": "7.7.1",
     "source-map-support": "0.5.21",
     "teen_process": "2.2.3",
-    "type-fest": "4.31.0",
+    "type-fest": "4.35.0",
     "winston": "3.17.0",
     "wrap-ansi": "7.0.0",
     "ws": "8.18.0",
@@ -103,5 +97,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3467f32c8e3618db05b6b210544cfdc6a57bb73c"
+  "gitHead": "ea00e3aa18aff3c51d1c19eea6c4d1c8c2483740"
 }

package/build/lib/bidi.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"bidi.d.ts","sourceRoot":"","sources":["../../lib/bidi.ts"],"names":[],"mappings":"AAMA,OAAO,SAAS,MAAM,IAAI,CAAC;AAO3B,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,WAAW,CAAC;AAC/C,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EACV,wBAAwB,EACxB,0BAA0B,EAC1B,cAAc,EAEf,MAAM,eAAe,CAAC;AAEvB,KAAK,SAAS,GAAG,cAAc,GAAG,YAAY,CAAC;AAkB/C;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQzD;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,eAAe,GAAG,IAAI,CAgC9F;AAED;;;GAGG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,YAAY,EAClB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,SAAS,GAChB,OAAO,CAAC,0BAA0B,GAAG,wBAAwB,CAAC,CA6ChE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,KAAK,GAAG,IAAI,CAEtE"}

package/build/lib/bidi.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"bidi.js","sourceRoot":"","sources":["../../lib/bidi.ts"],"names":[],"mappings":"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"}