appium-espresso-driver 2.34.4 → 2.36.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (15) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/README.md +8 -6
  3. package/build/lib/commands/actions.d.ts +7 -0
  4. package/build/lib/commands/actions.d.ts.map +1 -0
  5. package/build/lib/commands/actions.js +17 -0
  6. package/build/lib/commands/actions.js.map +1 -0
  7. package/build/lib/driver.d.ts +2 -0
  8. package/build/lib/driver.d.ts.map +1 -1
  9. package/build/lib/driver.js +2 -0
  10. package/build/lib/driver.js.map +1 -1
  11. package/espresso-server/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk +0 -0
  12. package/lib/commands/actions.js +18 -0
  13. package/lib/driver.ts +3 -0
  14. package/npm-shrinkwrap.json +95 -100
  15. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -1,3 +1,17 @@
1
+ ## [2.36.0](https://github.com/appium/appium-espresso-driver/compare/v2.35.0...v2.36.0) (2024-02-09)
2
+
3
+
4
+ ### Features
5
+
6
+ * add checkVersion option for mobile:installApp ([#980](https://github.com/appium/appium-espresso-driver/issues/980)) ([a0438b8](https://github.com/appium/appium-espresso-driver/commit/a0438b8993524f0e216a2c661cae6dd66c21611c))
7
+
8
+ ## [2.35.0](https://github.com/appium/appium-espresso-driver/compare/v2.34.4...v2.35.0) (2024-02-08)
9
+
10
+
11
+ ### Features
12
+
13
+ * Improve the documentation on unlock ([#979](https://github.com/appium/appium-espresso-driver/issues/979)) ([15ae78b](https://github.com/appium/appium-espresso-driver/commit/15ae78b3dbe6e35b26d1374b3e1935b457d5014d))
14
+
1
15
  ## [2.34.4](https://github.com/appium/appium-espresso-driver/compare/v2.34.3...v2.34.4) (2024-02-06)
2
16
 
3
17
 
package/README.md CHANGED
@@ -154,11 +154,10 @@ appium:noSign | Set it to `true` in order to skip application signing. By defaul
154
154
 
155
155
  Capability Name | Description
156
156
  --- | ---
157
- appium:skipUnlock | Whether to skip the check for lock screen presence (`true`). By default Espresso driver tries to detect if the device's screen is locked before starting the test and to unlock that (which sometimes might be unstable). Note, that this operation takes some time, so it is highly recommended to set this capability to `false` and disable screen locking on devices under test.
158
- appium:unlockType | Set one of the possible types of Android lock screens to unlock. Read the [Unlock tutorial](https://github.com/appium/appium-android-driver/blob/master/docs/UNLOCK.md) for more details.
159
- appium:unlockKey | Allows to set an unlock key. Read the [Unlock tutorial](https://github.com/appium/appium-android-driver/blob/master/docs/UNLOCK.md) for more details.
160
- appium:unlockStrategy | Either 'locksettings' (default) or 'uiautomator'. Setting it to 'uiautomator' will enforce the driver to avoid using special ADB shortcuts in order to speed up the unlock procedure.
161
- appium:unlockSuccessTimeout | Maximum number of milliseconds to wait until the device is unlocked. `2000` ms by default
157
+ appium:skipUnlock | Whether to skip the check for lock screen presence (`true`). By default Espresso driver tries to detect if the device's screen is locked before starting the test and to unlock that (which sometimes might be unstable). Note, that this operation takes some time, so it is recommended to set this capability to `false` and disable screen locking on devices under test. Read the [Unlock tutorial](./docs/unlock/main.md) for more details.
158
+ appium:unlockType | Set one of the possible types of Android lock screens to unlock. Read the [Unlock tutorial](./docs/unlock/main.md) for more details.
159
+ appium:unlockKey | Allows to set an unlock key. Read the [Unlock tutorial](./docs/unlock/main.md) for more details.
160
+ appium:unlockSuccessTimeout | Maximum number of milliseconds to wait until the device is unlocked. `2000` ms by default. Read the [Unlock tutorial](./docs/unlock/main.md) for more details.
162
161
 
163
162
  ### Web Context
164
163
 
@@ -919,6 +918,8 @@ The call is ignored if the app is not installed.
919
918
  Name | Type | Required | Description | Example
920
919
  --- | --- | --- | --- | ---
921
920
  appId | string | yes | The identifier of the application package to be removed | `my.app.id`
921
+ timeout | number | no | The count of milliseconds to wait until the app is terminated. 20000ms by default. | 1500, 0
922
+ keepData | boolean | no | Set to true in order to keep the application data and cache folders after uninstall. | true
922
923
 
923
924
  #### Returned Result
924
925
 
@@ -947,6 +948,7 @@ True if the app has been successfully terminated.
947
948
  ### mobile: installApp
948
949
 
949
950
  Installs the given application package to the device under test.
951
+ It might raise the `INSTALL_FAILED_VERSION_DOWNGRADE` error if the installation was a version downgrade.
950
952
 
951
953
  #### Arguments
952
954
 
@@ -958,6 +960,7 @@ allowTestPackages | boolean | no | Set to true in order to allow test packages i
958
960
  useSdcard | boolean | no | Set to true to install the app on sdcard instead of the device memory. false by default | true
959
961
  grantPermissions | boolean | no | Set to true in order to grant all the permissions requested in the application's manifest automatically after the installation is completed under Android 6+. The targetSdkVersion in the application manifest must be greater or equal to 23 and the Android version on the device under test must be greater or equal to Android 6 (API level 23) to grant permissions. Applications whose targetSdkVersion is lower than or equal to 22 must be reisntalled to grant permissions for Android 6+ devices. false by default | true
960
962
  replace | boolean | no | Set it to false if you don't want the application to be upgraded/reinstalled if it is already present on the device, but throw an error instead. true by default | false
963
+ checkVersion | boolean | no | Set to true, in order to skip the application installation if the device under test has a greater or equal to the application version. It may help to avoid `INSTALL_FAILED_VERSION_DOWNGRADE` error and unnecessary installation. | true
961
964
 
962
965
  ### mobile: clearApp
963
966
 
@@ -1190,7 +1193,6 @@ Name | Type | Required | Description | Example
1190
1193
  --- | --- | --- | --- | ---
1191
1194
  key | string | yes | The unlock key. See the documentation on [appium:unlockKey](#device-locking) capability for more details | 12345
1192
1195
  type | string | yes | The unlock type. See the documentation on [appium:unlockType](#device-locking) capability for more details | password
1193
- strategy | string | no | Unlock strategy. See the documentation on [appium:unlockStrategy](#device-locking) capability for more details | uiautomator
1194
1196
  timeoutMs | number | no | Unlock timeout. See the documentation on [appium:unlockSuccessTimeout](#device-locking) capability for more details | 5000
1195
1197
 
1196
1198
  ### mobile: isLocked
package/build/lib/commands/actions.d.ts ADDED
@@ -0,0 +1,7 @@
1
+ /**
2
+ * @this {import('../driver').EspressoDriver}
3
+ * @param {import('@appium/types').StringRecord[]} actions
4
+ * @returns {Promise<void>}
5
+ */
6
+ export function performActions(this: import("../driver").EspressoDriver, actions: import('@appium/types').StringRecord[]): Promise<void>;
7
+ //# sourceMappingURL=actions.d.ts.map
package/build/lib/commands/actions.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../../lib/commands/actions.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,kFAHW,OAAO,eAAe,EAAE,YAAY,EAAE,GACpC,QAAQ,IAAI,CAAC,CAczB"}
package/build/lib/commands/actions.js ADDED
@@ -0,0 +1,17 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.performActions = void 0;
4
+ /**
5
+ * @this {import('../driver').EspressoDriver}
6
+ * @param {import('@appium/types').StringRecord[]} actions
7
+ * @returns {Promise<void>}
8
+ */
9
+ async function performActions(actions) {
10
+ this.log.debug(`Received the following W3C actions: ${JSON.stringify(actions, null, ' ')}`);
11
+ // This is needed because Selenium API uses MOUSE as the default pointer type
12
+ const preprocessedActions = actions.map((action) => Object.assign({}, action, action.type === 'pointer' ? { parameters: { pointerType: 'touch' } } : {}));
13
+ this.log.debug(`Preprocessed actions: ${JSON.stringify(preprocessedActions, null, ' ')}`);
14
+ await this.espresso.jwproxy.command('/actions', 'POST', { actions: preprocessedActions });
15
+ }
16
+ exports.performActions = performActions;
17
+ //# sourceMappingURL=actions.js.map
package/build/lib/commands/actions.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../lib/commands/actions.js"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACI,KAAK,UAAU,cAAc,CAAC,OAAO;IAC1C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uCAAuC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7F,6EAA6E;IAC7E,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACjD,MAAM,CAAC,MAAM,CACX,EAAE,EACF,MAAM,EACN,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAC,UAAU,EAAE,EAAC,WAAW,EAAE,OAAO,EAAC,EAAC,CAAC,CAAC,CAAC,EAAE,CACtE,CACF,CAAC;IACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3F,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,EAAC,OAAO,EAAE,mBAAmB,EAAC,CAAC,CAAC;AAC1F,CAAC;AAZD,wCAYC"}
package/build/lib/driver.d.ts CHANGED
@@ -9,6 +9,7 @@ import * as miscCmds from './commands/misc';
9
9
  import * as servicesCmds from './commands/services';
10
10
  import * as screenshotCmds from './commands/screenshot';
11
11
  import * as idlingResourcesCmds from './commands/idling-resources';
12
+ import * as actionsCmds from './commands/actions';
12
13
  import { AndroidDriver } from 'appium-android-driver';
13
14
  import type { EspressoDriverCaps, EspressoDriverOpts, W3CEspressoDriverCaps } from './types';
14
15
  export declare class EspressoDriver extends AndroidDriver implements ExternalDriver<EspressoConstraints, string, StringRecord> {
@@ -415,6 +416,7 @@ export declare class EspressoDriver extends AndroidDriver implements ExternalDri
415
416
  canProxy(sessionId: any): boolean;
416
417
  getProxyAvoidList(sessionId: any): import("@appium/types").RouteMatcher[];
417
418
  get appOnDevice(): boolean;
419
+ performActions: typeof actionsCmds.performActions;
418
420
  executeMobile: typeof executeCmds.executeMobile;
419
421
  launchApp: typeof appManagementCmds.launchApp;
420
422
  closeApp: typeof appManagementCmds.closeApp;
package/build/lib/driver.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
package/build/lib/driver.js CHANGED
@@ -41,6 +41,7 @@ const miscCmds = __importStar(require("./commands/misc"));
41
41
  const servicesCmds = __importStar(require("./commands/services"));
42
42
  const screenshotCmds = __importStar(require("./commands/screenshot"));
43
43
  const idlingResourcesCmds = __importStar(require("./commands/idling-resources"));
44
+ const actionsCmds = __importStar(require("./commands/actions"));
44
45
  const appium_adb_1 = require("appium-adb");
45
46
  const appium_android_driver_1 = require("appium-android-driver");
46
47
  const io_appium_settings_1 = require("io.appium.settings");
@@ -154,6 +155,7 @@ class EspressoDriver extends appium_android_driver_1.AndroidDriver {
154
155
  // @ts-expect-error FIXME: what is this?
155
156
  delete opts.shell;
156
157
  super(opts, shouldValidateCaps);
158
+ this.performActions = actionsCmds.performActions;
157
159
  this.executeMobile = executeCmds.executeMobile;
158
160
  this.launchApp = appManagementCmds.launchApp;
159
161
  this.closeApp = appManagementCmds.closeApp;
package/build/lib/driver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
package/lib/commands/actions.js ADDED
@@ -0,0 +1,18 @@
1
+ /**
2
+ * @this {import('../driver').EspressoDriver}
3
+ * @param {import('@appium/types').StringRecord[]} actions
4
+ * @returns {Promise<void>}
5
+ */
6
+ export async function performActions(actions) {
7
+ this.log.debug(`Received the following W3C actions: ${JSON.stringify(actions, null, ' ')}`);
8
+ // This is needed because Selenium API uses MOUSE as the default pointer type
9
+ const preprocessedActions = actions.map((action) =>
10
+ Object.assign(
11
+ {},
12
+ action,
13
+ action.type === 'pointer' ? {parameters: {pointerType: 'touch'}} : {}
14
+ )
15
+ );
16
+ this.log.debug(`Preprocessed actions: ${JSON.stringify(preprocessedActions, null, ' ')}`);
17
+ await this.espresso.jwproxy.command('/actions', 'POST', {actions: preprocessedActions});
18
+ }
package/lib/driver.ts CHANGED
@@ -22,6 +22,7 @@ import * as miscCmds from './commands/misc';
22
22
  import * as servicesCmds from './commands/services';
23
23
  import * as screenshotCmds from './commands/screenshot';
24
24
  import * as idlingResourcesCmds from './commands/idling-resources';
25
+ import * as actionsCmds from './commands/actions';
25
26
  import { DEFAULT_ADB_PORT } from 'appium-adb';
26
27
  import { AndroidDriver, utils } from 'appium-android-driver';
27
28
  import { SETTINGS_HELPER_ID } from 'io.appium.settings';
@@ -697,6 +698,8 @@ export class EspressoDriver extends AndroidDriver implements ExternalDriver<
697
698
  return !this.opts.app && this.helpers.isPackageOrBundle(this.opts.appPackage!);
698
699
  }
699
700
 
701
+ performActions = actionsCmds.performActions;
702
+
700
703
  executeMobile = executeCmds.executeMobile;
701
704
 
702
705
  launchApp = appManagementCmds.launchApp;
package/npm-shrinkwrap.json CHANGED
@@ -1,16 +1,16 @@
1
1
  {
2
2
  "name": "appium-espresso-driver",
3
- "version": "2.34.4",
3
+ "version": "2.36.0",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "appium-espresso-driver",
9
- "version": "2.34.4",
9
+ "version": "2.36.0",
10
10
  "license": "Apache-2.0",
11
11
  "dependencies": {
12
12
  "appium-adb": "^12.0.0",
13
- "appium-android-driver": "^8.1.6",
13
+ "appium-android-driver": "^8.4.0",
14
14
  "asyncbox": "^3.0.0",
15
15
  "bluebird": "^3.5.0",
16
16
  "io.appium.settings": "^5.7.2",
@@ -68,12 +68,12 @@
68
68
  }
69
69
  },
70
70
  "node_modules/@appium/base-driver": {
71
- "version": "9.5.0",
72
- "resolved": "https://registry.npmjs.org/@appium/base-driver/-/base-driver-9.5.0.tgz",
73
- "integrity": "sha512-xzxXUrkMen4CqdUjggVeKwrh3+AyO4eSjkrRV+z4Ic39qclAqJS1HGjgJzCuu0RruTRg9DEMd4r2k1RVuf5udA==",
71
+ "version": "9.5.1",
72
+ "resolved": "https://registry.npmjs.org/@appium/base-driver/-/base-driver-9.5.1.tgz",
73
+ "integrity": "sha512-vOAautLIdNErhUbZFbIC6yo9xSxxK2FTjZfeELUBmPosSKezbRqx8htUt43CkwCr8PMDa5xv/OtYiG6k+bbgpg==",
74
74
  "dependencies": {
75
- "@appium/support": "^4.2.0",
76
- "@appium/types": "^0.16.0",
75
+ "@appium/support": "^4.2.1",
76
+ "@appium/types": "^0.16.1",
77
77
  "@colors/colors": "1.6.0",
78
78
  "@types/async-lock": "1.4.2",
79
79
  "@types/bluebird": "3.5.42",
@@ -83,20 +83,20 @@
83
83
  "@types/serve-favicon": "2.5.7",
84
84
  "async-lock": "1.4.1",
85
85
  "asyncbox": "3.0.0",
86
- "axios": "1.6.3",
86
+ "axios": "1.6.7",
87
87
  "bluebird": "3.7.2",
88
88
  "body-parser": "1.20.2",
89
89
  "es6-error": "4.1.1",
90
90
  "express": "4.18.2",
91
91
  "http-status-codes": "2.3.0",
92
92
  "lodash": "4.17.21",
93
- "lru-cache": "10.1.0",
93
+ "lru-cache": "10.2.0",
94
94
  "method-override": "3.0.0",
95
95
  "morgan": "1.10.0",
96
96
  "path-to-regexp": "6.2.1",
97
97
  "serve-favicon": "2.5.0",
98
98
  "source-map-support": "0.5.21",
99
- "type-fest": "4.9.0",
99
+ "type-fest": "4.10.1",
100
100
  "validate.js": "0.13.1"
101
101
  },
102
102
  "engines": {
@@ -122,12 +122,12 @@
122
122
  }
123
123
  },
124
124
  "node_modules/@appium/support": {
125
- "version": "4.2.0",
126
- "resolved": "https://registry.npmjs.org/@appium/support/-/support-4.2.0.tgz",
127
- "integrity": "sha512-DhUufCuuzwq+DfiOQc3OcL8gk++XBUnGMytUa3PcLJg98LmKZW2sZadp1M0IUm5TkYxnxq7DfRvdTK5kpULTvw==",
125
+ "version": "4.2.1",
126
+ "resolved": "https://registry.npmjs.org/@appium/support/-/support-4.2.1.tgz",
127
+ "integrity": "sha512-9XTkGP7lEs4pUsYqGf59nZwd/WXMzZfrra5SIYD0tzVRVB194fd9DNC5V7aLT0RZJgWZ+e2YJ++gwXvs8B+qwQ==",
128
128
  "dependencies": {
129
129
  "@appium/tsconfig": "^0.x",
130
- "@appium/types": "^0.16.0",
130
+ "@appium/types": "^0.16.1",
131
131
  "@colors/colors": "1.6.0",
132
132
  "@types/archiver": "6.0.2",
133
133
  "@types/base64-stream": "1.0.5",
@@ -143,10 +143,10 @@
143
143
  "@types/shell-quote": "1.7.5",
144
144
  "@types/supports-color": "8.1.3",
145
145
  "@types/teen_process": "2.0.4",
146
- "@types/uuid": "9.0.7",
146
+ "@types/uuid": "9.0.8",
147
147
  "@types/which": "3.0.3",
148
148
  "archiver": "6.0.1",
149
- "axios": "1.6.3",
149
+ "axios": "1.6.7",
150
150
  "base64-stream": "1.0.0",
151
151
  "bluebird": "3.7.2",
152
152
  "bplist-creator": "0.1.1",
@@ -175,7 +175,7 @@
175
175
  "source-map-support": "0.5.21",
176
176
  "supports-color": "8.1.1",
177
177
  "teen_process": "2.1.1",
178
- "type-fest": "4.9.0",
178
+ "type-fest": "4.10.1",
179
179
  "uuid": "9.0.1",
180
180
  "which": "4.0.0",
181
181
  "yauzl": "2.10.0"
@@ -185,7 +185,7 @@
185
185
  "npm": ">=8"
186
186
  },
187
187
  "optionalDependencies": {
188
- "sharp": "0.33.1"
188
+ "sharp": "0.33.2"
189
189
  }
190
190
  },
191
191
  "node_modules/@appium/support/node_modules/lru-cache": {
@@ -226,16 +226,16 @@
226
226
  }
227
227
  },
228
228
  "node_modules/@appium/types": {
229
- "version": "0.16.0",
230
- "resolved": "https://registry.npmjs.org/@appium/types/-/types-0.16.0.tgz",
231
- "integrity": "sha512-AFKzzgoA3pDZ2YWJpPMAI3ei5j2LTDa8yQGblIf11bhVvLp9dUvCozEbilgaXmMRu3m/pU/ZfU1Se13ARlCQuQ==",
229
+ "version": "0.16.1",
230
+ "resolved": "https://registry.npmjs.org/@appium/types/-/types-0.16.1.tgz",
231
+ "integrity": "sha512-fEQDDIJzJj5ppQBfMExweZKjW6OEonAmcZQh6teH2ykDRo2MJl1jazqxt9LYUbXdH4qChjsh2nYPcgpD6m4usw==",
232
232
  "dependencies": {
233
233
  "@appium/schema": "^0.5.0",
234
234
  "@appium/tsconfig": "^0.x",
235
235
  "@types/express": "4.17.21",
236
236
  "@types/npmlog": "7.0.0",
237
237
  "@types/ws": "8.5.10",
238
- "type-fest": "4.9.0"
238
+ "type-fest": "4.10.1"
239
239
  },
240
240
  "engines": {
241
241
  "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
@@ -425,9 +425,9 @@
425
425
  }
426
426
  },
427
427
  "node_modules/@img/sharp-libvips-linux-x64": {
428
- "version": "1.0.0",
429
- "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.0.tgz",
430
- "integrity": "sha512-naldaJy4hSVhWBgEjfdBY85CAa4UO+W1nx6a1sWStHZ7EUfNiuBTTN2KUYT5dH1+p/xij1t2QSXfCiFJoC5S/Q==",
428
+ "version": "1.0.1",
429
+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.1.tgz",
430
+ "integrity": "sha512-3NR1mxFsaSgMMzz1bAnnKbSAI+lHXVTqAHgc1bgzjHuXjo4hlscpUxc0vFSAPKI3yuzdzcZOkq7nDPrP2F8Jgw==",
431
431
  "cpu": [
432
432
  "x64"
433
433
  ],
@@ -446,9 +446,9 @@
446
446
  }
447
447
  },
448
448
  "node_modules/@img/sharp-libvips-linuxmusl-x64": {
449
- "version": "1.0.0",
450
- "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.0.tgz",
451
- "integrity": "sha512-FW8iK6rJrg+X2jKD0Ajhjv6y74lToIBEvkZhl42nZt563FfxkCYacrXZtd+q/sRQDypQLzY5WdLkVTbJoPyqNg==",
449
+ "version": "1.0.1",
450
+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.1.tgz",
451
+ "integrity": "sha512-dcT7inI9DBFK6ovfeWRe3hG30h51cBAP5JXlZfx6pzc/Mnf9HFCQDLtYf4MCBjxaaTfjCCjkBxcy3XzOAo5txw==",
452
452
  "cpu": [
453
453
  "x64"
454
454
  ],
@@ -467,9 +467,9 @@
467
467
  }
468
468
  },
469
469
  "node_modules/@img/sharp-linux-x64": {
470
- "version": "0.33.1",
471
- "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.1.tgz",
472
- "integrity": "sha512-4y8osC0cAc1TRpy02yn5omBeloZZwS62fPZ0WUAYQiLhSFSpWJfY/gMrzKzLcHB9ulUV6ExFiu2elMaixKDbeg==",
470
+ "version": "0.33.2",
471
+ "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.2.tgz",
472
+ "integrity": "sha512-xUT82H5IbXewKkeF5aiooajoO1tQV4PnKfS/OZtb5DDdxS/FCI/uXTVZ35GQ97RZXsycojz/AJ0asoz6p2/H/A==",
473
473
  "cpu": [
474
474
  "x64"
475
475
  ],
@@ -488,13 +488,13 @@
488
488
  "url": "https://opencollective.com/libvips"
489
489
  },
490
490
  "optionalDependencies": {
491
- "@img/sharp-libvips-linux-x64": "1.0.0"
491
+ "@img/sharp-libvips-linux-x64": "1.0.1"
492
492
  }
493
493
  },
494
494
  "node_modules/@img/sharp-linuxmusl-x64": {
495
- "version": "0.33.1",
496
- "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.1.tgz",
497
- "integrity": "sha512-LOGKNu5w8uu1evVqUAUKTix2sQu1XDRIYbsi5Q0c/SrXhvJ4QyOx+GaajxmOg5PZSsSnCYPSmhjHHsRBx06/wQ==",
495
+ "version": "0.33.2",
496
+ "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.2.tgz",
497
+ "integrity": "sha512-+ZLE3SQmSL+Fn1gmSaM8uFusW5Y3J9VOf+wMGNnTtJUMUxFhv+P4UPaYEYT8tqnyYVaOVGgMN/zsOxn9pSsO2A==",
498
498
  "cpu": [
499
499
  "x64"
500
500
  ],
@@ -513,7 +513,7 @@
513
513
  "url": "https://opencollective.com/libvips"
514
514
  },
515
515
  "optionalDependencies": {
516
- "@img/sharp-libvips-linuxmusl-x64": "1.0.0"
516
+ "@img/sharp-libvips-linuxmusl-x64": "1.0.1"
517
517
  }
518
518
  },
519
519
  "node_modules/@isaacs/cliui": {
@@ -731,9 +731,9 @@
731
731
  }
732
732
  },
733
733
  "node_modules/@types/node": {
734
- "version": "20.11.16",
735
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.16.tgz",
736
- "integrity": "sha512-gKb0enTmRCzXSSUJDq6/sPcqrfCv2mkkG6Jt/clpn5eiCbKTY+SgZUxo+p8ZKMof5dCp9vHQUAB7wOUTod22wQ==",
734
+ "version": "20.11.17",
735
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.17.tgz",
736
+ "integrity": "sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw==",
737
737
  "dependencies": {
738
738
  "undici-types": "~5.26.4"
739
739
  }
@@ -825,9 +825,9 @@
825
825
  }
826
826
  },
827
827
  "node_modules/@types/uuid": {
828
- "version": "9.0.7",
829
- "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.7.tgz",
830
- "integrity": "sha512-WUtIVRUZ9i5dYXefDEAI7sh9/O7jGvHg7Df/5O/gtH3Yabe5odI3UWopVR1qbPXQtvOxWu3mM4XxlYeZtMWF4g=="
828
+ "version": "9.0.8",
829
+ "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz",
830
+ "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA=="
831
831
  },
832
832
  "node_modules/@types/which": {
833
833
  "version": "3.0.3",
@@ -907,9 +907,9 @@
907
907
  }
908
908
  },
909
909
  "node_modules/appium-android-driver": {
910
- "version": "8.2.0",
911
- "resolved": "https://registry.npmjs.org/appium-android-driver/-/appium-android-driver-8.2.0.tgz",
912
- "integrity": "sha512-bHz7o+HT2jjJ/b398rRdM2QCu3dPyrkVALOU1SrUxQa18n3PIIRquQENINyhsKQChvi8uAFrDJtD8XOd618eLw==",
910
+ "version": "8.4.0",
911
+ "resolved": "https://registry.npmjs.org/appium-android-driver/-/appium-android-driver-8.4.0.tgz",
912
+ "integrity": "sha512-zzGszG1u3nMvSDaZbZKA2rEMFNT/CyWR4SkDRPEZa68rQYAjYzy2fkFbaceCuJdt4oVlch0Kb2033ePg4pVggQ==",
913
913
  "dependencies": {
914
914
  "@appium/support": "^4.2.0",
915
915
  "@colors/colors": "^1.6.0",
@@ -964,16 +964,6 @@
964
964
  "npm": ">=8"
965
965
  }
966
966
  },
967
- "node_modules/appium-chromedriver/node_modules/axios": {
968
- "version": "1.6.7",
969
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz",
970
- "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==",
971
- "dependencies": {
972
- "follow-redirects": "^1.15.4",
973
- "form-data": "^4.0.0",
974
- "proxy-from-env": "^1.1.0"
975
- }
976
- },
977
967
  "node_modules/aproba": {
978
968
  "version": "2.0.0",
979
969
  "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
@@ -1095,11 +1085,11 @@
1095
1085
  "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
1096
1086
  },
1097
1087
  "node_modules/axios": {
1098
- "version": "1.6.3",
1099
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.3.tgz",
1100
- "integrity": "sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==",
1088
+ "version": "1.6.7",
1089
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz",
1090
+ "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==",
1101
1091
  "dependencies": {
1102
- "follow-redirects": "^1.15.0",
1092
+ "follow-redirects": "^1.15.4",
1103
1093
  "form-data": "^4.0.0",
1104
1094
  "proxy-from-env": "^1.1.0"
1105
1095
  }
@@ -2548,9 +2538,9 @@
2548
2538
  }
2549
2539
  },
2550
2540
  "node_modules/lru-cache": {
2551
- "version": "10.1.0",
2552
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz",
2553
- "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==",
2541
+ "version": "10.2.0",
2542
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
2543
+ "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
2554
2544
  "engines": {
2555
2545
  "node": "14 || >=16.14"
2556
2546
  }
@@ -3411,13 +3401,14 @@
3411
3401
  "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
3412
3402
  },
3413
3403
  "node_modules/set-function-length": {
3414
- "version": "1.2.0",
3415
- "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.0.tgz",
3416
- "integrity": "sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w==",
3404
+ "version": "1.2.1",
3405
+ "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz",
3406
+ "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==",
3417
3407
  "dependencies": {
3418
- "define-data-property": "^1.1.1",
3408
+ "define-data-property": "^1.1.2",
3409
+ "es-errors": "^1.3.0",
3419
3410
  "function-bind": "^1.1.2",
3420
- "get-intrinsic": "^1.2.2",
3411
+ "get-intrinsic": "^1.2.3",
3421
3412
  "gopd": "^1.0.1",
3422
3413
  "has-property-descriptors": "^1.0.1"
3423
3414
  },
@@ -3431,9 +3422,9 @@
3431
3422
  "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
3432
3423
  },
3433
3424
  "node_modules/sharp": {
3434
- "version": "0.33.1",
3435
- "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.1.tgz",
3436
- "integrity": "sha512-iAYUnOdTqqZDb3QjMneBKINTllCJDZ3em6WaWy7NPECM4aHncvqHRm0v0bN9nqJxMiwamv5KIdauJ6lUzKDpTQ==",
3425
+ "version": "0.33.2",
3426
+ "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.2.tgz",
3427
+ "integrity": "sha512-WlYOPyyPDiiM07j/UO+E720ju6gtNtHjEGg5vovUk1Lgxyjm2LFO+37Nt/UI3MMh2l6hxTWQWi7qk3cXJTutcQ==",
3437
3428
  "hasInstallScript": true,
3438
3429
  "optional": true,
3439
3430
  "dependencies": {
@@ -3442,32 +3433,32 @@
3442
3433
  "semver": "^7.5.4"
3443
3434
  },
3444
3435
  "engines": {
3445
- "libvips": ">=8.15.0",
3436
+ "libvips": ">=8.15.1",
3446
3437
  "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
3447
3438
  },
3448
3439
  "funding": {
3449
3440
  "url": "https://opencollective.com/libvips"
3450
3441
  },
3451
3442
  "optionalDependencies": {
3452
- "@img/sharp-darwin-arm64": "0.33.1",
3453
- "@img/sharp-darwin-x64": "0.33.1",
3454
- "@img/sharp-libvips-darwin-arm64": "1.0.0",
3455
- "@img/sharp-libvips-darwin-x64": "1.0.0",
3456
- "@img/sharp-libvips-linux-arm": "1.0.0",
3457
- "@img/sharp-libvips-linux-arm64": "1.0.0",
3458
- "@img/sharp-libvips-linux-s390x": "1.0.0",
3459
- "@img/sharp-libvips-linux-x64": "1.0.0",
3460
- "@img/sharp-libvips-linuxmusl-arm64": "1.0.0",
3461
- "@img/sharp-libvips-linuxmusl-x64": "1.0.0",
3462
- "@img/sharp-linux-arm": "0.33.1",
3463
- "@img/sharp-linux-arm64": "0.33.1",
3464
- "@img/sharp-linux-s390x": "0.33.1",
3465
- "@img/sharp-linux-x64": "0.33.1",
3466
- "@img/sharp-linuxmusl-arm64": "0.33.1",
3467
- "@img/sharp-linuxmusl-x64": "0.33.1",
3468
- "@img/sharp-wasm32": "0.33.1",
3469
- "@img/sharp-win32-ia32": "0.33.1",
3470
- "@img/sharp-win32-x64": "0.33.1"
3443
+ "@img/sharp-darwin-arm64": "0.33.2",
3444
+ "@img/sharp-darwin-x64": "0.33.2",
3445
+ "@img/sharp-libvips-darwin-arm64": "1.0.1",
3446
+ "@img/sharp-libvips-darwin-x64": "1.0.1",
3447
+ "@img/sharp-libvips-linux-arm": "1.0.1",
3448
+ "@img/sharp-libvips-linux-arm64": "1.0.1",
3449
+ "@img/sharp-libvips-linux-s390x": "1.0.1",
3450
+ "@img/sharp-libvips-linux-x64": "1.0.1",
3451
+ "@img/sharp-libvips-linuxmusl-arm64": "1.0.1",
3452
+ "@img/sharp-libvips-linuxmusl-x64": "1.0.1",
3453
+ "@img/sharp-linux-arm": "0.33.2",
3454
+ "@img/sharp-linux-arm64": "0.33.2",
3455
+ "@img/sharp-linux-s390x": "0.33.2",
3456
+ "@img/sharp-linux-x64": "0.33.2",
3457
+ "@img/sharp-linuxmusl-arm64": "0.33.2",
3458
+ "@img/sharp-linuxmusl-x64": "0.33.2",
3459
+ "@img/sharp-wasm32": "0.33.2",
3460
+ "@img/sharp-win32-ia32": "0.33.2",
3461
+ "@img/sharp-win32-x64": "0.33.2"
3471
3462
  }
3472
3463
  },
3473
3464
  "node_modules/shebang-command": {
@@ -3498,13 +3489,17 @@
3498
3489
  }
3499
3490
  },
