Replace TotalRequests and SmallRequests rules

2015-06-19 23:46:39 +02:00
parent 8d4a0c34e7
commit ccbb324270
7 changed files with 143 additions and 155 deletions
@@ -67,13 +67,17 @@ var WeightChecker = function() {
                endTime = Date.now();
                debug('Redownload took %d ms', endTime - startTime);
                
+                var metrics = {};
+                var offenders = {};
+
+                // Count requests
+                offenders.totalRequests = listRequestsByType(results);
+                metrics.totalRequests = offenders.totalRequests.total;
+
                // Remove unwanted requests (redirections, about:blank)
                results = results.filter(function(result) {
                    return (result !== null && result.weightCheck && result.weightCheck.bodySize > 0);
                });
-                
-                var metrics = {};
-                var offenders = {};


                // Total weight
@@ -92,6 +96,10 @@ var WeightChecker = function() {
                offenders.gzipCompression = listFilesNotGzipped(results);
                metrics.gzipCompression = offenders.gzipCompression.totalGain;

+                // Small requests
+                offenders.smallRequests = listSmallRequests(results);
+                metrics.smallRequests = offenders.smallRequests.total;
+
                data.toolsResults.weightChecker = {
                    metrics: metrics,
                    offenders: offenders
@@ -249,6 +257,57 @@ var WeightChecker = function() {
        return results;
    }

+    function listRequestsByType(requests) {
+        var results = {
+            total: 0,
+            byType: {
+                html: [],
+                css: [],
+                js: [],
+                json: [],
+                image: [],
+                video: [],
+                webfont: [],
+                other: []
+            }
+        };
+
+        requests.forEach(function(req) {
+            if (req.url !== 'about:blank') {
+                var type = req.type || 'other';
+                results.byType[type].push(req.url);
+                results.total ++;
+            }
+        });
+
+        return results;
+    }
+
+    function listSmallRequests(requests) {
+        var results = {
+            total: 0,
+            byType: {
+                css: [],
+                js: [],
+                image: []
+            }
+        };
+
+        requests.forEach(function(req) {
+            if (req.weightCheck.bodySize > 0 && req.weightCheck.bodySize < 2048) {
+                if (req.isCSS || req.isJS || req.isImage) {
+                    results.byType[req.type].push({
+                        url: req.url,
+                        size: req.weightCheck.bodySize
+                    });
+                    results.total ++;
+                }
+            }
+        });
+
+        return results;
+    }
+

    function redownloadEntry(entry) {
        var deferred = Q.defer();