appium-mac2-driver 3.0.0 → 3.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/README.md +1 -1
- package/WebDriverAgentMac/IntegrationTests/AMW3CActionsTests.m +1 -1
- package/WebDriverAgentMac/WebDriverAgentLib/Categories/XCUIApplication+AMActiveElement.h +1 -1
- package/WebDriverAgentMac/WebDriverAgentLib/Categories/XCUIApplication+AMSource.h +2 -2
- package/WebDriverAgentMac/WebDriverAgentLib/Categories/XCUIApplication+FBW3CActions.h +1 -1
- package/WebDriverAgentMac/WebDriverAgentLib/Categories/XCUIElementQuery+AMHelpers.h +2 -2
- package/WebDriverAgentMac/WebDriverAgentLib/Commands/AMWindowCommands.m +3 -3
- package/WebDriverAgentMac/WebDriverAgentLib/Routing/FBExceptions.h +3 -3
- package/WebDriverAgentMac/WebDriverAgentLib/Routing/FBResponseJSONPayload.h +1 -1
- package/WebDriverAgentMac/WebDriverAgentLib/Routing/FBScreenRecordingRequest.h +1 -1
- package/WebDriverAgentMac/WebDriverAgentLib/Routing/FBScreenRecordingRequest.m +2 -2
- package/WebDriverAgentMac/WebDriverAgentLib/Utilities/AMScreenUtils.h +1 -1
- package/WebDriverAgentMac/WebDriverAgentLib/Utilities/AMSettings.h +1 -1
- package/WebDriverAgentMac/WebDriverAgentLib/Utilities/AMSnapshotUtils.h +2 -2
- package/WebDriverAgentMac/WebDriverAgentLib/Utilities/FBBaseActionsSynthesizer.h +9 -9
- package/WebDriverAgentMac/WebDriverAgentLib/Utilities/FBClassChainQueryParser.h +4 -4
- package/WebDriverAgentMac/WebDriverAgentLib/Utilities/FBClassChainQueryParser.m +4 -4
- package/WebDriverAgentMac/WebDriverAgentLib/Utilities/FBElementUtils.h +2 -2
- package/WebDriverAgentMac/WebDriverAgentLib/Utilities/FBXPath.h +2 -2
- package/WebDriverAgentMac/WebDriverAgentLib/Utilities/FBXPath.m +2 -2
- package/build/lib/commands/native-record-screen.js +4 -0
- package/build/lib/commands/native-record-screen.js.map +1 -1
- package/build/lib/doctor/optional-checks.js +2 -4
- package/build/lib/doctor/optional-checks.js.map +1 -1
- package/build/lib/doctor/required-checks.js +2 -4
- package/build/lib/doctor/required-checks.js.map +1 -1
- package/build/lib/driver.js +39 -33
- package/build/lib/driver.js.map +1 -1
- package/build/lib/wda-mac.js +6 -2
- package/build/lib/wda-mac.js.map +1 -1
- package/lib/wda-mac.js +2 -2
- package/npm-shrinkwrap.json +117 -108
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
## [3.0.1](https://github.com/appium/appium-mac2-driver/compare/v3.0.0...v3.0.1) (2025-09-28)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Miscellaneous Chores
|
|
5
|
+
|
|
6
|
+
* fix typos ([#344](https://github.com/appium/appium-mac2-driver/issues/344)) ([3687efa](https://github.com/appium/appium-mac2-driver/commit/3687efa3b43c83e2ec2a3f1414c6fa3b7f7da5c0))
|
|
7
|
+
|
|
1
8
|
## [3.0.0](https://github.com/appium/appium-mac2-driver/compare/v2.2.2...v3.0.0) (2025-08-17)
|
|
2
9
|
|
|
3
10
|
|
package/README.md
CHANGED
|
@@ -83,7 +83,7 @@ Mac2 driver supports the following location strategies:
|
|
|
83
83
|
|
|
84
84
|
Name | Description | Speed Ranking | Pseudocode
|
|
85
85
|
--- | --- | --- | ---
|
|
86
|
-
accessibilityId, id, name | These all strategies are mapped to the same Mac2 driver ByIdentifier lookup strategy. The locator matches the passed value with element's `
|
|
86
|
+
accessibilityId, id, name | These all strategies are mapped to the same Mac2 driver ByIdentifier lookup strategy. The locator matches the passed value with element's `identifier` attribute case-sensitively. | `⭐⭐⭐⭐⭐` | AppiumBy.accessibilityId("identifier"), By.id("identifier"), By.name("identifier")
|
|
87
87
|
className | Class name uses stringified element types for lookup | `⭐⭐⭐⭐⭐` | By.className("XCUIElementTypePopUpButton")
|
|
88
88
|
predicate | Lookup by predicate is natively supported by XCTest and is as fast as previous lookup strategies. This lookup strategy could only use the supported [element attributes](#element-attributes). Unknown attribute names would throw an exception. Check [NSPredicate cheat sheet](https://academy.realm.io/posts/nspredicate-cheatsheet/) for more details on how to build effective and flexible locators. | `⭐⭐⭐⭐⭐` | AppiumBy.iOSNsPredicateString("elementType == 2 AND label BEGINSWITH 'Safari'")
|
|
89
89
|
classChain | This strategy is a combination of Xpath flexibility and fast predicate lookup. Prefer it over Xpath unless there is no other way to build the desired locator. Visit [Class Chain Construction Rules tutorial](https://github.com/facebookarchive/WebDriverAgent/wiki/Class-Chain-Queries-Construction-Rules) to get more knowledge on how to build class chain locators. | `⭐⭐⭐⭐` | AppiumBy.iOSClassChain("**/XCUIElementTypeRuler[$elementType == 72 AND value BEGINSWITH '10'$]")
|
|
@@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
21
21
|
@interface XCUIApplication (AMActiveElement)
|
|
22
22
|
|
|
23
23
|
/**
|
|
24
|
-
|
|
24
|
+
Retrieves the element, which holds the keyboard input focus
|
|
25
25
|
*/
|
|
26
26
|
- (nullable XCUIElement *)am_activeElement;
|
|
27
27
|
|
|
@@ -21,12 +21,12 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
21
21
|
@interface XCUIApplication (AMSource)
|
|
22
22
|
|
|
23
23
|
/**
|
|
24
|
-
|
|
24
|
+
Retrieves XML application source representation
|
|
25
25
|
*/
|
|
26
26
|
- (NSString *)am_xmlRepresentation;
|
|
27
27
|
|
|
28
28
|
/**
|
|
29
|
-
|
|
29
|
+
Retrieves description application source representation.
|
|
30
30
|
Actually, the value of debugDescription property
|
|
31
31
|
*/
|
|
32
32
|
- (NSString *)am_descriptionRepresentation;
|
|
@@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
19
19
|
Perform complex touch action in scope of the current application.
|
|
20
20
|
|
|
21
21
|
@param actions Array of dictionaries, whose format is described in W3C spec (https://github.com/jlipps/simple-wd-spec#perform-actions)
|
|
22
|
-
@param elementCache Cached elements mapping for the
|
|
22
|
+
@param elementCache Cached elements mapping for the current application. The method assumes all elements are already represented by their actual instances if nil value is set
|
|
23
23
|
@param error If there is an error, upon return contains an NSError object that describes the problem
|
|
24
24
|
@return YES If the touch action has been successfully performed without errors
|
|
25
25
|
*/
|
|
@@ -23,14 +23,14 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
23
23
|
/**
|
|
24
24
|
Retrieves the first match from the query
|
|
25
25
|
|
|
26
|
-
@returns Matched element instance
|
|
26
|
+
@returns Matched element instance or nil if no element is found
|
|
27
27
|
*/
|
|
28
28
|
- (nullable XCUIElement *)am_firstMatch;
|
|
29
29
|
|
|
30
30
|
/**
|
|
31
31
|
Retrieves all matches from the query
|
|
32
32
|
|
|
33
|
-
@returns Matched element instances
|
|
33
|
+
@returns Matched element instances or an empty array if no matches are found
|
|
34
34
|
*/
|
|
35
35
|
- (NSArray<XCUIElement *> *)am_allMatches;
|
|
36
36
|
|
|
@@ -32,21 +32,21 @@
|
|
|
32
32
|
{
|
|
33
33
|
return [self performClickWithButtonId:@"_XCUI:FullScreenWindow"
|
|
34
34
|
request:request
|
|
35
|
-
errorMessage:[NSString stringWithFormat:@"%@ window cannot be maximized because the
|
|
35
|
+
errorMessage:[NSString stringWithFormat:@"%@ window cannot be maximized because the corresponding button is not available", request.session.currentApplication.description]];
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
+ (id<FBResponsePayload>)handleFullscreenWindow:(FBRouteRequest *)request
|
|
39
39
|
{
|
|
40
40
|
return [self performClickWithButtonId:@"_XCUI:FullScreenWindow"
|
|
41
41
|
request:request
|
|
42
|
-
errorMessage:[NSString stringWithFormat:@"%@ window cannot be put into fullscreen mode because the
|
|
42
|
+
errorMessage:[NSString stringWithFormat:@"%@ window cannot be put into fullscreen mode because the corresponding button is not available", request.session.currentApplication.description]];
|
|
43
43
|
}
|
|
44
44
|
|
|
45
45
|
+ (id<FBResponsePayload>)handleMinimizeWindow:(FBRouteRequest *)request
|
|
46
46
|
{
|
|
47
47
|
return [self performClickWithButtonId:@"_XCUI:MinimizeWindow"
|
|
48
48
|
request:request
|
|
49
|
-
errorMessage:[NSString stringWithFormat:@"%@ window cannot be minimized because the
|
|
49
|
+
errorMessage:[NSString stringWithFormat:@"%@ window cannot be minimized because the corresponding button is not available", request.session.currentApplication.description]];
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
+ (id<FBResponsePayload>)performClickWithButtonId:(NSString *)buttonId
|
|
@@ -30,16 +30,16 @@ extern NSString *const FBElementNotVisibleException;
|
|
|
30
30
|
extern NSString *const FBTimeoutException;
|
|
31
31
|
|
|
32
32
|
/**
|
|
33
|
-
The exception
|
|
33
|
+
The exception happens if the cached element does not exist in DOM anymore
|
|
34
34
|
*/
|
|
35
35
|
extern NSString *const FBStaleElementException;
|
|
36
36
|
|
|
37
37
|
/**
|
|
38
|
-
The exception
|
|
38
|
+
The exception happens if the provided XPath expression cannot be compiled because of a syntax error
|
|
39
39
|
*/
|
|
40
40
|
extern NSString *const FBInvalidXPathException;
|
|
41
41
|
/**
|
|
42
|
-
The exception
|
|
42
|
+
The exception happens if any internal error is triggered during XPath matching procedure
|
|
43
43
|
*/
|
|
44
44
|
extern NSString *const FBXPathQueryEvaluationException;
|
|
45
45
|
|
|
@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
20
20
|
@property (readonly, nonatomic, nullable) NSNumber *displayID;
|
|
21
21
|
|
|
22
22
|
/**
|
|
23
|
-
Creates a custom wrapper for a screen recording
|
|
23
|
+
Creates a custom wrapper for a screen recording request
|
|
24
24
|
|
|
25
25
|
@param fps FPS value, see baove
|
|
26
26
|
@param codec Codex value, see above
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
SEL videoEncodingConstructorSelector = NSSelectorFromString(@"initWithCodec:frameRate:");
|
|
38
38
|
if (![videoEncodingAllocated respondsToSelector:videoEncodingConstructorSelector]) {
|
|
39
39
|
[[[FBErrorBuilder builder]
|
|
40
|
-
withDescription:@"'initWithCodec:frameRate:'
|
|
40
|
+
withDescription:@"'initWithCodec:frameRate:' constructor is not found on XCTVideoEncoding class"]
|
|
41
41
|
buildError:error];
|
|
42
42
|
return nil;
|
|
43
43
|
}
|
|
@@ -69,7 +69,7 @@
|
|
|
69
69
|
SEL screenRecordingRequestConstructorSelector = NSSelectorFromString(@"initWithScreenID:rect:preferredEncoding:");
|
|
70
70
|
if (![screenRecordingRequestAllocated respondsToSelector:screenRecordingRequestConstructorSelector]) {
|
|
71
71
|
[[[FBErrorBuilder builder]
|
|
72
|
-
withDescription:@"'initWithScreenID:rect:preferredEncoding:'
|
|
72
|
+
withDescription:@"'initWithScreenID:rect:preferredEncoding:' constructor is not found on XCTScreenRecordingRequest class"]
|
|
73
73
|
buildError:error];
|
|
74
74
|
return nil;
|
|
75
75
|
}
|
|
@@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
22
22
|
|
|
23
23
|
/** YES if the corresponding screen is a main screen */
|
|
24
24
|
@property (readonly, nonatomic) BOOL isMain;
|
|
25
|
-
/** The integer
|
|
25
|
+
/** The integer identifier of a screen */
|
|
26
26
|
@property (readonly, nonatomic) long long identifier;
|
|
27
27
|
|
|
28
28
|
@end
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
|
|
19
19
|
NS_ASSUME_NONNULL_BEGIN
|
|
20
20
|
|
|
21
|
-
/*!Controls elements binding strategy. By default elements are bind by
|
|
21
|
+
/*!Controls elements binding strategy. By default elements are bind by accessibility identifier */
|
|
22
22
|
extern NSString* const AM_BOUND_ELEMENTS_BY_INDEX_SETTING;
|
|
23
23
|
|
|
24
24
|
/*!Whether to use the default XCTest UI interruptions hanfling (YES by default).
|
|
@@ -21,11 +21,11 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
21
21
|
@interface AMSnapshotUtils : NSObject
|
|
22
22
|
|
|
23
23
|
/**
|
|
24
|
-
|
|
24
|
+
Retrieves the unique snapshot hash. This hash is unique per snapshot's
|
|
25
25
|
accessibility elemnent, which means different snapshots of the same
|
|
26
26
|
element may have equal hashes
|
|
27
27
|
|
|
28
|
-
@param snapshot snapshot instance to
|
|
28
|
+
@param snapshot snapshot instance to calculate the hash for
|
|
29
29
|
@return The hash value as base64-encoded string
|
|
30
30
|
*/
|
|
31
31
|
+ (NSString *)hashWithSnapshot:(id)snapshot;
|
|
@@ -23,14 +23,14 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
23
23
|
@property (nonatomic) double offset;
|
|
24
24
|
|
|
25
25
|
/**
|
|
26
|
-
Get the name of the corresponding raw action item. This method is expected to be
|
|
27
|
-
|
|
28
|
-
@return The corresponding action item key in object's raw JSON
|
|
26
|
+
Get the name of the corresponding raw action item. This method is expected to be overridden in subclasses.
|
|
27
|
+
|
|
28
|
+
@return The corresponding action item key in object's raw JSON representation
|
|
29
29
|
*/
|
|
30
30
|
+ (NSString *)actionName;
|
|
31
31
|
|
|
32
32
|
/**
|
|
33
|
-
Add the current gesture to XCPointerEventPath instance. This method is expected to be
|
|
33
|
+
Add the current gesture to XCPointerEventPath instance. This method is expected to be overridden in subclasses.
|
|
34
34
|
|
|
35
35
|
@param eventPath The destination XCPointerEventPath instance. If nil value is passed then a new XCPointerEventPath instance is going to be created
|
|
36
36
|
@param allItems The existing actions chain to be transformed into event path
|
|
@@ -66,7 +66,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
66
66
|
Calculate absolute gesture position on the screen based on provided element and positionOffset values.
|
|
67
67
|
|
|
68
68
|
@param element The element instance to perform the gesture on. If element equals to nil then positionOffset is considered as absolute coordinates
|
|
69
|
-
@param positionOffset The actual coordinate offset. If this
|
|
69
|
+
@param positionOffset The actual coordinate offset. If this value equals to nil then element's hitpoint is taken as gesture position. If element is not nil then this offset is calculated relatively to the top-left cordner of the element's position
|
|
70
70
|
@param error If there is an error, upon return contains an NSError object that describes the problem
|
|
71
71
|
@return Adbsolute gesture position on the screen or nil if the calculation fails (for example, the element is invisible)
|
|
72
72
|
*/
|
|
@@ -85,7 +85,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
85
85
|
@property (nonatomic) double durationOffset;
|
|
86
86
|
|
|
87
87
|
/**
|
|
88
|
-
Add a new gesture item to the current chain. The method is expected to be
|
|
88
|
+
Add a new gesture item to the current chain. The method is expected to be overridden in subclasses.
|
|
89
89
|
|
|
90
90
|
@param item The actual gesture instance to be added
|
|
91
91
|
*/
|
|
@@ -113,8 +113,8 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
113
113
|
|
|
114
114
|
/**
|
|
115
115
|
Initializes actions synthesizer. This initializer should be used only by subclasses.
|
|
116
|
-
|
|
117
|
-
@param actions The raw actions chain received from request's JSON. The format of this chain is defined by the standard, implemented in the
|
|
116
|
+
|
|
117
|
+
@param actions The raw actions chain received from request's JSON. The format of this chain is defined by the standard, implemented in the corresponding subclass.
|
|
118
118
|
@param application Current application instance
|
|
119
119
|
@param elementCache Elements cache, which is used to replace elements references in the chain with their instances. We assume the chain already contains element instances if this parameter is set to nil
|
|
120
120
|
@param error If there is an error, upon return contains an NSError object that describes the problem
|
|
@@ -126,7 +126,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
126
126
|
error:(NSError **)error;
|
|
127
127
|
|
|
128
128
|
/**
|
|
129
|
-
Synthesizes XCTest-compatible event record to be performed in the UI. This method is supposed to be
|
|
129
|
+
Synthesizes XCTest-compatible event record to be performed in the UI. This method is supposed to be overridden by subclasses.
|
|
130
130
|
|
|
131
131
|
@param error If there is an error, upon return contains an NSError object that describes the problem
|
|
132
132
|
@return The generated event record or nil in case of failure
|
|
@@ -41,7 +41,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
41
41
|
@property (readonly, nonatomic, nullable) NSNumber *position;
|
|
42
42
|
/*! Element's type */
|
|
43
43
|
@property (readonly, nonatomic) XCUIElementType type;
|
|
44
|
-
/*! Whether an element is a descendant of the
|
|
44
|
+
/*! Whether an element is a descendant of the previous element */
|
|
45
45
|
@property (readonly, nonatomic) BOOL isDescendant;
|
|
46
46
|
/*! The ordered list of matching predicates for the current element */
|
|
47
47
|
@property (readonly, nonatomic) NSArray<FBAbstractPredicateItem *> *predicates;
|
|
@@ -84,14 +84,14 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
84
84
|
|
|
85
85
|
/**
|
|
86
86
|
Method used to interpret class chain queries
|
|
87
|
-
|
|
87
|
+
|
|
88
88
|
@param classChainQuery class chain query as string. See the documentation of
|
|
89
89
|
XCUIElement+FBClassChain category for more details about the expected query format
|
|
90
|
-
@param error standard NSError object, which is going to be
|
|
90
|
+
@param error standard NSError object, which is going to be initialized if
|
|
91
91
|
there are query parsing errors
|
|
92
92
|
@return list of parsed primitives packed to FBClassChainElement class or nil in case
|
|
93
93
|
there was parsing error (the parameter will be initialized with detailed error description in such case)
|
|
94
|
-
@throws FBUnknownAttributeException if any of predicates in the chain contains unknown attribute
|
|
94
|
+
@throws FBUnknownAttributeException if any of predicates in the chain contains unknown attribute
|
|
95
95
|
*/
|
|
96
96
|
+ (nullable FBClassChain*)parseQuery:(NSString*)classChainQuery error:(NSError **)error;
|
|
97
97
|
|
|
@@ -93,19 +93,19 @@ NS_ASSUME_NONNULL_END
|
|
|
93
93
|
|
|
94
94
|
+ (NSCharacterSet *)allowedCharacters
|
|
95
95
|
{
|
|
96
|
-
// This method is expected to be
|
|
96
|
+
// This method is expected to be overridden by subclasses
|
|
97
97
|
return [NSCharacterSet characterSetWithCharactersInString:@""];
|
|
98
98
|
}
|
|
99
99
|
|
|
100
100
|
+ (NSUInteger)maxLength
|
|
101
101
|
{
|
|
102
|
-
// This method is expected to be
|
|
102
|
+
// This method is expected to be overridden by subclasses
|
|
103
103
|
return ULONG_MAX;
|
|
104
104
|
}
|
|
105
105
|
|
|
106
106
|
- (NSArray<Class> *)followingTokens
|
|
107
107
|
{
|
|
108
|
-
// This method is expected to be
|
|
108
|
+
// This method is expected to be overridden by subclasses
|
|
109
109
|
return @[];
|
|
110
110
|
}
|
|
111
111
|
|
|
@@ -314,7 +314,7 @@ static NSString *const FBAbstractMethodInvocationException = @"FBAbstractMethodI
|
|
|
314
314
|
|
|
315
315
|
+ (NSString *)enclosingMarker
|
|
316
316
|
{
|
|
317
|
-
NSString *errMsg = [NSString stringWithFormat:@"The + (NSString *)enclosingMarker method is expected to be
|
|
317
|
+
NSString *errMsg = [NSString stringWithFormat:@"The + (NSString *)enclosingMarker method is expected to be overridden by %@ class", NSStringFromClass(self.class)];
|
|
318
318
|
@throw [NSException exceptionWithName:FBAbstractMethodInvocationException reason:errMsg userInfo:nil];
|
|
319
319
|
}
|
|
320
320
|
|
|
@@ -24,8 +24,8 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
24
24
|
|
|
25
25
|
/**
|
|
26
26
|
Returns available attributes names of an element
|
|
27
|
-
|
|
28
|
-
@return list of attribute names, basically
|
|
27
|
+
|
|
28
|
+
@return list of attribute names, basically members of XCUIElementAttributeName enum
|
|
29
29
|
*/
|
|
30
30
|
+ (NSArray<NSString *> *)wdAttributeNames;
|
|
31
31
|
|
|
@@ -15,10 +15,10 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
15
15
|
|
|
16
16
|
/**
|
|
17
17
|
Returns an array of descendants matching given xpath query
|
|
18
|
-
|
|
18
|
+
|
|
19
19
|
@param root the root element to execute XPath query for
|
|
20
20
|
@param xpathQuery requested xpath query
|
|
21
|
-
@param firstMatch whether to only
|
|
21
|
+
@param firstMatch whether to only resolve the first matched element (if YES) or all of them
|
|
22
22
|
@return an array of descendants matching the given xpath query or an empty array if no matches were found
|
|
23
23
|
@throws NSException if there is an unexpected internal error during xml parsing
|
|
24
24
|
*/
|
|
@@ -279,13 +279,13 @@ static NSString *const FBAbstractMethodInvocationException = @"AbstractMethodInv
|
|
|
279
279
|
|
|
280
280
|
+ (NSString *)name
|
|
281
281
|
{
|
|
282
|
-
NSString *errMsg = [NSString stringWithFormat:@"The abstract method +(NSString *)name is expected to be
|
|
282
|
+
NSString *errMsg = [NSString stringWithFormat:@"The abstract method +(NSString *)name is expected to be overridden by %@", NSStringFromClass(self.class)];
|
|
283
283
|
@throw [NSException exceptionWithName:FBAbstractMethodInvocationException reason:errMsg userInfo:nil];
|
|
284
284
|
}
|
|
285
285
|
|
|
286
286
|
+ (NSString *)valueForElement:(id<XCUIElementSnapshot>)element
|
|
287
287
|
{
|
|
288
|
-
NSString *errMsg = [NSString stringWithFormat:@"The abstract method -(NSString *)value is expected to be
|
|
288
|
+
NSString *errMsg = [NSString stringWithFormat:@"The abstract method -(NSString *)value is expected to be overridden by %@", NSStringFromClass(self.class)];
|
|
289
289
|
@throw [NSException exceptionWithName:FBAbstractMethodInvocationException reason:errMsg userInfo:nil];
|
|
290
290
|
}
|
|
291
291
|
|
|
@@ -55,6 +55,10 @@ const BUFFER_SIZE = 0xFFFF;
|
|
|
55
55
|
const MONITORING_INTERVAL_DURATION_MS = 1000;
|
|
56
56
|
const MAX_MONITORING_DURATION_MS = 24 * 60 * 60 * 1000; // 1 day
|
|
57
57
|
class NativeVideoChunksBroadcaster {
|
|
58
|
+
_ee;
|
|
59
|
+
_log;
|
|
60
|
+
_publishers;
|
|
61
|
+
_terminated;
|
|
58
62
|
constructor(ee, log) {
|
|
59
63
|
this._ee = ee;
|
|
60
64
|
this._log = log;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-record-screen.js","sourceRoot":"","sources":["../../../lib/commands/native-record-screen.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAwLA,0EAaC;AAOD,8EAIC;AA6BD,wEA4DC;AAOD,8CAEC;AAlTD,oDAAuB;AACvB,qDAAyC;AACzC,0DAA6B;AAC7B,4CAA0C;AAE1C,uCAAgD;AAGhD,uCAA4C;AAC5C,+CAAoC;AACpC,gDAAmD;AACnD,0CAA6D;AAE7D,MAAM,4BAA4B,GAAG,IAAI,CAAC;AAC1C,MAAM,WAAW,GAAG,MAAM,CAAC;AAC3B,MAAM,+BAA+B,GAAG,IAAI,CAAC;AAC7C,MAAM,0BAA0B,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,QAAQ;AAEhE,MAAa,4BAA4B;
|
|
1
|
+
{"version":3,"file":"native-record-screen.js","sourceRoot":"","sources":["../../../lib/commands/native-record-screen.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,10 +7,8 @@ const teen_process_1 = require("teen_process");
|
|
|
7
7
|
require("@colors/colors");
|
|
8
8
|
/** @satisfies {import('@appium/types').IDoctorCheck} */
|
|
9
9
|
class OptionalFfmpegCheck {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
this.FFMPEG_INSTALL_LINK = 'https://www.ffmpeg.org/download.html';
|
|
13
|
-
}
|
|
10
|
+
FFMPEG_BINARY = 'ffmpeg';
|
|
11
|
+
FFMPEG_INSTALL_LINK = 'https://www.ffmpeg.org/download.html';
|
|
14
12
|
async diagnose() {
|
|
15
13
|
const ffmpegPath = await (0, utils_1.resolveExecutablePath)(this.FFMPEG_BINARY);
|
|
16
14
|
return ffmpegPath
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"optional-checks.js","sourceRoot":"","sources":["../../../lib/doctor/optional-checks.js"],"names":[],"mappings":";;;AAAA,mCAA8C;AAC9C,4CAAsC;AACtC,+CAAkC;AAClC,0BAAwB;AAExB,wDAAwD;AACxD,MAAa,mBAAmB;
|
|
1
|
+
{"version":3,"file":"optional-checks.js","sourceRoot":"","sources":["../../../lib/doctor/optional-checks.js"],"names":[],"mappings":";;;AAAA,mCAA8C;AAC9C,4CAAsC;AACtC,+CAAkC;AAClC,0BAAwB;AAExB,wDAAwD;AACxD,MAAa,mBAAmB;IAC9B,aAAa,GAAG,QAAQ,CAAC;IACzB,mBAAmB,GAAG,sCAAsC,CAAC;IAE7D,KAAK,CAAC,QAAQ;QACZ,MAAM,UAAU,GAAG,MAAM,IAAA,6BAAqB,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAEnE,OAAO,UAAU;YACf,CAAC,CAAC,gBAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,aAAa,eAAe,UAAU,GAAG,CAAC;YACtE,CAAC,CAAC,gBAAM,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,aAAa,kBAAkB,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,GAAG;QACP,OAAO,CACL,GAAG,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,IAAI,yCAAyC;YACxE,eAAe,IAAI,CAAC,mBAAmB,GAAG,CAC3C,CAAC;IACJ,CAAC;IAED,UAAU;QACR,OAAO,KAAK,CAAC;IACf,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA1BD,kDA0BC;AACY,QAAA,mBAAmB,GAAG,IAAI,mBAAmB,EAAE,CAAC;AAG7D,wDAAwD;AACxD,MAAa,2BAA2B;IACtC,KAAK,CAAC,QAAQ;QACZ,IAAI,MAAM,CAAC;QACX,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,CAAC,oCAAoC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7F,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;AAzBD,kEAyBC;AACY,QAAA,2BAA2B,GAAG,IAAI,2BAA2B,EAAE,CAAC"}
|
|
@@ -30,10 +30,8 @@ exports.XcodeCheck = XcodeCheck;
|
|
|
30
30
|
exports.xcodeCheck = new XcodeCheck();
|
|
31
31
|
/** @satisfies {import('@appium/types').IDoctorCheck} */
|
|
32
32
|
class XcodebuildCheck {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
this.MIN_XCODE_VERSION = 13;
|
|
36
|
-
}
|
|
33
|
+
XCODE_VER_PATTERN = /^Xcode\s+([\d.]+)$/m;
|
|
34
|
+
MIN_XCODE_VERSION = 13;
|
|
37
35
|
async diagnose() {
|
|
38
36
|
let xcodeVerMatch;
|
|
39
37
|
let stdout;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"required-checks.js","sourceRoot":"","sources":["../../../lib/doctor/required-checks.js"],"names":[],"mappings":";;;AAAA,4CAAsC;AACtC,+CAAkC;AAClC,+CAAuD;AACvD,0BAAwB;AAGxB,wDAAwD;AACxD,MAAa,UAAU;IACrB,KAAK,CAAC,QAAQ;QACZ,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,MAAM,IAAA,sBAAY,GAAE,CAAC;YACvC,OAAO,gBAAM,CAAC,EAAE,CAAC,0BAA0B,SAAS,GAAG,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,gBAAM,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,GAAG;QACP,OAAO,oBAAoB,OAAO,CAAC,IAAI,gFAAgF,CAAC;IAC1H,CAAC;IAED,UAAU;QACR,OAAO,KAAK,CAAC;IACf,CAAC;IAED,UAAU;QACR,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AArBD,gCAqBC;AACY,QAAA,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;AAG3C,wDAAwD;AACxD,MAAa,eAAe;
|
|
1
|
+
{"version":3,"file":"required-checks.js","sourceRoot":"","sources":["../../../lib/doctor/required-checks.js"],"names":[],"mappings":";;;AAAA,4CAAsC;AACtC,+CAAkC;AAClC,+CAAuD;AACvD,0BAAwB;AAGxB,wDAAwD;AACxD,MAAa,UAAU;IACrB,KAAK,CAAC,QAAQ;QACZ,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,MAAM,IAAA,sBAAY,GAAE,CAAC;YACvC,OAAO,gBAAM,CAAC,EAAE,CAAC,0BAA0B,SAAS,GAAG,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,gBAAM,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,GAAG;QACP,OAAO,oBAAoB,OAAO,CAAC,IAAI,gFAAgF,CAAC;IAC1H,CAAC;IAED,UAAU;QACR,OAAO,KAAK,CAAC;IACf,CAAC;IAED,UAAU;QACR,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AArBD,gCAqBC;AACY,QAAA,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;AAG3C,wDAAwD;AACxD,MAAa,eAAe;IAC1B,iBAAiB,GAAG,qBAAqB,CAAC;IAC1C,iBAAiB,GAAG,EAAE,CAAC;IAEvB,KAAK,CAAC,QAAQ;QACZ,IAAI,aAAa,CAAC;QAClB,IAAI,MAAM,CAAC;QACX,IAAI,MAAM,CAAC;QACX,IAAI,CAAC;YACH,CAAC,EAAC,MAAM,EAAE,MAAM,EAAC,GAAG,MAAM,IAAA,mBAAI,EAAC,YAAY,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAC5D,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,gBAAM,CAAC,GAAG,CAAC,4BAA4B,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7E,CAAC;QACD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,gBAAM,CAAC,GAAG,CAAC,2CAA2C,MAAM,aAAa,MAAM,EAAE,CAAC,CAAC;QAC5F,CAAC;QACD,MAAM,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACrD,IAAI,aAAa,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3C,OAAO,gBAAM,CAAC,GAAG,CAAC,6BAA6B,aAAa,CAAC,CAAC,CAAC,+BAA+B;gBAC5F,QAAQ,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,gBAAM,CAAC,EAAE,CAAC,4DAA4D;YAC3E,IAAI,aAAa,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,GAAG;QACP,OAAO,WAAW,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,iBAAiB,iCAAiC,CAAC;IAC5F,CAAC;IAED,UAAU;QACR,OAAO,KAAK,CAAC;IACf,CAAC;IAED,UAAU;QACR,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AArCD,0CAqCC;AACY,QAAA,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC"}
|
package/build/lib/driver.js
CHANGED
|
@@ -66,40 +66,17 @@ const NO_PROXY = [
|
|
|
66
66
|
['POST', new RegExp('^/session/[^/]+/timeouts$')],
|
|
67
67
|
];
|
|
68
68
|
class Mac2Driver extends driver_1.BaseDriver {
|
|
69
|
+
/** @type {boolean} */
|
|
70
|
+
isProxyActive;
|
|
71
|
+
/** @type {import('./wda-mac').WDAMacServer} */
|
|
72
|
+
wda;
|
|
73
|
+
/** @type {nativeScreenRecordingCommands.NativeVideoChunksBroadcaster} */
|
|
74
|
+
_videoChunksBroadcaster;
|
|
75
|
+
static newMethodMap = method_map_1.newMethodMap;
|
|
76
|
+
static executeMethodMap = execute_method_map_1.executeMethodMap;
|
|
69
77
|
constructor(opts = {}) {
|
|
70
78
|
// @ts-ignore TODO: Make opts typed
|
|
71
79
|
super(opts);
|
|
72
|
-
this.macosLaunchApp = appManagemenetCommands.macosLaunchApp;
|
|
73
|
-
this.macosActivateApp = appManagemenetCommands.macosActivateApp;
|
|
74
|
-
this.macosTerminateApp = appManagemenetCommands.macosTerminateApp;
|
|
75
|
-
this.macosQueryAppState = appManagemenetCommands.macosQueryAppState;
|
|
76
|
-
this.macosExecAppleScript = appleScriptCommands.macosExecAppleScript;
|
|
77
|
-
this.execute = executeCommands.execute;
|
|
78
|
-
this.findElOrEls = findCommands.findElOrEls;
|
|
79
|
-
this.macosSetValue = gesturesCommands.macosSetValue;
|
|
80
|
-
this.macosClick = gesturesCommands.macosClick;
|
|
81
|
-
this.macosScroll = gesturesCommands.macosScroll;
|
|
82
|
-
this.macosSwipe = gesturesCommands.macosSwipe;
|
|
83
|
-
this.macosRightClick = gesturesCommands.macosRightClick;
|
|
84
|
-
this.macosHover = gesturesCommands.macosHover;
|
|
85
|
-
this.macosDoubleClick = gesturesCommands.macosDoubleClick;
|
|
86
|
-
this.macosClickAndDrag = gesturesCommands.macosClickAndDrag;
|
|
87
|
-
this.macosClickAndDragAndHold = gesturesCommands.macosClickAndDragAndHold;
|
|
88
|
-
this.macosKeys = gesturesCommands.macosKeys;
|
|
89
|
-
this.macosPressAndHold = gesturesCommands.macosPressAndHold;
|
|
90
|
-
this.macosTap = gesturesCommands.macosTap;
|
|
91
|
-
this.macosDoubleTap = gesturesCommands.macosDoubleTap;
|
|
92
|
-
this.macosPressAndDrag = gesturesCommands.macosPressAndDrag;
|
|
93
|
-
this.macosPressAndDragAndHold = gesturesCommands.macosPressAndDragAndHold;
|
|
94
|
-
this.macosDeepLink = navigationCommands.macosDeepLink;
|
|
95
|
-
this.startRecordingScreen = recordScreenCommands.startRecordingScreen;
|
|
96
|
-
this.stopRecordingScreen = recordScreenCommands.stopRecordingScreen;
|
|
97
|
-
this.macosStartNativeScreenRecording = nativeScreenRecordingCommands.macosStartNativeScreenRecording;
|
|
98
|
-
this.macosGetNativeScreenRecordingInfo = nativeScreenRecordingCommands.macosGetNativeScreenRecordingInfo;
|
|
99
|
-
this.macosStopNativeScreenRecording = nativeScreenRecordingCommands.macosStopNativeScreenRecording;
|
|
100
|
-
this.macosListDisplays = nativeScreenRecordingCommands.macosListDisplays;
|
|
101
|
-
this.macosScreenshots = screenshotCommands.macosScreenshots;
|
|
102
|
-
this.macosSource = sourceCommands.macosSource;
|
|
103
80
|
this.desiredCapConstraints = desired_caps_1.desiredCapConstraints;
|
|
104
81
|
this.locatorStrategies = [
|
|
105
82
|
'id',
|
|
@@ -210,9 +187,38 @@ class Mac2Driver extends driver_1.BaseDriver {
|
|
|
210
187
|
this.resetState();
|
|
211
188
|
await super.deleteSession();
|
|
212
189
|
}
|
|
190
|
+
macosLaunchApp = appManagemenetCommands.macosLaunchApp;
|
|
191
|
+
macosActivateApp = appManagemenetCommands.macosActivateApp;
|
|
192
|
+
macosTerminateApp = appManagemenetCommands.macosTerminateApp;
|
|
193
|
+
macosQueryAppState = appManagemenetCommands.macosQueryAppState;
|
|
194
|
+
macosExecAppleScript = appleScriptCommands.macosExecAppleScript;
|
|
195
|
+
execute = executeCommands.execute;
|
|
196
|
+
findElOrEls = findCommands.findElOrEls;
|
|
197
|
+
macosSetValue = gesturesCommands.macosSetValue;
|
|
198
|
+
macosClick = gesturesCommands.macosClick;
|
|
199
|
+
macosScroll = gesturesCommands.macosScroll;
|
|
200
|
+
macosSwipe = gesturesCommands.macosSwipe;
|
|
201
|
+
macosRightClick = gesturesCommands.macosRightClick;
|
|
202
|
+
macosHover = gesturesCommands.macosHover;
|
|
203
|
+
macosDoubleClick = gesturesCommands.macosDoubleClick;
|
|
204
|
+
macosClickAndDrag = gesturesCommands.macosClickAndDrag;
|
|
205
|
+
macosClickAndDragAndHold = gesturesCommands.macosClickAndDragAndHold;
|
|
206
|
+
macosKeys = gesturesCommands.macosKeys;
|
|
207
|
+
macosPressAndHold = gesturesCommands.macosPressAndHold;
|
|
208
|
+
macosTap = gesturesCommands.macosTap;
|
|
209
|
+
macosDoubleTap = gesturesCommands.macosDoubleTap;
|
|
210
|
+
macosPressAndDrag = gesturesCommands.macosPressAndDrag;
|
|
211
|
+
macosPressAndDragAndHold = gesturesCommands.macosPressAndDragAndHold;
|
|
212
|
+
macosDeepLink = navigationCommands.macosDeepLink;
|
|
213
|
+
startRecordingScreen = recordScreenCommands.startRecordingScreen;
|
|
214
|
+
stopRecordingScreen = recordScreenCommands.stopRecordingScreen;
|
|
215
|
+
macosStartNativeScreenRecording = nativeScreenRecordingCommands.macosStartNativeScreenRecording;
|
|
216
|
+
macosGetNativeScreenRecordingInfo = nativeScreenRecordingCommands.macosGetNativeScreenRecordingInfo;
|
|
217
|
+
macosStopNativeScreenRecording = nativeScreenRecordingCommands.macosStopNativeScreenRecording;
|
|
218
|
+
macosListDisplays = nativeScreenRecordingCommands.macosListDisplays;
|
|
219
|
+
macosScreenshots = screenshotCommands.macosScreenshots;
|
|
220
|
+
macosSource = sourceCommands.macosSource;
|
|
213
221
|
}
|
|
214
222
|
exports.Mac2Driver = Mac2Driver;
|
|
215
|
-
Mac2Driver.newMethodMap = method_map_1.newMethodMap;
|
|
216
|
-
Mac2Driver.executeMethodMap = execute_method_map_1.executeMethodMap;
|
|
217
223
|
exports.default = Mac2Driver;
|
|
218
224
|
//# sourceMappingURL=driver.js.map
|
package/build/lib/driver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,0CAA2D;AAC3D,wDAAuC;AACvC,iDAAuD;AACvD,kFAAoE;AACpE,4EAA8D;AAC9D,oEAAsD;AACtD,8DAAgD;AAChD,sEAAwD;AACxD,0EAA4D;AAC5D,+EAAiE;AACjE,2EAA6D;AAC7D,kEAAoD;AACpD,sDAA2B;AAC3B,6CAA4C;AAC5C,6DAAwD;AACxD,+FAAiF;AAEjF,qDAAqD;AACrD,MAAM,QAAQ,GAAG;IACf,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,wBAAwB,CAAC,CAAC;IAC7C,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,wBAAwB,CAAC,CAAC;IAC9C,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,0CAA0C,CAAC,CAAC;IAChE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,4BAA4B,CAAC,CAAC;IAClD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,8BAA8B,CAAC,CAAC;IACpD,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,2BAA2B,CAAC,CAAC;IAChD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,2BAA2B,CAAC,CAAC;CAClD,CAAC;AAEF,MAAa,UAAW,SAAQ,mBAAU;
|
|
1
|
+
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.js"],"names":[],"mappings":"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"}
|
package/build/lib/wda-mac.js
CHANGED
|
@@ -52,6 +52,8 @@ process.once('exit', () => {
|
|
|
52
52
|
}
|
|
53
53
|
});
|
|
54
54
|
class WDAMacProxy extends driver_1.JWProxy {
|
|
55
|
+
/** @type {boolean|undefined} */
|
|
56
|
+
didProcessExit;
|
|
55
57
|
async proxyCommand(url, method, body = null) {
|
|
56
58
|
if (this.didProcessExit) {
|
|
57
59
|
throw new driver_1.errors.InvalidContextError(`'${method} ${url}' cannot be proxied to Mac2 Driver server because ` +
|
|
@@ -86,7 +88,7 @@ class WDAMacProcess {
|
|
|
86
88
|
const timestampPath = path_1.default.resolve(process.env.HOME ?? '', RECENT_UPGRADE_TIMESTAMP_PATH);
|
|
87
89
|
if (await support_1.fs.exists(timestampPath)) {
|
|
88
90
|
// TODO: It is probably a bit ugly to hardcode the recent version string,
|
|
89
|
-
// TODO:
|
|
91
|
+
// TODO: however it should do the job as a temporary transition trick
|
|
90
92
|
// TODO: to switch from a hardcoded file path to the strongbox usage.
|
|
91
93
|
try {
|
|
92
94
|
boxItem = await box.createItemWithValue(RECENT_MODULE_VERSION_ITEM_NAME, '1.5.4');
|
|
@@ -113,7 +115,7 @@ class WDAMacProcess {
|
|
|
113
115
|
}
|
|
114
116
|
catch (e) {
|
|
115
117
|
log.warn(`The persisted module version string has been damaged: ${e.message}`);
|
|
116
|
-
log.info(`Updating it to '${packageInfo.version}' assuming the project
|
|
118
|
+
log.info(`Updating it to '${packageInfo.version}' assuming the project cleanup is not needed`);
|
|
117
119
|
await boxItem.write(packageInfo.version);
|
|
118
120
|
return;
|
|
119
121
|
}
|
|
@@ -276,6 +278,8 @@ class WDAMacProcess {
|
|
|
276
278
|
}
|
|
277
279
|
}
|
|
278
280
|
class WDAMacServer {
|
|
281
|
+
/** @type {WDAMacProxy} */
|
|
282
|
+
proxy;
|
|
279
283
|
constructor() {
|
|
280
284
|
this.process = null;
|
|
281
285
|
this.serverStartupTimeoutMs = STARTUP_TIMEOUT_MS;
|
package/build/lib/wda-mac.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wda-mac.js","sourceRoot":"","sources":["../../lib/wda-mac.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"wda-mac.js","sourceRoot":"","sources":["../../lib/wda-mac.js"],"names":[],"mappings":"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"}
|
package/lib/wda-mac.js
CHANGED
|
@@ -93,7 +93,7 @@ class WDAMacProcess {
|
|
|
93
93
|
const timestampPath = path.resolve(process.env.HOME ?? '', RECENT_UPGRADE_TIMESTAMP_PATH);
|
|
94
94
|
if (await fs.exists(timestampPath)) {
|
|
95
95
|
// TODO: It is probably a bit ugly to hardcode the recent version string,
|
|
96
|
-
// TODO:
|
|
96
|
+
// TODO: however it should do the job as a temporary transition trick
|
|
97
97
|
// TODO: to switch from a hardcoded file path to the strongbox usage.
|
|
98
98
|
try {
|
|
99
99
|
boxItem = await box.createItemWithValue(RECENT_MODULE_VERSION_ITEM_NAME, '1.5.4');
|
|
@@ -117,7 +117,7 @@ class WDAMacProcess {
|
|
|
117
117
|
recentModuleVersion = util.coerceVersion(recentModuleVersion, true);
|
|
118
118
|
} catch (e) {
|
|
119
119
|
log.warn(`The persisted module version string has been damaged: ${e.message}`);
|
|
120
|
-
log.info(`Updating it to '${packageInfo.version}' assuming the project
|
|
120
|
+
log.info(`Updating it to '${packageInfo.version}' assuming the project cleanup is not needed`);
|
|
121
121
|
await boxItem.write(packageInfo.version);
|
|
122
122
|
return;
|
|
123
123
|
}
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "appium-mac2-driver",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.1",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "appium-mac2-driver",
|
|
9
|
-
"version": "3.0.
|
|
9
|
+
"version": "3.0.1",
|
|
10
10
|
"license": "Apache-2.0",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@appium/strongbox": "^1.0.0-rc.1",
|
|
@@ -49,14 +49,14 @@
|
|
|
49
49
|
}
|
|
50
50
|
},
|
|
51
51
|
"node_modules/@appium/logger": {
|
|
52
|
-
"version": "2.0.
|
|
53
|
-
"resolved": "https://registry.npmjs.org/@appium/logger/-/logger-2.0.
|
|
54
|
-
"integrity": "sha512-
|
|
52
|
+
"version": "2.0.1",
|
|
53
|
+
"resolved": "https://registry.npmjs.org/@appium/logger/-/logger-2.0.1.tgz",
|
|
54
|
+
"integrity": "sha512-EMO0wqON/lvj78+APZB2OVpObyoA5PevAKUP1z6ZEl57eUksNsw5RctglfhCDsJwyyr/oSGEMw+3mZ/qMNR9fQ==",
|
|
55
55
|
"license": "ISC",
|
|
56
56
|
"dependencies": {
|
|
57
57
|
"console-control-strings": "1.1.0",
|
|
58
58
|
"lodash": "4.17.21",
|
|
59
|
-
"lru-cache": "11.1
|
|
59
|
+
"lru-cache": "11.2.1",
|
|
60
60
|
"set-blocking": "2.0.0"
|
|
61
61
|
},
|
|
62
62
|
"engines": {
|
|
@@ -65,9 +65,9 @@
|
|
|
65
65
|
}
|
|
66
66
|
},
|
|
67
67
|
"node_modules/@appium/schema": {
|
|
68
|
-
"version": "1.0.0
|
|
69
|
-
"resolved": "https://registry.npmjs.org/@appium/schema/-/schema-1.0.0
|
|
70
|
-
"integrity": "sha512-
|
|
68
|
+
"version": "1.0.0",
|
|
69
|
+
"resolved": "https://registry.npmjs.org/@appium/schema/-/schema-1.0.0.tgz",
|
|
70
|
+
"integrity": "sha512-eowz+sV6YxuHdsuRizEhG+AGeeMsUiS9ryWLkdFSqQlsNB+uDudehpYQiRkrrtaGOBzq7a3GDUB7zjc6eR80QA==",
|
|
71
71
|
"license": "Apache-2.0",
|
|
72
72
|
"dependencies": {
|
|
73
73
|
"json-schema": "0.4.0",
|
|
@@ -79,9 +79,9 @@
|
|
|
79
79
|
}
|
|
80
80
|
},
|
|
81
81
|
"node_modules/@appium/strongbox": {
|
|
82
|
-
"version": "1.0.0
|
|
83
|
-
"resolved": "https://registry.npmjs.org/@appium/strongbox/-/strongbox-1.0.0
|
|
84
|
-
"integrity": "sha512-
|
|
82
|
+
"version": "1.0.0",
|
|
83
|
+
"resolved": "https://registry.npmjs.org/@appium/strongbox/-/strongbox-1.0.0.tgz",
|
|
84
|
+
"integrity": "sha512-M6lA3iLaxpWtMAQT8vm2EmLuu00wzbqraeexLBGq3Jz3rEUUA2PhuOTJfEwKVw6mfjMd9tWq9qLjlOucgfvP+Q==",
|
|
85
85
|
"license": "Apache-2.0",
|
|
86
86
|
"dependencies": {
|
|
87
87
|
"env-paths": "2.2.1",
|
|
@@ -93,14 +93,14 @@
|
|
|
93
93
|
}
|
|
94
94
|
},
|
|
95
95
|
"node_modules/@appium/support": {
|
|
96
|
-
"version": "7.0.
|
|
97
|
-
"resolved": "https://registry.npmjs.org/@appium/support/-/support-7.0.
|
|
98
|
-
"integrity": "sha512-
|
|
96
|
+
"version": "7.0.1",
|
|
97
|
+
"resolved": "https://registry.npmjs.org/@appium/support/-/support-7.0.1.tgz",
|
|
98
|
+
"integrity": "sha512-djVPpwVRBMUIGuF49KwIqFC+NhczVchSbsMni8+8b4tCumS+2/RjaDAhZ4ZdSfz7/pSQdTxWfvK00OK+tysmPw==",
|
|
99
99
|
"license": "Apache-2.0",
|
|
100
100
|
"dependencies": {
|
|
101
|
-
"@appium/logger": "^2.0.
|
|
102
|
-
"@appium/tsconfig": "^1.
|
|
103
|
-
"@appium/types": "^1.0.
|
|
101
|
+
"@appium/logger": "^2.0.1",
|
|
102
|
+
"@appium/tsconfig": "^1.1.0",
|
|
103
|
+
"@appium/types": "^1.0.1",
|
|
104
104
|
"@colors/colors": "1.6.0",
|
|
105
105
|
"archiver": "7.0.1",
|
|
106
106
|
"axios": "1.11.0",
|
|
@@ -128,9 +128,9 @@
|
|
|
128
128
|
"shell-quote": "1.8.3",
|
|
129
129
|
"source-map-support": "0.5.21",
|
|
130
130
|
"supports-color": "8.1.1",
|
|
131
|
-
"teen_process": "
|
|
131
|
+
"teen_process": "3.0.1",
|
|
132
132
|
"type-fest": "4.41.0",
|
|
133
|
-
"uuid": "
|
|
133
|
+
"uuid": "13.0.0",
|
|
134
134
|
"which": "5.0.0",
|
|
135
135
|
"yauzl": "3.2.0"
|
|
136
136
|
},
|
|
@@ -142,29 +142,24 @@
|
|
|
142
142
|
"sharp": "0.34.3"
|
|
143
143
|
}
|
|
144
144
|
},
|
|
145
|
-
"node_modules/@appium/support/node_modules/
|
|
146
|
-
"version": "
|
|
147
|
-
"resolved": "https://registry.npmjs.org/
|
|
148
|
-
"integrity": "sha512-
|
|
149
|
-
"license": "
|
|
145
|
+
"node_modules/@appium/support/node_modules/axios": {
|
|
146
|
+
"version": "1.11.0",
|
|
147
|
+
"resolved": "https://registry.npmjs.org/axios/-/axios-1.11.0.tgz",
|
|
148
|
+
"integrity": "sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==",
|
|
149
|
+
"license": "MIT",
|
|
150
150
|
"dependencies": {
|
|
151
|
-
"
|
|
152
|
-
"
|
|
153
|
-
"
|
|
154
|
-
"source-map-support": "^0.x"
|
|
155
|
-
},
|
|
156
|
-
"engines": {
|
|
157
|
-
"node": "^16.13.0 || >=18.0.0",
|
|
158
|
-
"npm": ">=8"
|
|
151
|
+
"follow-redirects": "^1.15.6",
|
|
152
|
+
"form-data": "^4.0.4",
|
|
153
|
+
"proxy-from-env": "^1.1.0"
|
|
159
154
|
}
|
|
160
155
|
},
|
|
161
156
|
"node_modules/@appium/tsconfig": {
|
|
162
|
-
"version": "1.
|
|
163
|
-
"resolved": "https://registry.npmjs.org/@appium/tsconfig/-/tsconfig-1.
|
|
164
|
-
"integrity": "sha512-
|
|
157
|
+
"version": "1.1.0",
|
|
158
|
+
"resolved": "https://registry.npmjs.org/@appium/tsconfig/-/tsconfig-1.1.0.tgz",
|
|
159
|
+
"integrity": "sha512-4QO++yh9hMDiqAnPNHWQStxhTz1to6wG8hsPaviHjqOnlGQa34jrcS6gqciPZL6+xkd5qgIkZjmOTNNWNUFgqQ==",
|
|
165
160
|
"license": "Apache-2.0",
|
|
166
161
|
"dependencies": {
|
|
167
|
-
"@tsconfig/
|
|
162
|
+
"@tsconfig/node20": "20.1.6"
|
|
168
163
|
},
|
|
169
164
|
"engines": {
|
|
170
165
|
"node": "^20.19.0 || ^22.12.0 || >=24.0.0",
|
|
@@ -172,14 +167,14 @@
|
|
|
172
167
|
}
|
|
173
168
|
},
|
|
174
169
|
"node_modules/@appium/types": {
|
|
175
|
-
"version": "1.0.
|
|
176
|
-
"resolved": "https://registry.npmjs.org/@appium/types/-/types-1.0.
|
|
177
|
-
"integrity": "sha512-
|
|
170
|
+
"version": "1.0.1",
|
|
171
|
+
"resolved": "https://registry.npmjs.org/@appium/types/-/types-1.0.1.tgz",
|
|
172
|
+
"integrity": "sha512-Fajl1wzMNnr++OPo4SxfAsFVvu4g8UQO+w/sDv7rAreOmRh7xcLrmF/Q9rhBXDuWITczBQhvTH6nyLM9+bCP4w==",
|
|
178
173
|
"license": "Apache-2.0",
|
|
179
174
|
"dependencies": {
|
|
180
|
-
"@appium/logger": "^2.0.
|
|
181
|
-
"@appium/schema": "^1.0.0
|
|
182
|
-
"@appium/tsconfig": "^1.
|
|
175
|
+
"@appium/logger": "^2.0.1",
|
|
176
|
+
"@appium/schema": "^1.0.0",
|
|
177
|
+
"@appium/tsconfig": "^1.1.0",
|
|
183
178
|
"type-fest": "4.41.0"
|
|
184
179
|
},
|
|
185
180
|
"engines": {
|
|
@@ -220,9 +215,9 @@
|
|
|
220
215
|
}
|
|
221
216
|
},
|
|
222
217
|
"node_modules/@emnapi/runtime": {
|
|
223
|
-
"version": "1.
|
|
224
|
-
"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.
|
|
225
|
-
"integrity": "sha512
|
|
218
|
+
"version": "1.5.0",
|
|
219
|
+
"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.5.0.tgz",
|
|
220
|
+
"integrity": "sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ==",
|
|
226
221
|
"extraneous": true,
|
|
227
222
|
"license": "MIT",
|
|
228
223
|
"dependencies": {
|
|
@@ -306,9 +301,9 @@
|
|
|
306
301
|
}
|
|
307
302
|
},
|
|
308
303
|
"node_modules/@isaacs/cliui/node_modules/ansi-styles": {
|
|
309
|
-
"version": "6.2.
|
|
310
|
-
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.
|
|
311
|
-
"integrity": "sha512-
|
|
304
|
+
"version": "6.2.3",
|
|
305
|
+
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
|
|
306
|
+
"integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
|
|
312
307
|
"license": "MIT",
|
|
313
308
|
"engines": {
|
|
314
309
|
"node": ">=12"
|
|
@@ -344,10 +339,10 @@
|
|
|
344
339
|
"node": ">=14"
|
|
345
340
|
}
|
|
346
341
|
},
|
|
347
|
-
"node_modules/@tsconfig/
|
|
348
|
-
"version": "
|
|
349
|
-
"resolved": "https://registry.npmjs.org/@tsconfig/
|
|
350
|
-
"integrity": "sha512-
|
|
342
|
+
"node_modules/@tsconfig/node20": {
|
|
343
|
+
"version": "20.1.6",
|
|
344
|
+
"resolved": "https://registry.npmjs.org/@tsconfig/node20/-/node20-20.1.6.tgz",
|
|
345
|
+
"integrity": "sha512-sz+Hqx9zwZDpZIV871WSbUzSqNIsXzghZydypnfgzPKLltVJfkINfUeTct31n/tTSa9ZE1ZOfKdRre1uHHquYQ==",
|
|
351
346
|
"license": "MIT"
|
|
352
347
|
},
|
|
353
348
|
"node_modules/@types/normalize-package-data": {
|
|
@@ -357,9 +352,9 @@
|
|
|
357
352
|
"license": "MIT"
|
|
358
353
|
},
|
|
359
354
|
"node_modules/@xmldom/xmldom": {
|
|
360
|
-
"version": "0.8.
|
|
361
|
-
"resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.
|
|
362
|
-
"integrity": "sha512-
|
|
355
|
+
"version": "0.8.11",
|
|
356
|
+
"resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.11.tgz",
|
|
357
|
+
"integrity": "sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==",
|
|
363
358
|
"license": "MIT",
|
|
364
359
|
"engines": {
|
|
365
360
|
"node": ">=10.0.0"
|
|
@@ -378,9 +373,9 @@
|
|
|
378
373
|
}
|
|
379
374
|
},
|
|
380
375
|
"node_modules/ansi-regex": {
|
|
381
|
-
"version": "6.
|
|
382
|
-
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.
|
|
383
|
-
"integrity": "sha512-
|
|
376
|
+
"version": "6.2.2",
|
|
377
|
+
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
|
|
378
|
+
"integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
|
|
384
379
|
"license": "MIT",
|
|
385
380
|
"engines": {
|
|
386
381
|
"node": ">=12"
|
|
@@ -405,9 +400,9 @@
|
|
|
405
400
|
}
|
|
406
401
|
},
|
|
407
402
|
"node_modules/appium-xcode": {
|
|
408
|
-
"version": "6.0.
|
|
409
|
-
"resolved": "https://registry.npmjs.org/appium-xcode/-/appium-xcode-6.0.
|
|
410
|
-
"integrity": "sha512-
|
|
403
|
+
"version": "6.0.1",
|
|
404
|
+
"resolved": "https://registry.npmjs.org/appium-xcode/-/appium-xcode-6.0.1.tgz",
|
|
405
|
+
"integrity": "sha512-lAcoFTX5gY2UQB2jCUEeICMtSAM90Qto5kIBqq3Hy4BJCz/3kUWzK02fqxwpL9F7G3brKwiwwy78ftrLYD+j1Q==",
|
|
411
406
|
"license": "Apache-2.0",
|
|
412
407
|
"dependencies": {
|
|
413
408
|
"@appium/support": "^7.0.0-rc.1",
|
|
@@ -575,9 +570,9 @@
|
|
|
575
570
|
"license": "MIT"
|
|
576
571
|
},
|
|
577
572
|
"node_modules/axios": {
|
|
578
|
-
"version": "1.
|
|
579
|
-
"resolved": "https://registry.npmjs.org/axios/-/axios-1.
|
|
580
|
-
"integrity": "sha512-
|
|
573
|
+
"version": "1.12.2",
|
|
574
|
+
"resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz",
|
|
575
|
+
"integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==",
|
|
581
576
|
"license": "MIT",
|
|
582
577
|
"dependencies": {
|
|
583
578
|
"follow-redirects": "^1.15.6",
|
|
@@ -586,10 +581,18 @@
|
|
|
586
581
|
}
|
|
587
582
|
},
|
|
588
583
|
"node_modules/b4a": {
|
|
589
|
-
"version": "1.
|
|
590
|
-
"resolved": "https://registry.npmjs.org/b4a/-/b4a-1.
|
|
591
|
-
"integrity": "sha512-
|
|
592
|
-
"license": "Apache-2.0"
|
|
584
|
+
"version": "1.7.3",
|
|
585
|
+
"resolved": "https://registry.npmjs.org/b4a/-/b4a-1.7.3.tgz",
|
|
586
|
+
"integrity": "sha512-5Q2mfq2WfGuFp3uS//0s6baOJLMoVduPYVeNmDYxu5OUA1/cBfvr2RIS7vi62LdNj/urk1hfmj867I3qt6uZ7Q==",
|
|
587
|
+
"license": "Apache-2.0",
|
|
588
|
+
"peerDependencies": {
|
|
589
|
+
"react-native-b4a": "*"
|
|
590
|
+
},
|
|
591
|
+
"peerDependenciesMeta": {
|
|
592
|
+
"react-native-b4a": {
|
|
593
|
+
"optional": true
|
|
594
|
+
}
|
|
595
|
+
}
|
|
593
596
|
},
|
|
594
597
|
"node_modules/balanced-match": {
|
|
595
598
|
"version": "1.0.2",
|
|
@@ -598,11 +601,10 @@
|
|
|
598
601
|
"license": "MIT"
|
|
599
602
|
},
|
|
600
603
|
"node_modules/bare-events": {
|
|
601
|
-
"version": "2.
|
|
602
|
-
"resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.
|
|
603
|
-
"integrity": "sha512-
|
|
604
|
-
"license": "Apache-2.0"
|
|
605
|
-
"optional": true
|
|
604
|
+
"version": "2.7.0",
|
|
605
|
+
"resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.7.0.tgz",
|
|
606
|
+
"integrity": "sha512-b3N5eTW1g7vXkw+0CXh/HazGTcO5KYuu/RCNaJbDMPI6LHDi+7qe8EmxKUVe1sUbY2KZOVZFyj62x0OEz9qyAA==",
|
|
607
|
+
"license": "Apache-2.0"
|
|
606
608
|
},
|
|
607
609
|
"node_modules/base64-js": {
|
|
608
610
|
"version": "1.5.1",
|
|
@@ -882,9 +884,9 @@
|
|
|
882
884
|
}
|
|
883
885
|
},
|
|
884
886
|
"node_modules/debug": {
|
|
885
|
-
"version": "4.4.
|
|
886
|
-
"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.
|
|
887
|
-
"integrity": "sha512-
|
|
887
|
+
"version": "4.4.3",
|
|
888
|
+
"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
|
|
889
|
+
"integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
|
|
888
890
|
"extraneous": true,
|
|
889
891
|
"license": "MIT",
|
|
890
892
|
"dependencies": {
|
|
@@ -909,9 +911,9 @@
|
|
|
909
911
|
}
|
|
910
912
|
},
|
|
911
913
|
"node_modules/detect-libc": {
|
|
912
|
-
"version": "2.
|
|
913
|
-
"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.
|
|
914
|
-
"integrity": "sha512-
|
|
914
|
+
"version": "2.1.1",
|
|
915
|
+
"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.1.tgz",
|
|
916
|
+
"integrity": "sha512-ecqj/sy1jcK1uWrwpR67UhYrIFQ+5WlGxth34WquCbamhFA6hkkwiu37o6J5xCHdo1oixJRfVRw+ywV+Hq/0Aw==",
|
|
915
917
|
"license": "Apache-2.0",
|
|
916
918
|
"optional": true,
|
|
917
919
|
"engines": {
|
|
@@ -960,9 +962,9 @@
|
|
|
960
962
|
}
|
|
961
963
|
},
|
|
962
964
|
"node_modules/error-ex": {
|
|
963
|
-
"version": "1.3.
|
|
964
|
-
"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.
|
|
965
|
-
"integrity": "sha512-
|
|
965
|
+
"version": "1.3.4",
|
|
966
|
+
"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz",
|
|
967
|
+
"integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==",
|
|
966
968
|
"license": "MIT",
|
|
967
969
|
"dependencies": {
|
|
968
970
|
"is-arrayish": "^0.2.1"
|
|
@@ -1041,6 +1043,15 @@
|
|
|
1041
1043
|
"node": ">=0.8.x"
|
|
1042
1044
|
}
|
|
1043
1045
|
},
|
|
1046
|
+
"node_modules/events-universal": {
|
|
1047
|
+
"version": "1.0.1",
|
|
1048
|
+
"resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.1.tgz",
|
|
1049
|
+
"integrity": "sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==",
|
|
1050
|
+
"license": "Apache-2.0",
|
|
1051
|
+
"dependencies": {
|
|
1052
|
+
"bare-events": "^2.7.0"
|
|
1053
|
+
}
|
|
1054
|
+
},
|
|
1044
1055
|
"node_modules/fast-fifo": {
|
|
1045
1056
|
"version": "1.3.2",
|
|
1046
1057
|
"resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
|
|
@@ -1657,9 +1668,9 @@
|
|
|
1657
1668
|
}
|
|
1658
1669
|
},
|
|
1659
1670
|
"node_modules/lru-cache": {
|
|
1660
|
-
"version": "11.1
|
|
1661
|
-
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.1.
|
|
1662
|
-
"integrity": "sha512-
|
|
1671
|
+
"version": "11.2.1",
|
|
1672
|
+
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.1.tgz",
|
|
1673
|
+
"integrity": "sha512-r8LA6i4LP4EeWOhqBaZZjDWwehd1xUJPCJd9Sv300H0ZmcUER4+JPh7bqqZeqs1o5pgtgvXm+d9UGrB5zZGDiQ==",
|
|
1663
1674
|
"license": "ISC",
|
|
1664
1675
|
"engines": {
|
|
1665
1676
|
"node": "20 || >=22"
|
|
@@ -2314,18 +2325,18 @@
|
|
|
2314
2325
|
"license": "ISC"
|
|
2315
2326
|
},
|
|
2316
2327
|
"node_modules/simple-swizzle": {
|
|
2317
|
-
"version": "0.2.
|
|
2318
|
-
"resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.
|
|
2319
|
-
"integrity": "sha512-
|
|
2328
|
+
"version": "0.2.4",
|
|
2329
|
+
"resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.4.tgz",
|
|
2330
|
+
"integrity": "sha512-nAu1WFPQSMNr2Zn9PGSZK9AGn4t/y97lEm+MXTtUDwfP0ksAIX4nO+6ruD9Jwut4C49SB1Ws+fbXsm/yScWOHw==",
|
|
2320
2331
|
"license": "MIT",
|
|
2321
2332
|
"dependencies": {
|
|
2322
2333
|
"is-arrayish": "^0.3.1"
|
|
2323
2334
|
}
|
|
2324
2335
|
},
|
|
2325
2336
|
"node_modules/simple-swizzle/node_modules/is-arrayish": {
|
|
2326
|
-
"version": "0.3.
|
|
2327
|
-
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.
|
|
2328
|
-
"integrity": "sha512-
|
|
2337
|
+
"version": "0.3.4",
|
|
2338
|
+
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.4.tgz",
|
|
2339
|
+
"integrity": "sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==",
|
|
2329
2340
|
"license": "MIT"
|
|
2330
2341
|
},
|
|
2331
2342
|
"node_modules/slugify": {
|
|
@@ -2408,16 +2419,14 @@
|
|
|
2408
2419
|
}
|
|
2409
2420
|
},
|
|
2410
2421
|
"node_modules/streamx": {
|
|
2411
|
-
"version": "2.
|
|
2412
|
-
"resolved": "https://registry.npmjs.org/streamx/-/streamx-2.
|
|
2413
|
-
"integrity": "sha512-
|
|
2422
|
+
"version": "2.23.0",
|
|
2423
|
+
"resolved": "https://registry.npmjs.org/streamx/-/streamx-2.23.0.tgz",
|
|
2424
|
+
"integrity": "sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==",
|
|
2414
2425
|
"license": "MIT",
|
|
2415
2426
|
"dependencies": {
|
|
2427
|
+
"events-universal": "^1.0.0",
|
|
2416
2428
|
"fast-fifo": "^1.3.2",
|
|
2417
2429
|
"text-decoder": "^1.1.0"
|
|
2418
|
-
},
|
|
2419
|
-
"optionalDependencies": {
|
|
2420
|
-
"bare-events": "^2.2.0"
|
|
2421
2430
|
}
|
|
2422
2431
|
},
|
|
2423
2432
|
"node_modules/string_decoder": {
|
|
@@ -2489,9 +2498,9 @@
|
|
|
2489
2498
|
}
|
|
2490
2499
|
},
|
|
2491
2500
|
"node_modules/strip-ansi": {
|
|
2492
|
-
"version": "7.1.
|
|
2493
|
-
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.
|
|
2494
|
-
"integrity": "sha512-
|
|
2501
|
+
"version": "7.1.2",
|
|
2502
|
+
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
|
|
2503
|
+
"integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
|
|
2495
2504
|
"license": "MIT",
|
|
2496
2505
|
"dependencies": {
|
|
2497
2506
|
"ansi-regex": "^6.0.1"
|
|
@@ -2564,9 +2573,9 @@
|
|
|
2564
2573
|
}
|
|
2565
2574
|
},
|
|
2566
2575
|
"node_modules/teen_process": {
|
|
2567
|
-
"version": "3.0.
|
|
2568
|
-
"resolved": "https://registry.npmjs.org/teen_process/-/teen_process-3.0.
|
|
2569
|
-
"integrity": "sha512-
|
|
2576
|
+
"version": "3.0.1",
|
|
2577
|
+
"resolved": "https://registry.npmjs.org/teen_process/-/teen_process-3.0.1.tgz",
|
|
2578
|
+
"integrity": "sha512-gczXA8Wequcnw+vC0saFhNnjHrv7rR4Ilg2lvyfbVEFpH1ecUT7uj1hbUUcVdKwlGgYXREwAERa0BemrGeDgTw==",
|
|
2570
2579
|
"license": "Apache-2.0",
|
|
2571
2580
|
"dependencies": {
|
|
2572
2581
|
"bluebird": "^3.7.2",
|
|
@@ -2644,16 +2653,16 @@
|
|
|
2644
2653
|
"license": "MIT"
|
|
2645
2654
|
},
|
|
2646
2655
|
"node_modules/uuid": {
|
|
2647
|
-
"version": "
|
|
2648
|
-
"resolved": "https://registry.npmjs.org/uuid/-/uuid-
|
|
2649
|
-
"integrity": "sha512-
|
|
2656
|
+
"version": "13.0.0",
|
|
2657
|
+
"resolved": "https://registry.npmjs.org/uuid/-/uuid-13.0.0.tgz",
|
|
2658
|
+
"integrity": "sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==",
|
|
2650
2659
|
"funding": [
|
|
2651
2660
|
"https://github.com/sponsors/broofa",
|
|
2652
2661
|
"https://github.com/sponsors/ctavan"
|
|
2653
2662
|
],
|
|
2654
2663
|
"license": "MIT",
|
|
2655
2664
|
"bin": {
|
|
2656
|
-
"uuid": "dist/
|
|
2665
|
+
"uuid": "dist-node/bin/uuid"
|
|
2657
2666
|
}
|
|
2658
2667
|
},
|
|
2659
2668
|
"node_modules/validate-npm-package-license": {
|