appium-espresso-driver 10.0.1 → 10.0.2
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 +6 -0
- package/build/lib/commands/server/builder.js +1 -1
- package/build/lib/commands/server/builder.js.map +1 -1
- package/build/lib/driver.d.ts.map +1 -1
- package/build/lib/driver.js.map +1 -1
- package/espresso-server/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk +0 -0
- package/espresso-server/buildSrc/.gradle/9.7.1/executionHistory/executionHistory.bin +0 -0
- package/espresso-server/buildSrc/.gradle/9.7.1/executionHistory/executionHistory.lock +0 -0
- package/espresso-server/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/espresso-server/buildSrc/.gradle/buildOutputCleanup/cache.properties +1 -1
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin +0 -0
- package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/Version.kt +1 -1
- package/lib/commands/server/builder.ts +1 -1
- package/lib/driver.ts +2 -2
- package/node_modules/@appium/base-driver/build/lib/index.d.ts +1 -1
- package/node_modules/@appium/base-driver/build/lib/index.d.ts.map +1 -1
- package/node_modules/@appium/base-driver/build/lib/index.js +1 -1
- package/node_modules/@appium/base-driver/build/lib/index.js.map +1 -1
- package/node_modules/@appium/base-driver/build/lib/protocol/errors.d.ts.map +1 -1
- package/node_modules/@appium/base-driver/build/lib/protocol/errors.js.map +1 -1
- package/node_modules/@appium/base-driver/build/lib/protocol/helpers.d.ts +27 -0
- package/node_modules/@appium/base-driver/build/lib/protocol/helpers.d.ts.map +1 -1
- package/node_modules/@appium/base-driver/build/lib/protocol/helpers.js +50 -0
- package/node_modules/@appium/base-driver/build/lib/protocol/helpers.js.map +1 -1
- package/node_modules/@appium/base-driver/build/lib/protocol/index.d.ts +1 -0
- package/node_modules/@appium/base-driver/build/lib/protocol/index.d.ts.map +1 -1
- package/node_modules/@appium/base-driver/build/lib/protocol/index.js +1 -0
- package/node_modules/@appium/base-driver/build/lib/protocol/index.js.map +1 -1
- package/node_modules/@appium/base-driver/build/lib/protocol/route-handler.js +19 -24
- package/node_modules/@appium/base-driver/build/lib/protocol/route-handler.js.map +1 -1
- package/node_modules/@appium/base-driver/build/lib/protocol/session.d.ts +0 -7
- package/node_modules/@appium/base-driver/build/lib/protocol/session.d.ts.map +1 -1
- package/node_modules/@appium/base-driver/build/lib/protocol/session.js +0 -17
- package/node_modules/@appium/base-driver/build/lib/protocol/session.js.map +1 -1
- package/node_modules/@appium/base-driver/lib/index.ts +2 -0
- package/node_modules/@appium/base-driver/lib/protocol/errors.ts +4 -4
- package/node_modules/@appium/base-driver/lib/protocol/helpers.ts +60 -0
- package/node_modules/@appium/base-driver/lib/protocol/index.ts +1 -0
- package/node_modules/@appium/base-driver/lib/protocol/route-handler.ts +18 -28
- package/node_modules/@appium/base-driver/lib/protocol/session.ts +0 -20
- package/node_modules/@appium/base-driver/package.json +5 -5
- package/node_modules/@appium/schema/build/lib/appium-config-schema.d.ts +21 -0
- package/node_modules/@appium/schema/build/lib/appium-config-schema.d.ts.map +1 -1
- package/node_modules/@appium/schema/build/lib/appium-config-schema.js +21 -0
- package/node_modules/@appium/schema/build/lib/appium-config-schema.js.map +1 -1
- package/node_modules/@appium/schema/lib/appium-config-schema.ts +24 -0
- package/node_modules/@appium/schema/lib/appium-config.schema.json +21 -0
- package/node_modules/@appium/schema/package.json +2 -2
- package/node_modules/@appium/support/build/lib/index.d.ts +1 -1
- package/node_modules/@appium/support/build/lib/index.d.ts.map +1 -1
- package/node_modules/@appium/support/build/lib/internal/zip-extractor.d.ts.map +1 -1
- package/node_modules/@appium/support/build/lib/internal/zip-extractor.js +8 -1
- package/node_modules/@appium/support/build/lib/internal/zip-extractor.js.map +1 -1
- package/node_modules/@appium/support/build/lib/net.d.ts +56 -0
- package/node_modules/@appium/support/build/lib/net.d.ts.map +1 -1
- package/node_modules/@appium/support/build/lib/net.js +96 -1
- package/node_modules/@appium/support/build/lib/net.js.map +1 -1
- package/node_modules/@appium/support/lib/index.ts +9 -1
- package/node_modules/@appium/support/lib/internal/zip-extractor.ts +7 -1
- package/node_modules/@appium/support/lib/net.ts +126 -1
- package/node_modules/@appium/support/package.json +5 -5
- package/node_modules/@appium/types/build/lib/appium-config.d.ts +15 -0
- package/node_modules/@appium/types/build/lib/appium-config.d.ts.map +1 -1
- package/node_modules/@appium/types/build/lib/bidi.d.ts +44 -0
- package/node_modules/@appium/types/build/lib/bidi.d.ts.map +1 -0
- package/node_modules/@appium/types/build/lib/bidi.js +2 -0
- package/node_modules/@appium/types/build/lib/bidi.js.map +1 -0
- package/node_modules/@appium/types/build/lib/driver.d.ts +6 -0
- package/node_modules/@appium/types/build/lib/driver.d.ts.map +1 -1
- package/node_modules/@appium/types/build/lib/index.d.ts +1 -0
- package/node_modules/@appium/types/build/lib/index.d.ts.map +1 -1
- package/node_modules/@appium/types/build/lib/index.js +1 -0
- package/node_modules/@appium/types/build/lib/index.js.map +1 -1
- package/node_modules/@appium/types/lib/appium-config.ts +15 -0
- package/node_modules/@appium/types/lib/bidi.ts +45 -0
- package/node_modules/@appium/types/lib/driver.ts +6 -0
- package/node_modules/@appium/types/lib/index.ts +1 -0
- package/node_modules/@appium/types/package.json +4 -4
- package/node_modules/appium-android-driver/CHANGELOG.md +24 -0
- package/node_modules/appium-android-driver/package.json +4 -4
- package/node_modules/appium-chromedriver/CHANGELOG.md +7 -0
- package/node_modules/appium-chromedriver/config/mapping.json +1 -0
- package/node_modules/appium-chromedriver/package.json +2 -2
- package/node_modules/bare-buffer/CMakeLists.txt +3 -3
- package/node_modules/bare-buffer/README.md +4 -0
- package/node_modules/bare-buffer/package.json +2 -2
- package/node_modules/bare-buffer/prebuilds/android-arm/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/android-arm64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/android-ia32/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/android-x64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/darwin-arm64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/darwin-x64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/ios-arm64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/ios-arm64-simulator/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/ios-x64-simulator/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/linux-arm64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/linux-x64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/win32-arm64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/win32-x64/bare-buffer.bare +0 -0
- package/node_modules/bare-path/README.md +8 -0
- package/node_modules/bare-path/binding.c +33 -12
- package/node_modules/bare-path/index.d.ts +64 -0
- package/node_modules/bare-path/package.json +1 -1
- package/node_modules/bare-path/prebuilds/android-arm/bare-path.bare +0 -0
- package/node_modules/bare-path/prebuilds/android-arm64/bare-path.bare +0 -0
- package/node_modules/bare-path/prebuilds/android-ia32/bare-path.bare +0 -0
- package/node_modules/bare-path/prebuilds/android-x64/bare-path.bare +0 -0
- package/node_modules/bare-path/prebuilds/darwin-arm64/bare-path.bare +0 -0
- package/node_modules/bare-path/prebuilds/darwin-x64/bare-path.bare +0 -0
- package/node_modules/bare-path/prebuilds/ios-arm64/bare-path.bare +0 -0
- package/node_modules/bare-path/prebuilds/ios-arm64-simulator/bare-path.bare +0 -0
- package/node_modules/bare-path/prebuilds/ios-x64-simulator/bare-path.bare +0 -0
- package/node_modules/bare-path/prebuilds/linux-arm64/bare-path.bare +0 -0
- package/node_modules/bare-path/prebuilds/linux-x64/bare-path.bare +0 -0
- package/node_modules/bare-path/prebuilds/win32-arm64/bare-path.bare +0 -0
- package/node_modules/bare-path/prebuilds/win32-x64/bare-path.bare +0 -0
- package/node_modules/bare-url/CMakeLists.txt +5 -5
- package/node_modules/bare-url/package.json +2 -2
- package/node_modules/bare-url/prebuilds/android-arm/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/android-arm64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/android-ia32/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/android-x64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/darwin-arm64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/darwin-x64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/ios-arm64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/ios-arm64-simulator/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/ios-x64-simulator/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/linux-arm64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/linux-x64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/win32-arm64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/win32-x64/bare-url.bare +0 -0
- package/node_modules/io.appium.settings/CHANGELOG.md +14 -0
- package/node_modules/io.appium.settings/README.md +23 -0
- package/node_modules/io.appium.settings/apks/settings_apk-debug.apk +0 -0
- package/node_modules/io.appium.settings/build/lib/client.d.ts +3 -0
- package/node_modules/io.appium.settings/build/lib/client.d.ts.map +1 -1
- package/node_modules/io.appium.settings/build/lib/client.js +5 -0
- package/node_modules/io.appium.settings/build/lib/client.js.map +1 -1
- package/node_modules/io.appium.settings/build/lib/commands/accessibility.d.ts +25 -0
- package/node_modules/io.appium.settings/build/lib/commands/accessibility.d.ts.map +1 -0
- package/node_modules/io.appium.settings/build/lib/commands/accessibility.js +71 -0
- package/node_modules/io.appium.settings/build/lib/commands/accessibility.js.map +1 -0
- package/node_modules/io.appium.settings/build/lib/constants.d.ts +1 -0
- package/node_modules/io.appium.settings/build/lib/constants.d.ts.map +1 -1
- package/node_modules/io.appium.settings/build/lib/constants.js +1 -0
- package/node_modules/io.appium.settings/build/lib/constants.js.map +1 -1
- package/node_modules/io.appium.settings/lib/client.ts +7 -0
- package/node_modules/io.appium.settings/lib/commands/accessibility.ts +82 -0
- package/node_modules/io.appium.settings/lib/constants.ts +2 -0
- package/node_modules/io.appium.settings/package.json +3 -3
- package/package.json +4 -4
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { logger, util } from '@appium/support';
|
|
2
|
-
import { DEFAULT_BASE_PATH, MAX_LOG_BODY_LENGTH
|
|
2
|
+
import { DEFAULT_BASE_PATH, MAX_LOG_BODY_LENGTH } from '../constants.js';
|
|
3
3
|
import { errorFromW3CJsonCode, errors, getResponseForW3CError, isErrorType } from './errors.js';
|
|
4
|
-
import { ensureW3cResponse, formatResponseValue } from './helpers.js';
|
|
4
|
+
import { ensureW3cResponse, formatResponseValue, isProtocolResponseEnvelope } from './helpers.js';
|
|
5
5
|
import { preserveIdempotentSessionResponse } from './idempotency.js';
|
|
6
6
|
import { jsonParseErrors } from './json-parse-error.js';
|
|
7
7
|
import { checkParams, makeArgs, unwrapParams, wrapParams } from './params.js';
|
|
8
8
|
import { runWithProxyReq } from './proxy-context.js';
|
|
9
9
|
import { tryWdProxy } from './proxy.js';
|
|
10
10
|
import { CREATE_SESSION_COMMAND, DELETE_SESSION_COMMAND, METHOD_MAP } from './routes/index.js';
|
|
11
|
-
import {
|
|
11
|
+
import { getLogger, getSessionId, isSessionCommand } from './session.js';
|
|
12
12
|
import { getCommandValidator } from './validators.js';
|
|
13
13
|
export const deprecatedCommandsLogged = new Set();
|
|
14
14
|
/**
|
|
@@ -60,7 +60,6 @@ function buildHandler(app, method, path, spec, driver, isSessCmd) {
|
|
|
60
60
|
let httpStatus = 200;
|
|
61
61
|
let newSessionId;
|
|
62
62
|
const sessionId = getSessionId(driver, req);
|
|
63
|
-
let currentProtocol = extractProtocol(driver, sessionId);
|
|
64
63
|
try {
|
|
65
64
|
logDeprecationWarning(driver, method, path, spec, sessionId);
|
|
66
65
|
ensureSessionExists(driver, sessionId, isSessCmd);
|
|
@@ -95,9 +94,8 @@ function buildHandler(app, method, path, spec, driver, isSessCmd) {
|
|
|
95
94
|
// run the driver command wrapped inside the argument validators
|
|
96
95
|
getLogger(driver, sessionId).debug(`Calling %s.%s() with args: %s`, driver.constructor.name, command, logger.markSensitive(util.truncateString(JSON.stringify(args), { length: MAX_LOG_BODY_LENGTH })));
|
|
97
96
|
const result = didPluginOverrideProxy
|
|
98
|
-
? await runWithProxyReq(req, () => runDriverCommand(driver, command, args, sessionId
|
|
99
|
-
: await runDriverCommand(driver, command, args, sessionId
|
|
100
|
-
currentProtocol = result.currentProtocol;
|
|
97
|
+
? await runWithProxyReq(req, () => runDriverCommand(driver, command, args, sessionId))
|
|
98
|
+
: await runDriverCommand(driver, command, args, sessionId);
|
|
101
99
|
newSessionId = result.newSessionId;
|
|
102
100
|
httpResBody.value = result.driverRes;
|
|
103
101
|
getLogger(driver, sessionId || newSessionId).debug(`Responding ` +
|
|
@@ -106,14 +104,13 @@ function buildHandler(app, method, path, spec, driver, isSessCmd) {
|
|
|
106
104
|
})}`);
|
|
107
105
|
}
|
|
108
106
|
catch (err) {
|
|
109
|
-
currentProtocol = currentProtocol || extractProtocol(driver, sessionId || newSessionId);
|
|
110
107
|
[httpStatus, httpResBody] = buildErrorResponse(err, driver, sessionId || newSessionId);
|
|
111
108
|
}
|
|
112
109
|
if (newSessionId && abandonIfDisconnected?.()) {
|
|
113
110
|
await deleteAbandonedSession(driver, newSessionId);
|
|
114
111
|
}
|
|
115
112
|
else {
|
|
116
|
-
sendHandlerResponse(res, httpStatus, httpResBody, newSessionId
|
|
113
|
+
sendHandlerResponse(res, httpStatus, httpResBody, newSessionId);
|
|
117
114
|
}
|
|
118
115
|
return newSessionId;
|
|
119
116
|
};
|
|
@@ -236,28 +233,25 @@ function buildCommandArgs({ req, jsonObj, spec, command, validateCommandArgument
|
|
|
236
233
|
return args;
|
|
237
234
|
}
|
|
238
235
|
/**
|
|
239
|
-
* Runs the driver command and interprets its result:
|
|
240
|
-
*
|
|
241
|
-
* embedded in the result value.
|
|
236
|
+
* Runs the driver command and interprets its result: unpacks the createSession/deleteSession
|
|
237
|
+
* special cases, and raises W3C errors embedded in the result value.
|
|
242
238
|
*/
|
|
243
|
-
async function runDriverCommand(driver, command, args, sessionId
|
|
239
|
+
async function runDriverCommand(driver, command, args, sessionId) {
|
|
244
240
|
let driverRes = await driver.executeCommand(command, ...args);
|
|
245
|
-
//
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
// with a protocol and value/error property, re-assign the protocol
|
|
249
|
-
if (util.isPlainObject(driverRes) && Object.hasOwn(driverRes, 'protocol')) {
|
|
250
|
-
currentProtocol = driverRes.protocol || currentProtocol;
|
|
241
|
+
// A marked envelope, or `{protocol, error}` when `error` is an Error.
|
|
242
|
+
// `{protocol: 'W3C', value}` is command data.
|
|
243
|
+
if (isProtocolResponseEnvelope(driverRes)) {
|
|
251
244
|
if (driverRes.error) {
|
|
252
245
|
throw driverRes.error;
|
|
253
246
|
}
|
|
254
247
|
driverRes = driverRes.value;
|
|
255
248
|
}
|
|
249
|
+
// a protocol field on the unwrapped value means it is command data
|
|
250
|
+
const isProtocolData = util.isPlainObject(driverRes) && Object.hasOwn(driverRes, 'protocol');
|
|
256
251
|
let newSessionId;
|
|
257
252
|
// unpack createSession response
|
|
258
253
|
if (command === CREATE_SESSION_COMMAND) {
|
|
259
254
|
newSessionId = driverRes[0];
|
|
260
|
-
getLogger(driver, newSessionId).debug(`Cached the protocol value '${currentProtocol}' for the new session ${newSessionId}`);
|
|
261
255
|
driverRes = {
|
|
262
256
|
capabilities: driverRes[1],
|
|
263
257
|
};
|
|
@@ -271,10 +265,10 @@ async function runDriverCommand(driver, command, args, sessionId, currentProtoco
|
|
|
271
265
|
getLogger(driver, sessionId).debug('But deleting session, so not returning');
|
|
272
266
|
driverRes = null;
|
|
273
267
|
}
|
|
274
|
-
if (util.hasValue(driverRes) && util.isPlainObject(driverRes.value) && driverRes.value.error) {
|
|
268
|
+
if (!isProtocolData && util.hasValue(driverRes) && util.isPlainObject(driverRes.value) && driverRes.value.error) {
|
|
275
269
|
throw errorFromW3CJsonCode(driverRes.value.error, driverRes.value.message, driverRes.value.stacktrace, driverRes.value.data);
|
|
276
270
|
}
|
|
277
|
-
return { driverRes,
|
|
271
|
+
return { driverRes, newSessionId };
|
|
278
272
|
}
|
|
279
273
|
/**
|
|
280
274
|
* Normalizes a thrown value into an Error instance, warning when it wasn't one to begin with.
|
|
@@ -313,12 +307,13 @@ function buildErrorResponse(err, driver, sessionId) {
|
|
|
313
307
|
/**
|
|
314
308
|
* Writes the final HTTP response, either the pre-serialized string or the JSON body.
|
|
315
309
|
*/
|
|
316
|
-
function sendHandlerResponse(res, httpStatus, httpResBody, newSessionId
|
|
310
|
+
function sendHandlerResponse(res, httpStatus, httpResBody, newSessionId) {
|
|
317
311
|
if (typeof httpResBody === 'string') {
|
|
318
312
|
res.status(httpStatus).setHeader('content-type', 'application/json; charset=utf-8').send(httpResBody);
|
|
319
313
|
return;
|
|
320
314
|
}
|
|
321
|
-
|
|
315
|
+
// Appium 4 only writes W3C responses, so the new session id is always part of the body.
|
|
316
|
+
if (newSessionId && util.isPlainObject(httpResBody.value)) {
|
|
322
317
|
httpResBody.value.sessionId = newSessionId;
|
|
323
318
|
}
|
|
324
319
|
res.status(httpStatus).json(ensureW3cResponse(httpResBody));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-handler.js","sourceRoot":"","sources":["../../../lib/protocol/route-handler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"route-handler.js","sourceRoot":"","sources":["../../../lib/protocol/route-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAK7C,OAAO,EAAC,iBAAiB,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAC,oBAAoB,EAAE,MAAM,EAAE,sBAAsB,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AAC9F,OAAO,EAAC,iBAAiB,EAAE,mBAAmB,EAAE,0BAA0B,EAAC,MAAM,cAAc,CAAC;AAChG,OAAO,EAAC,iCAAiC,EAAC,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAC,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAC,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAC,UAAU,EAAC,MAAM,YAAY,CAAC;AACtC,OAAO,EAAC,sBAAsB,EAAE,sBAAsB,EAAE,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAC,SAAS,EAAE,YAAY,EAAE,gBAAgB,EAAC,MAAM,cAAc,CAAC;AACvE,OAAO,EAAC,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAEpD,MAAM,CAAC,MAAM,wBAAwB,GAAgB,IAAI,GAAG,EAAE,CAAC;AAe/D;;;GAGG;AACH,MAAM,UAAU,wBAAwB,CAAC,MAAiB;IACxD,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;IACrE,CAAC;IAED,IAAI,CAAC,CAAE,MAAc,CAAC,cAAc,IAAK,MAAc,CAAC,OAAO,CAAC,EAAE,CAAC;QACjE,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;IACjF,CAAC;IAED,4FAA4F;IAC5F,sFAAsF;IACtF,OAAO,SAAS,SAAS,CAAC,GAAG,EAAE,EAAC,QAAQ,GAAG,iBAAiB,EAAE,cAAc,GAAG,EAAE,EAAC,GAAG,EAAE;QACrF,sEAAsE;QACtE,6CAA6C;QAC7C,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAE3B,MAAM,UAAU,GAAsB,EAAC,GAAG,UAAU,EAAE,GAAG,cAAc,EAAC,CAAC;QACzE,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YACzD,qBAAqB,CAAC,GAAG,EAAE,GAAG,QAAQ,GAAG,IAAI,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QACpE,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,iFAAiF;AACjF,SAAS,qBAAqB,CAC5B,GAAY,EACZ,IAAY,EACZ,OAAkC,EAClC,MAAiB;IAEjB,IAAI,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,MAAM,IAAI,OAAO,CAAC,EAAE,CAAC;QACxC,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvD,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YAC3B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,GAAG,CAAC,cAAc,EAAE,iCAAiC,CAAC,CAAC,GAAG,EAAE,CAAC;QAC5G,CAAC,CAAC,CAAC;IACL,CAAC;IAED,uFAAuF;IACvF,sEAAsE;IACtE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,cAAc,GAAG;QACrB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,KAAK,MAAM,CAAC;QAClD,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,KAAK,MAAM,CAAC;KACnD,CAAC;IACF,KAAK,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,cAAc,EAAE,CAAC;QAC5C,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAC5E,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CACnB,GAAgB,EAChB,MAAc,EACd,IAAY,EACZ,IAA6B,EAC7B,MAAiB,EACjB,SAAkB;IAElB,MAAM,YAAY,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,qBAAqC,EAAE,EAAE;QAChG,IAAI,WAAW,GAAG,EAAS,CAAC;QAC5B,IAAI,UAAU,GAAG,GAAG,CAAC;QACrB,IAAI,YAAgC,CAAC;QACrC,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAE5C,IAAI,CAAC;YACH,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;YAC7D,mBAAmB,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;YAClD,MAAM,cAAc,GAAG,eAAe,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;YAC/D,IAAI,cAAc,EAAE,CAAC;gBACnB,MAAM,cAAc,CAAC;YACvB,CAAC;YACD,0BAA0B,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAEtC,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;YACpF,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;gBAC/B,OAAO;YACT,CAAC;YACD,MAAM,sBAAsB,GAAG,YAAY,KAAK,iBAAiB,CAAC;YAElE,yDAAyD;YACzD,qCAAqC;YACrC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClB,MAAM,IAAI,MAAM,CAAC,mBAAmB,EAAE,CAAC;YACzC,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YAE7B,8EAA8E;YAC9E,2EAA2E;YAC3E,MAAM,OAAO,GAAG,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE;gBAC7C,qBAAqB,EAAE,CAAC,sBAAsB;aAC/C,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,gBAAgB,CAAC;gBAC5B,GAAG;gBACH,OAAO;gBACP,IAAI;gBACJ,OAAO;gBACP,wBAAwB,EAAE,CAAC,sBAAsB;aAClD,CAAC,CAAC;YAEH,gEAAgE;YAChE,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,KAAK,CAChC,+BAA+B,EAC/B,MAAM,CAAC,WAAW,CAAC,IAAI,EACvB,OAAO,EACP,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAC,MAAM,EAAE,mBAAmB,EAAC,CAAC,CAAC,CAC/F,CAAC;YAEF,MAAM,MAAM,GAAG,sBAAsB;gBACnC,CAAC,CAAC,MAAM,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;gBACtF,CAAC,CAAC,MAAM,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;YAC7D,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;YACnC,WAAW,CAAC,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC;YAErC,SAAS,CAAC,MAAM,EAAE,SAAS,IAAI,YAAY,CAAC,CAAC,KAAK,CAChD,aAAa;gBACX,yBAAyB,OAAO,cAAc,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;oBAClG,MAAM,EAAE,mBAAmB;iBAC5B,CAAC,EAAE,CACP,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,IAAI,YAAY,CAAC,CAAC;QACzF,CAAC;QAED,IAAI,YAAY,IAAI,qBAAqB,EAAE,EAAE,EAAE,CAAC;YAC9C,MAAM,sBAAsB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QACrD,CAAC;aAAM,CAAC;YACN,mBAAmB,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,YAAY,CAAC;IACtB,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;QAC9D,MAAM,qBAAqB,GAAG,iCAAiC,CAAC,GAAG,CAAC,CAAC;QACrE,IAAI,qBAAqB,EAAE,CAAC;YAC1B,OAAO,MAAM,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,qBAAqB,CAAC,CAAC;QAC7D,CAAC;QACD,MAAM,cAAc,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAC/C,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAClD,MAAM,gBAAgB,GAAG,MAAM,cAAc,CAAC;QAC9C,IAAI,YAAY,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtC,MAAM,sBAAsB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QACrD,CAAC;IACH,CAAC,CAAC;IACF,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,KAAK,sBAAsB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,YAAY,CAAC;IAC3F,4BAA4B;IAC5B,MAAM,aAAa,GAAI,GAAqF,CAC1G,MAAM,CAAC,WAAW,EAAE,CACrB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACZ,aAAa,CAAC,IAAI,EAAE,CAAC,GAAY,EAAE,GAAa,EAAE,EAAE;QAClD,KAAK,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,kBAAkB,CAAC,GAAa;IACvC,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,EAAE;QACtC,IAAI,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YAC9B,OAAO;QACT,CAAC;QACD,sFAAsF;QACtF,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,GAAa;IACrC,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1B,OAAO,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,gBAAgB,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;AAChH,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,MAAyB,EAAE,SAAiB;IAChF,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAChD,UAAU,CAAC,IAAI,CAAC,gDAAgD,SAAS,eAAe,CAAC,CAAC;IAC1F,MAAM,IAAI,GAAG,CAAC,KAAc,EAAE,EAAE,CAC9B,UAAU,CAAC,IAAI,CACb,sCAAsC,SAAS,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAC7G,CAAC;IACJ,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAO,MAAkC,CAAC,cAAc,CACrE,sBAAsB,EACtB,SAAS,CACV,CAAC;QACF,IAAI,MAAM,EAAE,KAAK,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,GAAG,CAAC,CAAC;IACZ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,qBAAqB,CAC5B,MAAiB,EACjB,MAAc,EACd,IAAY,EACZ,IAA6B,EAC7B,SAA6B;IAE7B,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACnF,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3C,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,IAAI,CAC/B,OAAO,MAAM,IAAI,IAAI,gEAAgE;YACnF,0FAA0F;YAC1F,oFAAoF,CACvF,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,mBAAmB,CAAC,MAAiB,EAAE,SAA6B,EAAE,SAAkB;IAC/F,IAAI,SAAS,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;QAClD,MAAM,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;IACvC,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,0BAA0B,CAAC,GAAY,EAAE,IAA6B;IAC7E,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,IAAI,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC;QAC3D,OAAO;IACT,CAAC;IACD,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACnD,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;IACjF,MAAM,WAAW,GAAG,WAAW,KAAK,SAAS,IAAI,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC3E,IAAI,WAAW,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QACjD,MAAM,IAAI,MAAM,CAAC,oBAAoB,CAAC,yCAAyC,CAAC,CAAC;IACnF,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,GAAY,EAAE,IAA6B;IACrE,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,EAAC,IAAI,EAAC,GAAG,GAAG,CAAC;IACnB,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC;AAC3E,CAAC;AAED;;GAEG;AACH,SAAS,cAAc,CACrB,IAA6B,EAC7B,OAAY,EACZ,EAAC,qBAAqB,EAAmC;IAEzD,IAAI,IAAI,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC;QAC7B,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IACD,IAAI,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC;QAC/B,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACtD,CAAC;IACD,IAAI,IAAI,CAAC,aAAa,IAAI,qBAAqB,EAAE,CAAC;QAChD,WAAW,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAUD;;;;GAIG;AACH,SAAS,gBAAgB,CAAC,EAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,wBAAwB,EAAqB;IACnG,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC/C,IAAI,SAAS,IAAI,wBAAwB,EAAE,CAAC;QAC1C,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC;IACrB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAOD;;;GAGG;AACH,KAAK,UAAU,gBAAgB,CAC7B,MAAiB,EACjB,OAAe,EACf,IAAW,EACX,SAA6B;IAE7B,IAAI,SAAS,GAAQ,MAAO,MAA0B,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IAExF,sEAAsE;IACtE,8CAA8C;IAC9C,IAAI,0BAA0B,CAAC,SAAS,CAAC,EAAE,CAAC;QAC1C,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;YACpB,MAAM,SAAS,CAAC,KAAK,CAAC;QACxB,CAAC;QACD,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC;IAC9B,CAAC;IAED,mEAAmE;IACnE,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAE7F,IAAI,YAAgC,CAAC;IACrC,gCAAgC;IAChC,IAAI,OAAO,KAAK,sBAAsB,EAAE,CAAC;QACvC,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QAC5B,SAAS,GAAG;YACV,YAAY,EAAE,SAAS,CAAC,CAAC,CAAC;SAC3B,CAAC;IACJ,CAAC;IAED,SAAS,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAE3C,uDAAuD;IACvD,IAAI,OAAO,KAAK,sBAAsB,EAAE,CAAC;QACvC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,KAAK,CAChC,sBAAsB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE;YACnE,MAAM,EAAE,mBAAmB;SAC5B,CAAC,EAAE,CACL,CAAC;QACF,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC7E,SAAS,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAChH,MAAM,oBAAoB,CACxB,SAAS,CAAC,KAAK,CAAC,KAAK,EACrB,SAAS,CAAC,KAAK,CAAC,OAAO,EACvB,SAAS,CAAC,KAAK,CAAC,UAAU,EAC1B,SAAS,CAAC,KAAK,CAAC,IAAI,CACrB,CAAC;IACJ,CAAC;IAED,OAAO,EAAC,SAAS,EAAE,YAAY,EAAC,CAAC;AACnC,CAAC;AAED;;GAEG;AACH,SAAS,cAAc,CAAC,GAAY,EAAE,MAAiB,EAAE,SAA6B;IACpF,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;QACzB,OAAO,GAAG,CAAC;IACb,CAAC;IACD,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,CAAC;QAC5G,OAAO,GAAY,CAAC;IACtB,CAAC;IACD,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,IAAI,CAC/B,wFAAwF;QACtF,iDAAiD,CACpD,CAAC;IACF,OAAO,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;AAC7F,CAAC;AAED;;GAEG;AACH,SAAS,kBAAkB,CAAC,GAAY,EAAE,MAAiB,EAAE,SAA6B;IACxF,IAAI,SAAS,GAAG,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IAEvD,MAAM,UAAU,GAAI,SAA2C,CAAC,UAAU,CAAC;IAC3E,IAAI,MAAM,GAAG,UAAU,IAAI,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC;IACjD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;QACxC,qEAAqE;QACrE,uCAAuC;QACvC,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAChE,CAAC;IACD,IAAI,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACrD,SAAS,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC;IACzC,CAAC;SAAM,CAAC;QACN,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,KAAK,CAAC,+CAA+C,MAAM,EAAE,CAAC,CAAC;IAC9F,CAAC;IAED,OAAO,sBAAsB,CAAC,SAAS,CAAC,CAAC;AAC3C,CAAC;AAED;;GAEG;AACH,SAAS,mBAAmB,CAC1B,GAAa,EACb,UAAkB,EAClB,WAAgB,EAChB,YAAgC;IAEhC,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;QACpC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,cAAc,EAAE,iCAAiC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACtG,OAAO;IACT,CAAC;IACD,wFAAwF;IACxF,IAAI,YAAY,IAAI,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1D,WAAW,CAAC,KAAK,CAAC,SAAS,GAAG,YAAY,CAAC;IAC7C,CAAC;IACD,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC;AAC9D,CAAC"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import type { AppiumLogger, Core } from '@appium/types';
|
|
2
2
|
import type { Request } from 'express';
|
|
3
|
-
import { PROTOCOLS } from '../constants.js';
|
|
4
3
|
/**
|
|
5
4
|
* Extract and validate the sessionId from the Express route parameter.
|
|
6
5
|
* Express may return route params as string | string[] | undefined.
|
|
@@ -19,12 +18,6 @@ export declare function getSessionId(driver: Core<any>, req: Request): string |
|
|
|
19
18
|
* @returns Whether the command requires a session id in the URL
|
|
20
19
|
*/
|
|
21
20
|
export declare function isSessionCommand(command: string): boolean;
|
|
22
|
-
/**
|
|
23
|
-
* @param driver - Active driver, possibly an umbrella driver managing multiple sessions
|
|
24
|
-
* @param sessionId - Id of the session to resolve the protocol for
|
|
25
|
-
* @returns The active protocol for the given session
|
|
26
|
-
*/
|
|
27
|
-
export declare function extractProtocol(driver: Core<any>, sessionId?: string | null): keyof typeof PROTOCOLS;
|
|
28
21
|
/**
|
|
29
22
|
* @param driver - Active driver, possibly an umbrella driver managing multiple sessions
|
|
30
23
|
* @param sessionId - Id of the session to resolve the logger for
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../lib/protocol/session.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,YAAY,EAAE,IAAI,EAAC,MAAM,eAAe,CAAC;AACtD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../lib/protocol/session.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,YAAY,EAAE,IAAI,EAAC,MAAM,eAAe,CAAC;AACtD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAKrC;;;;;;;;;;;GAWG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAehF;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,SAAS,GAAE,MAAM,GAAG,IAAW,GAAG,YAAY,CAW1F"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { logger } from '@appium/support';
|
|
2
|
-
import { PROTOCOLS } from '../constants.js';
|
|
3
2
|
import { generateDriverLogPrefix } from '../helpers/log-prefix.js';
|
|
4
3
|
import { NO_SESSION_ID_COMMANDS } from './routes/index.js';
|
|
5
4
|
/**
|
|
@@ -35,22 +34,6 @@ export function getSessionId(driver, req) {
|
|
|
35
34
|
export function isSessionCommand(command) {
|
|
36
35
|
return !NO_SESSION_ID_COMMANDS.includes(command);
|
|
37
36
|
}
|
|
38
|
-
/**
|
|
39
|
-
* @param driver - Active driver, possibly an umbrella driver managing multiple sessions
|
|
40
|
-
* @param sessionId - Id of the session to resolve the protocol for
|
|
41
|
-
* @returns The active protocol for the given session
|
|
42
|
-
*/
|
|
43
|
-
export function extractProtocol(driver, sessionId = null) {
|
|
44
|
-
const dstDriver = typeof driver.driverForSession === 'function' && sessionId ? driver.driverForSession(sessionId) : driver;
|
|
45
|
-
if (dstDriver === driver) {
|
|
46
|
-
// Shortcircuit if the driver instance is not an umbrella driver
|
|
47
|
-
// or it is Fake driver instance, where `driver.driverForSession`
|
|
48
|
-
// always returns self instance
|
|
49
|
-
return driver.protocol ?? PROTOCOLS.W3C;
|
|
50
|
-
}
|
|
51
|
-
// Extract the protocol for the current session if the given driver is the umbrella one
|
|
52
|
-
return dstDriver?.protocol ?? PROTOCOLS.W3C;
|
|
53
|
-
}
|
|
54
37
|
/**
|
|
55
38
|
* @param driver - Active driver, possibly an umbrella driver managing multiple sessions
|
|
56
39
|
* @param sessionId - Id of the session to resolve the logger for
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../lib/protocol/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAIvC,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../lib/protocol/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAIvC,OAAO,EAAC,uBAAuB,EAAC,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAC,sBAAsB,EAAC,MAAM,mBAAmB,CAAC;AAEzD;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,YAAY,CAAC,MAAiB,EAAE,GAAY;IAC1D,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QACxC,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC1C,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,IAAI,CAC/B,yDAAyD,GAAG,CAAC,WAAW,IAAI;YAC1E,iHAAiH;YACjH,+CAA+C;YAC/C,0CAA0C,SAAS,IAAI;YACvD,wDAAwD,CAC3D,CAAC;QACF,iDAAiD;QACjD,GAAG,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;QACjC,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC;AAC9B,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAe;IAC9C,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACnD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,SAAS,CAAC,MAAiB,EAAE,YAA2B,IAAI;IAC1E,MAAM,SAAS,GACb,SAAS,IAAI,OAAO,MAAM,CAAC,gBAAgB,KAAK,UAAU;QACxD,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC;QAChD,CAAC,CAAC,MAAM,CAAC;IACb,IAAI,OAAO,SAAS,CAAC,GAAG,EAAE,IAAI,KAAK,UAAU,EAAE,CAAC;QAC9C,OAAO,SAAS,CAAC,GAAG,CAAC;IACvB,CAAC;IAED,MAAM,SAAS,GAAG,uBAAuB,CAAC,SAAS,CAAC,CAAC;IACrD,OAAO,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;AACrC,CAAC"}
|
|
@@ -6,10 +6,10 @@ import {HTTPStatusCodes} from '../helpers/http-status-codes.js';
|
|
|
6
6
|
const w3cLog = logger.getLogger('W3C');
|
|
7
7
|
|
|
8
8
|
class BaseError extends Error {
|
|
9
|
-
public cause: Error | undefined;
|
|
10
|
-
public message: string;
|
|
11
|
-
public name: string;
|
|
12
|
-
public stack: string | undefined;
|
|
9
|
+
public override cause: Error | undefined;
|
|
10
|
+
public override message: string;
|
|
11
|
+
public override name: string;
|
|
12
|
+
public override stack: string | undefined;
|
|
13
13
|
|
|
14
14
|
constructor(message: string = '', cause?: Error) {
|
|
15
15
|
super(message);
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import {util} from '@appium/support';
|
|
2
2
|
|
|
3
|
+
import {PROTOCOLS} from '../constants.js';
|
|
4
|
+
|
|
3
5
|
/**
|
|
4
6
|
* Preprocesses the resulting value for API responses.
|
|
5
7
|
* The argument value is NOT mutated.
|
|
@@ -28,3 +30,61 @@ export function ensureW3cResponse(responseBody: Record<string, unknown>): Record
|
|
|
28
30
|
delete result.sessionId;
|
|
29
31
|
return result;
|
|
30
32
|
}
|
|
33
|
+
|
|
34
|
+
/** Shared by every copy of this package. Enumerable so a spread or `Object.assign` clone keeps it. */
|
|
35
|
+
const RESPONSE_ENVELOPE = Symbol.for('appium.responseEnvelope');
|
|
36
|
+
|
|
37
|
+
/** Frozen objects cannot take the symbol. This copy still remembers them. */
|
|
38
|
+
const responseEnvelopes = new WeakSet<object>();
|
|
39
|
+
|
|
40
|
+
type ProtocolResponse = {
|
|
41
|
+
protocol?: typeof PROTOCOLS.W3C | typeof PROTOCOLS.MJSONWP | null;
|
|
42
|
+
value?: unknown;
|
|
43
|
+
error?: unknown;
|
|
44
|
+
};
|
|
45
|
+
|
|
46
|
+
/**
|
|
47
|
+
* Marks a response Appium built. A command result such as `{protocol: 'W3C', value: 5}` is not marked.
|
|
48
|
+
* Only Appium's umbrella driver calls this. A driver returns the value or throws.
|
|
49
|
+
* The mark is visible to another copy of this package, and to a spread or `Object.assign` clone.
|
|
50
|
+
* A frozen object is remembered only by this copy.
|
|
51
|
+
*
|
|
52
|
+
* @param envelope - Response object Appium just built
|
|
53
|
+
* @returns The same object
|
|
54
|
+
*/
|
|
55
|
+
export function markResponseEnvelope<T extends object>(envelope: T): T {
|
|
56
|
+
responseEnvelopes.add(envelope);
|
|
57
|
+
try {
|
|
58
|
+
Object.defineProperty(envelope, RESPONSE_ENVELOPE, {
|
|
59
|
+
value: true,
|
|
60
|
+
enumerable: true,
|
|
61
|
+
});
|
|
62
|
+
} catch {
|
|
63
|
+
// frozen or sealed
|
|
64
|
+
}
|
|
65
|
+
return envelope;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
* Whether `value` is a driver response envelope rather than command data.
|
|
70
|
+
* Marked responses qualify, as does `{protocol, error}` when `protocol` is `W3C` or `MJSONWP`
|
|
71
|
+
* and `error` is an Error.
|
|
72
|
+
* `{protocol: 'W3C', value: 5}` is command data.
|
|
73
|
+
*
|
|
74
|
+
* @param value - Command result or already wrapped handler result
|
|
75
|
+
* @returns `true` when the caller should read `value` / `error` instead of returning the object
|
|
76
|
+
*/
|
|
77
|
+
export function isProtocolResponseEnvelope(value: unknown): value is ProtocolResponse {
|
|
78
|
+
if (!util.isPlainObject(value)) {
|
|
79
|
+
return false;
|
|
80
|
+
}
|
|
81
|
+
const marker = Object.getOwnPropertyDescriptor(value, RESPONSE_ENVELOPE);
|
|
82
|
+
if (responseEnvelopes.has(value) || marker?.value === true) {
|
|
83
|
+
return true;
|
|
84
|
+
}
|
|
85
|
+
if (!(value.error instanceof Error)) {
|
|
86
|
+
return false;
|
|
87
|
+
}
|
|
88
|
+
const protocol = value.protocol;
|
|
89
|
+
return protocol === PROTOCOLS.W3C || protocol === PROTOCOLS.MJSONWP;
|
|
90
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export {BIDI_COMMANDS} from './bidi-commands/index.js';
|
|
2
2
|
export {errorFromW3CJsonCode, errors, getResponseForW3CError, isErrorType} from './errors.js';
|
|
3
|
+
export {isProtocolResponseEnvelope, markResponseEnvelope} from './helpers.js';
|
|
3
4
|
export {handleIdempotency} from './idempotency.js';
|
|
4
5
|
export {JsonParseErrors, jsonParseErrors} from './json-parse-error.js';
|
|
5
6
|
export {checkParams, makeArgs, validateExecuteMethodParams} from './params.js';
|
|
@@ -3,16 +3,16 @@ import type {Constraints, Core, Driver, DriverMethodDef, ExternalDriver, MethodM
|
|
|
3
3
|
import type {Application, Express, Request, Response} from 'express';
|
|
4
4
|
|
|
5
5
|
import type {BaseDriver} from '../basedriver/driver.js';
|
|
6
|
-
import {DEFAULT_BASE_PATH, MAX_LOG_BODY_LENGTH
|
|
6
|
+
import {DEFAULT_BASE_PATH, MAX_LOG_BODY_LENGTH} from '../constants.js';
|
|
7
7
|
import {errorFromW3CJsonCode, errors, getResponseForW3CError, isErrorType} from './errors.js';
|
|
8
|
-
import {ensureW3cResponse, formatResponseValue} from './helpers.js';
|
|
8
|
+
import {ensureW3cResponse, formatResponseValue, isProtocolResponseEnvelope} from './helpers.js';
|
|
9
9
|
import {preserveIdempotentSessionResponse} from './idempotency.js';
|
|
10
10
|
import {jsonParseErrors} from './json-parse-error.js';
|
|
11
11
|
import {checkParams, makeArgs, unwrapParams, wrapParams} from './params.js';
|
|
12
12
|
import {runWithProxyReq} from './proxy-context.js';
|
|
13
13
|
import {tryWdProxy} from './proxy.js';
|
|
14
14
|
import {CREATE_SESSION_COMMAND, DELETE_SESSION_COMMAND, METHOD_MAP} from './routes/index.js';
|
|
15
|
-
import {
|
|
15
|
+
import {getLogger, getSessionId, isSessionCommand} from './session.js';
|
|
16
16
|
import {getCommandValidator} from './validators.js';
|
|
17
17
|
|
|
18
18
|
export const deprecatedCommandsLogged: Set<string> = new Set();
|
|
@@ -97,7 +97,6 @@ function buildHandler(
|
|
|
97
97
|
let httpStatus = 200;
|
|
98
98
|
let newSessionId: string | undefined;
|
|
99
99
|
const sessionId = getSessionId(driver, req);
|
|
100
|
-
let currentProtocol = extractProtocol(driver, sessionId);
|
|
101
100
|
|
|
102
101
|
try {
|
|
103
102
|
logDeprecationWarning(driver, method, path, spec, sessionId);
|
|
@@ -143,9 +142,8 @@ function buildHandler(
|
|
|
143
142
|
);
|
|
144
143
|
|
|
145
144
|
const result = didPluginOverrideProxy
|
|
146
|
-
? await runWithProxyReq(req, () => runDriverCommand(driver, command, args, sessionId
|
|
147
|
-
: await runDriverCommand(driver, command, args, sessionId
|
|
148
|
-
currentProtocol = result.currentProtocol;
|
|
145
|
+
? await runWithProxyReq(req, () => runDriverCommand(driver, command, args, sessionId))
|
|
146
|
+
: await runDriverCommand(driver, command, args, sessionId);
|
|
149
147
|
newSessionId = result.newSessionId;
|
|
150
148
|
httpResBody.value = result.driverRes;
|
|
151
149
|
|
|
@@ -156,14 +154,13 @@ function buildHandler(
|
|
|
156
154
|
})}`,
|
|
157
155
|
);
|
|
158
156
|
} catch (err) {
|
|
159
|
-
currentProtocol = currentProtocol || extractProtocol(driver, sessionId || newSessionId);
|
|
160
157
|
[httpStatus, httpResBody] = buildErrorResponse(err, driver, sessionId || newSessionId);
|
|
161
158
|
}
|
|
162
159
|
|
|
163
160
|
if (newSessionId && abandonIfDisconnected?.()) {
|
|
164
161
|
await deleteAbandonedSession(driver, newSessionId);
|
|
165
162
|
} else {
|
|
166
|
-
sendHandlerResponse(res, httpStatus, httpResBody, newSessionId
|
|
163
|
+
sendHandlerResponse(res, httpStatus, httpResBody, newSessionId);
|
|
167
164
|
}
|
|
168
165
|
return newSessionId;
|
|
169
166
|
};
|
|
@@ -325,44 +322,37 @@ function buildCommandArgs({req, jsonObj, spec, command, validateCommandArguments
|
|
|
325
322
|
|
|
326
323
|
interface DriverCommandResult {
|
|
327
324
|
driverRes: any;
|
|
328
|
-
currentProtocol: keyof typeof PROTOCOLS;
|
|
329
325
|
newSessionId?: string;
|
|
330
326
|
}
|
|
331
327
|
|
|
332
328
|
/**
|
|
333
|
-
* Runs the driver command and interprets its result:
|
|
334
|
-
*
|
|
335
|
-
* embedded in the result value.
|
|
329
|
+
* Runs the driver command and interprets its result: unpacks the createSession/deleteSession
|
|
330
|
+
* special cases, and raises W3C errors embedded in the result value.
|
|
336
331
|
*/
|
|
337
332
|
async function runDriverCommand(
|
|
338
333
|
driver: Core<any>,
|
|
339
334
|
command: string,
|
|
340
335
|
args: any[],
|
|
341
336
|
sessionId: string | undefined,
|
|
342
|
-
currentProtocol: keyof typeof PROTOCOLS,
|
|
343
337
|
): Promise<DriverCommandResult> {
|
|
344
338
|
let driverRes: any = await (driver as BaseDriver<any>).executeCommand(command, ...args);
|
|
345
339
|
|
|
346
|
-
//
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
// If `executeCommand` was overridden and the method returns an object
|
|
350
|
-
// with a protocol and value/error property, re-assign the protocol
|
|
351
|
-
if (util.isPlainObject(driverRes) && Object.hasOwn(driverRes, 'protocol')) {
|
|
352
|
-
currentProtocol = (driverRes as {protocol?: keyof typeof PROTOCOLS}).protocol || currentProtocol;
|
|
340
|
+
// A marked envelope, or `{protocol, error}` when `error` is an Error.
|
|
341
|
+
// `{protocol: 'W3C', value}` is command data.
|
|
342
|
+
if (isProtocolResponseEnvelope(driverRes)) {
|
|
353
343
|
if (driverRes.error) {
|
|
354
344
|
throw driverRes.error;
|
|
355
345
|
}
|
|
356
346
|
driverRes = driverRes.value;
|
|
357
347
|
}
|
|
358
348
|
|
|
349
|
+
// a protocol field on the unwrapped value means it is command data
|
|
350
|
+
const isProtocolData = util.isPlainObject(driverRes) && Object.hasOwn(driverRes, 'protocol');
|
|
351
|
+
|
|
359
352
|
let newSessionId: string | undefined;
|
|
360
353
|
// unpack createSession response
|
|
361
354
|
if (command === CREATE_SESSION_COMMAND) {
|
|
362
355
|
newSessionId = driverRes[0];
|
|
363
|
-
getLogger(driver, newSessionId).debug(
|
|
364
|
-
`Cached the protocol value '${currentProtocol}' for the new session ${newSessionId}`,
|
|
365
|
-
);
|
|
366
356
|
driverRes = {
|
|
367
357
|
capabilities: driverRes[1],
|
|
368
358
|
};
|
|
@@ -381,7 +371,7 @@ async function runDriverCommand(
|
|
|
381
371
|
driverRes = null;
|
|
382
372
|
}
|
|
383
373
|
|
|
384
|
-
if (util.hasValue(driverRes) && util.isPlainObject(driverRes.value) && driverRes.value.error) {
|
|
374
|
+
if (!isProtocolData && util.hasValue(driverRes) && util.isPlainObject(driverRes.value) && driverRes.value.error) {
|
|
385
375
|
throw errorFromW3CJsonCode(
|
|
386
376
|
driverRes.value.error,
|
|
387
377
|
driverRes.value.message,
|
|
@@ -390,7 +380,7 @@ async function runDriverCommand(
|
|
|
390
380
|
);
|
|
391
381
|
}
|
|
392
382
|
|
|
393
|
-
return {driverRes,
|
|
383
|
+
return {driverRes, newSessionId};
|
|
394
384
|
}
|
|
395
385
|
|
|
396
386
|
/**
|
|
@@ -440,13 +430,13 @@ function sendHandlerResponse(
|
|
|
440
430
|
httpStatus: number,
|
|
441
431
|
httpResBody: any,
|
|
442
432
|
newSessionId: string | undefined,
|
|
443
|
-
currentProtocol: keyof typeof PROTOCOLS,
|
|
444
433
|
): void {
|
|
445
434
|
if (typeof httpResBody === 'string') {
|
|
446
435
|
res.status(httpStatus).setHeader('content-type', 'application/json; charset=utf-8').send(httpResBody);
|
|
447
436
|
return;
|
|
448
437
|
}
|
|
449
|
-
|
|
438
|
+
// Appium 4 only writes W3C responses, so the new session id is always part of the body.
|
|
439
|
+
if (newSessionId && util.isPlainObject(httpResBody.value)) {
|
|
450
440
|
httpResBody.value.sessionId = newSessionId;
|
|
451
441
|
}
|
|
452
442
|
res.status(httpStatus).json(ensureW3cResponse(httpResBody));
|
|
@@ -2,7 +2,6 @@ import {logger} from '@appium/support';
|
|
|
2
2
|
import type {AppiumLogger, Core} from '@appium/types';
|
|
3
3
|
import type {Request} from 'express';
|
|
4
4
|
|
|
5
|
-
import {PROTOCOLS} from '../constants.js';
|
|
6
5
|
import {generateDriverLogPrefix} from '../helpers/log-prefix.js';
|
|
7
6
|
import {NO_SESSION_ID_COMMANDS} from './routes/index.js';
|
|
8
7
|
|
|
@@ -43,25 +42,6 @@ export function isSessionCommand(command: string): boolean {
|
|
|
43
42
|
return !NO_SESSION_ID_COMMANDS.includes(command);
|
|
44
43
|
}
|
|
45
44
|
|
|
46
|
-
/**
|
|
47
|
-
* @param driver - Active driver, possibly an umbrella driver managing multiple sessions
|
|
48
|
-
* @param sessionId - Id of the session to resolve the protocol for
|
|
49
|
-
* @returns The active protocol for the given session
|
|
50
|
-
*/
|
|
51
|
-
export function extractProtocol(driver: Core<any>, sessionId: string | null = null): keyof typeof PROTOCOLS {
|
|
52
|
-
const dstDriver =
|
|
53
|
-
typeof driver.driverForSession === 'function' && sessionId ? driver.driverForSession(sessionId) : driver;
|
|
54
|
-
if (dstDriver === driver) {
|
|
55
|
-
// Shortcircuit if the driver instance is not an umbrella driver
|
|
56
|
-
// or it is Fake driver instance, where `driver.driverForSession`
|
|
57
|
-
// always returns self instance
|
|
58
|
-
return driver.protocol ?? PROTOCOLS.W3C;
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
// Extract the protocol for the current session if the given driver is the umbrella one
|
|
62
|
-
return dstDriver?.protocol ?? PROTOCOLS.W3C;
|
|
63
|
-
}
|
|
64
|
-
|
|
65
45
|
/**
|
|
66
46
|
* @param driver - Active driver, possibly an umbrella driver managing multiple sessions
|
|
67
47
|
* @param sessionId - Id of the session to resolve the logger for
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appium/base-driver",
|
|
3
|
-
"version": "11.0.0-beta.
|
|
4
|
-
"gitHead": "
|
|
3
|
+
"version": "11.0.0-beta.7",
|
|
4
|
+
"gitHead": "8fead4e46c638a9d52334127fcaa20496d9b690e",
|
|
5
5
|
"description": "Base driver class for Appium drivers",
|
|
6
6
|
"keywords": [
|
|
7
7
|
"android",
|
|
@@ -53,9 +53,9 @@
|
|
|
53
53
|
"test:types": "tsd"
|
|
54
54
|
},
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"@appium/support": "^8.0.0-beta.
|
|
57
|
-
"@appium/types": "
|
|
58
|
-
"asyncbox": "^6.
|
|
56
|
+
"@appium/support": "^8.0.0-beta.7",
|
|
57
|
+
"@appium/types": "^2.0.0-beta.6",
|
|
58
|
+
"asyncbox": "^6.6.0",
|
|
59
59
|
"axios": "^1.20.0",
|
|
60
60
|
"lru-cache": "^11.5.2",
|
|
61
61
|
"path-to-regexp": "^8.4.2",
|
|
@@ -67,6 +67,27 @@ export declare const AppiumConfigJsonSchema: {
|
|
|
67
67
|
readonly title: "base-path config";
|
|
68
68
|
readonly type: "string";
|
|
69
69
|
};
|
|
70
|
+
readonly 'bidi-heartbeat-interval': {
|
|
71
|
+
readonly default: 15;
|
|
72
|
+
readonly description: "Number of seconds between WebSocket ping frames sent to each BiDi client. A connection that misses two consecutive pongs is terminated. A value of 0 disables the heartbeat.";
|
|
73
|
+
readonly minimum: 0;
|
|
74
|
+
readonly title: "bidi-heartbeat-interval config";
|
|
75
|
+
readonly type: "integer";
|
|
76
|
+
};
|
|
77
|
+
readonly 'bidi-max-buffered-bytes': {
|
|
78
|
+
readonly default: 33554432;
|
|
79
|
+
readonly description: "Maximum number of bytes the server may keep buffered for a single BiDi connection that is not reading fast enough. A connection that stays above this limit for longer than \"bidi-max-buffered-ms\" (or exceeds twice the limit) is closed with the code 1013. A value of 0 disables the limit, as well as skipping of droppable events.";
|
|
80
|
+
readonly minimum: 0;
|
|
81
|
+
readonly title: "bidi-max-buffered-bytes config";
|
|
82
|
+
readonly type: "integer";
|
|
83
|
+
};
|
|
84
|
+
readonly 'bidi-max-buffered-ms': {
|
|
85
|
+
readonly default: 30000;
|
|
86
|
+
readonly description: "Number of milliseconds a BiDi connection may stay above \"bidi-max-buffered-bytes\" before it is closed. A value of 0 closes the connection as soon as the limit is exceeded.";
|
|
87
|
+
readonly minimum: 0;
|
|
88
|
+
readonly title: "bidi-max-buffered-ms config";
|
|
89
|
+
readonly type: "integer";
|
|
90
|
+
};
|
|
70
91
|
readonly 'default-capabilities': {
|
|
71
92
|
readonly $comment: "TODO";
|
|
72
93
|
readonly appiumCliAliases: readonly ["dc"];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appium-config-schema.d.ts","sourceRoot":"","sources":["../../lib/appium-config-schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAE7C;;;;GAIG;AAEH,eAAO,MAAM,sBAAsB
|
|
1
|
+
{"version":3,"file":"appium-config-schema.d.ts","sourceRoot":"","sources":["../../lib/appium-config-schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAE7C;;;;GAIG;AAEH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yCAoHP,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yCAwH3B,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgN7C,CAAC"}
|
|
@@ -67,6 +67,27 @@ export const AppiumConfigJsonSchema = {
|
|
|
67
67
|
title: 'base-path config',
|
|
68
68
|
type: 'string',
|
|
69
69
|
},
|
|
70
|
+
'bidi-heartbeat-interval': {
|
|
71
|
+
default: 15,
|
|
72
|
+
description: 'Number of seconds between WebSocket ping frames sent to each BiDi client. A connection that misses two consecutive pongs is terminated. A value of 0 disables the heartbeat.',
|
|
73
|
+
minimum: 0,
|
|
74
|
+
title: 'bidi-heartbeat-interval config',
|
|
75
|
+
type: 'integer',
|
|
76
|
+
},
|
|
77
|
+
'bidi-max-buffered-bytes': {
|
|
78
|
+
default: 33554432,
|
|
79
|
+
description: 'Maximum number of bytes the server may keep buffered for a single BiDi connection that is not reading fast enough. A connection that stays above this limit for longer than "bidi-max-buffered-ms" (or exceeds twice the limit) is closed with the code 1013. A value of 0 disables the limit, as well as skipping of droppable events.',
|
|
80
|
+
minimum: 0,
|
|
81
|
+
title: 'bidi-max-buffered-bytes config',
|
|
82
|
+
type: 'integer',
|
|
83
|
+
},
|
|
84
|
+
'bidi-max-buffered-ms': {
|
|
85
|
+
default: 30000,
|
|
86
|
+
description: 'Number of milliseconds a BiDi connection may stay above "bidi-max-buffered-bytes" before it is closed. A value of 0 closes the connection as soon as the limit is exceeded.',
|
|
87
|
+
minimum: 0,
|
|
88
|
+
title: 'bidi-max-buffered-ms config',
|
|
89
|
+
type: 'integer',
|
|
90
|
+
},
|
|
70
91
|
'default-capabilities': {
|
|
71
92
|
$comment: 'TODO',
|
|
72
93
|
appiumCliAliases: ['dc'],
|