appium 2.0.0 → 2.0.1
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.
- package/README.md +6 -8
- package/build/lib/appium.d.ts.map +1 -1
- package/build/lib/appium.js +22 -0
- package/build/lib/appium.js.map +1 -1
- package/build/lib/utils.d.ts +6 -0
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +12 -2
- package/build/lib/utils.js.map +1 -1
- package/lib/appium.js +33 -1
- package/lib/utils.js +14 -2
- package/package.json +7 -7
package/README.md
CHANGED
|
@@ -16,18 +16,16 @@ See the full list of
|
|
|
16
16
|
[officially-supported](https://appium.io/docs/en/latest/ecosystem/#drivers) and
|
|
17
17
|
[third-party](https://appium.io/docs/en/latest/ecosystem/#other-drivers) drivers for more details.
|
|
18
18
|
|
|
19
|
-
:bangbang:
|
|
19
|
+
:bangbang: The current Appium 2.0 documentation can be found [here](https://appium.io/docs/en/latest/).
|
|
20
20
|
|
|
21
|
-
:bangbang: Appium core team does not maintain Appium 1.x anymore since the 1st of January 2022. All recent versions of officially supported platform drivers are not compatible to Appium 1.x
|
|
21
|
+
:bangbang: Appium core team does not maintain Appium 1.x anymore since the 1st of January 2022. All recent versions of officially supported platform drivers are not compatible to Appium 1.x, and require Appium 2 to run. [Please read the migration guide from 1.x to 2.0](https://appium.io/docs/en/latest/guides/migrating-1-to-2/) to manage the Appium server.
|
|
22
22
|
|
|
23
|
-
Appium
|
|
24
|
-
found around the web may not be correct. The current Appium 2.0 documentation is very much in
|
|
25
|
-
progress. Currently, it can be found [here](https://appium.io/docs/en/latest/).
|
|
23
|
+
:bangbang: If you still use the deprecated Appium Desktop containing the built-in server then you won't be able to upgrade to Appium 2. Consider switching to [Appium Inspector](https://github.com/appium/appium-inspector) instead.
|
|
26
24
|
|
|
27
25
|
### Requirements
|
|
28
26
|
|
|
29
27
|
- macOS, Linux or Windows operating system
|
|
30
|
-
- Node.js
|
|
28
|
+
- Node.js 16+. Any relevant [LTS release](https://nodejs.dev/en/about/releases/) should work just fine.
|
|
31
29
|
- NPM (Node Package Manager) 8+
|
|
32
30
|
|
|
33
31
|
These are only server requirements. Each driver might have its own requirements. Consider checking the corresponding driver tutorial for more details.
|
|
@@ -37,10 +35,10 @@ These are only server requirements. Each driver might have its own requirements.
|
|
|
37
35
|
To install Appium 2 server using Node Package Manager (npm) run the following command:
|
|
38
36
|
|
|
39
37
|
```bash
|
|
40
|
-
npm
|
|
38
|
+
npm i --location=global appium
|
|
41
39
|
```
|
|
42
40
|
|
|
43
|
-
:bangbang:
|
|
41
|
+
:bangbang: Make sure Appium 1 is fully unistalled before upgrading it to Appium 2 (`npm uninstall --location=global appium`). Unexpected errors might appear if this has not been done.
|
|
44
42
|
|
|
45
43
|
### Drivers
|
|
46
44
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appium.d.ts","sourceRoot":"","sources":["../../lib/appium.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"appium.d.ts","sourceRoot":"","sources":["../../lib/appium.js"],"names":[],"mappings":"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"}
|
package/build/lib/appium.js
CHANGED
|
@@ -149,6 +149,10 @@ class AppiumDriver extends base_driver_1.DriverCore {
|
|
|
149
149
|
jsonwpCaps = lodash_1.default.cloneDeep(jsonwpCaps);
|
|
150
150
|
const jwpSettings = { ...defaultSettings, ...(0, utils_1.pullSettings)(jsonwpCaps) };
|
|
151
151
|
w3cCapabilities = lodash_1.default.cloneDeep(w3cCapabilities);
|
|
152
|
+
if (!lodash_1.default.isPlainObject(w3cCapabilities) ||
|
|
153
|
+
!(lodash_1.default.isArray(w3cCapabilities?.firstMatch) || lodash_1.default.isPlainObject(w3cCapabilities?.alwaysMatch))) {
|
|
154
|
+
throw (0, utils_1.makeNonW3cCapsError)();
|
|
155
|
+
}
|
|
152
156
|
// It is possible that the client only provides caps using JSONWP standard,
|
|
153
157
|
// although firstMatch/alwaysMatch properties are still present.
|
|
154
158
|
// In such case we assume the client understands W3C protocol and merge the given
|
|
@@ -482,6 +486,13 @@ class AppiumDriver extends base_driver_1.DriverCore {
|
|
|
482
486
|
}
|
|
483
487
|
// get any plugins which are registered as handling this command
|
|
484
488
|
const plugins = this.pluginsToHandleCmd(cmd, sessionId);
|
|
489
|
+
// if any plugins are going to handle this command, we can't guarantee that the default
|
|
490
|
+
// driver's executeCommand method will be called, which means we can't guarantee that the
|
|
491
|
+
// newCommandTimeout will be cleared. So we do it here as well.
|
|
492
|
+
if (plugins.length && dstSession) {
|
|
493
|
+
this.log.debug('Clearing new command timeout pre-emptively since plugin(s) will handle this command');
|
|
494
|
+
await dstSession.clearNewCommandTimeout();
|
|
495
|
+
}
|
|
485
496
|
// now we define a 'cmdHandledBy' object which will keep track of which plugins have handled this
|
|
486
497
|
// command. we care about this because (a) multiple plugins can handle the same command, and
|
|
487
498
|
// (b) there's no guarantee that a plugin will actually call the next() method which runs the
|
|
@@ -534,6 +545,17 @@ class AppiumDriver extends base_driver_1.DriverCore {
|
|
|
534
545
|
// if we had plugins, make sure to log out the helpful report about which plugins ended up
|
|
535
546
|
// handling the command and which didn't
|
|
536
547
|
this.logPluginHandlerReport(plugins, { cmd, cmdHandledBy });
|
|
548
|
+
// if we had plugins, and if they did not ultimately call the default handler, this means our
|
|
549
|
+
// new command timeout was not restarted by the default handler's executeCommand call, so
|
|
550
|
+
// restart it here using the same logic as in BaseDriver's executeCommand
|
|
551
|
+
if (dstSession &&
|
|
552
|
+
!cmdHandledBy.default &&
|
|
553
|
+
dstSession.isCommandsQueueEnabled &&
|
|
554
|
+
cmd !== base_driver_1.DELETE_SESSION_COMMAND) {
|
|
555
|
+
this.log.debug('Restarting new command timeout via umbrella driver since plugin did not ' +
|
|
556
|
+
'allow default handler to execute');
|
|
557
|
+
await dstSession.startNewCommandTimeout();
|
|
558
|
+
}
|
|
537
559
|
// And finally, if the command was createSession, we want to migrate any plugins which were
|
|
538
560
|
// previously sessionless to use the new sessionId, so that plugins can share state between
|
|
539
561
|
// their createSession method and other instance methods
|
package/build/lib/appium.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appium.js","sourceRoot":"","sources":["../../lib/appium.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"appium.js","sourceRoot":"","sources":["../../lib/appium.js"],"names":[],"mappings":"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"}
|
package/build/lib/utils.d.ts
CHANGED
|
@@ -1,4 +1,10 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
+
/**
|
|
3
|
+
* Creates an error object in case a session gets incompatible capabilities as the input.
|
|
4
|
+
*
|
|
5
|
+
* @returns {Error}
|
|
6
|
+
*/
|
|
7
|
+
export function makeNonW3cCapsError(): Error;
|
|
2
8
|
/**
|
|
3
9
|
* @template {CliCommand} [Cmd=ServerCommand]
|
|
4
10
|
* @template {CliExtensionSubcommand|void} [SubCmd=void]
|
package/build/lib/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":";AAwBA;;;;GAIG;AACH,uCAFa,KAAK,CAOjB;AAmRD;;;;;GAKG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAEC;AAED;;;;;GAKG;AACH,gVAEC;AAED;;;;;GAKG;AACH,8PAEC;AAED;;;;;GAKG;AACH,8PAEC;AAED;;;;;;GAMG;AACH,yCAJW,CAAC,GAAC,CAAC,GAAC,IAAI,GAEN,GAAG,oBAAoB,EAAE,CAcrC;AArWD,wCAAyC;AACzC,mCAAoC;2BAiXvB,OAAO,eAAe,EAAE,YAAY;uCACpC,OAAO,eAAe,EAAE,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAO/C,aAAa,CAAC,CAAC;cACf,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAUN,KAAK;cACL,MAAM;;;;;0EAQP,OAAO,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC;6EAKvC,OAAO,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC;4EAK1C,OAAO,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC;+EAKzC,OAAO,eAAe,EAAE,iBAAiB,CAAC,CAAC,CAAC;6BAK5C,OAAO,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;0BAIlC,OAAO,eAAe,EAAE,WAAW;yBAInC,OAAO,cAAc,EAAE,UAAU;qCACjC,OAAO,cAAc,EAAE,sBAAsB;kCAC7C,OAAO,cAAc,EAAE,mBAAmB;4BAC1C,OAAO,cAAc,EAAE,gBAAgB;4BACvC,OAAO,cAAc,EAAE,gBAAgB;4BACvC,OAAO,cAAc,EAAE,gBAAgB;yJAMvC,OAAO,cAAc,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC;+JAMxC,OAAO,cAAc,EAAE,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC;eA/b5C,SAAS;AA6BxB;;;;GAIG;AACH,wCAQE;AAEF;;;;;;;;;;;GAWG;AACH,0XAgHC;AAED;;;;;GAKG;AACH,oPAQC;AAoBD;;;;GAIG;AACH,2CAHW,MAAM,GACJ,MAAM,GAAC,SAAS,CAK5B;AAwDD;;;;;;;;;;;;;;;GAeG;AACH,oDAgBC;AAlHD;;;;GAIG;AACH,oPAEC;AAqBD;;;;;;GAMG;AACH,kCAFa,IAAI,CA+ChB"}
|
package/build/lib/utils.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.adjustNodePath = exports.removeAppiumPrefixes = exports.pullSettings = exports.getPackageVersion = exports.insertAppiumPrefixes = exports.parseCapsForInnerDriver = exports.inspect = exports.fetchInterfaces = exports.isPluginCommandArgs = exports.isDriverCommandArgs = exports.isExtensionCommandArgs = exports.isServerCommandArgs = exports.V6_BROADCAST_IP = exports.V4_BROADCAST_IP = void 0;
|
|
6
|
+
exports.adjustNodePath = exports.removeAppiumPrefixes = exports.pullSettings = exports.getPackageVersion = exports.insertAppiumPrefixes = exports.parseCapsForInnerDriver = exports.inspect = exports.fetchInterfaces = exports.isPluginCommandArgs = exports.isDriverCommandArgs = exports.isExtensionCommandArgs = exports.isServerCommandArgs = exports.makeNonW3cCapsError = exports.V6_BROADCAST_IP = exports.V4_BROADCAST_IP = void 0;
|
|
7
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
8
|
const logger_1 = __importDefault(require("./logger"));
|
|
9
9
|
const base_driver_1 = require("@appium/base-driver");
|
|
@@ -24,6 +24,16 @@ exports.V6_BROADCAST_IP = '::';
|
|
|
24
24
|
* @type {boolean}
|
|
25
25
|
*/
|
|
26
26
|
const isStdoutTTY = process.stdout.isTTY;
|
|
27
|
+
/**
|
|
28
|
+
* Creates an error object in case a session gets incompatible capabilities as the input.
|
|
29
|
+
*
|
|
30
|
+
* @returns {Error}
|
|
31
|
+
*/
|
|
32
|
+
function makeNonW3cCapsError() {
|
|
33
|
+
return new base_driver_1.errors.SessionNotCreatedError('Session capabilities format must comply to the W3C standard. Make sure your client is up to date. ' +
|
|
34
|
+
'See https://www.w3.org/TR/webdriver/#new-session for more details.');
|
|
35
|
+
}
|
|
36
|
+
exports.makeNonW3cCapsError = makeNonW3cCapsError;
|
|
27
37
|
/**
|
|
28
38
|
* Dumps to value to the console using `info` logger.
|
|
29
39
|
*
|
|
@@ -59,7 +69,7 @@ function parseCapsForInnerDriver(jsonwpCapabilities, w3cCapabilities, constraint
|
|
|
59
69
|
if (!hasW3CCaps) {
|
|
60
70
|
return /** @type {InvalidCaps<C>} */ ({
|
|
61
71
|
protocol: base_driver_1.PROTOCOLS.W3C,
|
|
62
|
-
error:
|
|
72
|
+
error: makeNonW3cCapsError(),
|
|
63
73
|
});
|
|
64
74
|
}
|
|
65
75
|
const { W3C } = base_driver_1.PROTOCOLS;
|
package/build/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,sDAA8B;AAC9B,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"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"}
|
package/lib/appium.js
CHANGED
|
@@ -13,7 +13,7 @@ import {
|
|
|
13
13
|
promoteAppiumOptionsForObject,
|
|
14
14
|
} from '@appium/base-driver';
|
|
15
15
|
import AsyncLock from 'async-lock';
|
|
16
|
-
import {parseCapsForInnerDriver, pullSettings} from './utils';
|
|
16
|
+
import {parseCapsForInnerDriver, pullSettings, makeNonW3cCapsError} from './utils';
|
|
17
17
|
import {util, node, logger} from '@appium/support';
|
|
18
18
|
import {getDefaultsForExtension} from './schema';
|
|
19
19
|
import {DRIVER_TYPE} from './constants';
|
|
@@ -231,6 +231,12 @@ class AppiumDriver extends DriverCore {
|
|
|
231
231
|
jsonwpCaps = _.cloneDeep(jsonwpCaps);
|
|
232
232
|
const jwpSettings = {...defaultSettings, ...pullSettings(jsonwpCaps)};
|
|
233
233
|
w3cCapabilities = _.cloneDeep(w3cCapabilities);
|
|
234
|
+
if (
|
|
235
|
+
!_.isPlainObject(w3cCapabilities) ||
|
|
236
|
+
!(_.isArray(w3cCapabilities?.firstMatch) || _.isPlainObject(w3cCapabilities?.alwaysMatch))
|
|
237
|
+
) {
|
|
238
|
+
throw makeNonW3cCapsError();
|
|
239
|
+
}
|
|
234
240
|
// It is possible that the client only provides caps using JSONWP standard,
|
|
235
241
|
// although firstMatch/alwaysMatch properties are still present.
|
|
236
242
|
// In such case we assume the client understands W3C protocol and merge the given
|
|
@@ -634,6 +640,16 @@ class AppiumDriver extends DriverCore {
|
|
|
634
640
|
// get any plugins which are registered as handling this command
|
|
635
641
|
const plugins = this.pluginsToHandleCmd(cmd, sessionId);
|
|
636
642
|
|
|
643
|
+
// if any plugins are going to handle this command, we can't guarantee that the default
|
|
644
|
+
// driver's executeCommand method will be called, which means we can't guarantee that the
|
|
645
|
+
// newCommandTimeout will be cleared. So we do it here as well.
|
|
646
|
+
if (plugins.length && dstSession) {
|
|
647
|
+
this.log.debug(
|
|
648
|
+
'Clearing new command timeout pre-emptively since plugin(s) will handle this command'
|
|
649
|
+
);
|
|
650
|
+
await dstSession.clearNewCommandTimeout();
|
|
651
|
+
}
|
|
652
|
+
|
|
637
653
|
// now we define a 'cmdHandledBy' object which will keep track of which plugins have handled this
|
|
638
654
|
// command. we care about this because (a) multiple plugins can handle the same command, and
|
|
639
655
|
// (b) there's no guarantee that a plugin will actually call the next() method which runs the
|
|
@@ -699,6 +715,22 @@ class AppiumDriver extends DriverCore {
|
|
|
699
715
|
// handling the command and which didn't
|
|
700
716
|
this.logPluginHandlerReport(plugins, {cmd, cmdHandledBy});
|
|
701
717
|
|
|
718
|
+
// if we had plugins, and if they did not ultimately call the default handler, this means our
|
|
719
|
+
// new command timeout was not restarted by the default handler's executeCommand call, so
|
|
720
|
+
// restart it here using the same logic as in BaseDriver's executeCommand
|
|
721
|
+
if (
|
|
722
|
+
dstSession &&
|
|
723
|
+
!cmdHandledBy.default &&
|
|
724
|
+
dstSession.isCommandsQueueEnabled &&
|
|
725
|
+
cmd !== DELETE_SESSION_COMMAND
|
|
726
|
+
) {
|
|
727
|
+
this.log.debug(
|
|
728
|
+
'Restarting new command timeout via umbrella driver since plugin did not ' +
|
|
729
|
+
'allow default handler to execute'
|
|
730
|
+
);
|
|
731
|
+
await dstSession.startNewCommandTimeout();
|
|
732
|
+
}
|
|
733
|
+
|
|
702
734
|
// And finally, if the command was createSession, we want to migrate any plugins which were
|
|
703
735
|
// previously sessionless to use the new sessionId, so that plugins can share state between
|
|
704
736
|
// their createSession method and other instance methods
|
package/lib/utils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _ from 'lodash';
|
|
2
2
|
import logger from './logger';
|
|
3
|
-
import {processCapabilities, PROTOCOLS, STANDARD_CAPS} from '@appium/base-driver';
|
|
3
|
+
import {processCapabilities, PROTOCOLS, STANDARD_CAPS, errors} from '@appium/base-driver';
|
|
4
4
|
import {inspect as dump} from 'util';
|
|
5
5
|
import {node} from '@appium/support';
|
|
6
6
|
import path from 'path';
|
|
@@ -22,6 +22,18 @@ export const V6_BROADCAST_IP = '::';
|
|
|
22
22
|
*/
|
|
23
23
|
const isStdoutTTY = process.stdout.isTTY;
|
|
24
24
|
|
|
25
|
+
/**
|
|
26
|
+
* Creates an error object in case a session gets incompatible capabilities as the input.
|
|
27
|
+
*
|
|
28
|
+
* @returns {Error}
|
|
29
|
+
*/
|
|
30
|
+
export function makeNonW3cCapsError() {
|
|
31
|
+
return new errors.SessionNotCreatedError(
|
|
32
|
+
'Session capabilities format must comply to the W3C standard. Make sure your client is up to date. ' +
|
|
33
|
+
'See https://www.w3.org/TR/webdriver/#new-session for more details.'
|
|
34
|
+
);
|
|
35
|
+
}
|
|
36
|
+
|
|
25
37
|
/**
|
|
26
38
|
* Dumps to value to the console using `info` logger.
|
|
27
39
|
*
|
|
@@ -69,7 +81,7 @@ function parseCapsForInnerDriver(
|
|
|
69
81
|
if (!hasW3CCaps) {
|
|
70
82
|
return /** @type {InvalidCaps<C>} */ ({
|
|
71
83
|
protocol: PROTOCOLS.W3C,
|
|
72
|
-
error:
|
|
84
|
+
error: makeNonW3cCapsError(),
|
|
73
85
|
});
|
|
74
86
|
}
|
|
75
87
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "appium",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.1",
|
|
4
4
|
"description": "Automation for Apps.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"automation",
|
|
@@ -60,11 +60,11 @@
|
|
|
60
60
|
"test:unit": "mocha \"./test/unit/**/*.spec.js\""
|
|
61
61
|
},
|
|
62
62
|
"dependencies": {
|
|
63
|
-
"@appium/base-driver": "^9.3.
|
|
64
|
-
"@appium/base-plugin": "^2.2.
|
|
65
|
-
"@appium/docutils": "^0.4.
|
|
63
|
+
"@appium/base-driver": "^9.3.16",
|
|
64
|
+
"@appium/base-plugin": "^2.2.16",
|
|
65
|
+
"@appium/docutils": "^0.4.5",
|
|
66
66
|
"@appium/schema": "^0.3.1",
|
|
67
|
-
"@appium/support": "^4.1.
|
|
67
|
+
"@appium/support": "^4.1.3",
|
|
68
68
|
"@appium/types": "^0.13.2",
|
|
69
69
|
"@sidvind/better-ajv-errors": "2.1.0",
|
|
70
70
|
"@types/argparse": "2.0.10",
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
"resolve-from": "5.0.0",
|
|
92
92
|
"semver": "7.5.3",
|
|
93
93
|
"source-map-support": "0.5.21",
|
|
94
|
-
"teen_process": "2.0.
|
|
94
|
+
"teen_process": "2.0.4",
|
|
95
95
|
"type-fest": "3.11.1",
|
|
96
96
|
"winston": "3.9.0",
|
|
97
97
|
"wrap-ansi": "7.0.0",
|
|
@@ -104,7 +104,7 @@
|
|
|
104
104
|
"publishConfig": {
|
|
105
105
|
"access": "public"
|
|
106
106
|
},
|
|
107
|
-
"gitHead": "
|
|
107
|
+
"gitHead": "ec57ff4c2a1ae3ecbab11bd02d4249ca67626d83",
|
|
108
108
|
"typedoc": {
|
|
109
109
|
"entryPoint": "./lib/main.js"
|
|
110
110
|
}
|