Updating to latest protocol.json

cdp/network/easyjson.go

@@ -3853,8 +3853,6 @@ func easyjsonC5a4559bDecodeGithubComKnqChromedpCdpNetwork33(in *jlexer.Lexer, ou
 		switch key {
 		case "requestId":
 			out.RequestID = RequestID(in.String())
-		case "frameId":
-			(out.FrameID).UnmarshalEasyJSON(in)
 		case "loaderId":
 			out.LoaderID = cdp.LoaderID(in.String())
 		case "timestamp":
@@ -3879,6 +3877,8 @@ func easyjsonC5a4559bDecodeGithubComKnqChromedpCdpNetwork33(in *jlexer.Lexer, ou
 				}
 				(*out.Response).UnmarshalEasyJSON(in)
 			}
+		case "frameId":
+			(out.FrameID).UnmarshalEasyJSON(in)
 		default:
 			in.SkipRecursive()
 		}
@@ -3903,12 +3903,6 @@ func easyjsonC5a4559bEncodeGithubComKnqChromedpCdpNetwork33(out *jwriter.Writer,
 		out.RawByte(',')
 	}
 	first = false
-	out.RawString("\"frameId\":")
-	out.String(string(in.FrameID))
-	if !first {
-		out.RawByte(',')
-	}
-	first = false
 	out.RawString("\"loaderId\":")
 	out.String(string(in.LoaderID))
 	if !first {
@@ -3937,6 +3931,14 @@ func easyjsonC5a4559bEncodeGithubComKnqChromedpCdpNetwork33(out *jwriter.Writer,
 	} else {
 		(*in.Response).MarshalEasyJSON(out)
 	}
+	if in.FrameID != "" {
+		if !first {
+			out.RawByte(',')
+		}
+		first = false
+		out.RawString("\"frameId\":")
+		out.String(string(in.FrameID))
+	}
 	out.RawByte('}')
 }
 
