refactor(scan): move field stat types from hardcode in viewer to fiel…

…ds list
viasite · Mar 13, 2021 · ff59c99 · ff59c99
1 parent 0d5fd47
commit ff59c99
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 1 deletion.
diff --git a/src/presets/fields.js b/src/presets/fields.js
@@ -28,6 +28,9 @@ const fields = [
     validate: {
       error: '== 0',
     },
+    stat: {
+      type: 'enum',
+    },
     groups: ['canonical'],
     type: 'boolean',
   },
@@ -43,6 +46,9 @@ const fields = [
     comment_en: 'Scan depth',
     groups: ['info'],
     type: 'integer',
+    stat: {
+      type: 'enum',
+    },
   },
   {
     name: 'status',
@@ -51,6 +57,9 @@ const fields = [
     validate: {
       error: '!= 200',
     },
+    stat: {
+      type: 'enum',
+    },
     groups: ['info'],
     type: 'integer',
   },
@@ -62,6 +71,10 @@ const fields = [
       warning: '> 500',
       error: '> 1000',
     },
+    stat: {
+      type: 'ranges',
+      ranges: ['< 100', '100-499', '500-999', '1000-2000', '> 2000']
+    },
     groups: ['perf'],
     type: 'integer',
   },
@@ -71,13 +84,19 @@ const fields = [
     /*validate: {
         error: 'len() == 0' // TODO:
     },*/
+    stat: {
+      type: 'unique',
+    },
     groups: ['metatags'],
     align: 'right',
   },
   {
     name: 'h1',
     comment: 'h1',
     comment_en: 'h1',
+    stat: {
+      type: 'unique',
+    },
     groups: ['seo', 'metatags'],
   },
   {
@@ -92,11 +111,17 @@ const fields = [
     /*validate: {
         warning: 'len() > 256',
     },*/
+    stat: {
+      type: 'unique',
+    },
     groups: ['metatags'],
   },
   {
     name: 'keywords',
     comment: 'Keywords',
+    stat: {
+      type: 'unique',
+    },
     groups: ['metatags'],
   },
   {
@@ -124,6 +149,9 @@ const fields = [
       warning: '== 0',
       error: '> 1',
     },
+    stat: {
+      type: 'enum',
+    },
     groups: ['seo'],
     type: 'integer',
   },
@@ -155,6 +183,9 @@ const fields = [
     validate: {
       warning: '> 1',
     },
+    stat: {
+      type: 'enum',
+    },
     groups: ['canonical'],
     type: 'integer',
   },
@@ -164,6 +195,9 @@ const fields = [
     validate: {
       warning: '< 1',
     },
+    stat: {
+      type: 'enum',
+    },
     groups: ['metatags'],
     type: 'integer',
   },
@@ -233,6 +267,9 @@ const fields = [
     validate: {
       warning: '< 5'
     },
+    stat: {
+      type: 'average',
+    },
     type: 'integer',
   },
   {
@@ -243,6 +280,10 @@ const fields = [
       warning: '> 1500',
       error: '> 3000',
     },
+    stat: {
+      type: 'ranges',
+      ranges: ['< 500', '500-1499', '1500-3000', '> 3000']
+    },
     groups: ['perf'],
     type: 'integer',
   },
@@ -254,6 +295,10 @@ const fields = [
       warning: '> 500000',
       error: '> 1000000',
     },
+    stat: {
+      type: 'ranges',
+      ranges: ['< 100000', '100000-500000', '> 500000']
+    },
     groups: ['perf'],
     type: 'integer',
   },
@@ -264,6 +309,10 @@ const fields = [
     comment_en: 'Lighthouse: Performance',
     groups: ['Lighthouse: Main'],
     type: 'integer',
+    stat: {
+      type: 'ranges',
+      ranges: ['< 50', '50-89', '90-100']
+    },
   },
   {
     name: 'lighthouse_scores_pwa',

diff --git a/src/scrap-site.js b/src/scrap-site.js
@@ -40,7 +40,7 @@ module.exports = async (baseUrl, options = {}) => {
   const protocol = url.parse(baseUrl).protocol;
 
   const log = (msg) => {
-    const socketId = options.socket ? `options.socket.id ` : '';
+    const socketId = options.socket ? `${options.socket.id} ` : '';
     if (DEBUG) console.log(`${socketId}${msg}`);
     socketSend(options.socket, 'status', msg);
   };