lighthouse 12.0.0 → 12.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cli/run.js +5 -38
- package/cli/test/smokehouse/lighthouse-runners/bundle.js +1 -1
- package/cli/test/smokehouse/smokehouse.js +11 -1
- package/core/audits/accessibility/aria-allowed-role.js +7 -9
- package/core/audits/byte-efficiency/byte-efficiency-audit.d.ts +2 -2
- package/core/audits/byte-efficiency/byte-efficiency-audit.js +3 -3
- package/core/audits/byte-efficiency/offscreen-images.js +1 -1
- package/core/audits/byte-efficiency/render-blocking-resources.d.ts +3 -3
- package/core/audits/byte-efficiency/render-blocking-resources.js +10 -10
- package/core/audits/dobetterweb/uses-http2.d.ts +2 -2
- package/core/audits/dobetterweb/uses-http2.js +5 -5
- package/core/audits/long-tasks.d.ts +7 -6
- package/core/audits/long-tasks.js +5 -4
- package/core/audits/metrics/first-meaningful-paint.d.ts +1 -17
- package/core/audits/metrics/first-meaningful-paint.js +5 -47
- package/core/audits/metrics/interactive.d.ts +1 -1
- package/core/audits/metrics/interactive.js +1 -1
- package/core/audits/predictive-perf.js +0 -6
- package/core/audits/prioritize-lcp-image.d.ts +1 -1
- package/core/audits/prioritize-lcp-image.js +2 -2
- package/core/audits/redirects.js +2 -3
- package/core/audits/third-party-facades.js +1 -1
- package/core/audits/third-party-summary.js +1 -1
- package/core/audits/uses-rel-preconnect.js +2 -2
- package/core/audits/uses-rel-preload.js +9 -9
- package/core/computed/critical-request-chains.js +3 -3
- package/core/computed/document-urls.js +3 -2
- package/core/computed/load-simulator.d.ts +4 -4
- package/core/computed/load-simulator.js +3 -54
- package/core/computed/main-resource.js +3 -2
- package/core/computed/metrics/interactive.d.ts +6 -0
- package/core/computed/metrics/interactive.js +2 -2
- package/core/computed/metrics/lantern-first-contentful-paint.d.ts +4 -4
- package/core/computed/metrics/lantern-first-contentful-paint.js +3 -3
- package/core/computed/metrics/lantern-interactive.d.ts +4 -4
- package/core/computed/metrics/lantern-interactive.js +6 -6
- package/core/computed/metrics/lantern-largest-contentful-paint.d.ts +4 -4
- package/core/computed/metrics/lantern-largest-contentful-paint.js +3 -3
- package/core/computed/metrics/lantern-max-potential-fid.d.ts +4 -4
- package/core/computed/metrics/lantern-max-potential-fid.js +3 -3
- package/core/computed/metrics/lantern-metric.d.ts +21 -2
- package/core/computed/metrics/lantern-metric.js +39 -4
- package/core/computed/metrics/lantern-speed-index.d.ts +4 -4
- package/core/computed/metrics/lantern-speed-index.js +4 -4
- package/core/computed/metrics/lantern-total-blocking-time.d.ts +4 -4
- package/core/computed/metrics/lantern-total-blocking-time.js +3 -3
- package/core/computed/metrics/timing-summary.js +0 -6
- package/core/computed/metrics/total-blocking-time.js +3 -1
- package/core/computed/navigation-insights.d.ts +2 -20
- package/core/computed/network-analysis.d.ts +0 -5
- package/core/computed/network-analysis.js +2 -42
- package/core/computed/page-dependency-graph.d.ts +5 -3
- package/core/computed/page-dependency-graph.js +17 -7
- package/core/computed/processed-navigation.d.ts +1 -1
- package/core/computed/tbt-impact-tasks.js +4 -2
- package/core/computed/trace-engine-result.d.ts +0 -11
- package/core/computed/trace-engine-result.js +5 -19
- package/core/config/constants.d.ts +28 -53
- package/core/config/constants.js +2 -43
- package/core/gather/driver/navigation.js +1 -1
- package/core/gather/driver/network-monitor.d.ts +2 -1
- package/core/gather/driver/network-monitor.js +4 -4
- package/core/gather/driver/target-manager.d.ts +1 -1
- package/core/gather/driver.d.ts +0 -12
- package/core/gather/driver.js +1 -26
- package/core/gather/gatherers/inspector-issues.js +1 -0
- package/core/gather/gatherers/root-causes.js +0 -1
- package/core/gather/session.d.ts +5 -3
- package/core/gather/session.js +22 -1
- package/core/lib/asset-saver.d.ts +13 -9
- package/core/lib/asset-saver.js +77 -30
- package/core/lib/bf-cache-strings.js +2 -2
- package/core/lib/lantern/{base-node.d.ts → BaseNode.d.ts} +7 -9
- package/core/lib/lantern/{base-node.js → BaseNode.js} +6 -6
- package/core/lib/lantern/BaseNode.test.js +385 -0
- package/core/lib/lantern/CpuNode.d.ts +43 -0
- package/core/lib/lantern/{cpu-node.js → CpuNode.js} +8 -9
- package/core/lib/lantern/{lantern-error.d.ts → LanternError.d.ts} +1 -1
- package/core/lib/lantern/{metric.d.ts → Metric.d.ts} +23 -25
- package/core/lib/lantern/{metric.js → Metric.js} +14 -16
- package/core/lib/lantern/{network-node.d.ts → NetworkNode.d.ts} +6 -7
- package/core/lib/lantern/{network-node.js → NetworkNode.js} +7 -9
- package/core/lib/lantern/PageDependencyGraph.d.ts +82 -0
- package/core/lib/lantern/{page-dependency-graph.js → PageDependencyGraph.js} +185 -50
- package/core/lib/lantern/PageDependencyGraph.test.js +654 -0
- package/core/{computed/metrics/tbt-utils.d.ts → lib/lantern/TBTUtils.d.ts} +1 -1
- package/core/lib/lantern/TBTUtils.test.d.ts +2 -0
- package/core/lib/lantern/TBTUtils.test.js +130 -0
- package/core/lib/lantern/TraceEngineComputationData.d.ts +25 -0
- package/core/lib/lantern/TraceEngineComputationData.js +466 -0
- package/core/lib/lantern/lantern.d.ts +19 -7
- package/core/lib/lantern/lantern.js +21 -1
- package/core/lib/lantern/metrics/{first-contentful-paint.d.ts → FirstContentfulPaint.d.ts} +11 -11
- package/core/lib/lantern/metrics/{first-contentful-paint.js → FirstContentfulPaint.js} +11 -13
- package/core/lib/lantern/metrics/FirstContentfulPaint.test.js +54 -0
- package/core/lib/lantern/metrics/Interactive.d.ts +20 -0
- package/core/lib/lantern/metrics/{interactive.js → Interactive.js} +23 -26
- package/core/lib/lantern/metrics/Interactive.test.js +56 -0
- package/core/lib/lantern/metrics/LargestContentfulPaint.d.ts +19 -0
- package/core/lib/lantern/metrics/{largest-contentful-paint.js → LargestContentfulPaint.js} +16 -19
- package/core/lib/lantern/metrics/LargestContentfulPaint.test.js +42 -0
- package/core/lib/lantern/metrics/MaxPotentialFID.d.ts +24 -0
- package/core/lib/lantern/metrics/{max-potential-fid.js → MaxPotentialFID.js} +12 -13
- package/core/lib/lantern/metrics/MetricTestUtils.d.ts +19 -0
- package/core/lib/lantern/metrics/MetricTestUtils.js +48 -0
- package/core/lib/lantern/metrics/{speed-index.d.ts → SpeedIndex.d.ts} +7 -13
- package/core/lib/lantern/metrics/{speed-index.js → SpeedIndex.js} +14 -16
- package/core/lib/lantern/metrics/SpeedIndex.test.js +83 -0
- package/core/lib/lantern/metrics/TotalBlockingTime.d.ts +25 -0
- package/core/lib/lantern/metrics/{total-blocking-time.js → TotalBlockingTime.js} +13 -16
- package/core/lib/lantern/metrics/__snapshots__/FirstContentfulPaint.test.js.snap +11 -0
- package/core/lib/lantern/metrics/__snapshots__/Interactive.test.js.snap +17 -0
- package/core/lib/lantern/metrics/metrics.d.ts +9 -0
- package/core/lib/lantern/metrics/metrics.js +16 -0
- package/core/lib/lantern/{simulator/connection-pool.d.ts → simulation/ConnectionPool.d.ts} +15 -15
- package/core/lib/lantern/{simulator/connection-pool.js → simulation/ConnectionPool.js} +25 -25
- package/core/lib/lantern/simulation/ConnectionPool.test.js +195 -0
- package/core/lib/lantern/simulation/Constants.d.ts +52 -0
- package/core/lib/lantern/simulation/Constants.js +48 -0
- package/core/lib/lantern/{simulator/dns-cache.d.ts → simulation/DNSCache.d.ts} +3 -3
- package/core/lib/lantern/{simulator/dns-cache.js → simulation/DNSCache.js} +2 -2
- package/core/lib/lantern/simulation/DNSCache.test.js +72 -0
- package/core/lib/lantern/{simulator/network-analyzer.d.ts → simulation/NetworkAnalyzer.d.ts} +34 -21
- package/core/lib/lantern/{simulator/network-analyzer.js → simulation/NetworkAnalyzer.js} +106 -57
- package/core/lib/lantern/simulation/NetworkAnalyzer.test.js +475 -0
- package/core/lib/lantern/{simulator/simulator-timing-map.d.ts → simulation/SimulationTimingMap.d.ts} +7 -7
- package/core/lib/lantern/{simulator/simulator-timing-map.js → simulation/SimulationTimingMap.js} +5 -6
- package/core/lib/lantern/{simulator/simulator.d.ts → simulation/Simulator.d.ts} +21 -19
- package/core/lib/lantern/{simulator/simulator.js → simulation/Simulator.js} +100 -45
- package/core/lib/lantern/simulation/Simulator.test.js +434 -0
- package/core/lib/lantern/simulation/TCPConnection.test.d.ts +2 -0
- package/core/lib/lantern/simulation/TCPConnection.test.js +374 -0
- package/core/lib/lantern/{simulator/tcp-connection.d.ts → simulation/TcpConnection.d.ts} +2 -2
- package/core/lib/lantern/{simulator/tcp-connection.js → simulation/TcpConnection.js} +1 -1
- package/core/lib/lantern/simulation/simulation.d.ts +21 -0
- package/core/lib/lantern/simulation/simulation.js +28 -0
- package/core/lib/lantern/types/lantern.d.ts +145 -20
- package/core/lib/lantern-trace-saver.d.ts +4 -4
- package/core/lib/lantern-trace-saver.js +4 -4
- package/core/lib/navigation-error.js +3 -3
- package/core/lib/network-recorder.js +2 -2
- package/core/lib/network-request.d.ts +29 -3
- package/core/lib/network-request.js +20 -13
- package/core/lib/tracehouse/trace-processor.d.ts +0 -2
- package/core/lib/tracehouse/trace-processor.js +1 -31
- package/core/lib/traces/metric-trace-events.js +0 -5
- package/dist/report/bundle.esm.js +1 -1
- package/dist/report/flow.js +1 -1
- package/dist/report/standalone.js +1 -1
- package/package.json +14 -13
- package/report/renderer/performance-category-renderer.js +1 -1
- package/shared/localization/locales/ar-XB.json +43 -4
- package/shared/localization/locales/ar.json +43 -4
- package/shared/localization/locales/bg.json +43 -4
- package/shared/localization/locales/ca.json +44 -5
- package/shared/localization/locales/cs.json +43 -4
- package/shared/localization/locales/da.json +43 -4
- package/shared/localization/locales/de.json +43 -4
- package/shared/localization/locales/el.json +43 -4
- package/shared/localization/locales/en-GB.json +42 -3
- package/shared/localization/locales/en-US.json +4 -4
- package/shared/localization/locales/en-XA.json +43 -4
- package/shared/localization/locales/en-XL.json +4 -4
- package/shared/localization/locales/es-419.json +43 -4
- package/shared/localization/locales/es.json +42 -3
- package/shared/localization/locales/fi.json +43 -4
- package/shared/localization/locales/fil.json +42 -3
- package/shared/localization/locales/fr.json +42 -3
- package/shared/localization/locales/he.json +48 -9
- package/shared/localization/locales/hi.json +43 -4
- package/shared/localization/locales/hr.json +43 -4
- package/shared/localization/locales/hu.json +42 -3
- package/shared/localization/locales/id.json +42 -3
- package/shared/localization/locales/it.json +43 -4
- package/shared/localization/locales/ja.json +42 -3
- package/shared/localization/locales/ko.json +43 -4
- package/shared/localization/locales/lt.json +42 -3
- package/shared/localization/locales/lv.json +43 -4
- package/shared/localization/locales/nl.json +44 -5
- package/shared/localization/locales/no.json +42 -3
- package/shared/localization/locales/pl.json +43 -4
- package/shared/localization/locales/pt-PT.json +43 -4
- package/shared/localization/locales/pt.json +43 -4
- package/shared/localization/locales/ro.json +43 -4
- package/shared/localization/locales/ru.json +43 -4
- package/shared/localization/locales/sk.json +43 -4
- package/shared/localization/locales/sl.json +42 -3
- package/shared/localization/locales/sr-Latn.json +43 -4
- package/shared/localization/locales/sr.json +43 -4
- package/shared/localization/locales/sv.json +42 -3
- package/shared/localization/locales/ta.json +42 -3
- package/shared/localization/locales/te.json +43 -4
- package/shared/localization/locales/th.json +44 -5
- package/shared/localization/locales/tr.json +43 -4
- package/shared/localization/locales/uk.json +43 -4
- package/shared/localization/locales/vi.json +43 -4
- package/shared/localization/locales/zh-HK.json +43 -4
- package/shared/localization/locales/zh-TW.json +43 -4
- package/shared/localization/locales/zh.json +43 -4
- package/third-party/chromium-synchronization/inspector-issueAdded-types-test.js +1 -0
- package/tsconfig-all.json +1 -0
- package/tsconfig.json +11 -7
- package/types/artifacts.d.ts +23 -25
- package/types/gatherer.d.ts +2 -3
- package/types/lhr/lhr.d.ts +2 -0
- package/core/computed/metrics/first-meaningful-paint.d.ts +0 -21
- package/core/computed/metrics/first-meaningful-paint.js +0 -44
- package/core/computed/metrics/lantern-first-meaningful-paint.d.ts +0 -25
- package/core/computed/metrics/lantern-first-meaningful-paint.js +0 -43
- package/core/lib/lantern/cpu-node.d.ts +0 -44
- package/core/lib/lantern/metrics/first-meaningful-paint.d.ts +0 -6
- package/core/lib/lantern/metrics/first-meaningful-paint.js +0 -64
- package/core/lib/lantern/metrics/interactive.d.ts +0 -26
- package/core/lib/lantern/metrics/largest-contentful-paint.d.ts +0 -19
- package/core/lib/lantern/metrics/max-potential-fid.d.ts +0 -30
- package/core/lib/lantern/metrics/total-blocking-time.d.ts +0 -31
- package/core/lib/lantern/page-dependency-graph.d.ts +0 -58
- /package/core/lib/lantern/{lantern-error.js → LanternError.js} +0 -0
- /package/core/{computed/metrics/tbt-utils.js → lib/lantern/TBTUtils.js} +0 -0
|
@@ -0,0 +1,195 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2018 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
|
|
7
|
+
import assert from 'assert/strict';
|
|
8
|
+
import {URL} from 'url';
|
|
9
|
+
|
|
10
|
+
import * as Lantern from '../lantern.js';
|
|
11
|
+
|
|
12
|
+
const {ConnectionPool} = Lantern.Simulation;
|
|
13
|
+
|
|
14
|
+
describe('ConnectionPool', () => {
|
|
15
|
+
const rtt = 100;
|
|
16
|
+
const throughput = 10000 * 1024;
|
|
17
|
+
let requestId;
|
|
18
|
+
|
|
19
|
+
function request(data = {}) {
|
|
20
|
+
const url = data.url || 'http://example.com';
|
|
21
|
+
const origin = new URL(url).origin;
|
|
22
|
+
const scheme = url.split(':')[0];
|
|
23
|
+
|
|
24
|
+
return Object.assign({
|
|
25
|
+
requestId: requestId++,
|
|
26
|
+
url,
|
|
27
|
+
protocol: 'http/1.1',
|
|
28
|
+
parsedURL: {scheme, securityOrigin: origin},
|
|
29
|
+
}, data);
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
function simulationOptions(options) {
|
|
33
|
+
return Object.assign(
|
|
34
|
+
{
|
|
35
|
+
rtt: 150,
|
|
36
|
+
throughput: 1024,
|
|
37
|
+
additionalRttByOrigin: new Map(),
|
|
38
|
+
serverResponseTimeByOrigin: new Map(),
|
|
39
|
+
},
|
|
40
|
+
options
|
|
41
|
+
);
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
beforeEach(() => {
|
|
45
|
+
requestId = 1;
|
|
46
|
+
});
|
|
47
|
+
|
|
48
|
+
describe('#constructor', () => {
|
|
49
|
+
it('should create the pool', () => {
|
|
50
|
+
const pool = new ConnectionPool([request()], simulationOptions({rtt, throughput}));
|
|
51
|
+
// Make sure 6 connections are created for each origin
|
|
52
|
+
assert.equal(pool._connectionsByOrigin.get('http://example.com').length, 6);
|
|
53
|
+
// Make sure it populates connectionWasReused
|
|
54
|
+
assert.equal(pool._connectionReusedByRequestId.get(1), false);
|
|
55
|
+
|
|
56
|
+
const connection = pool._connectionsByOrigin.get('http://example.com')[0];
|
|
57
|
+
assert.equal(connection._rtt, rtt);
|
|
58
|
+
assert.equal(connection._throughput, throughput);
|
|
59
|
+
assert.equal(connection._serverLatency, 30); // sets to default value
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
it('should set TLS properly', () => {
|
|
63
|
+
const recordA = request({url: 'https://example.com'});
|
|
64
|
+
const pool = new ConnectionPool([recordA], simulationOptions({rtt, throughput}));
|
|
65
|
+
const connection = pool._connectionsByOrigin.get('https://example.com')[0];
|
|
66
|
+
assert.ok(connection._ssl, 'should have set connection TLS');
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
it('should set H2 properly', () => {
|
|
70
|
+
const recordA = request({protocol: 'h2'});
|
|
71
|
+
const pool = new ConnectionPool([recordA], simulationOptions({rtt, throughput}));
|
|
72
|
+
const connection = pool._connectionsByOrigin.get('http://example.com')[0];
|
|
73
|
+
assert.ok(connection.isH2(), 'should have set HTTP/2');
|
|
74
|
+
assert.equal(pool._connectionsByOrigin.get('http://example.com').length, 1);
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
it('should set origin-specific RTT properly', () => {
|
|
78
|
+
const additionalRttByOrigin = new Map([['http://example.com', 63]]);
|
|
79
|
+
const pool = new ConnectionPool([request()],
|
|
80
|
+
simulationOptions({rtt, throughput, additionalRttByOrigin}));
|
|
81
|
+
const connection = pool._connectionsByOrigin.get('http://example.com')[0];
|
|
82
|
+
assert.ok(connection._rtt, rtt + 63);
|
|
83
|
+
});
|
|
84
|
+
|
|
85
|
+
it('should set origin-specific server latency properly', () => {
|
|
86
|
+
const serverResponseTimeByOrigin = new Map([['http://example.com', 63]]);
|
|
87
|
+
const pool = new ConnectionPool([request()],
|
|
88
|
+
simulationOptions({rtt, throughput, serverResponseTimeByOrigin}));
|
|
89
|
+
const connection = pool._connectionsByOrigin.get('http://example.com')[0];
|
|
90
|
+
assert.ok(connection._serverLatency, 63);
|
|
91
|
+
});
|
|
92
|
+
});
|
|
93
|
+
|
|
94
|
+
describe('.acquire', () => {
|
|
95
|
+
it('should remember the connection associated with each request', () => {
|
|
96
|
+
const requestA = request();
|
|
97
|
+
const requestB = request();
|
|
98
|
+
const pool = new ConnectionPool([requestA, requestB], simulationOptions({rtt, throughput}));
|
|
99
|
+
|
|
100
|
+
const connectionForA = pool.acquire(requestA);
|
|
101
|
+
const connectionForB = pool.acquire(requestB);
|
|
102
|
+
for (let i = 0; i < 10; i++) {
|
|
103
|
+
assert.equal(pool.acquireActiveConnectionFromRequest(requestA), connectionForA);
|
|
104
|
+
assert.equal(pool.acquireActiveConnectionFromRequest(requestB), connectionForB);
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
assert.deepStrictEqual(pool.connectionsInUse(), [connectionForA, connectionForB]);
|
|
108
|
+
});
|
|
109
|
+
|
|
110
|
+
it('should allocate at least 6 connections', () => {
|
|
111
|
+
const pool = new ConnectionPool([request()], simulationOptions({rtt, throughput}));
|
|
112
|
+
for (let i = 0; i < 6; i++) {
|
|
113
|
+
assert.ok(pool.acquire(request()), `did not find connection for ${i}th request`);
|
|
114
|
+
}
|
|
115
|
+
});
|
|
116
|
+
|
|
117
|
+
it('should allocate all connections', () => {
|
|
118
|
+
const records = new Array(7).fill(undefined, 0, 7).map(() => request());
|
|
119
|
+
const pool = new ConnectionPool(records, simulationOptions({rtt, throughput}));
|
|
120
|
+
const connections = records.map(request => pool.acquire(request));
|
|
121
|
+
assert.ok(connections[0], 'did not find connection for 1st request');
|
|
122
|
+
assert.ok(connections[5], 'did not find connection for 6th request');
|
|
123
|
+
assert.ok(connections[6], 'did not find connection for 7th request');
|
|
124
|
+
});
|
|
125
|
+
|
|
126
|
+
it('should be oblivious to connection reuse', () => {
|
|
127
|
+
const coldRecord = request();
|
|
128
|
+
const warmRecord = request();
|
|
129
|
+
const pool = new ConnectionPool([coldRecord, warmRecord],
|
|
130
|
+
simulationOptions({rtt, throughput}));
|
|
131
|
+
pool._connectionReusedByRequestId.set(warmRecord.requestId, true);
|
|
132
|
+
|
|
133
|
+
assert.ok(pool.acquire(coldRecord), 'should have acquired connection');
|
|
134
|
+
assert.ok(pool.acquire(warmRecord), 'should have acquired connection');
|
|
135
|
+
pool.release(coldRecord);
|
|
136
|
+
|
|
137
|
+
for (const connection of pool._connectionsByOrigin.get('http://example.com')) {
|
|
138
|
+
connection.setWarmed(true);
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
assert.ok(pool.acquire(coldRecord), 'should have acquired connection');
|
|
142
|
+
assert.ok(pool.acquireActiveConnectionFromRequest(warmRecord),
|
|
143
|
+
'should have acquired connection');
|
|
144
|
+
});
|
|
145
|
+
|
|
146
|
+
it('should acquire in order of warmness', () => {
|
|
147
|
+
const recordA = request();
|
|
148
|
+
const recordB = request();
|
|
149
|
+
const recordC = request();
|
|
150
|
+
const pool = new ConnectionPool([recordA, recordB, recordC],
|
|
151
|
+
simulationOptions({rtt, throughput}));
|
|
152
|
+
pool._connectionReusedByRequestId.set(recordA.requestId, true);
|
|
153
|
+
pool._connectionReusedByRequestId.set(recordB.requestId, true);
|
|
154
|
+
pool._connectionReusedByRequestId.set(recordC.requestId, true);
|
|
155
|
+
|
|
156
|
+
const [connectionWarm, connectionWarmer, connectionWarmest] =
|
|
157
|
+
pool._connectionsByOrigin.get('http://example.com');
|
|
158
|
+
connectionWarm.setWarmed(true);
|
|
159
|
+
connectionWarm.setCongestionWindow(10);
|
|
160
|
+
connectionWarmer.setWarmed(true);
|
|
161
|
+
connectionWarmer.setCongestionWindow(100);
|
|
162
|
+
connectionWarmest.setWarmed(true);
|
|
163
|
+
connectionWarmest.setCongestionWindow(1000);
|
|
164
|
+
|
|
165
|
+
assert.equal(pool.acquire(recordA), connectionWarmest);
|
|
166
|
+
assert.equal(pool.acquire(recordB), connectionWarmer);
|
|
167
|
+
assert.equal(pool.acquire(recordC), connectionWarm);
|
|
168
|
+
});
|
|
169
|
+
});
|
|
170
|
+
|
|
171
|
+
describe('.release', () => {
|
|
172
|
+
it('noop for request without connection', () => {
|
|
173
|
+
const requestA = request();
|
|
174
|
+
const pool = new ConnectionPool([requestA], simulationOptions({rtt, throughput}));
|
|
175
|
+
assert.equal(pool.release(requestA), undefined);
|
|
176
|
+
});
|
|
177
|
+
|
|
178
|
+
it('frees the connection for reissue', () => {
|
|
179
|
+
const requests = new Array(6).fill(undefined, 0, 7).map(() => request());
|
|
180
|
+
const pool = new ConnectionPool(requests, simulationOptions({rtt, throughput}));
|
|
181
|
+
requests.push(request());
|
|
182
|
+
|
|
183
|
+
requests.forEach(request => pool.acquire(request));
|
|
184
|
+
|
|
185
|
+
assert.equal(pool.connectionsInUse().length, 6);
|
|
186
|
+
assert.ok(!pool.acquire(requests[6]), 'had connection that is in use');
|
|
187
|
+
|
|
188
|
+
pool.release(requests[0]);
|
|
189
|
+
assert.equal(pool.connectionsInUse().length, 5);
|
|
190
|
+
|
|
191
|
+
assert.ok(pool.acquire(requests[6]), 'could not reissue released connection');
|
|
192
|
+
assert.ok(!pool.acquire(requests[0]), 'had connection that is in use');
|
|
193
|
+
});
|
|
194
|
+
});
|
|
195
|
+
});
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
export namespace Constants {
|
|
2
|
+
export { throttling };
|
|
3
|
+
}
|
|
4
|
+
declare namespace throttling {
|
|
5
|
+
export { DEVTOOLS_RTT_ADJUSTMENT_FACTOR };
|
|
6
|
+
export { DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR };
|
|
7
|
+
export namespace mobileSlow4G {
|
|
8
|
+
const rttMs: number;
|
|
9
|
+
const throughputKbps: number;
|
|
10
|
+
const requestLatencyMs: number;
|
|
11
|
+
const downloadThroughputKbps: number;
|
|
12
|
+
const uploadThroughputKbps: number;
|
|
13
|
+
const cpuSlowdownMultiplier: number;
|
|
14
|
+
}
|
|
15
|
+
export namespace mobileRegular3G {
|
|
16
|
+
const rttMs_1: number;
|
|
17
|
+
export { rttMs_1 as rttMs };
|
|
18
|
+
const throughputKbps_1: number;
|
|
19
|
+
export { throughputKbps_1 as throughputKbps };
|
|
20
|
+
const requestLatencyMs_1: number;
|
|
21
|
+
export { requestLatencyMs_1 as requestLatencyMs };
|
|
22
|
+
const downloadThroughputKbps_1: number;
|
|
23
|
+
export { downloadThroughputKbps_1 as downloadThroughputKbps };
|
|
24
|
+
const uploadThroughputKbps_1: number;
|
|
25
|
+
export { uploadThroughputKbps_1 as uploadThroughputKbps };
|
|
26
|
+
const cpuSlowdownMultiplier_1: number;
|
|
27
|
+
export { cpuSlowdownMultiplier_1 as cpuSlowdownMultiplier };
|
|
28
|
+
}
|
|
29
|
+
export namespace desktopDense4G {
|
|
30
|
+
const rttMs_2: number;
|
|
31
|
+
export { rttMs_2 as rttMs };
|
|
32
|
+
const throughputKbps_2: number;
|
|
33
|
+
export { throughputKbps_2 as throughputKbps };
|
|
34
|
+
const cpuSlowdownMultiplier_2: number;
|
|
35
|
+
export { cpuSlowdownMultiplier_2 as cpuSlowdownMultiplier };
|
|
36
|
+
const requestLatencyMs_2: number;
|
|
37
|
+
export { requestLatencyMs_2 as requestLatencyMs };
|
|
38
|
+
const downloadThroughputKbps_2: number;
|
|
39
|
+
export { downloadThroughputKbps_2 as downloadThroughputKbps };
|
|
40
|
+
const uploadThroughputKbps_2: number;
|
|
41
|
+
export { uploadThroughputKbps_2 as uploadThroughputKbps };
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* @license
|
|
46
|
+
* Copyright 2024 Google LLC
|
|
47
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
48
|
+
*/
|
|
49
|
+
declare const DEVTOOLS_RTT_ADJUSTMENT_FACTOR: 3.75;
|
|
50
|
+
declare const DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR: 0.9;
|
|
51
|
+
export {};
|
|
52
|
+
//# sourceMappingURL=Constants.d.ts.map
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2024 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
|
|
7
|
+
const DEVTOOLS_RTT_ADJUSTMENT_FACTOR = 3.75;
|
|
8
|
+
const DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR = 0.9;
|
|
9
|
+
|
|
10
|
+
const throttling = {
|
|
11
|
+
DEVTOOLS_RTT_ADJUSTMENT_FACTOR,
|
|
12
|
+
DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
|
|
13
|
+
// These values align with WebPageTest's definition of "Fast 3G"
|
|
14
|
+
// But offer similar characteristics to roughly the 75th percentile of 4G connections.
|
|
15
|
+
mobileSlow4G: {
|
|
16
|
+
rttMs: 150,
|
|
17
|
+
throughputKbps: 1.6 * 1024,
|
|
18
|
+
requestLatencyMs: 150 * DEVTOOLS_RTT_ADJUSTMENT_FACTOR,
|
|
19
|
+
downloadThroughputKbps: 1.6 * 1024 * DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
|
|
20
|
+
uploadThroughputKbps: 750 * DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
|
|
21
|
+
cpuSlowdownMultiplier: 4,
|
|
22
|
+
},
|
|
23
|
+
// These values partially align with WebPageTest's definition of "Regular 3G".
|
|
24
|
+
// These values are meant to roughly align with Chrome UX report's 3G definition which are based
|
|
25
|
+
// on HTTP RTT of 300-1400ms and downlink throughput of <700kbps.
|
|
26
|
+
mobileRegular3G: {
|
|
27
|
+
rttMs: 300,
|
|
28
|
+
throughputKbps: 700,
|
|
29
|
+
requestLatencyMs: 300 * DEVTOOLS_RTT_ADJUSTMENT_FACTOR,
|
|
30
|
+
downloadThroughputKbps: 700 * DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
|
|
31
|
+
uploadThroughputKbps: 700 * DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
|
|
32
|
+
cpuSlowdownMultiplier: 4,
|
|
33
|
+
},
|
|
34
|
+
// Using a "broadband" connection type
|
|
35
|
+
// Corresponds to "Dense 4G 25th percentile" in https://docs.google.com/document/d/1Ft1Bnq9-t4jK5egLSOc28IL4TvR-Tt0se_1faTA4KTY/edit#heading=h.bb7nfy2x9e5v
|
|
36
|
+
desktopDense4G: {
|
|
37
|
+
rttMs: 40,
|
|
38
|
+
throughputKbps: 10 * 1024,
|
|
39
|
+
cpuSlowdownMultiplier: 1,
|
|
40
|
+
requestLatencyMs: 0, // 0 means unset
|
|
41
|
+
downloadThroughputKbps: 0,
|
|
42
|
+
uploadThroughputKbps: 0,
|
|
43
|
+
},
|
|
44
|
+
};
|
|
45
|
+
|
|
46
|
+
const Constants = {throttling};
|
|
47
|
+
|
|
48
|
+
export {Constants};
|
|
@@ -25,7 +25,7 @@ export class DNSCache {
|
|
|
25
25
|
*/
|
|
26
26
|
_updateCacheResolvedAtIfNeeded(request: Lantern.NetworkRequest, resolvedAt: number): void;
|
|
27
27
|
/**
|
|
28
|
-
* Forcefully sets the DNS resolution time for a
|
|
28
|
+
* Forcefully sets the DNS resolution time for a request.
|
|
29
29
|
* Useful for testing and alternate execution simulations.
|
|
30
30
|
*
|
|
31
31
|
* @param {string} domain
|
|
@@ -36,7 +36,7 @@ export class DNSCache {
|
|
|
36
36
|
export namespace DNSCache {
|
|
37
37
|
export { DNS_RESOLUTION_RTT_MULTIPLIER as RTT_MULTIPLIER };
|
|
38
38
|
}
|
|
39
|
-
import * as Lantern from '../
|
|
39
|
+
import * as Lantern from '../lantern.js';
|
|
40
40
|
declare const DNS_RESOLUTION_RTT_MULTIPLIER: 2;
|
|
41
41
|
export {};
|
|
42
|
-
//# sourceMappingURL=
|
|
42
|
+
//# sourceMappingURL=DNSCache.d.ts.map
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import * as Lantern from '../
|
|
7
|
+
import * as Lantern from '../lantern.js';
|
|
8
8
|
|
|
9
9
|
// A DNS lookup will usually take ~1-2 roundtrips of connection latency plus the extra DNS routing time.
|
|
10
10
|
// Example: https://www.webpagetest.org/result/180703_3A_e33ec79747c002ed4d7bcbfc81462203/1/details/#waterfall_view_step1
|
|
@@ -58,7 +58,7 @@ class DNSCache {
|
|
|
58
58
|
}
|
|
59
59
|
|
|
60
60
|
/**
|
|
61
|
-
* Forcefully sets the DNS resolution time for a
|
|
61
|
+
* Forcefully sets the DNS resolution time for a request.
|
|
62
62
|
* Useful for testing and alternate execution simulations.
|
|
63
63
|
*
|
|
64
64
|
* @param {string} domain
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2018 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
|
|
7
|
+
import * as Lantern from '../lantern.js';
|
|
8
|
+
|
|
9
|
+
const {DNSCache} = Lantern.Simulation;
|
|
10
|
+
|
|
11
|
+
const MULTIPLIER = DNSCache.RTT_MULTIPLIER;
|
|
12
|
+
|
|
13
|
+
describe('DNSCache', () => {
|
|
14
|
+
let dns;
|
|
15
|
+
let request;
|
|
16
|
+
|
|
17
|
+
beforeEach(() => {
|
|
18
|
+
dns = new DNSCache({rtt: 100});
|
|
19
|
+
request = {parsedURL: {host: 'example.com'}};
|
|
20
|
+
});
|
|
21
|
+
|
|
22
|
+
describe('.getTimeUntilResolution', () => {
|
|
23
|
+
it('should return the RTT multiplied', () => {
|
|
24
|
+
const resolutionTime = dns.getTimeUntilResolution(request);
|
|
25
|
+
expect(resolutionTime).toBe(100 * MULTIPLIER);
|
|
26
|
+
});
|
|
27
|
+
|
|
28
|
+
it('should return time with requestedAt', () => {
|
|
29
|
+
const resolutionTime = dns.getTimeUntilResolution(request, {requestedAt: 1500});
|
|
30
|
+
expect(resolutionTime).toBe(100 * MULTIPLIER);
|
|
31
|
+
});
|
|
32
|
+
|
|
33
|
+
it('should not cache by default', () => {
|
|
34
|
+
dns.getTimeUntilResolution(request, {requestedAt: 0});
|
|
35
|
+
const resolutionTime = dns.getTimeUntilResolution(request, {requestedAt: 1000});
|
|
36
|
+
expect(resolutionTime).toBe(100 * MULTIPLIER);
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
it('should cache when told', () => {
|
|
40
|
+
dns.getTimeUntilResolution(request, {requestedAt: 0, shouldUpdateCache: true});
|
|
41
|
+
const resolutionTime = dns.getTimeUntilResolution(request, {requestedAt: 1000});
|
|
42
|
+
expect(resolutionTime).toBe(0);
|
|
43
|
+
});
|
|
44
|
+
|
|
45
|
+
it('should cache by domain', () => {
|
|
46
|
+
dns.getTimeUntilResolution(request, {requestedAt: 0, shouldUpdateCache: true});
|
|
47
|
+
const otherRequest = {parsedURL: {host: 'other-example.com'}};
|
|
48
|
+
const resolutionTime = dns.getTimeUntilResolution(otherRequest, {requestedAt: 1000});
|
|
49
|
+
expect(resolutionTime).toBe(100 * MULTIPLIER);
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
it('should not update cache with later times', () => {
|
|
53
|
+
dns.getTimeUntilResolution(request, {requestedAt: 1000, shouldUpdateCache: true});
|
|
54
|
+
dns.getTimeUntilResolution(request, {requestedAt: 1500, shouldUpdateCache: true});
|
|
55
|
+
dns.getTimeUntilResolution(request, {requestedAt: 500, shouldUpdateCache: true});
|
|
56
|
+
dns.getTimeUntilResolution(request, {requestedAt: 5000, shouldUpdateCache: true});
|
|
57
|
+
|
|
58
|
+
expect(dns.getTimeUntilResolution(request, {requestedAt: 0})).toBe(100 * MULTIPLIER);
|
|
59
|
+
expect(dns.getTimeUntilResolution(request, {requestedAt: 550})).toBe(100 * MULTIPLIER - 50);
|
|
60
|
+
expect(dns.getTimeUntilResolution(request, {requestedAt: 1000})).toBe(0);
|
|
61
|
+
expect(dns.getTimeUntilResolution(request, {requestedAt: 2000})).toBe(0);
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
describe('.setResolvedAt', () => {
|
|
66
|
+
it('should set the DNS resolution time for a request', () => {
|
|
67
|
+
dns.setResolvedAt(request.parsedURL.host, 123);
|
|
68
|
+
const resolutionTime = dns.getTimeUntilResolution(request);
|
|
69
|
+
expect(resolutionTime).toEqual(123);
|
|
70
|
+
});
|
|
71
|
+
});
|
|
72
|
+
});
|
package/core/lib/lantern/{simulator/network-analyzer.d.ts → simulation/NetworkAnalyzer.d.ts}
RENAMED
|
@@ -46,15 +46,15 @@ export class NetworkAnalyzer {
|
|
|
46
46
|
* @return {Map<string, Summary>}
|
|
47
47
|
*/
|
|
48
48
|
static summarize(values: Map<string, number[]>): Map<string, Summary>;
|
|
49
|
-
/** @typedef {{
|
|
49
|
+
/** @typedef {{request: Lantern.NetworkRequest, timing: Lantern.ResourceTiming, connectionReused?: boolean}} RequestInfo */
|
|
50
50
|
/**
|
|
51
|
-
* @param {Lantern.NetworkRequest[]}
|
|
51
|
+
* @param {Lantern.NetworkRequest[]} requests
|
|
52
52
|
* @param {(e: RequestInfo) => number | number[] | undefined} iteratee
|
|
53
53
|
* @return {Map<string, number[]>}
|
|
54
54
|
*/
|
|
55
|
-
static _estimateValueByOrigin(
|
|
56
|
-
|
|
57
|
-
timing:
|
|
55
|
+
static _estimateValueByOrigin(requests: Lantern.NetworkRequest[], iteratee: (e: {
|
|
56
|
+
request: Lantern.NetworkRequest;
|
|
57
|
+
timing: Lantern.ResourceTiming;
|
|
58
58
|
connectionReused?: boolean | undefined;
|
|
59
59
|
}) => number | number[] | undefined): Map<string, number[]>;
|
|
60
60
|
/**
|
|
@@ -69,8 +69,8 @@ export class NetworkAnalyzer {
|
|
|
69
69
|
* @return {number[]|number|undefined}
|
|
70
70
|
*/
|
|
71
71
|
static _estimateRTTViaConnectionTiming(info: {
|
|
72
|
-
|
|
73
|
-
timing:
|
|
72
|
+
request: Lantern.NetworkRequest;
|
|
73
|
+
timing: Lantern.ResourceTiming;
|
|
74
74
|
connectionReused?: boolean | undefined;
|
|
75
75
|
}): number[] | number | undefined;
|
|
76
76
|
/**
|
|
@@ -82,8 +82,8 @@ export class NetworkAnalyzer {
|
|
|
82
82
|
* @return {number|undefined}
|
|
83
83
|
*/
|
|
84
84
|
static _estimateRTTViaDownloadTiming(info: {
|
|
85
|
-
|
|
86
|
-
timing:
|
|
85
|
+
request: Lantern.NetworkRequest;
|
|
86
|
+
timing: Lantern.ResourceTiming;
|
|
87
87
|
connectionReused?: boolean | undefined;
|
|
88
88
|
}): number | undefined;
|
|
89
89
|
/**
|
|
@@ -96,8 +96,8 @@ export class NetworkAnalyzer {
|
|
|
96
96
|
* @return {number|undefined}
|
|
97
97
|
*/
|
|
98
98
|
static _estimateRTTViaSendStartTiming(info: {
|
|
99
|
-
|
|
100
|
-
timing:
|
|
99
|
+
request: Lantern.NetworkRequest;
|
|
100
|
+
timing: Lantern.ResourceTiming;
|
|
101
101
|
connectionReused?: boolean | undefined;
|
|
102
102
|
}): number | undefined;
|
|
103
103
|
/**
|
|
@@ -110,8 +110,8 @@ export class NetworkAnalyzer {
|
|
|
110
110
|
* @return {number|undefined}
|
|
111
111
|
*/
|
|
112
112
|
static _estimateRTTViaHeadersEndTiming(info: {
|
|
113
|
-
|
|
114
|
-
timing:
|
|
113
|
+
request: Lantern.NetworkRequest;
|
|
114
|
+
timing: Lantern.ResourceTiming;
|
|
115
115
|
connectionReused?: boolean | undefined;
|
|
116
116
|
}): number | undefined;
|
|
117
117
|
/**
|
|
@@ -123,10 +123,10 @@ export class NetworkAnalyzer {
|
|
|
123
123
|
*/
|
|
124
124
|
static _estimateResponseTimeByOrigin(records: Lantern.NetworkRequest[], rttByOrigin: Map<string, number>): Map<string, number[]>;
|
|
125
125
|
/**
|
|
126
|
-
* @param {Lantern.NetworkRequest[]}
|
|
126
|
+
* @param {Lantern.NetworkRequest[]} requests
|
|
127
127
|
* @return {boolean}
|
|
128
128
|
*/
|
|
129
|
-
static canTrustConnectionInformation(
|
|
129
|
+
static canTrustConnectionInformation(requests: Lantern.NetworkRequest[]): boolean;
|
|
130
130
|
/**
|
|
131
131
|
* Returns a map of requestId -> connectionReused, estimating the information if the information
|
|
132
132
|
* available in the records themselves appears untrustworthy.
|
|
@@ -160,14 +160,27 @@ export class NetworkAnalyzer {
|
|
|
160
160
|
rttByOrigin?: Map<string, number> | undefined;
|
|
161
161
|
}) | undefined): Map<string, Summary>;
|
|
162
162
|
/**
|
|
163
|
-
* Computes the average throughput for the given
|
|
163
|
+
* Computes the average throughput for the given requests in bits/second.
|
|
164
164
|
* Excludes data URI, failed or otherwise incomplete, and cached requests.
|
|
165
|
-
* Returns Infinity if there were no analyzable network
|
|
165
|
+
* Returns Infinity if there were no analyzable network requests.
|
|
166
166
|
*
|
|
167
|
-
* @param {
|
|
167
|
+
* @param {Lantern.NetworkRequest[]} records
|
|
168
168
|
* @return {number}
|
|
169
169
|
*/
|
|
170
|
-
static estimateThroughput(
|
|
170
|
+
static estimateThroughput(records: Lantern.NetworkRequest[]): number;
|
|
171
|
+
/**
|
|
172
|
+
* @param {Lantern.NetworkRequest[]} records
|
|
173
|
+
*/
|
|
174
|
+
static computeRTTAndServerResponseTime(records: Lantern.NetworkRequest[]): {
|
|
175
|
+
rtt: number;
|
|
176
|
+
additionalRttByOrigin: Map<string, number>;
|
|
177
|
+
serverResponseTimeByOrigin: Map<string, number>;
|
|
178
|
+
};
|
|
179
|
+
/**
|
|
180
|
+
* @param {Lantern.NetworkRequest[]} records
|
|
181
|
+
* @return {Lantern.Simulation.Settings['networkAnalysis']}
|
|
182
|
+
*/
|
|
183
|
+
static analyze(records: Lantern.NetworkRequest[]): Lantern.Simulation.Settings['networkAnalysis'];
|
|
171
184
|
/**
|
|
172
185
|
* @template {Lantern.NetworkRequest} T
|
|
173
186
|
* @param {Array<T>} records
|
|
@@ -192,5 +205,5 @@ export class NetworkAnalyzer {
|
|
|
192
205
|
*/
|
|
193
206
|
static resolveRedirects<T_2 extends Lantern.NetworkRequest<any>>(request: T_2): T_2;
|
|
194
207
|
}
|
|
195
|
-
import * as Lantern from '../
|
|
196
|
-
//# sourceMappingURL=
|
|
208
|
+
import * as Lantern from '../lantern.js';
|
|
209
|
+
//# sourceMappingURL=NetworkAnalyzer.d.ts.map
|