@appium/base-driver 8.2.3 → 8.3.1

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.
Files changed (128) hide show
  1. package/build/lib/basedriver/capabilities.js +2 -4
  2. package/build/lib/basedriver/commands/event.js +2 -4
  3. package/build/lib/basedriver/commands/find.js +5 -14
  4. package/build/lib/basedriver/commands/index.js +2 -4
  5. package/build/lib/basedriver/commands/log.js +4 -9
  6. package/build/lib/basedriver/commands/session.js +19 -30
  7. package/build/lib/basedriver/commands/settings.js +5 -11
  8. package/build/lib/basedriver/commands/timeout.js +11 -18
  9. package/build/lib/basedriver/desired-caps.js +2 -4
  10. package/build/lib/basedriver/device-settings.js +15 -5
  11. package/build/lib/basedriver/driver.js +36 -23
  12. package/build/lib/basedriver/helpers.js +10 -12
  13. package/build/lib/basedriver/logger.js +2 -4
  14. package/build/lib/constants.js +2 -4
  15. package/build/lib/express/crash.js +2 -4
  16. package/build/lib/express/express-logging.js +3 -5
  17. package/build/lib/express/idempotency.js +3 -5
  18. package/build/lib/express/logger.js +2 -4
  19. package/build/lib/express/middleware.js +2 -4
  20. package/build/lib/express/server.js +2 -4
  21. package/build/lib/express/static.js +2 -4
  22. package/build/lib/express/websocket.js +2 -4
  23. package/build/lib/helpers/capabilities.js +37 -0
  24. package/build/lib/index.js +4 -8
  25. package/build/lib/jsonwp-proxy/protocol-converter.js +19 -15
  26. package/build/lib/jsonwp-proxy/proxy.js +20 -15
  27. package/build/lib/jsonwp-status/status.js +2 -4
  28. package/build/lib/protocol/errors.js +2 -4
  29. package/build/lib/protocol/helpers.js +2 -4
  30. package/build/lib/protocol/index.js +2 -4
  31. package/build/lib/protocol/protocol.js +37 -30
  32. package/build/lib/protocol/routes.js +68 -4
  33. package/build/lib/protocol/validators.js +2 -4
  34. package/build/test/basedriver/README.md +5 -0
  35. package/build/test/basedriver/driver-e2e-tests.js +2 -4
  36. package/build/test/basedriver/driver-tests.js +12 -17
  37. package/build/test/basedriver/index.js +2 -4
  38. package/build/test/e2e/basedriver/driver.e2e.spec.js +15 -0
  39. package/build/test/e2e/basedriver/helpers.e2e.spec.js +192 -0
  40. package/build/test/e2e/basedriver/websockets.e2e.spec.js +82 -0
  41. package/build/test/e2e/express/server.e2e.spec.js +159 -0
  42. package/build/test/e2e/jsonwp-proxy/proxy.e2e.spec.js +59 -0
  43. package/build/test/e2e/protocol/fake-driver.js +163 -0
  44. package/build/test/e2e/protocol/helpers.js +25 -0
  45. package/build/test/e2e/protocol/protocol.e2e.spec.js +1186 -0
  46. package/build/test/helpers.js +2 -4
  47. package/build/test/unit/basedriver/capabilities.spec.js +672 -0
  48. package/build/test/unit/basedriver/capability.spec.js +353 -0
  49. package/build/test/unit/basedriver/commands/event.spec.js +110 -0
  50. package/build/test/unit/basedriver/commands/log.spec.js +85 -0
  51. package/build/test/unit/basedriver/driver.spec.js +15 -0
  52. package/build/test/unit/basedriver/helpers.spec.js +151 -0
  53. package/build/test/unit/basedriver/timeout.spec.js +135 -0
  54. package/build/test/unit/express/server.spec.js +155 -0
  55. package/build/test/unit/express/static.spec.js +26 -0
  56. package/build/test/unit/jsonwp-proxy/mock-request.js +91 -0
  57. package/build/test/unit/jsonwp-proxy/protocol-converter.spec.js +171 -0
  58. package/build/test/unit/jsonwp-proxy/proxy.spec.js +292 -0
  59. package/build/test/unit/jsonwp-proxy/url.spec.js +165 -0
  60. package/build/test/unit/jsonwp-status/status.spec.js +34 -0
  61. package/build/test/unit/protocol/errors.spec.js +390 -0
  62. package/build/test/unit/protocol/routes.spec.js +80 -0
  63. package/build/test/unit/protocol/validator.spec.js +149 -0
  64. package/lib/basedriver/commands/find.js +3 -6
  65. package/lib/basedriver/commands/log.js +2 -4
  66. package/lib/basedriver/commands/session.js +21 -22
  67. package/lib/basedriver/commands/settings.js +3 -5
  68. package/lib/basedriver/commands/timeout.js +9 -10
  69. package/lib/basedriver/device-settings.js +10 -1
  70. package/lib/basedriver/driver.js +36 -12
  71. package/lib/basedriver/helpers.js +13 -11
  72. package/lib/express/express-logging.js +1 -1
  73. package/lib/express/idempotency.js +1 -1
  74. package/lib/helpers/capabilities.js +25 -0
  75. package/lib/index.js +2 -2
  76. package/lib/jsonwp-proxy/protocol-converter.js +14 -13
  77. package/lib/jsonwp-proxy/proxy.js +16 -12
  78. package/lib/protocol/protocol.js +34 -29
  79. package/lib/protocol/routes.js +60 -1
  80. package/package.json +36 -24
  81. package/test/basedriver/README.md +5 -0
  82. package/test/basedriver/driver-e2e-tests.js +1 -1
  83. package/test/basedriver/driver-tests.js +12 -7
  84. package/build/lib/protocol/sessions-cache.js +0 -88
  85. package/build/test/basedriver/capabilities-specs.js +0 -632
  86. package/build/test/basedriver/capability-specs.js +0 -396
  87. package/build/test/basedriver/commands/event-specs.js +0 -112
  88. package/build/test/basedriver/commands/log-specs.js +0 -80
  89. package/build/test/basedriver/driver-e2e-specs.js +0 -17
  90. package/build/test/basedriver/driver-specs.js +0 -17
  91. package/build/test/basedriver/helpers-e2e-specs.js +0 -194
  92. package/build/test/basedriver/helpers-specs.js +0 -153
  93. package/build/test/basedriver/timeout-specs.js +0 -139
  94. package/build/test/basedriver/websockets-e2e-specs.js +0 -84
  95. package/build/test/express/server-e2e-specs.js +0 -156
  96. package/build/test/express/server-specs.js +0 -151
  97. package/build/test/express/static-specs.js +0 -23
  98. package/build/test/jsonwp-proxy/mock-request.js +0 -93
  99. package/build/test/jsonwp-proxy/protocol-converter-specs.js +0 -173
  100. package/build/test/jsonwp-proxy/proxy-e2e-specs.js +0 -61
  101. package/build/test/jsonwp-proxy/proxy-specs.js +0 -294
  102. package/build/test/jsonwp-proxy/url-specs.js +0 -167
  103. package/build/test/jsonwp-status/status-specs.js +0 -36
  104. package/build/test/protocol/errors-specs.js +0 -388
  105. package/build/test/protocol/fake-driver.js +0 -168
  106. package/build/test/protocol/helpers.js +0 -27
  107. package/build/test/protocol/protocol-e2e-specs.js +0 -1182
  108. package/build/test/protocol/routes-specs.js +0 -82
  109. package/build/test/protocol/validator-specs.js +0 -151
  110. package/lib/protocol/sessions-cache.js +0 -74
  111. package/test/basedriver/capabilities-specs.js +0 -505
  112. package/test/basedriver/capability-specs.js +0 -409
  113. package/test/basedriver/commands/event-specs.js +0 -74
  114. package/test/basedriver/commands/log-specs.js +0 -70
  115. package/test/basedriver/driver-e2e-specs.js +0 -8
  116. package/test/basedriver/driver-specs.js +0 -8
  117. package/test/basedriver/fixtures/BadZippedApp.zip +0 -1
  118. package/test/basedriver/fixtures/FakeAndroidApp.apk +0 -1
  119. package/test/basedriver/fixtures/FakeAndroidApp.asd +0 -0
  120. package/test/basedriver/fixtures/FakeIOSApp.app +0 -1
  121. package/test/basedriver/fixtures/FakeIOSApp.app.zip +0 -0
  122. package/test/basedriver/fixtures/FakeIOSApp.ipa +0 -0
  123. package/test/basedriver/fixtures/custom-element-finder-bad.js +0 -5
  124. package/test/basedriver/fixtures/custom-element-finder.js +0 -29
  125. package/test/basedriver/helpers-e2e-specs.js +0 -187
  126. package/test/basedriver/helpers-specs.js +0 -137
  127. package/test/basedriver/timeout-specs.js +0 -133
  128. package/test/basedriver/websockets-e2e-specs.js +0 -75
