patchright-core 1.51.3 → 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 +284 -404
- 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 +730 -894
- 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-1DiydmYA.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-l0TyP_G8.js +0 -259
- package/lib/vite/traceViewer/index.BqUZLSro.js +0 -2
- package/lib/vite/traceViewer/uiMode.C1d2m5sF.js +0 -5
|
@@ -1,97 +1,106 @@
|
|
|
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 firefox_exports = {};
|
|
30
|
+
__export(firefox_exports, {
|
|
31
|
+
Firefox: () => Firefox
|
|
5
32
|
});
|
|
6
|
-
exports
|
|
7
|
-
var
|
|
8
|
-
var
|
|
9
|
-
var
|
|
10
|
-
var
|
|
11
|
-
var
|
|
12
|
-
var
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
* Copyright 2017 Google Inc. All rights reserved.
|
|
16
|
-
* Modifications copyright (c) Microsoft Corporation.
|
|
17
|
-
*
|
|
18
|
-
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
19
|
-
* you may not use this file except in compliance with the License.
|
|
20
|
-
* You may obtain a copy of the License at
|
|
21
|
-
*
|
|
22
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
|
23
|
-
*
|
|
24
|
-
* Unless required by applicable law or agreed to in writing, software
|
|
25
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
26
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
27
|
-
* See the License for the specific language governing permissions and
|
|
28
|
-
* limitations under the License.
|
|
29
|
-
*/
|
|
30
|
-
|
|
31
|
-
class Firefox extends _browserType.BrowserType {
|
|
33
|
+
module.exports = __toCommonJS(firefox_exports);
|
|
34
|
+
var import_os = __toESM(require("os"));
|
|
35
|
+
var import_path = __toESM(require("path"));
|
|
36
|
+
var import_ffBrowser = require("./ffBrowser");
|
|
37
|
+
var import_ffConnection = require("./ffConnection");
|
|
38
|
+
var import_ascii = require("../utils/ascii");
|
|
39
|
+
var import_browserType = require("../browserType");
|
|
40
|
+
var import_browserType2 = require("../browserType");
|
|
41
|
+
class Firefox extends import_browserType.BrowserType {
|
|
32
42
|
constructor(parent) {
|
|
33
|
-
super(parent,
|
|
43
|
+
super(parent, "firefox");
|
|
34
44
|
}
|
|
35
45
|
connectToTransport(transport, options) {
|
|
36
|
-
return
|
|
46
|
+
return import_ffBrowser.FFBrowser.connect(this.attribution.playwright, transport, options);
|
|
37
47
|
}
|
|
38
48
|
doRewriteStartupLog(error) {
|
|
39
|
-
if (!error.logs)
|
|
40
|
-
|
|
41
|
-
if (error.logs.includes(`as root in a regular user's session is not supported.`))
|
|
42
|
-
|
|
49
|
+
if (!error.logs)
|
|
50
|
+
return error;
|
|
51
|
+
if (error.logs.includes(`as root in a regular user's session is not supported.`))
|
|
52
|
+
error.logs = "\n" + (0, import_ascii.wrapInASCIIBox)(`Firefox is unable to launch if the $HOME folder isn't owned by the current user.
|
|
53
|
+
Workaround: Set the HOME=/root environment variable${process.env.GITHUB_ACTION ? " in your GitHub Actions workflow file" : ""} when running Playwright.`, 1);
|
|
54
|
+
if (error.logs.includes("no DISPLAY environment variable specified"))
|
|
55
|
+
error.logs = "\n" + (0, import_ascii.wrapInASCIIBox)(import_browserType.kNoXServerRunningError, 1);
|
|
43
56
|
return error;
|
|
44
57
|
}
|
|
45
58
|
amendEnvironment(env, userDataDir, executable, browserArguments) {
|
|
46
|
-
if (!
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
// See https://github.com/microsoft/playwright/issues/20555
|
|
51
|
-
return {
|
|
52
|
-
...env,
|
|
53
|
-
SNAP_NAME: undefined,
|
|
54
|
-
SNAP_INSTANCE_NAME: undefined
|
|
55
|
-
};
|
|
59
|
+
if (!import_path.default.isAbsolute(import_os.default.homedir()))
|
|
60
|
+
throw new Error(`Cannot launch Firefox with relative home directory. Did you set ${import_os.default.platform() === "win32" ? "USERPROFILE" : "HOME"} to a relative path?`);
|
|
61
|
+
if (import_os.default.platform() === "linux") {
|
|
62
|
+
return { ...env, SNAP_NAME: void 0, SNAP_INSTANCE_NAME: void 0 };
|
|
56
63
|
}
|
|
57
64
|
return env;
|
|
58
65
|
}
|
|
59
66
|
attemptToGracefullyCloseBrowser(transport) {
|
|
60
|
-
const message = {
|
|
61
|
-
method: 'Browser.close',
|
|
62
|
-
params: {},
|
|
63
|
-
id: _ffConnection.kBrowserCloseMessageId
|
|
64
|
-
};
|
|
67
|
+
const message = { method: "Browser.close", params: {}, id: import_ffConnection.kBrowserCloseMessageId };
|
|
65
68
|
transport.send(message);
|
|
66
69
|
}
|
|
67
70
|
defaultArgs(options, isPersistent, userDataDir) {
|
|
68
|
-
const {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
const firefoxArguments = ['-no-remote'];
|
|
71
|
+
const { args = [], headless } = options;
|
|
72
|
+
const userDataDirArg = args.find((arg) => arg.startsWith("-profile") || arg.startsWith("--profile"));
|
|
73
|
+
if (userDataDirArg)
|
|
74
|
+
throw this._createUserDataDirArgMisuseError("--profile");
|
|
75
|
+
if (args.find((arg) => arg.startsWith("-juggler")))
|
|
76
|
+
throw new Error("Use the port parameter instead of -juggler argument");
|
|
77
|
+
const firefoxArguments = ["-no-remote"];
|
|
76
78
|
if (headless) {
|
|
77
|
-
firefoxArguments.push(
|
|
79
|
+
firefoxArguments.push("-headless");
|
|
78
80
|
} else {
|
|
79
|
-
firefoxArguments.push(
|
|
80
|
-
firefoxArguments.push(
|
|
81
|
+
firefoxArguments.push("-wait-for-browser");
|
|
82
|
+
firefoxArguments.push("-foreground");
|
|
81
83
|
}
|
|
82
84
|
firefoxArguments.push(`-profile`, userDataDir);
|
|
83
|
-
firefoxArguments.push(
|
|
85
|
+
firefoxArguments.push("-juggler-pipe");
|
|
84
86
|
firefoxArguments.push(...args);
|
|
85
|
-
if (isPersistent)
|
|
87
|
+
if (isPersistent)
|
|
88
|
+
firefoxArguments.push("about:blank");
|
|
89
|
+
else
|
|
90
|
+
firefoxArguments.push("-silent");
|
|
86
91
|
return firefoxArguments;
|
|
87
92
|
}
|
|
88
93
|
readyState(options) {
|
|
89
94
|
return new JugglerReadyState();
|
|
90
95
|
}
|
|
91
96
|
}
|
|
92
|
-
|
|
93
|
-
class JugglerReadyState extends _browserType.BrowserReadyState {
|
|
97
|
+
class JugglerReadyState extends import_browserType2.BrowserReadyState {
|
|
94
98
|
onBrowserOutput(message) {
|
|
95
|
-
if (message.includes(
|
|
99
|
+
if (message.includes("Juggler listening to the pipe"))
|
|
100
|
+
this._wsEndpoint.resolve(void 0);
|
|
96
101
|
}
|
|
97
|
-
}
|
|
102
|
+
}
|
|
103
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
104
|
+
0 && (module.exports = {
|
|
105
|
+
Firefox
|
|
106
|
+
});
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __copyProps = (to, from, except, desc) => {
|
|
7
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
8
|
+
for (let key of __getOwnPropNames(from))
|
|
9
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
10
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
11
|
+
}
|
|
12
|
+
return to;
|
|
13
|
+
};
|
|
14
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
15
|
+
var protocol_d_exports = {};
|
|
16
|
+
module.exports = __toCommonJS(protocol_d_exports);
|
package/lib/server/formData.js
CHANGED
|
@@ -1,29 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var formData_exports = {};
|
|
20
|
+
__export(formData_exports, {
|
|
21
|
+
MultipartFormData: () => MultipartFormData
|
|
5
22
|
});
|
|
6
|
-
exports
|
|
7
|
-
var
|
|
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
|
-
|
|
23
|
+
module.exports = __toCommonJS(formData_exports);
|
|
24
|
+
var import_utilsBundle = require("../utilsBundle");
|
|
24
25
|
class MultipartFormData {
|
|
25
26
|
constructor() {
|
|
26
|
-
this._boundary = void 0;
|
|
27
27
|
this._chunks = [];
|
|
28
28
|
this._boundary = generateUniqueBoundaryString();
|
|
29
29
|
}
|
|
@@ -39,7 +39,8 @@ class MultipartFormData {
|
|
|
39
39
|
addFileField(name, value) {
|
|
40
40
|
this._beginMultiPartHeader(name);
|
|
41
41
|
this._chunks.push(Buffer.from(`; filename="${value.name}"`));
|
|
42
|
-
this._chunks.push(Buffer.from(`\r
|
|
42
|
+
this._chunks.push(Buffer.from(`\r
|
|
43
|
+
content-type: ${value.mimeType || import_utilsBundle.mime.getType(value.name) || "application/octet-stream"}`));
|
|
43
44
|
this._finishMultiPartHeader();
|
|
44
45
|
this._chunks.push(value.buffer);
|
|
45
46
|
this._finishMultiPartField();
|
|
@@ -53,23 +54,94 @@ class MultipartFormData {
|
|
|
53
54
|
this._chunks.push(Buffer.from(`content-disposition: form-data; name="${name}"`));
|
|
54
55
|
}
|
|
55
56
|
_finishMultiPartHeader() {
|
|
56
|
-
this._chunks.push(Buffer.from(`\r
|
|
57
|
+
this._chunks.push(Buffer.from(`\r
|
|
58
|
+
\r
|
|
59
|
+
`));
|
|
57
60
|
}
|
|
58
61
|
_finishMultiPartField() {
|
|
59
|
-
this._chunks.push(Buffer.from(`\r
|
|
62
|
+
this._chunks.push(Buffer.from(`\r
|
|
63
|
+
`));
|
|
60
64
|
}
|
|
61
65
|
_addBoundary(isLastBoundary) {
|
|
62
|
-
this._chunks.push(Buffer.from(
|
|
63
|
-
if (isLastBoundary)
|
|
64
|
-
|
|
66
|
+
this._chunks.push(Buffer.from("--" + this._boundary));
|
|
67
|
+
if (isLastBoundary)
|
|
68
|
+
this._chunks.push(Buffer.from("--"));
|
|
69
|
+
this._chunks.push(Buffer.from("\r\n"));
|
|
65
70
|
}
|
|
66
71
|
}
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
72
|
+
const alphaNumericEncodingMap = [
|
|
73
|
+
65,
|
|
74
|
+
66,
|
|
75
|
+
67,
|
|
76
|
+
68,
|
|
77
|
+
69,
|
|
78
|
+
70,
|
|
79
|
+
71,
|
|
80
|
+
72,
|
|
81
|
+
73,
|
|
82
|
+
74,
|
|
83
|
+
75,
|
|
84
|
+
76,
|
|
85
|
+
77,
|
|
86
|
+
78,
|
|
87
|
+
79,
|
|
88
|
+
80,
|
|
89
|
+
81,
|
|
90
|
+
82,
|
|
91
|
+
83,
|
|
92
|
+
84,
|
|
93
|
+
85,
|
|
94
|
+
86,
|
|
95
|
+
87,
|
|
96
|
+
88,
|
|
97
|
+
89,
|
|
98
|
+
90,
|
|
99
|
+
97,
|
|
100
|
+
98,
|
|
101
|
+
99,
|
|
102
|
+
100,
|
|
103
|
+
101,
|
|
104
|
+
102,
|
|
105
|
+
103,
|
|
106
|
+
104,
|
|
107
|
+
105,
|
|
108
|
+
106,
|
|
109
|
+
107,
|
|
110
|
+
108,
|
|
111
|
+
109,
|
|
112
|
+
110,
|
|
113
|
+
111,
|
|
114
|
+
112,
|
|
115
|
+
113,
|
|
116
|
+
114,
|
|
117
|
+
115,
|
|
118
|
+
116,
|
|
119
|
+
117,
|
|
120
|
+
118,
|
|
121
|
+
119,
|
|
122
|
+
120,
|
|
123
|
+
121,
|
|
124
|
+
122,
|
|
125
|
+
48,
|
|
126
|
+
49,
|
|
127
|
+
50,
|
|
128
|
+
51,
|
|
129
|
+
52,
|
|
130
|
+
53,
|
|
131
|
+
54,
|
|
132
|
+
55,
|
|
133
|
+
56,
|
|
134
|
+
57,
|
|
135
|
+
65,
|
|
136
|
+
66
|
|
137
|
+
];
|
|
71
138
|
function generateUniqueBoundaryString() {
|
|
72
139
|
const charCodes = [];
|
|
73
|
-
for (let i = 0; i < 16; i++)
|
|
74
|
-
|
|
75
|
-
|
|
140
|
+
for (let i = 0; i < 16; i++)
|
|
141
|
+
charCodes.push(alphaNumericEncodingMap[Math.floor(Math.random() * alphaNumericEncodingMap.length)]);
|
|
142
|
+
return "----WebKitFormBoundary" + String.fromCharCode(...charCodes);
|
|
143
|
+
}
|
|
144
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
145
|
+
0 && (module.exports = {
|
|
146
|
+
MultipartFormData
|
|
147
|
+
});
|
|
@@ -1,49 +1,43 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.
|
|
4
|
-
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var frameSelectors_exports = {};
|
|
20
|
+
__export(frameSelectors_exports, {
|
|
21
|
+
FrameSelectors: () => FrameSelectors
|
|
5
22
|
});
|
|
6
|
-
exports
|
|
7
|
-
var
|
|
8
|
-
var
|
|
9
|
-
/**
|
|
10
|
-
* Copyright (c) Microsoft Corporation.
|
|
11
|
-
*
|
|
12
|
-
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
13
|
-
* you may not use this file except in compliance with the License.
|
|
14
|
-
* You may obtain a copy of the License at
|
|
15
|
-
*
|
|
16
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
|
17
|
-
*
|
|
18
|
-
* Unless required by applicable law or agreed to in writing, software
|
|
19
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
20
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
21
|
-
* See the License for the specific language governing permissions and
|
|
22
|
-
* limitations under the License.
|
|
23
|
-
*/
|
|
24
|
-
|
|
23
|
+
module.exports = __toCommonJS(frameSelectors_exports);
|
|
24
|
+
var import_utils = require("../utils");
|
|
25
|
+
var import_selectorParser = require("../utils/isomorphic/selectorParser");
|
|
25
26
|
class FrameSelectors {
|
|
26
27
|
constructor(frame) {
|
|
27
|
-
this.frame = void 0;
|
|
28
28
|
this.frame = frame;
|
|
29
29
|
}
|
|
30
30
|
_parseSelector(selector, options) {
|
|
31
|
-
const strict = typeof
|
|
31
|
+
const strict = typeof options?.strict === "boolean" ? options.strict : !!this.frame._page.context()._options.strictSelectors;
|
|
32
32
|
return this.frame._page.context().selectors().parseSelector(selector, strict);
|
|
33
33
|
}
|
|
34
34
|
async query(selector, options, scope) {
|
|
35
35
|
const resolved = await this.resolveInjectedForSelector(selector, options, scope);
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
const handle = await resolved.injected.evaluateHandle((injected, {
|
|
39
|
-
info,
|
|
40
|
-
|
|
41
|
-
}) => {
|
|
42
|
-
return injected.querySelector(info.parsed, scope || document, info.strict);
|
|
43
|
-
}, {
|
|
44
|
-
info: resolved.info,
|
|
45
|
-
scope: resolved.scope
|
|
46
|
-
});
|
|
36
|
+
if (!resolved)
|
|
37
|
+
return null;
|
|
38
|
+
const handle = await resolved.injected.evaluateHandle((injected, { info, scope: scope2 }) => {
|
|
39
|
+
return injected.querySelector(info.parsed, scope2 || document, info.strict);
|
|
40
|
+
}, { info: resolved.info, scope: resolved.scope });
|
|
47
41
|
const elementHandle = handle.asElement();
|
|
48
42
|
if (!elementHandle) {
|
|
49
43
|
handle.dispose();
|
|
@@ -52,67 +46,49 @@ class FrameSelectors {
|
|
|
52
46
|
return adoptIfNeeded(elementHandle, await resolved.frame._mainContext());
|
|
53
47
|
}
|
|
54
48
|
async queryArrayInMainWorld(selector, scope) {
|
|
55
|
-
const resolved = await this.resolveInjectedForSelector(selector, {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
info,
|
|
62
|
-
scope
|
|
63
|
-
}) => {
|
|
64
|
-
return injected.querySelectorAll(info.parsed, scope || document);
|
|
65
|
-
}, {
|
|
66
|
-
info: resolved.info,
|
|
67
|
-
scope: resolved.scope
|
|
68
|
-
});
|
|
49
|
+
const resolved = await this.resolveInjectedForSelector(selector, { mainWorld: true }, scope);
|
|
50
|
+
if (!resolved)
|
|
51
|
+
throw new Error(`Failed to find frame for selector "${selector}"`);
|
|
52
|
+
return await resolved.injected.evaluateHandle((injected, { info, scope: scope2 }) => {
|
|
53
|
+
return injected.querySelectorAll(info.parsed, scope2 || document);
|
|
54
|
+
}, { info: resolved.info, scope: resolved.scope });
|
|
69
55
|
}
|
|
70
56
|
async queryCount(selector) {
|
|
71
57
|
const resolved = await this.resolveInjectedForSelector(selector);
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
return await resolved.injected.evaluate((injected, {
|
|
75
|
-
info
|
|
76
|
-
}) => {
|
|
58
|
+
if (!resolved)
|
|
59
|
+
throw new Error(`Failed to find frame for selector "${selector}"`);
|
|
60
|
+
return await resolved.injected.evaluate((injected, { info }) => {
|
|
77
61
|
return injected.querySelectorAll(info.parsed, document).length;
|
|
78
|
-
}, {
|
|
79
|
-
info: resolved.info
|
|
80
|
-
});
|
|
62
|
+
}, { info: resolved.info });
|
|
81
63
|
}
|
|
82
64
|
async queryAll(selector, scope) {
|
|
83
65
|
const resolved = await this.resolveInjectedForSelector(selector, {}, scope);
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
const arrayHandle = await resolved.injected.evaluateHandle((injected, {
|
|
87
|
-
info,
|
|
88
|
-
|
|
89
|
-
}) => {
|
|
90
|
-
return injected.querySelectorAll(info.parsed, scope || document);
|
|
91
|
-
}, {
|
|
92
|
-
info: resolved.info,
|
|
93
|
-
scope: resolved.scope
|
|
94
|
-
});
|
|
66
|
+
if (!resolved)
|
|
67
|
+
return [];
|
|
68
|
+
const arrayHandle = await resolved.injected.evaluateHandle((injected, { info, scope: scope2 }) => {
|
|
69
|
+
return injected.querySelectorAll(info.parsed, scope2 || document);
|
|
70
|
+
}, { info: resolved.info, scope: resolved.scope });
|
|
95
71
|
const properties = await arrayHandle.getProperties();
|
|
96
72
|
arrayHandle.dispose();
|
|
97
|
-
|
|
98
|
-
// Note: adopting elements one by one may be slow. If we encounter the issue here,
|
|
99
|
-
// we might introduce 'useMainContext' option or similar to speed things up.
|
|
100
73
|
const targetContext = await resolved.frame._mainContext();
|
|
101
74
|
const result = [];
|
|
102
75
|
for (const property of properties.values()) {
|
|
103
76
|
const elementHandle = property.asElement();
|
|
104
|
-
if (elementHandle)
|
|
77
|
+
if (elementHandle)
|
|
78
|
+
result.push(adoptIfNeeded(elementHandle, targetContext));
|
|
79
|
+
else
|
|
80
|
+
property.dispose();
|
|
105
81
|
}
|
|
106
82
|
return Promise.all(result);
|
|
107
83
|
}
|
|
108
84
|
async resolveFrameForSelector(selector, options = {}, scope) {
|
|
109
85
|
let frame = this.frame;
|
|
110
|
-
const frameChunks = (0,
|
|
86
|
+
const frameChunks = (0, import_selectorParser.splitSelectorByFrame)(selector);
|
|
111
87
|
for (const chunk of frameChunks) {
|
|
112
|
-
(0,
|
|
113
|
-
if (nested && part.name ===
|
|
114
|
-
const locator = (0,
|
|
115
|
-
throw new
|
|
88
|
+
(0, import_selectorParser.visitAllSelectorParts)(chunk, (part, nested) => {
|
|
89
|
+
if (nested && part.name === "internal:control" && part.body === "enter-frame") {
|
|
90
|
+
const locator = (0, import_utils.asLocator)(this.frame._page.attribution.playwright.options.sdkLanguage, selector);
|
|
91
|
+
throw new import_selectorParser.InvalidSelectorError(`Frame locators are not allowed inside composite locators, while querying "${locator}"`);
|
|
116
92
|
}
|
|
117
93
|
});
|
|
118
94
|
}
|
|
@@ -120,52 +96,42 @@ class FrameSelectors {
|
|
|
120
96
|
const info = this._parseSelector(frameChunks[i], options);
|
|
121
97
|
const context = await frame._context(info.world);
|
|
122
98
|
const injectedScript = await context.injectedScript();
|
|
123
|
-
const handle = await injectedScript.evaluateHandle((injected, {
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
if (element && element.nodeName !== 'IFRAME' && element.nodeName !== 'FRAME') throw injected.createStacklessError(`Selector "${selectorString}" resolved to ${injected.previewNode(element)}, <iframe> was expected`);
|
|
130
|
-
return element;
|
|
131
|
-
}, {
|
|
132
|
-
info,
|
|
133
|
-
scope: i === 0 ? scope : undefined,
|
|
134
|
-
selectorString: (0, _selectorParser.stringifySelector)(info.parsed)
|
|
135
|
-
});
|
|
99
|
+
const handle = await injectedScript.evaluateHandle((injected, { info: info2, scope: scope2, selectorString }) => {
|
|
100
|
+
const element2 = injected.querySelector(info2.parsed, scope2 || document, info2.strict);
|
|
101
|
+
if (element2 && element2.nodeName !== "IFRAME" && element2.nodeName !== "FRAME")
|
|
102
|
+
throw injected.createStacklessError(`Selector "${selectorString}" resolved to ${injected.previewNode(element2)}, <iframe> was expected`);
|
|
103
|
+
return element2;
|
|
104
|
+
}, { info, scope: i === 0 ? scope : void 0, selectorString: (0, import_selectorParser.stringifySelector)(info.parsed) });
|
|
136
105
|
const element = handle.asElement();
|
|
137
|
-
if (!element)
|
|
106
|
+
if (!element)
|
|
107
|
+
return null;
|
|
138
108
|
const maybeFrame = await frame._page._delegate.getContentFrame(element);
|
|
139
109
|
element.dispose();
|
|
140
|
-
if (!maybeFrame)
|
|
110
|
+
if (!maybeFrame)
|
|
111
|
+
return null;
|
|
141
112
|
frame = maybeFrame;
|
|
142
113
|
}
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
return {
|
|
146
|
-
frame,
|
|
147
|
-
info: frame.selectors._parseSelector(frameChunks[frameChunks.length - 1], options),
|
|
148
|
-
scope
|
|
149
|
-
};
|
|
114
|
+
if (frame !== this.frame)
|
|
115
|
+
scope = void 0;
|
|
116
|
+
return { frame, info: frame.selectors._parseSelector(frameChunks[frameChunks.length - 1], options), scope };
|
|
150
117
|
}
|
|
151
118
|
async resolveInjectedForSelector(selector, options, scope) {
|
|
152
119
|
const resolved = await this.resolveFrameForSelector(selector, options, scope);
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
const context = await resolved.frame._context(options
|
|
120
|
+
if (!resolved)
|
|
121
|
+
return;
|
|
122
|
+
const context = await resolved.frame._context(options?.mainWorld ? "main" : resolved.info.world);
|
|
156
123
|
const injected = await context.injectedScript();
|
|
157
|
-
return {
|
|
158
|
-
injected,
|
|
159
|
-
info: resolved.info,
|
|
160
|
-
frame: resolved.frame,
|
|
161
|
-
scope: resolved.scope
|
|
162
|
-
};
|
|
124
|
+
return { injected, info: resolved.info, frame: resolved.frame, scope: resolved.scope };
|
|
163
125
|
}
|
|
164
126
|
}
|
|
165
|
-
exports.FrameSelectors = FrameSelectors;
|
|
166
127
|
async function adoptIfNeeded(handle, context) {
|
|
167
|
-
if (handle._context === context)
|
|
128
|
+
if (handle._context === context)
|
|
129
|
+
return handle;
|
|
168
130
|
const adopted = await handle._page._delegate.adoptElementHandle(handle, context);
|
|
169
131
|
handle.dispose();
|
|
170
132
|
return adopted;
|
|
171
|
-
}
|
|
133
|
+
}
|
|
134
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
135
|
+
0 && (module.exports = {
|
|
136
|
+
FrameSelectors
|
|
137
|
+
});
|