patchright-core 1.51.2 → 1.52.0
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/browsers.json +15 -13
- package/lib/androidServerImpl.js +42 -48
- package/lib/browserServerImpl.js +54 -67
- package/lib/cli/driver.js +71 -69
- package/lib/cli/program.js +312 -328
- package/lib/cli/programWithTestStub.js +51 -45
- package/lib/client/accessibility.js +31 -32
- package/lib/client/android.js +141 -228
- package/lib/client/api.js +135 -283
- package/lib/client/artifact.js +39 -36
- package/lib/client/browser.js +57 -61
- package/lib/client/browserContext.js +297 -326
- package/lib/client/browserType.js +92 -106
- package/lib/client/cdpSession.js +29 -31
- package/lib/client/channelOwner.js +82 -95
- package/lib/client/clientHelper.js +46 -38
- package/lib/client/clientInstrumentation.js +40 -37
- package/lib/client/clientStackTrace.js +41 -37
- package/lib/client/clock.js +36 -36
- package/lib/client/connection.js +190 -212
- package/lib/client/consoleMessage.js +31 -28
- package/lib/client/coverage.js +25 -22
- package/lib/client/dialog.js +30 -31
- package/lib/client/download.js +25 -25
- package/lib/client/electron.js +73 -75
- package/lib/client/elementHandle.js +111 -147
- package/lib/client/errors.js +53 -53
- package/lib/client/eventEmitter.js +124 -121
- package/lib/client/events.js +72 -68
- package/lib/client/fetch.js +135 -158
- package/lib/client/fileChooser.js +25 -24
- package/lib/client/fileUtils.js +31 -28
- package/lib/client/frame.js +187 -306
- package/lib/client/harRouter.js +42 -52
- package/lib/client/input.js +40 -69
- package/lib/client/jsHandle.js +54 -69
- package/lib/client/jsonPipe.js +27 -23
- package/lib/client/localUtils.js +29 -28
- package/lib/client/locator.js +161 -245
- package/lib/client/network.js +277 -295
- package/lib/client/page.js +270 -318
- package/lib/client/platform.js +46 -43
- package/lib/client/playwright.js +51 -66
- package/lib/client/selectors.js +48 -46
- package/lib/client/stream.js +29 -25
- package/lib/client/timeoutSettings.js +49 -39
- package/lib/client/tracing.js +48 -84
- package/lib/client/types.js +26 -22
- package/lib/client/video.js +35 -27
- package/lib/client/waiter.js +69 -88
- package/lib/client/webError.js +25 -23
- package/lib/client/webSocket.js +61 -56
- package/lib/client/worker.js +48 -58
- package/lib/client/writableStream.js +27 -23
- package/lib/generated/clockSource.js +26 -5
- package/lib/generated/consoleApiSource.js +26 -5
- package/lib/generated/injectedScriptSource.js +26 -5
- package/lib/generated/pollingRecorderSource.js +26 -5
- package/lib/generated/utilityScriptSource.js +26 -5
- package/lib/generated/webSocketMockSource.js +375 -4
- package/lib/inProcessFactory.js +53 -53
- package/lib/inprocess.js +2 -19
- package/lib/outofprocess.js +53 -46
- package/lib/protocol/debug.js +209 -25
- package/lib/protocol/serializers.js +153 -134
- package/lib/protocol/validator.js +2714 -2714
- package/lib/protocol/validatorPrimitives.js +114 -73
- package/lib/remote/playwrightConnection.js +140 -157
- package/lib/remote/playwrightServer.js +99 -84
- package/lib/server/accessibility.js +44 -37
- package/lib/server/android/android.js +216 -209
- package/lib/server/android/backendAdb.js +89 -82
- package/lib/server/artifact.js +78 -55
- package/lib/server/bidi/bidiBrowser.js +221 -155
- package/lib/server/bidi/bidiChromium.js +106 -79
- package/lib/server/bidi/bidiConnection.js +66 -83
- package/lib/server/bidi/bidiExecutionContext.js +128 -113
- package/lib/server/bidi/bidiFirefox.js +76 -69
- package/lib/server/bidi/bidiInput.js +86 -97
- package/lib/server/bidi/bidiNetworkManager.js +137 -154
- package/lib/server/bidi/bidiOverCdp.js +57 -58
- package/lib/server/bidi/bidiPage.js +247 -219
- package/lib/server/bidi/bidiPdf.js +52 -86
- package/lib/server/bidi/third_party/bidiCommands.d.js +22 -0
- package/lib/server/bidi/third_party/bidiDeserializer.js +55 -50
- package/lib/server/bidi/third_party/bidiKeyboard.js +236 -220
- package/lib/server/bidi/third_party/bidiProtocol.js +144 -131
- package/lib/server/bidi/third_party/bidiSerializer.js +67 -63
- package/lib/server/bidi/third_party/firefoxPrefs.js +141 -119
- package/lib/server/browser.js +76 -84
- package/lib/server/browserContext.js +321 -346
- package/lib/server/browserType.js +169 -182
- package/lib/server/callLog.js +47 -44
- package/lib/server/chromium/chromium.js +212 -190
- package/lib/server/chromium/chromiumSwitches.js +86 -64
- package/lib/server/chromium/crAccessibility.js +157 -131
- package/lib/server/chromium/crBrowser.js +253 -273
- package/lib/server/chromium/crConnection.js +91 -116
- package/lib/server/chromium/crCoverage.js +113 -127
- package/lib/server/chromium/crDevTools.js +59 -51
- package/lib/server/chromium/crDragDrop.js +62 -79
- package/lib/server/chromium/crExecutionContext.js +88 -83
- package/lib/server/chromium/crInput.js +97 -95
- package/lib/server/chromium/crNetworkManager.js +288 -403
- package/lib/server/chromium/crPage.js +522 -608
- package/lib/server/chromium/crPdf.js +54 -86
- package/lib/server/chromium/crProtocolHelper.js +92 -80
- package/lib/server/chromium/crServiceWorker.js +82 -67
- package/lib/server/chromium/defaultFontFamilies.js +152 -135
- package/lib/server/chromium/protocol.d.js +16 -0
- package/lib/server/chromium/videoRecorder.js +65 -99
- package/lib/server/clock.js +62 -50
- package/lib/server/codegen/csharp.js +185 -160
- package/lib/server/codegen/java.js +155 -128
- package/lib/server/codegen/javascript.js +163 -148
- package/lib/server/codegen/jsonl.js +32 -28
- package/lib/server/codegen/language.js +75 -52
- package/lib/server/codegen/languages.js +65 -27
- package/lib/server/codegen/python.js +140 -125
- package/lib/server/codegen/types.js +15 -4
- package/lib/server/console.js +28 -32
- package/lib/server/cookieStore.js +105 -86
- package/lib/server/debugController.js +97 -124
- package/lib/server/debugger.js +82 -78
- package/lib/server/deviceDescriptors.js +37 -24
- package/lib/server/deviceDescriptorsSource.json +50 -50
- package/lib/server/dialog.js +36 -35
- package/lib/server/dispatchers/androidDispatcher.js +196 -107
- package/lib/server/dispatchers/artifactDispatcher.js +62 -62
- package/lib/server/dispatchers/browserContextDispatcher.js +176 -205
- package/lib/server/dispatchers/browserDispatcher.js +78 -97
- package/lib/server/dispatchers/browserTypeDispatcher.js +35 -35
- package/lib/server/dispatchers/cdpSessionDispatcher.js +32 -36
- package/lib/server/dispatchers/debugControllerDispatcher.js +48 -66
- package/lib/server/dispatchers/dialogDispatcher.js +30 -27
- package/lib/server/dispatchers/dispatcher.js +169 -220
- package/lib/server/dispatchers/electronDispatcher.js +54 -57
- package/lib/server/dispatchers/elementHandlerDispatcher.js +77 -119
- package/lib/server/dispatchers/frameDispatcher.js +99 -163
- package/lib/server/dispatchers/jsHandleDispatcher.js +49 -66
- package/lib/server/dispatchers/jsonPipeDispatcher.js +35 -36
- package/lib/server/dispatchers/localUtilsDispatcher.js +95 -80
- package/lib/server/dispatchers/networkDispatchers.js +90 -107
- package/lib/server/dispatchers/pageDispatcher.js +128 -169
- package/lib/server/dispatchers/playwrightDispatcher.js +69 -76
- package/lib/server/dispatchers/selectorsDispatcher.js +28 -24
- package/lib/server/dispatchers/streamDispatcher.js +42 -45
- package/lib/server/dispatchers/tracingDispatcher.js +36 -41
- package/lib/server/dispatchers/webSocketRouteDispatcher.js +96 -131
- package/lib/server/dispatchers/writableStreamDispatcher.js +54 -38
- package/lib/server/dom.js +413 -443
- package/lib/server/download.js +45 -35
- package/lib/server/electron/electron.js +156 -176
- package/lib/server/electron/loader.js +8 -36
- package/lib/server/errors.js +47 -46
- package/lib/server/fetch.js +289 -323
- package/lib/server/fileChooser.js +25 -24
- package/lib/server/fileUploadUtils.js +65 -59
- package/lib/server/firefox/ffAccessibility.js +153 -131
- package/lib/server/firefox/ffBrowser.js +213 -277
- package/lib/server/firefox/ffConnection.js +63 -84
- package/lib/server/firefox/ffExecutionContext.js +91 -73
- package/lib/server/firefox/ffInput.js +67 -69
- package/lib/server/firefox/ffNetworkManager.js +131 -110
- package/lib/server/firefox/ffPage.js +236 -273
- package/lib/server/firefox/firefox.js +76 -67
- package/lib/server/firefox/protocol.d.js +16 -0
- package/lib/server/formData.js +107 -35
- package/lib/server/frameSelectors.js +77 -111
- package/lib/server/frames.js +741 -891
- package/lib/server/har/harRecorder.js +85 -77
- package/lib/server/har/harTracer.js +287 -222
- package/lib/server/harBackend.js +80 -80
- package/lib/server/helper.js +56 -59
- package/lib/server/index.js +59 -99
- package/lib/server/input.js +134 -163
- package/lib/server/instrumentation.js +49 -44
- package/lib/server/javascript.js +143 -134
- package/lib/server/launchApp.js +92 -73
- package/lib/server/localUtils.js +130 -122
- package/lib/server/macEditingCommands.js +141 -137
- package/lib/server/network.js +262 -296
- package/lib/server/page.js +329 -426
- package/lib/server/pageBinding.js +88 -0
- package/lib/server/pipeTransport.js +49 -45
- package/lib/server/playwright.js +60 -67
- package/lib/server/progress.js +56 -51
- package/lib/server/protocolError.js +34 -31
- package/lib/server/recorder/chat.js +70 -86
- package/lib/server/recorder/contextRecorder.js +134 -138
- package/lib/server/recorder/recorderApp.js +127 -136
- package/lib/server/recorder/recorderCollection.js +56 -44
- package/lib/server/recorder/recorderFrontend.js +15 -4
- package/lib/server/recorder/recorderRunner.js +79 -103
- package/lib/server/recorder/recorderUtils.js +56 -45
- package/lib/server/recorder/throttledFile.js +42 -30
- package/lib/server/recorder.js +177 -186
- package/lib/server/registry/browserFetcher.js +106 -101
- package/lib/server/registry/dependencies.js +245 -196
- package/lib/server/registry/index.js +904 -792
- package/lib/server/registry/nativeDeps.js +1073 -464
- package/lib/server/registry/oopDownloadBrowserMain.js +57 -75
- package/lib/server/screenshotter.js +166 -182
- package/lib/server/selectors.js +85 -46
- package/lib/server/socksClientCertificatesInterceptor.js +166 -185
- package/lib/server/socksInterceptor.js +62 -70
- package/lib/server/storageScript.js +94 -100
- package/lib/server/timeoutSettings.js +58 -43
- package/lib/server/trace/recorder/snapshotter.js +70 -89
- package/lib/server/trace/recorder/snapshotterInjected.js +238 -217
- package/lib/server/trace/recorder/tracing.js +321 -333
- package/lib/server/trace/test/inMemorySnapshotter.js +46 -52
- package/lib/server/trace/viewer/traceViewer.js +168 -146
- package/lib/server/transport.js +124 -133
- package/lib/server/types.js +26 -22
- package/lib/server/usKeyboardLayout.js +135 -545
- package/lib/server/utils/ascii.js +39 -26
- package/lib/server/utils/comparators.js +105 -103
- package/lib/server/utils/crypto.js +157 -112
- package/lib/server/utils/debug.js +37 -28
- package/lib/server/utils/debugLogger.js +69 -48
- package/lib/server/utils/env.js +52 -37
- package/lib/server/utils/eventsHelper.js +29 -28
- package/lib/server/utils/expectUtils.js +31 -26
- package/lib/server/utils/fileUtils.js +123 -136
- package/lib/server/utils/happyEyeballs.js +138 -123
- package/lib/server/utils/hostPlatform.js +84 -120
- package/lib/server/utils/httpServer.js +106 -121
- package/lib/server/utils/image_tools/colorUtils.js +42 -51
- package/lib/server/utils/image_tools/compare.js +44 -43
- package/lib/server/utils/image_tools/imageChannel.js +38 -30
- package/lib/server/utils/image_tools/stats.js +40 -40
- package/lib/server/utils/linuxUtils.js +50 -37
- package/lib/server/utils/network.js +143 -86
- package/lib/server/utils/nodePlatform.js +87 -79
- package/lib/server/utils/pipeTransport.js +44 -42
- package/lib/server/utils/processLauncher.js +111 -121
- package/lib/server/utils/profiler.js +52 -39
- package/lib/server/utils/socksProxy.js +280 -339
- package/lib/server/utils/spawnAsync.js +37 -41
- package/lib/server/utils/task.js +31 -38
- package/lib/server/utils/userAgent.js +73 -66
- package/lib/server/utils/wsServer.js +73 -69
- package/lib/server/utils/zipFile.js +36 -37
- package/lib/server/utils/zones.js +37 -34
- package/lib/server/webkit/protocol.d.js +16 -0
- package/lib/server/webkit/webkit.js +76 -63
- package/lib/server/webkit/wkAccessibility.js +161 -118
- package/lib/server/webkit/wkBrowser.js +159 -176
- package/lib/server/webkit/wkConnection.js +59 -83
- package/lib/server/webkit/wkExecutionContext.js +84 -70
- package/lib/server/webkit/wkInput.js +82 -80
- package/lib/server/webkit/wkInterceptableRequest.js +102 -95
- package/lib/server/webkit/wkPage.js +525 -619
- package/lib/server/webkit/wkProvisionalPage.js +45 -56
- package/lib/server/webkit/wkWorkers.js +77 -77
- package/lib/utils/isomorphic/ariaSnapshot.js +144 -152
- package/lib/utils/isomorphic/assert.js +28 -22
- package/lib/utils/isomorphic/builtins.js +90 -0
- package/lib/utils/isomorphic/colors.js +66 -59
- package/lib/utils/isomorphic/cssParser.js +121 -125
- package/lib/utils/isomorphic/cssTokenizer.js +436 -364
- package/lib/utils/isomorphic/headers.js +38 -37
- package/lib/utils/isomorphic/locatorGenerators.js +340 -357
- package/lib/utils/isomorphic/locatorParser.js +96 -105
- package/lib/utils/isomorphic/locatorUtils.js +63 -44
- package/lib/utils/isomorphic/manualPromise.js +47 -39
- package/lib/utils/isomorphic/mimeType.js +448 -25
- package/lib/utils/isomorphic/multimap.js +35 -27
- package/lib/utils/isomorphic/rtti.js +35 -33
- package/lib/utils/isomorphic/selectorParser.js +183 -193
- package/lib/utils/isomorphic/semaphore.js +27 -24
- package/lib/utils/isomorphic/stackTrace.js +87 -98
- package/lib/utils/isomorphic/stringUtils.js +113 -106
- package/lib/utils/isomorphic/time.js +41 -22
- package/lib/utils/isomorphic/timeoutRunner.js +55 -54
- package/lib/utils/isomorphic/traceUtils.js +38 -41
- package/lib/utils/isomorphic/types.js +15 -4
- package/lib/utils/isomorphic/urlMatch.js +112 -67
- package/lib/utils/isomorphic/utilityScriptSerializers.js +248 -0
- package/lib/utils.js +97 -443
- package/lib/utilsBundle.js +101 -52
- package/lib/vite/htmlReport/index.html +21 -15
- package/lib/vite/recorder/assets/{codeMirrorModule-B9YMkrwa.js → codeMirrorModule-DVQi6prl.js} +1 -1
- package/lib/vite/recorder/assets/index-97EUAAbk.js +184 -0
- package/lib/vite/recorder/index.html +1 -1
- package/lib/vite/traceViewer/assets/{codeMirrorModule-DpJ-EmBQ.js → codeMirrorModule-dvXVzLxY.js} +1 -1
- package/lib/vite/traceViewer/assets/defaultSettingsView-BjymbO6M.js +265 -0
- package/lib/vite/traceViewer/{defaultSettingsView.5fN5lw10.css → defaultSettingsView.QdHITyLI.css} +1 -1
- package/lib/vite/traceViewer/index.ChIUCJnj.js +2 -0
- package/lib/vite/traceViewer/index.html +3 -3
- package/lib/vite/traceViewer/sw.bundle.js +3 -3
- package/lib/vite/traceViewer/uiMode.html +3 -3
- package/lib/vite/traceViewer/uiMode.jUCiCtdp.js +5 -0
- package/lib/zipBundle.js +32 -23
- package/package.json +1 -1
- package/types/protocol.d.ts +436 -17
- package/types/types.d.ts +35 -16
- package/lib/server/isomorphic/utilityScriptSerializers.js +0 -229
- package/lib/vite/recorder/assets/index-ELPgmkwA.js +0 -184
- package/lib/vite/traceViewer/assets/defaultSettingsView-DTenqiGw.js +0 -259
- package/lib/vite/traceViewer/index.CUq7VgrV.js +0 -2
- package/lib/vite/traceViewer/uiMode.CHJSAD7F.js +0 -5
|
@@ -1,80 +1,93 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty
|
|
4
|
-
|
|
2
|
+
var __create = Object.create;
|
|
3
|
+
var __defProp = Object.defineProperty;
|
|
4
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
7
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
|
+
var __export = (target, all) => {
|
|
9
|
+
for (var name in all)
|
|
10
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
11
|
+
};
|
|
12
|
+
var __copyProps = (to, from, except, desc) => {
|
|
13
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
14
|
+
for (let key of __getOwnPropNames(from))
|
|
15
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
16
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
17
|
+
}
|
|
18
|
+
return to;
|
|
19
|
+
};
|
|
20
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
21
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
22
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
23
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
24
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
25
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
26
|
+
mod
|
|
27
|
+
));
|
|
28
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
29
|
+
var ffNetworkManager_exports = {};
|
|
30
|
+
__export(ffNetworkManager_exports, {
|
|
31
|
+
FFNetworkManager: () => FFNetworkManager
|
|
5
32
|
});
|
|
6
|
-
exports
|
|
7
|
-
var
|
|
8
|
-
var network =
|
|
9
|
-
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); }
|
|
10
|
-
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 && {}.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; }
|
|
11
|
-
/**
|
|
12
|
-
* Copyright 2019 Google Inc. All rights reserved.
|
|
13
|
-
* Modifications copyright (c) Microsoft Corporation.
|
|
14
|
-
*
|
|
15
|
-
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
16
|
-
* you may not use this file except in compliance with the License.
|
|
17
|
-
* You may obtain a copy of the License at
|
|
18
|
-
*
|
|
19
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
|
20
|
-
*
|
|
21
|
-
* Unless required by applicable law or agreed to in writing, software
|
|
22
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
23
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
24
|
-
* See the License for the specific language governing permissions and
|
|
25
|
-
* limitations under the License.
|
|
26
|
-
*/
|
|
27
|
-
|
|
33
|
+
module.exports = __toCommonJS(ffNetworkManager_exports);
|
|
34
|
+
var import_eventsHelper = require("../utils/eventsHelper");
|
|
35
|
+
var network = __toESM(require("../network"));
|
|
28
36
|
class FFNetworkManager {
|
|
29
37
|
constructor(session, page) {
|
|
30
|
-
this._session = void 0;
|
|
31
|
-
this._requests = void 0;
|
|
32
|
-
this._page = void 0;
|
|
33
|
-
this._eventListeners = void 0;
|
|
34
38
|
this._session = session;
|
|
35
|
-
this._requests = new Map();
|
|
39
|
+
this._requests = /* @__PURE__ */ new Map();
|
|
36
40
|
this._page = page;
|
|
37
|
-
this._eventListeners = [
|
|
41
|
+
this._eventListeners = [
|
|
42
|
+
import_eventsHelper.eventsHelper.addEventListener(session, "Network.requestWillBeSent", this._onRequestWillBeSent.bind(this)),
|
|
43
|
+
import_eventsHelper.eventsHelper.addEventListener(session, "Network.responseReceived", this._onResponseReceived.bind(this)),
|
|
44
|
+
import_eventsHelper.eventsHelper.addEventListener(session, "Network.requestFinished", this._onRequestFinished.bind(this)),
|
|
45
|
+
import_eventsHelper.eventsHelper.addEventListener(session, "Network.requestFailed", this._onRequestFailed.bind(this))
|
|
46
|
+
];
|
|
38
47
|
}
|
|
39
48
|
dispose() {
|
|
40
|
-
|
|
49
|
+
import_eventsHelper.eventsHelper.removeEventListeners(this._eventListeners);
|
|
41
50
|
}
|
|
42
51
|
async setRequestInterception(enabled) {
|
|
43
|
-
await Promise.all([
|
|
44
|
-
enabled
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
})]);
|
|
52
|
+
await Promise.all([
|
|
53
|
+
this._session.send("Network.setRequestInterception", { enabled }),
|
|
54
|
+
this._session.send("Page.setCacheDisabled", { cacheDisabled: enabled })
|
|
55
|
+
]);
|
|
48
56
|
}
|
|
49
57
|
_onRequestWillBeSent(event) {
|
|
50
58
|
const redirectedFrom = event.redirectedFrom ? this._requests.get(event.redirectedFrom) || null : null;
|
|
51
59
|
const frame = redirectedFrom ? redirectedFrom.request.frame() : event.frameId ? this._page._frameManager.frame(event.frameId) : null;
|
|
52
|
-
if (!frame)
|
|
53
|
-
|
|
60
|
+
if (!frame)
|
|
61
|
+
return;
|
|
62
|
+
if (redirectedFrom)
|
|
63
|
+
this._requests.delete(redirectedFrom._id);
|
|
54
64
|
const request = new InterceptableRequest(frame, redirectedFrom, event);
|
|
55
65
|
let route;
|
|
56
|
-
if (event.isIntercepted)
|
|
66
|
+
if (event.isIntercepted)
|
|
67
|
+
route = new FFRouteImpl(this._session, request);
|
|
57
68
|
this._requests.set(request._id, request);
|
|
58
69
|
this._page._frameManager.requestStarted(request.request, route);
|
|
59
70
|
}
|
|
60
71
|
_onResponseReceived(event) {
|
|
61
|
-
var _event$securityDetail, _event$securityDetail2, _event$securityDetail3, _event$securityDetail4, _event$securityDetail5;
|
|
62
72
|
const request = this._requests.get(event.requestId);
|
|
63
|
-
if (!request)
|
|
73
|
+
if (!request)
|
|
74
|
+
return;
|
|
64
75
|
const getResponseBody = async () => {
|
|
65
|
-
const
|
|
76
|
+
const response2 = await this._session.send("Network.getResponseBody", {
|
|
66
77
|
requestId: request._id
|
|
67
78
|
});
|
|
68
|
-
if (
|
|
69
|
-
|
|
79
|
+
if (response2.evicted)
|
|
80
|
+
throw new Error(`Response body for ${request.request.method()} ${request.request.url()} was evicted!`);
|
|
81
|
+
return Buffer.from(response2.base64body, "base64");
|
|
70
82
|
};
|
|
71
83
|
const startTime = event.timing.startTime;
|
|
72
84
|
function relativeToStart(time) {
|
|
73
|
-
if (!time)
|
|
74
|
-
|
|
85
|
+
if (!time)
|
|
86
|
+
return -1;
|
|
87
|
+
return (time - startTime) / 1e3;
|
|
75
88
|
}
|
|
76
89
|
const timing = {
|
|
77
|
-
startTime: startTime /
|
|
90
|
+
startTime: startTime / 1e3,
|
|
78
91
|
domainLookupStart: relativeToStart(event.timing.domainLookupStart),
|
|
79
92
|
domainLookupEnd: relativeToStart(event.timing.domainLookupEnd),
|
|
80
93
|
connectStart: relativeToStart(event.timing.connectStart),
|
|
@@ -84,7 +97,7 @@ class FFNetworkManager {
|
|
|
84
97
|
responseStart: relativeToStart(event.timing.responseStart)
|
|
85
98
|
};
|
|
86
99
|
const response = new network.Response(request.request, event.status, event.statusText, parseMultivalueHeaders(event.headers), timing, getResponseBody, event.fromServiceWorker);
|
|
87
|
-
if (event
|
|
100
|
+
if (event?.remoteIPAddress && typeof event?.remotePort === "number") {
|
|
88
101
|
response._serverAddrFinished({
|
|
89
102
|
ipAddress: event.remoteIPAddress,
|
|
90
103
|
port: event.remotePort
|
|
@@ -93,40 +106,39 @@ class FFNetworkManager {
|
|
|
93
106
|
response._serverAddrFinished();
|
|
94
107
|
}
|
|
95
108
|
response._securityDetailsFinished({
|
|
96
|
-
protocol: event
|
|
97
|
-
subjectName: event
|
|
98
|
-
issuer: event
|
|
99
|
-
validFrom: event
|
|
100
|
-
validTo: event
|
|
109
|
+
protocol: event?.securityDetails?.protocol,
|
|
110
|
+
subjectName: event?.securityDetails?.subjectName,
|
|
111
|
+
issuer: event?.securityDetails?.issuer,
|
|
112
|
+
validFrom: event?.securityDetails?.validFrom,
|
|
113
|
+
validTo: event?.securityDetails?.validTo
|
|
101
114
|
});
|
|
102
|
-
// "raw" headers are the same as "provisional" headers in Firefox.
|
|
103
115
|
response.setRawResponseHeaders(null);
|
|
104
|
-
// Headers size are not available in Firefox.
|
|
105
116
|
response.setResponseHeadersSize(null);
|
|
106
117
|
this._page._frameManager.requestReceivedResponse(response);
|
|
107
118
|
}
|
|
108
119
|
_onRequestFinished(event) {
|
|
109
120
|
const request = this._requests.get(event.requestId);
|
|
110
|
-
if (!request)
|
|
121
|
+
if (!request)
|
|
122
|
+
return;
|
|
111
123
|
const response = request.request._existingResponse();
|
|
112
124
|
response.setTransferSize(event.transferSize);
|
|
113
125
|
response.setEncodedBodySize(event.encodedBodySize);
|
|
114
|
-
|
|
115
|
-
// Keep redirected requests in the map for future reference as redirectedFrom.
|
|
116
126
|
const isRedirected = response.status() >= 300 && response.status() <= 399;
|
|
117
|
-
const responseEndTime = event.responseEndTime ? event.responseEndTime /
|
|
127
|
+
const responseEndTime = event.responseEndTime ? event.responseEndTime / 1e3 - response.timing().startTime : -1;
|
|
118
128
|
if (isRedirected) {
|
|
119
129
|
response._requestFinished(responseEndTime);
|
|
120
130
|
} else {
|
|
121
131
|
this._requests.delete(request._id);
|
|
122
132
|
response._requestFinished(responseEndTime);
|
|
123
133
|
}
|
|
124
|
-
if (event.protocolVersion)
|
|
134
|
+
if (event.protocolVersion)
|
|
135
|
+
response._setHttpVersion(event.protocolVersion);
|
|
125
136
|
this._page._frameManager.reportRequestFinished(request.request, response);
|
|
126
137
|
}
|
|
127
138
|
_onRequestFailed(event) {
|
|
128
139
|
const request = this._requests.get(event.requestId);
|
|
129
|
-
if (!request)
|
|
140
|
+
if (!request)
|
|
141
|
+
return;
|
|
130
142
|
this._requests.delete(request._id);
|
|
131
143
|
const response = request.request._existingResponse();
|
|
132
144
|
if (response) {
|
|
@@ -135,76 +147,83 @@ class FFNetworkManager {
|
|
|
135
147
|
response._requestFinished(-1);
|
|
136
148
|
}
|
|
137
149
|
request.request._setFailureText(event.errorCode);
|
|
138
|
-
this._page._frameManager.requestFailed(request.request, event.errorCode ===
|
|
150
|
+
this._page._frameManager.requestFailed(request.request, event.errorCode === "NS_BINDING_ABORTED");
|
|
139
151
|
}
|
|
140
152
|
}
|
|
141
|
-
exports.FFNetworkManager = FFNetworkManager;
|
|
142
153
|
const causeToResourceType = {
|
|
143
|
-
TYPE_INVALID:
|
|
144
|
-
TYPE_OTHER:
|
|
145
|
-
TYPE_SCRIPT:
|
|
146
|
-
TYPE_IMAGE:
|
|
147
|
-
TYPE_STYLESHEET:
|
|
148
|
-
TYPE_OBJECT:
|
|
149
|
-
TYPE_DOCUMENT:
|
|
150
|
-
TYPE_SUBDOCUMENT:
|
|
151
|
-
TYPE_REFRESH:
|
|
152
|
-
TYPE_XBL:
|
|
153
|
-
TYPE_PING:
|
|
154
|
-
TYPE_XMLHTTPREQUEST:
|
|
155
|
-
TYPE_OBJECT_SUBREQUEST:
|
|
156
|
-
TYPE_DTD:
|
|
157
|
-
TYPE_FONT:
|
|
158
|
-
TYPE_MEDIA:
|
|
159
|
-
TYPE_WEBSOCKET:
|
|
160
|
-
TYPE_CSP_REPORT:
|
|
161
|
-
TYPE_XSLT:
|
|
162
|
-
TYPE_BEACON:
|
|
163
|
-
TYPE_FETCH:
|
|
164
|
-
TYPE_IMAGESET:
|
|
165
|
-
TYPE_WEB_MANIFEST:
|
|
154
|
+
TYPE_INVALID: "other",
|
|
155
|
+
TYPE_OTHER: "other",
|
|
156
|
+
TYPE_SCRIPT: "script",
|
|
157
|
+
TYPE_IMAGE: "image",
|
|
158
|
+
TYPE_STYLESHEET: "stylesheet",
|
|
159
|
+
TYPE_OBJECT: "other",
|
|
160
|
+
TYPE_DOCUMENT: "document",
|
|
161
|
+
TYPE_SUBDOCUMENT: "document",
|
|
162
|
+
TYPE_REFRESH: "document",
|
|
163
|
+
TYPE_XBL: "other",
|
|
164
|
+
TYPE_PING: "other",
|
|
165
|
+
TYPE_XMLHTTPREQUEST: "xhr",
|
|
166
|
+
TYPE_OBJECT_SUBREQUEST: "other",
|
|
167
|
+
TYPE_DTD: "other",
|
|
168
|
+
TYPE_FONT: "font",
|
|
169
|
+
TYPE_MEDIA: "media",
|
|
170
|
+
TYPE_WEBSOCKET: "websocket",
|
|
171
|
+
TYPE_CSP_REPORT: "other",
|
|
172
|
+
TYPE_XSLT: "other",
|
|
173
|
+
TYPE_BEACON: "other",
|
|
174
|
+
TYPE_FETCH: "fetch",
|
|
175
|
+
TYPE_IMAGESET: "image",
|
|
176
|
+
TYPE_WEB_MANIFEST: "manifest"
|
|
166
177
|
};
|
|
167
178
|
const internalCauseToResourceType = {
|
|
168
|
-
TYPE_INTERNAL_EVENTSOURCE:
|
|
179
|
+
TYPE_INTERNAL_EVENTSOURCE: "eventsource"
|
|
169
180
|
};
|
|
170
181
|
class InterceptableRequest {
|
|
171
182
|
constructor(frame, redirectedFrom, payload) {
|
|
172
|
-
this.request = void 0;
|
|
173
|
-
this._id = void 0;
|
|
174
|
-
this._redirectedTo = void 0;
|
|
175
183
|
this._id = payload.requestId;
|
|
176
|
-
if (redirectedFrom)
|
|
184
|
+
if (redirectedFrom)
|
|
185
|
+
redirectedFrom._redirectedTo = this;
|
|
177
186
|
let postDataBuffer = null;
|
|
178
|
-
if (payload.postData)
|
|
179
|
-
|
|
180
|
-
|
|
187
|
+
if (payload.postData)
|
|
188
|
+
postDataBuffer = Buffer.from(payload.postData, "base64");
|
|
189
|
+
this.request = new network.Request(
|
|
190
|
+
frame._page._browserContext,
|
|
191
|
+
frame,
|
|
192
|
+
null,
|
|
193
|
+
redirectedFrom ? redirectedFrom.request : null,
|
|
194
|
+
payload.navigationId,
|
|
195
|
+
payload.url,
|
|
196
|
+
internalCauseToResourceType[payload.internalCause] || causeToResourceType[payload.cause] || "other",
|
|
197
|
+
payload.method,
|
|
198
|
+
postDataBuffer,
|
|
199
|
+
payload.headers
|
|
200
|
+
);
|
|
181
201
|
this.request.setRawRequestHeaders(null);
|
|
182
202
|
}
|
|
183
203
|
_finalRequest() {
|
|
184
204
|
let request = this;
|
|
185
|
-
while (request._redirectedTo)
|
|
205
|
+
while (request._redirectedTo)
|
|
206
|
+
request = request._redirectedTo;
|
|
186
207
|
return request;
|
|
187
208
|
}
|
|
188
209
|
}
|
|
189
210
|
class FFRouteImpl {
|
|
190
211
|
constructor(session, request) {
|
|
191
|
-
this._request = void 0;
|
|
192
|
-
this._session = void 0;
|
|
193
212
|
this._session = session;
|
|
194
213
|
this._request = request;
|
|
195
214
|
}
|
|
196
215
|
async continue(overrides) {
|
|
197
|
-
await this._session.sendMayFail(
|
|
216
|
+
await this._session.sendMayFail("Network.resumeInterceptedRequest", {
|
|
198
217
|
requestId: this._request._id,
|
|
199
218
|
url: overrides.url,
|
|
200
219
|
method: overrides.method,
|
|
201
220
|
headers: overrides.headers,
|
|
202
|
-
postData: overrides.postData ? Buffer.from(overrides.postData).toString(
|
|
221
|
+
postData: overrides.postData ? Buffer.from(overrides.postData).toString("base64") : void 0
|
|
203
222
|
});
|
|
204
223
|
}
|
|
205
224
|
async fulfill(response) {
|
|
206
|
-
const base64body = response.isBase64 ? response.body : Buffer.from(response.body).toString(
|
|
207
|
-
await this._session.sendMayFail(
|
|
225
|
+
const base64body = response.isBase64 ? response.body : Buffer.from(response.body).toString("base64");
|
|
226
|
+
await this._session.sendMayFail("Network.fulfillInterceptedRequest", {
|
|
208
227
|
requestId: this._request._id,
|
|
209
228
|
status: response.status,
|
|
210
229
|
statusText: network.statusText(response.status),
|
|
@@ -213,7 +232,7 @@ class FFRouteImpl {
|
|
|
213
232
|
});
|
|
214
233
|
}
|
|
215
234
|
async abort(errorCode) {
|
|
216
|
-
await this._session.sendMayFail(
|
|
235
|
+
await this._session.sendMayFail("Network.abortInterceptedRequest", {
|
|
217
236
|
requestId: this._request._id,
|
|
218
237
|
errorCode
|
|
219
238
|
});
|
|
@@ -222,12 +241,14 @@ class FFRouteImpl {
|
|
|
222
241
|
function parseMultivalueHeaders(headers) {
|
|
223
242
|
const result = [];
|
|
224
243
|
for (const header of headers) {
|
|
225
|
-
const separator = header.name.toLowerCase() ===
|
|
226
|
-
const tokens = header.value.split(separator).map(s => s.trim());
|
|
227
|
-
for (const token of tokens)
|
|
228
|
-
name: header.name,
|
|
229
|
-
value: token
|
|
230
|
-
});
|
|
244
|
+
const separator = header.name.toLowerCase() === "set-cookie" ? "\n" : ",";
|
|
245
|
+
const tokens = header.value.split(separator).map((s) => s.trim());
|
|
246
|
+
for (const token of tokens)
|
|
247
|
+
result.push({ name: header.name, value: token });
|
|
231
248
|
}
|
|
232
249
|
return result;
|
|
233
|
-
}
|
|
250
|
+
}
|
|
251
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
252
|
+
0 && (module.exports = {
|
|
253
|
+
FFNetworkManager
|
|
254
|
+
});
|