core(preconnect): use lantern for savings

GoogleChrome · Apr 30, 2018 · 41d4fca · 41d4fca
1 parent 192ce70
commit 41d4fca
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 17 deletions.
diff --git a/lighthouse-core/audits/uses-rel-preconnect.js b/lighthouse-core/audits/uses-rel-preconnect.js
@@ -65,18 +65,23 @@ class UsesRelPreconnectAudit extends Audit {
 
   /**
    * @param {LH.Artifacts} artifacts
+   * @param {LH.Audit.Context} context
    * @return {Promise<LH.Audit.Product>}
    */
-  static async audit(artifacts) {
+  static async audit(artifacts, context) {
     const devtoolsLog = artifacts.devtoolsLogs[UsesRelPreconnectAudit.DEFAULT_PASS];
     const URL = artifacts.URL;
+    const settings = context.settings;
     let maxWasted = 0;
 
-    const [networkRecords, mainResource] = await Promise.all([
+    const [networkRecords, mainResource, loadSimulator] = await Promise.all([
       artifacts.requestNetworkRecords(devtoolsLog),
       artifacts.requestMainResource({devtoolsLog, URL}),
+      artifacts.requestLoadSimulator({devtoolsLog, settings}),
     ]);
 
+    const {rtt, additionalRttByOrigin} = loadSimulator.getOptions();
+
     /** @type {Map<string, LH.WebInspector.NetworkRequest[]>}  */
     const origins = new Map();
     networkRecords
@@ -113,17 +118,24 @@ class UsesRelPreconnectAudit extends Audit {
         return (record.startTime < firstRecord.startTime) ? record: firstRecord;
       });
 
-      const connectionTime =
-        firstRecordOfOrigin._timing.connectEnd - firstRecordOfOrigin._timing.dnsStart;
+      const securityOrigin = firstRecordOfOrigin.parsedURL.securityOrigin();
+
+      // Approximate the connection time with the duration of TCP (+potentially SSL) handshake
+      // DNS time can be large but can also be 0 if a commonly used origin that's cached, so make
+      // no assumption about DNS.
+      const additionalRtt = additionalRttByOrigin.get(securityOrigin) || 0;
+      let connectionTime = rtt + additionalRtt;
+      if (firstRecordOfOrigin.parsedURL.scheme === 'https') connectionTime = connectionTime * 2;
+
       const timeBetweenMainResourceAndDnsStart =
         firstRecordOfOrigin.startTime * 1000 -
         mainResource.endTime * 1000 +
         firstRecordOfOrigin._timing.dnsStart;
+
       const wastedMs = Math.min(connectionTime, timeBetweenMainResourceAndDnsStart);
       maxWasted = Math.max(wastedMs, maxWasted);
       results.push({
-        url: firstRecordOfOrigin.parsedURL.securityOrigin(),
-        type: 'ms',
+        url: securityOrigin,
         wastedMs: wastedMs,
       });
     });

diff --git a/lighthouse-core/lib/dependency-graph/simulator/simulator.js b/lighthouse-core/lib/dependency-graph/simulator/simulator.js
@@ -278,6 +278,13 @@ class Simulator {
     }
   }
 
+  /**
+   * @return {LH.Gatherer.Simulation.Options}
+   */
+  getOptions() {
+    return this._options;
+  }
+
   /**
    * Estimates the time taken to process all of the graph's nodes.
    * @param {Node} graph

diff --git a/lighthouse-core/test/audits/uses-rel-preconnect-test.js b/lighthouse-core/test/audits/uses-rel-preconnect-test.js
@@ -20,6 +20,17 @@ const mainResource = {
 };
 
 describe('Performance: uses-rel-preconnect audit', () => {
+  let simulator;
+  let simulatorOptions;
+
+  beforeEach(() => {
+    simulator = {getOptions: () => simulatorOptions};
+    simulatorOptions = {
+      rtt: 100,
+      additionalRttByOrigin: new Map(),
+    };
+  });
+
   it(`shouldn't suggest preconnect for same origin`, async () => {
     const networkRecords = [
       mainResource,
@@ -34,9 +45,10 @@ describe('Performance: uses-rel-preconnect audit', () => {
       devtoolsLogs: {[UsesRelPreconnect.DEFAULT_PASS]: []},
       requestNetworkRecords: () => Promise.resolve(networkRecords),
       requestMainResource: () => Promise.resolve(mainResource),
+      requestLoadSimulator: () => Promise.resolve(simulator),
     };
 
-    const {score, rawValue, details} = await UsesRelPreconnect.audit(artifacts);
+    const {score, rawValue, details} = await UsesRelPreconnect.audit(artifacts, {});
     assert.equal(score, 1);
     assert.equal(rawValue, 0);
     assert.equal(details.items.length, 0);
@@ -54,9 +66,10 @@ describe('Performance: uses-rel-preconnect audit', () => {
       devtoolsLogs: {[UsesRelPreconnect.DEFAULT_PASS]: []},
       requestNetworkRecords: () => Promise.resolve(networkRecords),
       requestMainResource: () => Promise.resolve(mainResource),
+      requestLoadSimulator: () => Promise.resolve(simulator),
     };
 
-    const {score, rawValue, details} = await UsesRelPreconnect.audit(artifacts);
+    const {score, rawValue, details} = await UsesRelPreconnect.audit(artifacts, {});
     assert.equal(score, 1);
     assert.equal(rawValue, 0);
     assert.equal(details.items.length, 0);
@@ -74,9 +87,10 @@ describe('Performance: uses-rel-preconnect audit', () => {
       devtoolsLogs: {[UsesRelPreconnect.DEFAULT_PASS]: []},
       requestNetworkRecords: () => Promise.resolve(networkRecords),
       requestMainResource: () => Promise.resolve(mainResource),
+      requestLoadSimulator: () => Promise.resolve(simulator),
     };
 
-    const {score, rawValue, details} = await UsesRelPreconnect.audit(artifacts);
+    const {score, rawValue, details} = await UsesRelPreconnect.audit(artifacts, {});
     assert.equal(score, 1);
     assert.equal(rawValue, 0);
     assert.equal(details.items.length, 0);
@@ -100,9 +114,10 @@ describe('Performance: uses-rel-preconnect audit', () => {
       devtoolsLogs: {[UsesRelPreconnect.DEFAULT_PASS]: []},
       requestNetworkRecords: () => Promise.resolve(networkRecords),
       requestMainResource: () => Promise.resolve(mainResource),
+      requestLoadSimulator: () => Promise.resolve(simulator),
     };
 
-    const {score, rawValue, details} = await UsesRelPreconnect.audit(artifacts);
+    const {score, rawValue, details} = await UsesRelPreconnect.audit(artifacts, {});
     assert.equal(score, 1);
     assert.equal(rawValue, 0);
     assert.equal(details.items.length, 0);
@@ -121,9 +136,10 @@ describe('Performance: uses-rel-preconnect audit', () => {
       devtoolsLogs: {[UsesRelPreconnect.DEFAULT_PASS]: []},
       requestNetworkRecords: () => Promise.resolve(networkRecords),
       requestMainResource: () => Promise.resolve(mainResource),
+      requestLoadSimulator: () => Promise.resolve(simulator),
     };
 
-    const {score, rawValue, details} = await UsesRelPreconnect.audit(artifacts);
+    const {score, rawValue, details} = await UsesRelPreconnect.audit(artifacts, {});
     assert.equal(score, 1);
     assert.equal(rawValue, 0);
     assert.equal(details.items.length, 0);
@@ -136,6 +152,7 @@ describe('Performance: uses-rel-preconnect audit', () => {
         url: 'https://cdn.example.com/first',
         initiatorRequest: () => null,
         parsedURL: {
+          scheme: 'https',
           securityOrigin: () => 'https://cdn.example.com',
         },
         startTime: 2,
@@ -149,6 +166,7 @@ describe('Performance: uses-rel-preconnect audit', () => {
         url: 'https://cdn.example.com/second',
         initiatorRequest: () => null,
         parsedURL: {
+          scheme: 'https',
           securityOrigin: () => 'https://cdn.example.com',
         },
         startTime: 3,
@@ -163,13 +181,14 @@ describe('Performance: uses-rel-preconnect audit', () => {
       devtoolsLogs: {[UsesRelPreconnect.DEFAULT_PASS]: []},
       requestNetworkRecords: () => Promise.resolve(networkRecords),
       requestMainResource: () => Promise.resolve(mainResource),
+      requestLoadSimulator: () => Promise.resolve(simulator),
     };
 
-    const {rawValue, extendedInfo} = await UsesRelPreconnect.audit(artifacts);
+    const {rawValue, extendedInfo} = await UsesRelPreconnect.audit(artifacts, {});
     assert.equal(rawValue, 200);
     assert.equal(extendedInfo.value.length, 1);
     assert.deepStrictEqual(extendedInfo.value, [
-      {url: 'https://cdn.example.com', wastedMs: 200, type: 'ms'},
+      {url: 'https://cdn.example.com', wastedMs: 200},
     ]);
   });
 
@@ -180,7 +199,8 @@ describe('Performance: uses-rel-preconnect audit', () => {
         url: 'https://cdn.example.com/first',
         initiatorRequest: () => null,
         parsedURL: {
-          securityOrigin: () => 'https://cdn.example.com',
+          scheme: 'http',
+          securityOrigin: () => 'http://cdn.example.com',
         },
         startTime: 2,
         _timing: {
@@ -193,6 +213,7 @@ describe('Performance: uses-rel-preconnect audit', () => {
         url: 'https://othercdn.example.com/second',
         initiatorRequest: () => null,
         parsedURL: {
+          scheme: 'https',
           securityOrigin: () => 'https://othercdn.example.com',
         },
         startTime: 1.2,
@@ -207,14 +228,20 @@ describe('Performance: uses-rel-preconnect audit', () => {
       devtoolsLogs: {[UsesRelPreconnect.DEFAULT_PASS]: []},
       requestNetworkRecords: () => Promise.resolve(networkRecords),
       requestMainResource: () => Promise.resolve(mainResource),
+      requestLoadSimulator: () => Promise.resolve(simulator),
+    };
+
+    simulatorOptions = {
+      rtt: 100,
+      additionalRttByOrigin: new Map([['https://othercdn.example.com', 50]]),
     };
 
-    const {rawValue, extendedInfo} = await UsesRelPreconnect.audit(artifacts);
+    const {rawValue, extendedInfo} = await UsesRelPreconnect.audit(artifacts, {});
     assert.equal(rawValue, 300);
     assert.equal(extendedInfo.value.length, 2);
     assert.deepStrictEqual(extendedInfo.value, [
-      {url: 'https://othercdn.example.com', wastedMs: 300, type: 'ms'},
-      {url: 'https://cdn.example.com', wastedMs: 200, type: 'ms'},
+      {url: 'https://othercdn.example.com', wastedMs: 300},
+      {url: 'http://cdn.example.com', wastedMs: 100},
     ]);
   });
 });