appium 3.4.2 → 3.5.1

package/lib/{extension → utils}/package-changed.ts

@@ -1,15 +1,14 @@
 import {fs} from '@appium/support';
-import {isPackageChanged} from 'package-changed';
 import path from 'node:path';
 import {PKG_HASHFILE_RELATIVE_PATH} from '../constants';
 import {log} from '../logger';
+import {isPackageChanged} from './is-package-changed';
 
 /**
  * Determines if extensions have changed, and updates a hash the `package.json` in `appiumHome` if so.
  *
  * If they have, we need to sync them with the `extensions.yaml` manifest.
  *
- * _Warning: this makes a blocking call to `writeFileSync`._
  */
 export async function packageDidChange(appiumHome: string): Promise<boolean> {
   const hashFilename = path.join(appiumHome, PKG_HASHFILE_RELATIVE_PATH);
@@ -21,12 +20,12 @@ export async function packageDidChange(appiumHome: string): Promise<boolean> {
   } catch (err: any) {
     throw new Error(
       `Appium could not create the directory for hash file: ${hashFilenameDir}. Original error: ${err.message}`,
-      {cause: err}
+      {cause: err},
     );
   }
 
   let isChanged: boolean;
-  let writeHash: () => void;
+  let writeHash: () => Promise<void>;
   let oldHash: string | undefined;
   let hash: string;
   try {
@@ -41,14 +40,14 @@ export async function packageDidChange(appiumHome: string): Promise<boolean> {
 
   if (isChanged) {
     try {
-      writeHash();
+      await writeHash();
       log.debug(
-        `Updated hash of ${appiumHome}/package.json from: ${oldHash ?? '(none)'} to: ${hash}`
+        `Updated hash of ${appiumHome}/package.json from: ${oldHash ?? '(none)'} to: ${hash}`,
       );
     } catch (err: any) {
       throw new Error(
         `Appium could not write hash file: ${hashFilenameDir}. Original error: ${err.message}`,
-        {cause: err}
+        {cause: err},
       );
     }
   }

package/lib/utils/package-json.ts

@@ -0,0 +1,36 @@
+import nodeFs from 'node:fs';
+import path from 'node:path';
+import type {PackageJson} from 'type-fest';
+
+type AppiumPackageJson = PackageJson & {
+  name: string;
+  version: string;
+};
+
+function readPackageJsonSync(): {pkgRoot: string; pkg: AppiumPackageJson} {
+  let current = path.resolve(__dirname);
+  const root = path.parse(current).root;
+  let pkgRoot: string;
+  while (true) {
+    if (nodeFs.existsSync(path.join(current, 'package.json'))) {
+      pkgRoot = current;
+      break;
+    }
+    if (current === root) {
+      throw new Error(`Could not find \`package.json\` from ${__dirname}`);
+    }
+    current = path.dirname(current);
+  }
+  const pkg = JSON.parse(
+    nodeFs.readFileSync(path.join(pkgRoot, 'package.json'), 'utf8'),
+  ) as PackageJson;
+  if (typeof pkg.name !== 'string' || typeof pkg.version !== 'string') {
+    throw new Error(`Invalid \`package.json\` near ${__dirname}`);
+  }
+  return {pkgRoot, pkg: pkg as AppiumPackageJson};
+}
+
+const {pkg, pkgRoot} = readPackageJsonSync();
+
+export const npmPackage = pkg;
+export const appiumPackageRoot = pkgRoot;

package/lib/utils/resolve-from.ts

@@ -0,0 +1,40 @@
+import {realpath} from 'node:fs/promises';
+import Module from 'node:module';
+import path from 'node:path';
+
+/**
+ * Resolves `moduleId` using Node's module resolution from `fromDirectory`.
+ *
+ * @param fromDirectory - Directory to resolve from (typically a project or `APPIUM_HOME` root)
+ * @param moduleId - Module id or path to resolve (e.g. `semver/package.json`)
+ * @returns Resolved module id. Package paths are typically absolute filesystem paths; built-in
+ *   modules may resolve to non-absolute ids (e.g. `node:fs`, `fs`).
+ * @throws `Error` if Node cannot resolve `moduleId` from `fromDirectory`
+ */
+export async function resolveFrom(fromDirectory: string, moduleId: string): Promise<string> {
+  let resolvedFromDirectory: string;
+  try {
+    resolvedFromDirectory = await realpath(fromDirectory);
+  } catch (error) {
+    const err = error as NodeJS.ErrnoException;
+    if (err.code === 'ENOENT') {
+      resolvedFromDirectory = path.resolve(fromDirectory);
+    } else {
+      throw error;
+    }
+  }
+
+  const fromFile = path.join(resolvedFromDirectory, 'noop.js');
+  const nodeModule = Module as typeof Module & {
+    _resolveFilename: (
+      id: string,
+      parent: {id: string; filename: string; paths: string[]},
+    ) => string;
+    _nodeModulePaths: (from: string) => string[];
+  };
+  return nodeModule._resolveFilename(moduleId, {
+    id: fromFile,
+    filename: fromFile,
+    paths: nodeModule._nodeModulePaths(resolvedFromDirectory),
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium",
-  "version": "3.4.2",
+  "version": "3.5.1",
   "description": "Automation for Apps.",
   "keywords": [
     "automation",
@@ -60,31 +60,28 @@
     "test:unit": "mocha \"./test/unit/**/*.spec.ts\""
   },
   "dependencies": {
-    "@appium/base-driver": "10.5.2",
-    "@appium/base-plugin": "3.2.4",
-    "@appium/docutils": "2.4.2",
-    "@appium/logger": "2.0.7",
-    "@appium/schema": "1.1.1",
-    "@appium/support": "7.2.2",
-    "@appium/types": "1.4.0",
+    "@appium/base-driver": "10.7.0",
+    "@appium/base-plugin": "3.3.1",
+    "@appium/docutils": "2.5.0",
+    "@appium/logger": "2.0.9",
+    "@appium/schema": "1.2.1",
+    "@appium/support": "7.2.4",
+    "@appium/types": "1.5.1",
     "@sidvind/better-ajv-errors": "5.0.0",
     "ajv": "8.20.0",
     "ajv-formats": "3.0.1",
     "argparse": "2.0.1",
-    "axios": "1.16.0",
-    "bluebird": "3.7.2",
+    "asyncbox": "6.3.0",
+    "axios": "1.17.0",
     "lilconfig": "3.1.3",
-    "lodash": "4.18.1",
-    "lru-cache": "11.3.5",
+    "lru-cache": "11.5.1",
     "ora": "5.4.1",
-    "package-changed": "3.0.0",
-    "resolve-from": "5.0.0",
-    "semver": "7.7.4",
+    "semver": "7.8.4",
     "teen_process": "4.1.3",
-    "type-fest": "5.6.0",
+    "type-fest": "5.7.0",
     "winston": "3.19.0",
-    "ws": "8.20.0",
-    "yaml": "2.8.4"
+    "ws": "8.21.0",
+    "yaml": "2.9.0"
   },
   "engines": {
     "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
@@ -93,5 +90,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f5369c65a8dfe5f9a590c31d38b12b33e6e58fde"
+  "gitHead": "213efd0fa400bdd0156b00ad2c45f8ef005a01ca"
 }

package/scripts/autoinstall-extensions.js

@@ -21,14 +21,9 @@
  * `npm install -g appium --drivers=uiautomator2,xcuitest --plugins=images`
  */
 
-const B = require('bluebird');
 const path = require('node:path');
 const {realpath} = require('node:fs/promises');
 
-B.config({
-  cancellation: true,
-});
-
 /** @type {typeof import('../lib/cli/extension').runExtensionCommand} */
 let runExtensionCommand;
 /** @type {typeof import('../lib/constants').DRIVER_TYPE} */
@@ -118,9 +113,9 @@ async function main() {
     spinner.succeed('No drivers or plugins to automatically install.');
     log(
       'If desired, provide the argument "--drivers=<driver_name>[,<driver_name>...]" and/or ' +
-      '"--plugins=<plugin_name>[,<plugin_name>...]" to the "npm install appium" command. ' +
-      'The specified extensions will be installed automatically alongside Appium. ' +
-      'For a list of known extensions, run "appium <driver|plugin> list".'
+        '"--plugins=<plugin_name>[,<plugin_name>...]" to the "npm install appium" command. ' +
+        'The specified extensions will be installed automatically alongside Appium. ' +
+        'For a list of known extensions, run "appium <driver|plugin> list".',
     );
     return;
   }
@@ -170,11 +165,11 @@ async function main() {
   spinner.succeed(
     `Done. ${installedStats[DRIVER_TYPE]} ${util.pluralize(
       'driver',
-      installedStats[DRIVER_TYPE]
+      installedStats[DRIVER_TYPE],
     )} and ${installedStats[PLUGIN_TYPE]} ${util.pluralize(
       'plugin',
-      installedStats[PLUGIN_TYPE]
-    )} are installed.`
+      installedStats[PLUGIN_TYPE],
+    )} are installed.`,
   );
 }
 
@@ -201,7 +196,7 @@ async function checkAndInstallExtension({
       showInstalled: true,
       suppressOutput: true,
     },
-    type === DRIVER_TYPE ? driverConfig : pluginConfig
+    type === DRIVER_TYPE ? driverConfig : pluginConfig,
   );
   if (extList[ext]) {
     spinner.info(`The ${type} "${ext}" is already installed.`);
@@ -217,7 +212,7 @@ async function checkAndInstallExtension({
       suppressOutput: true,
       [type]: ext,
     },
-    type === DRIVER_TYPE ? driverConfig : pluginConfig
+    type === DRIVER_TYPE ? driverConfig : pluginConfig,
   );
   spinner.succeed(`Installed ${type} "${ext}".`);
 }

package/tsconfig.json

@@ -1,8 +1,15 @@
 {
   "extends": "@appium/tsconfig/tsconfig.json",
+  "ts-node": {
+    "transpileOnly": true,
+    "compilerOptions": {
+      "rootDir": "."
+    }
+  },
   "compilerOptions": {
     "rootDir": ".",
     "outDir": "build",
+    "strict": true,
     "paths": {
       "@appium/support": ["../support"],
       "@appium/base-driver": ["../base-driver"],
@@ -22,7 +29,6 @@
     {"path": "../support"},
     {"path": "../base-driver"},
     {"path": "../base-plugin"},
-    {"path": "../fake-driver"},
-    {"path": "../test-support"}
+    {"path": "../fake-driver"}
   ]
 }

package/types/cli.ts

@@ -153,47 +153,47 @@ export interface BaseExtArgs<Cmd extends CliExtensionCommand> {
  */
 export type ExtArgs<
   Cmd extends CliExtensionCommand,
-  SubCmd extends CliExtensionSubcommand | CliCommandSetupSubcommand
+  SubCmd extends CliExtensionSubcommand | CliCommandSetupSubcommand,
 > = BaseExtArgs<Cmd> &
   (Cmd extends CliCommandSetup
     ? SetupArgs
     : Cmd extends CliCommandDriver
-    ? DriverExtArgs
-    : Cmd extends CliCommandPlugin
-    ? PluginExtArgs
-    : never) &
+      ? DriverExtArgs
+      : Cmd extends CliCommandPlugin
+        ? PluginExtArgs
+        : never) &
   (SubCmd extends 'install'
     ? CliExtensionSubcommandInstallArgs
     : SubCmd extends 'list'
-    ? CliExtensionSubcommandListArgs
-    : SubCmd extends 'update'
-    ? CliExtensionSubcommandUpdateArgs
-    : never);
+      ? CliExtensionSubcommandListArgs
+      : SubCmd extends 'update'
+        ? CliExtensionSubcommandUpdateArgs
+        : never);
 
 /**
  * Some generic bits of arguments; should not be used outside this declaration
  */
 export type CommonArgs<
   Cmd extends CliCommand = CliCommandServer,
-  SubCmd extends CliExtensionSubcommand | CliCommandSetupSubcommand | void = void
+  SubCmd extends CliExtensionSubcommand | CliCommandSetupSubcommand | void = void,
 > = MoreArgs &
   ProgrammaticArgs &
   (Cmd extends CliCommandServer
     ? ServerArgs
     : Cmd extends CliCommandSetup
-    ? SetupArgs
-    : Cmd extends CliExtensionCommand
-    ? SubCmd extends CliExtensionSubcommand | CliCommandSetupSubcommand
-      ? ExtArgs<Cmd, SubCmd>
-      : never
-    : never);
+      ? SetupArgs
+      : Cmd extends CliExtensionCommand
+        ? SubCmd extends CliExtensionSubcommand | CliCommandSetupSubcommand
+          ? ExtArgs<Cmd, SubCmd>
+          : never
+        : never);
 
 /**
  * Fully-parsed arguments, containing defaults, computed args, and config file values.
  */
 export type ParsedArgs<
   Cmd extends CliCommand = CliCommandServer,
-  SubCmd extends CliExtensionSubcommand | CliCommandSetupSubcommand | void = void
+  SubCmd extends CliExtensionSubcommand | CliCommandSetupSubcommand | void = void,
 > = CommonArgs<Cmd, SubCmd>;
 
 /**
@@ -203,7 +203,7 @@ export type ParsedArgs<
  */
 export type Args<
   Cmd extends CliCommand = CliCommandServer,
-  SubCmd extends CliExtensionSubcommand | CliCommandSetupSubcommand | void = void
+  SubCmd extends CliExtensionSubcommand | CliCommandSetupSubcommand | void = void,
 > = Cmd extends CliCommandServer
   ? SetOptional<CommonArgs<Cmd>, keyof ServerArgs>
   : ParsedArgs<Cmd, SubCmd>;

package/types/index.ts

@@ -16,5 +16,5 @@ export interface AppiumEnv extends NodeJS.ProcessEnv {
 export type ExtClass<ExtType extends ExtensionType> = ExtType extends DriverType
   ? DriverClass
   : ExtType extends PluginType
-  ? PluginClass
-  : never;
+    ? PluginClass
+    : never;

package/types/manifest/base.ts

@@ -100,8 +100,8 @@ export interface PluginMetadata {
 export type ExtMetadata<ExtType extends ExtensionType> = (ExtType extends DriverType
   ? DriverMetadata
   : ExtType extends PluginType
-  ? PluginMetadata
-  : never) &
+    ? PluginMetadata
+    : never) &
   CommonExtMetadata;
 
 /**

package/types/manifest/v3.ts

@@ -103,8 +103,8 @@ export interface PluginMetadata {
 export type ExtMetadata<ExtType extends ExtensionType> = (ExtType extends DriverType
   ? DriverMetadata
   : ExtType extends PluginType
-  ? PluginMetadata
-  : never) &
+    ? PluginMetadata
+    : never) &
   CommonExtMetadata;
 
 /**

package/types/manifest/v4.ts

@@ -103,8 +103,8 @@ export interface PluginMetadata {
 export type ExtMetadata<ExtType extends ExtensionType> = (ExtType extends DriverType
   ? DriverMetadata
   : ExtType extends PluginType
-  ? PluginMetadata
-  : never) &
+    ? PluginMetadata
+    : never) &
   CommonExtMetadata;
 
 /**

package/build/lib/extension/package-changed.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"package-changed.d.ts","sourceRoot":"","sources":["../../../lib/extension/package-changed.ts"],"names":[],"mappings":"AAMA;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA2C3E"}

package/build/lib/extension/package-changed.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"package-changed.js","sourceRoot":"","sources":["../../../lib/extension/package-changed.ts"],"names":[],"mappings":";;;;;AAaA,4CA2CC;AAxDD,6CAAmC;AACnC,qDAAiD;AACjD,0DAA6B;AAC7B,4CAAwD;AACxD,sCAA8B;AAE9B;;;;;;GAMG;AACI,KAAK,UAAU,gBAAgB,CAAC,UAAkB;IACvD,MAAM,YAAY,GAAG,mBAAI,CAAC,IAAI,CAAC,UAAU,EAAE,sCAA0B,CAAC,CAAC;IAEvE,MAAM,eAAe,GAAG,mBAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACnD,YAAG,CAAC,KAAK,CAAC,iCAAiC,eAAe,EAAE,CAAC,CAAC;IAC9D,IAAI,CAAC;QACH,MAAM,YAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IACnC,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CACb,wDAAwD,eAAe,qBAAqB,GAAG,CAAC,OAAO,EAAE,EACzG,EAAC,KAAK,EAAE,GAAG,EAAC,CACb,CAAC;IACJ,CAAC;IAED,IAAI,SAAkB,CAAC;IACvB,IAAI,SAAqB,CAAC;IAC1B,IAAI,OAA2B,CAAC;IAChC,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,CAAC,EAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAC,GAAG,MAAM,IAAA,kCAAgB,EAAC;YAC9D,GAAG,EAAE,UAAU;YACf,YAAY,EAAE,sCAA0B;SACzC,CAAC,CAAC,CAAC;IACN,CAAC;IAAC,MAAM,CAAC;QACP,kFAAkF;QAClF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,IAAI,CAAC;YACH,SAAS,EAAE,CAAC;YACZ,YAAG,CAAC,KAAK,CACP,mBAAmB,UAAU,uBAAuB,OAAO,IAAI,QAAQ,QAAQ,IAAI,EAAE,CACtF,CAAC;QACJ,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CACb,qCAAqC,eAAe,qBAAqB,GAAG,CAAC,OAAO,EAAE,EACtF,EAAC,KAAK,EAAE,GAAG,EAAC,CACb,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/build/lib/utils.d.ts

@@ -1,13 +0,0 @@
-import _ from 'lodash';
-export declare const npmPackage: import("read-pkg", { with: { "resolution-mode": "import" } }).NormalizedPackageJson;
-/**
- * Returns the root directory of the Appium module (memoized).
- *
- * @throws {Error} If the appium module root cannot be determined.
- */
-export declare const getAppiumModuleRoot: (() => string) & _.MemoizedFunction;
-/**
- * Adler-32 checksum (see https://github.com/SheetJS/js-adler32).
- */
-export declare function adler32(str: string, seed?: number | null): number;
-//# sourceMappingURL=utils.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;AAGvB,eAAO,MAAM,UAAU,qFAAoC,CAAC;AAE5D;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,SAA6C,MAAM,sBAMjF,CAAC;AAEH;;GAEG;AACH,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,GAAG,IAAW,GAAG,MAAM,CAgDvE"}

package/build/lib/utils.js.map

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