@@ -4079,8 +4081,6 @@ func easyjsonC5a4559bDecodeGithubComKnqChromedpCdpNetwork35(in *jlexer.Lexer, ou
 		switch key {
 		case "requestId":
 			out.RequestID = RequestID(in.String())
-		case "frameId":
-			(out.FrameID).UnmarshalEasyJSON(in)
 		case "loaderId":
 			out.LoaderID = cdp.LoaderID(in.String())
 		case "documentURL":
@@ -4137,6 +4137,8 @@ func easyjsonC5a4559bDecodeGithubComKnqChromedpCdpNetwork35(in *jlexer.Lexer, ou
 			}
 		case "type":
 			(out.Type).UnmarshalEasyJSON(in)
+		case "frameId":
+			(out.FrameID).UnmarshalEasyJSON(in)
 		default:
 			in.SkipRecursive()
 		}
@@ -4161,12 +4163,6 @@ func easyjsonC5a4559bEncodeGithubComKnqChromedpCdpNetwork35(out *jwriter.Writer,
 		out.RawByte(',')
 	}
 	first = false
-	out.RawString("\"frameId\":")
-	out.String(string(in.FrameID))
-	if !first {
-		out.RawByte(',')
-	}
-	first = false
 	out.RawString("\"loaderId\":")
 	out.String(string(in.LoaderID))
 	if !first {
@@ -4235,6 +4231,14 @@ func easyjsonC5a4559bEncodeGithubComKnqChromedpCdpNetwork35(out *jwriter.Writer,
 		out.RawString("\"type\":")
 		(in.Type).MarshalEasyJSON(out)
 	}
+	if in.FrameID != "" {
+		if !first {
+			out.RawByte(',')
+		}
+		first = false
+		out.RawString("\"frameId\":")
+		out.String(string(in.FrameID))
+	}
 	out.RawByte('}')
 }
 

cdp/network/events.go

@@ -18,8 +18,7 @@ type EventResourceChangedPriority struct {
 // EventRequestWillBeSent fired when page is about to send HTTP request.
 type EventRequestWillBeSent struct {
 	RequestID        RequestID         `json:"requestId"`                  // Request identifier.
-	FrameID          cdp.FrameID       `json:"frameId"`                    // Frame identifier.
+	LoaderID         cdp.LoaderID      `json:"loaderId"`                   // Loader identifier. Empty string if the request is fetched form worker.
-	LoaderID         cdp.LoaderID      `json:"loaderId"`                   // Loader identifier.
 	DocumentURL      string            `json:"documentURL"`                // URL of the document this request is loaded for.
 	Request          *Request          `json:"request"`                    // Request data.
 	Timestamp        *cdp.Timestamp    `json:"timestamp"`                  // Timestamp.
@@ -27,6 +26,7 @@ type EventRequestWillBeSent struct {
 	Initiator        *Initiator        `json:"initiator"`                  // Request initiator.
 	RedirectResponse *Response         `json:"redirectResponse,omitempty"` // Redirect response data.
 	Type             page.ResourceType `json:"type,omitempty"`             // Type of this resource.
+	FrameID          cdp.FrameID       `json:"frameId,omitempty"`          // Frame identifier.
 }
 
 // EventRequestServedFromCache fired if request ended up loading from cache.
@@ -37,11 +37,11 @@ type EventRequestServedFromCache struct {
 // EventResponseReceived fired when HTTP response is available.
 type EventResponseReceived struct {
 	RequestID RequestID         `json:"requestId"`         // Request identifier.
-	FrameID   cdp.FrameID       `json:"frameId"`   // Frame identifier.
+	LoaderID  cdp.LoaderID      `json:"loaderId"`          // Loader identifier. Empty string if the request is fetched form worker.
-	LoaderID  cdp.LoaderID      `json:"loaderId"`  // Loader identifier.
 	Timestamp *cdp.Timestamp    `json:"timestamp"`         // Timestamp.
 	Type      page.ResourceType `json:"type"`              // Resource type.
 	Response  *Response         `json:"response"`          // Response data.
+	FrameID   cdp.FrameID       `json:"frameId,omitempty"` // Frame identifier.
 }
 
 // EventDataReceived fired when data chunk was received over the network.

cmd/chromedp-gen/protocol.json

@@ -3544,16 +3544,10 @@
               "$ref": "RequestId",
               "description": "Request identifier."
             },
-            {
-              "name": "frameId",
-              "$ref": "Page.FrameId",
-              "description": "Frame identifier.",
-              "experimental": true
-            },
             {
               "name": "loaderId",
               "$ref": "LoaderId",
-              "description": "Loader identifier."
+              "description": "Loader identifier. Empty string if the request is fetched form worker."
             },
             {
               "name": "documentURL",
@@ -3593,6 +3587,13 @@
               "optional": true,
               "experimental": true,
               "description": "Type of this resource."
+            },
+            {
+              "name": "frameId",
+              "optional": true,
+              "$ref": "Page.FrameId",
+              "description": "Frame identifier.",
+              "experimental": true
             }
           ]
         },
@@ -3616,16 +3617,10 @@
               "$ref": "RequestId",
               "description": "Request identifier."
             },
-            {
-              "name": "frameId",
-              "$ref": "Page.FrameId",
-              "description": "Frame identifier.",
-              "experimental": true
-            },
             {
               "name": "loaderId",
               "$ref": "LoaderId",
-              "description": "Loader identifier."
+              "description": "Loader identifier. Empty string if the request is fetched form worker."
             },
             {
               "name": "timestamp",
@@ -3641,6 +3636,13 @@
               "name": "response",
               "$ref": "Response",
               "description": "Response data."
+            },
+            {
+              "name": "frameId",
+              "optional": true,
+              "$ref": "Page.FrameId",
+              "description": "Frame identifier.",
+              "experimental": true
             }
           ]
         },