appium-safari-driver 2.2.0 → 3.0.4

package/build/lib/commands/record-screen.js

@@ -0,0 +1,329 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+require("source-map-support/register");
+
+var _lodash = _interopRequireDefault(require("lodash"));
+
+var _support = require("@appium/support");
+
+var _asyncbox = require("asyncbox");
+
+var _logger = _interopRequireDefault(require("../logger"));
+
+var _nodeSimctl = _interopRequireDefault(require("node-simctl"));
+
+const commands = {};
+const STARTUP_INTERVAL_MS = 300;
+const STARTUP_TIMEOUT_MS = 10 * 1000;
+const DEFAULT_TIME_LIMIT_MS = 60 * 10 * 1000;
+const PROCESS_SHUTDOWN_TIMEOUT_MS = 10 * 1000;
+const DEFAULT_EXT = '.mp4';
+
+async function uploadRecordedMedia(localFile, remotePath = null, uploadOptions = {}) {
+  if (_lodash.default.isEmpty(remotePath)) {
+    const {
+      size
+    } = await _support.fs.stat(localFile);
+
+    _logger.default.debug(`The size of the resulting screen recording is ${_support.util.toReadableSizeString(size)}`);
+
+    return (await _support.util.toInMemoryBase64(localFile)).toString();
+  }
+
+  const {
+    user,
+    pass,
+    method,
+    headers,
+    fileFieldName,
+    formFields
+  } = uploadOptions;
+  const options = {
+    method: method || 'PUT',
+    headers,
+    fileFieldName,
+    formFields
+  };
+
+  if (user && pass) {
+    options.auth = {
+      user,
+      pass
+    };
+  }
+
+  await _support.net.uploadFile(localFile, remotePath, options);
+  return '';
+}
+
+const VIDEO_FILES = new Set();
+process.on('exit', () => {
+  for (const videoFile of VIDEO_FILES) {
+    try {
+      _support.fs.rimrafSync(videoFile);
+    } catch (ign) {}
+  }
+});
+
+class ScreenRecorder {
+  constructor(udid, videoPath, opts = {}) {
+    this._process = null;
+    this._udid = udid;
+    this._videoPath = videoPath;
+    this._codec = opts.codec;
+    this._display = opts.display;
+    this._mask = opts.mask;
+    this._timeLimitMs = opts.timeLimit > 0 ? opts.timeLimit * 1000 : DEFAULT_TIME_LIMIT_MS;
+    this._timer = null;
+  }
+
+  async getVideoPath() {
+    if (await _support.fs.exists(this._videoPath)) {
+      VIDEO_FILES.add(this._videoPath);
+      return this._videoPath;
+    }
+
+    return '';
+  }
+
+  get isRunning() {
+    var _this$_process;
+
+    return !!((_this$_process = this._process) !== null && _this$_process !== void 0 && _this$_process.isRunning);
+  }
+
+  async _enforceTermination() {
+    if (this.isRunning) {
+      _logger.default.debug('Force-stopping the currently running video recording');
+
+      try {
+        await this._process.stop('SIGKILL');
+      } catch (ign) {}
+    }
+
+    this._process = null;
+    const videoPath = await this.getVideoPath();
+
+    if (videoPath) {
+      await _support.fs.rimraf(videoPath);
+      VIDEO_FILES.delete(videoPath);
+    }
+
+    return '';
+  }
+
+  async start() {
+    const args = [this._udid, 'recordVideo'];
+
+    if (this._display) {
+      args.push('--display', this._display);
+    }
+
+    if (this._codec) {
+      args.push('--codec', this._codec);
+    }
+
+    if (this._mask) {
+      args.push('--mask', this._mask);
+    }
+
+    args.push('--force', this._videoPath);
+    this._process = await new _nodeSimctl.default().exec('io', {
+      args,
+      asynchronous: true
+    });
+
+    _logger.default.debug(`Starting video recording with arguments: ${_support.util.quote(args)}`);
+
+    this._process.on('output', (stdout, stderr) => {
+      const line = _lodash.default.trim(stdout || stderr);
+
+      if (line) {
+        _logger.default.debug(`[recordVideo@${this._udid.substring(0, 8)}] ${line}`);
+      }
+    });
+
+    this._process.once('exit', async (code, signal) => {
+      this._process = null;
+
+      if (code === 0) {
+        _logger.default.debug('Screen recording exited without errors');
+      } else {
+        await this._enforceTermination();
+
+        _logger.default.warn(`Screen recording exited with error code ${code}, signal ${signal}`);
+      }
+    });
+
+    await this._process.start(0);
+
+    try {
+      await (0, _asyncbox.waitForCondition)(async () => {
+        if (!this.isRunning) {
+          throw new Error();
+        }
+
+        return !!(await this.getVideoPath());
+      }, {
+        waitMs: STARTUP_TIMEOUT_MS,
+        intervalMs: STARTUP_INTERVAL_MS
+      });
+    } catch (e) {
+      await this._enforceTermination();
+
+      _logger.default.errorAndThrow(`The expected screen record file '${this._videoPath}' does not exist after ${STARTUP_TIMEOUT_MS}ms. ` + `Check the server log for more details`);
+    }
+
+    this._timer = setTimeout(async () => {
+      if (this.isRunning) {
+        try {
+          await this.stop();
+        } catch (e) {
+          _logger.default.error(e);
+        }
+      }
+    }, this._timeLimitMs);
+
+    _logger.default.info(`The video recording has started. Will timeout in ${this._timeLimitMs}ms`);
+  }
+
+  async stop(force = false) {
+    if (this._timer) {
+      clearTimeout(this._timer);
+      this._timer = null;
+    }
+
+    if (force) {
+      return await this._enforceTermination();
+    }
+
+    if (!this.isRunning) {
+      _logger.default.debug('Screen recording is not running. Returning the recently recorded video');
+
+      return await this.getVideoPath();
+    }
+
+    try {
+      await this._process.stop('SIGINT', PROCESS_SHUTDOWN_TIMEOUT_MS);
+    } catch (e) {
+      await this._enforceTermination();
+      throw new Error(`Screen recording has failed to stop after ${PROCESS_SHUTDOWN_TIMEOUT_MS}ms`);
+    }
+
+    return await this.getVideoPath();
+  }
+
+}
+
+async function extractSimulatorUdid(caps) {
+  if (caps['safari:useSimulator'] === false) {
+    return null;
+  }
+
+  const allDevices = _lodash.default.flatMap(_lodash.default.values(await new _nodeSimctl.default().getDevices(null, 'iOS')));
+
+  for (const {
+    name,
+    udid,
+    state,
+    sdk
+  } of allDevices) {
+    if (state !== 'Booted') {
+      continue;
+    }
+
+    if (_lodash.default.toLower(caps['safari:deviceUDID']) === _lodash.default.toLower(udid)) {
+      return udid;
+    }
+
+    if (_lodash.default.toLower(caps['safari:deviceName']) === _lodash.default.toLower(name) && (caps['safari:platformVersion'] && caps['safari:platformVersion'] === sdk || !caps['safari:platformVersion'])) {
+      return udid;
+    }
+  }
+
+  return null;
+}
+
+commands.startRecordingScreen = async function startRecordingScreen(options = {}) {
+  var _this$_screenRecorder;
+
+  const {
+    timeLimit,
+    codec,
+    display,
+    mask,
+    forceRestart = true
+  } = options;
+
+  if ((_this$_screenRecorder = this._screenRecorder) !== null && _this$_screenRecorder !== void 0 && _this$_screenRecorder.isRunning) {
+    _logger.default.info('The screen recording is already running');
+
+    if (!forceRestart) {
+      _logger.default.info('Doing nothing');
+
+      return;
+    }
+
+    _logger.default.info('Forcing the active screen recording to stop');
+
+    await this._screenRecorder.stop(true);
+  }
+
+  this._screenRecorder = null;
+  const udid = await extractSimulatorUdid(this.caps);
+
+  if (!udid) {
+    throw new Error('Cannot determine Simulator UDID to record the video from. ' + 'Double check your session capabilities');
+  }
+
+  const videoPath = await _support.tempDir.path({
+    prefix: _support.util.uuidV4().substring(0, 8),
+    suffix: DEFAULT_EXT
+  });
+  this._screenRecorder = new ScreenRecorder(udid, videoPath, {
+    timeLimit: parseInt(timeLimit, 10),
+    codec,
+    display,
+    mask
+  });
+
+  try {
+    await this._screenRecorder.start();
+  } catch (e) {
+    this._screenRecorder = null;
+    throw e;
+  }
+};
+
+commands.stopRecordingScreen = async function stopRecordingScreen(options = {}) {
+  if (!this._screenRecorder) {
+    _logger.default.info('No screen recording has been started. Doing nothing');
+
+    return '';
+  }
+
+  _logger.default.debug('Retrieving the resulting video data');
+
+  const videoPath = await this._screenRecorder.stop();
+
+  if (!videoPath) {
+    _logger.default.info('No video data is found. Returning an empty string');
+
+    return '';
+  }
+
+  return await uploadRecordedMedia(videoPath, options.remotePath, options);
+};
+
+var _default = commands;
+exports.default = _default;require('source-map-support').install();
+
+
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/commands/record-screen.js"],"names":["commands","STARTUP_INTERVAL_MS","STARTUP_TIMEOUT_MS","DEFAULT_TIME_LIMIT_MS","PROCESS_SHUTDOWN_TIMEOUT_MS","DEFAULT_EXT","uploadRecordedMedia","localFile","remotePath","uploadOptions","_","isEmpty","size","fs","stat","log","debug","util","toReadableSizeString","toInMemoryBase64","toString","user","pass","method","headers","fileFieldName","formFields","options","auth","net","uploadFile","VIDEO_FILES","Set","process","on","videoFile","rimrafSync","ign","ScreenRecorder","constructor","udid","videoPath","opts","_process","_udid","_videoPath","_codec","codec","_display","display","_mask","mask","_timeLimitMs","timeLimit","_timer","getVideoPath","exists","add","isRunning","_enforceTermination","stop","rimraf","delete","start","args","push","Simctl","exec","asynchronous","quote","stdout","stderr","line","trim","substring","once","code","signal","warn","Error","waitMs","intervalMs","e","errorAndThrow","setTimeout","error","info","force","clearTimeout","extractSimulatorUdid","caps","allDevices","flatMap","values","getDevices","name","state","sdk","toLower","startRecordingScreen","forceRestart","_screenRecorder","tempDir","path","prefix","uuidV4","suffix","parseInt","stopRecordingScreen"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport { util, fs, net, tempDir } from '@appium/support';\nimport { waitForCondition } from 'asyncbox';\nimport log from '../logger';\nimport Simctl from 'node-simctl';\n\n\nconst commands = {};\n\nconst STARTUP_INTERVAL_MS = 300;\nconst STARTUP_TIMEOUT_MS = 10 * 1000;\nconst DEFAULT_TIME_LIMIT_MS = 60 * 10 * 1000; // 10 minutes\nconst PROCESS_SHUTDOWN_TIMEOUT_MS = 10 * 1000;\nconst DEFAULT_EXT = '.mp4';\n\n\nasync function uploadRecordedMedia (localFile, remotePath = null, uploadOptions = {}) {\n  if (_.isEmpty(remotePath)) {\n    const {size} = await fs.stat(localFile);\n    log.debug(`The size of the resulting screen recording is ${util.toReadableSizeString(size)}`);\n    return (await util.toInMemoryBase64(localFile)).toString();\n  }\n\n  const {user, pass, method, headers, fileFieldName, formFields} = uploadOptions;\n  const options = {\n    method: method || 'PUT',\n    headers,\n    fileFieldName,\n    formFields,\n  };\n  if (user && pass) {\n    options.auth = {user, pass};\n  }\n  await net.uploadFile(localFile, remotePath, options);\n  return '';\n}\n\nconst VIDEO_FILES = new Set();\nprocess.on('exit', () => {\n  for (const videoFile of VIDEO_FILES) {\n    try {\n      fs.rimrafSync(videoFile);\n    } catch (ign) {}\n  }\n});\n\nclass ScreenRecorder {\n  constructor (udid, videoPath, opts = {}) {\n    this._process = null;\n    this._udid = udid;\n    this._videoPath = videoPath;\n    this._codec = opts.codec;\n    this._display = opts.display;\n    this._mask = opts.mask;\n    this._timeLimitMs = opts.timeLimit > 0 ? opts.timeLimit * 1000 : DEFAULT_TIME_LIMIT_MS;\n    this._timer = null;\n  }\n\n  async getVideoPath () {\n    if (await fs.exists(this._videoPath)) {\n      VIDEO_FILES.add(this._videoPath);\n      return this._videoPath;\n    }\n    return '';\n  }\n\n  get isRunning () {\n    return !!(this._process?.isRunning);\n  }\n\n  async _enforceTermination () {\n    if (this.isRunning) {\n      log.debug('Force-stopping the currently running video recording');\n      try {\n        await this._process.stop('SIGKILL');\n      } catch (ign) {}\n    }\n    this._process = null;\n    const videoPath = await this.getVideoPath();\n    if (videoPath) {\n      await fs.rimraf(videoPath);\n      VIDEO_FILES.delete(videoPath);\n    }\n    return '';\n  }\n\n  async start () {\n    const args = [\n      this._udid, 'recordVideo'\n    ];\n    if (this._display) {\n      args.push('--display', this._display);\n    }\n    if (this._codec) {\n      args.push('--codec', this._codec);\n    }\n    if (this._mask) {\n      args.push('--mask', this._mask);\n    }\n    args.push('--force', this._videoPath);\n    this._process = await new Simctl().exec('io', {\n      args,\n      asynchronous: true,\n    });\n    log.debug(`Starting video recording with arguments: ${util.quote(args)}`);\n    this._process.on('output', (stdout, stderr) => {\n      const line = _.trim(stdout || stderr);\n      if (line) {\n        log.debug(`[recordVideo@${this._udid.substring(0, 8)}] ${line}`);\n      }\n    });\n    this._process.once('exit', async (code, signal) => {\n      this._process = null;\n      if (code === 0) {\n        log.debug('Screen recording exited without errors');\n      } else {\n        await this._enforceTermination();\n        log.warn(`Screen recording exited with error code ${code}, signal ${signal}`);\n      }\n    });\n    await this._process.start(0);\n    try {\n      await waitForCondition(async () => {\n        if (!this.isRunning) {\n          throw new Error();\n        }\n        return !!(await this.getVideoPath());\n      }, {\n        waitMs: STARTUP_TIMEOUT_MS,\n        intervalMs: STARTUP_INTERVAL_MS,\n      });\n    } catch (e) {\n      await this._enforceTermination();\n      log.errorAndThrow(`The expected screen record file '${this._videoPath}' does not exist after ${STARTUP_TIMEOUT_MS}ms. ` +\n        `Check the server log for more details`);\n    }\n    this._timer = setTimeout(async () => {\n      if (this.isRunning) {\n        try {\n          await this.stop();\n        } catch (e) {\n          log.error(e);\n        }\n      }\n    }, this._timeLimitMs);\n    log.info(`The video recording has started. Will timeout in ${this._timeLimitMs}ms`);\n  }\n\n  async stop (force = false) {\n    if (this._timer) {\n      clearTimeout(this._timer);\n      this._timer = null;\n    }\n\n    if (force) {\n      return await this._enforceTermination();\n    }\n\n    if (!this.isRunning) {\n      log.debug('Screen recording is not running. Returning the recently recorded video');\n      return await this.getVideoPath();\n    }\n\n    try {\n      await this._process.stop('SIGINT', PROCESS_SHUTDOWN_TIMEOUT_MS);\n    } catch (e) {\n      await this._enforceTermination();\n      throw new Error(`Screen recording has failed to stop after ${PROCESS_SHUTDOWN_TIMEOUT_MS}ms`);\n    }\n\n    return await this.getVideoPath();\n  }\n}\n\nasync function extractSimulatorUdid (caps) {\n  if (caps['safari:useSimulator'] === false) {\n    return null;\n  }\n\n  const allDevices = _.flatMap(_.values(await new Simctl().getDevices(null, 'iOS')));\n  for (const {name, udid, state, sdk} of allDevices) {\n    if (state !== 'Booted') {\n      continue;\n    }\n\n    if (_.toLower(caps['safari:deviceUDID']) === _.toLower(udid)) {\n      return udid;\n    }\n    if (_.toLower(caps['safari:deviceName']) === _.toLower(name) &&\n      (caps['safari:platformVersion'] && caps['safari:platformVersion'] === sdk\n        || !caps['safari:platformVersion'])) {\n      return udid;\n    }\n  }\n\n  return null;\n}\n\n\n/**\n * @typedef {Object} StartRecordingOptions\n *\n * @property {?string} codec [hevc] - Specifies the codec type: \"h264\" or \"hevc\"\n * @property {?string} display [internal] - Supports \"internal\" or \"external\". Default is \"internal\"\n * @property {?string} mask - For non-rectangular displays, handle the mask by policy:\n * - ignored: The mask is ignored and the unmasked framebuffer is saved.\n * - alpha: Not supported, but retained for compatibility; the mask is rendered black.\n * - black: The mask is rendered black.\n * @property {string|number} timeLimit [600] - The maximum recording time, in seconds. The default\n * value is 600 seconds (10 minutes).\n * @property {boolean} forceRestart [true] - Whether to ignore the call if a screen recording is currently running\n * (`false`) or to start a new recording immediately and terminate the existing one if running (`true`).\n */\n\n/**\n * Record the Simulator's display in background while the automated test is running.\n * This method uses `xcrun simctl io recordVideo` helper under the hood.\n * Check the output of `xcrun simctl io` command for more details.\n *\n * @param {?StartRecordingOptions} options - The available options.\n * @throws {Error} If screen recording has failed to start or is not supported for the destination device.\n */\ncommands.startRecordingScreen = async function startRecordingScreen (options = {}) {\n  const {\n    timeLimit,\n    codec,\n    display,\n    mask,\n    forceRestart = true,\n  } = options;\n  if (this._screenRecorder?.isRunning) {\n    log.info('The screen recording is already running');\n    if (!forceRestart) {\n      log.info('Doing nothing');\n      return;\n    }\n    log.info('Forcing the active screen recording to stop');\n    await this._screenRecorder.stop(true);\n  }\n  this._screenRecorder = null;\n\n  const udid = await extractSimulatorUdid(this.caps);\n  if (!udid) {\n    throw new Error('Cannot determine Simulator UDID to record the video from. ' +\n      'Double check your session capabilities');\n  }\n\n  const videoPath = await tempDir.path({\n    prefix: util.uuidV4().substring(0, 8),\n    suffix: DEFAULT_EXT,\n  });\n  this._screenRecorder = new ScreenRecorder(udid, videoPath, {\n    timeLimit: parseInt(timeLimit, 10),\n    codec,\n    display,\n    mask,\n  });\n  try {\n    await this._screenRecorder.start();\n  } catch (e) {\n    this._screenRecorder = null;\n    throw e;\n  }\n};\n\n/**\n * @typedef {Object} StopRecordingOptions\n *\n * @property {?string} remotePath - The path to the remote location, where the resulting video should be uploaded.\n * The following protocols are supported: http/https, ftp.\n * Null or empty string value (the default setting) means the content of resulting\n * file should be encoded as Base64 and passed as the endpoint response value.\n * An exception will be thrown if the generated media file is too big to\n * fit into the available process memory.\n * @property {?string} user - The name of the user for the remote authentication.\n * @property {?string} pass - The password for the remote authentication.\n * @property {?string} method - The http multipart upload method name. The 'PUT' one is used by default.\n * @property {?Object} headers - Additional headers mapping for multipart http(s) uploads\n * @property {?string} fileFieldName [file] - The name of the form field, where the file content BLOB should be stored for\n *                                            http(s) uploads\n * @property {?Object|Array<Pair>} formFields - Additional form fields for multipart http(s) uploads\n */\n\n/**\n * Stop recording the screen.\n * If no screen recording has been started before then the method returns an empty string.\n *\n * @param {?StopRecordingOptions} options - The available options.\n * @returns {string} Base64-encoded content of the recorded media file if 'remotePath'\n * parameter is falsy or an empty string.\n * @throws {Error} If there was an error while getting the name of a media file\n * or the file content cannot be uploaded to the remote location\n * or screen recording is not supported on the device under test.\n */\ncommands.stopRecordingScreen = async function stopRecordingScreen (options = {}) {\n  if (!this._screenRecorder) {\n    log.info('No screen recording has been started. Doing nothing');\n    return '';\n  }\n\n  log.debug('Retrieving the resulting video data');\n  const videoPath = await this._screenRecorder.stop();\n  if (!videoPath) {\n    log.info('No video data is found. Returning an empty string');\n    return '';\n  }\n  return await uploadRecordedMedia(videoPath, options.remotePath, options);\n};\n\nexport default commands;\n"],"file":"lib/commands/record-screen.js","sourceRoot":"../../.."}

