appium-safari-driver 2.2.1 → 3.0.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.
- package/.eslintrc +1 -1
- package/README.md +7 -5
- package/build/index.js +1 -1
- package/build/lib/commands/find.js +3 -3
- package/build/lib/commands/record-screen.js +14 -14
- package/build/lib/driver.js +3 -3
- package/build/lib/logger.js +3 -3
- package/build/lib/safari.js +10 -10
- package/build/lib/server.js +4 -4
- package/build/test/functional/desktop-driver-e2e-specs.js +11 -8
- package/build/test/functional/mobile-driver-e2e-specs.js +11 -8
- package/build/test/utils.js +1 -1
- package/gulpfile.js +3 -2
- package/lib/commands/find.js +1 -1
- package/lib/commands/record-screen.js +1 -1
- package/lib/driver.js +1 -1
- package/lib/logger.js +1 -1
- package/lib/safari.js +2 -2
- package/lib/server.js +3 -1
- package/package.json +15 -8
- package/test/functional/desktop-driver-e2e-specs.js +10 -7
- package/test/functional/mobile-driver-e2e-specs.js +10 -7
package/.eslintrc
CHANGED
package/README.md
CHANGED
|
@@ -1,25 +1,27 @@
|
|
|
1
|
-
|
|
1
|
+
Appium Safari Driver
|
|
2
2
|
====
|
|
3
3
|
|
|
4
|
-
This is Appium driver for automating Safari on [
|
|
4
|
+
This is Appium driver for automating Safari on [macOS](https://developer.apple.com/documentation/webkit/testing_with_webdriver_in_safari?language=objc) and iOS [since version 13](https://webkit.org/blog/9395/webdriver-is-coming-to-safari-in-ios-13/).
|
|
5
5
|
The driver only supports Safari automation using [W3C WebDriver protocol](https://www.w3.org/TR/webdriver/).
|
|
6
6
|
Under the hood this driver is a wrapper/proxy over Apple's `safaridriver` binary. Check the output of `man safaridriver` command to get more details on the supported features and possible pitfalls.
|
|
7
7
|
|
|
8
8
|
## Usage
|
|
9
9
|
|
|
10
|
-
It is mandatory to run the `safaridriver --enable` command from the
|
|
10
|
+
It is mandatory to run the `safaridriver --enable` command from the macOS terminal and provide your administrator password before any automated session will be executed.
|
|
11
11
|
In order to automate Safari on real devices it is also necessary to enable Remote Automation switch in `Settings → Safari → Advanced → Remote Automation` for these particular devices.
|
|
12
12
|
|
|
13
13
|
Then you need to decide where the automated test is going to be executed. Safari driver supports the following target platforms:
|
|
14
|
-
-
|
|
14
|
+
- macOS (High Sierra or newer)
|
|
15
15
|
- iOS Simulator (iOS version 13 or newer)
|
|
16
16
|
- iOS Real Device (iOS version 13 or newer)
|
|
17
17
|
|
|
18
|
+
Since the version 3.0.0 this driver is only compatible with Appium 2. Use the `appium driver install safari` CLI command to add it to your server dist.
|
|
19
|
+
|
|
18
20
|
Safari driver allows to define multiple criterions for platform selection and also to fine-tune your automation session properties. This could be done via the following session capabilities:
|
|
19
21
|
|
|
20
22
|
Capability Name | Description
|
|
21
23
|
--- | ---
|
|
22
|
-
platformName | safaridriver binary can only create WebDriver sessions for desktop or mobile Safari and can only run on
|
|
24
|
+
platformName | safaridriver binary can only create WebDriver sessions for desktop or mobile Safari and can only run on macOS. Value of platformName could equal to 'Mac' or 'iOS' in order to start Safari driver session for the corresponding platform. Values of platformName are compared case-insensitively.
|
|
23
25
|
automationName | Value of automationName must equal to 'Safari' in order to start Safari driver session. Values of automationName are compared case-insensitively.
|
|
24
26
|
browserName | safaridriver can only create WebDriver sessions for Safari. Any value passed to this capability will be changed to 'Safari'.
|
|
25
27
|
browserVersion | safaridriver will only create a session using hosts whose Safari version matches the value of browserVersion. Browser version numbers are prefix-matched. For example, if the value of browserVersion is '12', this will allow hosts with a Safari version of '12.0.1' or '12.1'.
|
package/build/index.js
CHANGED
|
@@ -11,13 +11,13 @@ Object.defineProperty(exports, "SafariDriver", {
|
|
|
11
11
|
return _driver.default;
|
|
12
12
|
}
|
|
13
13
|
});
|
|
14
|
+
exports.default = void 0;
|
|
14
15
|
Object.defineProperty(exports, "startServer", {
|
|
15
16
|
enumerable: true,
|
|
16
17
|
get: function () {
|
|
17
18
|
return _server.startServer;
|
|
18
19
|
}
|
|
19
20
|
});
|
|
20
|
-
exports.default = void 0;
|
|
21
21
|
|
|
22
22
|
require("source-map-support/register");
|
|
23
23
|
|
|
@@ -7,13 +7,13 @@ exports.default = exports.commands = void 0;
|
|
|
7
7
|
|
|
8
8
|
require("source-map-support/register");
|
|
9
9
|
|
|
10
|
-
var
|
|
10
|
+
var _support = require("@appium/support");
|
|
11
11
|
|
|
12
12
|
const commands = {};
|
|
13
13
|
exports.commands = commands;
|
|
14
14
|
|
|
15
15
|
commands.findElOrEls = async function findElOrEls(strategy, selector, mult, context) {
|
|
16
|
-
context =
|
|
16
|
+
context = _support.util.unwrapElement(context);
|
|
17
17
|
const endpoint = `/element${context ? `/${context}/element` : ''}${mult ? 's' : ''}`;
|
|
18
18
|
return await this.safari.proxy.command(endpoint, 'POST', {
|
|
19
19
|
using: strategy,
|
|
@@ -25,4 +25,4 @@ var _default = commands;
|
|
|
25
25
|
exports.default = _default;require('source-map-support').install();
|
|
26
26
|
|
|
27
27
|
|
|
28
|
-
//# sourceMappingURL=data:application/json;charset=utf8;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9jb21tYW5kcy9maW5kLmpzIl0sIm5hbWVzIjpbImNvbW1hbmRzIiwiZmluZEVsT3JFbHMiLCJzdHJhdGVneSIsInNlbGVjdG9yIiwibXVsdCIsImNvbnRleHQiLCJ1dGlsIiwidW53cmFwRWxlbWVudCIsImVuZHBvaW50Iiwic2FmYXJpIiwicHJveHkiLCJjb21tYW5kIiwidXNpbmciLCJ2YWx1ZSJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUE7O0FBR0EsTUFBTUEsUUFBUSxHQUFHLEVBQWpCOzs7QUFHQUEsUUFBUSxDQUFDQyxXQUFULEdBQXVCLGVBQWVBLFdBQWYsQ0FBNEJDLFFBQTVCLEVBQXNDQyxRQUF0QyxFQUFnREMsSUFBaEQsRUFBc0RDLE9BQXRELEVBQStEO0FBQ3BGQSxFQUFBQSxPQUFPLEdBQUdDLGNBQUtDLGFBQUwsQ0FBbUJGLE9BQW5CLENBQVY7QUFDQSxRQUFNRyxRQUFRLEdBQUksV0FBVUgsT0FBTyxHQUFJLElBQUdBLE9BQVEsVUFBZixHQUEyQixFQUFHLEdBQUVELElBQUksR0FBRyxHQUFILEdBQVMsRUFBRyxFQUFuRjtBQUVBLFNBQU8sTUFBTSxLQUFLSyxNQUFMLENBQVlDLEtBQVosQ0FBa0JDLE9BQWxCLENBQTBCSCxRQUExQixFQUFvQyxNQUFwQyxFQUE0QztBQUN2REksSUFBQUEsS0FBSyxFQUFFVixRQURnRDtBQUV2RFcsSUFBQUEsS0FBSyxFQUFFVjtBQUZnRCxHQUE1QyxDQUFiO0FBSUQsQ0FSRDs7ZUFZZUgsUSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHV0aWwgfSBmcm9tICdAYXBwaXVtL3N1cHBvcnQnO1xuXG5cbmNvbnN0IGNvbW1hbmRzID0ge307XG5cbi8vIFRoaXMgaXMgbmVlZGVkIHRvIG1ha2UgbG9va3VwIGJ5IGltYWdlIHdvcmtpbmdcbmNvbW1hbmRzLmZpbmRFbE9yRWxzID0gYXN5bmMgZnVuY3Rpb24gZmluZEVsT3JFbHMgKHN0cmF0ZWd5LCBzZWxlY3RvciwgbXVsdCwgY29udGV4dCkge1xuICBjb250ZXh0ID0gdXRpbC51bndyYXBFbGVtZW50KGNvbnRleHQpO1xuICBjb25zdCBlbmRwb2ludCA9IGAvZWxlbWVudCR7Y29udGV4dCA/IGAvJHtjb250ZXh0fS9lbGVtZW50YCA6ICcnfSR7bXVsdCA/ICdzJyA6ICcnfWA7XG5cbiAgcmV0dXJuIGF3YWl0IHRoaXMuc2FmYXJpLnByb3h5LmNvbW1hbmQoZW5kcG9pbnQsICdQT1NUJywge1xuICAgIHVzaW5nOiBzdHJhdGVneSxcbiAgICB2YWx1ZTogc2VsZWN0b3IsXG4gIH0pO1xufTtcblxuXG5leHBvcnQgeyBjb21tYW5kcyB9O1xuZXhwb3J0IGRlZmF1bHQgY29tbWFuZHM7XG4iXSwiZmlsZSI6ImxpYi9jb21tYW5kcy9maW5kLmpzIiwic291cmNlUm9vdCI6Ii4uLy4uLy4uIn0=
|
|
@@ -11,7 +11,7 @@ require("source-map-support/register");
|
|
|
11
11
|
|
|
12
12
|
var _lodash = _interopRequireDefault(require("lodash"));
|
|
13
13
|
|
|
14
|
-
var
|
|
14
|
+
var _support = require("@appium/support");
|
|
15
15
|
|
|
16
16
|
var _asyncbox = require("asyncbox");
|
|
17
17
|
|
|
@@ -30,11 +30,11 @@ async function uploadRecordedMedia(localFile, remotePath = null, uploadOptions =
|
|
|
30
30
|
if (_lodash.default.isEmpty(remotePath)) {
|
|
31
31
|
const {
|
|
32
32
|
size
|
|
33
|
-
} = await
|
|
33
|
+
} = await _support.fs.stat(localFile);
|
|
34
34
|
|
|
35
|
-
_logger.default.debug(`The size of the resulting screen recording is ${
|
|
35
|
+
_logger.default.debug(`The size of the resulting screen recording is ${_support.util.toReadableSizeString(size)}`);
|
|
36
36
|
|
|
37
|
-
return (await
|
|
37
|
+
return (await _support.util.toInMemoryBase64(localFile)).toString();
|
|
38
38
|
}
|
|
39
39
|
|
|
40
40
|
const {
|
|
@@ -59,7 +59,7 @@ async function uploadRecordedMedia(localFile, remotePath = null, uploadOptions =
|
|
|
59
59
|
};
|
|
60
60
|
}
|
|
61
61
|
|
|
62
|
-
await
|
|
62
|
+
await _support.net.uploadFile(localFile, remotePath, options);
|
|
63
63
|
return '';
|
|
64
64
|
}
|
|
65
65
|
|
|
@@ -67,7 +67,7 @@ const VIDEO_FILES = new Set();
|
|
|
67
67
|
process.on('exit', () => {
|
|
68
68
|
for (const videoFile of VIDEO_FILES) {
|
|
69
69
|
try {
|
|
70
|
-
|
|
70
|
+
_support.fs.rimrafSync(videoFile);
|
|
71
71
|
} catch (ign) {}
|
|
72
72
|
}
|
|
73
73
|
});
|
|
@@ -85,7 +85,7 @@ class ScreenRecorder {
|
|
|
85
85
|
}
|
|
86
86
|
|
|
87
87
|
async getVideoPath() {
|
|
88
|
-
if (await
|
|
88
|
+
if (await _support.fs.exists(this._videoPath)) {
|
|
89
89
|
VIDEO_FILES.add(this._videoPath);
|
|
90
90
|
return this._videoPath;
|
|
91
91
|
}
|
|
@@ -96,7 +96,7 @@ class ScreenRecorder {
|
|
|
96
96
|
get isRunning() {
|
|
97
97
|
var _this$_process;
|
|
98
98
|
|
|
99
|
-
return !!((_this$_process = this._process)
|
|
99
|
+
return !!((_this$_process = this._process) !== null && _this$_process !== void 0 && _this$_process.isRunning);
|
|
100
100
|
}
|
|
101
101
|
|
|
102
102
|
async _enforceTermination() {
|
|
@@ -112,7 +112,7 @@ class ScreenRecorder {
|
|
|
112
112
|
const videoPath = await this.getVideoPath();
|
|
113
113
|
|
|
114
114
|
if (videoPath) {
|
|
115
|
-
await
|
|
115
|
+
await _support.fs.rimraf(videoPath);
|
|
116
116
|
VIDEO_FILES.delete(videoPath);
|
|
117
117
|
}
|
|
118
118
|
|
|
@@ -140,7 +140,7 @@ class ScreenRecorder {
|
|
|
140
140
|
asynchronous: true
|
|
141
141
|
});
|
|
142
142
|
|
|
143
|
-
_logger.default.debug(`Starting video recording with arguments: ${
|
|
143
|
+
_logger.default.debug(`Starting video recording with arguments: ${_support.util.quote(args)}`);
|
|
144
144
|
|
|
145
145
|
this._process.on('output', (stdout, stderr) => {
|
|
146
146
|
const line = _lodash.default.trim(stdout || stderr);
|
|
@@ -262,7 +262,7 @@ commands.startRecordingScreen = async function startRecordingScreen(options = {}
|
|
|
262
262
|
forceRestart = true
|
|
263
263
|
} = options;
|
|
264
264
|
|
|
265
|
-
if ((_this$_screenRecorder = this._screenRecorder)
|
|
265
|
+
if ((_this$_screenRecorder = this._screenRecorder) !== null && _this$_screenRecorder !== void 0 && _this$_screenRecorder.isRunning) {
|
|
266
266
|
_logger.default.info('The screen recording is already running');
|
|
267
267
|
|
|
268
268
|
if (!forceRestart) {
|
|
@@ -283,8 +283,8 @@ commands.startRecordingScreen = async function startRecordingScreen(options = {}
|
|
|
283
283
|
throw new Error('Cannot determine Simulator UDID to record the video from. ' + 'Double check your session capabilities');
|
|
284
284
|
}
|
|
285
285
|
|
|
286
|
-
const videoPath = await
|
|
287
|
-
prefix:
|
|
286
|
+
const videoPath = await _support.tempDir.path({
|
|
287
|
+
prefix: _support.util.uuidV4().substring(0, 8),
|
|
288
288
|
suffix: DEFAULT_EXT
|
|
289
289
|
});
|
|
290
290
|
this._screenRecorder = new ScreenRecorder(udid, videoPath, {
|
|
@@ -326,4 +326,4 @@ var _default = commands;
|
|
|
326
326
|
exports.default = _default;require('source-map-support').install();
|
|
327
327
|
|
|
328
328
|
|
|
329
|
-
//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/commands/record-screen.js"],"names":["commands","STARTUP_INTERVAL_MS","STARTUP_TIMEOUT_MS","DEFAULT_TIME_LIMIT_MS","PROCESS_SHUTDOWN_TIMEOUT_MS","DEFAULT_EXT","uploadRecordedMedia","localFile","remotePath","uploadOptions","_","isEmpty","size","fs","stat","log","debug","util","toReadableSizeString","toInMemoryBase64","toString","user","pass","method","headers","fileFieldName","formFields","options","auth","net","uploadFile","VIDEO_FILES","Set","process","on","videoFile","rimrafSync","ign","ScreenRecorder","constructor","udid","videoPath","opts","_process","_udid","_videoPath","_codec","codec","_display","display","_mask","mask","_timeLimitMs","timeLimit","_timer","getVideoPath","exists","add","isRunning","_enforceTermination","stop","rimraf","delete","start","args","push","Simctl","exec","asynchronous","quote","stdout","stderr","line","trim","substring","once","code","signal","warn","Error","waitMs","intervalMs","e","errorAndThrow","setTimeout","error","info","force","clearTimeout","extractSimulatorUdid","caps","allDevices","flatMap","values","getDevices","name","state","sdk","toLower","startRecordingScreen","forceRestart","_screenRecorder","tempDir","path","prefix","uuidV4","suffix","parseInt","stopRecordingScreen"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AAGA,MAAMA,QAAQ,GAAG,EAAjB;AAEA,MAAMC,mBAAmB,GAAG,GAA5B;AACA,MAAMC,kBAAkB,GAAG,KAAK,IAAhC;AACA,MAAMC,qBAAqB,GAAG,KAAK,EAAL,GAAU,IAAxC;AACA,MAAMC,2BAA2B,GAAG,KAAK,IAAzC;AACA,MAAMC,WAAW,GAAG,MAApB;;AAGA,eAAeC,mBAAf,CAAoCC,SAApC,EAA+CC,UAAU,GAAG,IAA5D,EAAkEC,aAAa,GAAG,EAAlF,EAAsF;AACpF,MAAIC,gBAAEC,OAAF,CAAUH,UAAV,CAAJ,EAA2B;AACzB,UAAM;AAACI,MAAAA;AAAD,QAAS,MAAMC,kBAAGC,IAAH,CAAQP,SAAR,CAArB;;AACAQ,oBAAIC,KAAJ,CAAW,iDAAgDC,oBAAKC,oBAAL,CAA0BN,IAA1B,CAAgC,EAA3F;;AACA,WAAO,CAAC,MAAMK,oBAAKE,gBAAL,CAAsBZ,SAAtB,CAAP,EAAyCa,QAAzC,EAAP;AACD;;AAED,QAAM;AAACC,IAAAA,IAAD;AAAOC,IAAAA,IAAP;AAAaC,IAAAA,MAAb;AAAqBC,IAAAA,OAArB;AAA8BC,IAAAA,aAA9B;AAA6CC,IAAAA;AAA7C,MAA2DjB,aAAjE;AACA,QAAMkB,OAAO,GAAG;AACdJ,IAAAA,MAAM,EAAEA,MAAM,IAAI,KADJ;AAEdC,IAAAA,OAFc;AAGdC,IAAAA,aAHc;AAIdC,IAAAA;AAJc,GAAhB;;AAMA,MAAIL,IAAI,IAAIC,IAAZ,EAAkB;AAChBK,IAAAA,OAAO,CAACC,IAAR,GAAe;AAACP,MAAAA,IAAD;AAAOC,MAAAA;AAAP,KAAf;AACD;;AACD,QAAMO,mBAAIC,UAAJ,CAAevB,SAAf,EAA0BC,UAA1B,EAAsCmB,OAAtC,CAAN;AACA,SAAO,EAAP;AACD;;AAED,MAAMI,WAAW,GAAG,IAAIC,GAAJ,EAApB;AACAC,OAAO,CAACC,EAAR,CAAW,MAAX,EAAmB,MAAM;AACvB,OAAK,MAAMC,SAAX,IAAwBJ,WAAxB,EAAqC;AACnC,QAAI;AACFlB,wBAAGuB,UAAH,CAAcD,SAAd;AACD,KAFD,CAEE,OAAOE,GAAP,EAAY,CAAE;AACjB;AACF,CAND;;AAQA,MAAMC,cAAN,CAAqB;AACnBC,EAAAA,WAAW,CAAEC,IAAF,EAAQC,SAAR,EAAmBC,IAAI,GAAG,EAA1B,EAA8B;AACvC,SAAKC,QAAL,GAAgB,IAAhB;AACA,SAAKC,KAAL,GAAaJ,IAAb;AACA,SAAKK,UAAL,GAAkBJ,SAAlB;AACA,SAAKK,MAAL,GAAcJ,IAAI,CAACK,KAAnB;AACA,SAAKC,QAAL,GAAgBN,IAAI,CAACO,OAArB;AACA,SAAKC,KAAL,GAAaR,IAAI,CAACS,IAAlB;AACA,SAAKC,YAAL,GAAoBV,IAAI,CAACW,SAAL,GAAiB,CAAjB,GAAqBX,IAAI,CAACW,SAAL,GAAiB,IAAtC,GAA6ClD,qBAAjE;AACA,SAAKmD,MAAL,GAAc,IAAd;AACD;;AAED,QAAMC,YAAN,GAAsB;AACpB,QAAI,MAAM1C,kBAAG2C,MAAH,CAAU,KAAKX,UAAf,CAAV,EAAsC;AACpCd,MAAAA,WAAW,CAAC0B,GAAZ,CAAgB,KAAKZ,UAArB;AACA,aAAO,KAAKA,UAAZ;AACD;;AACD,WAAO,EAAP;AACD;;AAED,MAAIa,SAAJ,GAAiB;AAAA;;AACf,WAAO,CAAC,oBAAE,KAAKf,QAAP,mDAAE,eAAee,SAAjB,CAAR;AACD;;AAED,QAAMC,mBAAN,GAA6B;AAC3B,QAAI,KAAKD,SAAT,EAAoB;AAClB3C,sBAAIC,KAAJ,CAAU,sDAAV;;AACA,UAAI;AACF,cAAM,KAAK2B,QAAL,CAAciB,IAAd,CAAmB,SAAnB,CAAN;AACD,OAFD,CAEE,OAAOvB,GAAP,EAAY,CAAE;AACjB;;AACD,SAAKM,QAAL,GAAgB,IAAhB;AACA,UAAMF,SAAS,GAAG,MAAM,KAAKc,YAAL,EAAxB;;AACA,QAAId,SAAJ,EAAe;AACb,YAAM5B,kBAAGgD,MAAH,CAAUpB,SAAV,CAAN;AACAV,MAAAA,WAAW,CAAC+B,MAAZ,CAAmBrB,SAAnB;AACD;;AACD,WAAO,EAAP;AACD;;AAED,QAAMsB,KAAN,GAAe;AACb,UAAMC,IAAI,GAAG,CACX,KAAKpB,KADM,EACC,aADD,CAAb;;AAGA,QAAI,KAAKI,QAAT,EAAmB;AACjBgB,MAAAA,IAAI,CAACC,IAAL,CAAU,WAAV,EAAuB,KAAKjB,QAA5B;AACD;;AACD,QAAI,KAAKF,MAAT,EAAiB;AACfkB,MAAAA,IAAI,CAACC,IAAL,CAAU,SAAV,EAAqB,KAAKnB,MAA1B;AACD;;AACD,QAAI,KAAKI,KAAT,EAAgB;AACdc,MAAAA,IAAI,CAACC,IAAL,CAAU,QAAV,EAAoB,KAAKf,KAAzB;AACD;;AACDc,IAAAA,IAAI,CAACC,IAAL,CAAU,SAAV,EAAqB,KAAKpB,UAA1B;AACA,SAAKF,QAAL,GAAgB,MAAM,IAAIuB,mBAAJ,GAAaC,IAAb,CAAkB,IAAlB,EAAwB;AAC5CH,MAAAA,IAD4C;AAE5CI,MAAAA,YAAY,EAAE;AAF8B,KAAxB,CAAtB;;AAIArD,oBAAIC,KAAJ,CAAW,4CAA2CC,oBAAKoD,KAAL,CAAWL,IAAX,CAAiB,EAAvE;;AACA,SAAKrB,QAAL,CAAcT,EAAd,CAAiB,QAAjB,EAA2B,CAACoC,MAAD,EAASC,MAAT,KAAoB;AAC7C,YAAMC,IAAI,GAAG9D,gBAAE+D,IAAF,CAAOH,MAAM,IAAIC,MAAjB,CAAb;;AACA,UAAIC,IAAJ,EAAU;AACRzD,wBAAIC,KAAJ,CAAW,gBAAe,KAAK4B,KAAL,CAAW8B,SAAX,CAAqB,CAArB,EAAwB,CAAxB,CAA2B,KAAIF,IAAK,EAA9D;AACD;AACF,KALD;;AAMA,SAAK7B,QAAL,CAAcgC,IAAd,CAAmB,MAAnB,EAA2B,OAAOC,IAAP,EAAaC,MAAb,KAAwB;AACjD,WAAKlC,QAAL,GAAgB,IAAhB;;AACA,UAAIiC,IAAI,KAAK,CAAb,EAAgB;AACd7D,wBAAIC,KAAJ,CAAU,wCAAV;AACD,OAFD,MAEO;AACL,cAAM,KAAK2C,mBAAL,EAAN;;AACA5C,wBAAI+D,IAAJ,CAAU,2CAA0CF,IAAK,YAAWC,MAAO,EAA3E;AACD;AACF,KARD;;AASA,UAAM,KAAKlC,QAAL,CAAcoB,KAAd,CAAoB,CAApB,CAAN;;AACA,QAAI;AACF,YAAM,gCAAiB,YAAY;AACjC,YAAI,CAAC,KAAKL,SAAV,EAAqB;AACnB,gBAAM,IAAIqB,KAAJ,EAAN;AACD;;AACD,eAAO,CAAC,EAAE,MAAM,KAAKxB,YAAL,EAAR,CAAR;AACD,OALK,EAKH;AACDyB,QAAAA,MAAM,EAAE9E,kBADP;AAED+E,QAAAA,UAAU,EAAEhF;AAFX,OALG,CAAN;AASD,KAVD,CAUE,OAAOiF,CAAP,EAAU;AACV,YAAM,KAAKvB,mBAAL,EAAN;;AACA5C,sBAAIoE,aAAJ,CAAmB,oCAAmC,KAAKtC,UAAW,0BAAyB3C,kBAAmB,MAAhG,GACf,uCADH;AAED;;AACD,SAAKoD,MAAL,GAAc8B,UAAU,CAAC,YAAY;AACnC,UAAI,KAAK1B,SAAT,EAAoB;AAClB,YAAI;AACF,gBAAM,KAAKE,IAAL,EAAN;AACD,SAFD,CAEE,OAAOsB,CAAP,EAAU;AACVnE,0BAAIsE,KAAJ,CAAUH,CAAV;AACD;AACF;AACF,KARuB,EAQrB,KAAK9B,YARgB,CAAxB;;AASArC,oBAAIuE,IAAJ,CAAU,oDAAmD,KAAKlC,YAAa,IAA/E;AACD;;AAED,QAAMQ,IAAN,CAAY2B,KAAK,GAAG,KAApB,EAA2B;AACzB,QAAI,KAAKjC,MAAT,EAAiB;AACfkC,MAAAA,YAAY,CAAC,KAAKlC,MAAN,CAAZ;AACA,WAAKA,MAAL,GAAc,IAAd;AACD;;AAED,QAAIiC,KAAJ,EAAW;AACT,aAAO,MAAM,KAAK5B,mBAAL,EAAb;AACD;;AAED,QAAI,CAAC,KAAKD,SAAV,EAAqB;AACnB3C,sBAAIC,KAAJ,CAAU,wEAAV;;AACA,aAAO,MAAM,KAAKuC,YAAL,EAAb;AACD;;AAED,QAAI;AACF,YAAM,KAAKZ,QAAL,CAAciB,IAAd,CAAmB,QAAnB,EAA6BxD,2BAA7B,CAAN;AACD,KAFD,CAEE,OAAO8E,CAAP,EAAU;AACV,YAAM,KAAKvB,mBAAL,EAAN;AACA,YAAM,IAAIoB,KAAJ,CAAW,6CAA4C3E,2BAA4B,IAAnF,CAAN;AACD;;AAED,WAAO,MAAM,KAAKmD,YAAL,EAAb;AACD;;AA7HkB;;AAgIrB,eAAekC,oBAAf,CAAqCC,IAArC,EAA2C;AACzC,MAAIA,IAAI,CAAC,qBAAD,CAAJ,KAAgC,KAApC,EAA2C;AACzC,WAAO,IAAP;AACD;;AAED,QAAMC,UAAU,GAAGjF,gBAAEkF,OAAF,CAAUlF,gBAAEmF,MAAF,CAAS,MAAM,IAAI3B,mBAAJ,GAAa4B,UAAb,CAAwB,IAAxB,EAA8B,KAA9B,CAAf,CAAV,CAAnB;;AACA,OAAK,MAAM;AAACC,IAAAA,IAAD;AAAOvD,IAAAA,IAAP;AAAawD,IAAAA,KAAb;AAAoBC,IAAAA;AAApB,GAAX,IAAuCN,UAAvC,EAAmD;AACjD,QAAIK,KAAK,KAAK,QAAd,EAAwB;AACtB;AACD;;AAED,QAAItF,gBAAEwF,OAAF,CAAUR,IAAI,CAAC,mBAAD,CAAd,MAAyChF,gBAAEwF,OAAF,CAAU1D,IAAV,CAA7C,EAA8D;AAC5D,aAAOA,IAAP;AACD;;AACD,QAAI9B,gBAAEwF,OAAF,CAAUR,IAAI,CAAC,mBAAD,CAAd,MAAyChF,gBAAEwF,OAAF,CAAUH,IAAV,CAAzC,KACDL,IAAI,CAAC,wBAAD,CAAJ,IAAkCA,IAAI,CAAC,wBAAD,CAAJ,KAAmCO,GAArE,IACI,CAACP,IAAI,CAAC,wBAAD,CAFR,CAAJ,EAEyC;AACvC,aAAOlD,IAAP;AACD;AACF;;AAED,SAAO,IAAP;AACD;;AA0BDxC,QAAQ,CAACmG,oBAAT,GAAgC,eAAeA,oBAAf,CAAqCxE,OAAO,GAAG,EAA/C,EAAmD;AAAA;;AACjF,QAAM;AACJ0B,IAAAA,SADI;AAEJN,IAAAA,KAFI;AAGJE,IAAAA,OAHI;AAIJE,IAAAA,IAJI;AAKJiD,IAAAA,YAAY,GAAG;AALX,MAMFzE,OANJ;;AAOA,+BAAI,KAAK0E,eAAT,0DAAI,sBAAsB3C,SAA1B,EAAqC;AACnC3C,oBAAIuE,IAAJ,CAAS,yCAAT;;AACA,QAAI,CAACc,YAAL,EAAmB;AACjBrF,sBAAIuE,IAAJ,CAAS,eAAT;;AACA;AACD;;AACDvE,oBAAIuE,IAAJ,CAAS,6CAAT;;AACA,UAAM,KAAKe,eAAL,CAAqBzC,IAArB,CAA0B,IAA1B,CAAN;AACD;;AACD,OAAKyC,eAAL,GAAuB,IAAvB;AAEA,QAAM7D,IAAI,GAAG,MAAMiD,oBAAoB,CAAC,KAAKC,IAAN,CAAvC;;AACA,MAAI,CAAClD,IAAL,EAAW;AACT,UAAM,IAAIuC,KAAJ,CAAU,+DACd,wCADI,CAAN;AAED;;AAED,QAAMtC,SAAS,GAAG,MAAM6D,uBAAQC,IAAR,CAAa;AACnCC,IAAAA,MAAM,EAAEvF,oBAAKwF,MAAL,GAAc/B,SAAd,CAAwB,CAAxB,EAA2B,CAA3B,CAD2B;AAEnCgC,IAAAA,MAAM,EAAErG;AAF2B,GAAb,CAAxB;AAIA,OAAKgG,eAAL,GAAuB,IAAI/D,cAAJ,CAAmBE,IAAnB,EAAyBC,SAAzB,EAAoC;AACzDY,IAAAA,SAAS,EAAEsD,QAAQ,CAACtD,SAAD,EAAY,EAAZ,CADsC;AAEzDN,IAAAA,KAFyD;AAGzDE,IAAAA,OAHyD;AAIzDE,IAAAA;AAJyD,GAApC,CAAvB;;AAMA,MAAI;AACF,UAAM,KAAKkD,eAAL,CAAqBtC,KAArB,EAAN;AACD,GAFD,CAEE,OAAOmB,CAAP,EAAU;AACV,SAAKmB,eAAL,GAAuB,IAAvB;AACA,UAAMnB,CAAN;AACD;AACF,CAzCD;;AAwEAlF,QAAQ,CAAC4G,mBAAT,GAA+B,eAAeA,mBAAf,CAAoCjF,OAAO,GAAG,EAA9C,EAAkD;AAC/E,MAAI,CAAC,KAAK0E,eAAV,EAA2B;AACzBtF,oBAAIuE,IAAJ,CAAS,qDAAT;;AACA,WAAO,EAAP;AACD;;AAEDvE,kBAAIC,KAAJ,CAAU,qCAAV;;AACA,QAAMyB,SAAS,GAAG,MAAM,KAAK4D,eAAL,CAAqBzC,IAArB,EAAxB;;AACA,MAAI,CAACnB,SAAL,EAAgB;AACd1B,oBAAIuE,IAAJ,CAAS,mDAAT;;AACA,WAAO,EAAP;AACD;;AACD,SAAO,MAAMhF,mBAAmB,CAACmC,SAAD,EAAYd,OAAO,CAACnB,UAApB,EAAgCmB,OAAhC,CAAhC;AACD,CAbD;;eAee3B,Q","sourcesContent":["import _ from 'lodash';\nimport { util, fs, net, tempDir } from 'appium-support';\nimport { waitForCondition } from 'asyncbox';\nimport log from '../logger';\nimport Simctl from 'node-simctl';\n\n\nconst commands = {};\n\nconst STARTUP_INTERVAL_MS = 300;\nconst STARTUP_TIMEOUT_MS = 10 * 1000;\nconst DEFAULT_TIME_LIMIT_MS = 60 * 10 * 1000; // 10 minutes\nconst PROCESS_SHUTDOWN_TIMEOUT_MS = 10 * 1000;\nconst DEFAULT_EXT = '.mp4';\n\n\nasync function uploadRecordedMedia (localFile, remotePath = null, uploadOptions = {}) {\n  if (_.isEmpty(remotePath)) {\n    const {size} = await fs.stat(localFile);\n    log.debug(`The size of the resulting screen recording is ${util.toReadableSizeString(size)}`);\n    return (await util.toInMemoryBase64(localFile)).toString();\n  }\n\n  const {user, pass, method, headers, fileFieldName, formFields} = uploadOptions;\n  const options = {\n    method: method || 'PUT',\n    headers,\n    fileFieldName,\n    formFields,\n  };\n  if (user && pass) {\n    options.auth = {user, pass};\n  }\n  await net.uploadFile(localFile, remotePath, options);\n  return '';\n}\n\nconst VIDEO_FILES = new Set();\nprocess.on('exit', () => {\n  for (const videoFile of VIDEO_FILES) {\n    try {\n      fs.rimrafSync(videoFile);\n    } catch (ign) {}\n  }\n});\n\nclass ScreenRecorder {\n  constructor (udid, videoPath, opts = {}) {\n    this._process = null;\n    this._udid = udid;\n    this._videoPath = videoPath;\n    this._codec = opts.codec;\n    this._display = opts.display;\n    this._mask = opts.mask;\n    this._timeLimitMs = opts.timeLimit > 0 ? opts.timeLimit * 1000 : DEFAULT_TIME_LIMIT_MS;\n    this._timer = null;\n  }\n\n  async getVideoPath () {\n    if (await fs.exists(this._videoPath)) {\n      VIDEO_FILES.add(this._videoPath);\n      return this._videoPath;\n    }\n    return '';\n  }\n\n  get isRunning () {\n    return !!(this._process?.isRunning);\n  }\n\n  async _enforceTermination () {\n    if (this.isRunning) {\n      log.debug('Force-stopping the currently running video recording');\n      try {\n        await this._process.stop('SIGKILL');\n      } catch (ign) {}\n    }\n    this._process = null;\n    const videoPath = await this.getVideoPath();\n    if (videoPath) {\n      await fs.rimraf(videoPath);\n      VIDEO_FILES.delete(videoPath);\n    }\n    return '';\n  }\n\n  async start () {\n    const args = [\n      this._udid, 'recordVideo'\n    ];\n    if (this._display) {\n      args.push('--display', this._display);\n    }\n    if (this._codec) {\n      args.push('--codec', this._codec);\n    }\n    if (this._mask) {\n      args.push('--mask', this._mask);\n    }\n    args.push('--force', this._videoPath);\n    this._process = await new Simctl().exec('io', {\n      args,\n      asynchronous: true,\n    });\n    log.debug(`Starting video recording with arguments: ${util.quote(args)}`);\n    this._process.on('output', (stdout, stderr) => {\n      const line = _.trim(stdout || stderr);\n      if (line) {\n        log.debug(`[recordVideo@${this._udid.substring(0, 8)}] ${line}`);\n      }\n    });\n    this._process.once('exit', async (code, signal) => {\n      this._process = null;\n      if (code === 0) {\n        log.debug('Screen recording exited without errors');\n      } else {\n        await this._enforceTermination();\n        log.warn(`Screen recording exited with error code ${code}, signal ${signal}`);\n      }\n    });\n    await this._process.start(0);\n    try {\n      await waitForCondition(async () => {\n        if (!this.isRunning) {\n          throw new Error();\n        }\n        return !!(await this.getVideoPath());\n      }, {\n        waitMs: STARTUP_TIMEOUT_MS,\n        intervalMs: STARTUP_INTERVAL_MS,\n      });\n    } catch (e) {\n      await this._enforceTermination();\n      log.errorAndThrow(`The expected screen record file '${this._videoPath}' does not exist after ${STARTUP_TIMEOUT_MS}ms. ` +\n        `Check the server log for more details`);\n    }\n    this._timer = setTimeout(async () => {\n      if (this.isRunning) {\n        try {\n          await this.stop();\n        } catch (e) {\n          log.error(e);\n        }\n      }\n    }, this._timeLimitMs);\n    log.info(`The video recording has started. Will timeout in ${this._timeLimitMs}ms`);\n  }\n\n  async stop (force = false) {\n    if (this._timer) {\n      clearTimeout(this._timer);\n      this._timer = null;\n    }\n\n    if (force) {\n      return await this._enforceTermination();\n    }\n\n    if (!this.isRunning) {\n      log.debug('Screen recording is not running. Returning the recently recorded video');\n      return await this.getVideoPath();\n    }\n\n    try {\n      await this._process.stop('SIGINT', PROCESS_SHUTDOWN_TIMEOUT_MS);\n    } catch (e) {\n      await this._enforceTermination();\n      throw new Error(`Screen recording has failed to stop after ${PROCESS_SHUTDOWN_TIMEOUT_MS}ms`);\n    }\n\n    return await this.getVideoPath();\n  }\n}\n\nasync function extractSimulatorUdid (caps) {\n  if (caps['safari:useSimulator'] === false) {\n    return null;\n  }\n\n  const allDevices = _.flatMap(_.values(await new Simctl().getDevices(null, 'iOS')));\n  for (const {name, udid, state, sdk} of allDevices) {\n    if (state !== 'Booted') {\n      continue;\n    }\n\n    if (_.toLower(caps['safari:deviceUDID']) === _.toLower(udid)) {\n      return udid;\n    }\n    if (_.toLower(caps['safari:deviceName']) === _.toLower(name) &&\n      (caps['safari:platformVersion'] && caps['safari:platformVersion'] === sdk\n        || !caps['safari:platformVersion'])) {\n      return udid;\n    }\n  }\n\n  return null;\n}\n\n\n/**\n * @typedef {Object} StartRecordingOptions\n *\n * @property {?string} codec [hevc] - Specifies the codec type: \"h264\" or \"hevc\"\n * @property {?string} display [internal] - Supports \"internal\" or \"external\". Default is \"internal\"\n * @property {?string} mask - For non-rectangular displays, handle the mask by policy:\n * - ignored: The mask is ignored and the unmasked framebuffer is saved.\n * - alpha: Not supported, but retained for compatibility; the mask is rendered black.\n * - black: The mask is rendered black.\n * @property {string|number} timeLimit [600] - The maximum recording time, in seconds. The default\n * value is 600 seconds (10 minutes).\n * @property {boolean} forceRestart [true] - Whether to ignore the call if a screen recording is currently running\n * (`false`) or to start a new recording immediately and terminate the existing one if running (`true`).\n */\n\n/**\n * Record the Simulator's display in background while the automated test is running.\n * This method uses `xcrun simctl io recordVideo` helper under the hood.\n * Check the output of `xcrun simctl io` command for more details.\n *\n * @param {?StartRecordingOptions} options - The available options.\n * @throws {Error} If screen recording has failed to start or is not supported for the destination device.\n */\ncommands.startRecordingScreen = async function startRecordingScreen (options = {}) {\n  const {\n    timeLimit,\n    codec,\n    display,\n    mask,\n    forceRestart = true,\n  } = options;\n  if (this._screenRecorder?.isRunning) {\n    log.info('The screen recording is already running');\n    if (!forceRestart) {\n      log.info('Doing nothing');\n      return;\n    }\n    log.info('Forcing the active screen recording to stop');\n    await this._screenRecorder.stop(true);\n  }\n  this._screenRecorder = null;\n\n  const udid = await extractSimulatorUdid(this.caps);\n  if (!udid) {\n    throw new Error('Cannot determine Simulator UDID to record the video from. ' +\n      'Double check your session capabilities');\n  }\n\n  const videoPath = await tempDir.path({\n    prefix: util.uuidV4().substring(0, 8),\n    suffix: DEFAULT_EXT,\n  });\n  this._screenRecorder = new ScreenRecorder(udid, videoPath, {\n    timeLimit: parseInt(timeLimit, 10),\n    codec,\n    display,\n    mask,\n  });\n  try {\n    await this._screenRecorder.start();\n  } catch (e) {\n    this._screenRecorder = null;\n    throw e;\n  }\n};\n\n/**\n * @typedef {Object} StopRecordingOptions\n *\n * @property {?string} remotePath - The path to the remote location, where the resulting video should be uploaded.\n * The following protocols are supported: http/https, ftp.\n * Null or empty string value (the default setting) means the content of resulting\n * file should be encoded as Base64 and passed as the endpoint response value.\n * An exception will be thrown if the generated media file is too big to\n * fit into the available process memory.\n * @property {?string} user - The name of the user for the remote authentication.\n * @property {?string} pass - The password for the remote authentication.\n * @property {?string} method - The http multipart upload method name. The 'PUT' one is used by default.\n * @property {?Object} headers - Additional headers mapping for multipart http(s) uploads\n * @property {?string} fileFieldName [file] - The name of the form field, where the file content BLOB should be stored for\n *                                            http(s) uploads\n * @property {?Object|Array<Pair>} formFields - Additional form fields for multipart http(s) uploads\n */\n\n/**\n * Stop recording the screen.\n * If no screen recording has been started before then the method returns an empty string.\n *\n * @param {?StopRecordingOptions} options - The available options.\n * @returns {string} Base64-encoded content of the recorded media file if 'remotePath'\n * parameter is falsy or an empty string.\n * @throws {Error} If there was an error while getting the name of a media file\n * or the file content cannot be uploaded to the remote location\n * or screen recording is not supported on the device under test.\n */\ncommands.stopRecordingScreen = async function stopRecordingScreen (options = {}) {\n  if (!this._screenRecorder) {\n    log.info('No screen recording has been started. Doing nothing');\n    return '';\n  }\n\n  log.debug('Retrieving the resulting video data');\n  const videoPath = await this._screenRecorder.stop();\n  if (!videoPath) {\n    log.info('No video data is found. Returning an empty string');\n    return '';\n  }\n  return await uploadRecordedMedia(videoPath, options.remotePath, options);\n};\n\nexport default commands;\n"],"file":"lib/commands/record-screen.js","sourceRoot":"../../.."}
|
|
329
|
+
//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/commands/record-screen.js"],"names":["commands","STARTUP_INTERVAL_MS","STARTUP_TIMEOUT_MS","DEFAULT_TIME_LIMIT_MS","PROCESS_SHUTDOWN_TIMEOUT_MS","DEFAULT_EXT","uploadRecordedMedia","localFile","remotePath","uploadOptions","_","isEmpty","size","fs","stat","log","debug","util","toReadableSizeString","toInMemoryBase64","toString","user","pass","method","headers","fileFieldName","formFields","options","auth","net","uploadFile","VIDEO_FILES","Set","process","on","videoFile","rimrafSync","ign","ScreenRecorder","constructor","udid","videoPath","opts","_process","_udid","_videoPath","_codec","codec","_display","display","_mask","mask","_timeLimitMs","timeLimit","_timer","getVideoPath","exists","add","isRunning","_enforceTermination","stop","rimraf","delete","start","args","push","Simctl","exec","asynchronous","quote","stdout","stderr","line","trim","substring","once","code","signal","warn","Error","waitMs","intervalMs","e","errorAndThrow","setTimeout","error","info","force","clearTimeout","extractSimulatorUdid","caps","allDevices","flatMap","values","getDevices","name","state","sdk","toLower","startRecordingScreen","forceRestart","_screenRecorder","tempDir","path","prefix","uuidV4","suffix","parseInt","stopRecordingScreen"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AAGA,MAAMA,QAAQ,GAAG,EAAjB;AAEA,MAAMC,mBAAmB,GAAG,GAA5B;AACA,MAAMC,kBAAkB,GAAG,KAAK,IAAhC;AACA,MAAMC,qBAAqB,GAAG,KAAK,EAAL,GAAU,IAAxC;AACA,MAAMC,2BAA2B,GAAG,KAAK,IAAzC;AACA,MAAMC,WAAW,GAAG,MAApB;;AAGA,eAAeC,mBAAf,CAAoCC,SAApC,EAA+CC,UAAU,GAAG,IAA5D,EAAkEC,aAAa,GAAG,EAAlF,EAAsF;AACpF,MAAIC,gBAAEC,OAAF,CAAUH,UAAV,CAAJ,EAA2B;AACzB,UAAM;AAACI,MAAAA;AAAD,QAAS,MAAMC,YAAGC,IAAH,CAAQP,SAAR,CAArB;;AACAQ,oBAAIC,KAAJ,CAAW,iDAAgDC,cAAKC,oBAAL,CAA0BN,IAA1B,CAAgC,EAA3F;;AACA,WAAO,CAAC,MAAMK,cAAKE,gBAAL,CAAsBZ,SAAtB,CAAP,EAAyCa,QAAzC,EAAP;AACD;;AAED,QAAM;AAACC,IAAAA,IAAD;AAAOC,IAAAA,IAAP;AAAaC,IAAAA,MAAb;AAAqBC,IAAAA,OAArB;AAA8BC,IAAAA,aAA9B;AAA6CC,IAAAA;AAA7C,MAA2DjB,aAAjE;AACA,QAAMkB,OAAO,GAAG;AACdJ,IAAAA,MAAM,EAAEA,MAAM,IAAI,KADJ;AAEdC,IAAAA,OAFc;AAGdC,IAAAA,aAHc;AAIdC,IAAAA;AAJc,GAAhB;;AAMA,MAAIL,IAAI,IAAIC,IAAZ,EAAkB;AAChBK,IAAAA,OAAO,CAACC,IAAR,GAAe;AAACP,MAAAA,IAAD;AAAOC,MAAAA;AAAP,KAAf;AACD;;AACD,QAAMO,aAAIC,UAAJ,CAAevB,SAAf,EAA0BC,UAA1B,EAAsCmB,OAAtC,CAAN;AACA,SAAO,EAAP;AACD;;AAED,MAAMI,WAAW,GAAG,IAAIC,GAAJ,EAApB;AACAC,OAAO,CAACC,EAAR,CAAW,MAAX,EAAmB,MAAM;AACvB,OAAK,MAAMC,SAAX,IAAwBJ,WAAxB,EAAqC;AACnC,QAAI;AACFlB,kBAAGuB,UAAH,CAAcD,SAAd;AACD,KAFD,CAEE,OAAOE,GAAP,EAAY,CAAE;AACjB;AACF,CAND;;AAQA,MAAMC,cAAN,CAAqB;AACnBC,EAAAA,WAAW,CAAEC,IAAF,EAAQC,SAAR,EAAmBC,IAAI,GAAG,EAA1B,EAA8B;AACvC,SAAKC,QAAL,GAAgB,IAAhB;AACA,SAAKC,KAAL,GAAaJ,IAAb;AACA,SAAKK,UAAL,GAAkBJ,SAAlB;AACA,SAAKK,MAAL,GAAcJ,IAAI,CAACK,KAAnB;AACA,SAAKC,QAAL,GAAgBN,IAAI,CAACO,OAArB;AACA,SAAKC,KAAL,GAAaR,IAAI,CAACS,IAAlB;AACA,SAAKC,YAAL,GAAoBV,IAAI,CAACW,SAAL,GAAiB,CAAjB,GAAqBX,IAAI,CAACW,SAAL,GAAiB,IAAtC,GAA6ClD,qBAAjE;AACA,SAAKmD,MAAL,GAAc,IAAd;AACD;;AAEiB,QAAZC,YAAY,GAAI;AACpB,QAAI,MAAM1C,YAAG2C,MAAH,CAAU,KAAKX,UAAf,CAAV,EAAsC;AACpCd,MAAAA,WAAW,CAAC0B,GAAZ,CAAgB,KAAKZ,UAArB;AACA,aAAO,KAAKA,UAAZ;AACD;;AACD,WAAO,EAAP;AACD;;AAEY,MAATa,SAAS,GAAI;AAAA;;AACf,WAAO,CAAC,oBAAE,KAAKf,QAAP,2CAAE,eAAee,SAAjB,CAAR;AACD;;AAEwB,QAAnBC,mBAAmB,GAAI;AAC3B,QAAI,KAAKD,SAAT,EAAoB;AAClB3C,sBAAIC,KAAJ,CAAU,sDAAV;;AACA,UAAI;AACF,cAAM,KAAK2B,QAAL,CAAciB,IAAd,CAAmB,SAAnB,CAAN;AACD,OAFD,CAEE,OAAOvB,GAAP,EAAY,CAAE;AACjB;;AACD,SAAKM,QAAL,GAAgB,IAAhB;AACA,UAAMF,SAAS,GAAG,MAAM,KAAKc,YAAL,EAAxB;;AACA,QAAId,SAAJ,EAAe;AACb,YAAM5B,YAAGgD,MAAH,CAAUpB,SAAV,CAAN;AACAV,MAAAA,WAAW,CAAC+B,MAAZ,CAAmBrB,SAAnB;AACD;;AACD,WAAO,EAAP;AACD;;AAEU,QAALsB,KAAK,GAAI;AACb,UAAMC,IAAI,GAAG,CACX,KAAKpB,KADM,EACC,aADD,CAAb;;AAGA,QAAI,KAAKI,QAAT,EAAmB;AACjBgB,MAAAA,IAAI,CAACC,IAAL,CAAU,WAAV,EAAuB,KAAKjB,QAA5B;AACD;;AACD,QAAI,KAAKF,MAAT,EAAiB;AACfkB,MAAAA,IAAI,CAACC,IAAL,CAAU,SAAV,EAAqB,KAAKnB,MAA1B;AACD;;AACD,QAAI,KAAKI,KAAT,EAAgB;AACdc,MAAAA,IAAI,CAACC,IAAL,CAAU,QAAV,EAAoB,KAAKf,KAAzB;AACD;;AACDc,IAAAA,IAAI,CAACC,IAAL,CAAU,SAAV,EAAqB,KAAKpB,UAA1B;AACA,SAAKF,QAAL,GAAgB,MAAM,IAAIuB,mBAAJ,GAAaC,IAAb,CAAkB,IAAlB,EAAwB;AAC5CH,MAAAA,IAD4C;AAE5CI,MAAAA,YAAY,EAAE;AAF8B,KAAxB,CAAtB;;AAIArD,oBAAIC,KAAJ,CAAW,4CAA2CC,cAAKoD,KAAL,CAAWL,IAAX,CAAiB,EAAvE;;AACA,SAAKrB,QAAL,CAAcT,EAAd,CAAiB,QAAjB,EAA2B,CAACoC,MAAD,EAASC,MAAT,KAAoB;AAC7C,YAAMC,IAAI,GAAG9D,gBAAE+D,IAAF,CAAOH,MAAM,IAAIC,MAAjB,CAAb;;AACA,UAAIC,IAAJ,EAAU;AACRzD,wBAAIC,KAAJ,CAAW,gBAAe,KAAK4B,KAAL,CAAW8B,SAAX,CAAqB,CAArB,EAAwB,CAAxB,CAA2B,KAAIF,IAAK,EAA9D;AACD;AACF,KALD;;AAMA,SAAK7B,QAAL,CAAcgC,IAAd,CAAmB,MAAnB,EAA2B,OAAOC,IAAP,EAAaC,MAAb,KAAwB;AACjD,WAAKlC,QAAL,GAAgB,IAAhB;;AACA,UAAIiC,IAAI,KAAK,CAAb,EAAgB;AACd7D,wBAAIC,KAAJ,CAAU,wCAAV;AACD,OAFD,MAEO;AACL,cAAM,KAAK2C,mBAAL,EAAN;;AACA5C,wBAAI+D,IAAJ,CAAU,2CAA0CF,IAAK,YAAWC,MAAO,EAA3E;AACD;AACF,KARD;;AASA,UAAM,KAAKlC,QAAL,CAAcoB,KAAd,CAAoB,CAApB,CAAN;;AACA,QAAI;AACF,YAAM,gCAAiB,YAAY;AACjC,YAAI,CAAC,KAAKL,SAAV,EAAqB;AACnB,gBAAM,IAAIqB,KAAJ,EAAN;AACD;;AACD,eAAO,CAAC,EAAE,MAAM,KAAKxB,YAAL,EAAR,CAAR;AACD,OALK,EAKH;AACDyB,QAAAA,MAAM,EAAE9E,kBADP;AAED+E,QAAAA,UAAU,EAAEhF;AAFX,OALG,CAAN;AASD,KAVD,CAUE,OAAOiF,CAAP,EAAU;AACV,YAAM,KAAKvB,mBAAL,EAAN;;AACA5C,sBAAIoE,aAAJ,CAAmB,oCAAmC,KAAKtC,UAAW,0BAAyB3C,kBAAmB,MAAhG,GACf,uCADH;AAED;;AACD,SAAKoD,MAAL,GAAc8B,UAAU,CAAC,YAAY;AACnC,UAAI,KAAK1B,SAAT,EAAoB;AAClB,YAAI;AACF,gBAAM,KAAKE,IAAL,EAAN;AACD,SAFD,CAEE,OAAOsB,CAAP,EAAU;AACVnE,0BAAIsE,KAAJ,CAAUH,CAAV;AACD;AACF;AACF,KARuB,EAQrB,KAAK9B,YARgB,CAAxB;;AASArC,oBAAIuE,IAAJ,CAAU,oDAAmD,KAAKlC,YAAa,IAA/E;AACD;;AAES,QAAJQ,IAAI,CAAE2B,KAAK,GAAG,KAAV,EAAiB;AACzB,QAAI,KAAKjC,MAAT,EAAiB;AACfkC,MAAAA,YAAY,CAAC,KAAKlC,MAAN,CAAZ;AACA,WAAKA,MAAL,GAAc,IAAd;AACD;;AAED,QAAIiC,KAAJ,EAAW;AACT,aAAO,MAAM,KAAK5B,mBAAL,EAAb;AACD;;AAED,QAAI,CAAC,KAAKD,SAAV,EAAqB;AACnB3C,sBAAIC,KAAJ,CAAU,wEAAV;;AACA,aAAO,MAAM,KAAKuC,YAAL,EAAb;AACD;;AAED,QAAI;AACF,YAAM,KAAKZ,QAAL,CAAciB,IAAd,CAAmB,QAAnB,EAA6BxD,2BAA7B,CAAN;AACD,KAFD,CAEE,OAAO8E,CAAP,EAAU;AACV,YAAM,KAAKvB,mBAAL,EAAN;AACA,YAAM,IAAIoB,KAAJ,CAAW,6CAA4C3E,2BAA4B,IAAnF,CAAN;AACD;;AAED,WAAO,MAAM,KAAKmD,YAAL,EAAb;AACD;;AA7HkB;;AAgIrB,eAAekC,oBAAf,CAAqCC,IAArC,EAA2C;AACzC,MAAIA,IAAI,CAAC,qBAAD,CAAJ,KAAgC,KAApC,EAA2C;AACzC,WAAO,IAAP;AACD;;AAED,QAAMC,UAAU,GAAGjF,gBAAEkF,OAAF,CAAUlF,gBAAEmF,MAAF,CAAS,MAAM,IAAI3B,mBAAJ,GAAa4B,UAAb,CAAwB,IAAxB,EAA8B,KAA9B,CAAf,CAAV,CAAnB;;AACA,OAAK,MAAM;AAACC,IAAAA,IAAD;AAAOvD,IAAAA,IAAP;AAAawD,IAAAA,KAAb;AAAoBC,IAAAA;AAApB,GAAX,IAAuCN,UAAvC,EAAmD;AACjD,QAAIK,KAAK,KAAK,QAAd,EAAwB;AACtB;AACD;;AAED,QAAItF,gBAAEwF,OAAF,CAAUR,IAAI,CAAC,mBAAD,CAAd,MAAyChF,gBAAEwF,OAAF,CAAU1D,IAAV,CAA7C,EAA8D;AAC5D,aAAOA,IAAP;AACD;;AACD,QAAI9B,gBAAEwF,OAAF,CAAUR,IAAI,CAAC,mBAAD,CAAd,MAAyChF,gBAAEwF,OAAF,CAAUH,IAAV,CAAzC,KACDL,IAAI,CAAC,wBAAD,CAAJ,IAAkCA,IAAI,CAAC,wBAAD,CAAJ,KAAmCO,GAArE,IACI,CAACP,IAAI,CAAC,wBAAD,CAFR,CAAJ,EAEyC;AACvC,aAAOlD,IAAP;AACD;AACF;;AAED,SAAO,IAAP;AACD;;AA0BDxC,QAAQ,CAACmG,oBAAT,GAAgC,eAAeA,oBAAf,CAAqCxE,OAAO,GAAG,EAA/C,EAAmD;AAAA;;AACjF,QAAM;AACJ0B,IAAAA,SADI;AAEJN,IAAAA,KAFI;AAGJE,IAAAA,OAHI;AAIJE,IAAAA,IAJI;AAKJiD,IAAAA,YAAY,GAAG;AALX,MAMFzE,OANJ;;AAOA,+BAAI,KAAK0E,eAAT,kDAAI,sBAAsB3C,SAA1B,EAAqC;AACnC3C,oBAAIuE,IAAJ,CAAS,yCAAT;;AACA,QAAI,CAACc,YAAL,EAAmB;AACjBrF,sBAAIuE,IAAJ,CAAS,eAAT;;AACA;AACD;;AACDvE,oBAAIuE,IAAJ,CAAS,6CAAT;;AACA,UAAM,KAAKe,eAAL,CAAqBzC,IAArB,CAA0B,IAA1B,CAAN;AACD;;AACD,OAAKyC,eAAL,GAAuB,IAAvB;AAEA,QAAM7D,IAAI,GAAG,MAAMiD,oBAAoB,CAAC,KAAKC,IAAN,CAAvC;;AACA,MAAI,CAAClD,IAAL,EAAW;AACT,UAAM,IAAIuC,KAAJ,CAAU,+DACd,wCADI,CAAN;AAED;;AAED,QAAMtC,SAAS,GAAG,MAAM6D,iBAAQC,IAAR,CAAa;AACnCC,IAAAA,MAAM,EAAEvF,cAAKwF,MAAL,GAAc/B,SAAd,CAAwB,CAAxB,EAA2B,CAA3B,CAD2B;AAEnCgC,IAAAA,MAAM,EAAErG;AAF2B,GAAb,CAAxB;AAIA,OAAKgG,eAAL,GAAuB,IAAI/D,cAAJ,CAAmBE,IAAnB,EAAyBC,SAAzB,EAAoC;AACzDY,IAAAA,SAAS,EAAEsD,QAAQ,CAACtD,SAAD,EAAY,EAAZ,CADsC;AAEzDN,IAAAA,KAFyD;AAGzDE,IAAAA,OAHyD;AAIzDE,IAAAA;AAJyD,GAApC,CAAvB;;AAMA,MAAI;AACF,UAAM,KAAKkD,eAAL,CAAqBtC,KAArB,EAAN;AACD,GAFD,CAEE,OAAOmB,CAAP,EAAU;AACV,SAAKmB,eAAL,GAAuB,IAAvB;AACA,UAAMnB,CAAN;AACD;AACF,CAzCD;;AAwEAlF,QAAQ,CAAC4G,mBAAT,GAA+B,eAAeA,mBAAf,CAAoCjF,OAAO,GAAG,EAA9C,EAAkD;AAC/E,MAAI,CAAC,KAAK0E,eAAV,EAA2B;AACzBtF,oBAAIuE,IAAJ,CAAS,qDAAT;;AACA,WAAO,EAAP;AACD;;AAEDvE,kBAAIC,KAAJ,CAAU,qCAAV;;AACA,QAAMyB,SAAS,GAAG,MAAM,KAAK4D,eAAL,CAAqBzC,IAArB,EAAxB;;AACA,MAAI,CAACnB,SAAL,EAAgB;AACd1B,oBAAIuE,IAAJ,CAAS,mDAAT;;AACA,WAAO,EAAP;AACD;;AACD,SAAO,MAAMhF,mBAAmB,CAACmC,SAAD,EAAYd,OAAO,CAACnB,UAApB,EAAgCmB,OAAhC,CAAhC;AACD,CAbD;;eAee3B,Q","sourcesContent":["import _ from 'lodash';\nimport { util, fs, net, tempDir } from '@appium/support';\nimport { waitForCondition } from 'asyncbox';\nimport log from '../logger';\nimport Simctl from 'node-simctl';\n\n\nconst commands = {};\n\nconst STARTUP_INTERVAL_MS = 300;\nconst STARTUP_TIMEOUT_MS = 10 * 1000;\nconst DEFAULT_TIME_LIMIT_MS = 60 * 10 * 1000; // 10 minutes\nconst PROCESS_SHUTDOWN_TIMEOUT_MS = 10 * 1000;\nconst DEFAULT_EXT = '.mp4';\n\n\nasync function uploadRecordedMedia (localFile, remotePath = null, uploadOptions = {}) {\n  if (_.isEmpty(remotePath)) {\n    const {size} = await fs.stat(localFile);\n    log.debug(`The size of the resulting screen recording is ${util.toReadableSizeString(size)}`);\n    return (await util.toInMemoryBase64(localFile)).toString();\n  }\n\n  const {user, pass, method, headers, fileFieldName, formFields} = uploadOptions;\n  const options = {\n    method: method || 'PUT',\n    headers,\n    fileFieldName,\n    formFields,\n  };\n  if (user && pass) {\n    options.auth = {user, pass};\n  }\n  await net.uploadFile(localFile, remotePath, options);\n  return '';\n}\n\nconst VIDEO_FILES = new Set();\nprocess.on('exit', () => {\n  for (const videoFile of VIDEO_FILES) {\n    try {\n      fs.rimrafSync(videoFile);\n    } catch (ign) {}\n  }\n});\n\nclass ScreenRecorder {\n  constructor (udid, videoPath, opts = {}) {\n    this._process = null;\n    this._udid = udid;\n    this._videoPath = videoPath;\n    this._codec = opts.codec;\n    this._display = opts.display;\n    this._mask = opts.mask;\n    this._timeLimitMs = opts.timeLimit > 0 ? opts.timeLimit * 1000 : DEFAULT_TIME_LIMIT_MS;\n    this._timer = null;\n  }\n\n  async getVideoPath () {\n    if (await fs.exists(this._videoPath)) {\n      VIDEO_FILES.add(this._videoPath);\n      return this._videoPath;\n    }\n    return '';\n  }\n\n  get isRunning () {\n    return !!(this._process?.isRunning);\n  }\n\n  async _enforceTermination () {\n    if (this.isRunning) {\n      log.debug('Force-stopping the currently running video recording');\n      try {\n        await this._process.stop('SIGKILL');\n      } catch (ign) {}\n    }\n    this._process = null;\n    const videoPath = await this.getVideoPath();\n    if (videoPath) {\n      await fs.rimraf(videoPath);\n      VIDEO_FILES.delete(videoPath);\n    }\n    return '';\n  }\n\n  async start () {\n    const args = [\n      this._udid, 'recordVideo'\n    ];\n    if (this._display) {\n      args.push('--display', this._display);\n    }\n    if (this._codec) {\n      args.push('--codec', this._codec);\n    }\n    if (this._mask) {\n      args.push('--mask', this._mask);\n    }\n    args.push('--force', this._videoPath);\n    this._process = await new Simctl().exec('io', {\n      args,\n      asynchronous: true,\n    });\n    log.debug(`Starting video recording with arguments: ${util.quote(args)}`);\n    this._process.on('output', (stdout, stderr) => {\n      const line = _.trim(stdout || stderr);\n      if (line) {\n        log.debug(`[recordVideo@${this._udid.substring(0, 8)}] ${line}`);\n      }\n    });\n    this._process.once('exit', async (code, signal) => {\n      this._process = null;\n      if (code === 0) {\n        log.debug('Screen recording exited without errors');\n      } else {\n        await this._enforceTermination();\n        log.warn(`Screen recording exited with error code ${code}, signal ${signal}`);\n      }\n    });\n    await this._process.start(0);\n    try {\n      await waitForCondition(async () => {\n        if (!this.isRunning) {\n          throw new Error();\n        }\n        return !!(await this.getVideoPath());\n      }, {\n        waitMs: STARTUP_TIMEOUT_MS,\n        intervalMs: STARTUP_INTERVAL_MS,\n      });\n    } catch (e) {\n      await this._enforceTermination();\n      log.errorAndThrow(`The expected screen record file '${this._videoPath}' does not exist after ${STARTUP_TIMEOUT_MS}ms. ` +\n        `Check the server log for more details`);\n    }\n    this._timer = setTimeout(async () => {\n      if (this.isRunning) {\n        try {\n          await this.stop();\n        } catch (e) {\n          log.error(e);\n        }\n      }\n    }, this._timeLimitMs);\n    log.info(`The video recording has started. Will timeout in ${this._timeLimitMs}ms`);\n  }\n\n  async stop (force = false) {\n    if (this._timer) {\n      clearTimeout(this._timer);\n      this._timer = null;\n    }\n\n    if (force) {\n      return await this._enforceTermination();\n    }\n\n    if (!this.isRunning) {\n      log.debug('Screen recording is not running. Returning the recently recorded video');\n      return await this.getVideoPath();\n    }\n\n    try {\n      await this._process.stop('SIGINT', PROCESS_SHUTDOWN_TIMEOUT_MS);\n    } catch (e) {\n      await this._enforceTermination();\n      throw new Error(`Screen recording has failed to stop after ${PROCESS_SHUTDOWN_TIMEOUT_MS}ms`);\n    }\n\n    return await this.getVideoPath();\n  }\n}\n\nasync function extractSimulatorUdid (caps) {\n  if (caps['safari:useSimulator'] === false) {\n    return null;\n  }\n\n  const allDevices = _.flatMap(_.values(await new Simctl().getDevices(null, 'iOS')));\n  for (const {name, udid, state, sdk} of allDevices) {\n    if (state !== 'Booted') {\n      continue;\n    }\n\n    if (_.toLower(caps['safari:deviceUDID']) === _.toLower(udid)) {\n      return udid;\n    }\n    if (_.toLower(caps['safari:deviceName']) === _.toLower(name) &&\n      (caps['safari:platformVersion'] && caps['safari:platformVersion'] === sdk\n        || !caps['safari:platformVersion'])) {\n      return udid;\n    }\n  }\n\n  return null;\n}\n\n\n/**\n * @typedef {Object} StartRecordingOptions\n *\n * @property {?string} codec [hevc] - Specifies the codec type: \"h264\" or \"hevc\"\n * @property {?string} display [internal] - Supports \"internal\" or \"external\". Default is \"internal\"\n * @property {?string} mask - For non-rectangular displays, handle the mask by policy:\n * - ignored: The mask is ignored and the unmasked framebuffer is saved.\n * - alpha: Not supported, but retained for compatibility; the mask is rendered black.\n * - black: The mask is rendered black.\n * @property {string|number} timeLimit [600] - The maximum recording time, in seconds. The default\n * value is 600 seconds (10 minutes).\n * @property {boolean} forceRestart [true] - Whether to ignore the call if a screen recording is currently running\n * (`false`) or to start a new recording immediately and terminate the existing one if running (`true`).\n */\n\n/**\n * Record the Simulator's display in background while the automated test is running.\n * This method uses `xcrun simctl io recordVideo` helper under the hood.\n * Check the output of `xcrun simctl io` command for more details.\n *\n * @param {?StartRecordingOptions} options - The available options.\n * @throws {Error} If screen recording has failed to start or is not supported for the destination device.\n */\ncommands.startRecordingScreen = async function startRecordingScreen (options = {}) {\n  const {\n    timeLimit,\n    codec,\n    display,\n    mask,\n    forceRestart = true,\n  } = options;\n  if (this._screenRecorder?.isRunning) {\n    log.info('The screen recording is already running');\n    if (!forceRestart) {\n      log.info('Doing nothing');\n      return;\n    }\n    log.info('Forcing the active screen recording to stop');\n    await this._screenRecorder.stop(true);\n  }\n  this._screenRecorder = null;\n\n  const udid = await extractSimulatorUdid(this.caps);\n  if (!udid) {\n    throw new Error('Cannot determine Simulator UDID to record the video from. ' +\n      'Double check your session capabilities');\n  }\n\n  const videoPath = await tempDir.path({\n    prefix: util.uuidV4().substring(0, 8),\n    suffix: DEFAULT_EXT,\n  });\n  this._screenRecorder = new ScreenRecorder(udid, videoPath, {\n    timeLimit: parseInt(timeLimit, 10),\n    codec,\n    display,\n    mask,\n  });\n  try {\n    await this._screenRecorder.start();\n  } catch (e) {\n    this._screenRecorder = null;\n    throw e;\n  }\n};\n\n/**\n * @typedef {Object} StopRecordingOptions\n *\n * @property {?string} remotePath - The path to the remote location, where the resulting video should be uploaded.\n * The following protocols are supported: http/https, ftp.\n * Null or empty string value (the default setting) means the content of resulting\n * file should be encoded as Base64 and passed as the endpoint response value.\n * An exception will be thrown if the generated media file is too big to\n * fit into the available process memory.\n * @property {?string} user - The name of the user for the remote authentication.\n * @property {?string} pass - The password for the remote authentication.\n * @property {?string} method - The http multipart upload method name. The 'PUT' one is used by default.\n * @property {?Object} headers - Additional headers mapping for multipart http(s) uploads\n * @property {?string} fileFieldName [file] - The name of the form field, where the file content BLOB should be stored for\n *                                            http(s) uploads\n * @property {?Object|Array<Pair>} formFields - Additional form fields for multipart http(s) uploads\n */\n\n/**\n * Stop recording the screen.\n * If no screen recording has been started before then the method returns an empty string.\n *\n * @param {?StopRecordingOptions} options - The available options.\n * @returns {string} Base64-encoded content of the recorded media file if 'remotePath'\n * parameter is falsy or an empty string.\n * @throws {Error} If there was an error while getting the name of a media file\n * or the file content cannot be uploaded to the remote location\n * or screen recording is not supported on the device under test.\n */\ncommands.stopRecordingScreen = async function stopRecordingScreen (options = {}) {\n  if (!this._screenRecorder) {\n    log.info('No screen recording has been started. Doing nothing');\n    return '';\n  }\n\n  log.debug('Retrieving the resulting video data');\n  const videoPath = await this._screenRecorder.stop();\n  if (!videoPath) {\n    log.info('No video data is found. Returning an empty string');\n    return '';\n  }\n  return await uploadRecordedMedia(videoPath, options.remotePath, options);\n};\n\nexport default commands;\n"],"file":"lib/commands/record-screen.js","sourceRoot":"../../.."}
|
package/build/lib/driver.js
CHANGED
|
@@ -11,7 +11,7 @@ require("source-map-support/register");
|
|
|
11
11
|
|
|
12
12
|
var _lodash = _interopRequireDefault(require("lodash"));
|
|
13
13
|
|
|
14
|
-
var
|
|
14
|
+
var _baseDriver = require("@appium/base-driver");
|
|
15
15
|
|
|
16
16
|
var _logger = _interopRequireDefault(require("./logger"));
|
|
17
17
|
|
|
@@ -25,7 +25,7 @@ var _utils = require("./utils");
|
|
|
25
25
|
|
|
26
26
|
const NO_PROXY = [['GET', new RegExp('^/session/[^/]+/appium')], ['POST', new RegExp('^/session/[^/]+/appium')], ['POST', new RegExp('^/session/[^/]+/element/[^/]+/elements?$')], ['POST', new RegExp('^/session/[^/]+/elements?$')]];
|
|
27
27
|
|
|
28
|
-
class SafariDriver extends
|
|
28
|
+
class SafariDriver extends _baseDriver.BaseDriver {
|
|
29
29
|
constructor(opts = {}) {
|
|
30
30
|
super(opts);
|
|
31
31
|
this.desiredCapConstraints = _desiredCaps.desiredCapConstraints;
|
|
@@ -89,4 +89,4 @@ var _default = SafariDriver;
|
|
|
89
89
|
exports.default = _default;require('source-map-support').install();
|
|
90
90
|
|
|
91
91
|
|
|
92
|
-
//# sourceMappingURL=data:application/json;charset=utf8;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9kcml2ZXIuanMiXSwibmFtZXMiOlsiTk9fUFJPWFkiLCJSZWdFeHAiLCJTYWZhcmlEcml2ZXIiLCJCYXNlRHJpdmVyIiwiY29uc3RydWN0b3IiLCJvcHRzIiwiZGVzaXJlZENhcENvbnN0cmFpbnRzIiwibG9jYXRvclN0cmF0ZWdpZXMiLCJyZXNldFN0YXRlIiwiY21kIiwiZm4iLCJfIiwidG9QYWlycyIsImNvbW1hbmRzIiwicHJvdG90eXBlIiwic2FmYXJpIiwicHJveHlSZXFSZXMiLCJpc1Byb3h5QWN0aXZlIiwiX3NjcmVlblJlY29yZGVyIiwicHJveHlBY3RpdmUiLCJnZXRQcm94eUF2b2lkTGlzdCIsImNhblByb3h5IiwiY3JlYXRlU2Vzc2lvbiIsImFyZ3MiLCJzZXNzaW9uSWQiLCJjYXBzIiwiU2FmYXJpRHJpdmVyU2VydmVyIiwic3RhcnQiLCJlIiwiZGVsZXRlU2Vzc2lvbiIsInByb3h5IiwiYmluZCIsImxvZyIsImluZm8iLCJzdG9wIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUVBLE1BQU1BLFFBQVEsR0FBRyxDQUNmLENBQUMsS0FBRCxFQUFRLElBQUlDLE1BQUosQ0FBVyx3QkFBWCxDQUFSLENBRGUsRUFFZixDQUFDLE1BQUQsRUFBUyxJQUFJQSxNQUFKLENBQVcsd0JBQVgsQ0FBVCxDQUZlLEVBR2YsQ0FBQyxNQUFELEVBQVMsSUFBSUEsTUFBSixDQUFXLDBDQUFYLENBQVQsQ0FIZSxFQUlmLENBQUMsTUFBRCxFQUFTLElBQUlBLE1BQUosQ0FBVyw0QkFBWCxDQUFULENBSmUsQ0FBakI7O0FBT0EsTUFBTUMsWUFBTixTQUEyQkMsc0JBQTNCLENBQXNDO0FBQ3BDQyxFQUFBQSxXQUFXLENBQUVDLElBQUksR0FBRyxFQUFULEVBQWE7QUFDdEIsVUFBTUEsSUFBTjtBQUNBLFNBQUtDLHFCQUFMLEdBQTZCQSxrQ0FBN0I7QUFDQSxTQUFLQyxpQkFBTCxHQUF5QixDQUN2QixPQUR1QixFQUV2QixVQUZ1QixFQUd2QixXQUh1QixFQUl2QixtQkFKdUIsRUFLdkIsY0FMdUIsRUFPdkIsSUFQdUIsRUFRdkIsTUFSdUIsQ0FBekI7QUFVQSxTQUFLQyxVQUFMOztBQUVBLFNBQUssTUFBTSxDQUFDQyxHQUFELEVBQU1DLEVBQU4sQ0FBWCxJQUF3QkMsZ0JBQUVDLE9BQUYsQ0FBVUMsY0FBVixDQUF4QixFQUE2QztBQUMzQ1gsTUFBQUEsWUFBWSxDQUFDWSxTQUFiLENBQXVCTCxHQUF2QixJQUE4QkMsRUFBOUI7QUFDRDtBQUNGOztBQUVERixFQUFBQSxVQUFVLEdBQUk7QUFDWixTQUFLTyxNQUFMLEdBQWMsSUFBZDtBQUNBLFNBQUtDLFdBQUwsR0FBbUIsSUFBbkI7QUFDQSxTQUFLQyxhQUFMLEdBQXFCLEtBQXJCO0FBQ0EsU0FBS0MsZUFBTCxHQUF1QixJQUF2QjtBQUNEOztBQUVEQyxFQUFBQSxXQUFXLEdBQUk7QUFDYixXQUFPLEtBQUtGLGFBQVo7QUFDRDs7QUFFREcsRUFBQUEsaUJBQWlCLEdBQUk7QUFDbkIsV0FBT3BCLFFBQVA7QUFDRDs7QUFFRHFCLEVBQUFBLFFBQVEsR0FBSTtBQUNWLFdBQU8sSUFBUDtBQUNEOztBQUVrQixRQUFiQyxhQUFhLENBQUUsR0FBR0MsSUFBTCxFQUFXO0FBQzVCLFVBQU0sQ0FBQ0MsU0FBRCxFQUFZQyxJQUFaLElBQW9CLE1BQU0sTUFBTUgsYUFBTixDQUFvQixHQUFHQyxJQUF2QixDQUFoQztBQUNBLFNBQUtSLE1BQUwsR0FBYyxJQUFJVyxlQUFKLEVBQWQ7O0FBQ0EsUUFBSTtBQUNGLFlBQU0sS0FBS1gsTUFBTCxDQUFZWSxLQUFaLENBQWtCLGdDQUFvQkYsSUFBcEIsQ0FBbEIsQ0FBTjtBQUNELEtBRkQsQ0FFRSxPQUFPRyxDQUFQLEVBQVU7QUFDVixZQUFNLEtBQUtDLGFBQUwsRUFBTjtBQUNBLFlBQU1ELENBQU47QUFDRDs7QUFDRCxTQUFLWixXQUFMLEdBQW1CLEtBQUtELE1BQUwsQ0FBWWUsS0FBWixDQUFrQmQsV0FBbEIsQ0FBOEJlLElBQTlCLENBQW1DLEtBQUtoQixNQUFMLENBQVllLEtBQS9DLENBQW5CO0FBQ0EsU0FBS2IsYUFBTCxHQUFxQixJQUFyQjtBQUNBLFdBQU8sQ0FBQ08sU0FBRCxFQUFZQyxJQUFaLENBQVA7QUFDRDs7QUFFa0IsUUFBYkksYUFBYSxHQUFJO0FBQUE7O0FBQ3JCRyxvQkFBSUMsSUFBSixDQUFTLHVCQUFUOztBQUNBLG9DQUFNLEtBQUtmLGVBQVgsMERBQU0sc0JBQXNCZ0IsSUFBdEIsQ0FBMkIsSUFBM0IsQ0FBTjtBQUNBLDJCQUFNLEtBQUtuQixNQUFYLGlEQUFNLGFBQWFtQixJQUFiLEVBQU47QUFDQSxTQUFLMUIsVUFBTDtBQUVBLFVBQU0sTUFBTXFCLGFBQU4sRUFBTjtBQUNEOztBQTdEbUM7O2VBZ0V2QjNCLFkiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXyBmcm9tICdsb2Rhc2gnO1xuaW1wb3J0IHsgQmFzZURyaXZlciB9IGZyb20gJ0BhcHBpdW0vYmFzZS1kcml2ZXInO1xuaW1wb3J0IGxvZyBmcm9tICcuL2xvZ2dlcic7XG5pbXBvcnQgU2FmYXJpRHJpdmVyU2VydmVyIGZyb20gJy4vc2FmYXJpJztcbmltcG9ydCB7IGRlc2lyZWRDYXBDb25zdHJhaW50cyB9IGZyb20gJy4vZGVzaXJlZC1jYXBzJztcbmltcG9ydCBjb21tYW5kcyBmcm9tICcuL2NvbW1hbmRzL2luZGV4JztcbmltcG9ydCB7IGZvcm1hdENhcHNGb3JTZXJ2ZXIgfSBmcm9tICcuL3V0aWxzJztcblxuY29uc3QgTk9fUFJPWFkgPSBbXG4gIFsnR0VUJywgbmV3IFJlZ0V4cCgnXi9zZXNzaW9uL1teL10rL2FwcGl1bScpXSxcbiAgWydQT1NUJywgbmV3IFJlZ0V4cCgnXi9zZXNzaW9uL1teL10rL2FwcGl1bScpXSxcbiAgWydQT1NUJywgbmV3IFJlZ0V4cCgnXi9zZXNzaW9uL1teL10rL2VsZW1lbnQvW14vXSsvZWxlbWVudHM/JCcpXSxcbiAgWydQT1NUJywgbmV3IFJlZ0V4cCgnXi9zZXNzaW9uL1teL10rL2VsZW1lbnRzPyQnKV0sXG5dO1xuXG5jbGFzcyBTYWZhcmlEcml2ZXIgZXh0ZW5kcyBCYXNlRHJpdmVyIHtcbiAgY29uc3RydWN0b3IgKG9wdHMgPSB7fSkge1xuICAgIHN1cGVyKG9wdHMpO1xuICAgIHRoaXMuZGVzaXJlZENhcENvbnN0cmFpbnRzID0gZGVzaXJlZENhcENvbnN0cmFpbnRzO1xuICAgIHRoaXMubG9jYXRvclN0cmF0ZWdpZXMgPSBbXG4gICAgICAneHBhdGgnLFxuICAgICAgJ3RhZyBuYW1lJyxcbiAgICAgICdsaW5rIHRleHQnLFxuICAgICAgJ3BhcnRpYWwgbGluayB0ZXh0JyxcbiAgICAgICdjc3Mgc2VsZWN0b3InLFxuICAgICAgLy8gTGV0IHRoZXNlIHR3byByZWFjaCBTYWZhcmkgRHJpdmVyIGFuZCBmYWlsIHRoZXJlIHdpdGggYSBwcm9wZXIgZXJyb3IgbWVzc2FnZVxuICAgICAgJ2lkJyxcbiAgICAgICduYW1lJyxcbiAgICBdO1xuICAgIHRoaXMucmVzZXRTdGF0ZSgpO1xuXG4gICAgZm9yIChjb25zdCBbY21kLCBmbl0gb2YgXy50b1BhaXJzKGNvbW1hbmRzKSkge1xuICAgICAgU2FmYXJpRHJpdmVyLnByb3RvdHlwZVtjbWRdID0gZm47XG4gICAgfVxuICB9XG5cbiAgcmVzZXRTdGF0ZSAoKSB7XG4gICAgdGhpcy5zYWZhcmkgPSBudWxsO1xuICAgIHRoaXMucHJveHlSZXFSZXMgPSBudWxsO1xuICAgIHRoaXMuaXNQcm94eUFjdGl2ZSA9IGZhbHNlO1xuICAgIHRoaXMuX3NjcmVlblJlY29yZGVyID0gbnVsbDtcbiAgfVxuXG4gIHByb3h5QWN0aXZlICgpIHtcbiAgICByZXR1cm4gdGhpcy5pc1Byb3h5QWN0aXZlO1xuICB9XG5cbiAgZ2V0UHJveHlBdm9pZExpc3QgKCkge1xuICAgIHJldHVybiBOT19QUk9YWTtcbiAgfVxuXG4gIGNhblByb3h5ICgpIHtcbiAgICByZXR1cm4gdHJ1ZTtcbiAgfVxuXG4gIGFzeW5jIGNyZWF0ZVNlc3Npb24gKC4uLmFyZ3MpIHtcbiAgICBjb25zdCBbc2Vzc2lvbklkLCBjYXBzXSA9IGF3YWl0IHN1cGVyLmNyZWF0ZVNlc3Npb24oLi4uYXJncyk7XG4gICAgdGhpcy5zYWZhcmkgPSBuZXcgU2FmYXJpRHJpdmVyU2VydmVyKCk7XG4gICAgdHJ5IHtcbiAgICAgIGF3YWl0IHRoaXMuc2FmYXJpLnN0YXJ0KGZvcm1hdENhcHNGb3JTZXJ2ZXIoY2FwcykpO1xuICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgIGF3YWl0IHRoaXMuZGVsZXRlU2Vzc2lvbigpO1xuICAgICAgdGhyb3cgZTtcbiAgICB9XG4gICAgdGhpcy5wcm94eVJlcVJlcyA9IHRoaXMuc2FmYXJpLnByb3h5LnByb3h5UmVxUmVzLmJpbmQodGhpcy5zYWZhcmkucHJveHkpO1xuICAgIHRoaXMuaXNQcm94eUFjdGl2ZSA9IHRydWU7XG4gICAgcmV0dXJuIFtzZXNzaW9uSWQsIGNhcHNdO1xuICB9XG5cbiAgYXN5bmMgZGVsZXRlU2Vzc2lvbiAoKSB7XG4gICAgbG9nLmluZm8oJ0VuZGluZyBTYWZhcmkgc2Vzc2lvbicpO1xuICAgIGF3YWl0IHRoaXMuX3NjcmVlblJlY29yZGVyPy5zdG9wKHRydWUpO1xuICAgIGF3YWl0IHRoaXMuc2FmYXJpPy5zdG9wKCk7XG4gICAgdGhpcy5yZXNldFN0YXRlKCk7XG5cbiAgICBhd2FpdCBzdXBlci5kZWxldGVTZXNzaW9uKCk7XG4gIH1cbn1cblxuZXhwb3J0IGRlZmF1bHQgU2FmYXJpRHJpdmVyO1xuIl0sImZpbGUiOiJsaWIvZHJpdmVyLmpzIiwic291cmNlUm9vdCI6Ii4uLy4uIn0=
|
package/build/lib/logger.js
CHANGED
|
@@ -7,12 +7,12 @@ exports.default = void 0;
|
|
|
7
7
|
|
|
8
8
|
require("source-map-support/register");
|
|
9
9
|
|
|
10
|
-
var
|
|
10
|
+
var _support = require("@appium/support");
|
|
11
11
|
|
|
12
|
-
const log =
|
|
12
|
+
const log = _support.logger.getLogger('Safari');
|
|
13
13
|
|
|
14
14
|
var _default = log;
|
|
15
15
|
exports.default = _default;require('source-map-support').install();
|
|
16
16
|
|
|
17
17
|
|
|
18
|
-
//# sourceMappingURL=data:application/json;charset=utf8;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9sb2dnZXIuanMiXSwibmFtZXMiOlsibG9nIiwibG9nZ2VyIiwiZ2V0TG9nZ2VyIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQTs7QUFFQSxNQUFNQSxHQUFHLEdBQUdDLGdCQUFPQyxTQUFQLENBQWlCLFFBQWpCLENBQVo7O2VBRWVGLEciLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBsb2dnZXIgfSBmcm9tICdAYXBwaXVtL3N1cHBvcnQnO1xuXG5jb25zdCBsb2cgPSBsb2dnZXIuZ2V0TG9nZ2VyKCdTYWZhcmknKTtcblxuZXhwb3J0IGRlZmF1bHQgbG9nO1xuIl0sImZpbGUiOiJsaWIvbG9nZ2VyLmpzIiwic291cmNlUm9vdCI6Ii4uLy4uIn0=
|
package/build/lib/safari.js
CHANGED
|
@@ -13,9 +13,9 @@ var _os = _interopRequireDefault(require("os"));
|
|
|
13
13
|
|
|
14
14
|
var _path = _interopRequireDefault(require("path"));
|
|
15
15
|
|
|
16
|
-
var
|
|
16
|
+
var _baseDriver = require("@appium/base-driver");
|
|
17
17
|
|
|
18
|
-
var
|
|
18
|
+
var _support = require("@appium/support");
|
|
19
19
|
|
|
20
20
|
var _teen_process = require("teen_process");
|
|
21
21
|
|
|
@@ -25,21 +25,21 @@ var _portscanner = require("portscanner");
|
|
|
25
25
|
|
|
26
26
|
var _child_process = require("child_process");
|
|
27
27
|
|
|
28
|
-
const log =
|
|
28
|
+
const log = _support.logger.getLogger('SafariDriverServer');
|
|
29
29
|
|
|
30
30
|
const SD_BINARY = 'safaridriver';
|
|
31
31
|
const STARTUP_TIMEOUT = 10000;
|
|
32
32
|
const SAFARI_PORT_RANGE = [5100, 5200];
|
|
33
33
|
|
|
34
|
-
const SAFARI_SERVER_GUARD =
|
|
34
|
+
const SAFARI_SERVER_GUARD = _support.util.getLockFileGuard(_path.default.resolve(_os.default.tmpdir(), 'safari_server_guard.lock'), {
|
|
35
35
|
timeout: 5,
|
|
36
36
|
tryRecovery: true
|
|
37
37
|
});
|
|
38
38
|
|
|
39
|
-
class SafariProxy extends
|
|
39
|
+
class SafariProxy extends _baseDriver.JWProxy {
|
|
40
40
|
async proxyCommand(url, method, body = null) {
|
|
41
41
|
if (this.didProcessExit) {
|
|
42
|
-
throw new
|
|
42
|
+
throw new _baseDriver.errors.InvalidContextError(`'${method} ${url}' cannot be proxied to Safari Driver server because ` + 'the process is not running (probably crashed). Check the server log for more details');
|
|
43
43
|
}
|
|
44
44
|
|
|
45
45
|
return await super.proxyCommand(url, method, body);
|
|
@@ -56,7 +56,7 @@ class SafariDriverProcess {
|
|
|
56
56
|
get isRunning() {
|
|
57
57
|
var _this$proc;
|
|
58
58
|
|
|
59
|
-
return !!((_this$proc = this.proc)
|
|
59
|
+
return !!((_this$proc = this.proc) !== null && _this$proc !== void 0 && _this$proc.isRunning);
|
|
60
60
|
}
|
|
61
61
|
|
|
62
62
|
async init() {
|
|
@@ -76,7 +76,7 @@ class SafariDriverProcess {
|
|
|
76
76
|
let safariBin;
|
|
77
77
|
|
|
78
78
|
try {
|
|
79
|
-
safariBin = await
|
|
79
|
+
safariBin = await _support.fs.which(SD_BINARY);
|
|
80
80
|
} catch (e) {
|
|
81
81
|
throw new Error(`${SD_BINARY} binary cannot be found in PATH. ` + `Please make sure it is present on your system`);
|
|
82
82
|
}
|
|
@@ -179,7 +179,7 @@ class SafariDriverServer {
|
|
|
179
179
|
return;
|
|
180
180
|
}
|
|
181
181
|
|
|
182
|
-
if ((_this$proxy = this.proxy)
|
|
182
|
+
if ((_this$proxy = this.proxy) !== null && _this$proxy !== void 0 && _this$proxy.sessionId) {
|
|
183
183
|
try {
|
|
184
184
|
await this.proxy.command(`/session/${this.proxy.sessionId}`, 'DELETE');
|
|
185
185
|
} catch (e) {
|
|
@@ -194,4 +194,4 @@ var _default = SafariDriverServer;
|
|
|
194
194
|
exports.default = _default;require('source-map-support').install();
|
|
195
195
|
|
|
196
196
|
|
|
197
|
-
//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/safari.js"],"names":["log","logger","getLogger","SD_BINARY","STARTUP_TIMEOUT","SAFARI_PORT_RANGE","SAFARI_SERVER_GUARD","util","getLockFileGuard","path","resolve","os","tmpdir","timeout","tryRecovery","SafariProxy","JWProxy","proxyCommand","url","method","body","didProcessExit","errors","InvalidContextError","SafariDriverProcess","constructor","port","proc","isRunning","init","startPort","endPort","e","Error","safariBin","fs","which","SubProcess","on","stdout","stderr","line","debug","code","signal","info","start","kill","stop","ign","SAFARI_DRIVER_PROCESS","process","once","pid","SafariDriverServer","proxy","caps","server","base","keepAlive","command","err","message","waitMs","intervalMs","test","capabilities","firstMatch","alwaysMatch","sessionId"],"mappings":"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","sourcesContent":["import os from 'os';\nimport path from 'path';\nimport { JWProxy, errors } from 'appium-base-driver';\nimport { fs, logger, util } from 'appium-support';\nimport { SubProcess } from 'teen_process';\nimport { waitForCondition } from 'asyncbox';\nimport { findAPortNotInUse } from 'portscanner';\nimport { execSync } from 'child_process';\n\nconst log = logger.getLogger('SafariDriverServer');\n\nconst SD_BINARY = 'safaridriver';\nconst STARTUP_TIMEOUT = 10000; // seconds\nconst SAFARI_PORT_RANGE = [5100, 5200];\n// This guard is needed to make sure\n// we never run multiple Safari driver processes for the same Appium process\nconst SAFARI_SERVER_GUARD = util.getLockFileGuard(\n  path.resolve(os.tmpdir(), 'safari_server_guard.lock'),\n  {timeout: 5, tryRecovery: true}\n);\n\n\nclass SafariProxy extends JWProxy {\n  async proxyCommand (url, method, body = null) {\n    if (this.didProcessExit) {\n      throw new errors.InvalidContextError(\n        `'${method} ${url}' cannot be proxied to Safari Driver server because ` +\n        'the process is not running (probably crashed). Check the server log for more details');\n    }\n    return await super.proxyCommand(url, method, body);\n  }\n}\n\n\nclass SafariDriverProcess {\n  constructor () {\n    this.port = null;\n    this.proc = null;\n  }\n\n  get isRunning () {\n    return !!(this.proc?.isRunning);\n  }\n\n  async init () {\n    await SAFARI_SERVER_GUARD(async () => {\n      if (this.isRunning) {\n        return;\n      }\n\n      const [startPort, endPort] = SAFARI_PORT_RANGE;\n      try {\n        this.port = await findAPortNotInUse(startPort, endPort);\n      } catch (e) {\n        throw new Error(\n          `Cannot find any free port in range ${startPort}..${endPort}. ` +\n          `Double check the processes that are locking ports within this range and terminate ` +\n          `these which are not needed anymore`);\n      }\n\n      let safariBin;\n      try {\n        safariBin = await fs.which(SD_BINARY);\n      } catch (e) {\n        throw new Error(`${SD_BINARY} binary cannot be found in PATH. ` +\n          `Please make sure it is present on your system`);\n      }\n      this.proc = new SubProcess(safariBin, ['-p', this.port, '--diagnose']);\n      this.proc.on('output', (stdout, stderr) => {\n        const line = stdout || stderr;\n        log.debug(`[${SD_BINARY}] ${line}`);\n      });\n      this.proc.on('exit', (code, signal) => {\n        log.info(`${SD_BINARY} has exited with code ${code}, signal ${signal}`);\n      });\n      log.info(`Starting '${safariBin}' on port ${this.port}`);\n      await this.proc.start(0);\n    });\n  }\n\n  async kill () {\n    if (this.isRunning) {\n      try {\n        await this.proc.stop('SIGKILL');\n      } catch (ign) {}\n    }\n  }\n}\n\n// Single server process per Appium instance\nconst SAFARI_DRIVER_PROCESS = new SafariDriverProcess();\nprocess.once('exit', () => {\n  if (SAFARI_DRIVER_PROCESS.isRunning) {\n    try {\n      execSync(`kill ${SAFARI_DRIVER_PROCESS.proc.pid}`);\n    } catch (ign) {}\n  }\n});\n\nclass SafariDriverServer {\n  constructor () {\n    this.proxy = null;\n  }\n\n  get isRunning () {\n    return !!(SAFARI_DRIVER_PROCESS.isRunning);\n  }\n\n  async start (caps) {\n    await SAFARI_DRIVER_PROCESS.init();\n\n    this.proxy = new SafariProxy({\n      server: '127.0.0.1',\n      port: SAFARI_DRIVER_PROCESS.port,\n      base: '',\n      keepAlive: true,\n    });\n    this.proxy.didProcessExit = false;\n    SAFARI_DRIVER_PROCESS.proc.on('exit', () => {\n      this.proxy.didProcessExit = true;\n    });\n\n    try {\n      await waitForCondition(async () => {\n        try {\n          await this.proxy.command('/status', 'GET');\n          return true;\n        } catch (err) {\n          if (this.proxy.didProcessExit) {\n            throw new Error(err.message);\n          }\n          return false;\n        }\n      }, {\n        waitMs: STARTUP_TIMEOUT,\n        intervalMs: 1000,\n      });\n    } catch (e) {\n      if (/Condition unmet/.test(e.message)) {\n        if (SAFARI_DRIVER_PROCESS.isRunning) {\n          // avoid \"frozen\" processes,\n          await SAFARI_DRIVER_PROCESS.kill();\n        }\n        throw new Error(`Safari Driver server is not listening within ${STARTUP_TIMEOUT}ms timeout. ` +\n          `Make sure it has been executed manually at least once with '--enable' command line argument. ` +\n          `Check the server log for more details`);\n      }\n      throw e;\n    }\n\n    await this.proxy.command('/session', 'POST', {\n      capabilities: {\n        firstMatch: [{}],\n        alwaysMatch: caps,\n      }\n    });\n  }\n\n  async stop () {\n    if (!this.isRunning) {\n      log.info(`${SD_BINARY} session cannot be stopped, because the server is not running`);\n      return;\n    }\n\n    if (this.proxy?.sessionId) {\n      try {\n        await this.proxy.command(`/session/${this.proxy.sessionId}`, 'DELETE');\n      } catch (e) {\n        log.info(`${SD_BINARY} session cannot be deleted. Original error: ${e.message}`);\n      }\n    }\n  }\n}\n\nexport default SafariDriverServer;\n"],"file":"lib/safari.js","sourceRoot":"../.."}
|
|
197
|
+
//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/safari.js"],"names":["log","logger","getLogger","SD_BINARY","STARTUP_TIMEOUT","SAFARI_PORT_RANGE","SAFARI_SERVER_GUARD","util","getLockFileGuard","path","resolve","os","tmpdir","timeout","tryRecovery","SafariProxy","JWProxy","proxyCommand","url","method","body","didProcessExit","errors","InvalidContextError","SafariDriverProcess","constructor","port","proc","isRunning","init","startPort","endPort","e","Error","safariBin","fs","which","SubProcess","on","stdout","stderr","line","debug","code","signal","info","start","kill","stop","ign","SAFARI_DRIVER_PROCESS","process","once","pid","SafariDriverServer","proxy","caps","server","base","keepAlive","command","err","message","waitMs","intervalMs","test","capabilities","firstMatch","alwaysMatch","sessionId"],"mappings":"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","sourcesContent":["import os from 'os';\nimport path from 'path';\nimport { JWProxy, errors } from '@appium/base-driver';\nimport { fs, logger, util } from '@appium/support';\nimport { SubProcess } from 'teen_process';\nimport { waitForCondition } from 'asyncbox';\nimport { findAPortNotInUse } from 'portscanner';\nimport { execSync } from 'child_process';\n\nconst log = logger.getLogger('SafariDriverServer');\n\nconst SD_BINARY = 'safaridriver';\nconst STARTUP_TIMEOUT = 10000; // seconds\nconst SAFARI_PORT_RANGE = [5100, 5200];\n// This guard is needed to make sure\n// we never run multiple Safari driver processes for the same Appium process\nconst SAFARI_SERVER_GUARD = util.getLockFileGuard(\n  path.resolve(os.tmpdir(), 'safari_server_guard.lock'),\n  {timeout: 5, tryRecovery: true}\n);\n\n\nclass SafariProxy extends JWProxy {\n  async proxyCommand (url, method, body = null) {\n    if (this.didProcessExit) {\n      throw new errors.InvalidContextError(\n        `'${method} ${url}' cannot be proxied to Safari Driver server because ` +\n        'the process is not running (probably crashed). Check the server log for more details');\n    }\n    return await super.proxyCommand(url, method, body);\n  }\n}\n\n\nclass SafariDriverProcess {\n  constructor () {\n    this.port = null;\n    this.proc = null;\n  }\n\n  get isRunning () {\n    return !!(this.proc?.isRunning);\n  }\n\n  async init () {\n    await SAFARI_SERVER_GUARD(async () => {\n      if (this.isRunning) {\n        return;\n      }\n\n      const [startPort, endPort] = SAFARI_PORT_RANGE;\n      try {\n        this.port = await findAPortNotInUse(startPort, endPort);\n      } catch (e) {\n        throw new Error(\n          `Cannot find any free port in range ${startPort}..${endPort}. ` +\n          `Double check the processes that are locking ports within this range and terminate ` +\n          `these which are not needed anymore`);\n      }\n\n      let safariBin;\n      try {\n        safariBin = await fs.which(SD_BINARY);\n      } catch (e) {\n        throw new Error(`${SD_BINARY} binary cannot be found in PATH. ` +\n          `Please make sure it is present on your system`);\n      }\n      this.proc = new SubProcess(safariBin, ['-p', this.port, '--diagnose']);\n      this.proc.on('output', (stdout, stderr) => {\n        const line = stdout || stderr;\n        log.debug(`[${SD_BINARY}] ${line}`);\n      });\n      this.proc.on('exit', (code, signal) => {\n        log.info(`${SD_BINARY} has exited with code ${code}, signal ${signal}`);\n      });\n      log.info(`Starting '${safariBin}' on port ${this.port}`);\n      await this.proc.start(0);\n    });\n  }\n\n  async kill () {\n    if (this.isRunning) {\n      try {\n        await this.proc.stop('SIGKILL');\n      } catch (ign) {}\n    }\n  }\n}\n\n// Single server process per Appium instance\nconst SAFARI_DRIVER_PROCESS = new SafariDriverProcess();\nprocess.once('exit', () => {\n  if (SAFARI_DRIVER_PROCESS.isRunning) {\n    try {\n      execSync(`kill ${SAFARI_DRIVER_PROCESS.proc.pid}`);\n    } catch (ign) {}\n  }\n});\n\nclass SafariDriverServer {\n  constructor () {\n    this.proxy = null;\n  }\n\n  get isRunning () {\n    return !!(SAFARI_DRIVER_PROCESS.isRunning);\n  }\n\n  async start (caps) {\n    await SAFARI_DRIVER_PROCESS.init();\n\n    this.proxy = new SafariProxy({\n      server: '127.0.0.1',\n      port: SAFARI_DRIVER_PROCESS.port,\n      base: '',\n      keepAlive: true,\n    });\n    this.proxy.didProcessExit = false;\n    SAFARI_DRIVER_PROCESS.proc.on('exit', () => {\n      this.proxy.didProcessExit = true;\n    });\n\n    try {\n      await waitForCondition(async () => {\n        try {\n          await this.proxy.command('/status', 'GET');\n          return true;\n        } catch (err) {\n          if (this.proxy.didProcessExit) {\n            throw new Error(err.message);\n          }\n          return false;\n        }\n      }, {\n        waitMs: STARTUP_TIMEOUT,\n        intervalMs: 1000,\n      });\n    } catch (e) {\n      if (/Condition unmet/.test(e.message)) {\n        if (SAFARI_DRIVER_PROCESS.isRunning) {\n          // avoid \"frozen\" processes,\n          await SAFARI_DRIVER_PROCESS.kill();\n        }\n        throw new Error(`Safari Driver server is not listening within ${STARTUP_TIMEOUT}ms timeout. ` +\n          `Make sure it has been executed manually at least once with '--enable' command line argument. ` +\n          `Check the server log for more details`);\n      }\n      throw e;\n    }\n\n    await this.proxy.command('/session', 'POST', {\n      capabilities: {\n        firstMatch: [{}],\n        alwaysMatch: caps,\n      }\n    });\n  }\n\n  async stop () {\n    if (!this.isRunning) {\n      log.info(`${SD_BINARY} session cannot be stopped, because the server is not running`);\n      return;\n    }\n\n    if (this.proxy?.sessionId) {\n      try {\n        await this.proxy.command(`/session/${this.proxy.sessionId}`, 'DELETE');\n      } catch (e) {\n        log.info(`${SD_BINARY} session cannot be deleted. Original error: ${e.message}`);\n      }\n    }\n  }\n}\n\nexport default SafariDriverServer;\n"],"file":"lib/safari.js","sourceRoot":"../.."}
|
package/build/lib/server.js
CHANGED
|
@@ -11,7 +11,7 @@ require("source-map-support/register");
|
|
|
11
11
|
|
|
12
12
|
var _logger = _interopRequireDefault(require("./logger"));
|
|
13
13
|
|
|
14
|
-
var
|
|
14
|
+
var _baseDriver = require("@appium/base-driver");
|
|
15
15
|
|
|
16
16
|
var _driver = _interopRequireDefault(require("./driver"));
|
|
17
17
|
|
|
@@ -20,8 +20,8 @@ async function startServer(port, address) {
|
|
|
20
20
|
port,
|
|
21
21
|
address
|
|
22
22
|
});
|
|
23
|
-
let routeConfiguringFunction = (0,
|
|
24
|
-
let server = await (0,
|
|
23
|
+
let routeConfiguringFunction = (0, _baseDriver.routeConfiguringFunction)(d);
|
|
24
|
+
let server = await (0, _baseDriver.server)({
|
|
25
25
|
routeConfiguringFunction,
|
|
26
26
|
port,
|
|
27
27
|
hostname: address
|
|
@@ -33,4 +33,4 @@ async function startServer(port, address) {
|
|
|
33
33
|
}require('source-map-support').install();
|
|
34
34
|
|
|
35
35
|
|
|
36
|
-
//# sourceMappingURL=data:application/json;charset=utf8;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9zZXJ2ZXIuanMiXSwibmFtZXMiOlsic3RhcnRTZXJ2ZXIiLCJwb3J0IiwiYWRkcmVzcyIsImQiLCJTYWZhcmlEcml2ZXIiLCJyb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24iLCJzZXJ2ZXIiLCJob3N0bmFtZSIsImxvZyIsImluZm8iXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUE7O0FBQ0E7O0FBR0E7O0FBRUEsZUFBZUEsV0FBZixDQUE0QkMsSUFBNUIsRUFBa0NDLE9BQWxDLEVBQTJDO0FBQ3pDLE1BQUlDLENBQUMsR0FBRyxJQUFJQyxlQUFKLENBQWlCO0FBQUNILElBQUFBLElBQUQ7QUFBT0MsSUFBQUE7QUFBUCxHQUFqQixDQUFSO0FBQ0EsTUFBSUcsd0JBQXdCLEdBQUcsMENBQVdGLENBQVgsQ0FBL0I7QUFDQSxNQUFJRyxNQUFNLEdBQUcsTUFBTSx3QkFBVztBQUFDRCxJQUFBQSx3QkFBRDtBQUEyQkosSUFBQUEsSUFBM0I7QUFBaUNNLElBQUFBLFFBQVEsRUFBRUw7QUFBM0MsR0FBWCxDQUFuQjs7QUFDQU0sa0JBQUlDLElBQUosQ0FBVSwyQ0FBMENQLE9BQVEsSUFBR0QsSUFBSyxFQUFwRTs7QUFDQSxTQUFPSyxNQUFQO0FBQ0QiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgbG9nIGZyb20gJy4vbG9nZ2VyJztcbmltcG9ydCB7XG4gIHNlcnZlciBhcyBiYXNlU2VydmVyLCByb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24gYXMgbWFrZVJvdXRlclxufSBmcm9tICdAYXBwaXVtL2Jhc2UtZHJpdmVyJztcbmltcG9ydCBTYWZhcmlEcml2ZXIgZnJvbSAnLi9kcml2ZXInO1xuXG5hc3luYyBmdW5jdGlvbiBzdGFydFNlcnZlciAocG9ydCwgYWRkcmVzcykge1xuICBsZXQgZCA9IG5ldyBTYWZhcmlEcml2ZXIoe3BvcnQsIGFkZHJlc3N9KTtcbiAgbGV0IHJvdXRlQ29uZmlndXJpbmdGdW5jdGlvbiA9IG1ha2VSb3V0ZXIoZCk7XG4gIGxldCBzZXJ2ZXIgPSBhd2FpdCBiYXNlU2VydmVyKHtyb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24sIHBvcnQsIGhvc3RuYW1lOiBhZGRyZXNzfSk7XG4gIGxvZy5pbmZvKGBTYWZhcmlEcml2ZXIgc2VydmVyIGxpc3RlbmluZyBvbiBodHRwOi8vJHthZGRyZXNzfToke3BvcnR9YCk7XG4gIHJldHVybiBzZXJ2ZXI7XG59XG5cbmV4cG9ydCB7IHN0YXJ0U2VydmVyIH07XG4iXSwiZmlsZSI6ImxpYi9zZXJ2ZXIuanMiLCJzb3VyY2VSb290IjoiLi4vLi4ifQ==
|
|
@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
4
4
|
|
|
5
5
|
require("source-map-support/register");
|
|
6
6
|
|
|
7
|
-
var
|
|
7
|
+
var _webdriverio = require("webdriverio");
|
|
8
8
|
|
|
9
9
|
var _ = require("../..");
|
|
10
10
|
|
|
@@ -36,21 +36,24 @@ describe('Desktop SafariDriver', function () {
|
|
|
36
36
|
}
|
|
37
37
|
});
|
|
38
38
|
beforeEach(async function () {
|
|
39
|
-
driver =
|
|
40
|
-
|
|
39
|
+
driver = await (0, _webdriverio.remote)({
|
|
40
|
+
hostname: _utils.HOST,
|
|
41
|
+
port: _utils.PORT,
|
|
42
|
+
capabilities: CAPS
|
|
43
|
+
});
|
|
41
44
|
});
|
|
42
45
|
afterEach(async function () {
|
|
43
46
|
if (driver) {
|
|
44
|
-
await driver.
|
|
47
|
+
await driver.deleteSession();
|
|
45
48
|
driver = null;
|
|
46
49
|
}
|
|
47
50
|
});
|
|
48
51
|
it('should start and stop a session', async function () {
|
|
49
|
-
await driver.
|
|
50
|
-
const button = await driver
|
|
51
|
-
await button.
|
|
52
|
+
await driver.url('https://appium.io/');
|
|
53
|
+
const button = await driver.$('#downloadLink');
|
|
54
|
+
await button.getText().should.eventually.eql('Download Appium');
|
|
52
55
|
});
|
|
53
56
|
});require('source-map-support').install();
|
|
54
57
|
|
|
55
58
|
|
|
56
|
-
//# sourceMappingURL=data:application/json;charset=utf8;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvZnVuY3Rpb25hbC9kZXNrdG9wLWRyaXZlci1lMmUtc3BlY3MuanMiXSwibmFtZXMiOlsiY2hhaSIsInNob3VsZCIsInVzZSIsImNoYWlBc1Byb21pc2VkIiwiQ0FQUyIsImJyb3dzZXJOYW1lIiwicGxhdGZvcm1OYW1lIiwiZGVzY3JpYmUiLCJ0aW1lb3V0IiwiTU9DSEFfVElNRU9VVCIsInNlcnZlciIsImRyaXZlciIsImJlZm9yZSIsIlBPUlQiLCJIT1NUIiwiYWZ0ZXIiLCJjbG9zZSIsImJlZm9yZUVhY2giLCJob3N0bmFtZSIsInBvcnQiLCJjYXBhYmlsaXRpZXMiLCJhZnRlckVhY2giLCJkZWxldGVTZXNzaW9uIiwiaXQiLCJ1cmwiLCJidXR0b24iLCIkIiwiZ2V0VGV4dCIsImV2ZW50dWFsbHkiLCJlcWwiXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUVBQSxjQUFLQyxNQUFMOztBQUNBRCxjQUFLRSxHQUFMLENBQVNDLHVCQUFUOztBQUdBLE1BQU1DLElBQUksR0FBRztBQUNYQyxFQUFBQSxXQUFXLEVBQUUsY0FERjtBQUVYQyxFQUFBQSxZQUFZLEVBQUU7QUFGSCxDQUFiO0FBS0FDLFFBQVEsQ0FBQyxzQkFBRCxFQUF5QixZQUFZO0FBQzNDLE9BQUtDLE9BQUwsQ0FBYUMsb0JBQWI7QUFFQSxNQUFJQyxNQUFKO0FBQ0EsTUFBSUMsTUFBSjtBQUNBQyxFQUFBQSxNQUFNLENBQUMsa0JBQWtCO0FBQ3ZCRixJQUFBQSxNQUFNLEdBQUcsTUFBTSxtQkFBWUcsV0FBWixFQUFrQkMsV0FBbEIsQ0FBZjtBQUNELEdBRkssQ0FBTjtBQUdBQyxFQUFBQSxLQUFLLENBQUMsa0JBQWtCO0FBQ3RCLFFBQUlMLE1BQUosRUFBWTtBQUNWLFlBQU1BLE1BQU0sQ0FBQ00sS0FBUCxFQUFOO0FBQ0FOLE1BQUFBLE1BQU0sR0FBRyxJQUFUO0FBQ0Q7QUFDRixHQUxJLENBQUw7QUFNQU8sRUFBQUEsVUFBVSxDQUFDLGtCQUFrQjtBQUMzQk4sSUFBQUEsTUFBTSxHQUFHLE1BQU0seUJBQU87QUFDcEJPLE1BQUFBLFFBQVEsRUFBRUosV0FEVTtBQUVwQkssTUFBQUEsSUFBSSxFQUFFTixXQUZjO0FBR3BCTyxNQUFBQSxZQUFZLEVBQUVoQjtBQUhNLEtBQVAsQ0FBZjtBQUtELEdBTlMsQ0FBVjtBQU9BaUIsRUFBQUEsU0FBUyxDQUFDLGtCQUFrQjtBQUMxQixRQUFJVixNQUFKLEVBQVk7QUFDVixZQUFNQSxNQUFNLENBQUNXLGFBQVAsRUFBTjtBQUNBWCxNQUFBQSxNQUFNLEdBQUcsSUFBVDtBQUNEO0FBQ0YsR0FMUSxDQUFUO0FBT0FZLEVBQUFBLEVBQUUsQ0FBQyxpQ0FBRCxFQUFvQyxrQkFBa0I7QUFDdEQsVUFBTVosTUFBTSxDQUFDYSxHQUFQLENBQVcsb0JBQVgsQ0FBTjtBQUNBLFVBQU1DLE1BQU0sR0FBRyxNQUFNZCxNQUFNLENBQUNlLENBQVAsQ0FBUyxlQUFULENBQXJCO0FBQ0EsVUFBTUQsTUFBTSxDQUFDRSxPQUFQLEdBQWlCMUIsTUFBakIsQ0FBd0IyQixVQUF4QixDQUFtQ0MsR0FBbkMsQ0FBdUMsaUJBQXZDLENBQU47QUFDRCxHQUpDLENBQUY7QUFLRCxDQWpDTyxDQUFSIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgcmVtb3RlIH0gZnJvbSAnd2ViZHJpdmVyaW8nO1xuaW1wb3J0IHsgc3RhcnRTZXJ2ZXIgfSBmcm9tICcuLi8uLic7XG5pbXBvcnQgY2hhaUFzUHJvbWlzZWQgZnJvbSAnY2hhaS1hcy1wcm9taXNlZCc7XG5pbXBvcnQgY2hhaSBmcm9tICdjaGFpJztcbmltcG9ydCB7IEhPU1QsIFBPUlQsIE1PQ0hBX1RJTUVPVVQgfSBmcm9tICcuLi91dGlscyc7XG5cbmNoYWkuc2hvdWxkKCk7XG5jaGFpLnVzZShjaGFpQXNQcm9taXNlZCk7XG5cblxuY29uc3QgQ0FQUyA9IHtcbiAgYnJvd3Nlck5hbWU6ICdBcHBpdW1TYWZhcmknLFxuICBwbGF0Zm9ybU5hbWU6ICdtYWMnLFxufTtcblxuZGVzY3JpYmUoJ0Rlc2t0b3AgU2FmYXJpRHJpdmVyJywgZnVuY3Rpb24gKCkge1xuICB0aGlzLnRpbWVvdXQoTU9DSEFfVElNRU9VVCk7XG5cbiAgbGV0IHNlcnZlcjtcbiAgbGV0IGRyaXZlcjtcbiAgYmVmb3JlKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBzZXJ2ZXIgPSBhd2FpdCBzdGFydFNlcnZlcihQT1JULCBIT1NUKTtcbiAgfSk7XG4gIGFmdGVyKGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBpZiAoc2VydmVyKSB7XG4gICAgICBhd2FpdCBzZXJ2ZXIuY2xvc2UoKTtcbiAgICAgIHNlcnZlciA9IG51bGw7XG4gICAgfVxuICB9KTtcbiAgYmVmb3JlRWFjaChhc3luYyBmdW5jdGlvbiAoKSB7XG4gICAgZHJpdmVyID0gYXdhaXQgcmVtb3RlKHtcbiAgICAgIGhvc3RuYW1lOiBIT1NULFxuICAgICAgcG9ydDogUE9SVCxcbiAgICAgIGNhcGFiaWxpdGllczogQ0FQUyxcbiAgICB9KTtcbiAgfSk7XG4gIGFmdGVyRWFjaChhc3luYyBmdW5jdGlvbiAoKSB7XG4gICAgaWYgKGRyaXZlcikge1xuICAgICAgYXdhaXQgZHJpdmVyLmRlbGV0ZVNlc3Npb24oKTtcbiAgICAgIGRyaXZlciA9IG51bGw7XG4gICAgfVxuICB9KTtcblxuICBpdCgnc2hvdWxkIHN0YXJ0IGFuZCBzdG9wIGEgc2Vzc2lvbicsIGFzeW5jIGZ1bmN0aW9uICgpIHtcbiAgICBhd2FpdCBkcml2ZXIudXJsKCdodHRwczovL2FwcGl1bS5pby8nKTtcbiAgICBjb25zdCBidXR0b24gPSBhd2FpdCBkcml2ZXIuJCgnI2Rvd25sb2FkTGluaycpO1xuICAgIGF3YWl0IGJ1dHRvbi5nZXRUZXh0KCkuc2hvdWxkLmV2ZW50dWFsbHkuZXFsKCdEb3dubG9hZCBBcHBpdW0nKTtcbiAgfSk7XG59KTtcblxuXG4iXSwiZmlsZSI6InRlc3QvZnVuY3Rpb25hbC9kZXNrdG9wLWRyaXZlci1lMmUtc3BlY3MuanMiLCJzb3VyY2VSb290IjoiLi4vLi4vLi4ifQ==
|
|
@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
4
4
|
|
|
5
5
|
require("source-map-support/register");
|
|
6
6
|
|
|
7
|
-
var
|
|
7
|
+
var _webdriverio = require("webdriverio");
|
|
8
8
|
|
|
9
9
|
var _ = require("../..");
|
|
10
10
|
|
|
@@ -63,21 +63,24 @@ describe('Mobile SafariDriver', function () {
|
|
|
63
63
|
}
|
|
64
64
|
});
|
|
65
65
|
beforeEach(async function () {
|
|
66
|
-
driver =
|
|
67
|
-
|
|
66
|
+
driver = await (0, _webdriverio.remote)({
|
|
67
|
+
hostname: _utils.HOST,
|
|
68
|
+
port: _utils.PORT,
|
|
69
|
+
capabilities: CAPS
|
|
70
|
+
});
|
|
68
71
|
});
|
|
69
72
|
afterEach(async function () {
|
|
70
73
|
if (driver) {
|
|
71
|
-
await driver.
|
|
74
|
+
await driver.deleteSession();
|
|
72
75
|
driver = null;
|
|
73
76
|
}
|
|
74
77
|
});
|
|
75
78
|
it('should start and stop a session', async function () {
|
|
76
|
-
await driver.
|
|
77
|
-
const button = await driver
|
|
78
|
-
await button.
|
|
79
|
+
await driver.url('https://appium.io/');
|
|
80
|
+
const button = await driver.$('#downloadLink');
|
|
81
|
+
await button.getText().should.eventually.eql('Download Appium');
|
|
79
82
|
});
|
|
80
83
|
});require('source-map-support').install();
|
|
81
84
|
|
|
82
85
|
|
|
83
|
-
//# sourceMappingURL=data:application/json;charset=utf8;base64,
|
|
86
|
+
//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvZnVuY3Rpb25hbC9tb2JpbGUtZHJpdmVyLWUyZS1zcGVjcy5qcyJdLCJuYW1lcyI6WyJjaGFpIiwic2hvdWxkIiwidXNlIiwiY2hhaUFzUHJvbWlzZWQiLCJQTEFURk9STV9WRVJTSU9OIiwicHJvY2VzcyIsImVudiIsIkRFVklDRV9OQU1FIiwiQ0FQUyIsImJyb3dzZXJOYW1lIiwicGxhdGZvcm1OYW1lIiwiZGVzY3JpYmUiLCJ0aW1lb3V0IiwiTU9DSEFfVElNRU9VVCIsInNlcnZlciIsImRyaXZlciIsImJlZm9yZSIsIkNJIiwic2tpcCIsInNpbWN0bCIsIlNpbWN0bCIsImFsbERldmljZXMiLCJnZXREZXZpY2VzIiwiZGV2aWNlIiwiZmluZCIsIm5hbWUiLCJFcnJvciIsInN0YXRlIiwidWRpZCIsImJvb3REZXZpY2UiLCJzdGFydEJvb3RNb25pdG9yIiwiUE9SVCIsIkhPU1QiLCJhZnRlciIsImNsb3NlIiwiYmVmb3JlRWFjaCIsImhvc3RuYW1lIiwicG9ydCIsImNhcGFiaWxpdGllcyIsImFmdGVyRWFjaCIsImRlbGV0ZVNlc3Npb24iLCJpdCIsInVybCIsImJ1dHRvbiIsIiQiLCJnZXRUZXh0IiwiZXZlbnR1YWxseSIsImVxbCJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUE7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBRUFBLGNBQUtDLE1BQUw7O0FBQ0FELGNBQUtFLEdBQUwsQ0FBU0MsdUJBQVQ7O0FBRUEsTUFBTUMsZ0JBQWdCLEdBQUdDLE9BQU8sQ0FBQ0MsR0FBUixDQUFZRixnQkFBWixJQUFnQyxNQUF6RDtBQUNBLE1BQU1HLFdBQVcsR0FBR0YsT0FBTyxDQUFDQyxHQUFSLENBQVlDLFdBQVosSUFBMkIsbUJBQS9DO0FBQ0EsTUFBTUMsSUFBSSxHQUFHO0FBQ1hDLEVBQUFBLFdBQVcsRUFBRSxjQURGO0FBRVhDLEVBQUFBLFlBQVksRUFBRSxLQUZIO0FBR1gseUJBQXVCLElBSFo7QUFJWCw0QkFBMEJOLGdCQUpmO0FBS1gsdUJBQXFCRztBQUxWLENBQWI7QUFRQUksUUFBUSxDQUFDLHFCQUFELEVBQXdCLFlBQVk7QUFDMUMsT0FBS0MsT0FBTCxDQUFhQyxvQkFBYjtBQUVBLE1BQUlDLE1BQUo7QUFDQSxNQUFJQyxNQUFKO0FBQ0FDLEVBQUFBLE1BQU0sQ0FBQyxrQkFBa0I7QUFDdkIsUUFBSVgsT0FBTyxDQUFDQyxHQUFSLENBQVlXLEVBQWhCLEVBQW9CO0FBSWxCLGFBQU8sS0FBS0MsSUFBTCxFQUFQO0FBQ0Q7O0FBR0QsVUFBTUMsTUFBTSxHQUFHLElBQUlDLG1CQUFKLEVBQWY7QUFDQSxVQUFNQyxVQUFVLEdBQUcsTUFBTUYsTUFBTSxDQUFDRyxVQUFQLENBQWtCbEIsZ0JBQWxCLEVBQW9DLEtBQXBDLENBQXpCO0FBQ0EsVUFBTW1CLE1BQU0sR0FBR0YsVUFBVSxDQUFDRyxJQUFYLENBQWdCLENBQUM7QUFBQ0MsTUFBQUE7QUFBRCxLQUFELEtBQVlBLElBQUksS0FBS2xCLFdBQXJDLENBQWY7O0FBQ0EsUUFBSSxDQUFDZ0IsTUFBTCxFQUFhO0FBQ1gsWUFBTSxJQUFJRyxLQUFKLENBQVcsZ0JBQWVuQixXQUFZLGdCQUFlSCxnQkFBaUIsR0FBdEUsQ0FBTjtBQUNEOztBQUNELFFBQUltQixNQUFNLENBQUNJLEtBQVAsS0FBaUIsUUFBckIsRUFBK0I7QUFDN0JSLE1BQUFBLE1BQU0sQ0FBQ1MsSUFBUCxHQUFjTCxNQUFNLENBQUNLLElBQXJCO0FBQ0EsWUFBTVQsTUFBTSxDQUFDVSxVQUFQLEVBQU47QUFDQSxZQUFNVixNQUFNLENBQUNXLGdCQUFQLEVBQU47QUFDRDs7QUFFRGhCLElBQUFBLE1BQU0sR0FBRyxNQUFNLG1CQUFZaUIsV0FBWixFQUFrQkMsV0FBbEIsQ0FBZjtBQUNELEdBdEJLLENBQU47QUF1QkFDLEVBQUFBLEtBQUssQ0FBQyxrQkFBa0I7QUFDdEIsUUFBSW5CLE1BQUosRUFBWTtBQUNWLFlBQU1BLE1BQU0sQ0FBQ29CLEtBQVAsRUFBTjtBQUNBcEIsTUFBQUEsTUFBTSxHQUFHLElBQVQ7QUFDRDtBQUNGLEdBTEksQ0FBTDtBQU1BcUIsRUFBQUEsVUFBVSxDQUFDLGtCQUFrQjtBQUMzQnBCLElBQUFBLE1BQU0sR0FBRyxNQUFNLHlCQUFPO0FBQ3BCcUIsTUFBQUEsUUFBUSxFQUFFSixXQURVO0FBRXBCSyxNQUFBQSxJQUFJLEVBQUVOLFdBRmM7QUFHcEJPLE1BQUFBLFlBQVksRUFBRTlCO0FBSE0sS0FBUCxDQUFmO0FBS0QsR0FOUyxDQUFWO0FBT0ErQixFQUFBQSxTQUFTLENBQUMsa0JBQWtCO0FBQzFCLFFBQUl4QixNQUFKLEVBQVk7QUFDVixZQUFNQSxNQUFNLENBQUN5QixhQUFQLEVBQU47QUFDQXpCLE1BQUFBLE1BQU0sR0FBRyxJQUFUO0FBQ0Q7QUFDRixHQUxRLENBQVQ7QUFPQTBCLEVBQUFBLEVBQUUsQ0FBQyxpQ0FBRCxFQUFvQyxrQkFBa0I7QUFDdEQsVUFBTTFCLE1BQU0sQ0FBQzJCLEdBQVAsQ0FBVyxvQkFBWCxDQUFOO0FBQ0EsVUFBTUMsTUFBTSxHQUFHLE1BQU01QixNQUFNLENBQUM2QixDQUFQLENBQVMsZUFBVCxDQUFyQjtBQUNBLFVBQU1ELE1BQU0sQ0FBQ0UsT0FBUCxHQUFpQjVDLE1BQWpCLENBQXdCNkMsVUFBeEIsQ0FBbUNDLEdBQW5DLENBQXVDLGlCQUF2QyxDQUFOO0FBQ0QsR0FKQyxDQUFGO0FBS0QsQ0FyRE8sQ0FBUiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHJlbW90ZSB9IGZyb20gJ3dlYmRyaXZlcmlvJztcbmltcG9ydCB7IHN0YXJ0U2VydmVyIH0gZnJvbSAnLi4vLi4nO1xuaW1wb3J0IGNoYWlBc1Byb21pc2VkIGZyb20gJ2NoYWktYXMtcHJvbWlzZWQnO1xuaW1wb3J0IGNoYWkgZnJvbSAnY2hhaSc7XG5pbXBvcnQgU2ltY3RsIGZyb20gJ25vZGUtc2ltY3RsJztcbmltcG9ydCB7IEhPU1QsIFBPUlQsIE1PQ0hBX1RJTUVPVVQgfSBmcm9tICcuLi91dGlscyc7XG5cbmNoYWkuc2hvdWxkKCk7XG5jaGFpLnVzZShjaGFpQXNQcm9taXNlZCk7XG5cbmNvbnN0IFBMQVRGT1JNX1ZFUlNJT04gPSBwcm9jZXNzLmVudi5QTEFURk9STV9WRVJTSU9OIHx8ICcxNC4xJztcbmNvbnN0IERFVklDRV9OQU1FID0gcHJvY2Vzcy5lbnYuREVWSUNFX05BTUUgfHwgJ2lQaG9uZSAxMSBQcm8gTWF4JztcbmNvbnN0IENBUFMgPSB7XG4gIGJyb3dzZXJOYW1lOiAnQXBwaXVtU2FmYXJpJyxcbiAgcGxhdGZvcm1OYW1lOiAnaW9zJyxcbiAgJ3NhZmFyaTp1c2VTaW11bGF0b3InOiB0cnVlLFxuICAnc2FmYXJpOnBsYXRmb3JtVmVyc2lvbic6IFBMQVRGT1JNX1ZFUlNJT04sXG4gICdzYWZhcmk6ZGV2aWNlTmFtZSc6IERFVklDRV9OQU1FLFxufTtcblxuZGVzY3JpYmUoJ01vYmlsZSBTYWZhcmlEcml2ZXInLCBmdW5jdGlvbiAoKSB7XG4gIHRoaXMudGltZW91dChNT0NIQV9USU1FT1VUKTtcblxuICBsZXQgc2VydmVyO1xuICBsZXQgZHJpdmVyO1xuICBiZWZvcmUoYXN5bmMgZnVuY3Rpb24gKCkge1xuICAgIGlmIChwcm9jZXNzLmVudi5DSSkge1xuICAgICAgLy8gSW4gQXp1cmUgQ0kgdGhlIHN0dWZmIHVuZXhwZWN0ZWRseSBmYWlscyB3aXRoXG4gICAgICAvLyBcIlRoZSBkZXZpY2UgaXMgbm90IGNvbmZpZ3VyZWQgdG8gYWxsb3cgcmVtb3RlIGNvbnRyb2wgdmlhIFdlYkRyaXZlci4gVG8gZml4IHRoaXMsIHRvZ2dsZSAnQWxsb3cgUmVtb3RlIEF1dG9tYXRpb24nIGluIFNhZmFyaSdzIHNldHRpbmdzIChTZXR0aW5ncyBBcHAgPiBTYWZhcmkgPiBBZHZhbmNlZCkuXCJcbiAgICAgIC8vIGVycm9yXG4gICAgICByZXR1cm4gdGhpcy5za2lwKCk7XG4gICAgfVxuXG4gICAgLy8gUHJlYm9vdCBTaW11bGF0b3IgdG8gYXZvaWQgdW5leHBlY3RlZCB0aW1lb3V0c1xuICAgIGNvbnN0IHNpbWN0bCA9IG5ldyBTaW1jdGwoKTtcbiAgICBjb25zdCBhbGxEZXZpY2VzID0gYXdhaXQgc2ltY3RsLmdldERldmljZXMoUExBVEZPUk1fVkVSU0lPTiwgJ2lPUycpO1xuICAgIGNvbnN0IGRldmljZSA9IGFsbERldmljZXMuZmluZCgoe25hbWV9KSA9PiBuYW1lID09PSBERVZJQ0VfTkFNRSk7XG4gICAgaWYgKCFkZXZpY2UpIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcihgQ2Fubm90IGZpbmQgJyR7REVWSUNFX05BTUV9JyBTaW11bGF0b3IgKCR7UExBVEZPUk1fVkVSU0lPTn0pYCk7XG4gICAgfVxuICAgIGlmIChkZXZpY2Uuc3RhdGUgIT09ICdCb290ZWQnKSB7XG4gICAgICBzaW1jdGwudWRpZCA9IGRldmljZS51ZGlkO1xuICAgICAgYXdhaXQgc2ltY3RsLmJvb3REZXZpY2UoKTtcbiAgICAgIGF3YWl0IHNpbWN0bC5zdGFydEJvb3RNb25pdG9yKCk7XG4gICAgfVxuXG4gICAgc2VydmVyID0gYXdhaXQgc3RhcnRTZXJ2ZXIoUE9SVCwgSE9TVCk7XG4gIH0pO1xuICBhZnRlcihhc3luYyBmdW5jdGlvbiAoKSB7XG4gICAgaWYgKHNlcnZlcikge1xuICAgICAgYXdhaXQgc2VydmVyLmNsb3NlKCk7XG4gICAgICBzZXJ2ZXIgPSBudWxsO1xuICAgIH1cbiAgfSk7XG4gIGJlZm9yZUVhY2goYXN5bmMgZnVuY3Rpb24gKCkge1xuICAgIGRyaXZlciA9IGF3YWl0IHJlbW90ZSh7XG4gICAgICBob3N0bmFtZTogSE9TVCxcbiAgICAgIHBvcnQ6IFBPUlQsXG4gICAgICBjYXBhYmlsaXRpZXM6IENBUFMsXG4gICAgfSk7XG4gIH0pO1xuICBhZnRlckVhY2goYXN5bmMgZnVuY3Rpb24gKCkge1xuICAgIGlmIChkcml2ZXIpIHtcbiAgICAgIGF3YWl0IGRyaXZlci5kZWxldGVTZXNzaW9uKCk7XG4gICAgICBkcml2ZXIgPSBudWxsO1xuICAgIH1cbiAgfSk7XG5cbiAgaXQoJ3Nob3VsZCBzdGFydCBhbmQgc3RvcCBhIHNlc3Npb24nLCBhc3luYyBmdW5jdGlvbiAoKSB7XG4gICAgYXdhaXQgZHJpdmVyLnVybCgnaHR0cHM6Ly9hcHBpdW0uaW8vJyk7XG4gICAgY29uc3QgYnV0dG9uID0gYXdhaXQgZHJpdmVyLiQoJyNkb3dubG9hZExpbmsnKTtcbiAgICBhd2FpdCBidXR0b24uZ2V0VGV4dCgpLnNob3VsZC5ldmVudHVhbGx5LmVxbCgnRG93bmxvYWQgQXBwaXVtJyk7XG4gIH0pO1xufSk7XG5cblxuIl0sImZpbGUiOiJ0ZXN0L2Z1bmN0aW9uYWwvbW9iaWxlLWRyaXZlci1lMmUtc3BlY3MuanMiLCJzb3VyY2VSb290IjoiLi4vLi4vLi4ifQ==
|
package/build/test/utils.js
CHANGED
package/gulpfile.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
let gulp = require('gulp');
|
|
4
|
-
let boilerplate = require('appium
|
|
4
|
+
let boilerplate = require('@appium/gulp-plugins').boilerplate.use(gulp);
|
|
5
5
|
|
|
6
6
|
boilerplate({
|
|
7
|
-
build: 'appium-
|
|
7
|
+
build: 'appium-safari-driver',
|
|
8
|
+
files: ['index.js', 'lib/**/*.js', 'test/**/*.js', '!gulpfile.js'],
|
|
8
9
|
coverage: {
|
|
9
10
|
files: ['./test/unit/**/*-specs.js', '!./test/functional/**'],
|
|
10
11
|
verbose: true
|
package/lib/commands/find.js
CHANGED
package/lib/driver.js
CHANGED
package/lib/logger.js
CHANGED
package/lib/safari.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import os from 'os';
|
|
2
2
|
import path from 'path';
|
|
3
|
-
import { JWProxy, errors } from 'appium
|
|
4
|
-
import { fs, logger, util } from 'appium
|
|
3
|
+
import { JWProxy, errors } from '@appium/base-driver';
|
|
4
|
+
import { fs, logger, util } from '@appium/support';
|
|
5
5
|
import { SubProcess } from 'teen_process';
|
|
6
6
|
import { waitForCondition } from 'asyncbox';
|
|
7
7
|
import { findAPortNotInUse } from 'portscanner';
|
package/lib/server.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import log from './logger';
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
server as baseServer, routeConfiguringFunction as makeRouter
|
|
4
|
+
} from '@appium/base-driver';
|
|
3
5
|
import SafariDriver from './driver';
|
|
4
6
|
|
|
5
7
|
async function startServer (port, address) {
|
package/package.json
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
"appium",
|
|
6
6
|
"safari"
|
|
7
7
|
],
|
|
8
|
-
"version": "
|
|
8
|
+
"version": "3.0.0",
|
|
9
9
|
"author": "appium",
|
|
10
10
|
"license": "Apache-2.0",
|
|
11
11
|
"repository": {
|
|
@@ -33,15 +33,15 @@
|
|
|
33
33
|
"lib": "lib"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
+
"@appium/base-driver": "^8.0.0",
|
|
37
|
+
"@appium/support": "^2.46.0",
|
|
36
38
|
"@babel/runtime": "^7.0.0",
|
|
37
|
-
"appium-base-driver": "^7.1.0",
|
|
38
|
-
"appium-support": "^2.46.0",
|
|
39
39
|
"asyncbox": "^2.0.2",
|
|
40
40
|
"bluebird": "^3.5.1",
|
|
41
41
|
"lodash": "^4.17.4",
|
|
42
42
|
"node-simctl": "^6.4.0",
|
|
43
43
|
"portscanner": "2.2.0",
|
|
44
|
-
"source-map-support": "^0.
|
|
44
|
+
"source-map-support": "^0.x",
|
|
45
45
|
"teen_process": "^1.15.0"
|
|
46
46
|
},
|
|
47
47
|
"scripts": {
|
|
@@ -63,14 +63,21 @@
|
|
|
63
63
|
"precommit-test"
|
|
64
64
|
],
|
|
65
65
|
"devDependencies": {
|
|
66
|
+
"@appium/gulp-plugins": "^6.0.0",
|
|
67
|
+
"@appium/eslint-config-appium": "^5.0.0",
|
|
68
|
+
"@babel/core": "^7.16.0",
|
|
69
|
+
"@babel/eslint-parser": "^7.16.3",
|
|
66
70
|
"appium-gulp-plugins": "^5.4.0",
|
|
67
71
|
"chai": "^4.1.2",
|
|
68
72
|
"chai-as-promised": "^7.1.1",
|
|
69
|
-
"eslint
|
|
73
|
+
"eslint": "^7.32.0",
|
|
74
|
+
"eslint-plugin-import": "^2.25.3",
|
|
75
|
+
"eslint-plugin-mocha": "^9.0.0",
|
|
76
|
+
"eslint-plugin-promise": "^6.0.0",
|
|
70
77
|
"gulp": "^4.0.0",
|
|
71
|
-
"mocha": "^
|
|
78
|
+
"mocha": "^9.0.0",
|
|
72
79
|
"pre-commit": "^1.1.3",
|
|
73
|
-
"sinon": "^
|
|
74
|
-
"
|
|
80
|
+
"sinon": "^12.0.0",
|
|
81
|
+
"webdriverio": "^7.0.0"
|
|
75
82
|
}
|
|
76
83
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { remote } from 'webdriverio';
|
|
2
2
|
import { startServer } from '../..';
|
|
3
3
|
import chaiAsPromised from 'chai-as-promised';
|
|
4
4
|
import chai from 'chai';
|
|
@@ -28,20 +28,23 @@ describe('Desktop SafariDriver', function () {
|
|
|
28
28
|
}
|
|
29
29
|
});
|
|
30
30
|
beforeEach(async function () {
|
|
31
|
-
driver =
|
|
32
|
-
|
|
31
|
+
driver = await remote({
|
|
32
|
+
hostname: HOST,
|
|
33
|
+
port: PORT,
|
|
34
|
+
capabilities: CAPS,
|
|
35
|
+
});
|
|
33
36
|
});
|
|
34
37
|
afterEach(async function () {
|
|
35
38
|
if (driver) {
|
|
36
|
-
await driver.
|
|
39
|
+
await driver.deleteSession();
|
|
37
40
|
driver = null;
|
|
38
41
|
}
|
|
39
42
|
});
|
|
40
43
|
|
|
41
44
|
it('should start and stop a session', async function () {
|
|
42
|
-
await driver.
|
|
43
|
-
const button = await driver
|
|
44
|
-
await button.
|
|
45
|
+
await driver.url('https://appium.io/');
|
|
46
|
+
const button = await driver.$('#downloadLink');
|
|
47
|
+
await button.getText().should.eventually.eql('Download Appium');
|
|
45
48
|
});
|
|
46
49
|
});
|
|
47
50
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { remote } from 'webdriverio';
|
|
2
2
|
import { startServer } from '../..';
|
|
3
3
|
import chaiAsPromised from 'chai-as-promised';
|
|
4
4
|
import chai from 'chai';
|
|
@@ -53,20 +53,23 @@ describe('Mobile SafariDriver', function () {
|
|
|
53
53
|
}
|
|
54
54
|
});
|
|
55
55
|
beforeEach(async function () {
|
|
56
|
-
driver =
|
|
57
|
-
|
|
56
|
+
driver = await remote({
|
|
57
|
+
hostname: HOST,
|
|
58
|
+
port: PORT,
|
|
59
|
+
capabilities: CAPS,
|
|
60
|
+
});
|
|
58
61
|
});
|
|
59
62
|
afterEach(async function () {
|
|
60
63
|
if (driver) {
|
|
61
|
-
await driver.
|
|
64
|
+
await driver.deleteSession();
|
|
62
65
|
driver = null;
|
|
63
66
|
}
|
|
64
67
|
});
|
|
65
68
|
|
|
66
69
|
it('should start and stop a session', async function () {
|
|
67
|
-
await driver.
|
|
68
|
-
const button = await driver
|
|
69
|
-
await button.
|
|
70
|
+
await driver.url('https://appium.io/');
|
|
71
|
+
const button = await driver.$('#downloadLink');
|
|
72
|
+
await button.getText().should.eventually.eql('Download Appium');
|
|
70
73
|
});
|
|
71
74
|
});
|
|
72
75
|
|