Upgraded to Lighthouse v6 and added new metrics

Author: captainsham

.gitignore

@@ -1,3 +1,4 @@
 node_modules
 .env
 .DS_Store
+input

database.js

@@ -1,99 +1,23 @@
 // dependencies
-const pg = require('pg');
+const { Client } = require('pg');
 
-function connect (callback) {
-  client = new pg.Client({
+let client;
+
+async function connect (callback) {
+  client = new Client({
     user: process.env.DB_USER,
     host: process.env.DB_HOST,
     database: process.env.DB_NAME,
     password: process.env.DB_PASS
   });
 
   // Connect to the database and handle errors
-  client.connect((err) => {
-    if (err) {
-      console.error(err);
-    }else{
-      console.log('Connected to the database!');
-
-      // Make sure the database tables exist
-      client.query(`CREATE TABLE IF NOT EXISTS
-                      raw_reports(
-                        id SERIAL PRIMARY KEY,
-                        url VARCHAR (2048) NOT NULL,
-                        template VARCHAR (255),
-                        fetch_time timestamp,
-                        report JSON NOT NULL
-                      )
-      `);
-
-      client.query(`CREATE TABLE IF NOT EXISTS
-                      urls(
-                        id SERIAL PRIMARY KEY,
-                        url VARCHAR (2048) NOT NULL,
-                        template VARCHAR (255),
-                        start_date timestamp DEFAULT CURRENT_DATE,
-                        latest_date timestamp DEFAULT CURRENT_DATE,
-                        interval DECIMAL,
-                        lifetime DECIMAL
-                      )
-      `);
-
-      client.query(`CREATE TABLE IF NOT EXISTS
-                      gds_audits(
-                        id SERIAL PRIMARY KEY,
-                        url VARCHAR (2048) NOT NULL,
-                        template VARCHAR(2048),
-                        fetch_time timestamp,
-                        page_size decimal,
-                        first_contentful_paint decimal,
-                        max_potential_fid decimal,
-                        time_to_interactive decimal,
-                        first_meaningful_paint decimal,
-                        first_cpu_idle decimal
-                      )
-      `);
-
-      client.query(`CREATE TABLE IF NOT EXISTS
-                      resource_chart(
-                        id SERIAL PRIMARY KEY,
-                        audit_url VARCHAR(2048),
-                        template VARCHAR(2048),
-                        fetch_time TIMESTAMP,
-                        resource_url VARCHAR(2048),
-                        resource_type VARCHAR(2048),
-                        start_time decimal,
-                        end_time decimal
-                      )
-      `);
-
-      client.query(`CREATE TABLE IF NOT EXISTS
-                      savings_opportunities(
-                        id SERIAL PRIMARY KEY,
-                        audit_url VARCHAR(2048),
-                        template VARCHAR(2048),
-                        fetch_time TIMESTAMP,
-                        audit_text VARCHAR(2048),
-                        estimated_savings decimal
-                      )
-      `);
-
-      client.query(`CREATE TABLE IF NOT EXISTS
-                      diagnostics(
-                        id SERIAL PRIMARY KEY,
-                        audit_url VARCHAR(2048),
-                        template VARCHAR(2048),
-                        fetch_time TIMESTAMP,
-                        diagnostic_id VARCHAR(2048),
-                        item_label VARCHAR(2048),
-                        item_value DECIMAL
-                      )
-      `);
-
-      // Call the callback
-      callback();
-    }
-  });
+  try {
+    await client.connect();
+    callback();
+  } catch (error) {
+    console.error(error);
+  }
 }
 
 // Disconnect from the database

index.js

@@ -1,14 +1,14 @@
+// Load environment variables
+const dotenv = require('dotenv');
+dotenv.config();
+
 // dependencies
 const lighthouse = require('lighthouse');
 const chrome_launcher = require('chrome-launcher');
 const db = require('./database');
 const fs = require('fs');
 const path = require('path');
 const neat_csv = require('neat-csv');
-const dotenv = require('dotenv');
-
-// Load environment variables
-dotenv.config();
 
 // Is this a recurring report or no?
 let should_repeat = false;
@@ -41,7 +41,7 @@ if (should_repeat) {
 if (isNaN(auto_report_interval) || isNaN(auto_report_lifetime) ||
                 auto_report_interval < 1 || auto_report_lifetime < 1) {
   console.log('$$$Sorry, please check your input.');
-  return;
+  process.exit(1);
 }
 
 if (should_repeat) {
@@ -116,6 +116,10 @@ async function parseReportAndStore (url, template, report) {
   const time_to_interactive = report['audits']['interactive']['numericValue'];
   const first_meaningful_paint = report['audits']['first-meaningful-paint']['numericValue'];
   const first_cpu_idle = report['audits']['first-cpu-idle']['numericValue'];
+  const largest_contentful_paint = report['audits']['largest-contentful-paint']['numericValue'];
+  const cumulative_layout_shift = report['audits']['cumulative-layout-shift']['numericValue'];
+  const total_blocking_time = report['audits']['total-blocking-time']['numericValue'];
+  const speed_index = report['audits']['speed-index']['numericValue'];
 
   // These are lists and will have to be iterated
   const network_resources = report['audits']['network-requests']['details']['items'];
@@ -252,10 +256,14 @@ async function parseReportAndStore (url, template, report) {
                                               max_potential_fid,
                                               time_to_interactive,
                                               first_meaningful_paint,
-                                              first_cpu_idle
+                                              first_cpu_idle,
+                                              largest_contentful_paint,
+                                              cumulative_layout_shift,
+                                              total_blocking_time,
+                                              speed_index
                                             )
                                             VALUES (
-                                              $1, $2, $3, $4, $5, $6, $7, $8, $9
+                                              $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13
                                             )`;
 
   const resource_chart_query_text = `INSERT INTO resource_chart (
@@ -311,7 +319,11 @@ async function parseReportAndStore (url, template, report) {
     max_potential_fid,
     time_to_interactive,
     first_meaningful_paint,
-    first_cpu_idle
+    first_cpu_idle,
+    largest_contentful_paint,
+    cumulative_layout_shift,
+    total_blocking_time,
+    speed_index
   ];
 
   // Execute the queries
@@ -444,7 +456,6 @@ async function doAutomaticReporting () {
   console.log('Done automatically reporting!');
 
   db.disconnect();
-  return;
 }
 
 // Let's get started