@appium/base-driver 8.1.2 → 8.2.3

package/lib/protocol/protocol.js

@@ -2,7 +2,7 @@ import _ from 'lodash';
 import { util } from '@appium/support';
 import { validators } from './validators';
 import {
-  errors, isErrorType, getResponseForW3CError, getResponseForJsonwpError,
+  errors, isErrorType, getResponseForW3CError,
   errorFromMJSONWPStatusCode, errorFromW3CJsonCode,
 } from './errors';
 import { METHOD_MAP, NO_SESSION_ID_COMMANDS } from './routes';
@@ -16,6 +16,7 @@ import SESSIONS_CACHE from './sessions-cache';
 
 const CREATE_SESSION_COMMAND = 'createSession';
 const DELETE_SESSION_COMMAND = 'deleteSession';
+const GET_STATUS_COMMAND = 'getStatus';
 
 class Protocol {}
 
@@ -239,9 +240,17 @@ function buildHandler (app, method, path, spec, driver, isSessCmd) {
       // this command should never be proxied (which is useful for plugin developers who add
       // commands and generally would not want that command to be proxied instead of handled by the
       // plugin)
+      let didPluginOverrideProxy = false;
       if (isSessCmd && !spec.neverProxy && driverShouldDoJwpProxy(driver, req, spec.command)) {
-        await doJwpProxy(driver, req, res);
-        return;
+        if (!driver.pluginsToHandleCmd ||
+            driver.pluginsToHandleCmd(spec.command, req.params.sessionId).length === 0) {
+          await doJwpProxy(driver, req, res);
+          return;
+        }
+        SESSIONS_CACHE.getLogger(req.params.sessionId, currentProtocol).debug(`Would have proxied ` +
+          `command directly, but a plugin exists which might require its value, so will let ` +
+          `its value be collected internally and made part of plugin chain`);
+        didPluginOverrideProxy = true;
       }
 
       // if a command is not in our method map, it's because we
@@ -283,12 +292,15 @@ function buildHandler (app, method, path, spec, driver, isSessCmd) {
         `${driver.constructor.name}.${spec.command}() with args: ` +
         _.truncate(JSON.stringify(args), {length: MAX_LOG_BODY_LENGTH}));
 
-      if (driver.executeCommand) {
-        driverRes = await driver.executeCommand(spec.command, ...args);
-      } else {
-        driverRes = await driver.execute(spec.command, ...args);
+      if (didPluginOverrideProxy) {
+        // TODO for now we add this information on the args list, but that's mixing purposes here.
+        // We really should add another 'options' parameter to 'executeCommand', but this would be
+        // a breaking change for all drivers so would need to be handled carefully.
+        args.push({reqForProxy: req});
       }
 
+      driverRes = await driver.executeCommand(spec.command, ...args);
+
       // Get the protocol after executeCommand
       currentProtocol = extractProtocol(driver, req.params.sessionId) || currentProtocol;
 
@@ -366,24 +378,7 @@ function buildHandler (app, method, path, spec, driver, isSessCmd) {
           .debug(`Encountered internal error running command: ${errMsg}`);
       }
 
-      if (currentProtocol === PROTOCOLS.W3C) {
-        [httpStatus, httpResBody] = getResponseForW3CError(actualErr);
-      } else if (currentProtocol === PROTOCOLS.MJSONWP) {
-        [httpStatus, httpResBody] = getResponseForJsonwpError(actualErr);
-      } else {
-        // If it's unknown what the protocol is (like if it's `getStatus` prior to `createSession`), merge the responses
-        // together to be protocol-agnostic
-        let jsonwpRes = getResponseForJsonwpError(actualErr);
-        let w3cRes = getResponseForW3CError(actualErr);
-
-        httpResBody = {
-          ...jsonwpRes[1],
-          ...w3cRes[1],
-        };
-
-        // Use the JSONWP status code (which is usually 500)
-        httpStatus = jsonwpRes[0];
-      }
+      [httpStatus, httpResBody] = getResponseForW3CError(actualErr);
     }
 
     // decode the response, which is either a string or json
@@ -404,7 +399,7 @@ function buildHandler (app, method, path, spec, driver, isSessCmd) {
         delete httpResBody.sessionId;
       }
 
-      httpResBody = formatStatus(httpResBody, httpStatus, currentProtocol);
+      httpResBody = formatStatus(httpResBody);
       res.status(httpStatus).json(httpResBody);
     }
   };
