Log Message
Web Inspector: HAR Extension for `serverIPAddress` port number https://bugs.webkit.org/show_bug.cgi?id=195695
Reviewed by Matt Baker. Source/WebInspectorUI: * UserInterface/Controllers/HARBuilder.js: (WI.HARBuilder.entry): (WI.HARBuilder.port): * UserInterface/Models/LocalResource.js: (WI.LocalResource.fromHAREntry): LayoutTests: * http/tests/inspector/network/har/har-basic-expected.txt: * http/tests/inspector/network/har/har-page-expected.txt:
Modified Paths
- trunk/LayoutTests/ChangeLog
- trunk/LayoutTests/http/tests/inspector/network/har/har-basic-expected.txt
- trunk/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt
- trunk/Source/WebInspectorUI/ChangeLog
- trunk/Source/WebInspectorUI/UserInterface/Controllers/HARBuilder.js
- trunk/Source/WebInspectorUI/UserInterface/Models/LocalResource.js
Diff
Modified: trunk/LayoutTests/ChangeLog (243086 => 243087)
--- trunk/LayoutTests/ChangeLog 2019-03-18 18:35:04 UTC (rev 243086)
+++ trunk/LayoutTests/ChangeLog 2019-03-18 18:47:43 UTC (rev 243087)
@@ -1,5 +1,15 @@
2019-03-18 Joseph Pecoraro <pecor...@apple.com>
+ Web Inspector: HAR Extension for `serverIPAddress` port number
+ https://bugs.webkit.org/show_bug.cgi?id=195695
+
+ Reviewed by Matt Baker.
+
+ * http/tests/inspector/network/har/har-basic-expected.txt:
+ * http/tests/inspector/network/har/har-page-expected.txt:
+
+2019-03-18 Joseph Pecoraro <pecor...@apple.com>
+
Unreviewed test gardening after r243024.
* inspector/timeline/timeline-recording-expected.txt:
Modified: trunk/LayoutTests/http/tests/inspector/network/har/har-basic-expected.txt (243086 => 243087)
--- trunk/LayoutTests/http/tests/inspector/network/har/har-basic-expected.txt 2019-03-18 18:35:04 UTC (rev 243086)
+++ trunk/LayoutTests/http/tests/inspector/network/har/har-basic-expected.txt 2019-03-18 18:47:43 UTC (rev 243087)
@@ -135,6 +135,7 @@
"receive": 99.99999999999987
},
"serverIPAddress": "12.34.56.78",
+ "_serverPort": 443,
"connection": "1",
"_fetchType": "Network Load",
"_priority": "medium"
Modified: trunk/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt (243086 => 243087)
--- trunk/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt 2019-03-18 18:35:04 UTC (rev 243086)
+++ trunk/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt 2019-03-18 18:47:43 UTC (rev 243087)
@@ -62,6 +62,7 @@
"wait": "<filtered>",
"receive": "<filtered>"
},
+ "_serverPort": 8000,
"_priority": "high"
},
{
@@ -104,6 +105,7 @@
"wait": "<filtered>",
"receive": "<filtered>"
},
+ "_serverPort": 8000,
"_priority": "high"
},
{
@@ -146,6 +148,7 @@
"wait": "<filtered>",
"receive": "<filtered>"
},
+ "_serverPort": 8000,
"_priority": "high"
},
{
@@ -195,6 +198,7 @@
"wait": "<filtered>",
"receive": "<filtered>"
},
+ "_serverPort": 8000,
"_priority": "medium"
},
{
@@ -250,6 +254,7 @@
"wait": "<filtered>",
"receive": "<filtered>"
},
+ "_serverPort": 8000,
"_priority": "medium"
},
{
@@ -304,6 +309,7 @@
"wait": "<filtered>",
"receive": "<filtered>"
},
+ "_serverPort": 8000,
"_priority": "medium"
},
{
@@ -358,6 +364,7 @@
"wait": "<filtered>",
"receive": "<filtered>"
},
+ "_serverPort": 8000,
"_priority": "medium"
},
{
@@ -412,6 +419,7 @@
"wait": "<filtered>",
"receive": "<filtered>"
},
+ "_serverPort": 8000,
"_priority": "medium"
},
{
@@ -470,6 +478,7 @@
"wait": "<filtered>",
"receive": "<filtered>"
},
+ "_serverPort": 8000,
"_priority": "medium"
},
{
@@ -534,6 +543,7 @@
"wait": "<filtered>",
"receive": "<filtered>"
},
+ "_serverPort": 8000,
"_priority": "medium"
},
{
@@ -602,6 +612,7 @@
"wait": "<filtered>",
"receive": "<filtered>"
},
+ "_serverPort": 8000,
"_priority": "medium"
},
{
@@ -674,6 +685,7 @@
"wait": "<filtered>",
"receive": "<filtered>"
},
+ "_serverPort": 8000,
"_priority": "medium"
},
{
@@ -750,6 +762,7 @@
"wait": "<filtered>",
"receive": "<filtered>"
},
+ "_serverPort": 8000,
"_priority": "medium"
}
]
Modified: trunk/Source/WebInspectorUI/ChangeLog (243086 => 243087)
--- trunk/Source/WebInspectorUI/ChangeLog 2019-03-18 18:35:04 UTC (rev 243086)
+++ trunk/Source/WebInspectorUI/ChangeLog 2019-03-18 18:47:43 UTC (rev 243087)
@@ -1,3 +1,16 @@
+2019-03-18 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: HAR Extension for `serverIPAddress` port number
+ https://bugs.webkit.org/show_bug.cgi?id=195695
+
+ Reviewed by Matt Baker.
+
+ * UserInterface/Controllers/HARBuilder.js:
+ (WI.HARBuilder.entry):
+ (WI.HARBuilder.port):
+ * UserInterface/Models/LocalResource.js:
+ (WI.LocalResource.fromHAREntry):
+
2019-03-16 Nikita Vasilyev <nvasil...@apple.com>
Web Inspector: Changes: style attribute changes aren't being tracked
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/HARBuilder.js (243086 => 243087)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/HARBuilder.js 2019-03-18 18:35:04 UTC (rev 243086)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/HARBuilder.js 2019-03-18 18:47:43 UTC (rev 243087)
@@ -105,7 +105,10 @@
entry.time = (resource.timingData.responseEnd - resource.timingData.startTime) * 1000;
if (resource.remoteAddress) {
entry.serverIPAddress = HARBuilder.ipAddress(resource.remoteAddress);
- // FIXME: <https://webkit.org/b/195695> Web Inspector: HAR Extension for `serverIPAddress` port number
+
+ // WebKit Custom Field `_serverPort`.
+ if (entry.serverIPAddress)
+ entry._serverPort = HARBuilder.port(resource.remoteAddress);
}
if (resource.connectionIdentifier)
entry.connection = "" + resource.connectionIdentifier;
@@ -295,6 +298,26 @@
return remoteAddress.replace(/:\d+$/, "");
}
+ static port(remoteAddress)
+ {
+ // IP Address, without port.
+ if (!remoteAddress)
+ return undefined;
+
+ // NOTE: Resource.remoteAddress always includes the port at the end.
+ // So this always matches the last part.
+ let index = remoteAddress.lastIndexOf(":");
+ if (!index)
+ return undefined;
+
+ let portString = remoteAddress.substr(index + 1);
+ let port = parseInt(portString);
+ if (isNaN(port))
+ return undefined;
+
+ return port;
+ }
+
static date(date)
{
// ISO 8601
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/LocalResource.js (243086 => 243087)
--- trunk/Source/WebInspectorUI/UserInterface/Models/LocalResource.js 2019-03-18 18:35:04 UTC (rev 243086)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/LocalResource.js 2019-03-18 18:47:43 UTC (rev 243087)
@@ -97,7 +97,6 @@
static fromHAREntry(entry, archiveStartWalltime)
{
- // FIXME: <https://webkit.org/b/195695> Web Inspector: HAR Extension for `serverIPAddress` port number
// FIXME: <https://webkit.org/b/195694> Web Inspector: HAR Extension for Redirect Timing Info
let {request, response, startedDateTime, timings} = entry;
@@ -159,6 +158,10 @@
finishedTimestamp = timing.responseEnd;
}
+ let serverAddress = entry.serverIPAddress || null;
+ if (serverAddress && typeof entry._serverPort === "number")
+ serverAddress += ":" + entry._serverPort;
+
return new WI.LocalResource({
request: {
url: request.url,
@@ -182,7 +185,7 @@
responseSource: WI.HARBuilder.responseSourceFromHARFetchType(entry._fetchType),
protocol: WI.HARBuilder.protocolFromHARProtocol(response.httpVersion),
priority: WI.HARBuilder.networkPriorityFromHARPriority(entry._priority),
- remoteAddress: entry.serverIPAddress || null,
+ remoteAddress: serverAddress,
connectionIdentifier: entry.connection ? parseInt(entry.connection) : null,
requestHeaderBytesSent: request.headersSize >= 0 ? request.headersSize : NaN,
requestBodyBytesSent: request.bodySize >= 0 ? request.bodySize : NaN,
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