@@ -1,139 +0,0 @@
1
- "use strict";
2
-
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
- require("source-map-support/register");
6
-
7
- var _lib = _interopRequireDefault(require("../../lib"));
8
-
9
- var _sinon = _interopRequireDefault(require("sinon"));
10
-
11
- describe('timeout', function () {
12
- let driver = new _lib.default();
13
- let implicitWaitSpy, newCommandTimeoutSpy;
14
- before(function () {
15
- implicitWaitSpy = _sinon.default.spy(driver, 'setImplicitWait');
16
- newCommandTimeoutSpy = _sinon.default.spy(driver, 'setNewCommandTimeout');
17
- });
18
- beforeEach(function () {
19
- driver.implicitWaitMs = 0;
20
- });
21
- afterEach(function () {
22
- implicitWaitSpy.resetHistory();
23
- newCommandTimeoutSpy.resetHistory();
24
- });
25
- describe('timeouts', function () {
26
- describe('errors', function () {
27
- it('should throw an error if something random is sent', async function () {
28
- await driver.timeouts('random timeout', 'howdy').should.eventually.be.rejected;
29
- });
30
- it('should throw an error if timeout is negative', async function () {
31
- await driver.timeouts('random timeout', -42).should.eventually.be.rejected;
32
- });
33
- it('should throw an errors if timeout type is unknown', async function () {
34
- await driver.timeouts('random timeout', 42).should.eventually.be.rejected;
35
- });
36
- it('should throw an error if something random is sent to scriptDuration', async function () {
37
- await driver.timeouts(undefined, undefined, 123, undefined, undefined).should.eventually.be.rejected;
38
- });
39
- it('should throw an error if something random is sent to pageLoadDuration', async function () {
40
- await driver.timeouts(undefined, undefined, undefined, 123, undefined).should.eventually.be.rejected;
41
- });
42
- });
43
- describe('implicit wait', function () {
44
- it('should call setImplicitWait when given an integer', async function () {
45
- await driver.timeouts('implicit', 42);
46
- implicitWaitSpy.calledOnce.should.be.true;
47
- implicitWaitSpy.firstCall.args[0].should.equal(42);
48
- driver.implicitWaitMs.should.eql(42);
49
- });
50
- it('should call setImplicitWait when given a string', async function () {
51
- await driver.timeouts('implicit', '42');
52
- implicitWaitSpy.calledOnce.should.be.true;
53
- implicitWaitSpy.firstCall.args[0].should.equal(42);
54
- driver.implicitWaitMs.should.eql(42);
55
- });
56
- it('should call setImplicitWait when given an integer to implicitDuration', async function () {
57
- await driver.timeouts(undefined, undefined, undefined, undefined, 42);
58
- implicitWaitSpy.calledOnce.should.be.true;
59
- implicitWaitSpy.firstCall.args[0].should.equal(42);
60
- driver.implicitWaitMs.should.eql(42);
61
- });
62
- it('should call setImplicitWait when given a string to implicitDuration', async function () {
63
- await driver.timeouts(undefined, undefined, undefined, undefined, '42');
64
- implicitWaitSpy.calledOnce.should.be.true;
65
- implicitWaitSpy.firstCall.args[0].should.equal(42);
66
- driver.implicitWaitMs.should.eql(42);
67
- });
68
- });
69
- });
70
- describe('implicitWait', function () {
71
- it('should call setImplicitWait when given an integer', async function () {
72
- await driver.implicitWait(42);
73
- implicitWaitSpy.calledOnce.should.be.true;
74
- implicitWaitSpy.firstCall.args[0].should.equal(42);
75
- driver.implicitWaitMs.should.eql(42);
76
- });
77
- it('should call setImplicitWait when given a string', async function () {
78
- await driver.implicitWait('42');
79
- implicitWaitSpy.calledOnce.should.be.true;
80
- implicitWaitSpy.firstCall.args[0].should.equal(42);
81
- driver.implicitWaitMs.should.eql(42);
82
- });
83
- it('should throw an error if something random is sent', async function () {
84
- await driver.implicitWait('howdy').should.eventually.be.rejected;
85
- });
86
- it('should throw an error if timeout is negative', async function () {
87
- await driver.implicitWait(-42).should.eventually.be.rejected;
88
- });
89
- });
90
- describe('set implicit wait', function () {
91
- it('should set the implicit wait with an integer', function () {
92
- driver.setImplicitWait(42);
93
- driver.implicitWaitMs.should.eql(42);
94
- });
95
- describe('with managed driver', function () {
96
- let managedDriver1 = new _lib.default();
97
- let managedDriver2 = new _lib.default();
98
- before(function () {
99
- driver.addManagedDriver(managedDriver1);
100
- driver.addManagedDriver(managedDriver2);
101
- });
102
- after(function () {
103
- driver.managedDrivers = [];
104
- });
105
- it('should set the implicit wait on managed drivers', function () {
106
- driver.setImplicitWait(42);
107
- driver.implicitWaitMs.should.eql(42);
108
- managedDriver1.implicitWaitMs.should.eql(42);
109
- managedDriver2.implicitWaitMs.should.eql(42);
110
- });
111
- });
112
- });
113
- describe('set new command timeout', function () {
114
- it('should set the new command timeout with an integer', function () {
115
- driver.setNewCommandTimeout(42);
116
- driver.newCommandTimeoutMs.should.eql(42);
117
- });
118
- describe('with managed driver', function () {
119
- let managedDriver1 = new _lib.default();
120
- let managedDriver2 = new _lib.default();
121
- before(function () {
122
- driver.addManagedDriver(managedDriver1);
123
- driver.addManagedDriver(managedDriver2);
124
- });
125
- after(function () {
126
- driver.managedDrivers = [];
127
- });
128
- it('should set the new command timeout on managed drivers', function () {
129
- driver.setNewCommandTimeout(42);
130
- driver.newCommandTimeoutMs.should.eql(42);
131
- managedDriver1.newCommandTimeoutMs.should.eql(42);
132
- managedDriver2.newCommandTimeoutMs.should.eql(42);
133
- });
134
- });
135
- });
136
- });require('source-map-support').install();
137
-
138
-
139
- //# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["test/basedriver/timeout-specs.js"],"names":["describe","driver","BaseDriver","implicitWaitSpy","newCommandTimeoutSpy","before","sinon","spy","beforeEach","implicitWaitMs","afterEach","resetHistory","it","timeouts","should","eventually","be","rejected","undefined","calledOnce","true","firstCall","args","equal","eql","implicitWait","setImplicitWait","managedDriver1","managedDriver2","addManagedDriver","after","managedDrivers","setNewCommandTimeout","newCommandTimeoutMs"],"mappings":"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","sourcesContent":["import BaseDriver from '../../lib';\nimport sinon from 'sinon';\n\n\n\n\ndescribe('timeout', function () {\n  let driver = new BaseDriver();\n  let implicitWaitSpy, newCommandTimeoutSpy;\n  before(function () {\n    implicitWaitSpy = sinon.spy(driver, 'setImplicitWait');\n    newCommandTimeoutSpy = sinon.spy(driver, 'setNewCommandTimeout');\n  });\n  beforeEach(function () {\n    driver.implicitWaitMs = 0;\n  });\n  afterEach(function () {\n    implicitWaitSpy.resetHistory();\n    newCommandTimeoutSpy.resetHistory();\n  });\n  describe('timeouts', function () {\n    describe('errors', function () {\n      it('should throw an error if something random is sent', async function () {\n        await driver.timeouts('random timeout', 'howdy').should.eventually.be.rejected;\n      });\n      it('should throw an error if timeout is negative', async function () {\n        await driver.timeouts('random timeout', -42).should.eventually.be.rejected;\n      });\n      it('should throw an errors if timeout type is unknown', async function () {\n        await driver.timeouts('random timeout', 42).should.eventually.be.rejected;\n      });\n      it('should throw an error if something random is sent to scriptDuration', async function () {\n        await driver.timeouts(undefined, undefined, 123, undefined, undefined).should.eventually.be.rejected;\n      });\n      it('should throw an error if something random is sent to pageLoadDuration', async function () {\n        await driver.timeouts(undefined, undefined, undefined, 123, undefined).should.eventually.be.rejected;\n      });\n    });\n    describe('implicit wait', function () {\n      it('should call setImplicitWait when given an integer', async function () {\n        await driver.timeouts('implicit', 42);\n        implicitWaitSpy.calledOnce.should.be.true;\n        implicitWaitSpy.firstCall.args[0].should.equal(42);\n        driver.implicitWaitMs.should.eql(42);\n      });\n      it('should call setImplicitWait when given a string', async function () {\n        await driver.timeouts('implicit', '42');\n        implicitWaitSpy.calledOnce.should.be.true;\n        implicitWaitSpy.firstCall.args[0].should.equal(42);\n        driver.implicitWaitMs.should.eql(42);\n      });\n      it('should call setImplicitWait when given an integer to implicitDuration', async function () {\n        await driver.timeouts(undefined, undefined, undefined, undefined, 42);\n        implicitWaitSpy.calledOnce.should.be.true;\n        implicitWaitSpy.firstCall.args[0].should.equal(42);\n        driver.implicitWaitMs.should.eql(42);\n      });\n      it('should call setImplicitWait when given a string to implicitDuration', async function () {\n        await driver.timeouts(undefined, undefined, undefined, undefined, '42');\n        implicitWaitSpy.calledOnce.should.be.true;\n        implicitWaitSpy.firstCall.args[0].should.equal(42);\n        driver.implicitWaitMs.should.eql(42);\n      });\n    });\n  });\n  describe('implicitWait', function () {\n    it('should call setImplicitWait when given an integer', async function () {\n      await driver.implicitWait(42);\n      implicitWaitSpy.calledOnce.should.be.true;\n      implicitWaitSpy.firstCall.args[0].should.equal(42);\n      driver.implicitWaitMs.should.eql(42);\n    });\n    it('should call setImplicitWait when given a string', async function () {\n      await driver.implicitWait('42');\n      implicitWaitSpy.calledOnce.should.be.true;\n      implicitWaitSpy.firstCall.args[0].should.equal(42);\n      driver.implicitWaitMs.should.eql(42);\n    });\n    it('should throw an error if something random is sent', async function () {\n      await driver.implicitWait('howdy').should.eventually.be.rejected;\n    });\n    it('should throw an error if timeout is negative', async function () {\n      await driver.implicitWait(-42).should.eventually.be.rejected;\n    });\n  });\n\n  describe('set implicit wait', function () {\n    it('should set the implicit wait with an integer', function () {\n      driver.setImplicitWait(42);\n      driver.implicitWaitMs.should.eql(42);\n    });\n    describe('with managed driver', function () {\n      let managedDriver1 = new BaseDriver();\n      let managedDriver2 = new BaseDriver();\n      before(function () {\n        driver.addManagedDriver(managedDriver1);\n        driver.addManagedDriver(managedDriver2);\n      });\n      after(function () {\n        driver.managedDrivers = [];\n      });\n      it('should set the implicit wait on managed drivers', function () {\n        driver.setImplicitWait(42);\n        driver.implicitWaitMs.should.eql(42);\n        managedDriver1.implicitWaitMs.should.eql(42);\n        managedDriver2.implicitWaitMs.should.eql(42);\n      });\n    });\n  });\n  describe('set new command timeout', function () {\n    it('should set the new command timeout with an integer', function () {\n      driver.setNewCommandTimeout(42);\n      driver.newCommandTimeoutMs.should.eql(42);\n    });\n    describe('with managed driver', function () {\n      let managedDriver1 = new BaseDriver();\n      let managedDriver2 = new BaseDriver();\n      before(function () {\n        driver.addManagedDriver(managedDriver1);\n        driver.addManagedDriver(managedDriver2);\n      });\n      after(function () {\n        driver.managedDrivers = [];\n      });\n      it('should set the new command timeout on managed drivers', function () {\n        driver.setNewCommandTimeout(42);\n        driver.newCommandTimeoutMs.should.eql(42);\n        managedDriver1.newCommandTimeoutMs.should.eql(42);\n        managedDriver2.newCommandTimeoutMs.should.eql(42);\n      });\n    });\n  });\n});\n"],"file":"test/basedriver/timeout-specs.js","sourceRoot":"../../.."}
@@ -1,84 +0,0 @@
1
- "use strict";
2
-
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
- require("source-map-support/register");
6
-
7
- var _lodash = _interopRequireDefault(require("lodash"));
8
-
9
- var _lib = require("../../lib");
10
-
11
- var _fakeDriver = require("../protocol/fake-driver");
12
-
13
- var _ws = _interopRequireDefault(require("ws"));
14
-
15
- var _bluebird = _interopRequireDefault(require("bluebird"));
16
-
17
- var _helpers = require("../helpers");
18
-
19
- describe('Websockets (e2e)', function () {
20
- let baseServer;
21
- let driver;
22
- let port;
23
- const SESSION_ID = 'foo';
24
- const WS_DATA = 'Hello';
25
- before(async function () {
26
- driver = new _fakeDriver.FakeDriver();
27
- driver.sessionId = SESSION_ID;
28
- port = await (0, _helpers.getTestPort)();
29
- baseServer = await (0, _lib.server)({
30
- routeConfiguringFunction: (0, _lib.routeConfiguringFunction)(driver),
31
- port
32
- });
33
- });
34
- after(async function () {
35
- await baseServer.close();
36
- });
37
- describe('web sockets support', function () {
38
- it('should be able to add websocket handler and remove it', async function () {
39
- const wss = new _ws.default.Server({
40
- noServer: true
41
- });
42
- wss.on('connection', ws => {
43
- if (ws && ws.readyState === _ws.default.OPEN) {
44
- ws.send(WS_DATA);
45
- }
46
- });
47
- const previousListenerCount = baseServer.listenerCount('upgrade');
48
- const endpoint = `${_lib.DEFAULT_WS_PATHNAME_PREFIX}/hello`;
49
- const timeout = 5000;
50
- await baseServer.addWebSocketHandler(endpoint, wss);
51
- baseServer.listenerCount('upgrade').should.be.above(previousListenerCount);
52
-
53
- _lodash.default.keys(await baseServer.getWebSocketHandlers()).length.should.eql(1);
54
-
55
- await new _bluebird.default((resolve, reject) => {
56
- const client = new _ws.default(`ws://${_helpers.TEST_HOST}:${port}${endpoint}`);
57
- client.on('connection', (ws, req) => {
58
- ws.should.not.be.empty;
59
- req.connection.remoteAddress.should.not.be.empty;
60
- });
61
- client.on('message', data => {
62
- data.should.eql(WS_DATA);
63
- resolve();
64
- });
65
- client.on('error', reject);
66
- setTimeout(() => reject(new Error('No websocket messages have been received after the timeout')), timeout);
67
- });
68
- (await baseServer.removeWebSocketHandler(endpoint)).should.be.true;
69
-
70
- _lodash.default.keys(await baseServer.getWebSocketHandlers()).length.should.eql(0);
71
-
72
- await new _bluebird.default((resolve, reject) => {
73
- const client = new _ws.default(`ws://${_helpers.TEST_HOST}:${port}${endpoint}`);
74
- client.on('message', data => reject(new Error(`No websocket messages are expected after the handler ` + `has been removed. '${data}' is received instead. `)));
75
- client.on('error', resolve);
76
- setTimeout(resolve, timeout);
77
- });
78
- baseServer.listenerCount('upgrade').should.be.above(previousListenerCount);
79
- });
80
- });
81
- });require('source-map-support').install();
82
-
83
-
84
- //# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["test/basedriver/websockets-e2e-specs.js"],"names":["describe","baseServer","driver","port","SESSION_ID","WS_DATA","before","FakeDriver","sessionId","routeConfiguringFunction","after","close","it","wss","WebSocket","Server","noServer","on","ws","readyState","OPEN","send","previousListenerCount","listenerCount","endpoint","DEFAULT_WS_PATHNAME_PREFIX","timeout","addWebSocketHandler","should","be","above","_","keys","getWebSocketHandlers","length","eql","B","resolve","reject","client","TEST_HOST","req","not","empty","connection","remoteAddress","data","setTimeout","Error","removeWebSocketHandler","true"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport { server, routeConfiguringFunction,\n         DEFAULT_WS_PATHNAME_PREFIX } from '../../lib';\nimport { FakeDriver } from '../protocol/fake-driver';\nimport WebSocket from 'ws';\nimport B from 'bluebird';\nimport {TEST_HOST, getTestPort} from '../helpers';\n\n\ndescribe('Websockets (e2e)', function () {\n  let baseServer;\n  let driver;\n  let port;\n  const SESSION_ID = 'foo';\n  const WS_DATA = 'Hello';\n\n  before(async function () {\n    driver = new FakeDriver();\n    driver.sessionId = SESSION_ID;\n    port = await getTestPort();\n    baseServer = await server({\n      routeConfiguringFunction: routeConfiguringFunction(driver),\n      port,\n    });\n  });\n  after(async function () {\n    await baseServer.close();\n  });\n\n  describe('web sockets support', function () {\n    it('should be able to add websocket handler and remove it', async function () {\n      const wss = new WebSocket.Server({\n        noServer: true,\n      });\n      wss.on('connection', (ws) => {\n        if (ws && ws.readyState === WebSocket.OPEN) {\n          ws.send(WS_DATA);\n        }\n      });\n      const previousListenerCount = baseServer.listenerCount('upgrade');\n      const endpoint = `${DEFAULT_WS_PATHNAME_PREFIX}/hello`;\n      const timeout = 5000;\n      await baseServer.addWebSocketHandler(endpoint, wss);\n      baseServer.listenerCount('upgrade').should.be.above(previousListenerCount);\n      _.keys(await baseServer.getWebSocketHandlers()).length.should.eql(1);\n      await new B((resolve, reject) => {\n        const client = new WebSocket(`ws://${TEST_HOST}:${port}${endpoint}`);\n        client.on('connection', (ws, req) => {\n          ws.should.not.be.empty;\n          req.connection.remoteAddress.should.not.be.empty;\n        });\n        client.on('message', (data) => {\n          data.should.eql(WS_DATA);\n          resolve();\n        });\n        client.on('error', reject);\n        setTimeout(() => reject(new Error('No websocket messages have been received after the timeout')),\n                   timeout);\n      });\n\n      (await baseServer.removeWebSocketHandler(endpoint)).should.be.true;\n      _.keys(await baseServer.getWebSocketHandlers()).length.should.eql(0);\n      await new B((resolve, reject) => {\n        const client = new WebSocket(`ws://${TEST_HOST}:${port}${endpoint}`);\n        client.on('message', (data) =>\n          reject(new Error(`No websocket messages are expected after the handler ` +\n                           `has been removed. '${data}' is received instead. `))\n        );\n        client.on('error', resolve);\n        setTimeout(resolve, timeout);\n      });\n      baseServer.listenerCount('upgrade').should.be.above(previousListenerCount);\n    });\n  });\n});\n"],"file":"test/basedriver/websockets-e2e-specs.js","sourceRoot":"../../.."}
@@ -1,156 +0,0 @@
1
- "use strict";
2
-
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
- require("source-map-support/register");
6
-
7
- var _lib = require("../../lib");
8
-
9
- var _axios = _interopRequireDefault(require("axios"));
10
-
11
- var _sinon = _interopRequireDefault(require("sinon"));
12
-
13
- var _bluebird = _interopRequireDefault(require("bluebird"));
14
-
15
- var _lodash = _interopRequireDefault(require("lodash"));
16
-
17
- var _helpers = require("../helpers");
18
-
19
- describe('server', function () {
20
- let hwServer;
21
- let errorStub;
22
- let port;
23
- before(async function () {
24
- port = await (0, _helpers.getTestPort)(true);
25
- errorStub = _sinon.default.stub(console, 'error');
26
-
27
- function configureRoutes(app) {
28
- app.get('/', (req, res) => {
29
- res.header['content-type'] = 'text/html';
30
- res.status(200).send('Hello World!');
31
- });
32
- app.get('/python', (req, res) => {
33
- res.status(200).send(req.headers['content-type']);
34
- });
35
- app.get('/error', () => {
36
- throw new Error('hahaha');
37
- });
38
- app.get('/pause', async (req, res) => {
39
- res.header['content-type'] = 'text/html';
40
- await _bluebird.default.delay(1000);
41
- res.status(200).send('We have waited!');
42
- });
43
- }
44
-
45
- hwServer = await (0, _lib.server)({
46
- routeConfiguringFunction: configureRoutes,
47
- port
48
- });
49
- });
50
- after(async function () {
51
- await hwServer.close();
52
- errorStub.restore();
53
- });
54
- it('should start up with our middleware', async function () {
55
- const {
56
- data
57
- } = await _axios.default.get(`http://${_helpers.TEST_HOST}:${port}/`);
58
- data.should.eql('Hello World!');
59
- });
60
- it('should fix broken context type', async function () {
61
- const {
62
- data
63
- } = await (0, _axios.default)({
64
- url: `http://${_helpers.TEST_HOST}:${port}/python`,
65
- headers: {
66
- 'user-agent': 'Python',
67
- 'content-type': 'application/x-www-form-urlencoded'
68
- }
69
- });
70
- data.should.eql('application/json; charset=utf-8');
71
- });
72
- it('should catch errors in the catchall', async function () {
73
- await _axios.default.get(`http://${_helpers.TEST_HOST}:${port}/error`).should.be.rejected;
74
- });
75
- it('should error if we try to start again on a port that is used', async function () {
76
- await (0, _lib.server)({
77
- routeConfiguringFunction() {},
78
-
79
- port
80
- }).should.be.rejectedWith(/EADDRINUSE/);
81
- });
82
- it('should not wait for the server close connections before finishing closing', async function () {
83
- let bodyPromise = _axios.default.get(`http://${_helpers.TEST_HOST}:${port}/pause`).catch(() => {});
84
-
85
- await _bluebird.default.delay(100);
86
- let before = Date.now();
87
- await hwServer.close();
88
- (Date.now() - before).should.not.be.above(800);
89
- await bodyPromise;
90
- });
91
- it('should error if we try to start on a bad hostname', async function () {
92
- this.timeout(60000);
93
- await (0, _lib.server)({
94
- routeConfiguringFunction: _lodash.default.noop,
95
- port,
96
- hostname: 'lolcathost'
97
- }).should.be.rejectedWith(/ENOTFOUND|EADDRNOTAVAIL|EAI_AGAIN/);
98
- await (0, _lib.server)({
99
- routeConfiguringFunction: _lodash.default.noop,
100
- port,
101
- hostname: '1.1.1.1'
102
- }).should.be.rejectedWith(/EADDRNOTAVAIL/);
103
- });
104
- });
105
- describe('server plugins', function () {
106
- let hwServer;
107
- let port;
108
- before(async function () {
109
- port = await (0, _helpers.getTestPort)(true);
110
- });
111
- afterEach(async function () {
112
- try {
113
- await hwServer.close();
114
- } catch (ign) {}
115
- });
116
-
117
- function updaterWithGetRoute(route, reply) {
118
- return async (app, httpServer) => {
119
- app.get(`/${route}`, (req, res) => {
120
- res.header['content-type'] = 'text/html';
121
- res.status(200).send(reply);
122
- });
123
- httpServer[`_updated_${route}`] = true;
124
- };
125
- }
126
-
127
- it('should allow one or more plugins to update the server', async function () {
128
- hwServer = await (0, _lib.server)({
129
- routeConfiguringFunction: _lodash.default.noop,
130
- port,
131
- serverUpdaters: [updaterWithGetRoute('plugin1', 'res from plugin1 route'), updaterWithGetRoute('plugin2', 'res from plugin2 route')]
132
- });
133
- let {
134
- data
135
- } = await _axios.default.get(`http://${_helpers.TEST_HOST}:${port}/plugin1`);
136
- data.should.eql('res from plugin1 route');
137
- ({
138
- data
139
- } = await _axios.default.get(`http://${_helpers.TEST_HOST}:${port}/plugin2`));
140
- data.should.eql('res from plugin2 route');
141
- hwServer._updated_plugin1.should.be.true;
142
- hwServer._updated_plugin2.should.be.true;
143
- });
144
- it('should pass on errors from the plugin updateServer method', async function () {
145
- await (0, _lib.server)({
146
- routeConfiguringFunction: _lodash.default.noop,
147
- port,
148
- serverUpdaters: [() => {
149
- throw new Error('ugh');
150
- }]
151
- }).should.eventually.be.rejectedWith(/ugh/);
152
- });
153
- });require('source-map-support').install();
154
-
155
-
156
- //# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["test/express/server-e2e-specs.js"],"names":["describe","hwServer","errorStub","port","before","sinon","stub","console","configureRoutes","app","get","req","res","header","status","send","headers","Error","B","delay","routeConfiguringFunction","after","close","restore","it","data","axios","TEST_HOST","should","eql","url","be","rejected","rejectedWith","bodyPromise","catch","Date","now","not","above","timeout","_","noop","hostname","afterEach","ign","updaterWithGetRoute","route","reply","httpServer","serverUpdaters","_updated_plugin1","true","_updated_plugin2","eventually"],"mappings":"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","sourcesContent":["// transpile:mocha\n\nimport { server } from '../../lib';\nimport axios from 'axios';\nimport sinon from 'sinon';\nimport B from 'bluebird';\nimport _ from 'lodash';\nimport {TEST_HOST, getTestPort} from '../helpers';\n\n\ndescribe('server', function () {\n  let hwServer;\n  let errorStub;\n  let port;\n  before(async function () {\n    port = await getTestPort(true);\n    errorStub = sinon.stub(console, 'error');\n    function configureRoutes (app) {\n      app.get('/', (req, res) => {\n        res.header['content-type'] = 'text/html';\n        res.status(200).send('Hello World!');\n      });\n      app.get('/python', (req, res) => {\n        res.status(200).send(req.headers['content-type']);\n      });\n      app.get('/error', () => {\n        throw new Error('hahaha');\n      });\n      app.get('/pause', async (req, res) => {\n        res.header['content-type'] = 'text/html';\n        await B.delay(1000);\n        res.status(200).send('We have waited!');\n      });\n    }\n    hwServer = await server({\n      routeConfiguringFunction: configureRoutes,\n      port,\n    });\n  });\n  after(async function () {\n    await hwServer.close();\n    errorStub.restore();\n  });\n\n  it('should start up with our middleware', async function () {\n    const {data} = await axios.get(`http://${TEST_HOST}:${port}/`);\n    data.should.eql('Hello World!');\n  });\n  it('should fix broken context type', async function () {\n    const {data} = await axios({\n      url: `http://${TEST_HOST}:${port}/python`,\n      headers: {\n        'user-agent': 'Python',\n        'content-type': 'application/x-www-form-urlencoded'\n      }\n    });\n    data.should.eql('application/json; charset=utf-8');\n  });\n  it('should catch errors in the catchall', async function () {\n    await axios.get(`http://${TEST_HOST}:${port}/error`).should.be.rejected;\n  });\n  it('should error if we try to start again on a port that is used', async function () {\n    await server({\n      routeConfiguringFunction () {},\n      port,\n    }).should.be.rejectedWith(/EADDRINUSE/);\n  });\n  it('should not wait for the server close connections before finishing closing', async function () {\n    let bodyPromise = axios.get(`http://${TEST_HOST}:${port}/pause`).catch(() => {});\n\n    // relinquish control so that we don't close before the request is received\n    await B.delay(100);\n\n    let before = Date.now();\n    await hwServer.close();\n    // expect slightly less than the request waited, since we paused above\n    (Date.now() - before).should.not.be.above(800);\n\n    await bodyPromise;\n  });\n  it('should error if we try to start on a bad hostname', async function () {\n    this.timeout(60000);\n    await server({\n      routeConfiguringFunction: _.noop,\n      port,\n      hostname: 'lolcathost',\n    }).should.be.rejectedWith(/ENOTFOUND|EADDRNOTAVAIL|EAI_AGAIN/);\n    await server({\n      routeConfiguringFunction: _.noop,\n      port,\n      hostname: '1.1.1.1',\n    }).should.be.rejectedWith(/EADDRNOTAVAIL/);\n  });\n});\n\ndescribe('server plugins', function () {\n  let hwServer;\n  let port;\n\n  before(async function () {\n    port = await getTestPort(true);\n  });\n\n  afterEach(async function () {\n    try {\n      await hwServer.close();\n    } catch (ign) {}\n  });\n\n  function updaterWithGetRoute (route, reply) {\n    return async (app, httpServer) => { // eslint-disable-line require-await\n      app.get(`/${route}`, (req, res) => {\n        res.header['content-type'] = 'text/html';\n        res.status(200).send(reply);\n      });\n      httpServer[`_updated_${route}`] = true;\n    };\n  }\n\n  it('should allow one or more plugins to update the server', async function () {\n    hwServer = await server({\n      routeConfiguringFunction: _.noop,\n      port,\n      serverUpdaters: [\n        updaterWithGetRoute('plugin1', 'res from plugin1 route'),\n        updaterWithGetRoute('plugin2', 'res from plugin2 route'),\n      ]\n    });\n    let {data} = await axios.get(`http://${TEST_HOST}:${port}/plugin1`);\n    data.should.eql('res from plugin1 route');\n    ({data} = await axios.get(`http://${TEST_HOST}:${port}/plugin2`));\n    data.should.eql('res from plugin2 route');\n    hwServer._updated_plugin1.should.be.true;\n    hwServer._updated_plugin2.should.be.true;\n  });\n  it('should pass on errors from the plugin updateServer method', async function () {\n    await server({\n      routeConfiguringFunction: _.noop,\n      port,\n      serverUpdaters: [() => { throw new Error('ugh');}]\n    }).should.eventually.be.rejectedWith(/ugh/);\n  });\n});\n"],"file":"test/express/server-e2e-specs.js","sourceRoot":"../../.."}
@@ -1,151 +0,0 @@
1
- "use strict";
2
-
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
- require("source-map-support/register");
6
-
7
- var _lib = require("../../lib");
8
-
9
- var _server2 = require("../../lib/express/server");
10
-
11
- var _sinon = _interopRequireDefault(require("sinon"));
12
-
13
- var _helpers = require("../helpers");
14
-
15
- function fakeApp() {
16
- const app = {
17
- use: _sinon.default.spy(),
18
- all: _sinon.default.spy(),
19
- get: _sinon.default.spy(),
20
- post: _sinon.default.spy(),
21
- delete: _sinon.default.spy(),
22
- totalCount: () => app.use.callCount + app.all.callCount + app.get.callCount + app.post.callCount + app.delete.callCount
23
- };
24
- return app;
25
- }
26
-
27
- const newMethodMap = {
28
- '/session/:sessionId/fake': {
29
- GET: {
30
- command: 'fakeGet'
31
- },
32
- POST: {
33
- command: 'fakePost',
34
- payloadParams: {
35
- required: ['fakeParam']
36
- }
37
- }
38
- }
39
- };
40
-
41
- const updateServer = (app, httpServer) => {
42
- app.updated = true;
43
- httpServer.updated = true;
44
- };
45
-
46
- function fakeDriver() {
47
- return {
48
- sessionExists: () => {},
49
- executeCommand: () => {}
50
- };
51
- }
52
-
53
- describe('server configuration', function () {
54
- let port;
55
- before(async function () {
56
- port = await (0, _helpers.getTestPort)(true);
57
- });
58
- it('should actually use the middleware', function () {
59
- const app = fakeApp();
60
-
61
- const configureRoutes = () => {};
62
-
63
- (0, _server2.configureServer)({
64
- app,
65
- addRoutes: configureRoutes
66
- });
67
- app.use.callCount.should.equal(14);
68
- app.all.callCount.should.equal(4);
69
- });
70
- it('should apply new methods in plugins to the standard method map', function () {
71
- const app1 = fakeApp();
72
- const app2 = fakeApp();
73
- const driver = fakeDriver();
74
- const addRoutes = (0, _lib.routeConfiguringFunction)(driver);
75
- (0, _server2.configureServer)({
76
- app: app1,
77
- addRoutes
78
- });
79
- (0, _server2.configureServer)({
80
- app: app2,
81
- addRoutes,
82
- extraMethodMap: newMethodMap
83
- });
84
- app2.totalCount().should.eql(app1.totalCount() + 2);
85
- });
86
- it('should silently reject new methods in plugins if not plain objects', function () {
87
- const app1 = fakeApp();
88
- const app2 = fakeApp();
89
- const driver = fakeDriver();
90
- const addRoutes = (0, _lib.routeConfiguringFunction)(driver);
91
- (0, _server2.configureServer)({
92
- app: app1,
93
- addRoutes
94
- });
95
- (0, _server2.configureServer)({
96
- app: app2,
97
- addRoutes,
98
- extraMethodMap: []
99
- });
100
- app2.totalCount().should.eql(app1.totalCount());
101
- });
102
- it('should allow plugins to update the server', async function () {
103
- const driver = fakeDriver();
104
-
105
- const _server = await (0, _lib.server)({
106
- routeConfiguringFunction: (0, _lib.routeConfiguringFunction)(driver),
107
- port,
108
- extraMethodMap: newMethodMap,
109
- serverUpdaters: [updateServer]
110
- });
111
-
112
- try {
113
- _server.updated.should.be.true;
114
- } finally {
115
- await _server.close();
116
- }
117
- });
118
- it('should reject if error thrown in configureRoutes parameter', async function () {
119
- const configureRoutes = () => {
120
- throw new Error('I am Mr. MeeSeeks look at me!');
121
- };
122
-
123
- await (0, _lib.server)({
124
- routeConfiguringFunction: configureRoutes,
125
- port
126
- }).should.be.rejectedWith('MeeSeeks');
127
- });
128
- describe('#normalizeBasePath', function () {
129
- it('should throw an error for paths of the wrong type', function () {
130
- should.throw(() => {
131
- (0, _server2.normalizeBasePath)(null);
132
- });
133
- should.throw(() => {
134
- (0, _server2.normalizeBasePath)(1);
135
- });
136
- });
137
- it('should remove trailing slashes', function () {
138
- (0, _server2.normalizeBasePath)('/wd/hub/').should.eql('/wd/hub');
139
- (0, _server2.normalizeBasePath)('/foo/').should.eql('/foo');
140
- (0, _server2.normalizeBasePath)('/').should.eql('');
141
- });
142
- it('should ensure a leading slash is present', function () {
143
- (0, _server2.normalizeBasePath)('foo').should.eql('/foo');
144
- (0, _server2.normalizeBasePath)('wd/hub').should.eql('/wd/hub');
145
- (0, _server2.normalizeBasePath)('wd/hub/').should.eql('/wd/hub');
146
- });
147
- });
148
- });require('source-map-support').install();
149
-
150
-
151
- //# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["test/express/server-specs.js"],"names":["fakeApp","app","use","sinon","spy","all","get","post","delete","totalCount","callCount","newMethodMap","GET","command","POST","payloadParams","required","updateServer","httpServer","updated","fakeDriver","sessionExists","executeCommand","describe","port","before","it","configureRoutes","addRoutes","should","equal","app1","app2","driver","extraMethodMap","eql","_server","routeConfiguringFunction","serverUpdaters","be","true","close","Error","rejectedWith","throw"],"mappings":"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","sourcesContent":["// transpile:mocha\n\nimport { server, routeConfiguringFunction } from '../../lib';\nimport { configureServer, normalizeBasePath } from '../../lib/express/server';\nimport sinon from 'sinon';\nimport {getTestPort} from '../helpers';\n\nfunction fakeApp () {\n  const app = {\n    use: sinon.spy(),\n    all: sinon.spy(),\n    get: sinon.spy(),\n    post: sinon.spy(),\n    delete: sinon.spy(),\n    totalCount: () => (\n      app.use.callCount + app.all.callCount + app.get.callCount + app.post.callCount +\n      app.delete.callCount\n    )\n  };\n  return app;\n}\n\nconst newMethodMap = {\n  '/session/:sessionId/fake': {\n    GET: {command: 'fakeGet'},\n    POST: {command: 'fakePost', payloadParams: {required: ['fakeParam']}}\n  },\n};\n\nconst updateServer = (app, httpServer) => {\n  app.updated = true;\n  httpServer.updated = true;\n};\n\nfunction fakeDriver () {\n  return {sessionExists: () => {}, executeCommand: () => {}};\n}\n\ndescribe('server configuration', function () {\n  let port;\n\n  before(async function () {\n    port = await getTestPort(true);\n  });\n\n  it('should actually use the middleware', function () {\n    const app = fakeApp();\n    const configureRoutes = () => {};\n    configureServer({app, addRoutes: configureRoutes});\n    app.use.callCount.should.equal(14);\n    app.all.callCount.should.equal(4);\n  });\n\n  it('should apply new methods in plugins to the standard method map', function () {\n    const app1 = fakeApp();\n    const app2 = fakeApp();\n    const driver = fakeDriver();\n    const addRoutes = routeConfiguringFunction(driver);\n    configureServer({app: app1, addRoutes});\n    configureServer({app: app2, addRoutes, extraMethodMap: newMethodMap});\n    app2.totalCount().should.eql(app1.totalCount() + 2);\n  });\n\n  it('should silently reject new methods in plugins if not plain objects', function () {\n    const app1 = fakeApp();\n    const app2 = fakeApp();\n    const driver = fakeDriver();\n    const addRoutes = routeConfiguringFunction(driver);\n    configureServer({app: app1, addRoutes});\n    configureServer({app: app2, addRoutes, extraMethodMap: []});\n    app2.totalCount().should.eql(app1.totalCount());\n  });\n\n  it('should allow plugins to update the server', async function () {\n    const driver = fakeDriver();\n    const _server = await server({\n      routeConfiguringFunction: routeConfiguringFunction(driver),\n      port,\n      extraMethodMap: newMethodMap,\n      serverUpdaters: [updateServer]\n    });\n    try {\n      _server.updated.should.be.true;\n    } finally {\n      await _server.close();\n    }\n  });\n\n  it('should reject if error thrown in configureRoutes parameter', async function () {\n    const configureRoutes = () => {\n      throw new Error('I am Mr. MeeSeeks look at me!');\n    };\n    await server({\n      routeConfiguringFunction: configureRoutes,\n      port,\n    }).should.be.rejectedWith('MeeSeeks');\n  });\n\n  describe('#normalizeBasePath', function () {\n    it('should throw an error for paths of the wrong type', function () {\n      should.throw(() => {\n        normalizeBasePath(null);\n      });\n      should.throw(() => {\n        normalizeBasePath(1);\n      });\n    });\n    it('should remove trailing slashes', function () {\n      normalizeBasePath('/wd/hub/').should.eql('/wd/hub');\n      normalizeBasePath('/foo/').should.eql('/foo');\n      normalizeBasePath('/').should.eql('');\n    });\n    it('should ensure a leading slash is present', function () {\n      normalizeBasePath('foo').should.eql('/foo');\n      normalizeBasePath('wd/hub').should.eql('/wd/hub');\n      normalizeBasePath('wd/hub/').should.eql('/wd/hub');\n    });\n  });\n});\n"],"file":"test/express/server-specs.js","sourceRoot":"../../.."}
@@ -1,23 +0,0 @@
1
- "use strict";
2
-
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
- require("source-map-support/register");
6
-
7
- var _static = require("../../lib/express/static");
8
-
9
- var _sinon = _interopRequireDefault(require("sinon"));
10
-
11
- describe('welcome', function () {
12
- it('should fill the template', async function () {
13
- let res = {
14
- send: _sinon.default.spy()
15
- };
16
- await (0, _static.welcome)({}, res);
17
- res.send.calledOnce.should.be.true;
18
- res.send.args[0][0].should.include('Let\'s browse!');
19
- });
20
- });require('source-map-support').install();
21
-
22
-
23
- //# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvZXhwcmVzcy9zdGF0aWMtc3BlY3MuanMiXSwibmFtZXMiOlsiZGVzY3JpYmUiLCJpdCIsInJlcyIsInNlbmQiLCJzaW5vbiIsInNweSIsImNhbGxlZE9uY2UiLCJzaG91bGQiLCJiZSIsInRydWUiLCJhcmdzIiwiaW5jbHVkZSJdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBRUE7O0FBQ0E7O0FBSUFBLFFBQVEsQ0FBQyxTQUFELEVBQVksWUFBWTtBQUM5QkMsRUFBQUEsRUFBRSxDQUFDLDBCQUFELEVBQTZCLGtCQUFrQjtBQUMvQyxRQUFJQyxHQUFHLEdBQUc7QUFDUkMsTUFBQUEsSUFBSSxFQUFFQyxlQUFNQyxHQUFOO0FBREUsS0FBVjtBQUdBLFVBQU0scUJBQVEsRUFBUixFQUFZSCxHQUFaLENBQU47QUFFQUEsSUFBQUEsR0FBRyxDQUFDQyxJQUFKLENBQVNHLFVBQVQsQ0FBb0JDLE1BQXBCLENBQTJCQyxFQUEzQixDQUE4QkMsSUFBOUI7QUFDQVAsSUFBQUEsR0FBRyxDQUFDQyxJQUFKLENBQVNPLElBQVQsQ0FBYyxDQUFkLEVBQWlCLENBQWpCLEVBQW9CSCxNQUFwQixDQUEyQkksT0FBM0IsQ0FBbUMsZ0JBQW5DO0FBQ0QsR0FSQyxDQUFGO0FBU0QsQ0FWTyxDQUFSIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdHJhbnNwaWxlOm1vY2hhXG5cbmltcG9ydCB7IHdlbGNvbWUgfSBmcm9tICcuLi8uLi9saWIvZXhwcmVzcy9zdGF0aWMnO1xuaW1wb3J0IHNpbm9uIGZyb20gJ3Npbm9uJztcblxuXG5cbmRlc2NyaWJlKCd3ZWxjb21lJywgZnVuY3Rpb24gKCkge1xuICBpdCgnc2hvdWxkIGZpbGwgdGhlIHRlbXBsYXRlJywgYXN5bmMgZnVuY3Rpb24gKCkge1xuICAgIGxldCByZXMgPSB7XG4gICAgICBzZW5kOiBzaW5vbi5zcHkoKVxuICAgIH07XG4gICAgYXdhaXQgd2VsY29tZSh7fSwgcmVzKTtcblxuICAgIHJlcy5zZW5kLmNhbGxlZE9uY2Uuc2hvdWxkLmJlLnRydWU7XG4gICAgcmVzLnNlbmQuYXJnc1swXVswXS5zaG91bGQuaW5jbHVkZSgnTGV0XFwncyBicm93c2UhJyk7XG4gIH0pO1xufSk7XG4iXSwiZmlsZSI6InRlc3QvZXhwcmVzcy9zdGF0aWMtc3BlY3MuanMiLCJzb3VyY2VSb290IjoiLi4vLi4vLi4ifQ==