@appium/base-driver 10.2.1 → 10.3.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/build/lib/basedriver/commands/execute.js +2 -1
- package/build/lib/basedriver/commands/execute.js.map +1 -1
- package/build/lib/jsonwp-proxy/protocol-converter.d.ts +42 -78
- package/build/lib/jsonwp-proxy/protocol-converter.d.ts.map +1 -1
- package/build/lib/jsonwp-proxy/protocol-converter.js +87 -139
- package/build/lib/jsonwp-proxy/protocol-converter.js.map +1 -1
- package/build/lib/jsonwp-proxy/proxy.d.ts +52 -97
- package/build/lib/jsonwp-proxy/proxy.d.ts.map +1 -1
- package/build/lib/jsonwp-proxy/proxy.js +98 -141
- package/build/lib/jsonwp-proxy/proxy.js.map +1 -1
- package/lib/basedriver/commands/execute.ts +2 -1
- package/lib/jsonwp-proxy/protocol-converter.ts +284 -0
- package/lib/jsonwp-proxy/proxy.ts +506 -0
- package/package.json +9 -9
- package/lib/jsonwp-proxy/protocol-converter.js +0 -317
- package/lib/jsonwp-proxy/proxy.js +0 -493
|
@@ -10,7 +10,7 @@ const status_1 = require("../jsonwp-status/status");
|
|
|
10
10
|
const errors_1 = require("../protocol/errors");
|
|
11
11
|
const protocol_1 = require("../protocol");
|
|
12
12
|
const constants_1 = require("../constants");
|
|
13
|
-
const protocol_converter_1 =
|
|
13
|
+
const protocol_converter_1 = require("./protocol-converter");
|
|
14
14
|
const helpers_1 = require("../protocol/helpers");
|
|
15
15
|
const node_http_1 = __importDefault(require("node:http"));
|
|
16
16
|
const node_https_1 = __importDefault(require("node:https"));
|
|
@@ -34,34 +34,22 @@ const ALLOWED_OPTS = [
|
|
|
34
34
|
'headers',
|
|
35
35
|
];
|
|
36
36
|
class JWProxy {
|
|
37
|
-
/** @type {string} */
|
|
38
37
|
scheme;
|
|
39
|
-
/** @type {string} */
|
|
40
38
|
server;
|
|
41
|
-
/** @type {number} */
|
|
42
39
|
port;
|
|
43
|
-
/** @type {string} */
|
|
44
40
|
base;
|
|
45
|
-
/** @type {string} */
|
|
46
41
|
reqBasePath;
|
|
47
|
-
/** @type {string?} */
|
|
48
42
|
sessionId;
|
|
49
|
-
/** @type {number} */
|
|
50
43
|
timeout;
|
|
51
|
-
/** @type {import('@appium/types').HTTPHeaders | undefined} */
|
|
52
44
|
headers;
|
|
53
|
-
|
|
45
|
+
httpAgent;
|
|
46
|
+
httpsAgent;
|
|
47
|
+
protocolConverter;
|
|
54
48
|
_downstreamProtocol;
|
|
55
|
-
/** @type {ProxyRequest[]} */
|
|
56
49
|
_activeRequests;
|
|
57
|
-
|
|
58
|
-
* @param {import('@appium/types').ProxyOptions} [opts={}]
|
|
59
|
-
*/
|
|
50
|
+
_log;
|
|
60
51
|
constructor(opts = {}) {
|
|
61
52
|
const filteredOpts = lodash_1.default.pick(opts, ALLOWED_OPTS);
|
|
62
|
-
// omit 'log' in the defaults assignment here because 'log' is a getter and we are going to set
|
|
63
|
-
// it to this._log (which lies behind the getter) further down
|
|
64
|
-
/** @type {import('@appium/types').ProxyOptions} */
|
|
65
53
|
const options = lodash_1.default.defaults(lodash_1.default.omit(filteredOpts, 'log'), {
|
|
66
54
|
scheme: 'http',
|
|
67
55
|
server: 'localhost',
|
|
@@ -71,7 +59,7 @@ class JWProxy {
|
|
|
71
59
|
sessionId: null,
|
|
72
60
|
timeout: DEFAULT_REQUEST_TIMEOUT,
|
|
73
61
|
});
|
|
74
|
-
options.scheme =
|
|
62
|
+
options.scheme = options.scheme.toLowerCase();
|
|
75
63
|
Object.assign(this, options);
|
|
76
64
|
this._activeRequests = [];
|
|
77
65
|
this._downstreamProtocol = null;
|
|
@@ -82,7 +70,7 @@ class JWProxy {
|
|
|
82
70
|
};
|
|
83
71
|
this.httpAgent = new node_http_1.default.Agent(agentOpts);
|
|
84
72
|
this.httpsAgent = new node_https_1.default.Agent(agentOpts);
|
|
85
|
-
this.protocolConverter = new protocol_converter_1.
|
|
73
|
+
this.protocolConverter = new protocol_converter_1.ProtocolConverter(this.proxy.bind(this), opts.log);
|
|
86
74
|
this._log = opts.log;
|
|
87
75
|
this.log.debug(`${this.constructor.name} options: ${JSON.stringify(options)}`);
|
|
88
76
|
}
|
|
@@ -90,30 +78,14 @@ class JWProxy {
|
|
|
90
78
|
return this._log ?? DEFAULT_LOG;
|
|
91
79
|
}
|
|
92
80
|
/**
|
|
93
|
-
*
|
|
94
|
-
*
|
|
95
|
-
* @private - Do not call this method directly,
|
|
96
|
-
* it uses client-specific arguments and responses!
|
|
97
|
-
*
|
|
98
|
-
* @param {import('axios').RawAxiosRequestConfig} requestConfig
|
|
99
|
-
* @returns {Promise<import('axios').AxiosResponse>}
|
|
100
|
-
*/
|
|
101
|
-
async request(requestConfig) {
|
|
102
|
-
const req = new proxy_request_1.ProxyRequest(requestConfig);
|
|
103
|
-
this._activeRequests.push(req);
|
|
104
|
-
try {
|
|
105
|
-
return await req.execute();
|
|
106
|
-
}
|
|
107
|
-
finally {
|
|
108
|
-
lodash_1.default.pull(this._activeRequests, req);
|
|
109
|
-
}
|
|
110
|
-
}
|
|
111
|
-
/**
|
|
112
|
-
* @returns {number}
|
|
81
|
+
* Returns the number of active downstream HTTP requests.
|
|
113
82
|
*/
|
|
114
83
|
getActiveRequestsCount() {
|
|
115
84
|
return this._activeRequests.length;
|
|
116
85
|
}
|
|
86
|
+
/**
|
|
87
|
+
* Cancels all currently active downstream HTTP requests.
|
|
88
|
+
*/
|
|
117
89
|
cancelActiveRequests() {
|
|
118
90
|
for (const ar of this._activeRequests) {
|
|
119
91
|
ar.cancel();
|
|
@@ -121,27 +93,26 @@ class JWProxy {
|
|
|
121
93
|
this._activeRequests = [];
|
|
122
94
|
}
|
|
123
95
|
/**
|
|
124
|
-
*
|
|
96
|
+
* Sets the protocol used by the downstream server (W3C or MJSONWP).
|
|
125
97
|
*/
|
|
126
98
|
set downstreamProtocol(value) {
|
|
127
99
|
this._downstreamProtocol = value;
|
|
128
100
|
this.protocolConverter.downstreamProtocol = value;
|
|
129
101
|
}
|
|
102
|
+
/**
|
|
103
|
+
* Gets the protocol used by the downstream server (W3C or MJSONWP).
|
|
104
|
+
*/
|
|
130
105
|
get downstreamProtocol() {
|
|
131
106
|
return this._downstreamProtocol;
|
|
132
107
|
}
|
|
133
108
|
/**
|
|
134
|
-
*
|
|
135
|
-
* @param {string} url
|
|
136
|
-
* @param {string} [method]
|
|
137
|
-
* @returns {string}
|
|
109
|
+
* Builds a full downstream URL (including base path and session) for a given upstream URL.
|
|
138
110
|
*/
|
|
139
111
|
getUrlForProxy(url, method) {
|
|
140
112
|
const parsedUrl = this._parseUrl(url);
|
|
141
113
|
const normalizedPathname = this._toNormalizedPathname(parsedUrl);
|
|
142
114
|
const commandName = normalizedPathname
|
|
143
|
-
? (0, protocol_1.routeToCommandName)(normalizedPathname,
|
|
144
|
-
/** @type {import('@appium/types').HTTPMethod | undefined} */ (method))
|
|
115
|
+
? (0, protocol_1.routeToCommandName)(normalizedPathname, method)
|
|
145
116
|
: '';
|
|
146
117
|
const requiresSessionId = !commandName || (commandName && (0, protocol_1.isSessionCommand)(commandName));
|
|
147
118
|
const proxyPrefix = `${this.scheme}://${this.server}:${this.port}${this.base}`;
|
|
@@ -158,11 +129,7 @@ class JWProxy {
|
|
|
158
129
|
return `${proxyPrefix}/session/${this.sessionId}${proxySuffix}`;
|
|
159
130
|
}
|
|
160
131
|
/**
|
|
161
|
-
*
|
|
162
|
-
* @param {string} url
|
|
163
|
-
* @param {string} method
|
|
164
|
-
* @param {import('@appium/types').HTTPBody} [body=null]
|
|
165
|
-
* @returns {Promise<[import('@appium/types').ProxyResponse, import('@appium/types').HTTPBody]>}
|
|
132
|
+
* Proxies a raw WebDriver command to the downstream server.
|
|
166
133
|
*/
|
|
167
134
|
async proxy(url, method, body = null) {
|
|
168
135
|
method = method.toUpperCase();
|
|
@@ -170,7 +137,6 @@ class JWProxy {
|
|
|
170
137
|
const truncateBody = (content) => lodash_1.default.truncate(lodash_1.default.isString(content) ? content : JSON.stringify(content), {
|
|
171
138
|
length: constants_1.MAX_LOG_BODY_LENGTH,
|
|
172
139
|
});
|
|
173
|
-
/** @type {import('axios').RawAxiosRequestConfig} */
|
|
174
140
|
const reqOpts = {
|
|
175
141
|
url: newUrl,
|
|
176
142
|
method,
|
|
@@ -185,7 +151,8 @@ class JWProxy {
|
|
|
185
151
|
httpAgent: this.httpAgent,
|
|
186
152
|
httpsAgent: this.httpsAgent,
|
|
187
153
|
};
|
|
188
|
-
// GET methods shouldn't have any body. Most servers are OK with this,
|
|
154
|
+
// GET methods shouldn't have any body. Most servers are OK with this,
|
|
155
|
+
// but WebDriverAgent throws 400 errors
|
|
189
156
|
if (support_1.util.hasValue(body) && method !== 'GET') {
|
|
190
157
|
if (typeof body !== 'object') {
|
|
191
158
|
try {
|
|
@@ -202,7 +169,7 @@ class JWProxy {
|
|
|
202
169
|
}
|
|
203
170
|
this.log.debug(`Proxying [%s %s] to [%s %s] with ${reqOpts.data ? 'body: %s' : '%s body'}`, method, url || '/', method, newUrl, reqOpts.data ? support_1.logger.markSensitive(truncateBody(reqOpts.data)) : 'no');
|
|
204
171
|
const throwProxyError = (error) => {
|
|
205
|
-
const err =
|
|
172
|
+
const err = new Error(`The request to ${url} has failed`);
|
|
206
173
|
err.response = {
|
|
207
174
|
data: error,
|
|
208
175
|
status: 500,
|
|
@@ -224,46 +191,47 @@ class JWProxy {
|
|
|
224
191
|
const isSessionCreationRequest = url.endsWith('/session') && method === 'POST';
|
|
225
192
|
if (isSessionCreationRequest) {
|
|
226
193
|
if (status === 200) {
|
|
227
|
-
|
|
194
|
+
const value = data.value;
|
|
195
|
+
const raw = data.sessionId ?? value?.sessionId;
|
|
196
|
+
this.sessionId =
|
|
197
|
+
typeof raw === 'string' ? raw : raw != null ? String(raw) : null;
|
|
228
198
|
}
|
|
229
|
-
this.downstreamProtocol = this.getProtocolFromResBody(data);
|
|
199
|
+
this.downstreamProtocol = this.getProtocolFromResBody(data) ?? this.downstreamProtocol;
|
|
230
200
|
this.log.info(`Determined the downstream protocol as '${this.downstreamProtocol}'`);
|
|
231
201
|
}
|
|
232
|
-
if (lodash_1.default.has(data, 'status') &&
|
|
233
|
-
|
|
202
|
+
if (lodash_1.default.has(data, 'status') &&
|
|
203
|
+
parseInt(data.status, 10) !== 0) {
|
|
234
204
|
throwProxyError(data);
|
|
235
205
|
}
|
|
236
|
-
|
|
237
|
-
|
|
206
|
+
return [
|
|
207
|
+
{
|
|
238
208
|
statusCode: status,
|
|
239
|
-
headers:
|
|
209
|
+
headers: headers,
|
|
240
210
|
body: data,
|
|
241
|
-
},
|
|
211
|
+
},
|
|
212
|
+
data,
|
|
213
|
+
];
|
|
242
214
|
}
|
|
243
215
|
catch (e) {
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
let proxyErrorMsg = e.message;
|
|
248
|
-
if (support_1.util.hasValue(e.response)) {
|
|
216
|
+
const err = e;
|
|
217
|
+
let proxyErrorMsg = err.message;
|
|
218
|
+
if (support_1.util.hasValue(err.response)) {
|
|
249
219
|
if (!isResponseLogged) {
|
|
250
|
-
const error = truncateBody(
|
|
251
|
-
this.log.info(support_1.util.hasValue(
|
|
252
|
-
? `Got response with status ${
|
|
220
|
+
const error = truncateBody(err.response.data);
|
|
221
|
+
this.log.info(support_1.util.hasValue(err.response.status)
|
|
222
|
+
? `Got response with status ${err.response.status}: ${error}`
|
|
253
223
|
: `Got response with unknown status: ${error}`);
|
|
254
224
|
}
|
|
255
225
|
}
|
|
256
226
|
else {
|
|
257
|
-
proxyErrorMsg = `Could not proxy command to the remote server. Original error: ${
|
|
258
|
-
this.log.info(
|
|
227
|
+
proxyErrorMsg = `Could not proxy command to the remote server. Original error: ${err.message}`;
|
|
228
|
+
this.log.info(err.message);
|
|
259
229
|
}
|
|
260
|
-
throw new errors_1.errors.ProxyRequestError(proxyErrorMsg,
|
|
230
|
+
throw new errors_1.errors.ProxyRequestError(proxyErrorMsg, err.response?.data, err.response?.status);
|
|
261
231
|
}
|
|
262
232
|
}
|
|
263
233
|
/**
|
|
264
|
-
*
|
|
265
|
-
* @param {Record<string, any>} resObj
|
|
266
|
-
* @returns {Protocol | undefined}
|
|
234
|
+
* Detects the downstream protocol from a response body.
|
|
267
235
|
*/
|
|
268
236
|
getProtocolFromResBody(resObj) {
|
|
269
237
|
if (lodash_1.default.isInteger(resObj.status)) {
|
|
@@ -274,16 +242,14 @@ class JWProxy {
|
|
|
274
242
|
}
|
|
275
243
|
}
|
|
276
244
|
/**
|
|
277
|
-
*
|
|
278
|
-
* @param {string} url
|
|
279
|
-
* @param {import('@appium/types').HTTPMethod} method
|
|
280
|
-
* @param {import('@appium/types').HTTPBody} [body=null]
|
|
281
|
-
* @returns {Promise<[import('@appium/types').ProxyResponse, import('@appium/types').HTTPBody]>}
|
|
245
|
+
* Proxies a command identified by its HTTP method and URL to the downstream server.
|
|
282
246
|
*/
|
|
283
247
|
async proxyCommand(url, method, body = null) {
|
|
284
248
|
const parsedUrl = this._parseUrl(url);
|
|
285
249
|
const normalizedPathname = this._toNormalizedPathname(parsedUrl);
|
|
286
|
-
const commandName = normalizedPathname
|
|
250
|
+
const commandName = normalizedPathname
|
|
251
|
+
? (0, protocol_1.routeToCommandName)(normalizedPathname, method)
|
|
252
|
+
: '';
|
|
287
253
|
if (!commandName) {
|
|
288
254
|
return await this.proxy(url, method, body);
|
|
289
255
|
}
|
|
@@ -291,11 +257,7 @@ class JWProxy {
|
|
|
291
257
|
return await this.protocolConverter.convertAndProxy(commandName, url, method, body);
|
|
292
258
|
}
|
|
293
259
|
/**
|
|
294
|
-
*
|
|
295
|
-
* @param {string} url
|
|
296
|
-
* @param {import('@appium/types').HTTPMethod} method
|
|
297
|
-
* @param {import('@appium/types').HTTPBody} [body=null]
|
|
298
|
-
* @returns {Promise<import('@appium/types').HTTPBody>}
|
|
260
|
+
* Executes a WebDriver command and returns the unwrapped `value` field (or throws).
|
|
299
261
|
*/
|
|
300
262
|
async command(url, method, body = null) {
|
|
301
263
|
let response;
|
|
@@ -309,32 +271,33 @@ class JWProxy {
|
|
|
309
271
|
}
|
|
310
272
|
throw new errors_1.errors.UnknownError(err.message);
|
|
311
273
|
}
|
|
312
|
-
const
|
|
274
|
+
const resBody = resBodyObj;
|
|
275
|
+
const protocol = this.getProtocolFromResBody(resBody);
|
|
313
276
|
if (protocol === MJSONWP) {
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
return resBodyObj.value;
|
|
277
|
+
if (response.statusCode === 200 && resBody.status === 0) {
|
|
278
|
+
return resBody.value;
|
|
317
279
|
}
|
|
318
|
-
const status = parseInt(
|
|
280
|
+
const status = parseInt(resBody.status, 10);
|
|
319
281
|
if (!isNaN(status) && status !== 0) {
|
|
320
|
-
let message =
|
|
321
|
-
if (lodash_1.default.has(message, 'message')) {
|
|
282
|
+
let message = resBody.value;
|
|
283
|
+
if (lodash_1.default.isPlainObject(message) && lodash_1.default.has(message, 'message')) {
|
|
322
284
|
message = message.message;
|
|
323
285
|
}
|
|
324
|
-
throw (0, errors_1.errorFromMJSONWPStatusCode)(status, lodash_1.default.isEmpty(message)
|
|
286
|
+
throw (0, errors_1.errorFromMJSONWPStatusCode)(status, lodash_1.default.isEmpty(message)
|
|
287
|
+
? (0, status_1.getSummaryByCode)(status)
|
|
288
|
+
: message);
|
|
325
289
|
}
|
|
326
290
|
}
|
|
327
291
|
else if (protocol === W3C) {
|
|
328
|
-
// Got response in W3C format
|
|
329
292
|
if (response.statusCode < 300) {
|
|
330
|
-
return
|
|
293
|
+
return resBody.value;
|
|
331
294
|
}
|
|
332
|
-
if (lodash_1.default.isPlainObject(
|
|
333
|
-
|
|
295
|
+
if (lodash_1.default.isPlainObject(resBody.value) && resBody.value.error) {
|
|
296
|
+
const value = resBody.value;
|
|
297
|
+
throw (0, errors_1.errorFromW3CJsonCode)(value.error, value.message ?? '', value.stacktrace);
|
|
334
298
|
}
|
|
335
299
|
}
|
|
336
300
|
else if (response.statusCode === 200) {
|
|
337
|
-
// Unknown protocol. Keeping it because of the backward compatibility
|
|
338
301
|
return resBodyObj;
|
|
339
302
|
}
|
|
340
303
|
throw new errors_1.errors.UnknownError(`Did not know what to do with response code '${response.statusCode}' ` +
|
|
@@ -343,31 +306,25 @@ class JWProxy {
|
|
|
343
306
|
})}'`);
|
|
344
307
|
}
|
|
345
308
|
/**
|
|
346
|
-
*
|
|
347
|
-
* @param {string} url
|
|
348
|
-
* @returns {string | null}
|
|
309
|
+
* Extracts a session id from a WebDriver-style URL.
|
|
349
310
|
*/
|
|
350
311
|
getSessionIdFromUrl(url) {
|
|
351
312
|
const match = url.match(/\/session\/([^/]+)/);
|
|
352
313
|
return match ? match[1] : null;
|
|
353
314
|
}
|
|
354
315
|
/**
|
|
316
|
+
* Proxies an Express `Request`/`Response` pair to the downstream server,
|
|
317
|
+
* converting any downstream errors into a proper W3C HTTP response.
|
|
355
318
|
*
|
|
356
|
-
*
|
|
357
|
-
* @param {import('express').Response} res
|
|
319
|
+
* This method must not throw; it always writes a response.
|
|
358
320
|
*/
|
|
359
321
|
async proxyReqRes(req, res) {
|
|
360
|
-
// ! this method must not throw any exceptions
|
|
361
|
-
// ! make sure to call res.send before return
|
|
362
|
-
/** @type {number} */
|
|
363
322
|
let statusCode;
|
|
364
|
-
/** @type {import('@appium/types').HTTPBody} */
|
|
365
323
|
let resBodyObj;
|
|
366
324
|
try {
|
|
367
|
-
|
|
368
|
-
[response, resBodyObj] = await this.proxyCommand(req.originalUrl,
|
|
369
|
-
/** @type {import('@appium/types').HTTPMethod} */ (req.method), req.body);
|
|
325
|
+
const [response, body] = await this.proxyCommand(req.originalUrl, req.method, req.body);
|
|
370
326
|
statusCode = response.statusCode;
|
|
327
|
+
resBodyObj = body;
|
|
371
328
|
}
|
|
372
329
|
catch (err) {
|
|
373
330
|
[statusCode, resBodyObj] = (0, errors_1.getResponseForW3CError)((0, errors_1.isErrorType)(err, errors_1.errors.ProxyRequestError) ? err.getActualError() : err);
|
|
@@ -378,42 +335,47 @@ class JWProxy {
|
|
|
378
335
|
lodash_1.default.truncate(`${resBodyObj}`, { length: 300 }));
|
|
379
336
|
[statusCode, resBodyObj] = (0, errors_1.getResponseForW3CError)(error);
|
|
380
337
|
}
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
// Instead, return the id from the request or from current session
|
|
384
|
-
if (lodash_1.default.has(resBodyObj, 'sessionId')) {
|
|
338
|
+
const resBody = resBodyObj;
|
|
339
|
+
if (lodash_1.default.has(resBody, 'sessionId')) {
|
|
385
340
|
const reqSessionId = this.getSessionIdFromUrl(req.originalUrl);
|
|
386
341
|
if (reqSessionId) {
|
|
387
|
-
this.log.info(`Replacing sessionId ${
|
|
388
|
-
|
|
342
|
+
this.log.info(`Replacing sessionId ${resBody.sessionId} with ${reqSessionId}`);
|
|
343
|
+
resBody.sessionId = reqSessionId;
|
|
389
344
|
}
|
|
390
345
|
else if (this.sessionId) {
|
|
391
|
-
this.log.info(`Replacing sessionId ${
|
|
392
|
-
|
|
346
|
+
this.log.info(`Replacing sessionId ${resBody.sessionId} with ${this.sessionId}`);
|
|
347
|
+
resBody.sessionId = this.sessionId;
|
|
393
348
|
}
|
|
394
349
|
}
|
|
395
|
-
|
|
396
|
-
res.status(statusCode).json((0, helpers_1.ensureW3cResponse)(
|
|
350
|
+
resBody.value = (0, helpers_1.formatResponseValue)(resBody.value);
|
|
351
|
+
res.status(statusCode).json((0, helpers_1.ensureW3cResponse)(resBody));
|
|
397
352
|
}
|
|
398
353
|
/**
|
|
354
|
+
* Performs requests to the downstream server
|
|
399
355
|
*
|
|
400
|
-
* @
|
|
401
|
-
*
|
|
356
|
+
* @private - Do not call this method directly,
|
|
357
|
+
* it uses client-specific arguments and responses!
|
|
402
358
|
*/
|
|
359
|
+
async request(requestConfig) {
|
|
360
|
+
const req = new proxy_request_1.ProxyRequest(requestConfig);
|
|
361
|
+
this._activeRequests.push(req);
|
|
362
|
+
try {
|
|
363
|
+
return await req.execute();
|
|
364
|
+
}
|
|
365
|
+
finally {
|
|
366
|
+
lodash_1.default.pull(this._activeRequests, req);
|
|
367
|
+
}
|
|
368
|
+
}
|
|
403
369
|
_parseUrl(url) {
|
|
404
370
|
// eslint-disable-next-line n/no-deprecated-api -- we need relative URL support
|
|
405
371
|
const parsedUrl = node_url_1.default.parse(url || '/');
|
|
406
|
-
if (lodash_1.default.isNil(parsedUrl.href) ||
|
|
407
|
-
|
|
372
|
+
if (lodash_1.default.isNil(parsedUrl.href) ||
|
|
373
|
+
lodash_1.default.isNil(parsedUrl.pathname) ||
|
|
374
|
+
(parsedUrl.protocol && !['http:', 'https:'].includes(parsedUrl.protocol))) {
|
|
408
375
|
throw new Error(`Did not know how to proxy the url '${url}'`);
|
|
409
376
|
}
|
|
410
377
|
return parsedUrl;
|
|
411
378
|
}
|
|
412
|
-
/**
|
|
413
|
-
*
|
|
414
|
-
* @param {ParsedUrl} parsedUrl
|
|
415
|
-
* @returns {string}
|
|
416
|
-
*/
|
|
417
379
|
_toNormalizedPathname(parsedUrl) {
|
|
418
380
|
if (!lodash_1.default.isString(parsedUrl.pathname)) {
|
|
419
381
|
return '';
|
|
@@ -425,25 +387,20 @@ class JWProxy {
|
|
|
425
387
|
// This is needed for the backward compatibility
|
|
426
388
|
// if drivers don't set reqBasePath properly
|
|
427
389
|
if (!this.reqBasePath) {
|
|
428
|
-
if (match && lodash_1.default.isArray(match.params
|
|
429
|
-
pathname = pathname.replace(`/${match.params
|
|
390
|
+
if (match && match.params && lodash_1.default.isArray(match.params.prefix)) {
|
|
391
|
+
pathname = pathname.replace(`/${match.params.prefix.join('/')}`, '');
|
|
430
392
|
}
|
|
431
393
|
else if (lodash_1.default.startsWith(pathname, '/wd/hub')) {
|
|
432
394
|
pathname = pathname.replace('/wd/hub', '');
|
|
433
395
|
}
|
|
434
396
|
}
|
|
435
397
|
let result = pathname;
|
|
436
|
-
if (match) {
|
|
437
|
-
|
|
398
|
+
if (match && match.params) {
|
|
399
|
+
const command = match.params.command;
|
|
400
|
+
result = lodash_1.default.isArray(command) ? `/${command.join('/')}` : '';
|
|
438
401
|
}
|
|
439
402
|
return lodash_1.default.trimEnd(result, '/');
|
|
440
403
|
}
|
|
441
404
|
}
|
|
442
405
|
exports.JWProxy = JWProxy;
|
|
443
|
-
exports.default = JWProxy;
|
|
444
|
-
/**
|
|
445
|
-
* @typedef {Error & {response: {data: import('type-fest').JsonObject, status: import('http-status-codes').StatusCodes}}} ProxyError
|
|
446
|
-
* @typedef {nodeUrl.UrlWithStringQuery} ParsedUrl
|
|
447
|
-
* @typedef {typeof PROTOCOLS[keyof typeof PROTOCOLS]} Protocol
|
|
448
|
-
*/
|
|
449
406
|
//# sourceMappingURL=proxy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../lib/jsonwp-proxy/proxy.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../lib/jsonwp-proxy/proxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,7 +57,8 @@ const ExecuteCommands: IExecuteCommands = {
|
|
|
57
57
|
);
|
|
58
58
|
}
|
|
59
59
|
const args = validateExecuteMethodParams(protoArgs as any[], commandMetadata.params);
|
|
60
|
-
const
|
|
60
|
+
const commandName = commandMetadata.command as keyof BaseDriver<C>;
|
|
61
|
+
const command = this[commandName] as DriverCommand;
|
|
61
62
|
return await command.call(this, ...args);
|
|
62
63
|
},
|
|
63
64
|
};
|