appium-remote-debugger 15.7.2 → 15.8.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/CHANGELOG.md +12 -0
- package/build/lib/atoms.d.ts.map +1 -1
- package/build/lib/atoms.js +27 -28
- package/build/lib/atoms.js.map +1 -1
- package/build/lib/index.d.ts.map +1 -1
- package/build/lib/index.js +7 -0
- package/build/lib/index.js.map +1 -1
- package/build/lib/mixins/connect.d.ts.map +1 -1
- package/build/lib/mixins/connect.js +21 -25
- package/build/lib/mixins/connect.js.map +1 -1
- package/build/lib/mixins/execute.d.ts.map +1 -1
- package/build/lib/mixins/execute.js +2 -8
- package/build/lib/mixins/execute.js.map +1 -1
- package/build/lib/mixins/message-handlers.d.ts.map +1 -1
- package/build/lib/mixins/message-handlers.js +8 -12
- package/build/lib/mixins/message-handlers.js.map +1 -1
- package/build/lib/mixins/misc.d.ts.map +1 -1
- package/build/lib/mixins/misc.js +5 -39
- package/build/lib/mixins/misc.js.map +1 -1
- package/build/lib/mixins/navigate.d.ts.map +1 -1
- package/build/lib/mixins/navigate.js +20 -55
- package/build/lib/mixins/navigate.js.map +1 -1
- package/build/lib/mixins/property-accessors.d.ts +24 -0
- package/build/lib/mixins/property-accessors.d.ts.map +1 -1
- package/build/lib/mixins/property-accessors.js +24 -0
- package/build/lib/mixins/property-accessors.js.map +1 -1
- package/build/lib/remote-debugger.d.ts +38 -38
- package/build/lib/remote-debugger.d.ts.map +1 -1
- package/build/lib/remote-debugger.js +64 -69
- package/build/lib/remote-debugger.js.map +1 -1
- package/build/lib/rpc/remote-messages.d.ts.map +1 -1
- package/build/lib/rpc/remote-messages.js +7 -8
- package/build/lib/rpc/remote-messages.js.map +1 -1
- package/build/lib/rpc/rpc-client-real-device-shim.d.ts.map +1 -1
- package/build/lib/rpc/rpc-client-real-device-shim.js +3 -6
- package/build/lib/rpc/rpc-client-real-device-shim.js.map +1 -1
- package/build/lib/rpc/rpc-client-simulator.d.ts.map +1 -1
- package/build/lib/rpc/rpc-client-simulator.js +3 -5
- package/build/lib/rpc/rpc-client-simulator.js.map +1 -1
- package/build/lib/rpc/rpc-client.d.ts +27 -27
- package/build/lib/rpc/rpc-client.d.ts.map +1 -1
- package/build/lib/rpc/rpc-client.js +226 -224
- package/build/lib/rpc/rpc-client.js.map +1 -1
- package/build/lib/rpc/rpc-message-handler.js +7 -10
- package/build/lib/rpc/rpc-message-handler.js.map +1 -1
- package/build/lib/types.d.ts +19 -19
- package/build/lib/types.d.ts.map +1 -1
- package/build/lib/utils.d.ts +70 -4
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +171 -23
- package/build/lib/utils.js.map +1 -1
- package/lib/atoms.ts +31 -32
- package/lib/index.ts +7 -0
- package/lib/mixins/connect.ts +22 -23
- package/lib/mixins/execute.ts +3 -5
- package/lib/mixins/message-handlers.ts +9 -10
- package/lib/mixins/misc.ts +8 -7
- package/lib/mixins/navigate.ts +58 -63
- package/lib/mixins/property-accessors.ts +24 -0
- package/lib/remote-debugger.ts +74 -76
- package/lib/rpc/remote-messages.ts +10 -5
- package/lib/rpc/rpc-client-real-device-shim.ts +3 -3
- package/lib/rpc/rpc-client-simulator.ts +3 -5
- package/lib/rpc/rpc-client.ts +259 -247
- package/lib/rpc/rpc-message-handler.ts +7 -7
- package/lib/types.ts +24 -24
- package/lib/utils.ts +181 -23
- package/package.json +4 -8
- package/scripts/common.mjs +42 -37
- package/scripts/web_inspector_proxy.mjs +3 -5
|
@@ -32,9 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
32
32
|
return result;
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
-
};
|
|
38
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
36
|
exports.RemoteDebugger = exports.REMOTE_DEBUGGER_PORT = void 0;
|
|
40
37
|
const node_events_1 = require("node:events");
|
|
@@ -49,43 +46,10 @@ const cookieMixins = __importStar(require("./mixins/cookies"));
|
|
|
49
46
|
const screenshotMixins = __importStar(require("./mixins/screenshot"));
|
|
50
47
|
const eventMixins = __importStar(require("./mixins/events"));
|
|
51
48
|
const miscellaneousMixins = __importStar(require("./mixins/misc"));
|
|
52
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
53
49
|
exports.REMOTE_DEBUGGER_PORT = 27753;
|
|
54
50
|
const PAGE_READY_TIMEOUT_MS = 5000;
|
|
55
51
|
const { version: MODULE_VERSION } = (0, utils_1.getModuleProperties)();
|
|
56
52
|
class RemoteDebugger extends node_events_1.EventEmitter {
|
|
57
|
-
_skippedApps;
|
|
58
|
-
_clientEventListeners;
|
|
59
|
-
_appDict;
|
|
60
|
-
_appIdKey;
|
|
61
|
-
_pageIdKey;
|
|
62
|
-
_connectedDrivers;
|
|
63
|
-
_currentState;
|
|
64
|
-
_pageLoadDelay;
|
|
65
|
-
_rpcClient;
|
|
66
|
-
_pageLoading;
|
|
67
|
-
_navigatingToPage;
|
|
68
|
-
_allowNavigationWithoutReload;
|
|
69
|
-
_pageLoadMs;
|
|
70
|
-
_pageLoadStrategy;
|
|
71
|
-
_log;
|
|
72
|
-
_bundleId;
|
|
73
|
-
_additionalBundleIds;
|
|
74
|
-
_ignoredBundleIds;
|
|
75
|
-
_platformVersion;
|
|
76
|
-
_isSafari;
|
|
77
|
-
_includeSafari;
|
|
78
|
-
_garbageCollectOnExecute;
|
|
79
|
-
_host;
|
|
80
|
-
_port;
|
|
81
|
-
_socketPath;
|
|
82
|
-
_remoteDebugProxy;
|
|
83
|
-
_pageReadyTimeout;
|
|
84
|
-
_logAllCommunication;
|
|
85
|
-
_logAllCommunicationHexDump;
|
|
86
|
-
_socketChunkSize;
|
|
87
|
-
_webInspectorMaxFrameLength;
|
|
88
|
-
_fullPageInitialization;
|
|
89
53
|
// events
|
|
90
54
|
static EVENT_PAGE_CHANGE;
|
|
91
55
|
static EVENT_DISCONNECT;
|
|
@@ -120,7 +84,7 @@ class RemoteDebugger extends node_events_1.EventEmitter {
|
|
|
120
84
|
overrideUserAgent = miscellaneousMixins.overrideUserAgent;
|
|
121
85
|
garbageCollect = miscellaneousMixins.garbageCollect;
|
|
122
86
|
isJavascriptExecutionBlocked = miscellaneousMixins.isJavascriptExecutionBlocked;
|
|
123
|
-
//
|
|
87
|
+
// callbacks
|
|
124
88
|
onPageChange = messageHandlerMixins.onPageChange;
|
|
125
89
|
onConnectedApplicationList = messageHandlerMixins.onConnectedApplicationList;
|
|
126
90
|
onAppConnect = messageHandlerMixins.onAppConnect;
|
|
@@ -129,6 +93,38 @@ class RemoteDebugger extends node_events_1.EventEmitter {
|
|
|
129
93
|
onConnectedDriverList = messageHandlerMixins.onConnectedDriverList;
|
|
130
94
|
onCurrentState = messageHandlerMixins.onCurrentState;
|
|
131
95
|
frameDetached = navigationMixins.frameDetached;
|
|
96
|
+
_skippedApps;
|
|
97
|
+
_clientEventListeners;
|
|
98
|
+
_appDict;
|
|
99
|
+
_appIdKey;
|
|
100
|
+
_pageIdKey;
|
|
101
|
+
_connectedDrivers;
|
|
102
|
+
_currentState;
|
|
103
|
+
_pageLoadDelay;
|
|
104
|
+
_rpcClient;
|
|
105
|
+
_pageLoading;
|
|
106
|
+
_navigatingToPage;
|
|
107
|
+
_allowNavigationWithoutReload;
|
|
108
|
+
_pageLoadMs;
|
|
109
|
+
_pageLoadStrategy;
|
|
110
|
+
_log;
|
|
111
|
+
_bundleId;
|
|
112
|
+
_additionalBundleIds;
|
|
113
|
+
_ignoredBundleIds;
|
|
114
|
+
_platformVersion;
|
|
115
|
+
_isSafari;
|
|
116
|
+
_includeSafari;
|
|
117
|
+
_garbageCollectOnExecute;
|
|
118
|
+
_host;
|
|
119
|
+
_port;
|
|
120
|
+
_socketPath;
|
|
121
|
+
_remoteDebugProxy;
|
|
122
|
+
_pageReadyTimeout;
|
|
123
|
+
_logAllCommunication;
|
|
124
|
+
_logAllCommunicationHexDump;
|
|
125
|
+
_socketChunkSize;
|
|
126
|
+
_webInspectorMaxFrameLength;
|
|
127
|
+
_fullPageInitialization;
|
|
132
128
|
constructor(opts = {}) {
|
|
133
129
|
super();
|
|
134
130
|
this._log = opts.log ?? logger_1.log;
|
|
@@ -148,12 +144,11 @@ class RemoteDebugger extends node_events_1.EventEmitter {
|
|
|
148
144
|
this._socketPath = socketPath;
|
|
149
145
|
this._remoteDebugProxy = remoteDebugProxy;
|
|
150
146
|
this._pageReadyTimeout = pageReadyTimeout;
|
|
151
|
-
this._logAllCommunication =
|
|
152
|
-
? !!logFullResponse
|
|
153
|
-
: !!logAllCommunication;
|
|
147
|
+
this._logAllCommunication =
|
|
148
|
+
logAllCommunication == null ? !!logFullResponse : !!logAllCommunication;
|
|
154
149
|
this._logAllCommunicationHexDump = logAllCommunicationHexDump;
|
|
155
150
|
this._socketChunkSize = socketChunkSize;
|
|
156
|
-
if (
|
|
151
|
+
if (Number.isInteger(webInspectorMaxFrameLength)) {
|
|
157
152
|
this._webInspectorMaxFrameLength = webInspectorMaxFrameLength;
|
|
158
153
|
}
|
|
159
154
|
this._fullPageInitialization = fullPageInitialization;
|
|
@@ -164,6 +159,33 @@ class RemoteDebugger extends node_events_1.EventEmitter {
|
|
|
164
159
|
get log() {
|
|
165
160
|
return this._log;
|
|
166
161
|
}
|
|
162
|
+
get isConnected() {
|
|
163
|
+
return !!this._rpcClient?.isConnected;
|
|
164
|
+
}
|
|
165
|
+
// Only use this getter to read the appDict value.
|
|
166
|
+
// Any changes to it don't mutate the original property
|
|
167
|
+
// because the getter always returns the copy of it
|
|
168
|
+
get appDict() {
|
|
169
|
+
return structuredClone(this._appDict);
|
|
170
|
+
}
|
|
171
|
+
get allowNavigationWithoutReload() {
|
|
172
|
+
return !!this._allowNavigationWithoutReload;
|
|
173
|
+
}
|
|
174
|
+
get currentState() {
|
|
175
|
+
return this._currentState;
|
|
176
|
+
}
|
|
177
|
+
get connectedDrivers() {
|
|
178
|
+
return this._connectedDrivers;
|
|
179
|
+
}
|
|
180
|
+
get pageLoadMs() {
|
|
181
|
+
return this._pageLoadMs ?? navigationMixins.DEFAULT_PAGE_READINESS_TIMEOUT_MS;
|
|
182
|
+
}
|
|
183
|
+
set allowNavigationWithoutReload(allow) {
|
|
184
|
+
this._allowNavigationWithoutReload = allow;
|
|
185
|
+
}
|
|
186
|
+
set pageLoadMs(value) {
|
|
187
|
+
this._pageLoadMs = value;
|
|
188
|
+
}
|
|
167
189
|
requireRpcClient(checkConnected = false) {
|
|
168
190
|
if (!this._rpcClient) {
|
|
169
191
|
throw new Error(`rpcClient is undefined. Has 'initRpcClient' been called before?`);
|
|
@@ -217,36 +239,9 @@ class RemoteDebugger extends node_events_1.EventEmitter {
|
|
|
217
239
|
pageLoadTimeoutMs: this._pageLoadMs,
|
|
218
240
|
});
|
|
219
241
|
}
|
|
220
|
-
get isConnected() {
|
|
221
|
-
return !!this._rpcClient?.isConnected;
|
|
222
|
-
}
|
|
223
|
-
// Only use this getter to read the appDict value.
|
|
224
|
-
// Any changes to it don't mutate the original property
|
|
225
|
-
// because the getter always returns the copy of it
|
|
226
|
-
get appDict() {
|
|
227
|
-
return lodash_1.default.cloneDeep(this._appDict);
|
|
228
|
-
}
|
|
229
|
-
set allowNavigationWithoutReload(allow) {
|
|
230
|
-
this._allowNavigationWithoutReload = allow;
|
|
231
|
-
}
|
|
232
|
-
get allowNavigationWithoutReload() {
|
|
233
|
-
return !!this._allowNavigationWithoutReload;
|
|
234
|
-
}
|
|
235
|
-
get currentState() {
|
|
236
|
-
return this._currentState;
|
|
237
|
-
}
|
|
238
|
-
get connectedDrivers() {
|
|
239
|
-
return this._connectedDrivers;
|
|
240
|
-
}
|
|
241
|
-
get pageLoadMs() {
|
|
242
|
-
return this._pageLoadMs ?? navigationMixins.DEFAULT_PAGE_READINESS_TIMEOUT_MS;
|
|
243
|
-
}
|
|
244
|
-
set pageLoadMs(value) {
|
|
245
|
-
this._pageLoadMs = value;
|
|
246
|
-
}
|
|
247
242
|
}
|
|
248
243
|
exports.RemoteDebugger = RemoteDebugger;
|
|
249
|
-
for (const [name, event] of
|
|
244
|
+
for (const [name, event] of Object.entries(eventMixins.events)) {
|
|
250
245
|
RemoteDebugger[name] = event;
|
|
251
246
|
}
|
|
252
247
|
exports.default = RemoteDebugger;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-debugger.js","sourceRoot":"","sources":["../../lib/remote-debugger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"remote-debugger.js","sourceRoot":"","sources":["../../lib/remote-debugger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-messages.d.ts","sourceRoot":"","sources":["../../../lib/rpc/remote-messages.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"remote-messages.d.ts","sourceRoot":"","sources":["../../../lib/rpc/remote-messages.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,QAAQ,EACR,SAAS,EACT,eAAe,EAChB,MAAM,UAAU,CAAC;AAiClB;;;;GAIG;AACH,qBAAa,cAAc;IACzB;;;;;OAKG;IACH,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB;IASlD;;;;;;OAMG;IACH,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,gBAAgB;IAUlE;;;;;;;;OAQG;IACH,YAAY,CACV,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,QAAQ,EAClB,SAAS,CAAC,EAAE,SAAS,GACpB,gBAAgB;IAanB;;;;;;;;OAQG;IACH,eAAe,CACb,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,EAClB,SAAS,CAAC,EAAE,SAAS,EACrB,OAAO,CAAC,EAAE,OAAO,GAChB,gBAAgB;IAYnB;;;;;OAKG;IACH,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,gBAAgB;IASrD;;;;;;OAMG;IACH,cAAc,CAAC,IAAI,EAAE,iBAAiB,GAAG,mBAAmB,GAAG,gBAAgB;IA+C/E;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,iBAAiB,GAAG,mBAAmB,GAAG,gBAAgB;IA6BlF;;;;;;OAMG;IACH,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,GAAG,mBAAmB,GAAG,gBAAgB;IAoBjF;;;;;;;;OAQG;IACH,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,eAAe,GAAG,gBAAgB;CA6C/F;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAExD"}
|
|
@@ -1,16 +1,15 @@
|
|
|
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.RemoteMessages = void 0;
|
|
7
4
|
exports.isDirectCommand = isDirectCommand;
|
|
8
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
9
5
|
const protocol_1 = require("../protocol");
|
|
10
6
|
const OBJECT_GROUP = 'console';
|
|
11
7
|
const MINIMAL_COMMAND = 'getMinimalCommand';
|
|
12
8
|
const FULL_COMMAND = 'getFullCommand';
|
|
13
9
|
const DIRECT_COMMAND = 'getDirectCommand';
|
|
10
|
+
function omitNilValues(obj) {
|
|
11
|
+
return Object.fromEntries(Object.entries(obj).filter(([, value]) => value !== null && value !== undefined));
|
|
12
|
+
}
|
|
14
13
|
// mapping of commands to the function for getting the command
|
|
15
14
|
// defaults to `getMinimalCommand`, so no need to have those listed here
|
|
16
15
|
const COMMANDS = {
|
|
@@ -94,7 +93,7 @@ class RemoteMessages {
|
|
|
94
93
|
return {
|
|
95
94
|
__argument: {
|
|
96
95
|
WIRApplicationIdentifierKey: appIdKey,
|
|
97
|
-
WIRIndicateEnabledKey:
|
|
96
|
+
WIRIndicateEnabledKey: enabled == null ? true : enabled,
|
|
98
97
|
WIRConnectionIdentifierKey: connId,
|
|
99
98
|
WIRPageIdentifierKey: pageIdKey,
|
|
100
99
|
},
|
|
@@ -160,7 +159,7 @@ class RemoteMessages {
|
|
|
160
159
|
},
|
|
161
160
|
__selector: '_rpc_forwardSocketData:',
|
|
162
161
|
};
|
|
163
|
-
return
|
|
162
|
+
return omitNilValues(plist);
|
|
164
163
|
}
|
|
165
164
|
/**
|
|
166
165
|
* Creates a minimal command with only the essential parameters.
|
|
@@ -193,7 +192,7 @@ class RemoteMessages {
|
|
|
193
192
|
},
|
|
194
193
|
__selector: '_rpc_forwardSocketData:',
|
|
195
194
|
};
|
|
196
|
-
return
|
|
195
|
+
return omitNilValues(plist);
|
|
197
196
|
}
|
|
198
197
|
/**
|
|
199
198
|
* Creates a direct command that bypasses the Target.sendMessageToTarget wrapper.
|
|
@@ -218,7 +217,7 @@ class RemoteMessages {
|
|
|
218
217
|
},
|
|
219
218
|
__selector: '_rpc_forwardSocketData:',
|
|
220
219
|
};
|
|
221
|
-
return
|
|
220
|
+
return omitNilValues(plist);
|
|
222
221
|
}
|
|
223
222
|
/**
|
|
224
223
|
* Gets a remote command based on the command name and options.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-messages.js","sourceRoot":"","sources":["../../../lib/rpc/remote-messages.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"remote-messages.js","sourceRoot":"","sources":["../../../lib/rpc/remote-messages.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client-real-device-shim.d.ts","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-real-device-shim.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rpc-client-real-device-shim.d.ts","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-real-device-shim.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,KAAK,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAE9D,OAAO,KAAK,EAAC,mBAAmB,EAAE,mBAAmB,EAAC,MAAM,sBAAsB,CAAC;AAEnF;;GAEG;AACH,MAAM,WAAW,8BAA+B,SAAQ,gBAAgB;IACtE,qDAAqD;IACrD,IAAI,EAAE,MAAM,CAAC;CACd;AAUD;;;;;;;;GAQG;AACH,qBAAa,uBAAwB,SAAQ,SAAS;IACpD,SAAS,CAAC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IACpD,SAAS,CAAC,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAC1C,SAAS,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,SAAS,CAAC,WAAW,EAAE,OAAO,CAAS;IAEvC;;;;OAIG;gBACS,IAAI,EAAE,8BAA8B;IAIhD;;;;OAIG;IACY,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBvC;;;OAGG;IACY,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA4C1C;;;;;OAKG;IACY,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAY7D;;;;;OAKG;IACY,OAAO,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAMhD;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IA6B5B;;;;;;OAMG;IACH,OAAO,CAAC,cAAc;IAqBtB;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;CAY3B;AAED,eAAe,uBAAuB,CAAC"}
|
|
@@ -1,12 +1,9 @@
|
|
|
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.RpcClientRealDeviceShim = void 0;
|
|
7
4
|
const logger_1 = require("../logger");
|
|
5
|
+
const utils_1 = require("../utils");
|
|
8
6
|
const rpc_client_1 = require("./rpc-client");
|
|
9
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
10
7
|
/**
|
|
11
8
|
* RPC client implementation for iOS 18+ real devices using the WebInspector shim.
|
|
12
9
|
* This client uses the `com.apple.webinspector.shim.remote` service via RemoteXPC
|
|
@@ -159,7 +156,7 @@ class RpcClientRealDeviceShim extends rpc_client_1.RpcClient {
|
|
|
159
156
|
__selector: message.__selector,
|
|
160
157
|
};
|
|
161
158
|
// Convert buffer data to strings where necessary
|
|
162
|
-
if (
|
|
159
|
+
if ((0, utils_1.isPlainObject)(message.__argument)) {
|
|
163
160
|
const args = { ...message.__argument };
|
|
164
161
|
// Handle WIRMessageDataKey and WIRSocketDataKey which may be buffers
|
|
165
162
|
for (const key of ['WIRMessageDataKey', 'WIRSocketDataKey', 'WIRDestinationKey']) {
|
|
@@ -179,7 +176,7 @@ class RpcClientRealDeviceShim extends rpc_client_1.RpcClient {
|
|
|
179
176
|
* @returns The translated arguments for the shim service.
|
|
180
177
|
*/
|
|
181
178
|
translateArguments(args) {
|
|
182
|
-
if (!
|
|
179
|
+
if (!(0, utils_1.isPlainObject)(args)) {
|
|
183
180
|
return {};
|
|
184
181
|
}
|
|
185
182
|
const translated = { ...args };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client-real-device-shim.js","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-real-device-shim.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rpc-client-real-device-shim.js","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-real-device-shim.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client-simulator.d.ts","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-simulator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rpc-client-simulator.d.ts","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-simulator.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAEvC,OAAO,KAAK,EAAC,gBAAgB,EAAE,yBAAyB,EAAE,aAAa,EAAC,MAAM,UAAU,CAAC;AAEzF;;;;GAIG;AACH,qBAAa,kBAAmB,SAAQ,SAAS;IAC/C,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACjC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,GAAG,CAAC;IACtC,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC;IACpC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IACvC,SAAS,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC;IAExB;;;OAGG;gBACS,IAAI,GAAE,gBAAgB,GAAG,yBAA8B;IAcnE;;;OAGG;IACY,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA4FvC;;;OAGG;IACY,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1C;;;;;OAKG;IACY,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B7D;;;;;OAKG;IACY,OAAO,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;CAYjD"}
|
|
@@ -5,8 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.RpcClientSimulator = void 0;
|
|
7
7
|
const logger_1 = require("../logger");
|
|
8
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
9
|
-
const bluebird_1 = __importDefault(require("bluebird"));
|
|
10
8
|
const node_net_1 = __importDefault(require("node:net"));
|
|
11
9
|
const rpc_client_1 = require("./rpc-client");
|
|
12
10
|
const appium_ios_device_1 = require("appium-ios-device");
|
|
@@ -100,7 +98,7 @@ class RpcClientSimulator extends rpc_client_1.RpcClient {
|
|
|
100
98
|
});
|
|
101
99
|
this.service.listenMessage(this.receive.bind(this));
|
|
102
100
|
// connect the socket
|
|
103
|
-
return await new
|
|
101
|
+
return await new Promise((resolve, reject) => {
|
|
104
102
|
// only resolve this function when we are actually connected
|
|
105
103
|
if (!this.socket) {
|
|
106
104
|
return reject(new Error('RPC socket is not connected. Please contact developers'));
|
|
@@ -141,7 +139,7 @@ class RpcClientSimulator extends rpc_client_1.RpcClient {
|
|
|
141
139
|
*/
|
|
142
140
|
async sendMessage(cmd) {
|
|
143
141
|
let onSocketError;
|
|
144
|
-
return await new
|
|
142
|
+
return await new Promise((resolve, reject) => {
|
|
145
143
|
// handle socket problems
|
|
146
144
|
onSocketError = (err) => {
|
|
147
145
|
logger_1.log.error(`Socket error: ${err.message}`);
|
|
@@ -172,7 +170,7 @@ class RpcClientSimulator extends rpc_client_1.RpcClient {
|
|
|
172
170
|
return;
|
|
173
171
|
}
|
|
174
172
|
for (const key of ['WIRMessageDataKey', 'WIRDestinationKey', 'WIRSocketDataKey']) {
|
|
175
|
-
if (
|
|
173
|
+
if (data[key] !== undefined) {
|
|
176
174
|
data[key] = data[key].toString('utf8');
|
|
177
175
|
}
|
|
178
176
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client-simulator.js","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-simulator.ts"],"names":[],"mappings":";;;;;;AAAA,sCAA8B;AAC9B,
|
|
1
|
+
{"version":3,"file":"rpc-client-simulator.js","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-simulator.ts"],"names":[],"mappings":"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"}
|
|
@@ -85,18 +85,18 @@ export declare class RpcClient {
|
|
|
85
85
|
* @returns True if connected, false otherwise.
|
|
86
86
|
*/
|
|
87
87
|
get isConnected(): boolean;
|
|
88
|
-
/**
|
|
89
|
-
* Sets the connection status.
|
|
90
|
-
*
|
|
91
|
-
* @param connected - The connection status to set.
|
|
92
|
-
*/
|
|
93
|
-
set isConnected(connected: boolean);
|
|
94
88
|
/**
|
|
95
89
|
* Gets the event emitter for target subscriptions.
|
|
96
90
|
*
|
|
97
91
|
* @returns The target subscriptions event emitter.
|
|
98
92
|
*/
|
|
99
93
|
get targetSubscriptions(): EventEmitter;
|
|
94
|
+
/**
|
|
95
|
+
* Sets the connection status.
|
|
96
|
+
*
|
|
97
|
+
* @param connected - The connection status to set.
|
|
98
|
+
*/
|
|
99
|
+
set isConnected(connected: boolean);
|
|
100
100
|
/**
|
|
101
101
|
* Registers an event listener on the message handler.
|
|
102
102
|
*
|
|
@@ -273,18 +273,6 @@ export declare class RpcClient {
|
|
|
273
273
|
* @param pageReadinessDetector - Optional detector for determining when the page is ready.
|
|
274
274
|
*/
|
|
275
275
|
selectPage(appIdKey: AppIdKey, pageIdKey: PageIdKey, pageReadinessDetector?: PageReadinessDetector): Promise<void>;
|
|
276
|
-
/**
|
|
277
|
-
* Initializes a page by enabling various Web Inspector domains.
|
|
278
|
-
* Can perform either simple or full initialization based on configuration.
|
|
279
|
-
* Mimics the steps that Desktop Safari Develop tools uses to initialize
|
|
280
|
-
* a Web Inspector session.
|
|
281
|
-
*
|
|
282
|
-
* @param appIdKey - The application identifier key.
|
|
283
|
-
* @param pageIdKey - The page identifier key.
|
|
284
|
-
* @param targetId - Optional target ID. If not provided, will be retrieved from the targets map.
|
|
285
|
-
* @returns A promise that resolves to true if initialization succeeded, false otherwise.
|
|
286
|
-
*/
|
|
287
|
-
private _initializePage;
|
|
288
276
|
/**
|
|
289
277
|
* Connects to a specific application and returns its page dictionary.
|
|
290
278
|
*
|
|
@@ -316,6 +304,27 @@ export declare class RpcClient {
|
|
|
316
304
|
* @param scriptInfo - Information about the parsed script.
|
|
317
305
|
*/
|
|
318
306
|
onScriptParsed(err: Error | undefined, scriptInfo: StringRecord): void;
|
|
307
|
+
/**
|
|
308
|
+
* Waits for a page to be initialized by acquiring locks on both the page
|
|
309
|
+
* target lock and the page selection lock.
|
|
310
|
+
*
|
|
311
|
+
* @param appIdKey - The application identifier key.
|
|
312
|
+
* @param pageIdKey - The page identifier key.
|
|
313
|
+
* @throws Error if no targets are found for the application.
|
|
314
|
+
*/
|
|
315
|
+
waitForPage(appIdKey: AppIdKey, pageIdKey: PageIdKey): Promise<void>;
|
|
316
|
+
/**
|
|
317
|
+
* Initializes a page by enabling various Web Inspector domains.
|
|
318
|
+
* Can perform either simple or full initialization based on configuration.
|
|
319
|
+
* Mimics the steps that Desktop Safari Develop tools uses to initialize
|
|
320
|
+
* a Web Inspector session.
|
|
321
|
+
*
|
|
322
|
+
* @param appIdKey - The application identifier key.
|
|
323
|
+
* @param pageIdKey - The page identifier key.
|
|
324
|
+
* @param targetId - Optional target ID. If not provided, will be retrieved from the targets map.
|
|
325
|
+
* @returns A promise that resolves to true if initialization succeeded, false otherwise.
|
|
326
|
+
*/
|
|
327
|
+
private _initializePage;
|
|
319
328
|
/**
|
|
320
329
|
* Resumes a paused target.
|
|
321
330
|
*
|
|
@@ -334,15 +343,6 @@ export declare class RpcClient {
|
|
|
334
343
|
* @param pageReadinessDetector - The detector for determining page readiness.
|
|
335
344
|
*/
|
|
336
345
|
private _waitForPageReadiness;
|
|
337
|
-
/**
|
|
338
|
-
* Waits for a page to be initialized by acquiring locks on both the page
|
|
339
|
-
* target lock and the page selection lock.
|
|
340
|
-
*
|
|
341
|
-
* @param appIdKey - The application identifier key.
|
|
342
|
-
* @param pageIdKey - The page identifier key.
|
|
343
|
-
* @throws Error if no targets are found for the application.
|
|
344
|
-
*/
|
|
345
|
-
waitForPage(appIdKey: AppIdKey, pageIdKey: PageIdKey): Promise<void>;
|
|
346
346
|
/**
|
|
347
347
|
* Gets the pending target details if there is a pending request for the given app.
|
|
348
348
|
* Filters out non-page target types (e.g., 'frame').
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../../lib/rpc/rpc-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../../lib/rpc/rpc-client.ts"],"names":[],"mappings":"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"}
|