Skip to content

added ResourceTiming parser in CDP Network #7415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 5, 2019
Merged

added ResourceTiming parser in CDP Network #7415

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a64a19f
added ResourceTiming parser in CDP Network
Jul 21, 2019
ade19b3
fixed PR rejects
Jul 23, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 127 additions & 0 deletions java/client/src/org/openqa/selenium/devtools/network/model/ResourceTiming.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@

package org.openqa.selenium.devtools.network.model;

import static java.util.Objects.requireNonNull;

import org.openqa.selenium.json.JsonInput;

/**
* Timing information for the request
*/
Expand Down Expand Up @@ -54,6 +58,32 @@ public class ResourceTiming {

private Double receiveHeadersEnd;

public ResourceTiming(Double requestTime, Double proxyStart, Double proxyEnd,
Double dnsStart, Double dnsEnd, Double connectStart,
Double connectEnd, Double sslStart, Double sslEnd,
Double workerStart, Double workerReady, Double sendStart,
Double sendEnd, Double pushStart, Double pushEnd,
Double receiveHeadersEnd) {
this.requestTime = requireNonNull(requestTime, "'requestTime' is required for ResourceTiming");
this.proxyStart = requireNonNull(proxyStart, "'proxyStart' is required for ResourceTiming");
this.proxyEnd = requireNonNull(proxyEnd, "'proxyEnd' is required for ResourceTiming");
this.dnsStart = requireNonNull(dnsStart, "'dnsStart' is required for ResourceTiming");
this.dnsEnd = requireNonNull(dnsEnd, "'dnsEnd' is required for ResourceTiming");
this.connectStart =
requireNonNull(connectStart, "'connectStart' is required for ResourceTiming");
this.connectEnd = requireNonNull(connectEnd, "'connectEnd' is required for ResourceTiming");
this.sslStart = requireNonNull(sslStart, "'sslStart' is required for ResourceTiming");
this.sslEnd = requireNonNull(sslEnd, "'sslEnd' is required for ResourceTiming");
this.workerStart = workerStart;
this.workerReady = workerReady;
this.sendStart = requireNonNull(sendStart, "'sendStart' is required for ResourceTiming");
this.sendEnd = requireNonNull(sendEnd, "'sendEnd' is required for ResourceTiming");
this.pushStart = pushStart;
this.pushEnd = pushEnd;
this.receiveHeadersEnd =
requireNonNull(receiveHeadersEnd, "'receiveHeadersEnd' is required for ResourceTiming");
}

/**
* Timing's requestTime is a baseline in seconds, while the other numbers are ticks in
* milliseconds relatively to this requestTime.
Expand Down Expand Up @@ -219,4 +249,101 @@ public Double getReceiveHeadersEnd() {
public void setReceiveHeadersEnd(Double receiveHeadersEnd) {
this.receiveHeadersEnd = receiveHeadersEnd;
}

private static ResourceTiming fromJson(JsonInput input) {

input.beginObject();

Double requestTime = null;

Double proxyStart = null;

Double proxyEnd = null;

Double dnsStart = null;

Double dnsEnd = null;

Double connectStart = null;

Double connectEnd = null;

Double sslStart = null;

Double sslEnd = null;

Double workerStart = null;

Double workerReady = null;

Double sendStart = null;

Double sendEnd = null;

Double pushStart = null;

Double pushEnd = null;

Double receiveHeadersEnd = null;

while (input.hasNext()) {
switch (input.nextName()) {
case "requestTime":
requestTime = input.read(Double.class);
break;
case "proxyStart":
proxyStart = input.read(Double.class);
break;
case "proxyEnd":
proxyEnd = input.read(Double.class);
break;
case "dnsStart":
dnsStart = input.read(Double.class);
break;
case "dnsEnd":
dnsEnd = input.read(Double.class);
break;
case "connectStart":
connectStart = input.read(Double.class);
break;
case "connectEnd":
connectEnd = input.read(Double.class);
break;
case "sslStart":
sslStart = input.read(Double.class);
break;
case "sslEnd":
sslEnd = input.read(Double.class);
break;
case "workerStart":
workerStart = input.read(Double.class);
break;
case "workerReady":
workerReady = input.read(Double.class);
break;
case "sendStart":
sendStart = input.read(Double.class);
break;
case "sendEnd":
sendEnd = input.read(Double.class);
break;
case "pushStart":
pushStart = input.read(Double.class);
break;
case "pushEnd":
pushEnd = input.read(Double.class);
break;
case "receiveHeadersEnd":
receiveHeadersEnd = input.read(Double.class);
break;
default:
input.skipValue();
break;
}
}

return new ResourceTiming(requestTime, proxyStart, proxyEnd, dnsStart, dnsEnd, connectStart,
connectEnd, sslStart, sslEnd, workerStart, workerReady, sendStart,
sendEnd, pushStart, pushEnd, receiveHeadersEnd);
}
}
3 changes: 3 additions & 0 deletions java/client/src/org/openqa/selenium/devtools/network/model/Response.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,9 @@ private static Response fromJson(JsonInput input) {
case "securityDetails":
securityDetails = input.read(SecurityDetails.class);
break;
case "timing":
timing = input.read(ResourceTiming.class);
break;
default:
input.skipValue();
break;
Expand Down
38 changes: 20 additions & 18 deletions java/client/test/org/openqa/selenium/devtools/ChromeDevToolsNetworkTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,6 @@
package org.openqa.selenium.devtools;


import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.junit.Assert;
import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.Cookie;
import org.openqa.selenium.devtools.network.model.BlockedReason;
import org.openqa.selenium.devtools.network.model.ConnectionType;
import org.openqa.selenium.devtools.network.model.InterceptionStage;
import org.openqa.selenium.devtools.network.model.RequestId;
import org.openqa.selenium.devtools.network.model.RequestPattern;
import org.openqa.selenium.devtools.network.model.ResourceType;
import org.openqa.selenium.devtools.network.model.ResponseBody;
import org.openqa.selenium.remote.http.HttpMethod;

import java.util.List;
import java.util.Optional;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.openqa.selenium.devtools.network.Network.clearBrowserCache;
Expand Down Expand Up @@ -75,6 +57,25 @@
import static org.openqa.selenium.devtools.network.Network.webSocketFrameReceived;
import static org.openqa.selenium.devtools.network.Network.webSocketFrameSent;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;

import org.junit.Assert;
import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.Cookie;
import org.openqa.selenium.devtools.network.model.BlockedReason;
import org.openqa.selenium.devtools.network.model.ConnectionType;
import org.openqa.selenium.devtools.network.model.InterceptionStage;
import org.openqa.selenium.devtools.network.model.RequestId;
import org.openqa.selenium.devtools.network.model.RequestPattern;
import org.openqa.selenium.devtools.network.model.ResourceType;
import org.openqa.selenium.devtools.network.model.ResponseBody;
import org.openqa.selenium.remote.http.HttpMethod;

import java.util.List;
import java.util.Optional;

public class ChromeDevToolsNetworkTest extends DevToolsTestBase {

@Test
Expand Down Expand Up @@ -181,6 +182,7 @@ public void verifySearchInResponseBody() {

devTools.addListener(responseReceived(), responseReceived -> {
Assert.assertNotNull(responseReceived);
Assert.assertNotNull(responseReceived.getResponse().getTiming());
requestIds[0] = responseReceived.getRequestId();
});

Expand Down