Skip to content

Commit b07d818

Browse files
KhafraDevmetcoder95
authored andcommitted
update create opaque timing info (nodejs#1143)
1 parent ffb3a6e commit b07d818

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

lib/fetch/index.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const {
2424
requestCurrentURL,
2525
setRequestReferrerPolicyOnRedirect,
2626
tryUpgradeRequestToAPotentiallyTrustworthyURL,
27-
makeTimingInfo,
27+
createOpaqueTimingInfo,
2828
appendFetchMetadata,
2929
corsCheck,
3030
crossOriginResourcePolicyCheck,
@@ -226,11 +226,9 @@ function finalizeAndReportTiming (response, initiatorType = 'other') {
226226

227227
// 6. If response’s timing allow passed flag is not set, then:
228228
if (!timingInfo.timingAllowPassed) {
229-
// 1. Set timingInfo to a new fetch timing info whose start time and
230-
// post-redirect start time are timingInfo’s start time.
231-
timingInfo = makeTimingInfo({
232-
startTime: timingInfo.startTime,
233-
postRedirectStartTime: timingInfo.postRedirectStartTime
229+
// 1. Set timingInfo to a the result of creating an opaque timing info for timingInfo.
230+
timingInfo = createOpaqueTimingInfo({
231+
startTime: timingInfo.startTime
234232
})
235233

236234
// 2. Set cacheState to the empty string.
@@ -339,9 +337,8 @@ function fetching ({
339337
// post-redirect start time are the coarsened shared current time given
340338
// crossOriginIsolatedCapability.
341339
const currenTime = coarsenedSharedCurrentTime(crossOriginIsolatedCapability)
342-
const timingInfo = makeTimingInfo({
343-
startTime: currenTime,
344-
postRedirectStartTime: currenTime
340+
const timingInfo = createOpaqueTimingInfo({
341+
startTime: currenTime
345342
})
346343

347344
// 6. Let fetchParams be a new fetch params whose

lib/fetch/util.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -253,20 +253,20 @@ function coarsenedSharedCurrentTime (crossOriginIsolatedCapability) {
253253
return performance.now()
254254
}
255255

256-
function makeTimingInfo (init) {
256+
// https://fetch.spec.whatwg.org/#create-an-opaque-timing-info
257+
function createOpaqueTimingInfo (timingInfo) {
257258
return {
258-
startTime: 0,
259+
startTime: timingInfo.startTime ?? 0,
259260
redirectStartTime: 0,
260261
redirectEndTime: 0,
261-
postRedirectStartTime: 0,
262+
postRedirectStartTime: timingInfo.startTime ?? 0,
262263
finalServiceWorkerStartTime: 0,
263264
finalNetworkResponseStartTime: 0,
264265
finalNetworkRequestStartTime: 0,
265266
endTime: 0,
266267
encodedBodySize: 0,
267268
decodedBodySize: 0,
268-
finalConnectionTimingInfo: null,
269-
...init
269+
finalConnectionTimingInfo: null
270270
}
271271
}
272272

@@ -318,7 +318,7 @@ module.exports = {
318318
TAOCheck,
319319
corsCheck,
320320
crossOriginResourcePolicyCheck,
321-
makeTimingInfo,
321+
createOpaqueTimingInfo,
322322
setRequestReferrerPolicyOnRedirect,
323323
isValidHTTPToken,
324324
requestBadPort,

0 commit comments

Comments
 (0)