appium 2.0.0-beta.56 → 2.0.0-beta.57
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/LICENSE +1 -1
- package/README.md +3 -6
- package/build/lib/appium.d.ts +2 -2
- package/build/lib/appium.d.ts.map +1 -1
- package/build/lib/appium.js +1 -1
- package/build/lib/appium.js.map +1 -1
- package/build/lib/cli/driver-command.d.ts.map +1 -1
- package/build/lib/cli/driver-command.js +6 -1
- package/build/lib/cli/driver-command.js.map +1 -1
- package/build/lib/cli/extension-command.d.ts +23 -9
- package/build/lib/cli/extension-command.d.ts.map +1 -1
- package/build/lib/cli/extension-command.js +66 -21
- package/build/lib/cli/extension-command.js.map +1 -1
- package/build/lib/cli/plugin-command.d.ts.map +1 -1
- package/build/lib/cli/plugin-command.js +6 -1
- package/build/lib/cli/plugin-command.js.map +1 -1
- package/build/lib/config.d.ts +1 -1
- package/build/lib/config.d.ts.map +1 -1
- package/build/lib/config.js +3 -2
- package/build/lib/config.js.map +1 -1
- package/lib/appium.js +1 -1
- package/lib/cli/driver-command.js +6 -1
- package/lib/cli/extension-command.js +70 -21
- package/lib/cli/plugin-command.js +6 -1
- package/lib/config.js +3 -2
- package/package.json +10 -10
- package/scripts/autoinstall-extensions.js +23 -0
package/LICENSE
CHANGED
|
@@ -186,7 +186,7 @@
|
|
|
186
186
|
same "printed page" as the copyright notice for easier
|
|
187
187
|
identification within third-party archives.
|
|
188
188
|
|
|
189
|
-
Copyright
|
|
189
|
+
Copyright OpenJS Foundation and other contributors, https://openjsf.org/
|
|
190
190
|
|
|
191
191
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
192
192
|
you may not use this file except in compliance with the License.
|
package/README.md
CHANGED
|
@@ -57,7 +57,7 @@ appium driver install --source=npm appium-xcuitest-driver[@<version>]
|
|
|
57
57
|
# To install a driver from a local folder (useful for developers)
|
|
58
58
|
appium driver install --source=local /Users/me/sources/appium-xcuitest-driver
|
|
59
59
|
# To install a new driver from github (hm, maybe it's time to publish it to NPM?)
|
|
60
|
-
appium driver install --source=github appium/appium-xcuitest-driver
|
|
60
|
+
appium driver install --source=github --package=appium-xcuitest-driver appium/appium-xcuitest-driver
|
|
61
61
|
|
|
62
62
|
# To list already installed drivers
|
|
63
63
|
appium driver list --installed
|
|
@@ -168,7 +168,7 @@ Java/Kotlin. Appium opens up the possibility of true cross-platform native app
|
|
|
168
168
|
automation, for mobile and beyond. Finally!
|
|
169
169
|
|
|
170
170
|
If you're new to Appium or want a more comprehensive description of what this is all
|
|
171
|
-
about, please read our [
|
|
171
|
+
about, please read our [Intro to Appium](https://appium.github.io/appium/docs/en/latest/intro/).
|
|
172
172
|
|
|
173
173
|
### Quickstart
|
|
174
174
|
|
|
@@ -204,10 +204,7 @@ be sure to sign up!
|
|
|
204
204
|
|
|
205
205
|
### Troubleshooting
|
|
206
206
|
|
|
207
|
-
|
|
208
|
-
Please have a look here first if you run into any problems. It contains instructions for checking
|
|
209
|
-
a lot of common errors and how to get in touch with the community if you're
|
|
210
|
-
stumped.
|
|
207
|
+
Please find the troubleshooting guide at the corresponding driver repository/documentation.
|
|
211
208
|
|
|
212
209
|
### License
|
|
213
210
|
|
package/build/lib/appium.d.ts
CHANGED
|
@@ -85,13 +85,13 @@ export class AppiumDriver extends DriverCore<typeof import("@appium/types").BASE
|
|
|
85
85
|
/** @type {DriverOpts} */
|
|
86
86
|
args: DriverOpts;
|
|
87
87
|
sessionExists(sessionId: any): boolean;
|
|
88
|
-
driverForSession(sessionId: any): import("@appium/types").ExternalDriver<
|
|
88
|
+
driverForSession(sessionId: any): import("@appium/types").ExternalDriver<Readonly<Record<string, import("@appium/types").Constraint>>>;
|
|
89
89
|
getStatus(): Promise<{
|
|
90
90
|
build: import("../types").BuildInfo;
|
|
91
91
|
}>;
|
|
92
92
|
getSessions(): Promise<{
|
|
93
93
|
id: string;
|
|
94
|
-
capabilities: Partial<import("@appium/types").ConstraintsToCaps<
|
|
94
|
+
capabilities: Partial<import("@appium/types").ConstraintsToCaps<Readonly<Record<string, import("@appium/types").Constraint>>> & void> | undefined;
|
|
95
95
|
}[]>;
|
|
96
96
|
printNewSessionAnnouncement(driverName: any, driverVersion: any, driverBaseVersion: any): void;
|
|
97
97
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appium.d.ts","sourceRoot":"","sources":["../../lib/appium.js"],"names":[],"mappings":"AAmzBA;;;GAGG;AACH;IAME,cAOC;IAZD;;OAEG;IACH,MAFU,SAAS,MAAM,CAAC,CAEgB;CAU3C;sCAtyBY,mCAAmC;6BA2yBnC,OAAO,eAAe,EAAE,cAAc;qBACtC,OAAO,eAAe,EAAE,MAAM;0BAC9B,OAAO,eAAe,EAAE,WAAW;yBACnC,OAAO,eAAe,EAAE,UAAU;yBAClC,OAAO,eAAe,EAAE,UAAU;0BAClC,OAAO,eAAe,EAAE,WAAW;2BACnC,OAAO,eAAe,EAAE,YAAY;4BACpC,OAAO,eAAe,EAAE,aAAa;2BACrC,OAAO,2BAA2B,EAAE,YAAY;qBAChD,OAAO,eAAe,EAAE,MAAM;0BAC9B,OAAO,eAAe,EAAE,WAAW;yBACnC,OAAO,eAAe,EAAE,UAAU;yBAClC,OAAO,eAAe,EAAE,UAAU;2BAClC,OAAO,eAAe,EAAE,YAAY;6BACpC,OAAO,eAAe,EAAE,cAAc,CAAC,qBAAqB,GAAG,EAAE,CAAC,EAAC,qBAAqB,IAAI,CAAC,CAAC;;;;;;;;;;sGAe9F,OAAO,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC;mGAK1C,OAAO,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC;AAv0BpD;;GAEG;AACH;IAyDE;;OAEG;IACH,kBAFW,UAAU,EA+BpB;IAxFD;;;;;OAKG;IACH,UAFU,OAAO,MAAM,EAAC,cAAc,CAAC,CAE9B;IAET;;;;;OAKG;IACH,gBAFU,OAAO,MAAM,EAAC,cAAc,EAAE,CAAC,CAE1B;IASf;;;OAGG;IACH,eAFU,IAAI,WAAW,EAAC,MAAM,CAAC,CAEnB;IAEd;;;OAGG;IACH,gBAFU,OAAO,MAAM,EAAC,aAAa,WAAW,CAAC,EAAE,CAAC,CAErC;IAEf;;;OAGG;IACH,oBAFU,aAAa,WAAW,CAAC,EAAE,CAElB;IAEnB,2BAA2B;IAC3B,cADW,YAAY,CACV;IAEb,2BAA2B;IAC3B,QADW,YAAY,CAChB;IAEP;;;OAGG;IACH,gCAHU,uBAAuB,CAGX;IAEtB,yBAAyB;IACzB,MADW,UAAU,CAChB;IAsDL,uCAGC;IAED,
|
|
1
|
+
{"version":3,"file":"appium.d.ts","sourceRoot":"","sources":["../../lib/appium.js"],"names":[],"mappings":"AAmzBA;;;GAGG;AACH;IAME,cAOC;IAZD;;OAEG;IACH,MAFU,SAAS,MAAM,CAAC,CAEgB;CAU3C;sCAtyBY,mCAAmC;6BA2yBnC,OAAO,eAAe,EAAE,cAAc;qBACtC,OAAO,eAAe,EAAE,MAAM;0BAC9B,OAAO,eAAe,EAAE,WAAW;yBACnC,OAAO,eAAe,EAAE,UAAU;yBAClC,OAAO,eAAe,EAAE,UAAU;0BAClC,OAAO,eAAe,EAAE,WAAW;2BACnC,OAAO,eAAe,EAAE,YAAY;4BACpC,OAAO,eAAe,EAAE,aAAa;2BACrC,OAAO,2BAA2B,EAAE,YAAY;qBAChD,OAAO,eAAe,EAAE,MAAM;0BAC9B,OAAO,eAAe,EAAE,WAAW;yBACnC,OAAO,eAAe,EAAE,UAAU;yBAClC,OAAO,eAAe,EAAE,UAAU;2BAClC,OAAO,eAAe,EAAE,YAAY;6BACpC,OAAO,eAAe,EAAE,cAAc,CAAC,qBAAqB,GAAG,EAAE,CAAC,EAAC,qBAAqB,IAAI,CAAC,CAAC;;;;;;;;;;sGAe9F,OAAO,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC;mGAK1C,OAAO,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC;AAv0BpD;;GAEG;AACH;IAyDE;;OAEG;IACH,kBAFW,UAAU,EA+BpB;IAxFD;;;;;OAKG;IACH,UAFU,OAAO,MAAM,EAAC,cAAc,CAAC,CAE9B;IAET;;;;;OAKG;IACH,gBAFU,OAAO,MAAM,EAAC,cAAc,EAAE,CAAC,CAE1B;IASf;;;OAGG;IACH,eAFU,IAAI,WAAW,EAAC,MAAM,CAAC,CAEnB;IAEd;;;OAGG;IACH,gBAFU,OAAO,MAAM,EAAC,aAAa,WAAW,CAAC,EAAE,CAAC,CAErC;IAEf;;;OAGG;IACH,oBAFU,aAAa,WAAW,CAAC,EAAE,CAElB;IAEnB,2BAA2B;IAC3B,cADW,YAAY,CACV;IAEb,2BAA2B;IAC3B,QADW,YAAY,CAChB;IAEP;;;OAGG;IACH,gCAHU,uBAAuB,CAGX;IAEtB,yBAAyB;IACzB,MADW,UAAU,CAChB;IAsDL,uCAGC;IAED,uIAEC;IAGD;;OAIC;IAGD;;;SAKC;IAED,+FAiBC;IAED;;;;OAIG;IACH,6BAHW,MAAM,GACJ,YAAY,CAIxB;IAED;;;;;;;;OAQG;IACH,6BAHW,MAAM,GACJ,YAAY,GAAC,SAAS,CAclC;IAED;;;;;;OAMG;IACH,0BALW,gBAAgB,uBAAuB,CAAC,WACxC,gBAAgB,uBAAuB,CAAC,mBACxC,gBAAgB,uBAAuB,CAAC;;;;;;;;OAyKlD;IAED;;;;OAIG;IACH,wCAHW,MAAM,kBACN,MAAM,QAsChB;IAED;;;;OAIG;IAEH,qCAJW,WAAW,GACT,QAAQ,UAAU,EAAE,CAAC,CAkBjC;IAED;;OAEG;IACH,yBAFW,MAAM;;;;;;;;OA0ChB;IAED,4CAqBC;IAED;;;;;OAKG;IACH,8BAHY,MAAM,gBAejB;IAED;;;;;;;;;OASG;IACH,wBAJW,MAAM,cACL,MAAM,gBASjB;IAED;;;OAGG;IACH,yBAFa,MAAM,EAAE,CAWpB;IAED;;;;;OAKG;IACH,oBAJW,MAAM,WACF,GAAG,kBA+HjB;IAED;;;;;;;YAwBC;IAED;;;aAoBC;IAED;;;;;;;OAwBC;IAED,qCAGC;IAYD,kCAGC;CACF"}
|
package/build/lib/appium.js
CHANGED
|
@@ -190,7 +190,7 @@ class AppiumDriver extends base_driver_1.DriverCore {
|
|
|
190
190
|
* @type {DriverData[]}
|
|
191
191
|
*/
|
|
192
192
|
let otherPendingDriversData = [];
|
|
193
|
-
const driverInstance = new InnerDriver(this.args, true);
|
|
193
|
+
const driverInstance = /** @type {ExternalDriver} */ (new InnerDriver(this.args, true));
|
|
194
194
|
// We want to assign security values directly on the driver. The driver
|
|
195
195
|
// should not read security values from `this.opts` because those values
|
|
196
196
|
// could have been set by a malicious user via capabilities, whereas we
|
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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/driver-command.js"],"names":[],"mappings":"AAOA;;GAEG;AAEH;IACE;;OAEG;IACH,8BAFW,OAAO,qBAAqB,EAAE,uBAAuB,CAAC,UAAU,CAAC,EAK3E;IAED;;;;;OAKG;IACH,8CAHW,iBAAiB,GAChB,QAAQ,UAAU,UAAU,CAAC,CAAC,CAQzC;IAED;;;;;OAKG;IACH,sBAHW,mBAAmB,GAClB,QAAQ,UAAU,UAAU,CAAC,CAAC,CAIzC;IAED;;;;;OAKG;IACH,2BAHW,gBAAgB,GACf,QAAQ,OAAO,qBAAqB,EAAE,qBAAqB,CAAC,CAIvE;IAED;;;;OAIG;IACH,uCAHW,gBAAgB,GACf,QAAQ,OAAO,qBAAqB,EAAE,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"driver-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/driver-command.js"],"names":[],"mappings":"AAOA;;GAEG;AAEH;IACE;;OAEG;IACH,8BAFW,OAAO,qBAAqB,EAAE,uBAAuB,CAAC,UAAU,CAAC,EAK3E;IAED;;;;;OAKG;IACH,8CAHW,iBAAiB,GAChB,QAAQ,UAAU,UAAU,CAAC,CAAC,CAQzC;IAED;;;;;OAKG;IACH,sBAHW,mBAAmB,GAClB,QAAQ,UAAU,UAAU,CAAC,CAAC,CAIzC;IAED;;;;;OAKG;IACH,2BAHW,gBAAgB,GACf,QAAQ,OAAO,qBAAqB,EAAE,qBAAqB,CAAC,CAIvE;IAED;;;;OAIG;IACH,uCAHW,gBAAgB,GACf,QAAQ,OAAO,qBAAqB,EAAE,SAAS,CAAC,CAS3D;CAqCF;4BAGY,OAAO,eAAe,EAAE,aAAa;yBACrC,OAAO,eAAe,EAAE,UAAU;+EAKlC,OAAO,cAAc,EAAE,SAAS,CAAC,OAAO,CAAC;;YAKxC,OAAO,+BAA+B,EAAE,eAAe,CAAC,UAAU,CAAC;UACnE,OAAO;;;;;;;;;YAMP,MAAM;;;;iBACN,WAAW;;;;;;0BAKZ,OAAO,cAAc,EAAE,WAAW;;;;;;;;YAMjC,MAAM;;;;;;;;;YAMN,MAAM;;;;YACN,OAAO;;;;;;;;;YAMP,MAAM;;;;gBACN,MAAM"}
|
|
@@ -56,7 +56,12 @@ class DriverCommand extends extension_command_1.default {
|
|
|
56
56
|
* @return {Promise<import('./extension-command').RunOutput>}
|
|
57
57
|
*/
|
|
58
58
|
async run({ driver, scriptName, extraArgs }) {
|
|
59
|
-
return await super._run({
|
|
59
|
+
return await super._run({
|
|
60
|
+
installSpec: driver,
|
|
61
|
+
scriptName,
|
|
62
|
+
extraArgs,
|
|
63
|
+
bufferOutput: this.isJsonOutput,
|
|
64
|
+
});
|
|
60
65
|
}
|
|
61
66
|
/**
|
|
62
67
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver-command.js","sourceRoot":"","sources":["../../../lib/cli/driver-command.js"],"names":[],"mappings":";;;;;AAAA,oDAAuB;AACvB,4EAAmD;AACnD,4CAA2C;AAC3C,0BAAwB;AAExB,MAAM,iBAAiB,GAAG,CAAC,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;AAEzF;;GAEG;AAEH,MAAqB,aAAc,SAAQ,2BAAgB;IACzD;;OAEG;IACH,YAAY,EAAC,MAAM,EAAE,IAAI,EAAC;QACxB,KAAK,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,yBAAa,CAAC;IACvC,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAO,CAAC,EAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAC;QAC9C,OAAO,MAAM,KAAK,CAAC,QAAQ,CAAC;YAC1B,WAAW,EAAE,MAAM;YACnB,WAAW;YACX,WAAW;SACZ,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,SAAS,CAAC,EAAC,MAAM,EAAC;QACtB,OAAO,MAAM,KAAK,CAAC,UAAU,CAAC,EAAC,WAAW,EAAE,MAAM,EAAC,CAAC,CAAC;IACvD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,MAAM,EAAC;QAC3B,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,EAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC,CAAC;IAC5D,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAC;QACvC,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"driver-command.js","sourceRoot":"","sources":["../../../lib/cli/driver-command.js"],"names":[],"mappings":";;;;;AAAA,oDAAuB;AACvB,4EAAmD;AACnD,4CAA2C;AAC3C,0BAAwB;AAExB,MAAM,iBAAiB,GAAG,CAAC,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;AAEzF;;GAEG;AAEH,MAAqB,aAAc,SAAQ,2BAAgB;IACzD;;OAEG;IACH,YAAY,EAAC,MAAM,EAAE,IAAI,EAAC;QACxB,KAAK,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,yBAAa,CAAC;IACvC,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAO,CAAC,EAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAC;QAC9C,OAAO,MAAM,KAAK,CAAC,QAAQ,CAAC;YAC1B,WAAW,EAAE,MAAM;YACnB,WAAW;YACX,WAAW;SACZ,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,SAAS,CAAC,EAAC,MAAM,EAAC;QACtB,OAAO,MAAM,KAAK,CAAC,UAAU,CAAC,EAAC,WAAW,EAAE,MAAM,EAAC,CAAC,CAAC;IACvD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,MAAM,EAAC;QAC3B,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,EAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC,CAAC;IAC5D,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAC;QACvC,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC;YACtB,WAAW,EAAE,MAAM;YACnB,UAAU;YACV,SAAS;YACT,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,kBAAkB,CAAC,EAAC,OAAO,EAAE,OAAO,EAAC;QACnC,OAAO,CACL,UAAU,OAAO,IAAI,OAAO,CAAC,OAAO,2BAA2B,CAAC,KAAK;YACrE,qBAAqB,OAAO,CAAC,cAAc,CAAC,KAAK,IAAI;YACrD,oBAAoB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,CAClE,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACH,uBAAuB,CAAC,cAAc,EAAE,WAAW;QACjD,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAM,CAC5C,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,EAC/D,EAAE,CACH,CAAC;QAEF,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;YAC7B,MAAM,IAAI,KAAK,CACb,WAAW,WAAW,kDAAkD;gBACtE,gCAAgC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAClE,CAAC;SACH;IACH,CAAC;CACF;AA5FD,gCA4FC;AAED;;;GAGG;AAEH;;;GAGG;AAEH;;;;GAIG;AAEH;;;;;;GAMG;AAEH;;GAEG;AAEH;;;;GAIG;AAEH;;;;;GAKG;AAEH;;;;;;GAMG"}
|
|
@@ -77,6 +77,10 @@ export type RunOptions = {
|
|
|
77
77
|
* - arguments to pass to the script
|
|
78
78
|
*/
|
|
79
79
|
extraArgs?: string[] | undefined;
|
|
80
|
+
/**
|
|
81
|
+
* - if true, will buffer the output of the script and return it
|
|
82
|
+
*/
|
|
83
|
+
bufferOutput?: boolean | undefined;
|
|
80
84
|
};
|
|
81
85
|
/**
|
|
82
86
|
* Return value of {@linkcode ExtensionCommand._run }
|
|
@@ -87,9 +91,9 @@ export type RunOutput = {
|
|
|
87
91
|
*/
|
|
88
92
|
error?: string | undefined;
|
|
89
93
|
/**
|
|
90
|
-
* - script output
|
|
94
|
+
* - script output if `bufferOutput` was `true` in {@linkcode RunOptions }
|
|
91
95
|
*/
|
|
92
|
-
output
|
|
96
|
+
output?: string[] | undefined;
|
|
93
97
|
};
|
|
94
98
|
/**
|
|
95
99
|
* Options for {@linkcode ExtensionCommand._update }.
|
|
@@ -369,17 +373,27 @@ export class ExtensionCommand<ExtType extends import("@appium/types").ExtensionT
|
|
|
369
373
|
*/
|
|
370
374
|
updateExtension(installSpec: string, version: string): Promise<void>;
|
|
371
375
|
/**
|
|
372
|
-
*
|
|
373
|
-
*
|
|
374
|
-
*
|
|
375
|
-
*
|
|
376
|
-
*
|
|
377
|
-
*
|
|
376
|
+
* Just wraps {@linkcode child_process.spawn} with some default options
|
|
377
|
+
*
|
|
378
|
+
* @param {string} cwd - CWD
|
|
379
|
+
* @param {string} script - Path to script
|
|
380
|
+
* @param {string[]} args - Extra args for script
|
|
381
|
+
* @param {import('child_process').SpawnOptions} opts - Options
|
|
382
|
+
* @returns {import('node:child_process').ChildProcess}
|
|
383
|
+
*/
|
|
384
|
+
_runUnbuffered(cwd: string, script: string, args?: string[], opts?: import('child_process').SpawnOptions): import('node:child_process').ChildProcess;
|
|
385
|
+
/**
|
|
386
|
+
* Runs a script cached inside the `scripts` field under `appium`
|
|
387
|
+
* inside of the extension's `package.json` file. Will throw
|
|
388
|
+
* an error if the driver/plugin does not contain a `scripts` field
|
|
389
|
+
* underneath the `appium` field in its `package.json`, if the
|
|
390
|
+
* `scripts` field is not a plain object, or if the `scriptName` is
|
|
391
|
+
* not found within `scripts` object.
|
|
378
392
|
*
|
|
379
393
|
* @param {RunOptions} opts
|
|
380
394
|
* @return {Promise<RunOutput>}
|
|
381
395
|
*/
|
|
382
|
-
_run({ installSpec, scriptName, extraArgs }: RunOptions): Promise<RunOutput>;
|
|
396
|
+
_run({ installSpec, scriptName, extraArgs, bufferOutput }: RunOptions): Promise<RunOutput>;
|
|
383
397
|
}
|
|
384
398
|
import { console } from "@appium/support";
|
|
385
399
|
//# sourceMappingURL=extension-command.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/extension-command.js"],"names":[],"mappings":";;;;;;;;
|
|
1
|
+
{"version":3,"file":"extension-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/extension-command.js"],"names":[],"mappings":"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"}
|
|
@@ -10,9 +10,10 @@ const lodash_1 = __importDefault(require("lodash"));
|
|
|
10
10
|
const path_1 = __importDefault(require("path"));
|
|
11
11
|
const support_1 = require("@appium/support");
|
|
12
12
|
const utils_1 = require("./utils");
|
|
13
|
-
const teen_process_1 = require("teen_process");
|
|
14
13
|
const extension_config_1 = require("../extension/extension-config");
|
|
14
|
+
const teen_process_1 = require("teen_process");
|
|
15
15
|
const package_changed_1 = require("../extension/package-changed");
|
|
16
|
+
const child_process_1 = require("child_process");
|
|
16
17
|
const UPDATE_ALL = 'installed';
|
|
17
18
|
class NotUpdatableError extends Error {
|
|
18
19
|
}
|
|
@@ -556,17 +557,33 @@ class ExtensionCommand {
|
|
|
556
557
|
await this.config.updateExtension(installSpec, extData);
|
|
557
558
|
}
|
|
558
559
|
/**
|
|
559
|
-
*
|
|
560
|
-
*
|
|
561
|
-
*
|
|
562
|
-
*
|
|
563
|
-
*
|
|
564
|
-
*
|
|
560
|
+
* Just wraps {@linkcode child_process.spawn} with some default options
|
|
561
|
+
*
|
|
562
|
+
* @param {string} cwd - CWD
|
|
563
|
+
* @param {string} script - Path to script
|
|
564
|
+
* @param {string[]} args - Extra args for script
|
|
565
|
+
* @param {import('child_process').SpawnOptions} opts - Options
|
|
566
|
+
* @returns {import('node:child_process').ChildProcess}
|
|
567
|
+
*/
|
|
568
|
+
_runUnbuffered(cwd, script, args = [], opts = {}) {
|
|
569
|
+
return (0, child_process_1.spawn)(process.execPath, [script, ...args], {
|
|
570
|
+
cwd,
|
|
571
|
+
stdio: 'inherit',
|
|
572
|
+
...opts,
|
|
573
|
+
});
|
|
574
|
+
}
|
|
575
|
+
/**
|
|
576
|
+
* Runs a script cached inside the `scripts` field under `appium`
|
|
577
|
+
* inside of the extension's `package.json` file. Will throw
|
|
578
|
+
* an error if the driver/plugin does not contain a `scripts` field
|
|
579
|
+
* underneath the `appium` field in its `package.json`, if the
|
|
580
|
+
* `scripts` field is not a plain object, or if the `scriptName` is
|
|
581
|
+
* not found within `scripts` object.
|
|
565
582
|
*
|
|
566
583
|
* @param {RunOptions} opts
|
|
567
584
|
* @return {Promise<RunOutput>}
|
|
568
585
|
*/
|
|
569
|
-
async _run({ installSpec, scriptName, extraArgs = [] }) {
|
|
586
|
+
async _run({ installSpec, scriptName, extraArgs = [], bufferOutput = false }) {
|
|
570
587
|
if (!this.config.isInstalled(installSpec)) {
|
|
571
588
|
throw this._createFatalError(`The ${this.type} "${installSpec}" is not installed`);
|
|
572
589
|
}
|
|
@@ -583,23 +600,50 @@ class ExtensionCommand {
|
|
|
583
600
|
if (!(scriptName in /** @type {Record<string,string>} */ (extScripts))) {
|
|
584
601
|
throw this._createFatalError(`The ${this.type} named '${installSpec}' does not support the script: '${scriptName}'`);
|
|
585
602
|
}
|
|
586
|
-
|
|
587
|
-
|
|
588
|
-
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
|
|
594
|
-
|
|
603
|
+
if (bufferOutput) {
|
|
604
|
+
const runner = new teen_process_1.SubProcess(process.execPath, [extScripts[scriptName], ...extraArgs], {
|
|
605
|
+
cwd: this.config.getInstallPath(installSpec),
|
|
606
|
+
});
|
|
607
|
+
const output = new utils_1.RingBuffer(50);
|
|
608
|
+
runner.on('stream-line', (line) => {
|
|
609
|
+
output.enqueue(line);
|
|
610
|
+
this.log.log(line);
|
|
611
|
+
});
|
|
612
|
+
await runner.start(0);
|
|
613
|
+
try {
|
|
614
|
+
await runner.join();
|
|
615
|
+
this.log.ok(`${scriptName} successfully ran`.green);
|
|
616
|
+
return { output: output.getBuff() };
|
|
617
|
+
}
|
|
618
|
+
catch (err) {
|
|
619
|
+
this.log.error(`Encountered an error when running '${scriptName}': ${err.message}`.red);
|
|
620
|
+
return { error: err.message, output: output.getBuff() };
|
|
621
|
+
}
|
|
622
|
+
}
|
|
595
623
|
try {
|
|
596
|
-
await
|
|
624
|
+
await new bluebird_1.default((resolve, reject) => {
|
|
625
|
+
this._runUnbuffered(this.config.getInstallPath(installSpec), extScripts[scriptName], extraArgs)
|
|
626
|
+
.on('error', (err) => {
|
|
627
|
+
// generally this is of the "I can't find the script" variety.
|
|
628
|
+
// this is a developer bug: the extension is pointing to a script that is not where the
|
|
629
|
+
// developer said it would be (in `appium.scripts` of the extension's `package.json`)
|
|
630
|
+
reject(err);
|
|
631
|
+
})
|
|
632
|
+
.on('close', (code) => {
|
|
633
|
+
if (code === 0) {
|
|
634
|
+
resolve();
|
|
635
|
+
}
|
|
636
|
+
else {
|
|
637
|
+
reject(new Error(`Script "${scriptName}" exited with code ${code}`));
|
|
638
|
+
}
|
|
639
|
+
});
|
|
640
|
+
});
|
|
597
641
|
this.log.ok(`${scriptName} successfully ran`.green);
|
|
598
|
-
return {
|
|
642
|
+
return {};
|
|
599
643
|
}
|
|
600
644
|
catch (err) {
|
|
601
645
|
this.log.error(`Encountered an error when running '${scriptName}': ${err.message}`.red);
|
|
602
|
-
return { error: err.message
|
|
646
|
+
return { error: err.message };
|
|
603
647
|
}
|
|
604
648
|
}
|
|
605
649
|
}
|
|
@@ -669,13 +713,14 @@ exports.default = ExtensionCommand;
|
|
|
669
713
|
* @property {string} installSpec - name of the extension to run a script from
|
|
670
714
|
* @property {string} scriptName - name of the script to run
|
|
671
715
|
* @property {string[]} [extraArgs] - arguments to pass to the script
|
|
716
|
+
* @property {boolean} [bufferOutput] - if true, will buffer the output of the script and return it
|
|
672
717
|
*/
|
|
673
718
|
/**
|
|
674
719
|
* Return value of {@linkcode ExtensionCommand._run}
|
|
675
720
|
*
|
|
676
721
|
* @typedef RunOutput
|
|
677
722
|
* @property {string} [error] - error message if script ran unsuccessfully, otherwise undefined
|
|
678
|
-
* @property {string[]} output - script output
|
|
723
|
+
* @property {string[]} [output] - script output if `bufferOutput` was `true` in {@linkcode RunOptions}
|
|
679
724
|
*/
|
|
680
725
|
/**
|
|
681
726
|
* Options for {@linkcode ExtensionCommand._update}.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension-command.js","sourceRoot":"","sources":["../../../lib/cli/extension-command.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"extension-command.js","sourceRoot":"","sources":["../../../lib/cli/extension-command.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/plugin-command.js"],"names":[],"mappings":"AAMA;;GAEG;AACH;IACE;;;OAGG;IACH,8BAFW,OAAO,qBAAqB,EAAE,uBAAuB,CAAC,UAAU,CAAC,EAK3E;IAED;;;;;OAKG;IACH,8CAHW,iBAAiB,GACf,QAAQ,UAAU,UAAU,CAAC,CAAC,CAQ1C;IAED;;;;;OAKG;IACH,sBAHW,mBAAmB,GACjB,QAAQ,UAAU,UAAU,CAAC,CAAC,CAI1C;IAED;;;;;OAKG;IACH,2BAHW,gBAAgB,GACd,QAAQ,OAAO,qBAAqB,EAAE,qBAAqB,CAAC,CAIxE;IAED;;;;OAIG;IACH,uCAHW,gBAAgB,GACd,QAAQ,OAAO,qBAAqB,EAAE,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"plugin-command.d.ts","sourceRoot":"","sources":["../../../lib/cli/plugin-command.js"],"names":[],"mappings":"AAMA;;GAEG;AACH;IACE;;;OAGG;IACH,8BAFW,OAAO,qBAAqB,EAAE,uBAAuB,CAAC,UAAU,CAAC,EAK3E;IAED;;;;;OAKG;IACH,8CAHW,iBAAiB,GACf,QAAQ,UAAU,UAAU,CAAC,CAAC,CAQ1C;IAED;;;;;OAKG;IACH,sBAHW,mBAAmB,GACjB,QAAQ,UAAU,UAAU,CAAC,CAAC,CAI1C;IAED;;;;;OAKG;IACH,2BAHW,gBAAgB,GACd,QAAQ,OAAO,qBAAqB,EAAE,qBAAqB,CAAC,CAIxE;IAED;;;;OAIG;IACH,uCAHW,gBAAgB,GACd,QAAQ,OAAO,qBAAqB,EAAE,SAAS,CAAC,CAS5D;CAkCF;4BAGY,OAAO,eAAe,EAAE,aAAa;yBACrC,OAAO,eAAe,EAAE,UAAU;+EAKlC,OAAO,cAAc,EAAE,SAAS,CAAC,OAAO,CAAC;;;;;;;;YAMxC,MAAM;;;;iBACN,WAAW;;;;;;0BAKZ,OAAO,cAAc,EAAE,WAAW;;;;;;;;YAMjC,MAAM;;;;;;;;;YAMN,MAAM;;;;YACN,OAAO;;;;;;;;;YAMP,MAAM;;;;gBACN,MAAM"}
|
|
@@ -56,7 +56,12 @@ class PluginCommand extends extension_command_1.default {
|
|
|
56
56
|
* @returns {Promise<import('./extension-command').RunOutput>}
|
|
57
57
|
*/
|
|
58
58
|
async run({ plugin, scriptName, extraArgs }) {
|
|
59
|
-
return await super._run({
|
|
59
|
+
return await super._run({
|
|
60
|
+
installSpec: plugin,
|
|
61
|
+
scriptName,
|
|
62
|
+
extraArgs,
|
|
63
|
+
bufferOutput: this.isJsonOutput,
|
|
64
|
+
});
|
|
60
65
|
}
|
|
61
66
|
/**
|
|
62
67
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-command.js","sourceRoot":"","sources":["../../../lib/cli/plugin-command.js"],"names":[],"mappings":";;;;;AAAA,oDAAuB;AACvB,4EAAmD;AACnD,4CAA2C;AAE3C,MAAM,iBAAiB,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;AAEtD;;GAEG;AACH,MAAqB,aAAc,SAAQ,2BAAgB;IACzD;;;OAGG;IACH,YAAY,EAAC,MAAM,EAAE,IAAI,EAAC;QACxB,KAAK,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,yBAAa,CAAC;IACvC,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAO,CAAC,EAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAC;QAC9C,OAAO,MAAM,KAAK,CAAC,QAAQ,CAAC;YAC1B,WAAW,EAAE,MAAM;YACnB,WAAW;YACX,WAAW;SACZ,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,SAAS,CAAC,EAAC,MAAM,EAAC;QACtB,OAAO,MAAM,KAAK,CAAC,UAAU,CAAC,EAAC,WAAW,EAAE,MAAM,EAAC,CAAC,CAAC;IACvD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,MAAM,EAAC;QAC3B,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,EAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC,CAAC;IAC5D,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAC;QACvC,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"plugin-command.js","sourceRoot":"","sources":["../../../lib/cli/plugin-command.js"],"names":[],"mappings":";;;;;AAAA,oDAAuB;AACvB,4EAAmD;AACnD,4CAA2C;AAE3C,MAAM,iBAAiB,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;AAEtD;;GAEG;AACH,MAAqB,aAAc,SAAQ,2BAAgB;IACzD;;;OAGG;IACH,YAAY,EAAC,MAAM,EAAE,IAAI,EAAC;QACxB,KAAK,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,yBAAa,CAAC;IACvC,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAO,CAAC,EAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAC;QAC9C,OAAO,MAAM,KAAK,CAAC,QAAQ,CAAC;YAC1B,WAAW,EAAE,MAAM;YACnB,WAAW;YACX,WAAW;SACZ,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,SAAS,CAAC,EAAC,MAAM,EAAC;QACtB,OAAO,MAAM,KAAK,CAAC,UAAU,CAAC,EAAC,WAAW,EAAE,MAAM,EAAC,CAAC,CAAC;IACvD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,MAAM,EAAC;QAC3B,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,EAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC,CAAC;IAC5D,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAC;QACvC,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC;YACtB,WAAW,EAAE,MAAM;YACnB,UAAU;YACV,SAAS;YACT,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,kBAAkB,CAAC,EAAC,OAAO,EAAE,OAAO,EAAC;QACnC,OAAO,UAAU,OAAO,IAAI,OAAO,CAAC,OAAO,yBAAyB,CAAC,KAAK,CAAC;IAC7E,CAAC;IAED;;;;;;;;;OASG;IACH,uBAAuB,CAAC,cAAc,EAAE,WAAW;QACjD,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAM,CAC5C,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,EAC/D,EAAE,CACH,CAAC;QAEF,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;YAC7B,MAAM,IAAI,KAAK,CACb,qBAAqB,WAAW,kDAAkD;gBAChF,gCAAgC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAClE,CAAC;SACH;IACH,CAAC;CACF;AA1FD,gCA0FC;AAED;;;GAGG;AAEH;;;GAGG;AAEH;;;;;;GAMG;AAEH;;GAEG;AAEH;;;;GAIG;AAEH;;;;;GAKG;AAEH;;;;;;GAMG"}
|
package/build/lib/config.d.ts
CHANGED
|
@@ -28,7 +28,7 @@ export function getNonDefaultServerArgs(parsedArgs: Args): Args;
|
|
|
28
28
|
* @returns {Promise<string?>}
|
|
29
29
|
*/
|
|
30
30
|
export function getGitRev(useGithubApiFallback?: boolean | undefined): Promise<string | null>;
|
|
31
|
-
export const APPIUM_VER:
|
|
31
|
+
export const APPIUM_VER: string;
|
|
32
32
|
/**
|
|
33
33
|
* @param {boolean} [useGithubApiFallback]
|
|
34
34
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../lib/config.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../lib/config.js"],"names":[],"mappings":"AAuJA,4CAOC;yBAyLY,OAAO,cAAc,EAAE,UAAU;mBACjC,OAAO,cAAc,EAAE,IAAI;;AArNxC;;;;;;GAMG;AACH,gCAFa,OAAO,cAAc,EAAE,SAAS,CAI5C;AAED,oCAOC;AAwBD,+CAGC;AAhBD,6CAWC;AA6ID;;GAEG;AACH,uCAFW,MAAM,iBAWhB;AAlJD;;;;GAIG;AACH,oDAHW,IAAI,GACF,IAAI,CAmFhB;AAtMD;;;GAGG;AACH,uEAFa,QAAQ,MAAM,QAAE,CA6B5B;AAtFD,gCAAsC;AA6BtC;;GAEG;AACH,2FAUC;AAmOD;;;;;;;;;;GAUG;AACH,0DALW,QAAQ,UAAU,CAAC,gBACnB,OAAO,eAAe,EAAE,oBAAoB,YAC5C,QAAQ,UAAU,CAAC,cACnB,UAAU,QAqBpB;AAgBD,6BAAuC"}
|
package/build/lib/config.js
CHANGED
|
@@ -15,8 +15,9 @@ const schema_1 = require("./schema/schema");
|
|
|
15
15
|
const npmPackage = support_1.fs.readPackageJsonFrom(__dirname);
|
|
16
16
|
const APPIUM_VER = npmPackage.version;
|
|
17
17
|
exports.APPIUM_VER = APPIUM_VER;
|
|
18
|
-
const
|
|
19
|
-
const
|
|
18
|
+
const ENGINES = /** @type {Record<string,string>} */ (npmPackage.engines);
|
|
19
|
+
const MIN_NODE_VERSION = ENGINES.node;
|
|
20
|
+
const MIN_NPM_VERSION = ENGINES.npm;
|
|
20
21
|
const GIT_META_ROOT = '.git';
|
|
21
22
|
const GIT_BINARY = `git${support_1.system.isWindows() ? '.exe' : ''}`;
|
|
22
23
|
const GITHUB_API = 'https://api.github.com/repos/appium/appium';
|
package/build/lib/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../lib/config.js"],"names":[],"mappings":";;;;;;AAAA,+BAA+B;AAC/B,oDAAuB;AACvB,6CAA2C;AAC3C,kDAA0B;AAC1B,+CAAkC;AAClC,oDAA4B;AAC5B,sDAA6B;AAC7B,4CAAqE;AAErE,MAAM,UAAU,GAAG,YAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;AAErD,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../lib/config.js"],"names":[],"mappings":"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"}
|
package/lib/appium.js
CHANGED
|
@@ -289,7 +289,7 @@ class AppiumDriver extends DriverCore {
|
|
|
289
289
|
*/
|
|
290
290
|
let otherPendingDriversData = [];
|
|
291
291
|
|
|
292
|
-
const driverInstance = new InnerDriver(this.args, true);
|
|
292
|
+
const driverInstance = /** @type {ExternalDriver} */ (new InnerDriver(this.args, true));
|
|
293
293
|
|
|
294
294
|
// We want to assign security values directly on the driver. The driver
|
|
295
295
|
// should not read security values from `this.opts` because those values
|
|
@@ -58,7 +58,12 @@ export default class DriverCommand extends ExtensionCommand {
|
|
|
58
58
|
* @return {Promise<import('./extension-command').RunOutput>}
|
|
59
59
|
*/
|
|
60
60
|
async run({driver, scriptName, extraArgs}) {
|
|
61
|
-
return await super._run({
|
|
61
|
+
return await super._run({
|
|
62
|
+
installSpec: driver,
|
|
63
|
+
scriptName,
|
|
64
|
+
extraArgs,
|
|
65
|
+
bufferOutput: this.isJsonOutput,
|
|
66
|
+
});
|
|
62
67
|
}
|
|
63
68
|
|
|
64
69
|
/**
|
|
@@ -4,14 +4,15 @@ import _ from 'lodash';
|
|
|
4
4
|
import path from 'path';
|
|
5
5
|
import {npm, util, env, console} from '@appium/support';
|
|
6
6
|
import {spinWith, RingBuffer} from './utils';
|
|
7
|
-
import {SubProcess} from 'teen_process';
|
|
8
7
|
import {
|
|
9
8
|
INSTALL_TYPE_NPM,
|
|
10
9
|
INSTALL_TYPE_GIT,
|
|
11
10
|
INSTALL_TYPE_GITHUB,
|
|
12
11
|
INSTALL_TYPE_LOCAL,
|
|
13
12
|
} from '../extension/extension-config';
|
|
13
|
+
import {SubProcess} from 'teen_process';
|
|
14
14
|
import {packageDidChange} from '../extension/package-changed';
|
|
15
|
+
import {spawn} from 'child_process';
|
|
15
16
|
|
|
16
17
|
const UPDATE_ALL = 'installed';
|
|
17
18
|
|
|
@@ -660,17 +661,34 @@ class ExtensionCommand {
|
|
|
660
661
|
}
|
|
661
662
|
|
|
662
663
|
/**
|
|
663
|
-
*
|
|
664
|
-
*
|
|
665
|
-
*
|
|
666
|
-
*
|
|
667
|
-
*
|
|
668
|
-
*
|
|
664
|
+
* Just wraps {@linkcode child_process.spawn} with some default options
|
|
665
|
+
*
|
|
666
|
+
* @param {string} cwd - CWD
|
|
667
|
+
* @param {string} script - Path to script
|
|
668
|
+
* @param {string[]} args - Extra args for script
|
|
669
|
+
* @param {import('child_process').SpawnOptions} opts - Options
|
|
670
|
+
* @returns {import('node:child_process').ChildProcess}
|
|
671
|
+
*/
|
|
672
|
+
_runUnbuffered(cwd, script, args = [], opts = {}) {
|
|
673
|
+
return spawn(process.execPath, [script, ...args], {
|
|
674
|
+
cwd,
|
|
675
|
+
stdio: 'inherit',
|
|
676
|
+
...opts,
|
|
677
|
+
});
|
|
678
|
+
}
|
|
679
|
+
|
|
680
|
+
/**
|
|
681
|
+
* Runs a script cached inside the `scripts` field under `appium`
|
|
682
|
+
* inside of the extension's `package.json` file. Will throw
|
|
683
|
+
* an error if the driver/plugin does not contain a `scripts` field
|
|
684
|
+
* underneath the `appium` field in its `package.json`, if the
|
|
685
|
+
* `scripts` field is not a plain object, or if the `scriptName` is
|
|
686
|
+
* not found within `scripts` object.
|
|
669
687
|
*
|
|
670
688
|
* @param {RunOptions} opts
|
|
671
689
|
* @return {Promise<RunOutput>}
|
|
672
690
|
*/
|
|
673
|
-
async _run({installSpec, scriptName, extraArgs = []}) {
|
|
691
|
+
async _run({installSpec, scriptName, extraArgs = [], bufferOutput = false}) {
|
|
674
692
|
if (!this.config.isInstalled(installSpec)) {
|
|
675
693
|
throw this._createFatalError(`The ${this.type} "${installSpec}" is not installed`);
|
|
676
694
|
}
|
|
@@ -699,26 +717,56 @@ class ExtensionCommand {
|
|
|
699
717
|
);
|
|
700
718
|
}
|
|
701
719
|
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
720
|
+
if (bufferOutput) {
|
|
721
|
+
const runner = new SubProcess(process.execPath, [extScripts[scriptName], ...extraArgs], {
|
|
722
|
+
cwd: this.config.getInstallPath(installSpec),
|
|
723
|
+
});
|
|
705
724
|
|
|
706
|
-
|
|
725
|
+
const output = new RingBuffer(50);
|
|
707
726
|
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
|
|
711
|
-
|
|
727
|
+
runner.on('stream-line', (line) => {
|
|
728
|
+
output.enqueue(line);
|
|
729
|
+
this.log.log(line);
|
|
730
|
+
});
|
|
712
731
|
|
|
713
|
-
|
|
732
|
+
await runner.start(0);
|
|
733
|
+
|
|
734
|
+
try {
|
|
735
|
+
await runner.join();
|
|
736
|
+
this.log.ok(`${scriptName} successfully ran`.green);
|
|
737
|
+
return {output: output.getBuff()};
|
|
738
|
+
} catch (err) {
|
|
739
|
+
this.log.error(`Encountered an error when running '${scriptName}': ${err.message}`.red);
|
|
740
|
+
return {error: err.message, output: output.getBuff()};
|
|
741
|
+
}
|
|
742
|
+
}
|
|
714
743
|
|
|
715
744
|
try {
|
|
716
|
-
await
|
|
745
|
+
await new B((resolve, reject) => {
|
|
746
|
+
this._runUnbuffered(
|
|
747
|
+
this.config.getInstallPath(installSpec),
|
|
748
|
+
extScripts[scriptName],
|
|
749
|
+
extraArgs
|
|
750
|
+
)
|
|
751
|
+
.on('error', (err) => {
|
|
752
|
+
// generally this is of the "I can't find the script" variety.
|
|
753
|
+
// this is a developer bug: the extension is pointing to a script that is not where the
|
|
754
|
+
// developer said it would be (in `appium.scripts` of the extension's `package.json`)
|
|
755
|
+
reject(err);
|
|
756
|
+
})
|
|
757
|
+
.on('close', (code) => {
|
|
758
|
+
if (code === 0) {
|
|
759
|
+
resolve();
|
|
760
|
+
} else {
|
|
761
|
+
reject(new Error(`Script "${scriptName}" exited with code ${code}`));
|
|
762
|
+
}
|
|
763
|
+
});
|
|
764
|
+
});
|
|
717
765
|
this.log.ok(`${scriptName} successfully ran`.green);
|
|
718
|
-
return {
|
|
766
|
+
return {};
|
|
719
767
|
} catch (err) {
|
|
720
768
|
this.log.error(`Encountered an error when running '${scriptName}': ${err.message}`.red);
|
|
721
|
-
return {error: err.message
|
|
769
|
+
return {error: err.message};
|
|
722
770
|
}
|
|
723
771
|
}
|
|
724
772
|
}
|
|
@@ -802,6 +850,7 @@ export {ExtensionCommand};
|
|
|
802
850
|
* @property {string} installSpec - name of the extension to run a script from
|
|
803
851
|
* @property {string} scriptName - name of the script to run
|
|
804
852
|
* @property {string[]} [extraArgs] - arguments to pass to the script
|
|
853
|
+
* @property {boolean} [bufferOutput] - if true, will buffer the output of the script and return it
|
|
805
854
|
*/
|
|
806
855
|
|
|
807
856
|
/**
|
|
@@ -809,7 +858,7 @@ export {ExtensionCommand};
|
|
|
809
858
|
*
|
|
810
859
|
* @typedef RunOutput
|
|
811
860
|
* @property {string} [error] - error message if script ran unsuccessfully, otherwise undefined
|
|
812
|
-
* @property {string[]} output - script output
|
|
861
|
+
* @property {string[]} [output] - script output if `bufferOutput` was `true` in {@linkcode RunOptions}
|
|
813
862
|
*/
|
|
814
863
|
|
|
815
864
|
/**
|
|
@@ -57,7 +57,12 @@ export default class PluginCommand extends ExtensionCommand {
|
|
|
57
57
|
* @returns {Promise<import('./extension-command').RunOutput>}
|
|
58
58
|
*/
|
|
59
59
|
async run({plugin, scriptName, extraArgs}) {
|
|
60
|
-
return await super._run({
|
|
60
|
+
return await super._run({
|
|
61
|
+
installSpec: plugin,
|
|
62
|
+
scriptName,
|
|
63
|
+
extraArgs,
|
|
64
|
+
bufferOutput: this.isJsonOutput,
|
|
65
|
+
});
|
|
61
66
|
}
|
|
62
67
|
|
|
63
68
|
/**
|
package/lib/config.js
CHANGED
|
@@ -10,8 +10,9 @@ import {getDefaultsForSchema, getAllArgSpecs} from './schema/schema';
|
|
|
10
10
|
const npmPackage = fs.readPackageJsonFrom(__dirname);
|
|
11
11
|
|
|
12
12
|
const APPIUM_VER = npmPackage.version;
|
|
13
|
-
const
|
|
14
|
-
const
|
|
13
|
+
const ENGINES = /** @type {Record<string,string>} */ (npmPackage.engines);
|
|
14
|
+
const MIN_NODE_VERSION = ENGINES.node;
|
|
15
|
+
const MIN_NPM_VERSION = ENGINES.npm;
|
|
15
16
|
|
|
16
17
|
const GIT_META_ROOT = '.git';
|
|
17
18
|
const GIT_BINARY = `git${system.isWindows() ? '.exe' : ''}`;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "appium",
|
|
3
|
-
"version": "2.0.0-beta.
|
|
3
|
+
"version": "2.0.0-beta.57",
|
|
4
4
|
"description": "Automation for Apps.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"automation",
|
|
@@ -59,12 +59,12 @@
|
|
|
59
59
|
"test:unit": "mocha \"./test/unit/**/*.spec.js\""
|
|
60
60
|
},
|
|
61
61
|
"dependencies": {
|
|
62
|
-
"@appium/base-driver": "^9.3.
|
|
63
|
-
"@appium/base-plugin": "^2.2.
|
|
64
|
-
"@appium/docutils": "^0.
|
|
65
|
-
"@appium/schema": "^0.2.
|
|
66
|
-
"@appium/support": "^3.1.
|
|
67
|
-
"@appium/types": "^0.10.
|
|
62
|
+
"@appium/base-driver": "^9.3.3",
|
|
63
|
+
"@appium/base-plugin": "^2.2.3",
|
|
64
|
+
"@appium/docutils": "^0.3.0",
|
|
65
|
+
"@appium/schema": "^0.2.6",
|
|
66
|
+
"@appium/support": "^3.1.7",
|
|
67
|
+
"@appium/types": "^0.10.1",
|
|
68
68
|
"@sidvind/better-ajv-errors": "2.1.0",
|
|
69
69
|
"@types/argparse": "2.0.10",
|
|
70
70
|
"@types/bluebird": "3.5.38",
|
|
@@ -82,7 +82,7 @@
|
|
|
82
82
|
"cross-env": "7.0.3",
|
|
83
83
|
"find-up": "5.0.0",
|
|
84
84
|
"glob": "8.1.0",
|
|
85
|
-
"lilconfig": "2.0
|
|
85
|
+
"lilconfig": "2.1.0",
|
|
86
86
|
"lodash": "4.17.21",
|
|
87
87
|
"longjohn": "0.2.12",
|
|
88
88
|
"npmlog": "7.0.1",
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
"semver": "7.3.8",
|
|
93
93
|
"source-map-support": "0.5.21",
|
|
94
94
|
"teen_process": "2.0.2",
|
|
95
|
-
"type-fest": "3.6.
|
|
95
|
+
"type-fest": "3.6.1",
|
|
96
96
|
"winston": "3.8.2",
|
|
97
97
|
"wrap-ansi": "7.0.0",
|
|
98
98
|
"yaml": "2.2.1"
|
|
@@ -105,7 +105,7 @@
|
|
|
105
105
|
"access": "public",
|
|
106
106
|
"tag": "next"
|
|
107
107
|
},
|
|
108
|
-
"gitHead": "
|
|
108
|
+
"gitHead": "872b924a97c13142bdb8bf4218a4db324f309ce4",
|
|
109
109
|
"typedoc": {
|
|
110
110
|
"entryPoint": "./lib/main.js"
|
|
111
111
|
}
|
|
@@ -22,6 +22,8 @@
|
|
|
22
22
|
*/
|
|
23
23
|
|
|
24
24
|
const B = require('bluebird');
|
|
25
|
+
const path = require('node:path');
|
|
26
|
+
const {realpath} = require('node:fs/promises');
|
|
25
27
|
|
|
26
28
|
B.config({
|
|
27
29
|
cancellation: true,
|
|
@@ -55,11 +57,32 @@ function log(message) {
|
|
|
55
57
|
console.error(wrap(`[Appium] ${message}`));
|
|
56
58
|
}
|
|
57
59
|
|
|
60
|
+
/**
|
|
61
|
+
* This is a naive attempt at determining whether or not we are in a dev environment; in other
|
|
62
|
+
* words, is `postinstall` being run from within the `appium` monorepo?
|
|
63
|
+
*
|
|
64
|
+
* When we're in the monorepo, `npm_config_local_prefix` will be set to the root of the monorepo root
|
|
65
|
+
* dir when running this lifecycle script from an `npm install` in the monorepo root.
|
|
66
|
+
*
|
|
67
|
+
* `realpath` is necessary due to macOS omitting `/private` from paths
|
|
68
|
+
*/
|
|
69
|
+
async function isDevEnvironment() {
|
|
70
|
+
return (
|
|
71
|
+
process.env.npm_config_local_prefix &&
|
|
72
|
+
path.join(process.env.npm_config_local_prefix, 'packages', 'appium') ===
|
|
73
|
+
(await realpath(path.join(__dirname, '..')))
|
|
74
|
+
);
|
|
75
|
+
}
|
|
76
|
+
|
|
58
77
|
/**
|
|
59
78
|
* Setup / check environment if we should do anything here
|
|
60
79
|
* @returns {Promise<boolean>} `true` if Appium is built and ready to go
|
|
61
80
|
*/
|
|
62
81
|
async function init() {
|
|
82
|
+
if (await isDevEnvironment()) {
|
|
83
|
+
log('Dev environment likely; skipping automatic installation of extensions');
|
|
84
|
+
return false;
|
|
85
|
+
}
|
|
63
86
|
try {
|
|
64
87
|
({env, util, logger} = require('@appium/support'));
|
|
65
88
|
// @ts-ignore
|