@checkly/playwright-core 1.42.17 → 1.47.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ThirdPartyNotices.txt +144 -109
- package/browsers.json +15 -25
- package/lib/androidServerImpl.js +1 -1
- package/lib/browserServerImpl.js +1 -1
- package/lib/cli/driver.js +1 -3
- package/lib/cli/program.js +5 -10
- package/lib/client/android.js +1 -1
- package/lib/client/api.js +7 -0
- package/lib/client/browserContext.js +37 -5
- package/lib/client/browserType.js +19 -11
- package/lib/client/channelOwner.js +19 -16
- package/lib/client/clientInstrumentation.js +17 -7
- package/lib/client/clock.js +68 -0
- package/lib/client/connection.js +9 -6
- package/lib/client/electron.js +7 -5
- package/lib/client/elementHandle.js +44 -14
- package/lib/client/eventEmitter.js +314 -0
- package/lib/client/fetch.js +81 -28
- package/lib/client/frame.js +2 -4
- package/lib/client/jsHandle.js +7 -1
- package/lib/client/locator.js +9 -0
- package/lib/client/network.js +12 -9
- package/lib/client/page.js +45 -23
- package/lib/client/playwright.js +3 -0
- package/lib/client/tracing.js +7 -4
- package/lib/common/socksProxy.js +2 -2
- package/lib/generated/clockSource.js +7 -0
- package/lib/generated/injectedScriptSource.js +1 -1
- package/lib/generated/recorderSource.js +1 -1
- package/lib/generated/utilityScriptSource.js +1 -1
- package/lib/protocol/serializers.js +12 -11
- package/lib/protocol/validator.js +137 -55
- package/lib/server/bidi/bidiBrowser.js +296 -0
- package/lib/server/bidi/bidiConnection.js +206 -0
- package/lib/server/bidi/bidiExecutionContext.js +162 -0
- package/lib/server/bidi/bidiFirefox.js +110 -0
- package/lib/server/bidi/bidiInput.js +174 -0
- package/lib/server/bidi/bidiNetworkManager.js +304 -0
- package/lib/server/bidi/bidiPage.js +456 -0
- package/lib/server/bidi/third_party/bidiDeserializer.js +93 -0
- package/lib/server/bidi/third_party/bidiKeyboard.js +238 -0
- package/lib/server/bidi/third_party/bidiProtocol.js +139 -0
- package/lib/server/bidi/third_party/bidiSerializer.js +144 -0
- package/lib/server/browser.js +9 -1
- package/lib/server/browserContext.js +97 -22
- package/lib/server/browserType.js +27 -20
- package/lib/server/chromium/chromium.js +30 -15
- package/lib/server/chromium/chromiumSwitches.js +6 -3
- package/lib/server/chromium/crBrowser.js +11 -17
- package/lib/server/chromium/crConnection.js +2 -2
- package/lib/server/chromium/crDragDrop.js +28 -29
- package/lib/server/chromium/crNetworkManager.js +130 -84
- package/lib/server/chromium/crPage.js +34 -79
- package/lib/server/chromium/crProtocolHelper.js +3 -1
- package/lib/server/chromium/crServiceWorker.js +20 -23
- package/lib/server/chromium/videoRecorder.js +1 -1
- package/lib/server/clock.js +125 -0
- package/lib/server/codegen/csharp.js +299 -0
- package/lib/server/codegen/java.js +235 -0
- package/lib/server/codegen/javascript.js +223 -0
- package/lib/server/codegen/jsonl.js +47 -0
- package/lib/server/codegen/language.js +76 -0
- package/lib/server/codegen/languages.js +30 -0
- package/lib/server/codegen/python.js +265 -0
- package/lib/server/codegen/types.js +5 -0
- package/lib/server/debugController.js +3 -5
- package/lib/server/deviceDescriptors.js +9 -4
- package/lib/server/deviceDescriptorsSource.json +239 -119
- package/lib/server/dispatchers/androidDispatcher.js +1 -1
- package/lib/server/dispatchers/browserContextDispatcher.js +51 -7
- package/lib/server/dispatchers/dispatcher.js +36 -40
- package/lib/server/dispatchers/frameDispatcher.js +1 -2
- package/lib/server/dispatchers/jsHandleDispatcher.js +1 -1
- package/lib/server/dispatchers/jsonPipeDispatcher.js +4 -6
- package/lib/server/dispatchers/localUtilsDispatcher.js +19 -5
- package/lib/server/dispatchers/networkDispatchers.js +2 -2
- package/lib/server/dispatchers/pageDispatcher.js +5 -2
- package/lib/server/dispatchers/playwrightDispatcher.js +1 -0
- package/lib/server/dispatchers/writableStreamDispatcher.js +8 -5
- package/lib/server/dom.js +90 -53
- package/lib/server/electron/electron.js +21 -4
- package/lib/server/fetch.js +74 -25
- package/lib/server/fileUploadUtils.js +7 -3
- package/lib/server/firefox/ffBrowser.js +36 -25
- package/lib/server/firefox/ffConnection.js +2 -2
- package/lib/server/firefox/ffNetworkManager.js +6 -4
- package/lib/server/firefox/ffPage.js +22 -24
- package/lib/server/firefox/firefox.js +25 -6
- package/lib/server/frameSelectors.js +2 -2
- package/lib/server/frames.js +205 -159
- package/lib/server/har/harTracer.js +4 -12
- package/lib/server/helper.js +3 -3
- package/lib/server/index.js +18 -0
- package/lib/server/input.js +18 -8
- package/lib/server/instrumentation.js +0 -4
- package/lib/server/isomorphic/utilityScriptSerializers.js +19 -5
- package/lib/server/javascript.js +3 -2
- package/lib/server/launchApp.js +3 -2
- package/lib/server/network.js +14 -4
- package/lib/server/page.js +75 -46
- package/lib/server/playwright.js +5 -2
- package/lib/server/recorder/codeGenerator.js +2 -1
- package/lib/server/recorder/contextRecorder.js +316 -0
- package/lib/server/recorder/csharp.js +2 -1
- package/lib/server/recorder/java.js +2 -1
- package/lib/server/recorder/javascript.js +2 -1
- package/lib/server/recorder/jsonl.js +2 -1
- package/lib/server/recorder/language.js +2 -1
- package/lib/server/recorder/python.js +2 -1
- package/lib/server/recorder/recorderApp.js +14 -5
- package/lib/server/recorder/recorderCollection.js +127 -0
- package/lib/server/recorder/recorderRunner.js +177 -0
- package/lib/server/recorder/recorderUtils.js +23 -0
- package/lib/server/recorder/throttledFile.js +46 -0
- package/lib/server/recorder/utils.js +2 -1
- package/lib/server/recorder.js +42 -418
- package/lib/server/registry/index.js +99 -100
- package/lib/server/registry/nativeDeps.js +107 -0
- package/lib/server/screenshotter.js +6 -12
- package/lib/server/socksClientCertificatesInterceptor.js +328 -0
- package/lib/server/trace/recorder/snapshotter.js +4 -1
- package/lib/server/trace/recorder/tracing.js +27 -96
- package/lib/server/trace/viewer/traceViewer.js +54 -67
- package/lib/server/transport.js +1 -1
- package/lib/server/webkit/webkit.js +5 -5
- package/lib/server/webkit/wkBrowser.js +14 -14
- package/lib/server/webkit/wkConnection.js +3 -3
- package/lib/server/webkit/wkInterceptableRequest.js +8 -4
- package/lib/server/webkit/wkPage.js +52 -34
- package/lib/server/webkit/wkProvisionalPage.js +36 -1
- package/lib/utils/crypto.js +141 -0
- package/lib/utils/debugLogger.js +2 -0
- package/lib/utils/env.js +4 -2
- package/lib/utils/expectUtils.js +33 -0
- package/lib/utils/fileUtils.js +140 -1
- package/lib/utils/glob.js +2 -1
- package/lib/utils/happy-eyeballs.js +29 -2
- package/lib/utils/hostPlatform.js +13 -4
- package/lib/utils/httpServer.js +54 -13
- package/lib/utils/index.js +53 -31
- package/lib/utils/isomorphic/cssTokenizer.js +1 -1
- package/lib/utils/isomorphic/locatorParser.js +1 -1
- package/lib/utils/isomorphic/mimeType.js +29 -0
- package/lib/utils/isomorphic/stringUtils.js +28 -1
- package/lib/utils/isomorphic/urlMatch.js +120 -0
- package/lib/utils/mimeType.js +2 -1
- package/lib/utils/network.js +7 -35
- package/lib/utils/stackTrace.js +2 -4
- package/lib/utils/timeoutRunner.js +11 -76
- package/lib/utils/zones.js +23 -60
- package/lib/utilsBundle.js +2 -1
- package/lib/utilsBundleImpl/index.js +33 -31
- package/lib/vite/htmlReport/index.html +12 -12
- package/lib/vite/recorder/assets/codeMirrorModule-BN0yUF4I.js +24 -0
- package/lib/vite/recorder/assets/{codicon-zGuYmc9o.ttf → codicon-DCmgc-ay.ttf} +0 -0
- package/lib/vite/recorder/assets/index-B-MT5gKo.css +1 -0
- package/lib/vite/recorder/assets/index-DVt3E1Ef.js +47 -0
- package/lib/vite/recorder/index.html +2 -2
- package/lib/vite/traceViewer/assets/codeMirrorModule-5yiV-3wl.js +16831 -0
- package/lib/vite/traceViewer/assets/codeMirrorModule-B7Z3vq11.js +24 -0
- package/lib/vite/traceViewer/assets/codeMirrorModule-C6p3E9Zg.js +24 -0
- package/lib/vite/traceViewer/assets/codeMirrorModule-CcviAl53.js +16831 -0
- package/lib/vite/traceViewer/assets/codeMirrorModule-CqYUz5ms.js +24 -0
- package/lib/vite/traceViewer/assets/codeMirrorModule-DS3v0XrQ.js +24 -0
- package/lib/vite/traceViewer/assets/codeMirrorModule-Dx6AXgMV.js +16838 -0
- package/lib/vite/traceViewer/assets/codeMirrorModule-T_sdMrbM.js +24 -0
- package/lib/vite/traceViewer/assets/codeMirrorModule-V7N6ppkd.js +15585 -0
- package/lib/vite/traceViewer/assets/testServerConnection-D-tXL3sj.js +224 -0
- package/lib/vite/traceViewer/assets/testServerConnection-DeE2kSzz.js +1 -0
- package/lib/vite/traceViewer/assets/workbench-Bjkiwcr1.js +19119 -0
- package/lib/vite/traceViewer/assets/workbench-C43LWZEX.js +72 -0
- package/lib/vite/traceViewer/assets/workbench-C5OQh9VX.js +19119 -0
- package/lib/vite/traceViewer/assets/workbench-Crj6jzdv.js +19119 -0
- package/lib/vite/traceViewer/assets/workbench-DrQjKdyE.js +72 -0
- package/lib/vite/traceViewer/assets/workbench-Pa1v1Ojh.js +72 -0
- package/lib/vite/traceViewer/assets/workbench-caTaZnzx.js +72 -0
- package/lib/vite/traceViewer/assets/workbench-u2lRPMOT.js +72 -0
- package/lib/vite/traceViewer/assets/wsPort-EUvw-dwH.js +18540 -0
- package/lib/vite/traceViewer/assets/xtermModule-CZ7sDYXB.js +6529 -0
- package/lib/vite/traceViewer/assets/xtermModule-_6TC5FYT.js +6529 -0
- package/lib/vite/traceViewer/codeMirrorModule.Cy8X9Wtw.css +344 -0
- package/lib/vite/traceViewer/codeMirrorModule.svF_VrcJ.css +344 -0
- package/lib/vite/traceViewer/codicon.DCmgc-ay.ttf +0 -0
- package/lib/vite/traceViewer/embedded.BBZ9gQEw.js +104 -0
- package/lib/vite/traceViewer/embedded.BQq6Psnz.js +104 -0
- package/lib/vite/traceViewer/embedded.BVDVQOzc.js +2 -0
- package/lib/vite/traceViewer/embedded.Bn8Ptzv6.js +2 -0
- package/lib/vite/traceViewer/embedded.CvhnUgIi.js +2 -0
- package/lib/vite/traceViewer/embedded.D27cnKiB.js +104 -0
- package/lib/vite/traceViewer/embedded.DPqrDeET.js +2 -0
- package/lib/vite/traceViewer/embedded.DbzY7Q8w.js +2 -0
- package/lib/vite/traceViewer/embedded.DjZq4InJ.css +68 -0
- package/lib/vite/traceViewer/embedded.html +16 -0
- package/lib/vite/traceViewer/embedded.w7WN2u1R.css +1 -0
- package/lib/vite/traceViewer/index.5mge2rY_.css +124 -0
- package/lib/vite/traceViewer/index.6KJ-JQ0L.js +180 -0
- package/lib/vite/traceViewer/index.B8dgQwuN.js +2 -0
- package/lib/vite/traceViewer/index.BGj8jY3H.js +2 -0
- package/lib/vite/traceViewer/index.BSak5QT9.js +2 -0
- package/lib/vite/traceViewer/index.C0EgJ4oW.js +195 -0
- package/lib/vite/traceViewer/index.CUpI-BFe.js +195 -0
- package/lib/vite/traceViewer/{index.-g_5lMbJ.css → index.CrbWWHbf.css} +1 -1
- package/lib/vite/traceViewer/index.DkRbtWVo.js +195 -0
- package/lib/vite/traceViewer/index.QanXxRUb.css +131 -0
- package/lib/vite/traceViewer/index._cX8k4co.js +2 -0
- package/lib/vite/traceViewer/index.html +5 -4
- package/lib/vite/traceViewer/index.pMAN88y-.js +2 -0
- package/lib/vite/traceViewer/snapshot.html +1 -1
- package/lib/vite/traceViewer/sw.bundle.js +3 -4
- package/lib/vite/traceViewer/uiMode.D-tg1Oci.js +1730 -0
- package/lib/vite/traceViewer/uiMode.D3cNFP6u.css +1 -0
- package/lib/vite/traceViewer/uiMode.DKjMBMlc.js +1730 -0
- package/lib/vite/traceViewer/uiMode.DVWUEIHq.css +1424 -0
- package/lib/vite/traceViewer/uiMode.DVrL7a1K.js +10 -0
- package/lib/vite/traceViewer/uiMode.Dg9oJCQU.js +10 -0
- package/lib/vite/traceViewer/uiMode.DwZAzstF.js +10 -0
- package/lib/vite/traceViewer/uiMode.O07awP3T.js +10 -0
- package/lib/vite/traceViewer/uiMode.gGHHTsyL.js +1730 -0
- package/lib/vite/traceViewer/uiMode.html +5 -4
- package/lib/vite/traceViewer/uiMode.iq7CyYy7.js +1490 -0
- package/lib/vite/traceViewer/uiMode.jY2s-9ps.js +10 -0
- package/lib/vite/traceViewer/uiMode.xvJHbkzl.css +1324 -0
- package/lib/vite/traceViewer/workbench.B3X2QtYa.css +3702 -0
- package/lib/vite/traceViewer/workbench.DjbIuxix.css +1 -0
- package/lib/vite/traceViewer/workbench.DyTpxWVb.css +1 -0
- package/lib/vite/traceViewer/workbench.wuxQoE2z.css +3703 -0
- package/lib/vite/traceViewer/wsPort.p5jUwABW.css +3450 -0
- package/lib/vite/traceViewer/xtermModule.4oRVGWQ-.css +209 -0
- package/lib/vite/traceViewer/xtermModule.OKEVRlkP.css +209 -0
- package/package.json +2 -2
- package/types/protocol.d.ts +960 -78
- package/types/structs.d.ts +1 -1
- package/types/types.d.ts +3083 -2448
- package/lib/vite/recorder/assets/codeMirrorModule-I9ks4y7D.js +0 -24
- package/lib/vite/recorder/assets/index-ljsTwXtJ.css +0 -1
- package/lib/vite/recorder/assets/index-yg8ypzl6.js +0 -47
- package/lib/vite/traceViewer/assets/codeMirrorModule-0bpaqixv.js +0 -24
- package/lib/vite/traceViewer/assets/wsPort-_JBDEilC.js +0 -69
- package/lib/vite/traceViewer/index.u51inEcm.js +0 -2
- package/lib/vite/traceViewer/uiMode.Fb0bNA4H.js +0 -10
- package/lib/vite/traceViewer/uiMode.pWy0Re7G.css +0 -1
- package/lib/vite/traceViewer/wsPort.zR1WIy9-.css +0 -1
- /package/lib/vite/recorder/assets/{codeMirrorModule-Hs9-1ZG4.css → codeMirrorModule-ez37Vkbh.css} +0 -0
- /package/lib/vite/traceViewer/assets/{xtermModule-Yt6xwiJ_.js → xtermModule-BeNbaIVa.js} +0 -0
- /package/lib/vite/traceViewer/{codeMirrorModule.Hs9-1ZG4.css → codeMirrorModule.ez37Vkbh.css} +0 -0
- /package/lib/vite/traceViewer/{xtermModule.0lwXJFHT.css → xtermModule.DSXBckUd.css} +0 -0
package/lib/utils/crypto.js
CHANGED
|
@@ -5,7 +5,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.calculateSha1 = calculateSha1;
|
|
7
7
|
exports.createGuid = createGuid;
|
|
8
|
+
exports.generateSelfSignedCertificate = generateSelfSignedCertificate;
|
|
8
9
|
var _crypto = _interopRequireDefault(require("crypto"));
|
|
10
|
+
var _debug = require("./debug");
|
|
9
11
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
10
12
|
/**
|
|
11
13
|
* Copyright (c) Microsoft Corporation.
|
|
@@ -30,4 +32,143 @@ function calculateSha1(buffer) {
|
|
|
30
32
|
const hash = _crypto.default.createHash('sha1');
|
|
31
33
|
hash.update(buffer);
|
|
32
34
|
return hash.digest('hex');
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
// Variable-length quantity encoding aka. base-128 encoding
|
|
38
|
+
function encodeBase128(value) {
|
|
39
|
+
const bytes = [];
|
|
40
|
+
do {
|
|
41
|
+
let byte = value & 0x7f;
|
|
42
|
+
value >>>= 7;
|
|
43
|
+
if (bytes.length > 0) byte |= 0x80;
|
|
44
|
+
bytes.push(byte);
|
|
45
|
+
} while (value > 0);
|
|
46
|
+
return Buffer.from(bytes.reverse());
|
|
47
|
+
}
|
|
48
|
+
;
|
|
49
|
+
|
|
50
|
+
// ASN1/DER Speficiation: https://www.itu.int/rec/T-REC-X.680-X.693-202102-I/en
|
|
51
|
+
class DER {
|
|
52
|
+
static encodeSequence(data) {
|
|
53
|
+
return this._encode(0x30, Buffer.concat(data));
|
|
54
|
+
}
|
|
55
|
+
static encodeInteger(data) {
|
|
56
|
+
(0, _debug.assert)(data >= -128 && data <= 127);
|
|
57
|
+
return this._encode(0x02, Buffer.from([data]));
|
|
58
|
+
}
|
|
59
|
+
static encodeObjectIdentifier(oid) {
|
|
60
|
+
const parts = oid.split('.').map(v => Number(v));
|
|
61
|
+
// Encode the second part, which could be large, using base-128 encoding if necessary
|
|
62
|
+
const output = [encodeBase128(40 * parts[0] + parts[1])];
|
|
63
|
+
for (let i = 2; i < parts.length; i++) {
|
|
64
|
+
output.push(encodeBase128(parts[i]));
|
|
65
|
+
}
|
|
66
|
+
return this._encode(0x06, Buffer.concat(output));
|
|
67
|
+
}
|
|
68
|
+
static encodeNull() {
|
|
69
|
+
return Buffer.from([0x05, 0x00]);
|
|
70
|
+
}
|
|
71
|
+
static encodeSet(data) {
|
|
72
|
+
(0, _debug.assert)(data.length === 1, 'Only one item in the set is supported. We\'d need to sort the data to support more.');
|
|
73
|
+
// We expect the data to be already sorted.
|
|
74
|
+
return this._encode(0x31, Buffer.concat(data));
|
|
75
|
+
}
|
|
76
|
+
static encodeExplicitContextDependent(tag, data) {
|
|
77
|
+
return this._encode(0xa0 + tag, data);
|
|
78
|
+
}
|
|
79
|
+
static encodePrintableString(data) {
|
|
80
|
+
return this._encode(0x13, Buffer.from(data));
|
|
81
|
+
}
|
|
82
|
+
static encodeBitString(data) {
|
|
83
|
+
// The first byte of the content is the number of unused bits at the end
|
|
84
|
+
const unusedBits = 0; // Assuming all bits are used
|
|
85
|
+
const content = Buffer.concat([Buffer.from([unusedBits]), data]);
|
|
86
|
+
return this._encode(0x03, content);
|
|
87
|
+
}
|
|
88
|
+
static encodeDate(date) {
|
|
89
|
+
const year = date.getUTCFullYear();
|
|
90
|
+
const isGeneralizedTime = year >= 2050;
|
|
91
|
+
const parts = [isGeneralizedTime ? year.toString() : year.toString().slice(-2), (date.getUTCMonth() + 1).toString().padStart(2, '0'), date.getUTCDate().toString().padStart(2, '0'), date.getUTCHours().toString().padStart(2, '0'), date.getUTCMinutes().toString().padStart(2, '0'), date.getUTCSeconds().toString().padStart(2, '0')];
|
|
92
|
+
const encodedDate = parts.join('') + 'Z';
|
|
93
|
+
const tag = isGeneralizedTime ? 0x18 : 0x17; // 0x18 for GeneralizedTime, 0x17 for UTCTime
|
|
94
|
+
return this._encode(tag, Buffer.from(encodedDate));
|
|
95
|
+
}
|
|
96
|
+
static _encode(tag, data) {
|
|
97
|
+
const lengthBytes = this._encodeLength(data.length);
|
|
98
|
+
return Buffer.concat([Buffer.from([tag]), lengthBytes, data]);
|
|
99
|
+
}
|
|
100
|
+
static _encodeLength(length) {
|
|
101
|
+
if (length < 128) {
|
|
102
|
+
return Buffer.from([length]);
|
|
103
|
+
} else {
|
|
104
|
+
const lengthBytes = [];
|
|
105
|
+
while (length > 0) {
|
|
106
|
+
lengthBytes.unshift(length & 0xFF);
|
|
107
|
+
length >>= 8;
|
|
108
|
+
}
|
|
109
|
+
return Buffer.from([0x80 | lengthBytes.length, ...lengthBytes]);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
// X.509 Specification: https://datatracker.ietf.org/doc/html/rfc2459#section-4.1
|
|
115
|
+
function generateSelfSignedCertificate() {
|
|
116
|
+
const {
|
|
117
|
+
privateKey,
|
|
118
|
+
publicKey
|
|
119
|
+
} = _crypto.default.generateKeyPairSync('rsa', {
|
|
120
|
+
modulusLength: 2048
|
|
121
|
+
});
|
|
122
|
+
const publicKeyDer = publicKey.export({
|
|
123
|
+
type: 'pkcs1',
|
|
124
|
+
format: 'der'
|
|
125
|
+
});
|
|
126
|
+
const oneYearInMilliseconds = 365 * 24 * 60 * 60 * 1_000;
|
|
127
|
+
const notBefore = new Date(new Date().getTime() - oneYearInMilliseconds);
|
|
128
|
+
const notAfter = new Date(new Date().getTime() + oneYearInMilliseconds);
|
|
129
|
+
|
|
130
|
+
// List of fields / structure: https://datatracker.ietf.org/doc/html/rfc2459#section-4.1
|
|
131
|
+
const tbsCertificate = DER.encodeSequence([DER.encodeExplicitContextDependent(0, DER.encodeInteger(1)),
|
|
132
|
+
// version
|
|
133
|
+
DER.encodeInteger(1),
|
|
134
|
+
// serialNumber
|
|
135
|
+
DER.encodeSequence([DER.encodeObjectIdentifier('1.2.840.113549.1.1.11'),
|
|
136
|
+
// sha256WithRSAEncryption PKCS #1
|
|
137
|
+
DER.encodeNull()]),
|
|
138
|
+
// signature
|
|
139
|
+
DER.encodeSequence([DER.encodeSet([DER.encodeSequence([DER.encodeObjectIdentifier('2.5.4.3'),
|
|
140
|
+
// commonName X.520 DN component
|
|
141
|
+
DER.encodePrintableString('localhost')])]), DER.encodeSet([DER.encodeSequence([DER.encodeObjectIdentifier('2.5.4.10'),
|
|
142
|
+
// organizationName X.520 DN component
|
|
143
|
+
DER.encodePrintableString('Playwright Client Certificate Support')])])]),
|
|
144
|
+
// issuer
|
|
145
|
+
DER.encodeSequence([DER.encodeDate(notBefore),
|
|
146
|
+
// notBefore
|
|
147
|
+
DER.encodeDate(notAfter) // notAfter
|
|
148
|
+
]),
|
|
149
|
+
// validity
|
|
150
|
+
DER.encodeSequence([DER.encodeSet([DER.encodeSequence([DER.encodeObjectIdentifier('2.5.4.3'),
|
|
151
|
+
// commonName X.520 DN component
|
|
152
|
+
DER.encodePrintableString('localhost')])]), DER.encodeSet([DER.encodeSequence([DER.encodeObjectIdentifier('2.5.4.10'),
|
|
153
|
+
// organizationName X.520 DN component
|
|
154
|
+
DER.encodePrintableString('Playwright Client Certificate Support')])])]),
|
|
155
|
+
// subject
|
|
156
|
+
DER.encodeSequence([DER.encodeSequence([DER.encodeObjectIdentifier('1.2.840.113549.1.1.1'),
|
|
157
|
+
// rsaEncryption PKCS #1
|
|
158
|
+
DER.encodeNull()]), DER.encodeBitString(publicKeyDer)]) // SubjectPublicKeyInfo
|
|
159
|
+
]);
|
|
160
|
+
const signature = _crypto.default.sign('sha256', tbsCertificate, privateKey);
|
|
161
|
+
const certificate = DER.encodeSequence([tbsCertificate, DER.encodeSequence([DER.encodeObjectIdentifier('1.2.840.113549.1.1.11'),
|
|
162
|
+
// sha256WithRSAEncryption PKCS #1
|
|
163
|
+
DER.encodeNull()]), DER.encodeBitString(signature)]);
|
|
164
|
+
const certPem = ['-----BEGIN CERTIFICATE-----',
|
|
165
|
+
// Split the base64 string into lines of 64 characters
|
|
166
|
+
certificate.toString('base64').match(/.{1,64}/g).join('\n'), '-----END CERTIFICATE-----'].join('\n');
|
|
167
|
+
return {
|
|
168
|
+
cert: certPem,
|
|
169
|
+
key: privateKey.export({
|
|
170
|
+
type: 'pkcs1',
|
|
171
|
+
format: 'pem'
|
|
172
|
+
})
|
|
173
|
+
};
|
|
33
174
|
}
|
package/lib/utils/debugLogger.js
CHANGED
package/lib/utils/env.js
CHANGED
|
@@ -29,9 +29,11 @@ function getFromENV(name) {
|
|
|
29
29
|
value = value === undefined ? process.env[`npm_package_config_${name.toLowerCase()}`] : value;
|
|
30
30
|
return value;
|
|
31
31
|
}
|
|
32
|
-
function getAsBooleanFromENV(name) {
|
|
32
|
+
function getAsBooleanFromENV(name, defaultValue) {
|
|
33
33
|
const value = getFromENV(name);
|
|
34
|
-
|
|
34
|
+
if (value === 'false' || value === '0') return false;
|
|
35
|
+
if (value) return true;
|
|
36
|
+
return !!defaultValue;
|
|
35
37
|
}
|
|
36
38
|
function getPackageManager() {
|
|
37
39
|
const env = process.env.npm_config_user_agent || '';
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.serializeExpectedTextValues = serializeExpectedTextValues;
|
|
7
|
+
var _rtti = require("./rtti");
|
|
8
|
+
/**
|
|
9
|
+
* Copyright (c) Microsoft Corporation.
|
|
10
|
+
*
|
|
11
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
12
|
+
* you may not use this file except in compliance with the License.
|
|
13
|
+
* You may obtain a copy of the License at
|
|
14
|
+
*
|
|
15
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
16
|
+
*
|
|
17
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
18
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
19
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
20
|
+
* See the License for the specific language governing permissions and
|
|
21
|
+
* limitations under the License.
|
|
22
|
+
*/
|
|
23
|
+
|
|
24
|
+
function serializeExpectedTextValues(items, options = {}) {
|
|
25
|
+
return items.map(i => ({
|
|
26
|
+
string: (0, _rtti.isString)(i) ? i : undefined,
|
|
27
|
+
regexSource: (0, _rtti.isRegExp)(i) ? i.source : undefined,
|
|
28
|
+
regexFlags: (0, _rtti.isRegExp)(i) ? i.flags : undefined,
|
|
29
|
+
matchSubstring: options.matchSubstring,
|
|
30
|
+
ignoreCase: options.ignoreCase,
|
|
31
|
+
normalizeWhiteSpace: options.normalizeWhiteSpace
|
|
32
|
+
}));
|
|
33
|
+
}
|
package/lib/utils/fileUtils.js
CHANGED
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
+
exports.SerializedFS = void 0;
|
|
6
7
|
exports.canAccessFile = canAccessFile;
|
|
7
8
|
exports.copyFileAndMakeWritable = copyFileAndMakeWritable;
|
|
8
9
|
exports.fileUploadSizeLimit = exports.existsAsync = void 0;
|
|
@@ -12,6 +13,8 @@ exports.sanitizeForFilePath = sanitizeForFilePath;
|
|
|
12
13
|
exports.toPosixPath = toPosixPath;
|
|
13
14
|
var _fs = _interopRequireDefault(require("fs"));
|
|
14
15
|
var _path = _interopRequireDefault(require("path"));
|
|
16
|
+
var _manualPromise = require("./manualPromise");
|
|
17
|
+
var _zipBundle = require("../zipBundle");
|
|
15
18
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
16
19
|
/**
|
|
17
20
|
* Copyright (c) Microsoft Corporation.
|
|
@@ -63,4 +66,140 @@ function sanitizeForFilePath(s) {
|
|
|
63
66
|
}
|
|
64
67
|
function toPosixPath(aPath) {
|
|
65
68
|
return aPath.split(_path.default.sep).join(_path.default.posix.sep);
|
|
66
|
-
}
|
|
69
|
+
}
|
|
70
|
+
class SerializedFS {
|
|
71
|
+
constructor() {
|
|
72
|
+
this._buffers = new Map();
|
|
73
|
+
// Should never be accessed from within appendOperation.
|
|
74
|
+
this._error = void 0;
|
|
75
|
+
this._operations = [];
|
|
76
|
+
this._operationsDone = void 0;
|
|
77
|
+
this._operationsDone = new _manualPromise.ManualPromise();
|
|
78
|
+
this._operationsDone.resolve(); // No operations scheduled yet.
|
|
79
|
+
}
|
|
80
|
+
mkdir(dir) {
|
|
81
|
+
this._appendOperation({
|
|
82
|
+
op: 'mkdir',
|
|
83
|
+
dir
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
writeFile(file, content, skipIfExists) {
|
|
87
|
+
this._buffers.delete(file); // No need to flush the buffer since we'll overwrite anyway.
|
|
88
|
+
this._appendOperation({
|
|
89
|
+
op: 'writeFile',
|
|
90
|
+
file,
|
|
91
|
+
content,
|
|
92
|
+
skipIfExists
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
appendFile(file, text, flush) {
|
|
96
|
+
if (!this._buffers.has(file)) this._buffers.set(file, []);
|
|
97
|
+
this._buffers.get(file).push(text);
|
|
98
|
+
if (flush) this._flushFile(file);
|
|
99
|
+
}
|
|
100
|
+
_flushFile(file) {
|
|
101
|
+
const buffer = this._buffers.get(file);
|
|
102
|
+
if (buffer === undefined) return;
|
|
103
|
+
const content = buffer.join('');
|
|
104
|
+
this._buffers.delete(file);
|
|
105
|
+
this._appendOperation({
|
|
106
|
+
op: 'appendFile',
|
|
107
|
+
file,
|
|
108
|
+
content
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
copyFile(from, to) {
|
|
112
|
+
this._flushFile(from);
|
|
113
|
+
this._buffers.delete(to); // No need to flush the buffer since we'll overwrite anyway.
|
|
114
|
+
this._appendOperation({
|
|
115
|
+
op: 'copyFile',
|
|
116
|
+
from,
|
|
117
|
+
to
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
async syncAndGetError() {
|
|
121
|
+
for (const file of this._buffers.keys()) this._flushFile(file);
|
|
122
|
+
await this._operationsDone;
|
|
123
|
+
return this._error;
|
|
124
|
+
}
|
|
125
|
+
zip(entries, zipFileName) {
|
|
126
|
+
for (const file of this._buffers.keys()) this._flushFile(file);
|
|
127
|
+
|
|
128
|
+
// Chain the export operation against write operations,
|
|
129
|
+
// so that files do not change during the export.
|
|
130
|
+
this._appendOperation({
|
|
131
|
+
op: 'zip',
|
|
132
|
+
entries,
|
|
133
|
+
zipFileName
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
// This method serializes all writes to the trace.
|
|
138
|
+
_appendOperation(op) {
|
|
139
|
+
const last = this._operations[this._operations.length - 1];
|
|
140
|
+
if ((last === null || last === void 0 ? void 0 : last.op) === 'appendFile' && op.op === 'appendFile' && last.file === op.file) {
|
|
141
|
+
// Merge pending appendFile operations for performance.
|
|
142
|
+
last.content += op.content;
|
|
143
|
+
return;
|
|
144
|
+
}
|
|
145
|
+
this._operations.push(op);
|
|
146
|
+
if (this._operationsDone.isDone()) this._performOperations();
|
|
147
|
+
}
|
|
148
|
+
async _performOperations() {
|
|
149
|
+
this._operationsDone = new _manualPromise.ManualPromise();
|
|
150
|
+
while (this._operations.length) {
|
|
151
|
+
const op = this._operations.shift();
|
|
152
|
+
// Ignore all operations after the first error.
|
|
153
|
+
if (this._error) continue;
|
|
154
|
+
try {
|
|
155
|
+
await this._performOperation(op);
|
|
156
|
+
} catch (e) {
|
|
157
|
+
this._error = e;
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
this._operationsDone.resolve();
|
|
161
|
+
}
|
|
162
|
+
async _performOperation(op) {
|
|
163
|
+
switch (op.op) {
|
|
164
|
+
case 'mkdir':
|
|
165
|
+
{
|
|
166
|
+
await _fs.default.promises.mkdir(op.dir, {
|
|
167
|
+
recursive: true
|
|
168
|
+
});
|
|
169
|
+
return;
|
|
170
|
+
}
|
|
171
|
+
case 'writeFile':
|
|
172
|
+
{
|
|
173
|
+
// Note: 'wx' flag only writes when the file does not exist.
|
|
174
|
+
// See https://nodejs.org/api/fs.html#file-system-flags.
|
|
175
|
+
// This way tracing never have to write the same resource twice.
|
|
176
|
+
if (op.skipIfExists) await _fs.default.promises.writeFile(op.file, op.content, {
|
|
177
|
+
flag: 'wx'
|
|
178
|
+
}).catch(() => {});else await _fs.default.promises.writeFile(op.file, op.content);
|
|
179
|
+
return;
|
|
180
|
+
}
|
|
181
|
+
case 'copyFile':
|
|
182
|
+
{
|
|
183
|
+
await _fs.default.promises.copyFile(op.from, op.to);
|
|
184
|
+
return;
|
|
185
|
+
}
|
|
186
|
+
case 'appendFile':
|
|
187
|
+
{
|
|
188
|
+
await _fs.default.promises.appendFile(op.file, op.content);
|
|
189
|
+
return;
|
|
190
|
+
}
|
|
191
|
+
case 'zip':
|
|
192
|
+
{
|
|
193
|
+
const zipFile = new _zipBundle.yazl.ZipFile();
|
|
194
|
+
const result = new _manualPromise.ManualPromise();
|
|
195
|
+
zipFile.on('error', error => result.reject(error));
|
|
196
|
+
for (const entry of op.entries) zipFile.addFile(entry.value, entry.name);
|
|
197
|
+
zipFile.end();
|
|
198
|
+
zipFile.outputStream.pipe(_fs.default.createWriteStream(op.zipFileName)).on('close', () => result.resolve()).on('error', error => result.reject(error));
|
|
199
|
+
await result;
|
|
200
|
+
return;
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
exports.SerializedFS = SerializedFS;
|
package/lib/utils/glob.js
CHANGED
|
@@ -3,7 +3,9 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
+
exports.createConnectionAsync = createConnectionAsync;
|
|
6
7
|
exports.createSocket = createSocket;
|
|
8
|
+
exports.createTLSSocket = createTLSSocket;
|
|
7
9
|
exports.httpsHappyEyeballsAgent = exports.httpHappyEyeballsTimings = exports.httpHappyEyeballsAgent = void 0;
|
|
8
10
|
var dns = _interopRequireWildcard(require("dns"));
|
|
9
11
|
var http = _interopRequireWildcard(require("http"));
|
|
@@ -11,6 +13,7 @@ var https = _interopRequireWildcard(require("https"));
|
|
|
11
13
|
var net = _interopRequireWildcard(require("net"));
|
|
12
14
|
var tls = _interopRequireWildcard(require("tls"));
|
|
13
15
|
var _manualPromise = require("./manualPromise");
|
|
16
|
+
var _debug = require("./debug");
|
|
14
17
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
15
18
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
16
19
|
/**
|
|
@@ -59,8 +62,14 @@ class HttpsHappyEyeballsAgent extends https.Agent {
|
|
|
59
62
|
createConnectionAsync(options, oncreate, /* useTLS */true).catch(err => oncreate === null || oncreate === void 0 ? void 0 : oncreate(err));
|
|
60
63
|
}
|
|
61
64
|
}
|
|
62
|
-
|
|
63
|
-
|
|
65
|
+
|
|
66
|
+
// These options are aligned with the default Node.js globalAgent options.
|
|
67
|
+
const httpsHappyEyeballsAgent = exports.httpsHappyEyeballsAgent = new HttpsHappyEyeballsAgent({
|
|
68
|
+
keepAlive: true
|
|
69
|
+
});
|
|
70
|
+
const httpHappyEyeballsAgent = exports.httpHappyEyeballsAgent = new HttpHappyEyeballsAgent({
|
|
71
|
+
keepAlive: true
|
|
72
|
+
});
|
|
64
73
|
const httpHappyEyeballsTimings = exports.httpHappyEyeballsTimings = timings;
|
|
65
74
|
async function createSocket(host, port) {
|
|
66
75
|
return new Promise((resolve, reject) => {
|
|
@@ -82,6 +91,24 @@ async function createSocket(host, port) {
|
|
|
82
91
|
}
|
|
83
92
|
});
|
|
84
93
|
}
|
|
94
|
+
async function createTLSSocket(options) {
|
|
95
|
+
return new Promise((resolve, reject) => {
|
|
96
|
+
(0, _debug.assert)(options.host, 'host is required');
|
|
97
|
+
if (net.isIP(options.host)) {
|
|
98
|
+
const socket = tls.connect(options);
|
|
99
|
+
socket.on('secureConnect', () => resolve(socket));
|
|
100
|
+
socket.on('error', error => reject(error));
|
|
101
|
+
} else {
|
|
102
|
+
createConnectionAsync(options, (err, socket) => {
|
|
103
|
+
if (err) reject(err);
|
|
104
|
+
if (socket) {
|
|
105
|
+
socket.on('secureConnect', () => resolve(socket));
|
|
106
|
+
socket.on('error', error => reject(error));
|
|
107
|
+
}
|
|
108
|
+
}, true).catch(err => reject(err));
|
|
109
|
+
}
|
|
110
|
+
});
|
|
111
|
+
}
|
|
85
112
|
async function createConnectionAsync(options, oncreate, useTLS) {
|
|
86
113
|
const lookup = options.__testHookLookup || lookupAddresses;
|
|
87
114
|
const hostname = clientRequestArgsToHostName(options);
|
|
@@ -37,7 +37,7 @@ function calculatePlatform() {
|
|
|
37
37
|
macVersion = 'mac10.15';
|
|
38
38
|
} else {
|
|
39
39
|
// ver[0] >= 20
|
|
40
|
-
const LAST_STABLE_MAC_MAJOR_VERSION =
|
|
40
|
+
const LAST_STABLE_MAC_MAJOR_VERSION = 14;
|
|
41
41
|
// Best-effort support for MacOS beta versions.
|
|
42
42
|
macVersion = 'mac' + Math.min(ver[0] - 9, LAST_STABLE_MAC_MAJOR_VERSION);
|
|
43
43
|
// BigSur is the first version that might run on Apple Silicon.
|
|
@@ -69,21 +69,30 @@ function calculatePlatform() {
|
|
|
69
69
|
hostPlatform: 'ubuntu20.04' + archSuffix,
|
|
70
70
|
isOfficiallySupportedPlatform
|
|
71
71
|
};
|
|
72
|
-
return {
|
|
72
|
+
if (parseInt(distroInfo.version, 10) <= 22) return {
|
|
73
73
|
hostPlatform: 'ubuntu22.04' + archSuffix,
|
|
74
74
|
isOfficiallySupportedPlatform
|
|
75
75
|
};
|
|
76
|
+
return {
|
|
77
|
+
hostPlatform: 'ubuntu24.04' + archSuffix,
|
|
78
|
+
isOfficiallySupportedPlatform
|
|
79
|
+
};
|
|
76
80
|
}
|
|
77
81
|
// Linux Mint is ubuntu-based but does not have the same versions
|
|
78
82
|
if ((distroInfo === null || distroInfo === void 0 ? void 0 : distroInfo.id) === 'linuxmint') {
|
|
79
|
-
|
|
83
|
+
const mintMajor = parseInt(distroInfo.version, 10);
|
|
84
|
+
if (mintMajor <= 20) return {
|
|
80
85
|
hostPlatform: 'ubuntu20.04' + archSuffix,
|
|
81
86
|
isOfficiallySupportedPlatform: false
|
|
82
87
|
};
|
|
83
|
-
return {
|
|
88
|
+
if (mintMajor === 21) return {
|
|
84
89
|
hostPlatform: 'ubuntu22.04' + archSuffix,
|
|
85
90
|
isOfficiallySupportedPlatform: false
|
|
86
91
|
};
|
|
92
|
+
return {
|
|
93
|
+
hostPlatform: 'ubuntu24.04' + archSuffix,
|
|
94
|
+
isOfficiallySupportedPlatform: false
|
|
95
|
+
};
|
|
87
96
|
}
|
|
88
97
|
if ((distroInfo === null || distroInfo === void 0 ? void 0 : distroInfo.id) === 'debian' || (distroInfo === null || distroInfo === void 0 ? void 0 : distroInfo.id) === 'raspbian') {
|
|
89
98
|
const isOfficiallySupportedPlatform = (distroInfo === null || distroInfo === void 0 ? void 0 : distroInfo.id) === 'debian';
|
package/lib/utils/httpServer.js
CHANGED
|
@@ -10,6 +10,7 @@ var _utilsBundle = require("../utilsBundle");
|
|
|
10
10
|
var _debug = require("./debug");
|
|
11
11
|
var _network = require("./network");
|
|
12
12
|
var _manualPromise = require("./manualPromise");
|
|
13
|
+
var _crypto = require("./crypto");
|
|
13
14
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
14
15
|
/**
|
|
15
16
|
* Copyright (c) Microsoft Corporation.
|
|
@@ -28,13 +29,14 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
28
29
|
*/
|
|
29
30
|
|
|
30
31
|
class HttpServer {
|
|
31
|
-
constructor(
|
|
32
|
+
constructor() {
|
|
32
33
|
this._server = void 0;
|
|
33
|
-
this.
|
|
34
|
+
this._urlPrefixPrecise = '';
|
|
35
|
+
this._urlPrefixHumanReadable = '';
|
|
34
36
|
this._port = 0;
|
|
35
37
|
this._started = false;
|
|
36
38
|
this._routes = [];
|
|
37
|
-
this.
|
|
39
|
+
this._wsGuid = void 0;
|
|
38
40
|
this._server = (0, _network.createHttpServer)(this._onRequest.bind(this));
|
|
39
41
|
}
|
|
40
42
|
server() {
|
|
@@ -66,6 +68,45 @@ class HttpServer {
|
|
|
66
68
|
this._server.removeListener('error', errorListener);
|
|
67
69
|
}
|
|
68
70
|
}
|
|
71
|
+
createWebSocket(transport, guid) {
|
|
72
|
+
(0, _debug.assert)(!this._wsGuid, 'can only create one main websocket transport per server');
|
|
73
|
+
this._wsGuid = guid || (0, _crypto.createGuid)();
|
|
74
|
+
const wss = new _utilsBundle.wsServer({
|
|
75
|
+
server: this._server,
|
|
76
|
+
path: '/' + this._wsGuid
|
|
77
|
+
});
|
|
78
|
+
wss.on('connection', ws => {
|
|
79
|
+
transport.sendEvent = (method, params) => ws.send(JSON.stringify({
|
|
80
|
+
method,
|
|
81
|
+
params
|
|
82
|
+
}));
|
|
83
|
+
transport.close = () => ws.close();
|
|
84
|
+
ws.on('message', async message => {
|
|
85
|
+
const {
|
|
86
|
+
id,
|
|
87
|
+
method,
|
|
88
|
+
params
|
|
89
|
+
} = JSON.parse(String(message));
|
|
90
|
+
try {
|
|
91
|
+
const result = await transport.dispatch(method, params);
|
|
92
|
+
ws.send(JSON.stringify({
|
|
93
|
+
id,
|
|
94
|
+
result
|
|
95
|
+
}));
|
|
96
|
+
} catch (e) {
|
|
97
|
+
ws.send(JSON.stringify({
|
|
98
|
+
id,
|
|
99
|
+
error: String(e)
|
|
100
|
+
}));
|
|
101
|
+
}
|
|
102
|
+
});
|
|
103
|
+
ws.on('close', () => transport.onclose());
|
|
104
|
+
ws.on('error', () => transport.onclose());
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
wsGuid() {
|
|
108
|
+
return this._wsGuid;
|
|
109
|
+
}
|
|
69
110
|
async start(options = {}) {
|
|
70
111
|
(0, _debug.assert)(!this._started, 'server already started');
|
|
71
112
|
this._started = true;
|
|
@@ -82,21 +123,21 @@ class HttpServer {
|
|
|
82
123
|
}
|
|
83
124
|
const address = this._server.address();
|
|
84
125
|
(0, _debug.assert)(address, 'Could not bind server socket');
|
|
85
|
-
if (
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
}
|
|
126
|
+
if (typeof address === 'string') {
|
|
127
|
+
this._urlPrefixPrecise = address;
|
|
128
|
+
this._urlPrefixHumanReadable = address;
|
|
129
|
+
} else {
|
|
130
|
+
this._port = address.port;
|
|
131
|
+
const resolvedHost = address.family === 'IPv4' ? address.address : `[${address.address}]`;
|
|
132
|
+
this._urlPrefixPrecise = `http://${resolvedHost}:${address.port}`;
|
|
133
|
+
this._urlPrefixHumanReadable = `http://${host}:${address.port}`;
|
|
92
134
|
}
|
|
93
|
-
return this._urlPrefix;
|
|
94
135
|
}
|
|
95
136
|
async stop() {
|
|
96
137
|
await new Promise(cb => this._server.close(cb));
|
|
97
138
|
}
|
|
98
|
-
urlPrefix() {
|
|
99
|
-
return this.
|
|
139
|
+
urlPrefix(purpose) {
|
|
140
|
+
return purpose === 'human-readable' ? this._urlPrefixHumanReadable : this._urlPrefixPrecise;
|
|
100
141
|
}
|
|
101
142
|
serveFile(request, response, absoluteFilePath, headers) {
|
|
102
143
|
try {
|