appium 3.2.0 → 3.2.2

package/lib/appium.js

@@ -560,16 +560,14 @@ class AppiumDriver extends DriverCore {
   /**
    * Get the appropriate plugins for a session (or sessionless plugins)
    *
-   * @param {?string} sessionId - the sessionId (or null) to use to find plugins
+   * @param {string|null} [sessionId=null] - the sessionId (or null) to use to find plugins
    * @returns {Array<import('@appium/types').Plugin>} - array of plugin instances
    */
   pluginsForSession(sessionId = null) {
     if (sessionId) {
-      if (!this.sessionPlugins[sessionId]) {
-        const driverId = generateDriverLogPrefix(this.sessions[sessionId]);
-        this.sessionPlugins[sessionId] = this.createPluginInstances(driverId || null);
-      }
-      return this.sessionPlugins[sessionId];
+      const driver = this.sessions[sessionId];
+      return this.sessionPlugins[sessionId]
+        ?? (driver ? this.createPluginInstances(generateDriverLogPrefix(driver)) : []);
     }
 
     if (_.isEmpty(this.sessionlessPlugins)) {
@@ -598,7 +596,7 @@ class AppiumDriver extends DriverCore {
 
   /**
    * Creates instances of all of the enabled Plugin classes
-   * @param {string|null} driverId - ID to use for linking a driver to a plugin in logs
+   * @param {string|null} [driverId=null] - ID to use for linking a driver to a plugin in logs
    * @returns {Plugin[]}
    */
   createPluginInstances(driverId = null) {

package/lib/bidi-commands.ts

@@ -1,9 +1,7 @@
 import _ from 'lodash';
 import B from 'bluebird';
-import {
-  errors,
-  ExtensionCore,
-} from '@appium/base-driver';
+import type {ExtensionCore} from '@appium/base-driver';
+import {errors} from '@appium/base-driver';
 import {BIDI_BASE_PATH, BIDI_EVENT_NAME} from './constants';
 import WebSocket from 'ws';
 import os from 'node:os';

package/lib/cli/extension-command.js

@@ -601,20 +601,22 @@ class ExtensionCliCommand {
    * @returns {Promise<ExtInstallReceipt<ExtType>>}
    */
   async installViaNpm({installSpec, pkgName, pkgVer, installType}) {
-    const msg = `Installing '${installSpec}'`;
+    const installMsg = `Installing '${installSpec}'`;
+    const validateMsg = `Validating '${installSpec}'`;
 
     // the string used for installation is either <name>@<ver> in the case of a standard NPM
     // package, or whatever the user sent in otherwise.
     const installStr = installType === INSTALL_TYPE_NPM ? `${pkgName}${pkgVer ? `@${pkgVer}` : ''}` : installSpec;
     const appiumHome = this.config.appiumHome;
     try {
-      const {pkg, installPath} = await spinWith(this.isJsonOutput, msg, async () => {
-        const {pkg, installPath} = await npm.installPackage(appiumHome, installStr, {
-          pkgName,
-          installType,
-        });
+      const {pkg, installPath} = await spinWith(
+        this.isJsonOutput,
+        installMsg,
+        async () => await npm.installPackage(appiumHome, installStr, {pkgName, installType})
+      );
+
+      await spinWith(this.isJsonOutput, validateMsg, async () => {
         this.validatePackageJson(pkg, installSpec);
-        return {pkg, installPath};
       });
 
       return this.getInstallationReceipt({

package/lib/cli/parser.js

@@ -14,7 +14,7 @@ import {
   SERVER_SUBCOMMAND,
   SETUP_SUBCOMMAND
 } from '../constants';
-import {finalizeSchema, getArgSpec, hasArgSpec} from '../schema';
+import {finalizeSchema, getAllArgSpecs, getArgSpec, hasArgSpec} from '../schema';
 import {rootDir} from '../config';
 import {getExtensionArgs, getServerArgs} from './args';
 import {
@@ -158,6 +158,25 @@ class ArgParser {
     }
   }
 
+  /**
+   * Normalize hyphenated server arg keys (e.g. "log-level") to dest form (e.g. "loglevel").
+   * Use when server args come from programmatic init rather than the CLI, so they match
+   * the shape produced by parseArgs() / _transformParsedArgs().
+   * Mutates the given object.
+   *
+   * @param {object} obj - Object that may contain server args with schema property names
+   * @returns {object} The same object with keys normalized
+   */
+  static normalizeServerArgs(obj) {
+    for (const spec of getAllArgSpecs().values()) {
+      if (!spec.extType && obj[spec.name] !== undefined && spec.rawDest !== spec.name) {
+        obj[spec.rawDest] = obj[spec.name] ?? obj[spec.rawDest];
+        delete obj[spec.name];
+      }
+    }
+    return obj;
+  }
+
   /**
    * Given an object full of arguments as returned by `argparser.parse_args`,
    * expand the ones for extensions into a nested object structure and rename

package/lib/inspector-commands.ts

@@ -19,7 +19,7 @@ import type {
   BiDiCommandNamesToInfosMap,
   ExecuteMethodMap,
 } from '@appium/types';
-import type { AppiumDriver } from './appium';
+import type {AppiumDriver} from './appium';
 
 
 export async function listCommands(this: AppiumDriver, sessionId?: string): Promise<ListCommandsResponse> {

package/lib/logsink.js

@@ -5,10 +5,6 @@ import _ from 'lodash';
 import { adler32 } from './utils';
 import { LRUCache } from 'lru-cache';
 
-// set up distributed logging before everything else
-global._global_npmlog = globalLog;
-// npmlog is used only for emitting, we use winston for output
-globalLog.level = 'info';
 const LEVELS_MAP = {
   debug: 4,
   info: 3,
@@ -42,6 +38,7 @@ const COLORS_CACHE = new LRUCache({
   updateAgeOnGet: true,
 });
 
+// npmlog is used only for emitting, we use winston for output (global is set by support)
 /** @type {import('winston').Logger?} */
 let log = null;
 
@@ -102,6 +99,8 @@ export async function init(args) {
       }
     }
   });
+  // Only Winston produces output; avoid duplicate lines from the logger's default stream
+  globalLog.stream = null;
 }
 
 /**
@@ -211,12 +210,17 @@ async function createTransports(args) {
   let consoleLogLevel;
   /** @type {string} */
   let fileLogLevel;
-  if (args.loglevel && args.loglevel.match(':')) {
+
+  // Server args are normalized in main so we only see dest form (`loglevel`).
+  // Fall back to schema default so Winston never sees undefined.
+  const rawLogLevel = args.loglevel ?? 'debug';
+
+  if (rawLogLevel && rawLogLevel.includes(':')) {
     // --log-level arg can optionally provide diff logging levels for console and file, separated by a colon
-    const lvlPair = args.loglevel.split(':');
+    const lvlPair = rawLogLevel.split(':');
     [consoleLogLevel, fileLogLevel] = lvlPair;
   } else {
-    consoleLogLevel = fileLogLevel = args.loglevel;
+    consoleLogLevel = fileLogLevel = rawLogLevel;
   }
 
   transports.push(createConsoleTransport(args, consoleLogLevel));

package/lib/main.js

@@ -13,7 +13,7 @@ import _ from 'lodash';
 import {AppiumDriver} from './appium';
 import {runExtensionCommand} from './cli/extension';
 import { runSetupCommand } from './cli/setup-command';
-import {getParser} from './cli/parser';
+import {getParser, ArgParser} from './cli/parser';
 import {
   APPIUM_VER,
   checkNodeOk,
@@ -211,6 +211,8 @@ async function init(args) {
       delete args.throwInsteadOfExit;
     }
     preConfigArgs = {...args, subcommand: args.subcommand ?? SERVER_SUBCOMMAND};
+    // Normalize hyphenated keys to dest form so programmatic args match CLI shape
+    ArgParser.normalizeServerArgs(preConfigArgs);
   } else {
     // otherwise parse from CLI
     preConfigArgs = /** @type {Args<Cmd, SubCmd>} */ (parser.parseArgs());

package/lib/schema/cli-args.js

@@ -112,6 +112,12 @@ function subSchemaToArgDef(subSchema, argSpec) {
     help: makeDescription(subSchema),
   };
 
+  // argparse infers dest from the option string (e.g. --log-level → log_level).
+  // We need schema dest (e.g. loglevel) so merged server args and logsink use the right key.
+  if (!argSpec.extType) {
+    argOpts.dest = argSpec.rawDest;
+  }
+
   /**
    * Generally we will provide a `type` to `argparse` as a function which
    * validates using ajv (which is much more full-featured than what `argparse`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "description": "Automation for Apps.",
   "keywords": [
     "automation",
@@ -32,16 +32,15 @@
   },
   "files": [
     "lib",
-    "build",
+    "build/lib",
+    "build/types",
     "index.js",
     "driver.*",
     "support.*",
     "plugin.*",
     "scripts/autoinstall-extensions.js",
     "types",
-    "tsconfig.json",
-    "!build/tsconfig.tsbuildinfo",
-    "!build/test"
+    "tsconfig.json"
   ],
   "scripts": {
     "build:docs": "node docs/scripts/build-docs.js",
@@ -56,34 +55,34 @@
     "postinstall": "node ./scripts/autoinstall-extensions.js",
     "publish:docs": "cross-env APPIUM_DOCS_PUBLISH=1 npm run build:docs",
     "test": "npm run test:unit",
-    "test:e2e": "mocha --exit --timeout 1m --slow 30s \"./test/e2e/**/*.spec.js\"",
+    "test:e2e": "mocha --exit --timeout 1m --slow 30s \"./test/e2e/**/*.spec.ts\"",
     "test:smoke": "cross-env APPIUM_HOME=./local_appium_home node ./index.js driver install uiautomator2 && cross-env APPIUM_HOME=./local_appium_home node ./index.js driver list",
-    "test:unit": "mocha \"./test/unit/**/*.spec.js\""
+    "test:unit": "mocha \"./test/unit/**/*.spec.ts\""
   },
   "dependencies": {
-    "@appium/base-driver": "^10.2.0",
-    "@appium/base-plugin": "^3.0.6",
-    "@appium/docutils": "^2.2.1",
-    "@appium/logger": "^2.0.4",
-    "@appium/schema": "^1.0.1",
-    "@appium/support": "^7.0.5",
-    "@appium/types": "^1.2.0",
+    "@appium/base-driver": "^10.2.2",
+    "@appium/base-plugin": "^3.1.1",
+    "@appium/docutils": "^2.2.2",
+    "@appium/logger": "^2.0.5",
+    "@appium/schema": "^1.1.0",
+    "@appium/support": "^7.0.6",
+    "@appium/types": "^1.2.1",
     "@sidvind/better-ajv-errors": "4.0.1",
-    "ajv": "8.17.1",
+    "ajv": "8.18.0",
     "ajv-formats": "3.0.1",
     "argparse": "2.0.1",
     "async-lock": "1.4.1",
-    "axios": "1.13.3",
+    "axios": "1.13.6",
     "bluebird": "3.7.2",
     "lilconfig": "3.1.3",
     "lodash": "4.17.23",
-    "lru-cache": "11.2.5",
+    "lru-cache": "11.2.6",
     "ora": "5.4.1",
     "package-changed": "3.0.0",
     "resolve-from": "5.0.0",
-    "semver": "7.7.3",
-    "teen_process": "4.0.8",
-    "type-fest": "5.4.1",
+    "semver": "7.7.4",
+    "teen_process": "4.0.10",
+    "type-fest": "5.4.4",
     "winston": "3.19.0",
     "ws": "8.19.0",
     "yaml": "2.8.2"
@@ -95,5 +94,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f7b20335eab4022e5cbbb627ec86866a994444f8"
+  "gitHead": "c745352c6500937a4590d1ef6ef19785143a8870"
 }

package/tsconfig.json

@@ -7,19 +7,22 @@
       "@appium/support": ["../support"],
       "@appium/base-driver": ["../base-driver"],
       "@appium/base-plugin": ["../base-plugin"],
+      "@appium/fake-driver": ["../fake-driver"],
       "@appium/types": ["../types"],
       "@appium/schema": ["../schema"],
       "appium": ["."]
     },
-    "checkJs": true
+    "checkJs": true,
+    "types": ["mocha", "chai", "chai-as-promised", "node"]
   },
-  "include": ["lib", "types"],
+  "include": ["lib", "types", "test"],
   "references": [
     {"path": "../schema"},
     {"path": "../types"},
     {"path": "../support"},
     {"path": "../base-driver"},
     {"path": "../base-plugin"},
+    {"path": "../fake-driver"},
     {"path": "../test-support"}
   ]
 }

package/types/cli.ts

@@ -1,6 +1,6 @@
-import {DriverType, PluginType, ServerArgs} from '@appium/types';
-import {SetOptional} from 'type-fest';
-import {InstallType} from './manifest';
+import type {DriverType, PluginType, ServerArgs} from '@appium/types';
+import type {SetOptional} from 'type-fest';
+import type {InstallType} from './manifest';
 export type CliCommandServer = 'server';
 export type CliCommandSetup = 'setup';
 export type CliCommandDriver = DriverType;

package/types/index.ts

@@ -1,4 +1,4 @@
-import {ExtensionType, DriverType, DriverClass, PluginType, PluginClass} from '@appium/types';
+import type {ExtensionType, DriverType, DriverClass, PluginType, PluginClass} from '@appium/types';
 
 export * from './manifest';
 export * from './cli';

package/types/manifest/base.ts

@@ -1,6 +1,6 @@
-import {DriverType, ExtensionType, PluginType} from '@appium/types';
-import {SchemaObject} from 'ajv';
-import {PackageJson, SetRequired} from 'type-fest';
+import type {DriverType, ExtensionType, PluginType} from '@appium/types';
+import type {SchemaObject} from 'ajv';
+import type {PackageJson, SetRequired} from 'type-fest';
 
 /**
  * One of the possible extension installation stratgies

package/types/manifest/v3.ts

@@ -1,6 +1,6 @@
-import {DriverType, ExtensionType, PluginType} from '@appium/types';
-import {SchemaObject} from 'ajv';
-import {PackageJson, SetRequired} from 'type-fest';
+import type {DriverType, ExtensionType, PluginType} from '@appium/types';
+import type {SchemaObject} from 'ajv';
+import type {PackageJson, SetRequired} from 'type-fest';
 
 /**
  * One of the possible extension installation stratgies

package/types/manifest/v4.ts

@@ -1,6 +1,6 @@
-import {DriverType, ExtensionType, PluginType} from '@appium/types';
-import {SchemaObject} from 'ajv';
-import {PackageJson, SetRequired} from 'type-fest';
+import type {DriverType, ExtensionType, PluginType} from '@appium/types';
+import type {SchemaObject} from 'ajv';
+import type {PackageJson, SetRequired} from 'type-fest';
 
 /**
  * One of the possible extension installation stratgies