@@ -422,7 +417,7 @@ function driverShouldDoJwpProxy (driver, req, command) {
 
   // we should never proxy deleteSession because we need to give the containing
   // driver an opportunity to clean itself up
-  if (command === 'deleteSession') {
+  if (command === DELETE_SESSION_COMMAND) {
     return false;
   }
 
@@ -441,11 +436,10 @@ async function doJwpProxy (driver, req, res) {
 
   // check that the inner driver has a proxy function
   if (!driver.canProxy(req.params.sessionId)) {
-    throw new Error('Trying to proxy to a JSONWP server but driver is unable to proxy');
+    throw new Error('Trying to proxy to a server but the driver is unable to proxy');
   }
   try {
-    const proxiedRes = await driver.executeCommand('proxyReqRes', req, res, req.params.sessionId);
-    if (proxiedRes && proxiedRes.error) throw proxiedRes.error; // eslint-disable-line curly
+    await driver.executeCommand('proxyReqRes', req, res, req.params.sessionId);
   } catch (err) {
     if (isErrorType(err, errors.ProxyRequestError)) {
       throw err;
@@ -458,5 +452,6 @@ async function doJwpProxy (driver, req, res) {
 
 export {
   Protocol, routeConfiguringFunction, isSessionCommand,
-  driverShouldDoJwpProxy, determineProtocol
+  driverShouldDoJwpProxy, determineProtocol, CREATE_SESSION_COMMAND,
+  DELETE_SESSION_COMMAND, GET_STATUS_COMMAND,
 };

package/lib/protocol/routes.js

@@ -575,9 +575,6 @@ const METHOD_MAP = {
   '/session/:sessionId/appium/receive_async_response': {
     POST: {command: 'receiveAsyncResponse', payloadParams: {required: ['response']}}
   },
-  '/session/:sessionId/appium/execute_driver': {
-    POST: {command: 'executeDriverScript', payloadParams: {required: ['script'], optional: ['type', 'timeout']}}
-  },
   '/session/:sessionId/appium/events': {
     POST: {command: 'getLogEvents', payloadParams: {optional: ['type']}}
   },

package/package.json

@@ -11,7 +11,7 @@
     "firefoxos",
     "testing"
   ],
-  "version": "8.1.2",
+  "version": "8.2.3",
   "author": "https://github.com/appium",
   "license": "Apache-2.0",
   "repository": {
@@ -25,7 +25,6 @@
     "node": ">=12",
     "npm": ">=6"
   },
-  "main": "./build/index.js",
   "directories": {
     "lib": "lib"
   },
@@ -36,20 +35,18 @@
     "static",
     "test/basedriver",
     "!test/basedriver/fixtures",
-    "build/index.js",
-    "build/lib",
-    "build/test/basedriver",
+    "build",
     "!build/test/basedriver/fixtures"
   ],
   "dependencies": {
-    "@appium/support": "^2.55.0",
-    "@babel/runtime": "7.16.0",
+    "@appium/support": "^2.55.3",
+    "@babel/runtime": "7.16.3",
+    "@dabh/colors": "1.4.0",
     "async-lock": "1.3.0",
     "asyncbox": "2.9.2",
     "axios": "0.24.0",
     "bluebird": "3.7.2",
     "body-parser": "1.19.0",
-    "colors": "1.4.0",
     "es6-error": "4.1.1",
     "express": "4.17.1",
     "http-status-codes": "2.1.4",
@@ -58,18 +55,13 @@
     "method-override": "3.0.0",
     "morgan": "1.10.0",
     "serve-favicon": "2.5.0",
-    "source-map-support": "0.5.20",
+    "source-map-support": "0.5.21",
     "validate.js": "0.13.1",
-    "webdriverio": "6.12.1",
-    "ws": "7.5.5"
-  },
-  "devDependencies": {
-    "@appium/eslint-config-appium": "^4.7.3",
-    "@appium/gulp-plugins": "^5.5.4"
+    "ws": "7.5.6"
   },
   "publishConfig": {
     "access": "public"
   },
   "homepage": "https://appium.io",
-  "gitHead": "71357e52e1b6211241975ca349411f2df92628fc"
+  "gitHead": "ca90a11813546ab4851e5b1f0406f420a53227e6"
 }

package/test/basedriver/capability-specs.js

@@ -1,4 +1,4 @@
-import { default as BaseDriver, errors } from '../..';
+import { default as BaseDriver, errors } from '../../lib';
 import logger from '../../lib/basedriver/logger';
 import sinon from 'sinon';
 

package/test/basedriver/commands/event-specs.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { BaseDriver } from '../../..';
+import { BaseDriver } from '../../../lib';
 
 
 

package/test/basedriver/driver-e2e-specs.js

@@ -1,6 +1,6 @@
 // transpile:mocha
 
-import BaseDriver from '../..';
+import BaseDriver from '../../lib';
 import baseDriverE2ETests from './driver-e2e-tests';
 baseDriverE2ETests(BaseDriver, {
   platformName: 'iOS',

package/test/basedriver/driver-e2e-tests.js

@@ -1,8 +1,5 @@
 import _ from 'lodash';
-import { BaseDriver, server, routeConfiguringFunction, DeviceSettings, errors } from '../..';
-import {
-  MJSONWP_ELEMENT_KEY, W3C_ELEMENT_KEY
-} from '../../lib/constants';
+import { BaseDriver, server, routeConfiguringFunction, DeviceSettings } from '../../lib';
 import axios from 'axios';
 import B from 'bluebird';
 import {TEST_HOST, getTestPort, createAppiumURL, METHODS} from '../helpers';
@@ -339,181 +336,6 @@ function baseDriverE2ETests (DriverClass, defaultCaps = {}) {
       });
     });
 
-    describe('execute driver script', function () {
-      // mock some methods on BaseDriver that aren't normally there except in
-      // a fully blown driver
-      let originalFindElement, sessionId;
-      before(function () {
-        d.allowInsecure = ['execute_driver_script'];
-        originalFindElement = d.findElement;
-        d.findElement = (function (strategy, selector) {
-          if (strategy === 'accessibility id' && selector === 'amazing') {
-            return {[W3C_ELEMENT_KEY]: 'element-id-1'};
-          }
-
-          throw new errors.NoSuchElementError('not found');
-        }).bind(d);
-      });
-
-      beforeEach(async function () {
-        ({sessionId} = await startSession(defaultCaps));
-      });
-
-      after(function () {
-        d.findElement = originalFindElement;
-      });
-
-      afterEach(async function () {
-        await endSession(sessionId);
-      });
-
-      it('should not work unless the allowInsecure feature flag is set', async function () {
-        d._allowInsecure = d.allowInsecure;
-        try {
-          d.allowInsecure = [];
-          const script = `return 'foo'`;
-          await axios({
-            url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-            method: POST,
-            data: {script, type: 'wd'},
-          }).should.eventually.be.rejected;
-          await endSession(sessionId);
-        } finally {
-          d.allowInsecure = d._allowInsecure;
-        }
-      });
-
-      it('should execute a webdriverio script in the context of session', async function () {
-        const script = `
-          const timeouts = await driver.getTimeouts();
-          const status = await driver.status();
-          return [timeouts, status];
-        `;
-        const {value} = (await axios({
-          url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-          method: POST,
-          data: {script, type: 'webdriverio'},
-        })).data;
-        const expectedTimeouts = {command: 250, implicit: 0};
-        const expectedStatus = {};
-        value.result.should.eql([expectedTimeouts, expectedStatus]);
-      });
-
-      it('should fail with any script type other than webdriverio currently', async function () {
-        const script = `return 'foo'`;
-        await axios({
-          url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-          method: POST,
-          data: {script, type: 'wd'},
-        }).should.eventually.be.rejected;
-      });
-
-      it('should execute a webdriverio script that returns elements correctly', async function () {
-        const script = `
-          return await driver.$("~amazing");
-        `;
-        const {value} = (await axios({
-          url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-          method: POST,
-          data: {script},
-        })).data;
-        value.result.should.eql({
-          [W3C_ELEMENT_KEY]: 'element-id-1',
-          [MJSONWP_ELEMENT_KEY]: 'element-id-1'
-        });
-      });
-
-      it('should execute a webdriverio script that returns elements in deep structure', async function () {
-        const script = `
-          const el = await driver.$("~amazing");
-          return {element: el, elements: [el, el]};
-        `;
-        const {value} = (await axios({
-          url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-          method: POST,
-          data: {script},
-        })).data;
-        const elObj = {
-          [W3C_ELEMENT_KEY]: 'element-id-1',
-          [MJSONWP_ELEMENT_KEY]: 'element-id-1'
-        };
-        value.result.should.eql({element: elObj, elements: [elObj, elObj]});
-      });
-
-      it('should store and return logs to the user', async function () {
-        const script = `
-          console.log("foo");
-          console.log("foo2");
-          console.warn("bar");
-          console.error("baz");
-          return null;
-        `;
-        const {value} = (await axios({
-          url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-          method: POST,
-          data: {script},
-        })).data;
-        value.logs.should.eql({log: ['foo', 'foo2'], warn: ['bar'], error: ['baz']});
-      });
-
-      it('should have appium specific commands available', async function () {
-        const script = `
-          return typeof driver.lock;
-        `;
-        const {value} = (await axios({
-          url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-          method: POST,
-          data: {script},
-        })).data;
-        value.result.should.eql('function');
-      });
-
-      it('should correctly handle errors that happen in a webdriverio script', async function () {
-        const script = `
-          return await driver.$("~notfound");
-        `;
-        const {data} = await axios({
-          url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-          method: POST,
-          validateStatus: null,
-          data: {script},
-        });
-        data.value.result.error.error.should.equal('no such element');
-        data.value.result.error.message.should.equal('not found');
-        data.value.result.error.stacktrace.should.includes('NoSuchElementError:');
-        data.value.result.selector.should.equal('~notfound');
-        data.value.result.sessionId.should.equal(sessionId);
-      });
-
-      it('should correctly handle errors that happen when a script cannot be compiled', async function () {
-        const script = `
-          return {;
-        `;
-        const {data} = await axios({
-          url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-          method: POST,
-          validateStatus: null,
-          data: {script},
-        });
-        data.value.should.have.property('message');
-        data.value.message.should.match(/An unknown server-side error occurred while processing the command. Original error: Could not execute driver script. Original error was: Error: Unexpected token '?;'?/);
-      });
-
-      it('should be able to set a timeout on a driver script', async function () {
-        const script = `
-          await Promise.delay(1000);
-          return true;
-        `;
-        const {value} = (await axios({
-          url: createAppiumTestURL(sessionId, 'appium/execute_driver'),
-          method: POST,
-          validateStatus: null,
-          data: {script, timeout: 50},
-        })).data;
-        value.message.should.match(/.+50.+timeout.+/);
-      });
-    });
-
     if (DriverClass === BaseDriver) {
       // only run this test on basedriver, not other drivers which also use these tests, since we
       // don't want them to try and start sessions with these random capabilities that are

package/test/basedriver/driver-specs.js

@@ -1,6 +1,6 @@
 // transpile:mocha
 
-import BaseDriver from '../..';
+import BaseDriver from '../../lib';
 import baseDriverUnitTests from './driver-tests';
 baseDriverUnitTests(BaseDriver, {
   platformName: 'iOS',

package/test/basedriver/driver-tests.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import B from 'bluebird';
-import { DeviceSettings } from '../..';
+import { DeviceSettings } from '../../lib';
 import sinon from 'sinon';
 
 
@@ -335,8 +335,8 @@ function baseDriverUnitTests (DriverClass, defaultCaps = {}) {
         it('should have a #canProxy method', function () {
           d.canProxy.should.be.an.instanceof(Function);
         });
-        it('should return false from #canProxy', function () {
-          d.canProxy(sessId).should.be.false;
+        it('should return a boolean from #canProxy', function () {
+          d.canProxy(sessId).should.be.a('boolean');
         });
         it('should throw an error when sessionId is wrong', function () {
           (() => { d.canProxy(); }).should.throw;

package/test/basedriver/helpers-specs.js

@@ -98,6 +98,10 @@ describe('helpers', function () {
       sandbox.stub(zip, 'extractAllTo').resolves();
       sandbox.stub(zip, 'assertValidZip').resolves();
       sandbox.stub(fs, 'mv').resolves();
+      sandbox.stub(fs, 'stat').resolves({
+        isFile: () => true,
+        isDirectory: () => false,
+      });
       sandbox.stub(fs, 'exists').resolves(true);
       sandbox.stub(fs, 'hash').resolves('0xDEADBEEF');
       sandbox.stub(fs, 'glob').resolves(['/path/to/an.apk']);

package/test/basedriver/timeout-specs.js

@@ -1,4 +1,4 @@
-import BaseDriver from '../..';
+import BaseDriver from '../../lib';
 import sinon from 'sinon';
 
 

package/test/basedriver/websockets-e2e-specs.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import { server, routeConfiguringFunction,
-         DEFAULT_WS_PATHNAME_PREFIX } from '../..';
+         DEFAULT_WS_PATHNAME_PREFIX } from '../../lib';
 import { FakeDriver } from '../protocol/fake-driver';
 import WebSocket from 'ws';
 import B from 'bluebird';

package/build/index.js

@@ -1,120 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.BaseDriver = exports.BASEDRIVER_HANDLED_SETTINGS = exports.ALL_COMMANDS = void 0;
-Object.defineProperty(exports, "DEFAULT_BASE_PATH", {
-  enumerable: true,
-  get: function () {
-    return _constants.DEFAULT_BASE_PATH;
-  }
-});
-exports.NO_SESSION_ID_COMMANDS = exports.METHOD_MAP = exports.JWProxy = exports.DeviceSettings = exports.DEFAULT_WS_PATHNAME_PREFIX = void 0;
-Object.defineProperty(exports, "PROTOCOLS", {
-  enumerable: true,
-  get: function () {
-    return _constants.PROTOCOLS;
-  }
-});
-exports.validateCaps = exports.statusCodes = exports.server = exports.routeToCommandName = exports.routeConfiguringFunction = exports.processCapabilities = exports.normalizeBasePath = exports.isStandardCap = exports.isSessionCommand = exports.isErrorType = exports.getSummaryByCode = exports.errors = exports.errorFromW3CJsonCode = exports.errorFromMJSONWPStatusCode = exports.errorFromCode = exports.determineProtocol = exports.default = exports.STATIC_DIR = exports.Protocol = void 0;
-
-require("source-map-support/register");
-
-var driver = _interopRequireWildcard(require("./lib/basedriver/driver"));
-
-var deviceSettings = _interopRequireWildcard(require("./lib/basedriver/device-settings"));
-
-var protocol = _interopRequireWildcard(require("./lib/protocol"));
-
-var _constants = require("./lib/constants");
-
-var staticIndex = _interopRequireWildcard(require("./lib/express/static"));
-
-var serverIndex = _interopRequireWildcard(require("./lib/express/server"));
-
-var proxyIndex = _interopRequireWildcard(require("./lib/jsonwp-proxy/proxy"));
-
-var statusIndex = _interopRequireWildcard(require("./lib/jsonwp-status/status"));
-
-var caps = _interopRequireWildcard(require("./lib/basedriver/capabilities"));
-
-var ws = _interopRequireWildcard(require("./lib/express/websocket"));
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-const {
-  BaseDriver
-} = driver;
-exports.BaseDriver = BaseDriver;
-const {
-  DeviceSettings,
-  BASEDRIVER_HANDLED_SETTINGS
-} = deviceSettings;
-exports.BASEDRIVER_HANDLED_SETTINGS = BASEDRIVER_HANDLED_SETTINGS;
-exports.DeviceSettings = DeviceSettings;
-var _default = BaseDriver;
-exports.default = _default;
-const {
-  Protocol,
-  routeConfiguringFunction,
-  errors,
-  isErrorType,
-  errorFromMJSONWPStatusCode,
-  errorFromW3CJsonCode,
-  ALL_COMMANDS,
-  METHOD_MAP,
-  routeToCommandName,
-  NO_SESSION_ID_COMMANDS,
-  isSessionCommand,
-  normalizeBasePath,
-  determineProtocol
-} = protocol;
-exports.determineProtocol = determineProtocol;
-exports.normalizeBasePath = normalizeBasePath;
-exports.isSessionCommand = isSessionCommand;
-exports.NO_SESSION_ID_COMMANDS = NO_SESSION_ID_COMMANDS;
-exports.routeToCommandName = routeToCommandName;
-exports.METHOD_MAP = METHOD_MAP;
-exports.ALL_COMMANDS = ALL_COMMANDS;
-exports.errorFromW3CJsonCode = errorFromW3CJsonCode;
-exports.errorFromCode = exports.errorFromMJSONWPStatusCode = errorFromMJSONWPStatusCode;
-exports.isErrorType = isErrorType;
-exports.errors = errors;
-exports.routeConfiguringFunction = routeConfiguringFunction;
-exports.Protocol = Protocol;
-const {
-  STATIC_DIR
-} = staticIndex;
-exports.STATIC_DIR = STATIC_DIR;
-const {
-  server
-} = serverIndex;
-exports.server = server;
-const {
-  JWProxy
-} = proxyIndex;
-exports.JWProxy = JWProxy;
-const {
-  codes: statusCodes,
-  getSummaryByCode
-} = statusIndex;
-exports.getSummaryByCode = getSummaryByCode;
-exports.statusCodes = statusCodes;
-const {
-  processCapabilities,
-  isStandardCap,
-  validateCaps
-} = caps;
-exports.validateCaps = validateCaps;
-exports.isStandardCap = isStandardCap;
-exports.processCapabilities = processCapabilities;
-const {
-  DEFAULT_WS_PATHNAME_PREFIX
-} = ws;
-exports.DEFAULT_WS_PATHNAME_PREFIX = DEFAULT_WS_PATHNAME_PREFIX;require('source-map-support').install();
-
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LmpzIl0sIm5hbWVzIjpbIkJhc2VEcml2ZXIiLCJkcml2ZXIiLCJEZXZpY2VTZXR0aW5ncyIsIkJBU0VEUklWRVJfSEFORExFRF9TRVRUSU5HUyIsImRldmljZVNldHRpbmdzIiwiUHJvdG9jb2wiLCJyb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24iLCJlcnJvcnMiLCJpc0Vycm9yVHlwZSIsImVycm9yRnJvbU1KU09OV1BTdGF0dXNDb2RlIiwiZXJyb3JGcm9tVzNDSnNvbkNvZGUiLCJBTExfQ09NTUFORFMiLCJNRVRIT0RfTUFQIiwicm91dGVUb0NvbW1hbmROYW1lIiwiTk9fU0VTU0lPTl9JRF9DT01NQU5EUyIsImlzU2Vzc2lvbkNvbW1hbmQiLCJub3JtYWxpemVCYXNlUGF0aCIsImRldGVybWluZVByb3RvY29sIiwicHJvdG9jb2wiLCJTVEFUSUNfRElSIiwic3RhdGljSW5kZXgiLCJzZXJ2ZXIiLCJzZXJ2ZXJJbmRleCIsIkpXUHJveHkiLCJwcm94eUluZGV4IiwiY29kZXMiLCJzdGF0dXNDb2RlcyIsImdldFN1bW1hcnlCeUNvZGUiLCJzdGF0dXNJbmRleCIsInByb2Nlc3NDYXBhYmlsaXRpZXMiLCJpc1N0YW5kYXJkQ2FwIiwidmFsaWRhdGVDYXBzIiwiY2FwcyIsIkRFRkFVTFRfV1NfUEFUSE5BTUVfUFJFRklYIiwid3MiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBR0E7O0FBQ0E7O0FBVUE7O0FBQ0E7O0FBb0JBOztBQUlBOztBQUtBOztBQUtBOztBQUtBOztBQUtBOzs7Ozs7QUFyREEsTUFBTTtBQUFFQSxFQUFBQTtBQUFGLElBQWlCQyxNQUF2Qjs7QUFDQSxNQUFNO0FBQUVDLEVBQUFBLGNBQUY7QUFBa0JDLEVBQUFBO0FBQWxCLElBQWtEQyxjQUF4RDs7O2VBR2VKLFU7O0FBU2YsTUFBTTtBQUNKSyxFQUFBQSxRQURJO0FBQ01DLEVBQUFBLHdCQUROO0FBQ2dDQyxFQUFBQSxNQURoQztBQUN3Q0MsRUFBQUEsV0FEeEM7QUFFSkMsRUFBQUEsMEJBRkk7QUFFd0JDLEVBQUFBLG9CQUZ4QjtBQUU4Q0MsRUFBQUEsWUFGOUM7QUFFNERDLEVBQUFBLFVBRjVEO0FBR0pDLEVBQUFBLGtCQUhJO0FBR2dCQyxFQUFBQSxzQkFIaEI7QUFHd0NDLEVBQUFBLGdCQUh4QztBQUlKQyxFQUFBQSxpQkFKSTtBQUllQyxFQUFBQTtBQUpmLElBS0ZDLFFBTEo7Ozs7Ozs7Ozs7Ozs7O0FBaUJBLE1BQU07QUFBRUMsRUFBQUE7QUFBRixJQUFpQkMsV0FBdkI7O0FBSUEsTUFBTTtBQUFFQyxFQUFBQTtBQUFGLElBQWFDLFdBQW5COztBQUtBLE1BQU07QUFBRUMsRUFBQUE7QUFBRixJQUFjQyxVQUFwQjs7QUFLQSxNQUFNO0FBQUVDLEVBQUFBLEtBQUssRUFBRUMsV0FBVDtBQUFzQkMsRUFBQUE7QUFBdEIsSUFBMkNDLFdBQWpEOzs7QUFLQSxNQUFNO0FBQUVDLEVBQUFBLG1CQUFGO0FBQXVCQyxFQUFBQSxhQUF2QjtBQUFzQ0MsRUFBQUE7QUFBdEMsSUFBdURDLElBQTdEOzs7O0FBS0EsTUFBTTtBQUFFQyxFQUFBQTtBQUFGLElBQWlDQyxFQUF2QyIsInNvdXJjZXNDb250ZW50IjpbIi8vIHRyYW5zcGlsZTptYWluXG5cbi8vIEJhc2VEcml2ZXIgZXhwb3J0c1xuaW1wb3J0ICogYXMgZHJpdmVyIGZyb20gJy4vbGliL2Jhc2Vkcml2ZXIvZHJpdmVyJztcbmltcG9ydCAqIGFzIGRldmljZVNldHRpbmdzIGZyb20gJy4vbGliL2Jhc2Vkcml2ZXIvZGV2aWNlLXNldHRpbmdzJztcblxuY29uc3QgeyBCYXNlRHJpdmVyIH0gPSBkcml2ZXI7XG5jb25zdCB7IERldmljZVNldHRpbmdzLCBCQVNFRFJJVkVSX0hBTkRMRURfU0VUVElOR1MgfSA9IGRldmljZVNldHRpbmdzO1xuXG5leHBvcnQgeyBCYXNlRHJpdmVyLCBEZXZpY2VTZXR0aW5ncywgQkFTRURSSVZFUl9IQU5ETEVEX1NFVFRJTkdTIH07XG5leHBvcnQgZGVmYXVsdCBCYXNlRHJpdmVyO1xuXG5cbi8vIE1KU09OV1AgZXhwb3J0c1xuaW1wb3J0ICogYXMgcHJvdG9jb2wgZnJvbSAnLi9saWIvcHJvdG9jb2wnO1xuaW1wb3J0IHtcbiAgREVGQVVMVF9CQVNFX1BBVEgsIFBST1RPQ09MU1xufSBmcm9tICcuL2xpYi9jb25zdGFudHMnO1xuXG5jb25zdCB7XG4gIFByb3RvY29sLCByb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24sIGVycm9ycywgaXNFcnJvclR5cGUsXG4gIGVycm9yRnJvbU1KU09OV1BTdGF0dXNDb2RlLCBlcnJvckZyb21XM0NKc29uQ29kZSwgQUxMX0NPTU1BTkRTLCBNRVRIT0RfTUFQLFxuICByb3V0ZVRvQ29tbWFuZE5hbWUsIE5PX1NFU1NJT05fSURfQ09NTUFORFMsIGlzU2Vzc2lvbkNvbW1hbmQsXG4gIG5vcm1hbGl6ZUJhc2VQYXRoLCBkZXRlcm1pbmVQcm90b2NvbFxufSA9IHByb3RvY29sO1xuXG5leHBvcnQge1xuICBQcm90b2NvbCwgcm91dGVDb25maWd1cmluZ0Z1bmN0aW9uLCBlcnJvcnMsIGlzRXJyb3JUeXBlLCBQUk9UT0NPTFMsXG4gIGVycm9yRnJvbU1KU09OV1BTdGF0dXNDb2RlLCBlcnJvckZyb21XM0NKc29uQ29kZSwgZGV0ZXJtaW5lUHJvdG9jb2wsXG4gIGVycm9yRnJvbU1KU09OV1BTdGF0dXNDb2RlIGFzIGVycm9yRnJvbUNvZGUsIEFMTF9DT01NQU5EUywgTUVUSE9EX01BUCxcbiAgcm91dGVUb0NvbW1hbmROYW1lLCBOT19TRVNTSU9OX0lEX0NPTU1BTkRTLCBpc1Nlc3Npb25Db21tYW5kLFxuICBERUZBVUxUX0JBU0VfUEFUSCwgbm9ybWFsaXplQmFzZVBhdGhcbn07XG5cbi8vIEV4cHJlc3MgZXhwb3J0c1xuaW1wb3J0ICogYXMgc3RhdGljSW5kZXggZnJvbSAnLi9saWIvZXhwcmVzcy9zdGF0aWMnO1xuY29uc3QgeyBTVEFUSUNfRElSIH0gPSBzdGF0aWNJbmRleDtcbmV4cG9ydCB7IFNUQVRJQ19ESVIgfTtcblxuaW1wb3J0ICogYXMgc2VydmVySW5kZXggZnJvbSAnLi9saWIvZXhwcmVzcy9zZXJ2ZXInO1xuY29uc3QgeyBzZXJ2ZXIgfSA9IHNlcnZlckluZGV4O1xuZXhwb3J0IHsgc2VydmVyIH07XG5cbi8vIGpzb253cC1wcm94eSBleHBvcnRzXG5pbXBvcnQgKiBhcyBwcm94eUluZGV4IGZyb20gJy4vbGliL2pzb253cC1wcm94eS9wcm94eSc7XG5jb25zdCB7IEpXUHJveHkgfSA9IHByb3h5SW5kZXg7XG5leHBvcnQgeyBKV1Byb3h5IH07XG5cbi8vIGpzb253cC1zdGF0dXMgZXhwb3J0c1xuaW1wb3J0ICogYXMgc3RhdHVzSW5kZXggZnJvbSAnLi9saWIvanNvbndwLXN0YXR1cy9zdGF0dXMnO1xuY29uc3QgeyBjb2Rlczogc3RhdHVzQ29kZXMsIGdldFN1bW1hcnlCeUNvZGUgfSA9IHN0YXR1c0luZGV4O1xuZXhwb3J0IHsgc3RhdHVzQ29kZXMsIGdldFN1bW1hcnlCeUNvZGUgfTtcblxuLy8gVzNDIGNhcGFiaWxpdGllcyBwYXJzZXJcbmltcG9ydCAqIGFzIGNhcHMgZnJvbSAnLi9saWIvYmFzZWRyaXZlci9jYXBhYmlsaXRpZXMnO1xuY29uc3QgeyBwcm9jZXNzQ2FwYWJpbGl0aWVzLCBpc1N0YW5kYXJkQ2FwLCB2YWxpZGF0ZUNhcHMgfSA9IGNhcHM7XG5leHBvcnQgeyBwcm9jZXNzQ2FwYWJpbGl0aWVzLCBpc1N0YW5kYXJkQ2FwLCB2YWxpZGF0ZUNhcHMgfTtcblxuLy8gV2ViIHNvY2tldCBoZWxwZXJzXG5pbXBvcnQgKiBhcyB3cyBmcm9tICcuL2xpYi9leHByZXNzL3dlYnNvY2tldCc7XG5jb25zdCB7IERFRkFVTFRfV1NfUEFUSE5BTUVfUFJFRklYIH0gPSB3cztcbmV4cG9ydCB7IERFRkFVTFRfV1NfUEFUSE5BTUVfUFJFRklYIH07Il0sImZpbGUiOiJpbmRleC5qcyIsInNvdXJjZVJvb3QiOiIuLiJ9