package/build/lib/driver.js

@@ -11,7 +11,7 @@ require("source-map-support/register");
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _appiumBaseDriver = require("appium-base-driver");
+var _baseDriver = require("@appium/base-driver");
 
 var _logger = _interopRequireDefault(require("./logger"));
 
@@ -23,9 +23,9 @@ var _index = _interopRequireDefault(require("./commands/index"));
 
 var _utils = require("./utils");
 
-const NO_PROXY = [['GET', new RegExp('^/session/[^/]+/appium')], ['POST', new RegExp('^/session/[^/]+/appium')], ['POST', new RegExp('^/session/[^/]+/element/[^/]+/elements?$')], ['POST', new RegExp('^/session/[^/]+/elements?$')]];
+const NO_PROXY = [['GET', new RegExp('^/session/[^/]+/appium')], ['POST', new RegExp('^/session/[^/]+/appium')], ['POST', new RegExp('^/session/[^/]+/element/[^/]+/elements?$')], ['POST', new RegExp('^/session/[^/]+/elements?$')], ['DELETE', new RegExp('^/session/[^/]+/cookie$')]];
 
-class SafariDriver extends _appiumBaseDriver.BaseDriver {
+class SafariDriver extends _baseDriver.BaseDriver {
   constructor(opts = {}) {
     super(opts);
     this.desiredCapConstraints = _desiredCaps.desiredCapConstraints;
@@ -41,6 +41,7 @@ class SafariDriver extends _appiumBaseDriver.BaseDriver {
     this.safari = null;
     this.proxyReqRes = null;
     this.isProxyActive = false;
+    this._screenRecorder = null;
   }
 
   proxyActive() {
@@ -72,9 +73,12 @@ class SafariDriver extends _appiumBaseDriver.BaseDriver {
   }
 
   async deleteSession() {
+    var _this$_screenRecorder, _this$safari;
+
     _logger.default.info('Ending Safari session');
 
-    await this.safari.stop();
+    await ((_this$_screenRecorder = this._screenRecorder) === null || _this$_screenRecorder === void 0 ? void 0 : _this$_screenRecorder.stop(true));
+    await ((_this$safari = this.safari) === null || _this$safari === void 0 ? void 0 : _this$safari.stop());
     this.resetState();
     await super.deleteSession();
   }
@@ -85,4 +89,4 @@ var _default = SafariDriver;
 exports.default = _default;require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9kcml2ZXIuanMiXSwibmFtZXMiOlsiTk9fUFJPWFkiLCJSZWdFeHAiLCJTYWZhcmlEcml2ZXIiLCJCYXNlRHJpdmVyIiwiY29uc3RydWN0b3IiLCJvcHRzIiwiZGVzaXJlZENhcENvbnN0cmFpbnRzIiwibG9jYXRvclN0cmF0ZWdpZXMiLCJyZXNldFN0YXRlIiwiY21kIiwiZm4iLCJfIiwidG9QYWlycyIsImNvbW1hbmRzIiwicHJvdG90eXBlIiwic2FmYXJpIiwicHJveHlSZXFSZXMiLCJpc1Byb3h5QWN0aXZlIiwicHJveHlBY3RpdmUiLCJnZXRQcm94eUF2b2lkTGlzdCIsImNhblByb3h5IiwiY3JlYXRlU2Vzc2lvbiIsImFyZ3MiLCJzZXNzaW9uSWQiLCJjYXBzIiwiU2FmYXJpRHJpdmVyU2VydmVyIiwic3RhcnQiLCJlIiwiZGVsZXRlU2Vzc2lvbiIsInByb3h5IiwiYmluZCIsImxvZyIsImluZm8iLCJzdG9wIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUVBLE1BQU1BLFFBQVEsR0FBRyxDQUNmLENBQUMsS0FBRCxFQUFRLElBQUlDLE1BQUosQ0FBVyx3QkFBWCxDQUFSLENBRGUsRUFFZixDQUFDLE1BQUQsRUFBUyxJQUFJQSxNQUFKLENBQVcsd0JBQVgsQ0FBVCxDQUZlLEVBR2YsQ0FBQyxNQUFELEVBQVMsSUFBSUEsTUFBSixDQUFXLDBDQUFYLENBQVQsQ0FIZSxFQUlmLENBQUMsTUFBRCxFQUFTLElBQUlBLE1BQUosQ0FBVyw0QkFBWCxDQUFULENBSmUsQ0FBakI7O0FBT0EsTUFBTUMsWUFBTixTQUEyQkMsNEJBQTNCLENBQXNDO0FBQ3BDQyxFQUFBQSxXQUFXLENBQUVDLElBQUksR0FBRyxFQUFULEVBQWE7QUFDdEIsVUFBTUEsSUFBTjtBQUNBLFNBQUtDLHFCQUFMLEdBQTZCQSxrQ0FBN0I7QUFDQSxTQUFLQyxpQkFBTCxHQUF5QixDQUN2QixPQUR1QixFQUV2QixVQUZ1QixFQUd2QixXQUh1QixFQUl2QixtQkFKdUIsRUFLdkIsY0FMdUIsRUFPdkIsSUFQdUIsRUFRdkIsTUFSdUIsQ0FBekI7QUFVQSxTQUFLQyxVQUFMOztBQUVBLFNBQUssTUFBTSxDQUFDQyxHQUFELEVBQU1DLEVBQU4sQ0FBWCxJQUF3QkMsZ0JBQUVDLE9BQUYsQ0FBVUMsY0FBVixDQUF4QixFQUE2QztBQUMzQ1gsTUFBQUEsWUFBWSxDQUFDWSxTQUFiLENBQXVCTCxHQUF2QixJQUE4QkMsRUFBOUI7QUFDRDtBQUNGOztBQUVERixFQUFBQSxVQUFVLEdBQUk7QUFDWixTQUFLTyxNQUFMLEdBQWMsSUFBZDtBQUNBLFNBQUtDLFdBQUwsR0FBbUIsSUFBbkI7QUFDQSxTQUFLQyxhQUFMLEdBQXFCLEtBQXJCO0FBQ0Q7O0FBRURDLEVBQUFBLFdBQVcsR0FBSTtBQUNiLFdBQU8sS0FBS0QsYUFBWjtBQUNEOztBQUVERSxFQUFBQSxpQkFBaUIsR0FBSTtBQUNuQixXQUFPbkIsUUFBUDtBQUNEOztBQUVEb0IsRUFBQUEsUUFBUSxHQUFJO0FBQ1YsV0FBTyxJQUFQO0FBQ0Q7O0FBRUQsUUFBTUMsYUFBTixDQUFxQixHQUFHQyxJQUF4QixFQUE4QjtBQUM1QixVQUFNLENBQUNDLFNBQUQsRUFBWUMsSUFBWixJQUFvQixNQUFNLE1BQU1ILGFBQU4sQ0FBb0IsR0FBR0MsSUFBdkIsQ0FBaEM7QUFDQSxTQUFLUCxNQUFMLEdBQWMsSUFBSVUsZUFBSixFQUFkOztBQUNBLFFBQUk7QUFDRixZQUFNLEtBQUtWLE1BQUwsQ0FBWVcsS0FBWixDQUFrQixnQ0FBb0JGLElBQXBCLENBQWxCLENBQU47QUFDRCxLQUZELENBRUUsT0FBT0csQ0FBUCxFQUFVO0FBQ1YsWUFBTSxLQUFLQyxhQUFMLEVBQU47QUFDQSxZQUFNRCxDQUFOO0FBQ0Q7O0FBQ0QsU0FBS1gsV0FBTCxHQUFtQixLQUFLRCxNQUFMLENBQVljLEtBQVosQ0FBa0JiLFdBQWxCLENBQThCYyxJQUE5QixDQUFtQyxLQUFLZixNQUFMLENBQVljLEtBQS9DLENBQW5CO0FBQ0EsU0FBS1osYUFBTCxHQUFxQixJQUFyQjtBQUNBLFdBQU8sQ0FBQ00sU0FBRCxFQUFZQyxJQUFaLENBQVA7QUFDRDs7QUFFRCxRQUFNSSxhQUFOLEdBQXVCO0FBQ3JCRyxvQkFBSUMsSUFBSixDQUFTLHVCQUFUOztBQUNBLFVBQU0sS0FBS2pCLE1BQUwsQ0FBWWtCLElBQVosRUFBTjtBQUNBLFNBQUt6QixVQUFMO0FBRUEsVUFBTSxNQUFNb0IsYUFBTixFQUFOO0FBQ0Q7O0FBM0RtQzs7ZUE4RHZCMUIsWSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBfIGZyb20gJ2xvZGFzaCc7XG5pbXBvcnQgeyBCYXNlRHJpdmVyIH0gZnJvbSAnYXBwaXVtLWJhc2UtZHJpdmVyJztcbmltcG9ydCBsb2cgZnJvbSAnLi9sb2dnZXInO1xuaW1wb3J0IFNhZmFyaURyaXZlclNlcnZlciBmcm9tICcuL3NhZmFyaSc7XG5pbXBvcnQgeyBkZXNpcmVkQ2FwQ29uc3RyYWludHMgfSBmcm9tICcuL2Rlc2lyZWQtY2Fwcyc7XG5pbXBvcnQgY29tbWFuZHMgZnJvbSAnLi9jb21tYW5kcy9pbmRleCc7XG5pbXBvcnQgeyBmb3JtYXRDYXBzRm9yU2VydmVyIH0gZnJvbSAnLi91dGlscyc7XG5cbmNvbnN0IE5PX1BST1hZID0gW1xuICBbJ0dFVCcsIG5ldyBSZWdFeHAoJ14vc2Vzc2lvbi9bXi9dKy9hcHBpdW0nKV0sXG4gIFsnUE9TVCcsIG5ldyBSZWdFeHAoJ14vc2Vzc2lvbi9bXi9dKy9hcHBpdW0nKV0sXG4gIFsnUE9TVCcsIG5ldyBSZWdFeHAoJ14vc2Vzc2lvbi9bXi9dKy9lbGVtZW50L1teL10rL2VsZW1lbnRzPyQnKV0sXG4gIFsnUE9TVCcsIG5ldyBSZWdFeHAoJ14vc2Vzc2lvbi9bXi9dKy9lbGVtZW50cz8kJyldLFxuXTtcblxuY2xhc3MgU2FmYXJpRHJpdmVyIGV4dGVuZHMgQmFzZURyaXZlciB7XG4gIGNvbnN0cnVjdG9yIChvcHRzID0ge30pIHtcbiAgICBzdXBlcihvcHRzKTtcbiAgICB0aGlzLmRlc2lyZWRDYXBDb25zdHJhaW50cyA9IGRlc2lyZWRDYXBDb25zdHJhaW50cztcbiAgICB0aGlzLmxvY2F0b3JTdHJhdGVnaWVzID0gW1xuICAgICAgJ3hwYXRoJyxcbiAgICAgICd0YWcgbmFtZScsXG4gICAgICAnbGluayB0ZXh0JyxcbiAgICAgICdwYXJ0aWFsIGxpbmsgdGV4dCcsXG4gICAgICAnY3NzIHNlbGVjdG9yJyxcbiAgICAgIC8vIExldCB0aGVzZSB0d28gcmVhY2ggU2FmYXJpIERyaXZlciBhbmQgZmFpbCB0aGVyZSB3aXRoIGEgcHJvcGVyIGVycm9yIG1lc3NhZ2VcbiAgICAgICdpZCcsXG4gICAgICAnbmFtZScsXG4gICAgXTtcbiAgICB0aGlzLnJlc2V0U3RhdGUoKTtcblxuICAgIGZvciAoY29uc3QgW2NtZCwgZm5dIG9mIF8udG9QYWlycyhjb21tYW5kcykpIHtcbiAgICAgIFNhZmFyaURyaXZlci5wcm90b3R5cGVbY21kXSA9IGZuO1xuICAgIH1cbiAgfVxuXG4gIHJlc2V0U3RhdGUgKCkge1xuICAgIHRoaXMuc2FmYXJpID0gbnVsbDtcbiAgICB0aGlzLnByb3h5UmVxUmVzID0gbnVsbDtcbiAgICB0aGlzLmlzUHJveHlBY3RpdmUgPSBmYWxzZTtcbiAgfVxuXG4gIHByb3h5QWN0aXZlICgpIHtcbiAgICByZXR1cm4gdGhpcy5pc1Byb3h5QWN0aXZlO1xuICB9XG5cbiAgZ2V0UHJveHlBdm9pZExpc3QgKCkge1xuICAgIHJldHVybiBOT19QUk9YWTtcbiAgfVxuXG4gIGNhblByb3h5ICgpIHtcbiAgICByZXR1cm4gdHJ1ZTtcbiAgfVxuXG4gIGFzeW5jIGNyZWF0ZVNlc3Npb24gKC4uLmFyZ3MpIHtcbiAgICBjb25zdCBbc2Vzc2lvbklkLCBjYXBzXSA9IGF3YWl0IHN1cGVyLmNyZWF0ZVNlc3Npb24oLi4uYXJncyk7XG4gICAgdGhpcy5zYWZhcmkgPSBuZXcgU2FmYXJpRHJpdmVyU2VydmVyKCk7XG4gICAgdHJ5IHtcbiAgICAgIGF3YWl0IHRoaXMuc2FmYXJpLnN0YXJ0KGZvcm1hdENhcHNGb3JTZXJ2ZXIoY2FwcykpO1xuICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgIGF3YWl0IHRoaXMuZGVsZXRlU2Vzc2lvbigpO1xuICAgICAgdGhyb3cgZTtcbiAgICB9XG4gICAgdGhpcy5wcm94eVJlcVJlcyA9IHRoaXMuc2FmYXJpLnByb3h5LnByb3h5UmVxUmVzLmJpbmQodGhpcy5zYWZhcmkucHJveHkpO1xuICAgIHRoaXMuaXNQcm94eUFjdGl2ZSA9IHRydWU7XG4gICAgcmV0dXJuIFtzZXNzaW9uSWQsIGNhcHNdO1xuICB9XG5cbiAgYXN5bmMgZGVsZXRlU2Vzc2lvbiAoKSB7XG4gICAgbG9nLmluZm8oJ0VuZGluZyBTYWZhcmkgc2Vzc2lvbicpO1xuICAgIGF3YWl0IHRoaXMuc2FmYXJpLnN0b3AoKTtcbiAgICB0aGlzLnJlc2V0U3RhdGUoKTtcblxuICAgIGF3YWl0IHN1cGVyLmRlbGV0ZVNlc3Npb24oKTtcbiAgfVxufVxuXG5leHBvcnQgZGVmYXVsdCBTYWZhcmlEcml2ZXI7XG4iXSwiZmlsZSI6ImxpYi9kcml2ZXIuanMiLCJzb3VyY2VSb290IjoiLi4vLi4ifQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9kcml2ZXIuanMiXSwibmFtZXMiOlsiTk9fUFJPWFkiLCJSZWdFeHAiLCJTYWZhcmlEcml2ZXIiLCJCYXNlRHJpdmVyIiwiY29uc3RydWN0b3IiLCJvcHRzIiwiZGVzaXJlZENhcENvbnN0cmFpbnRzIiwibG9jYXRvclN0cmF0ZWdpZXMiLCJyZXNldFN0YXRlIiwiY21kIiwiZm4iLCJfIiwidG9QYWlycyIsImNvbW1hbmRzIiwicHJvdG90eXBlIiwic2FmYXJpIiwicHJveHlSZXFSZXMiLCJpc1Byb3h5QWN0aXZlIiwiX3NjcmVlblJlY29yZGVyIiwicHJveHlBY3RpdmUiLCJnZXRQcm94eUF2b2lkTGlzdCIsImNhblByb3h5IiwiY3JlYXRlU2Vzc2lvbiIsImFyZ3MiLCJzZXNzaW9uSWQiLCJjYXBzIiwiU2FmYXJpRHJpdmVyU2VydmVyIiwic3RhcnQiLCJlIiwiZGVsZXRlU2Vzc2lvbiIsInByb3h5IiwiYmluZCIsImxvZyIsImluZm8iLCJzdG9wIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7OztBQUFBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUNBOztBQUVBLE1BQU1BLFFBQVEsR0FBRyxDQUNmLENBQUMsS0FBRCxFQUFRLElBQUlDLE1BQUosQ0FBVyx3QkFBWCxDQUFSLENBRGUsRUFFZixDQUFDLE1BQUQsRUFBUyxJQUFJQSxNQUFKLENBQVcsd0JBQVgsQ0FBVCxDQUZlLEVBR2YsQ0FBQyxNQUFELEVBQVMsSUFBSUEsTUFBSixDQUFXLDBDQUFYLENBQVQsQ0FIZSxFQUlmLENBQUMsTUFBRCxFQUFTLElBQUlBLE1BQUosQ0FBVyw0QkFBWCxDQUFULENBSmUsRUFNZixDQUFDLFFBQUQsRUFBVyxJQUFJQSxNQUFKLENBQVcseUJBQVgsQ0FBWCxDQU5lLENBQWpCOztBQVNBLE1BQU1DLFlBQU4sU0FBMkJDLHNCQUEzQixDQUFzQztBQUNwQ0MsRUFBQUEsV0FBVyxDQUFFQyxJQUFJLEdBQUcsRUFBVCxFQUFhO0FBQ3RCLFVBQU1BLElBQU47QUFDQSxTQUFLQyxxQkFBTCxHQUE2QkEsa0NBQTdCO0FBQ0EsU0FBS0MsaUJBQUwsR0FBeUIsQ0FDdkIsT0FEdUIsRUFFdkIsVUFGdUIsRUFHdkIsV0FIdUIsRUFJdkIsbUJBSnVCLEVBS3ZCLGNBTHVCLEVBT3ZCLElBUHVCLEVBUXZCLE1BUnVCLENBQXpCO0FBVUEsU0FBS0MsVUFBTDs7QUFFQSxTQUFLLE1BQU0sQ0FBQ0MsR0FBRCxFQUFNQyxFQUFOLENBQVgsSUFBd0JDLGdCQUFFQyxPQUFGLENBQVVDLGNBQVYsQ0FBeEIsRUFBNkM7QUFDM0NYLE1BQUFBLFlBQVksQ0FBQ1ksU0FBYixDQUF1QkwsR0FBdkIsSUFBOEJDLEVBQTlCO0FBQ0Q7QUFDRjs7QUFFREYsRUFBQUEsVUFBVSxHQUFJO0FBQ1osU0FBS08sTUFBTCxHQUFjLElBQWQ7QUFDQSxTQUFLQyxXQUFMLEdBQW1CLElBQW5CO0FBQ0EsU0FBS0MsYUFBTCxHQUFxQixLQUFyQjtBQUNBLFNBQUtDLGVBQUwsR0FBdUIsSUFBdkI7QUFDRDs7QUFFREMsRUFBQUEsV0FBVyxHQUFJO0FBQ2IsV0FBTyxLQUFLRixhQUFaO0FBQ0Q7O0FBRURHLEVBQUFBLGlCQUFpQixHQUFJO0FBQ25CLFdBQU9wQixRQUFQO0FBQ0Q7O0FBRURxQixFQUFBQSxRQUFRLEdBQUk7QUFDVixXQUFPLElBQVA7QUFDRDs7QUFFa0IsUUFBYkMsYUFBYSxDQUFFLEdBQUdDLElBQUwsRUFBVztBQUM1QixVQUFNLENBQUNDLFNBQUQsRUFBWUMsSUFBWixJQUFvQixNQUFNLE1BQU1ILGFBQU4sQ0FBb0IsR0FBR0MsSUFBdkIsQ0FBaEM7QUFDQSxTQUFLUixNQUFMLEdBQWMsSUFBSVcsZUFBSixFQUFkOztBQUNBLFFBQUk7QUFDRixZQUFNLEtBQUtYLE1BQUwsQ0FBWVksS0FBWixDQUFrQixnQ0FBb0JGLElBQXBCLENBQWxCLENBQU47QUFDRCxLQUZELENBRUUsT0FBT0csQ0FBUCxFQUFVO0FBQ1YsWUFBTSxLQUFLQyxhQUFMLEVBQU47QUFDQSxZQUFNRCxDQUFOO0FBQ0Q7O0FBQ0QsU0FBS1osV0FBTCxHQUFtQixLQUFLRCxNQUFMLENBQVllLEtBQVosQ0FBa0JkLFdBQWxCLENBQThCZSxJQUE5QixDQUFtQyxLQUFLaEIsTUFBTCxDQUFZZSxLQUEvQyxDQUFuQjtBQUNBLFNBQUtiLGFBQUwsR0FBcUIsSUFBckI7QUFDQSxXQUFPLENBQUNPLFNBQUQsRUFBWUMsSUFBWixDQUFQO0FBQ0Q7O0FBRWtCLFFBQWJJLGFBQWEsR0FBSTtBQUFBOztBQUNyQkcsb0JBQUlDLElBQUosQ0FBUyx1QkFBVDs7QUFDQSxvQ0FBTSxLQUFLZixlQUFYLDBEQUFNLHNCQUFzQmdCLElBQXRCLENBQTJCLElBQTNCLENBQU47QUFDQSwyQkFBTSxLQUFLbkIsTUFBWCxpREFBTSxhQUFhbUIsSUFBYixFQUFOO0FBQ0EsU0FBSzFCLFVBQUw7QUFFQSxVQUFNLE1BQU1xQixhQUFOLEVBQU47QUFDRDs7QUE3RG1DOztlQWdFdkIzQixZIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IF8gZnJvbSAnbG9kYXNoJztcbmltcG9ydCB7IEJhc2VEcml2ZXIgfSBmcm9tICdAYXBwaXVtL2Jhc2UtZHJpdmVyJztcbmltcG9ydCBsb2cgZnJvbSAnLi9sb2dnZXInO1xuaW1wb3J0IFNhZmFyaURyaXZlclNlcnZlciBmcm9tICcuL3NhZmFyaSc7XG5pbXBvcnQgeyBkZXNpcmVkQ2FwQ29uc3RyYWludHMgfSBmcm9tICcuL2Rlc2lyZWQtY2Fwcyc7XG5pbXBvcnQgY29tbWFuZHMgZnJvbSAnLi9jb21tYW5kcy9pbmRleCc7XG5pbXBvcnQgeyBmb3JtYXRDYXBzRm9yU2VydmVyIH0gZnJvbSAnLi91dGlscyc7XG5cbmNvbnN0IE5PX1BST1hZID0gW1xuICBbJ0dFVCcsIG5ldyBSZWdFeHAoJ14vc2Vzc2lvbi9bXi9dKy9hcHBpdW0nKV0sXG4gIFsnUE9TVCcsIG5ldyBSZWdFeHAoJ14vc2Vzc2lvbi9bXi9dKy9hcHBpdW0nKV0sXG4gIFsnUE9TVCcsIG5ldyBSZWdFeHAoJ14vc2Vzc2lvbi9bXi9dKy9lbGVtZW50L1teL10rL2VsZW1lbnRzPyQnKV0sXG4gIFsnUE9TVCcsIG5ldyBSZWdFeHAoJ14vc2Vzc2lvbi9bXi9dKy9lbGVtZW50cz8kJyldLFxuXG4gIFsnREVMRVRFJywgbmV3IFJlZ0V4cCgnXi9zZXNzaW9uL1teL10rL2Nvb2tpZSQnKV0sXG5dO1xuXG5jbGFzcyBTYWZhcmlEcml2ZXIgZXh0ZW5kcyBCYXNlRHJpdmVyIHtcbiAgY29uc3RydWN0b3IgKG9wdHMgPSB7fSkge1xuICAgIHN1cGVyKG9wdHMpO1xuICAgIHRoaXMuZGVzaXJlZENhcENvbnN0cmFpbnRzID0gZGVzaXJlZENhcENvbnN0cmFpbnRzO1xuICAgIHRoaXMubG9jYXRvclN0cmF0ZWdpZXMgPSBbXG4gICAgICAneHBhdGgnLFxuICAgICAgJ3RhZyBuYW1lJyxcbiAgICAgICdsaW5rIHRleHQnLFxuICAgICAgJ3BhcnRpYWwgbGluayB0ZXh0JyxcbiAgICAgICdjc3Mgc2VsZWN0b3InLFxuICAgICAgLy8gTGV0IHRoZXNlIHR3byByZWFjaCBTYWZhcmkgRHJpdmVyIGFuZCBmYWlsIHRoZXJlIHdpdGggYSBwcm9wZXIgZXJyb3IgbWVzc2FnZVxuICAgICAgJ2lkJyxcbiAgICAgICduYW1lJyxcbiAgICBdO1xuICAgIHRoaXMucmVzZXRTdGF0ZSgpO1xuXG4gICAgZm9yIChjb25zdCBbY21kLCBmbl0gb2YgXy50b1BhaXJzKGNvbW1hbmRzKSkge1xuICAgICAgU2FmYXJpRHJpdmVyLnByb3RvdHlwZVtjbWRdID0gZm47XG4gICAgfVxuICB9XG5cbiAgcmVzZXRTdGF0ZSAoKSB7XG4gICAgdGhpcy5zYWZhcmkgPSBudWxsO1xuICAgIHRoaXMucHJveHlSZXFSZXMgPSBudWxsO1xuICAgIHRoaXMuaXNQcm94eUFjdGl2ZSA9IGZhbHNlO1xuICAgIHRoaXMuX3NjcmVlblJlY29yZGVyID0gbnVsbDtcbiAgfVxuXG4gIHByb3h5QWN0aXZlICgpIHtcbiAgICByZXR1cm4gdGhpcy5pc1Byb3h5QWN0aXZlO1xuICB9XG5cbiAgZ2V0UHJveHlBdm9pZExpc3QgKCkge1xuICAgIHJldHVybiBOT19QUk9YWTtcbiAgfVxuXG4gIGNhblByb3h5ICgpIHtcbiAgICByZXR1cm4gdHJ1ZTtcbiAgfVxuXG4gIGFzeW5jIGNyZWF0ZVNlc3Npb24gKC4uLmFyZ3MpIHtcbiAgICBjb25zdCBbc2Vzc2lvbklkLCBjYXBzXSA9IGF3YWl0IHN1cGVyLmNyZWF0ZVNlc3Npb24oLi4uYXJncyk7XG4gICAgdGhpcy5zYWZhcmkgPSBuZXcgU2FmYXJpRHJpdmVyU2VydmVyKCk7XG4gICAgdHJ5IHtcbiAgICAgIGF3YWl0IHRoaXMuc2FmYXJpLnN0YXJ0KGZvcm1hdENhcHNGb3JTZXJ2ZXIoY2FwcykpO1xuICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgIGF3YWl0IHRoaXMuZGVsZXRlU2Vzc2lvbigpO1xuICAgICAgdGhyb3cgZTtcbiAgICB9XG4gICAgdGhpcy5wcm94eVJlcVJlcyA9IHRoaXMuc2FmYXJpLnByb3h5LnByb3h5UmVxUmVzLmJpbmQodGhpcy5zYWZhcmkucHJveHkpO1xuICAgIHRoaXMuaXNQcm94eUFjdGl2ZSA9IHRydWU7XG4gICAgcmV0dXJuIFtzZXNzaW9uSWQsIGNhcHNdO1xuICB9XG5cbiAgYXN5bmMgZGVsZXRlU2Vzc2lvbiAoKSB7XG4gICAgbG9nLmluZm8oJ0VuZGluZyBTYWZhcmkgc2Vzc2lvbicpO1xuICAgIGF3YWl0IHRoaXMuX3NjcmVlblJlY29yZGVyPy5zdG9wKHRydWUpO1xuICAgIGF3YWl0IHRoaXMuc2FmYXJpPy5zdG9wKCk7XG4gICAgdGhpcy5yZXNldFN0YXRlKCk7XG5cbiAgICBhd2FpdCBzdXBlci5kZWxldGVTZXNzaW9uKCk7XG4gIH1cbn1cblxuZXhwb3J0IGRlZmF1bHQgU2FmYXJpRHJpdmVyO1xuIl0sImZpbGUiOiJsaWIvZHJpdmVyLmpzIiwic291cmNlUm9vdCI6Ii4uLy4uIn0=

package/build/lib/logger.js

@@ -7,12 +7,12 @@ exports.default = void 0;
 
 require("source-map-support/register");
 
-var _appiumSupport = require("appium-support");
+var _support = require("@appium/support");
 
-const log = _appiumSupport.logger.getLogger('Safari');
+const log = _support.logger.getLogger('Safari');
 
 var _default = log;
 exports.default = _default;require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9sb2dnZXIuanMiXSwibmFtZXMiOlsibG9nIiwibG9nZ2VyIiwiZ2V0TG9nZ2VyIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQTs7QUFFQSxNQUFNQSxHQUFHLEdBQUdDLHNCQUFPQyxTQUFQLENBQWlCLFFBQWpCLENBQVo7O2VBRWVGLEciLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBsb2dnZXIgfSBmcm9tICdhcHBpdW0tc3VwcG9ydCc7XG5cbmNvbnN0IGxvZyA9IGxvZ2dlci5nZXRMb2dnZXIoJ1NhZmFyaScpO1xuXG5leHBvcnQgZGVmYXVsdCBsb2c7XG4iXSwiZmlsZSI6ImxpYi9sb2dnZXIuanMiLCJzb3VyY2VSb290IjoiLi4vLi4ifQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9sb2dnZXIuanMiXSwibmFtZXMiOlsibG9nIiwibG9nZ2VyIiwiZ2V0TG9nZ2VyIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQTs7QUFFQSxNQUFNQSxHQUFHLEdBQUdDLGdCQUFPQyxTQUFQLENBQWlCLFFBQWpCLENBQVo7O2VBRWVGLEciLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBsb2dnZXIgfSBmcm9tICdAYXBwaXVtL3N1cHBvcnQnO1xuXG5jb25zdCBsb2cgPSBsb2dnZXIuZ2V0TG9nZ2VyKCdTYWZhcmknKTtcblxuZXhwb3J0IGRlZmF1bHQgbG9nO1xuIl0sImZpbGUiOiJsaWIvbG9nZ2VyLmpzIiwic291cmNlUm9vdCI6Ii4uLy4uIn0=

package/build/lib/safari.js

@@ -13,9 +13,9 @@ var _os = _interopRequireDefault(require("os"));
 
 var _path = _interopRequireDefault(require("path"));
 
-var _appiumBaseDriver = require("appium-base-driver");
+var _baseDriver = require("@appium/base-driver");
 
-var _appiumSupport = require("appium-support");
+var _support = require("@appium/support");
 
 var _teen_process = require("teen_process");
 
@@ -25,21 +25,21 @@ var _portscanner = require("portscanner");
 
 var _child_process = require("child_process");
 
-const log = _appiumSupport.logger.getLogger('SafariDriverServer');
+const log = _support.logger.getLogger('SafariDriverServer');
 
 const SD_BINARY = 'safaridriver';
 const STARTUP_TIMEOUT = 10000;
 const SAFARI_PORT_RANGE = [5100, 5200];
 
-const SAFARI_SERVER_GUARD = _appiumSupport.util.getLockFileGuard(_path.default.resolve(_os.default.tmpdir(), 'safari_server_guard.lock'), {
+const SAFARI_SERVER_GUARD = _support.util.getLockFileGuard(_path.default.resolve(_os.default.tmpdir(), 'safari_server_guard.lock'), {
   timeout: 5,
   tryRecovery: true
 });
 
-class SafariProxy extends _appiumBaseDriver.JWProxy {
+class SafariProxy extends _baseDriver.JWProxy {
   async proxyCommand(url, method, body = null) {
     if (this.didProcessExit) {
-      throw new _appiumBaseDriver.errors.InvalidContextError(`'${method} ${url}' cannot be proxied to Safari Driver server because ` + 'the process is not running (probably crashed). Check the server log for more details');
+      throw new _baseDriver.errors.InvalidContextError(`'${method} ${url}' cannot be proxied to Safari Driver server because ` + 'the process is not running (probably crashed). Check the server log for more details');
     }
 
     return await super.proxyCommand(url, method, body);
@@ -56,7 +56,7 @@ class SafariDriverProcess {
   get isRunning() {
     var _this$proc;
 
-    return !!((_this$proc = this.proc) === null || _this$proc === void 0 ? void 0 : _this$proc.isRunning);
+    return !!((_this$proc = this.proc) !== null && _this$proc !== void 0 && _this$proc.isRunning);
   }
 
   async init() {
@@ -76,7 +76,7 @@ class SafariDriverProcess {
       let safariBin;
 
       try {
-        safariBin = await _appiumSupport.fs.which(SD_BINARY);
+        safariBin = await _support.fs.which(SD_BINARY);
       } catch (e) {
         throw new Error(`${SD_BINARY} binary cannot be found in PATH. ` + `Please make sure it is present on your system`);
       }
@@ -179,7 +179,7 @@ class SafariDriverServer {
       return;
     }
 
-    if ((_this$proxy = this.proxy) === null || _this$proxy === void 0 ? void 0 : _this$proxy.sessionId) {
+    if ((_this$proxy = this.proxy) !== null && _this$proxy !== void 0 && _this$proxy.sessionId) {
       try {
         await this.proxy.command(`/session/${this.proxy.sessionId}`, 'DELETE');
       } catch (e) {
@@ -194,4 +194,4 @@ var _default = SafariDriverServer;
 exports.default = _default;require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/safari.js"],"names":["log","logger","getLogger","SD_BINARY","STARTUP_TIMEOUT","SAFARI_PORT_RANGE","SAFARI_SERVER_GUARD","util","getLockFileGuard","path","resolve","os","tmpdir","timeout","tryRecovery","SafariProxy","JWProxy","proxyCommand","url","method","body","didProcessExit","errors","InvalidContextError","SafariDriverProcess","constructor","port","proc","isRunning","init","startPort","endPort","e","Error","safariBin","fs","which","SubProcess","on","stdout","stderr","line","debug","code","signal","info","start","kill","stop","ign","SAFARI_DRIVER_PROCESS","process","once","pid","SafariDriverServer","proxy","caps","server","base","keepAlive","command","err","message","waitMs","intervalMs","test","capabilities","firstMatch","alwaysMatch","sessionId"],"mappings":"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","sourcesContent":["import os from 'os';\nimport path from 'path';\nimport { JWProxy, errors } from 'appium-base-driver';\nimport { fs, logger, util } from 'appium-support';\nimport { SubProcess } from 'teen_process';\nimport { waitForCondition } from 'asyncbox';\nimport { findAPortNotInUse } from 'portscanner';\nimport { execSync } from 'child_process';\n\nconst log = logger.getLogger('SafariDriverServer');\n\nconst SD_BINARY = 'safaridriver';\nconst STARTUP_TIMEOUT = 10000; // seconds\nconst SAFARI_PORT_RANGE = [5100, 5200];\n// This guard is needed to make sure\n// we never run multiple Safari driver processes for the same Appium process\nconst SAFARI_SERVER_GUARD = util.getLockFileGuard(\n  path.resolve(os.tmpdir(), 'safari_server_guard.lock'),\n  {timeout: 5, tryRecovery: true}\n);\n\n\nclass SafariProxy extends JWProxy {\n  async proxyCommand (url, method, body = null) {\n    if (this.didProcessExit) {\n      throw new errors.InvalidContextError(\n        `'${method} ${url}' cannot be proxied to Safari Driver server because ` +\n        'the process is not running (probably crashed). Check the server log for more details');\n    }\n    return await super.proxyCommand(url, method, body);\n  }\n}\n\n\nclass SafariDriverProcess {\n  constructor () {\n    this.port = null;\n    this.proc = null;\n  }\n\n  get isRunning () {\n    return !!(this.proc?.isRunning);\n  }\n\n  async init () {\n    await SAFARI_SERVER_GUARD(async () => {\n      if (this.isRunning) {\n        return;\n      }\n\n      const [startPort, endPort] = SAFARI_PORT_RANGE;\n      try {\n        this.port = await findAPortNotInUse(startPort, endPort);\n      } catch (e) {\n        throw new Error(\n          `Cannot find any free port in range ${startPort}..${endPort}. ` +\n          `Double check the processes that are locking ports within this range and terminate ` +\n          `these which are not needed anymore`);\n      }\n\n      let safariBin;\n      try {\n        safariBin = await fs.which(SD_BINARY);\n      } catch (e) {\n        throw new Error(`${SD_BINARY} binary cannot be found in PATH. ` +\n          `Please make sure it is present on your system`);\n      }\n      this.proc = new SubProcess(safariBin, ['-p', this.port, '--diagnose']);\n      this.proc.on('output', (stdout, stderr) => {\n        const line = stdout || stderr;\n        log.debug(`[${SD_BINARY}] ${line}`);\n      });\n      this.proc.on('exit', (code, signal) => {\n        log.info(`${SD_BINARY} has exited with code ${code}, signal ${signal}`);\n      });\n      log.info(`Starting '${safariBin}' on port ${this.port}`);\n      await this.proc.start(0);\n    });\n  }\n\n  async kill () {\n    if (this.isRunning) {\n      try {\n        await this.proc.stop('SIGKILL');\n      } catch (ign) {}\n    }\n  }\n}\n\n// Single server process per Appium instance\nconst SAFARI_DRIVER_PROCESS = new SafariDriverProcess();\nprocess.once('exit', () => {\n  if (SAFARI_DRIVER_PROCESS.isRunning) {\n    try {\n      execSync(`kill ${SAFARI_DRIVER_PROCESS.proc.pid}`);\n    } catch (ign) {}\n  }\n});\n\nclass SafariDriverServer {\n  constructor () {\n    this.proxy = null;\n  }\n\n  get isRunning () {\n    return !!(SAFARI_DRIVER_PROCESS.isRunning);\n  }\n\n  async start (caps) {\n    await SAFARI_DRIVER_PROCESS.init();\n\n    this.proxy = new SafariProxy({\n      server: '127.0.0.1',\n      port: SAFARI_DRIVER_PROCESS.port,\n      base: '',\n      keepAlive: true,\n    });\n    this.proxy.didProcessExit = false;\n    SAFARI_DRIVER_PROCESS.proc.on('exit', () => {\n      this.proxy.didProcessExit = true;\n    });\n\n    try {\n      await waitForCondition(async () => {\n        try {\n          await this.proxy.command('/status', 'GET');\n          return true;\n        } catch (err) {\n          if (this.proxy.didProcessExit) {\n            throw new Error(err.message);\n          }\n          return false;\n        }\n      }, {\n        waitMs: STARTUP_TIMEOUT,\n        intervalMs: 1000,\n      });\n    } catch (e) {\n      if (/Condition unmet/.test(e.message)) {\n        if (SAFARI_DRIVER_PROCESS.isRunning) {\n          // avoid \"frozen\" processes,\n          await SAFARI_DRIVER_PROCESS.kill();\n        }\n        throw new Error(`Safari Driver server is not listening within ${STARTUP_TIMEOUT}ms timeout. ` +\n          `Make sure it has been executed manually at least once with '--enable' command line argument. ` +\n          `Check the server log for more details`);\n      }\n      throw e;\n    }\n\n    await this.proxy.command('/session', 'POST', {\n      capabilities: {\n        firstMatch: [{}],\n        alwaysMatch: caps,\n      }\n    });\n  }\n\n  async stop () {\n    if (!this.isRunning) {\n      log.info(`${SD_BINARY} session cannot be stopped, because the server is not running`);\n      return;\n    }\n\n    if (this.proxy?.sessionId) {\n      try {\n        await this.proxy.command(`/session/${this.proxy.sessionId}`, 'DELETE');\n      } catch (e) {\n        log.info(`${SD_BINARY} session cannot be deleted. Original error: ${e.message}`);\n      }\n    }\n  }\n}\n\nexport default SafariDriverServer;\n"],"file":"lib/safari.js","sourceRoot":"../.."}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/safari.js"],"names":["log","logger","getLogger","SD_BINARY","STARTUP_TIMEOUT","SAFARI_PORT_RANGE","SAFARI_SERVER_GUARD","util","getLockFileGuard","path","resolve","os","tmpdir","timeout","tryRecovery","SafariProxy","JWProxy","proxyCommand","url","method","body","didProcessExit","errors","InvalidContextError","SafariDriverProcess","constructor","port","proc","isRunning","init","startPort","endPort","e","Error","safariBin","fs","which","SubProcess","on","stdout","stderr","line","debug","code","signal","info","start","kill","stop","ign","SAFARI_DRIVER_PROCESS","process","once","pid","SafariDriverServer","proxy","caps","server","base","keepAlive","command","err","message","waitMs","intervalMs","test","capabilities","firstMatch","alwaysMatch","sessionId"],"mappings":"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","sourcesContent":["import os from 'os';\nimport path from 'path';\nimport { JWProxy, errors } from '@appium/base-driver';\nimport { fs, logger, util } from '@appium/support';\nimport { SubProcess } from 'teen_process';\nimport { waitForCondition } from 'asyncbox';\nimport { findAPortNotInUse } from 'portscanner';\nimport { execSync } from 'child_process';\n\nconst log = logger.getLogger('SafariDriverServer');\n\nconst SD_BINARY = 'safaridriver';\nconst STARTUP_TIMEOUT = 10000; // seconds\nconst SAFARI_PORT_RANGE = [5100, 5200];\n// This guard is needed to make sure\n// we never run multiple Safari driver processes for the same Appium process\nconst SAFARI_SERVER_GUARD = util.getLockFileGuard(\n  path.resolve(os.tmpdir(), 'safari_server_guard.lock'),\n  {timeout: 5, tryRecovery: true}\n);\n\n\nclass SafariProxy extends JWProxy {\n  async proxyCommand (url, method, body = null) {\n    if (this.didProcessExit) {\n      throw new errors.InvalidContextError(\n        `'${method} ${url}' cannot be proxied to Safari Driver server because ` +\n        'the process is not running (probably crashed). Check the server log for more details');\n    }\n    return await super.proxyCommand(url, method, body);\n  }\n}\n\n\nclass SafariDriverProcess {\n  constructor () {\n    this.port = null;\n    this.proc = null;\n  }\n\n  get isRunning () {\n    return !!(this.proc?.isRunning);\n  }\n\n  async init () {\n    await SAFARI_SERVER_GUARD(async () => {\n      if (this.isRunning) {\n        return;\n      }\n\n      const [startPort, endPort] = SAFARI_PORT_RANGE;\n      try {\n        this.port = await findAPortNotInUse(startPort, endPort);\n      } catch (e) {\n        throw new Error(\n          `Cannot find any free port in range ${startPort}..${endPort}. ` +\n          `Double check the processes that are locking ports within this range and terminate ` +\n          `these which are not needed anymore`);\n      }\n\n      let safariBin;\n      try {\n        safariBin = await fs.which(SD_BINARY);\n      } catch (e) {\n        throw new Error(`${SD_BINARY} binary cannot be found in PATH. ` +\n          `Please make sure it is present on your system`);\n      }\n      this.proc = new SubProcess(safariBin, ['-p', this.port, '--diagnose']);\n      this.proc.on('output', (stdout, stderr) => {\n        const line = stdout || stderr;\n        log.debug(`[${SD_BINARY}] ${line}`);\n      });\n      this.proc.on('exit', (code, signal) => {\n        log.info(`${SD_BINARY} has exited with code ${code}, signal ${signal}`);\n      });\n      log.info(`Starting '${safariBin}' on port ${this.port}`);\n      await this.proc.start(0);\n    });\n  }\n\n  async kill () {\n    if (this.isRunning) {\n      try {\n        await this.proc.stop('SIGKILL');\n      } catch (ign) {}\n    }\n  }\n}\n\n// Single server process per Appium instance\nconst SAFARI_DRIVER_PROCESS = new SafariDriverProcess();\nprocess.once('exit', () => {\n  if (SAFARI_DRIVER_PROCESS.isRunning) {\n    try {\n      execSync(`kill ${SAFARI_DRIVER_PROCESS.proc.pid}`);\n    } catch (ign) {}\n  }\n});\n\nclass SafariDriverServer {\n  constructor () {\n    this.proxy = null;\n  }\n\n  get isRunning () {\n    return !!(SAFARI_DRIVER_PROCESS.isRunning);\n  }\n\n  async start (caps) {\n    await SAFARI_DRIVER_PROCESS.init();\n\n    this.proxy = new SafariProxy({\n      server: '127.0.0.1',\n      port: SAFARI_DRIVER_PROCESS.port,\n      base: '',\n      keepAlive: true,\n    });\n    this.proxy.didProcessExit = false;\n    SAFARI_DRIVER_PROCESS.proc.on('exit', () => {\n      this.proxy.didProcessExit = true;\n    });\n\n    try {\n      await waitForCondition(async () => {\n        try {\n          await this.proxy.command('/status', 'GET');\n          return true;\n        } catch (err) {\n          if (this.proxy.didProcessExit) {\n            throw new Error(err.message);\n          }\n          return false;\n        }\n      }, {\n        waitMs: STARTUP_TIMEOUT,\n        intervalMs: 1000,\n      });\n    } catch (e) {\n      if (/Condition unmet/.test(e.message)) {\n        if (SAFARI_DRIVER_PROCESS.isRunning) {\n          // avoid \"frozen\" processes,\n          await SAFARI_DRIVER_PROCESS.kill();\n        }\n        throw new Error(`Safari Driver server is not listening within ${STARTUP_TIMEOUT}ms timeout. ` +\n          `Make sure it has been executed manually at least once with '--enable' command line argument. ` +\n          `Check the server log for more details`);\n      }\n      throw e;\n    }\n\n    await this.proxy.command('/session', 'POST', {\n      capabilities: {\n        firstMatch: [{}],\n        alwaysMatch: caps,\n      }\n    });\n  }\n\n  async stop () {\n    if (!this.isRunning) {\n      log.info(`${SD_BINARY} session cannot be stopped, because the server is not running`);\n      return;\n    }\n\n    if (this.proxy?.sessionId) {\n      try {\n        await this.proxy.command(`/session/${this.proxy.sessionId}`, 'DELETE');\n      } catch (e) {\n        log.info(`${SD_BINARY} session cannot be deleted. Original error: ${e.message}`);\n      }\n    }\n  }\n}\n\nexport default SafariDriverServer;\n"],"file":"lib/safari.js","sourceRoot":"../.."}

package/build/lib/server.js

@@ -11,7 +11,7 @@ require("source-map-support/register");
 
 var _logger = _interopRequireDefault(require("./logger"));
 
-var _appiumBaseDriver = require("appium-base-driver");
+var _baseDriver = require("@appium/base-driver");
 
 var _driver = _interopRequireDefault(require("./driver"));
 
@@ -20,8 +20,8 @@ async function startServer(port, address) {
     port,
     address
   });
-  let routeConfiguringFunction = (0, _appiumBaseDriver.routeConfiguringFunction)(d);
-  let server = await (0, _appiumBaseDriver.server)({
+  let routeConfiguringFunction = (0, _baseDriver.routeConfiguringFunction)(d);
+  let server = await (0, _baseDriver.server)({
     routeConfiguringFunction,
     port,
     hostname: address
@@ -33,4 +33,4 @@ async function startServer(port, address) {
 }require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9zZXJ2ZXIuanMiXSwibmFtZXMiOlsic3RhcnRTZXJ2ZXIiLCJwb3J0IiwiYWRkcmVzcyIsImQiLCJTYWZhcmlEcml2ZXIiLCJyb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24iLCJzZXJ2ZXIiLCJob3N0bmFtZSIsImxvZyIsImluZm8iXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUE7O0FBQ0E7O0FBQ0E7O0FBRUEsZUFBZUEsV0FBZixDQUE0QkMsSUFBNUIsRUFBa0NDLE9BQWxDLEVBQTJDO0FBQ3pDLE1BQUlDLENBQUMsR0FBRyxJQUFJQyxlQUFKLENBQWlCO0FBQUNILElBQUFBLElBQUQ7QUFBT0MsSUFBQUE7QUFBUCxHQUFqQixDQUFSO0FBQ0EsTUFBSUcsd0JBQXdCLEdBQUcsZ0RBQVdGLENBQVgsQ0FBL0I7QUFDQSxNQUFJRyxNQUFNLEdBQUcsTUFBTSw4QkFBVztBQUFDRCxJQUFBQSx3QkFBRDtBQUEyQkosSUFBQUEsSUFBM0I7QUFBaUNNLElBQUFBLFFBQVEsRUFBRUw7QUFBM0MsR0FBWCxDQUFuQjs7QUFDQU0sa0JBQUlDLElBQUosQ0FBVSwyQ0FBMENQLE9BQVEsSUFBR0QsSUFBSyxFQUFwRTs7QUFDQSxTQUFPSyxNQUFQO0FBQ0QiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgbG9nIGZyb20gJy4vbG9nZ2VyJztcbmltcG9ydCB7IHNlcnZlciBhcyBiYXNlU2VydmVyLCByb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24gYXMgbWFrZVJvdXRlciB9IGZyb20gJ2FwcGl1bS1iYXNlLWRyaXZlcic7XG5pbXBvcnQgU2FmYXJpRHJpdmVyIGZyb20gJy4vZHJpdmVyJztcblxuYXN5bmMgZnVuY3Rpb24gc3RhcnRTZXJ2ZXIgKHBvcnQsIGFkZHJlc3MpIHtcbiAgbGV0IGQgPSBuZXcgU2FmYXJpRHJpdmVyKHtwb3J0LCBhZGRyZXNzfSk7XG4gIGxldCByb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24gPSBtYWtlUm91dGVyKGQpO1xuICBsZXQgc2VydmVyID0gYXdhaXQgYmFzZVNlcnZlcih7cm91dGVDb25maWd1cmluZ0Z1bmN0aW9uLCBwb3J0LCBob3N0bmFtZTogYWRkcmVzc30pO1xuICBsb2cuaW5mbyhgU2FmYXJpRHJpdmVyIHNlcnZlciBsaXN0ZW5pbmcgb24gaHR0cDovLyR7YWRkcmVzc306JHtwb3J0fWApO1xuICByZXR1cm4gc2VydmVyO1xufVxuXG5leHBvcnQgeyBzdGFydFNlcnZlciB9O1xuIl0sImZpbGUiOiJsaWIvc2VydmVyLmpzIiwic291cmNlUm9vdCI6Ii4uLy4uIn0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9zZXJ2ZXIuanMiXSwibmFtZXMiOlsic3RhcnRTZXJ2ZXIiLCJwb3J0IiwiYWRkcmVzcyIsImQiLCJTYWZhcmlEcml2ZXIiLCJyb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24iLCJzZXJ2ZXIiLCJob3N0bmFtZSIsImxvZyIsImluZm8iXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7O0FBQUE7O0FBQ0E7O0FBR0E7O0FBRUEsZUFBZUEsV0FBZixDQUE0QkMsSUFBNUIsRUFBa0NDLE9BQWxDLEVBQTJDO0FBQ3pDLE1BQUlDLENBQUMsR0FBRyxJQUFJQyxlQUFKLENBQWlCO0FBQUNILElBQUFBLElBQUQ7QUFBT0MsSUFBQUE7QUFBUCxHQUFqQixDQUFSO0FBQ0EsTUFBSUcsd0JBQXdCLEdBQUcsMENBQVdGLENBQVgsQ0FBL0I7QUFDQSxNQUFJRyxNQUFNLEdBQUcsTUFBTSx3QkFBVztBQUFDRCxJQUFBQSx3QkFBRDtBQUEyQkosSUFBQUEsSUFBM0I7QUFBaUNNLElBQUFBLFFBQVEsRUFBRUw7QUFBM0MsR0FBWCxDQUFuQjs7QUFDQU0sa0JBQUlDLElBQUosQ0FBVSwyQ0FBMENQLE9BQVEsSUFBR0QsSUFBSyxFQUFwRTs7QUFDQSxTQUFPSyxNQUFQO0FBQ0QiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgbG9nIGZyb20gJy4vbG9nZ2VyJztcbmltcG9ydCB7XG4gIHNlcnZlciBhcyBiYXNlU2VydmVyLCByb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24gYXMgbWFrZVJvdXRlclxufSBmcm9tICdAYXBwaXVtL2Jhc2UtZHJpdmVyJztcbmltcG9ydCBTYWZhcmlEcml2ZXIgZnJvbSAnLi9kcml2ZXInO1xuXG5hc3luYyBmdW5jdGlvbiBzdGFydFNlcnZlciAocG9ydCwgYWRkcmVzcykge1xuICBsZXQgZCA9IG5ldyBTYWZhcmlEcml2ZXIoe3BvcnQsIGFkZHJlc3N9KTtcbiAgbGV0IHJvdXRlQ29uZmlndXJpbmdGdW5jdGlvbiA9IG1ha2VSb3V0ZXIoZCk7XG4gIGxldCBzZXJ2ZXIgPSBhd2FpdCBiYXNlU2VydmVyKHtyb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24sIHBvcnQsIGhvc3RuYW1lOiBhZGRyZXNzfSk7XG4gIGxvZy5pbmZvKGBTYWZhcmlEcml2ZXIgc2VydmVyIGxpc3RlbmluZyBvbiBodHRwOi8vJHthZGRyZXNzfToke3BvcnR9YCk7XG4gIHJldHVybiBzZXJ2ZXI7XG59XG5cbmV4cG9ydCB7IHN0YXJ0U2VydmVyIH07XG4iXSwiZmlsZSI6ImxpYi9zZXJ2ZXIuanMiLCJzb3VyY2VSb290IjoiLi4vLi4ifQ==