Add protocols related metrics

core/modules/navigationTiming/scope.js

@@ -1,4 +1,9 @@
 (function (phantomas) {
+  // Prevent events from being sent from an iframe. Only from the main document.
+  if (window.parent !== window || window.location.href === "about:blank") {
+    return;
+  }
+
   function emit(eventName) {
     phantomas.log("Navigation Timing milestone: %s", eventName);
     phantomas.emit("milestone", eventName); // @desc Page loading milestone has been reached: domInteractive, domReady and domComplete

core/modules/requestsMonitor/requestsMonitor.js

@@ -314,6 +314,12 @@ module.exports = function (phantomas) {
           break;
       }
 
+      // HTTP and TLS protocols version
+      entry.httpVersion = resp.protocol;
+      if (resp.securityDetails) {
+        entry.tlsVersion = resp.securityDetails.protocol;
+      }
+
       // requests stats
       if (!entry.isBase64) {
         phantomas.incrMetric("requests");

docs/metrics.md

@@ -1,7 +1,7 @@
 Modules and metrics
 ===================
 
-This file describes all [`phantomas` modules](https://github.com/macbre/phantomas/tree/devel/modules) (34 of them) and 177 metrics that they emit.
+This file describes all [`phantomas` modules](https://github.com/macbre/phantomas/tree/devel/modules) (35 of them) and 181 metrics that they emit.
 
 When applicable, [offender](https://github.com/macbre/phantomas/issues/140) example is provided.
 
@@ -1023,6 +1023,43 @@ comma-separated list of HTTP status codes that main request followed through (co
 Code taken from windowPerformance module
 
 
+## [protocols](https://github.com/macbre/phantomas/tree/devel/modules/protocols/protocols.js)
+
+> Checks versions of HTTP and TLS protocols
+
+##### `mainDomainHttpProtocol`
+
+HTTP protocol used by the main domain (string)
+
+##### `mainDomainTlsProtocol`
+
+TLS protocol used by the main domain (string)
+
+##### `oldHttpProtocol`
+
+number of domains using HTTP/1.0 or 1.1 (number, with offenders)
+
+```json
+{
+  "domain": "https://127.0.0.1:8889",
+  "httpVersion": "http/1.1",
+  "requests": 1
+}
+```
+
+##### `oldTlsProtocol`
+
+number of domains using TLS 1.1 or 1.2 (number, with offenders)
+
+```json
+{
+  "domain": "https://127.0.0.1:8889",
+  "tlsVersion": "TLS 1.1",
+  "beforeDomReady": true
+}
+```
+
+
 ## [redirects](https://github.com/macbre/phantomas/tree/devel/modules/redirects/redirects.js)
 
 > Analyzes HTTP redirects

extensions/viewport/viewport.js

@@ -1,7 +1,7 @@
 /**
  * Provides the --viewport option to set any device resolution and pixel density ratio.
  * If the user sets a viewport size as well as a device option (--phone, --tablet, ...),
- * we assume that he/she wants to overwrite the device values.
+ * we assume that he or she wants to overwrite the device values.
  *
  * Two syntaxes are supported:
  *  - 1200x800 will set a 1x pixel density ratio

lib/metadata/generate.js

@@ -133,7 +133,8 @@ function getModuleMetadata(moduleFile) {
       }
 
       // check if offenders are reported for this metric
-      if (content.indexOf("phantomas.addOffender('" + metricName + "'") > -1) {
+      let offenderRegex = new RegExp("phantomas.addOffender\\([\\n\\r\\s]*[\"']" + metricName + "[\"']");
+      if (content.search(offenderRegex) > -1) {
         entry.offenders = true;
       }