puppeteer - npm Package Compare versions

Comparing version 1.0.0-next.1515546200351 to 1.0.0-next.1515552562439

lib/FrameManager.js

@@ -91,2 +91,10 @@ /**
   /**
+   * @param {!string} frameId
+   * @return {?Frame}
+   */
+  frame(frameId) {
+    return this._frames.get(frameId) || null;
+  }
+
+  /**
    * @param {string} frameId
@@ -93,0 +101,0 @@ * @param {?string} parentFrameId

lib/NetworkManager.js

@@ -22,7 +22,9 @@ /**
   /**
-   * @param {Puppeteer.Session} client
+   * @param {!Puppeteer.Session} client
+   * @param {!Puppeteer.FrameManager} frameManager
    */
-  constructor(client) {
+  constructor(client, frameManager) {
     super();
     this._client = client;
+    this._frameManager = frameManager;
     /** @type {!Map<string, !Request>} */
@@ -155,3 +157,3 @@ this._requestIdToRequest = new Map();
       this._handleRequestRedirect(request, event.responseStatusCode, event.responseHeaders);
-      this._handleRequestStart(request._requestId, event.interceptionId, event.redirectUrl, event.resourceType, event.request);
+      this._handleRequestStart(request._requestId, event.interceptionId, event.redirectUrl, event.resourceType, event.request, event.frameId);
       return;
@@ -163,6 +165,6 @@ }
       this._requestHashToRequestIds.delete(requestHash, requestId);
-      this._handleRequestStart(requestId, event.interceptionId, event.request.url, event.resourceType, event.request);
+      this._handleRequestStart(requestId, event.interceptionId, event.request.url, event.resourceType, event.request, event.frameId);
     } else {
       this._requestHashToInterceptionIds.set(requestHash, event.interceptionId);
-      this._handleRequestStart(null, event.interceptionId, event.request.url, event.resourceType, event.request);
+      this._handleRequestStart(null, event.interceptionId, event.request.url, event.resourceType, event.request, event.frameId);
     }
@@ -192,5 +194,9 @@ }
    * @param {!Object} requestPayload
+   * @param {?string} frameId
    */
-  _handleRequestStart(requestId, interceptionId, url, resourceType, requestPayload) {
-    const request = new Request(this._client, requestId, interceptionId, this._userRequestInterceptionEnabled, url, resourceType, requestPayload);
+  _handleRequestStart(requestId, interceptionId, url, resourceType, requestPayload, frameId) {
+    let frame = null;
+    if (frameId)
+      frame = this._frameManager.frame(frameId);
+    const request = new Request(this._client, requestId, interceptionId, this._userRequestInterceptionEnabled, url, resourceType, requestPayload, frame);
     if (requestId)
@@ -229,3 +235,3 @@ this._requestIdToRequest.set(requestId, request);
     }
-    this._handleRequestStart(event.requestId, null, event.request.url, event.type, event.request);
+    this._handleRequestStart(event.requestId, null, event.request.url, event.type, event.request, event.frameId);
   }
@@ -289,4 +295,5 @@
    * @param {!Object} payload
+   * @param {?Puppeteer.Frame} frame
    */
-  constructor(client, requestId, interceptionId, allowInterception, url, resourceType, payload) {
+  constructor(client, requestId, interceptionId, allowInterception, url, resourceType, payload, frame) {
     this._client = client;
@@ -308,2 +315,3 @@ this._requestId = requestId;
     this._headers = {};
+    this._frame = frame;
     for (const key of Object.keys(payload.headers))
@@ -356,2 +364,9 @@ this._headers[key.toLowerCase()] = payload.headers[key];
   /**
+   * @return {?Puppeteer.Frame}
+   */
+  frame() {
+    return this._frame;
+  }
+
+  /**
    * @return {?{errorText: string}}
@@ -358,0 +373,0 @@ */

lib/Page.js

@@ -75,3 +75,3 @@ /**
     this._frameManager = new FrameManager(client, frameTree, this);
-    this._networkManager = new NetworkManager(client);
+    this._networkManager = new NetworkManager(client, this._frameManager);
     this._emulationManager = new EmulationManager(client);
@@ -78,0 +78,0 @@ this._tracing = new Tracing(client);

package.json

 {
   "name": "puppeteer",
-  "version": "1.0.0-next.1515546200351",
+  "version": "1.0.0-next.1515552562439",
   "description": "A high-level API to control headless Chrome over the DevTools Protocol",
@@ -5,0 +5,0 @@ "main": "index.js",

No alert changes

Improved metrics

Total package byte prevSize

253271

increased by0.24%

Lines of code

6386

increased by0.33%

No dependency changes