3500
3491
  "node_modules/side-channel": {
3501
- "version": "1.0.4",
3502
- "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
3503
- "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
3492
+ "version": "1.0.5",
3493
+ "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.5.tgz",
3494
+ "integrity": "sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==",
3504
3495
  "dependencies": {
3505
- "call-bind": "^1.0.0",
3506
- "get-intrinsic": "^1.0.2",
3507
- "object-inspect": "^1.9.0"
3496
+ "call-bind": "^1.0.6",
3497
+ "es-errors": "^1.3.0",
3498
+ "get-intrinsic": "^1.2.4",
3499
+ "object-inspect": "^1.13.1"
3500
+ },
3501
+ "engines": {
3502
+ "node": ">= 0.4"
3508
3503
  },
3509
3504
  "funding": {
3510
3505
  "url": "https://github.com/sponsors/ljharb"
@@ -3806,9 +3801,9 @@
3806
3801
  "extraneous": true
3807
3802
  },
3808
3803
  "node_modules/type-fest": {
3809
- "version": "4.9.0",
3810
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.9.0.tgz",
3811
- "integrity": "sha512-KS/6lh/ynPGiHD/LnAobrEFq3Ad4pBzOlJ1wAnJx9N4EYoqFhMfLIBjUT2UEx4wg5ZE+cC1ob6DCSpppVo+rtg==",
3804
+ "version": "4.10.1",
3805
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.10.1.tgz",
3806
+ "integrity": "sha512-7ZnJYTp6uc04uYRISWtiX3DSKB/fxNQT0B5o1OUeCqiQiwF+JC9+rJiZIDrPrNCLLuTqyQmh4VdQqh/ZOkv9MQ==",
3812
3807
  "engines": {
3813
3808
  "node": ">=16"
3814
3809
  },
package/package.json CHANGED
@@ -7,7 +7,7 @@
7
7
  "automated testing",
8
8
  "android"
9
9
  ],
10
- "version": "2.34.4",
10
+ "version": "2.36.0",
11
11
  "author": "Appium Contributors",
12
12
  "license": "Apache-2.0",
13
13
  "repository": {
@@ -73,7 +73,7 @@
73
73
  ],
74
74
  "dependencies": {
75
75
  "appium-adb": "^12.0.0",
76
- "appium-android-driver": "^8.1.6",
76
+ "appium-android-driver": "^8.4.0",
77
77
  "asyncbox": "^3.0.0",
78
78
  "bluebird": "^3.5.0",
79
79
  "io.appium.settings": "^5.7.2",