appium-mac2-driver 3.3.1 → 3.3.3
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/CHANGELOG.md +12 -0
- package/build/lib/commands/bidi/models.d.ts +6 -0
- package/build/lib/commands/bidi/models.d.ts.map +1 -1
- package/build/lib/commands/bidi/models.js +6 -0
- package/build/lib/commands/bidi/models.js.map +1 -1
- package/build/lib/commands/bidi/types.d.ts +2 -2
- package/build/lib/commands/bidi/types.d.ts.map +1 -1
- package/build/lib/commands/execute.d.ts.map +1 -1
- package/build/lib/commands/execute.js +1 -5
- package/build/lib/commands/execute.js.map +1 -1
- package/build/lib/commands/gestures.d.ts.map +1 -1
- package/build/lib/commands/gestures.js +6 -7
- package/build/lib/commands/gestures.js.map +1 -1
- package/build/lib/commands/helpers.d.ts +9 -0
- package/build/lib/commands/helpers.d.ts.map +1 -1
- package/build/lib/commands/helpers.js +10 -5
- package/build/lib/commands/helpers.js.map +1 -1
- package/build/lib/commands/native-record-screen.d.ts +11 -11
- package/build/lib/commands/native-record-screen.d.ts.map +1 -1
- package/build/lib/commands/native-record-screen.js +6 -8
- package/build/lib/commands/native-record-screen.js.map +1 -1
- package/build/lib/commands/record-screen.d.ts.map +1 -1
- package/build/lib/commands/record-screen.js +15 -15
- package/build/lib/commands/record-screen.js.map +1 -1
- package/build/lib/doctor/optional-checks.d.ts +1 -1
- package/build/lib/doctor/optional-checks.d.ts.map +1 -1
- package/build/lib/doctor/optional-checks.js +1 -1
- package/build/lib/doctor/optional-checks.js.map +1 -1
- package/build/lib/doctor/required-checks.d.ts +1 -1
- package/build/lib/doctor/required-checks.d.ts.map +1 -1
- package/build/lib/doctor/required-checks.js +1 -1
- package/build/lib/doctor/required-checks.js.map +1 -1
- package/build/lib/driver.d.ts +18 -18
- package/build/lib/driver.d.ts.map +1 -1
- package/build/lib/driver.js +51 -52
- package/build/lib/driver.js.map +1 -1
- package/build/lib/utils.d.ts +19 -8
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +48 -10
- package/build/lib/utils.js.map +1 -1
- package/build/lib/wda-mac.d.ts.map +1 -1
- package/build/lib/wda-mac.js +25 -24
- package/build/lib/wda-mac.js.map +1 -1
- package/lib/commands/bidi/models.ts +6 -0
- package/lib/commands/bidi/types.ts +2 -2
- package/lib/commands/execute.ts +1 -2
- package/lib/commands/gestures.ts +8 -4
- package/lib/commands/helpers.ts +10 -2
- package/lib/commands/native-record-screen.ts +19 -23
- package/lib/commands/record-screen.ts +17 -17
- package/lib/doctor/optional-checks.ts +2 -1
- package/lib/doctor/required-checks.ts +2 -1
- package/lib/driver.ts +79 -79
- package/lib/utils.ts +48 -7
- package/lib/wda-mac.ts +33 -32
- package/npm-shrinkwrap.json +118 -100
- package/package.json +1 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## [3.3.3](https://github.com/appium/appium-mac2-driver/compare/v3.3.2...v3.3.3) (2026-05-06)
|
|
2
|
+
|
|
3
|
+
### Miscellaneous Chores
|
|
4
|
+
|
|
5
|
+
* fix lint warnings ([#380](https://github.com/appium/appium-mac2-driver/issues/380)) ([d380f37](https://github.com/appium/appium-mac2-driver/commit/d380f375e9aaf76e80b1163bda4518cfdff18c82))
|
|
6
|
+
|
|
7
|
+
## [3.3.2](https://github.com/appium/appium-mac2-driver/compare/v3.3.1...v3.3.2) (2026-05-06)
|
|
8
|
+
|
|
9
|
+
### Miscellaneous Chores
|
|
10
|
+
|
|
11
|
+
* drop lodash ([#379](https://github.com/appium/appium-mac2-driver/issues/379)) ([9501e03](https://github.com/appium/appium-mac2-driver/commit/9501e030b659bad833f987dff597de8f7f358ad9))
|
|
12
|
+
|
|
1
13
|
## [3.3.1](https://github.com/appium/appium-mac2-driver/compare/v3.3.0...v3.3.1) (2026-04-15)
|
|
2
14
|
|
|
3
15
|
### Bug Fixes
|
|
@@ -1,3 +1,9 @@
|
|
|
1
1
|
import type { NativeVideoChunkAddedEvent } from './types';
|
|
2
|
+
/**
|
|
3
|
+
* Converts the given UUID and video chunk payload into a NativeVideoChunkAddedEvent object.
|
|
4
|
+
* @param uuid The unique identifier for the video chunk.
|
|
5
|
+
* @param payload The video chunk data as a Buffer.
|
|
6
|
+
* @returns A NativeVideoChunkAddedEvent object containing the UUID and encoded video chunk.
|
|
7
|
+
*/
|
|
2
8
|
export declare function toNativeVideoChunkAddedEvent(uuid: string, payload: Buffer): NativeVideoChunkAddedEvent;
|
|
3
9
|
//# sourceMappingURL=models.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../lib/commands/bidi/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,SAAS,CAAC;AAGxD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GACd,0BAA0B,CAQ5B"}
|
|
1
|
+
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../lib/commands/bidi/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,SAAS,CAAC;AAGxD;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GACd,0BAA0B,CAQ5B"}
|
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.toNativeVideoChunkAddedEvent = toNativeVideoChunkAddedEvent;
|
|
4
4
|
const constants_1 = require("./constants");
|
|
5
|
+
/**
|
|
6
|
+
* Converts the given UUID and video chunk payload into a NativeVideoChunkAddedEvent object.
|
|
7
|
+
* @param uuid The unique identifier for the video chunk.
|
|
8
|
+
* @param payload The video chunk data as a Buffer.
|
|
9
|
+
* @returns A NativeVideoChunkAddedEvent object containing the UUID and encoded video chunk.
|
|
10
|
+
*/
|
|
5
11
|
function toNativeVideoChunkAddedEvent(uuid, payload) {
|
|
6
12
|
return {
|
|
7
13
|
method: constants_1.NATIVE_VIDEO_CHUNK_ADDED_EVENT,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../lib/commands/bidi/models.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../lib/commands/bidi/models.ts"],"names":[],"mappings":";;AASA,oEAWC;AAnBD,2CAA2D;AAE3D;;;;;GAKG;AACH,SAAgB,4BAA4B,CAC1C,IAAY,EACZ,OAAe;IAEf,OAAO;QACL,MAAM,EAAE,0CAA8B;QACtC,MAAM,EAAE;YACN,IAAI;YACJ,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;SACpC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
export interface NativeVideoChunkAddedEvent extends BiDiEvent<NativeVideoChunkAddedParams> {
|
|
2
|
+
}
|
|
1
3
|
interface BiDiEvent<TParams> {
|
|
2
4
|
method: string;
|
|
3
5
|
params: TParams;
|
|
@@ -6,7 +8,5 @@ interface NativeVideoChunkAddedParams {
|
|
|
6
8
|
uuid: string;
|
|
7
9
|
payload: string;
|
|
8
10
|
}
|
|
9
|
-
export interface NativeVideoChunkAddedEvent extends BiDiEvent<NativeVideoChunkAddedParams> {
|
|
10
|
-
}
|
|
11
11
|
export {};
|
|
12
12
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../lib/commands/bidi/types.ts"],"names":[],"mappings":"AAAA,UAAU,SAAS,CAAC,OAAO;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,UAAU,2BAA2B;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../lib/commands/bidi/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,0BAA2B,SAAQ,SAAS,CAAC,2BAA2B,CAAC;CAAG;AAE7F,UAAU,SAAS,CAAC,OAAO;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,UAAU,2BAA2B;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../lib/commands/execute.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../lib/commands/execute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,WAAW,CAAC;AAC1C,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAIhD;;;;GAIG;AACH,wBAAsB,OAAO,CAC3B,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,SAAS,GAAG,EAAE,GAAG,YAAY,GACnC,OAAO,CAAC,GAAG,CAAC,CAOd"}
|
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.execute = execute;
|
|
7
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
8
4
|
const EXECUTE_SCRIPT_PREFIX = 'macos:';
|
|
9
5
|
/**
|
|
10
6
|
*
|
|
@@ -26,6 +22,6 @@ async function execute(script, args) {
|
|
|
26
22
|
* @returns Preprocessed arguments as StringRecord
|
|
27
23
|
*/
|
|
28
24
|
function preprocessExecuteMethodArgs(args) {
|
|
29
|
-
return (
|
|
25
|
+
return (Array.isArray(args) ? args[0] : args) ?? {};
|
|
30
26
|
}
|
|
31
27
|
//# sourceMappingURL=execute.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../lib/commands/execute.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../lib/commands/execute.ts"],"names":[],"mappings":";;AAUA,0BAWC;AAlBD,MAAM,qBAAqB,GAAG,QAAQ,CAAC;AAEvC;;;;GAIG;AACI,KAAK,UAAU,OAAO,CAE3B,MAAc,EACd,IAAoC;IAEpC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gCAAgC,MAAM,GAAG,CAAC,CAAC;IACzD,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;SACnC,IAAI,EAAE;SACN,OAAO,CAAC,YAAY,EAAE,GAAG,qBAAqB,GAAG,CAAC,CAAC;IACtD,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,IAAI,CAAC,CAAC;IAC3D,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;AACvE,CAAC;AAED;;;;;GAKG;AACH,SAAS,2BAA2B,CAAC,IAAoC;IACvE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;AACtD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gestures.d.ts","sourceRoot":"","sources":["../../../lib/commands/gestures.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gestures.d.ts","sourceRoot":"","sources":["../../../lib/commands/gestures.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.macosSetValue = macosSetValue;
|
|
7
4
|
exports.macosClick = macosClick;
|
|
@@ -18,7 +15,6 @@ exports.macosDoubleTap = macosDoubleTap;
|
|
|
18
15
|
exports.macosPressAndHold = macosPressAndHold;
|
|
19
16
|
exports.macosPressAndDrag = macosPressAndDrag;
|
|
20
17
|
exports.macosPressAndDragAndHold = macosPressAndDragAndHold;
|
|
21
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
22
18
|
const support_1 = require("appium/support");
|
|
23
19
|
const driver_1 = require("appium/driver");
|
|
24
20
|
/**
|
|
@@ -442,7 +438,7 @@ async function macosPressAndDragAndHold(duration, holdDuration, sourceElementId,
|
|
|
442
438
|
* @param y - Optional Y coordinate
|
|
443
439
|
*/
|
|
444
440
|
function requireElementIdOrXY(elementId, x, y) {
|
|
445
|
-
if (
|
|
441
|
+
if (typeof elementId !== 'string' && !(typeof x === 'number' && typeof y === 'number')) {
|
|
446
442
|
throw new driver_1.errors.InvalidArgumentError(`'elementId' or 'x' and 'y' is required.`);
|
|
447
443
|
}
|
|
448
444
|
}
|
|
@@ -457,8 +453,11 @@ function requireElementIdOrXY(elementId, x, y) {
|
|
|
457
453
|
* @param endY - Optional ending Y coordinate
|
|
458
454
|
*/
|
|
459
455
|
function requireSourceDestWithElementsOrCoordinates(sourceElementId, destinationElementId, startX, startY, endX, endY) {
|
|
460
|
-
if (!(
|
|
461
|
-
!(
|
|
456
|
+
if (!(typeof sourceElementId === 'string' && typeof destinationElementId === 'string') &&
|
|
457
|
+
!(typeof startX === 'number' &&
|
|
458
|
+
typeof startY === 'number' &&
|
|
459
|
+
typeof endX === 'number' &&
|
|
460
|
+
typeof endY === 'number')) {
|
|
462
461
|
throw new driver_1.errors.InvalidArgumentError(`'sourceElementId' and 'destinationElementId' ` +
|
|
463
462
|
`or 'startX', 'startY', 'endX' and 'endY' are required.`);
|
|
464
463
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gestures.js","sourceRoot":"","sources":["../../../lib/commands/gestures.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gestures.js","sourceRoot":"","sources":["../../../lib/commands/gestures.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
import type { Mac2Driver } from '../driver';
|
|
2
2
|
import type { StringRecord } from '@appium/types';
|
|
3
|
+
/**
|
|
4
|
+
* Uploads the given local file to the specified remote path or returns
|
|
5
|
+
* it as a base64 string if no remote path is provided.
|
|
6
|
+
* @this Mac2Driver The Mac2Driver instance.
|
|
7
|
+
* @param localFile The path to the local file to be uploaded.
|
|
8
|
+
* @param remotePath The remote path where the file should be uploaded. If null, the file will be returned as a base64 string.
|
|
9
|
+
* @param uploadOptions Additional options for the upload, such as authentication and headers.
|
|
10
|
+
* @returns A promise that resolves to a base64 string if no remote path is provided, or an empty string if the file is uploaded.
|
|
11
|
+
*/
|
|
3
12
|
export declare function uploadRecordedMedia(this: Mac2Driver, localFile: string, remotePath: string | null, uploadOptions?: StringRecord): Promise<string>;
|
|
4
13
|
//# sourceMappingURL=helpers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../lib/commands/helpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../lib/commands/helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,WAAW,CAAC;AAC1C,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAEhD;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,IAAI,EACzB,aAAa,GAAE,YAAiB,GAC/B,OAAO,CAAC,MAAM,CAAC,CAqBjB"}
|
|
@@ -1,13 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.uploadRecordedMedia = uploadRecordedMedia;
|
|
7
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
8
4
|
const support_1 = require("appium/support");
|
|
5
|
+
/**
|
|
6
|
+
* Uploads the given local file to the specified remote path or returns
|
|
7
|
+
* it as a base64 string if no remote path is provided.
|
|
8
|
+
* @this Mac2Driver The Mac2Driver instance.
|
|
9
|
+
* @param localFile The path to the local file to be uploaded.
|
|
10
|
+
* @param remotePath The remote path where the file should be uploaded. If null, the file will be returned as a base64 string.
|
|
11
|
+
* @param uploadOptions Additional options for the upload, such as authentication and headers.
|
|
12
|
+
* @returns A promise that resolves to a base64 string if no remote path is provided, or an empty string if the file is uploaded.
|
|
13
|
+
*/
|
|
9
14
|
async function uploadRecordedMedia(localFile, remotePath, uploadOptions = {}) {
|
|
10
|
-
if (
|
|
15
|
+
if (remotePath == null || remotePath.length === 0) {
|
|
11
16
|
const { size } = await support_1.fs.stat(localFile);
|
|
12
17
|
this.log.debug(`The size of the resulting screen recording is ${support_1.util.toReadableSizeString(size)}`);
|
|
13
18
|
return (await support_1.util.toInMemoryBase64(localFile)).toString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../lib/commands/helpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../lib/commands/helpers.ts"],"names":[],"mappings":";;AAaA,kDA0BC;AAvCD,4CAA6C;AAI7C;;;;;;;;GAQG;AACI,KAAK,UAAU,mBAAmB,CAEvC,SAAiB,EACjB,UAAyB,EACzB,gBAA8B,EAAE;IAEhC,IAAI,UAAU,IAAI,IAAI,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClD,MAAM,EAAC,IAAI,EAAC,GAAG,MAAM,YAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,iDAAiD,cAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,CACnF,CAAC;QACF,OAAO,CAAC,MAAM,cAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC7D,CAAC;IAED,MAAM,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAC,GAAG,aAAa,CAAC;IAC/E,MAAM,OAAO,GAAiB;QAC5B,MAAM,EAAE,MAAM,IAAI,KAAK;QACvB,OAAO;QACP,aAAa;QACb,UAAU;KACX,CAAC;IACF,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACjB,OAAO,CAAC,IAAI,GAAG,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC;IAC9B,CAAC;IACD,MAAM,aAAG,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACrD,OAAO,EAAE,CAAC;AACZ,CAAC"}
|
|
@@ -1,6 +1,17 @@
|
|
|
1
1
|
import type { Mac2Driver } from '../driver';
|
|
2
2
|
import type { AppiumLogger, StringRecord } from '@appium/types';
|
|
3
3
|
import type EventEmitter from 'node:events';
|
|
4
|
+
interface ActiveVideoInfo {
|
|
5
|
+
fps: number;
|
|
6
|
+
codec: number;
|
|
7
|
+
displayId: number;
|
|
8
|
+
uuid: string;
|
|
9
|
+
startedAt: number;
|
|
10
|
+
}
|
|
11
|
+
interface DisplayInfo {
|
|
12
|
+
id: number;
|
|
13
|
+
isMain: boolean;
|
|
14
|
+
}
|
|
4
15
|
export declare class NativeVideoChunksBroadcaster {
|
|
5
16
|
private _ee;
|
|
6
17
|
private _log;
|
|
@@ -71,16 +82,5 @@ export declare function macosStopNativeScreenRecording(this: Mac2Driver, remoteP
|
|
|
71
82
|
* @returns A map where keys are display identifiers and values are display infos
|
|
72
83
|
*/
|
|
73
84
|
export declare function macosListDisplays(this: Mac2Driver): Promise<StringRecord<DisplayInfo>>;
|
|
74
|
-
interface ActiveVideoInfo {
|
|
75
|
-
fps: number;
|
|
76
|
-
codec: number;
|
|
77
|
-
displayId: number;
|
|
78
|
-
uuid: string;
|
|
79
|
-
startedAt: number;
|
|
80
|
-
}
|
|
81
|
-
interface DisplayInfo {
|
|
82
|
-
id: number;
|
|
83
|
-
isMain: boolean;
|
|
84
|
-
}
|
|
85
85
|
export {};
|
|
86
86
|
//# sourceMappingURL=native-record-screen.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-record-screen.d.ts","sourceRoot":"","sources":["../../../lib/commands/native-record-screen.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"native-record-screen.d.ts","sourceRoot":"","sources":["../../../lib/commands/native-record-screen.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,WAAW,CAAC;AAE1C,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAC9D,OAAO,KAAK,YAAY,MAAM,aAAa,CAAC;AAY5C,UAAU,eAAe;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,WAAW;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,qBAAa,4BAA4B;IACvC,OAAO,CAAC,GAAG,CAAe;IAC1B,OAAO,CAAC,IAAI,CAAe;IAC3B,OAAO,CAAC,WAAW,CAA6B;IAChD,OAAO,CAAC,WAAW,CAAU;gBAEjB,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY;IAO/C,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAMtB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOpC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAYlC,gBAAgB;YAgEhB,KAAK;YAuBL,QAAQ;CAyBvB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,UAAU,EAChB,GAAG,CAAC,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,eAAe,CAAC,CAQ1B;AAED;;;;GAIG;AACH,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,UAAU,GACf,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAEjC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,UAAU,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,YAAY,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EACxC,aAAa,CAAC,EAAE,MAAM,EACtB,UAAU,CAAC,EAAE,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EAC9C,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,MAAM,CAAC,CAkDjB;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAE5F"}
|
|
@@ -41,7 +41,6 @@ exports.macosStartNativeScreenRecording = macosStartNativeScreenRecording;
|
|
|
41
41
|
exports.macosGetNativeScreenRecordingInfo = macosGetNativeScreenRecordingInfo;
|
|
42
42
|
exports.macosStopNativeScreenRecording = macosStopNativeScreenRecording;
|
|
43
43
|
exports.macosListDisplays = macosListDisplays;
|
|
44
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
45
44
|
const bluebird_1 = __importStar(require("bluebird"));
|
|
46
45
|
const node_path_1 = __importDefault(require("node:path"));
|
|
47
46
|
const support_1 = require("appium/support");
|
|
@@ -50,6 +49,7 @@ const asyncbox_1 = require("asyncbox");
|
|
|
50
49
|
const teen_process_1 = require("teen_process");
|
|
51
50
|
const constants_1 = require("./bidi/constants");
|
|
52
51
|
const models_1 = require("./bidi/models");
|
|
52
|
+
const utils_1 = require("../utils");
|
|
53
53
|
const RECORDING_STARTUP_TIMEOUT_MS = 5000;
|
|
54
54
|
const BUFFER_SIZE = 0xffff;
|
|
55
55
|
const MONITORING_INTERVAL_DURATION_MS = 1000;
|
|
@@ -155,7 +155,7 @@ class NativeVideoChunksBroadcaster {
|
|
|
155
155
|
}
|
|
156
156
|
}
|
|
157
157
|
clearTimeout(timer);
|
|
158
|
-
if (
|
|
158
|
+
if (publishingErrors.length > 0) {
|
|
159
159
|
throw new Error(publishingErrors.join('\n'));
|
|
160
160
|
}
|
|
161
161
|
}
|
|
@@ -164,14 +164,14 @@ class NativeVideoChunksBroadcaster {
|
|
|
164
164
|
return;
|
|
165
165
|
}
|
|
166
166
|
const attachments = await listAttachments();
|
|
167
|
-
if (
|
|
167
|
+
if (attachments.length === 0) {
|
|
168
168
|
return;
|
|
169
169
|
}
|
|
170
170
|
const tasks = attachments
|
|
171
171
|
.map((attachmentPath) => [node_path_1.default.basename(attachmentPath), attachmentPath])
|
|
172
172
|
.filter(([name]) => this._publishers.has(name))
|
|
173
173
|
.map(([, attachmentPath]) => support_1.fs.rimraf(attachmentPath));
|
|
174
|
-
if (
|
|
174
|
+
if (tasks.length === 0) {
|
|
175
175
|
return;
|
|
176
176
|
}
|
|
177
177
|
try {
|
|
@@ -245,7 +245,7 @@ async function macosGetNativeScreenRecordingInfo() {
|
|
|
245
245
|
*/
|
|
246
246
|
async function macosStopNativeScreenRecording(remotePath, user, pass, method, headers, fileFieldName, formFields, ignorePayload) {
|
|
247
247
|
const response = (await this.wda.proxy.command('/wda/video/stop', 'POST', {}));
|
|
248
|
-
if (!response || !
|
|
248
|
+
if (!response || !(0, utils_1.isPlainObject)(response)) {
|
|
249
249
|
throw new Error('There is no active screen recording, thus nothing to stop. Did you start it before?');
|
|
250
250
|
}
|
|
251
251
|
const { uuid } = response;
|
|
@@ -264,7 +264,7 @@ async function macosStopNativeScreenRecording(remotePath, user, pass, method, he
|
|
|
264
264
|
if (ignorePayload) {
|
|
265
265
|
return '';
|
|
266
266
|
}
|
|
267
|
-
const matchedVideoPath =
|
|
267
|
+
const matchedVideoPath = (await listAttachments()).find((name) => name.endsWith(uuid));
|
|
268
268
|
if (!matchedVideoPath) {
|
|
269
269
|
throw new Error(`The screen recording identified by ${uuid} cannot be retrieved. ` +
|
|
270
270
|
`Make sure the Appium Server process or its parent process (e.g. Terminal) ` +
|
|
@@ -291,7 +291,6 @@ async function macosStopNativeScreenRecording(remotePath, user, pass, method, he
|
|
|
291
291
|
async function macosListDisplays() {
|
|
292
292
|
return (await this.wda.proxy.command('/wda/displays/list', 'GET'));
|
|
293
293
|
}
|
|
294
|
-
// #region Private functions
|
|
295
294
|
async function listAttachments() {
|
|
296
295
|
// The expected path looks like
|
|
297
296
|
// $HOME/Library/Daemon Containers/EFDD24BF-F856-411F-8954-CD5F0D6E6F3E/Data/Attachments/CAE7E5E2-5AC9-4D33-A47B-C491D644DE06
|
|
@@ -305,5 +304,4 @@ async function isFileUsed(fpath, userProcessName) {
|
|
|
305
304
|
const { stdout } = await (0, teen_process_1.exec)('lsof', [fpath]);
|
|
306
305
|
return stdout.includes(userProcessName);
|
|
307
306
|
}
|
|
308
|
-
// #endregion
|
|
309
307
|
//# sourceMappingURL=native-record-screen.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-record-screen.js","sourceRoot":"","sources":["../../../lib/commands/native-record-screen.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"native-record-screen.js","sourceRoot":"","sources":["../../../lib/commands/native-record-screen.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"record-screen.d.ts","sourceRoot":"","sources":["../../../lib/commands/record-screen.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"record-screen.d.ts","sourceRoot":"","sources":["../../../lib/commands/record-screen.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ exports.macosStartRecordingScreen = macosStartRecordingScreen;
|
|
|
8
8
|
exports.startRecordingScreen = startRecordingScreen;
|
|
9
9
|
exports.macosStopRecordingScreen = macosStopRecordingScreen;
|
|
10
10
|
exports.stopRecordingScreen = stopRecordingScreen;
|
|
11
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
12
11
|
const asyncbox_1 = require("asyncbox");
|
|
13
12
|
const support_1 = require("appium/support");
|
|
14
13
|
const teen_process_1 = require("teen_process");
|
|
@@ -22,17 +21,6 @@ const DEFAULT_EXT = 'mp4';
|
|
|
22
21
|
const FFMPEG_BINARY = 'ffmpeg';
|
|
23
22
|
const DEFAULT_FPS = 15;
|
|
24
23
|
const DEFAULT_PRESET = 'veryfast';
|
|
25
|
-
/**
|
|
26
|
-
* @param log - Logger instance
|
|
27
|
-
*/
|
|
28
|
-
async function requireFfmpegPath(log) {
|
|
29
|
-
try {
|
|
30
|
-
return await support_1.fs.which(FFMPEG_BINARY);
|
|
31
|
-
}
|
|
32
|
-
catch {
|
|
33
|
-
throw log.errorWithException(`${FFMPEG_BINARY} has not been found in PATH. ` + `Please make sure it is installed`);
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
24
|
class ScreenRecorder {
|
|
37
25
|
_log;
|
|
38
26
|
_videoPath;
|
|
@@ -105,8 +93,9 @@ class ScreenRecorder {
|
|
|
105
93
|
this._process = new teen_process_1.SubProcess(fullCmd[0], fullCmd.slice(1));
|
|
106
94
|
this._log.debug(`Starting ${FFMPEG_BINARY}: ${support_1.util.quote(fullCmd)}`);
|
|
107
95
|
this._process.on('output', (stdout, stderr) => {
|
|
108
|
-
|
|
109
|
-
|
|
96
|
+
const output = stdout ?? stderr ?? '';
|
|
97
|
+
if (output.trim()) {
|
|
98
|
+
this._log.debug(`[${FFMPEG_BINARY}] ${output}`);
|
|
110
99
|
}
|
|
111
100
|
});
|
|
112
101
|
this._process.once('exit', async (code, signal) => {
|
|
@@ -220,7 +209,7 @@ exports.ScreenRecorder = ScreenRecorder;
|
|
|
220
209
|
* @throws {Error} If screen recording has failed to start or is not supported on the device under test.
|
|
221
210
|
*/
|
|
222
211
|
async function macosStartRecordingScreen(deviceId, timeLimit, videoFilter, fps, preset, captureCursor, captureClicks, forceRestart = true) {
|
|
223
|
-
if (
|
|
212
|
+
if (deviceId == null) {
|
|
224
213
|
throw new Error(`'deviceId' option must be provided. Run 'ffmpeg -f avfoundation -list_devices true -i' ` +
|
|
225
214
|
'to fetch the list of available device ids');
|
|
226
215
|
}
|
|
@@ -315,4 +304,15 @@ async function macosStopRecordingScreen(remotePath, user, pass, method, headers,
|
|
|
315
304
|
async function stopRecordingScreen(options = {}) {
|
|
316
305
|
return await this.macosStopRecordingScreen(options.remotePath, options.user, options.pass, options.method, options.headers, options.fileFieldName, options.formFields);
|
|
317
306
|
}
|
|
307
|
+
/**
|
|
308
|
+
* @param log - Logger instance
|
|
309
|
+
*/
|
|
310
|
+
async function requireFfmpegPath(log) {
|
|
311
|
+
try {
|
|
312
|
+
return await support_1.fs.which(FFMPEG_BINARY);
|
|
313
|
+
}
|
|
314
|
+
catch {
|
|
315
|
+
throw log.errorWithException(`${FFMPEG_BINARY} has not been found in PATH. ` + `Please make sure it is installed`);
|
|
316
|
+
}
|
|
317
|
+
}
|
|
318
318
|
//# sourceMappingURL=record-screen.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"record-screen.js","sourceRoot":"","sources":["../../../lib/commands/record-screen.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"record-screen.js","sourceRoot":"","sources":["../../../lib/commands/record-screen.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import type { IDoctorCheck, AppiumLogger, DoctorCheckResult } from '@appium/types';
|
|
2
2
|
import '@colors/colors';
|
|
3
3
|
export declare class OptionalFfmpegCheck implements IDoctorCheck {
|
|
4
|
-
log: AppiumLogger;
|
|
5
4
|
static readonly FFMPEG_BINARY = "ffmpeg";
|
|
6
5
|
static readonly FFMPEG_INSTALL_LINK = "https://www.ffmpeg.org/download.html";
|
|
6
|
+
log: AppiumLogger;
|
|
7
7
|
diagnose(): Promise<DoctorCheckResult>;
|
|
8
8
|
fix(): Promise<string>;
|
|
9
9
|
hasAutofix(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"optional-checks.d.ts","sourceRoot":"","sources":["../../../lib/doctor/optional-checks.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAC,MAAM,eAAe,CAAC;AACjF,OAAO,gBAAgB,CAAC;AAExB,qBAAa,mBAAoB,YAAW,YAAY;IACtD,
|
|
1
|
+
{"version":3,"file":"optional-checks.d.ts","sourceRoot":"","sources":["../../../lib/doctor/optional-checks.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAC,MAAM,eAAe,CAAC;AACjF,OAAO,gBAAgB,CAAC;AAExB,qBAAa,mBAAoB,YAAW,YAAY;IACtD,MAAM,CAAC,QAAQ,CAAC,aAAa,YAAY;IACzC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,0CAA0C;IAE7E,GAAG,EAAG,YAAY,CAAC;IAEb,QAAQ,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAQtC,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;IAO5B,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;CAGtB;AACD,eAAO,MAAM,mBAAmB,qBAA4B,CAAC;AAE7D,qBAAa,2BAA4B,YAAW,YAAY;IAC9D,GAAG,EAAG,YAAY,CAAC;IAEb,QAAQ,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAetC,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;IAI5B,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;CAGtB;AACD,eAAO,MAAM,2BAA2B,6BAAoC,CAAC"}
|
|
@@ -6,9 +6,9 @@ const support_1 = require("appium/support");
|
|
|
6
6
|
const teen_process_1 = require("teen_process");
|
|
7
7
|
require("@colors/colors");
|
|
8
8
|
class OptionalFfmpegCheck {
|
|
9
|
-
log;
|
|
10
9
|
static FFMPEG_BINARY = 'ffmpeg';
|
|
11
10
|
static FFMPEG_INSTALL_LINK = 'https://www.ffmpeg.org/download.html';
|
|
11
|
+
log;
|
|
12
12
|
async diagnose() {
|
|
13
13
|
const ffmpegPath = await (0, utils_1.resolveExecutablePath)(OptionalFfmpegCheck.FFMPEG_BINARY);
|
|
14
14
|
return ffmpegPath
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"optional-checks.js","sourceRoot":"","sources":["../../../lib/doctor/optional-checks.ts"],"names":[],"mappings":";;;AAAA,mCAA8C;AAC9C,4CAAsC;AACtC,+CAAkC;AAElC,0BAAwB;AAExB,MAAa,mBAAmB;IAC9B,
|
|
1
|
+
{"version":3,"file":"optional-checks.js","sourceRoot":"","sources":["../../../lib/doctor/optional-checks.ts"],"names":[],"mappings":";;;AAAA,mCAA8C;AAC9C,4CAAsC;AACtC,+CAAkC;AAElC,0BAAwB;AAExB,MAAa,mBAAmB;IAC9B,MAAM,CAAU,aAAa,GAAG,QAAQ,CAAC;IACzC,MAAM,CAAU,mBAAmB,GAAG,sCAAsC,CAAC;IAE7E,GAAG,CAAgB;IAEnB,KAAK,CAAC,QAAQ;QACZ,MAAM,UAAU,GAAG,MAAM,IAAA,6BAAqB,EAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;QAElF,OAAO,UAAU;YACf,CAAC,CAAC,gBAAM,CAAC,UAAU,CAAC,GAAG,mBAAmB,CAAC,aAAa,eAAe,UAAU,GAAG,CAAC;YACrF,CAAC,CAAC,gBAAM,CAAC,WAAW,CAAC,GAAG,mBAAmB,CAAC,aAAa,kBAAkB,CAAC,CAAC;IACjF,CAAC;IAED,KAAK,CAAC,GAAG;QACP,OAAO,CACL,GAAG,GAAG,mBAAmB,CAAC,aAAa,EAAE,CAAC,IAAI,yCAAyC;YACvF,eAAe,mBAAmB,CAAC,mBAAmB,GAAG,CAC1D,CAAC;IACJ,CAAC;IAED,UAAU;QACR,OAAO,KAAK,CAAC;IACf,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC;IACd,CAAC;;AA3BH,kDA4BC;AACY,QAAA,mBAAmB,GAAG,IAAI,mBAAmB,EAAE,CAAC;AAE7D,MAAa,2BAA2B;IACtC,GAAG,CAAgB;IAEnB,KAAK,CAAC,QAAQ;QACZ,IAAI,MAAc,CAAC;QACnB,IAAI,CAAC;YACH,CAAC,EAAC,MAAM,EAAC,GAAG,MAAM,IAAA,mBAAI,EAAC,oBAAoB,CAAC,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,gBAAM,CAAC,WAAW,CACvB,oCAAqC,GAAW,CAAC,MAAM,IAAK,GAAa,CAAC,OAAO,EAAE,CACpF,CAAC;QACJ,CAAC;QACD,IAAI,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACxC,OAAO,gBAAM,CAAC,UAAU,CAAC,sDAAsD,CAAC,CAAC;QACnF,CAAC;QACD,OAAO,gBAAM,CAAC,WAAW,CAAC,8CAA8C,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,GAAG;QACP,OAAO,mHAAmH,CAAC;IAC7H,CAAC;IAED,UAAU;QACR,OAAO,KAAK,CAAC;IACf,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA7BD,kEA6BC;AACY,QAAA,2BAA2B,GAAG,IAAI,2BAA2B,EAAE,CAAC"}
|
|
@@ -9,9 +9,9 @@ export declare class XcodeCheck implements IDoctorCheck {
|
|
|
9
9
|
}
|
|
10
10
|
export declare const xcodeCheck: XcodeCheck;
|
|
11
11
|
export declare class XcodebuildCheck implements IDoctorCheck {
|
|
12
|
-
log: AppiumLogger;
|
|
13
12
|
static readonly XCODE_VER_PATTERN: RegExp;
|
|
14
13
|
static readonly MIN_XCODE_VERSION = 13;
|
|
14
|
+
log: AppiumLogger;
|
|
15
15
|
diagnose(): Promise<DoctorCheckResult>;
|
|
16
16
|
fix(): Promise<string>;
|
|
17
17
|
hasAutofix(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"required-checks.d.ts","sourceRoot":"","sources":["../../../lib/doctor/required-checks.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAC,MAAM,eAAe,CAAC;AACjF,OAAO,gBAAgB,CAAC;AAExB,qBAAa,UAAW,YAAW,YAAY;IAC7C,GAAG,EAAG,YAAY,CAAC;IAEb,QAAQ,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAStC,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;IAI5B,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;CAGtB;AACD,eAAO,MAAM,UAAU,YAAmB,CAAC;AAE3C,qBAAa,eAAgB,YAAW,YAAY;IAClD,
|
|
1
|
+
{"version":3,"file":"required-checks.d.ts","sourceRoot":"","sources":["../../../lib/doctor/required-checks.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAC,MAAM,eAAe,CAAC;AACjF,OAAO,gBAAgB,CAAC;AAExB,qBAAa,UAAW,YAAW,YAAY;IAC7C,GAAG,EAAG,YAAY,CAAC;IAEb,QAAQ,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAStC,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;IAI5B,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;CAGtB;AACD,eAAO,MAAM,UAAU,YAAmB,CAAC;AAE3C,qBAAa,eAAgB,YAAW,YAAY;IAClD,MAAM,CAAC,QAAQ,CAAC,iBAAiB,SAAyB;IAC1D,MAAM,CAAC,QAAQ,CAAC,iBAAiB,MAAM;IAEvC,GAAG,EAAG,YAAY,CAAC;IAEb,QAAQ,IAAI,OAAO,CAAC,iBAAiB,CAAC;IA4BtC,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;IAI5B,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;CAGtB;AACD,eAAO,MAAM,eAAe,iBAAwB,CAAC"}
|
|
@@ -29,9 +29,9 @@ class XcodeCheck {
|
|
|
29
29
|
exports.XcodeCheck = XcodeCheck;
|
|
30
30
|
exports.xcodeCheck = new XcodeCheck();
|
|
31
31
|
class XcodebuildCheck {
|
|
32
|
-
log;
|
|
33
32
|
static XCODE_VER_PATTERN = /^Xcode\s+([\d.]+)$/m;
|
|
34
33
|
static MIN_XCODE_VERSION = 13;
|
|
34
|
+
log;
|
|
35
35
|
async diagnose() {
|
|
36
36
|
let xcodeVerMatch;
|
|
37
37
|
let stdout;
|