also check new mask icon location and add build system

.eslintrc.js

@@ -0,0 +1,278 @@
+module.exports = {
+  "env": {
+    "browser": true
+  },
+  "extends": "eslint:recommended",
+  "rules": {
+    "accessor-pairs": "error",
+    "array-bracket-newline": "error",
+    "array-bracket-spacing": [
+      "error",
+      "never"
+    ],
+    "array-callback-return": "error",
+    "array-element-newline": "off",
+    "arrow-body-style": "error",
+    "arrow-parens": "error",
+    "arrow-spacing": "error",
+    "block-scoped-var": "error",
+    "block-spacing": "error",
+    "brace-style": "off",
+    "callback-return": "error",
+    "camelcase": "error",
+    "capitalized-comments": "off",
+    "class-methods-use-this": "error",
+    "comma-dangle": "error",
+    "comma-spacing": [
+      "error",
+      {
+        "after": true,
+        "before": false
+      }
+    ],
+    "comma-style": [
+      "error",
+      "last"
+    ],
+    "complexity": "error",
+    "computed-property-spacing": [
+      "error",
+      "never"
+    ],
+    "consistent-return": "off",
+    "consistent-this": "error",
+    "curly": "error",
+    "default-case": "error",
+    "dot-location": "error",
+    "dot-notation": "error",
+    "eol-last": "error",
+    "eqeqeq": "error",
+    "for-direction": "error",
+    "func-call-spacing": "error",
+    "func-name-matching": "error",
+    "func-names": [
+      "error",
+      "never"
+    ],
+    "func-style": "off",
+    "function-paren-newline": "off",
+    "generator-star-spacing": "error",
+    "getter-return": "error",
+    "global-require": "error",
+    "guard-for-in": "error",
+    "handle-callback-err": "error",
+    "id-blacklist": "error",
+    "id-length": "off",
+    "id-match": "error",
+    "implicit-arrow-linebreak": "error",
+    "indent": "off",
+    "indent-legacy": "off",
+    "init-declarations": "off",
+    "jsx-quotes": "error",
+    "key-spacing": "error",
+    "keyword-spacing": [
+      "error",
+      {
+        "after": true,
+        "before": true
+      }
+    ],
+    "line-comment-position": "off",
+    "linebreak-style": [
+      "error",
+      "unix"
+    ],
+    "lines-around-comment": "off",
+    "lines-around-directive": "error",
+    "lines-between-class-members": "error",
+    "max-depth": "error",
+    "max-len": "off",
+    "max-lines": "off",
+    "max-nested-callbacks": "error",
+    "max-params": "error",
+    "max-statements": "off",
+    "max-statements-per-line": "error",
+    "multiline-comment-style": [
+      "error",
+      "separate-lines"
+    ],
+    "new-cap": "error",
+    "new-parens": "error",
+    "newline-after-var": "off",
+    "newline-before-return": "off",
+    "newline-per-chained-call": "error",
+    "no-alert": "error",
+    "no-array-constructor": "error",
+    "no-await-in-loop": "error",
+    "no-bitwise": "error",
+    "no-buffer-constructor": "error",
+    "no-caller": "error",
+    "no-catch-shadow": "error",
+    "no-confusing-arrow": "error",
+    "no-continue": "error",
+    "no-div-regex": "error",
+    "no-duplicate-imports": "error",
+    "no-else-return": "error",
+    "no-empty-function": "error",
+    "no-eq-null": "error",
+    "no-eval": "error",
+    "no-extend-native": "error",
+    "no-extra-bind": "error",
+    "no-extra-label": "error",
+    "no-extra-parens": "off",
+    "no-floating-decimal": "error",
+    "no-implicit-coercion": "error",
+    "no-implicit-globals": "off",
+    "no-implied-eval": "error",
+    "no-inline-comments": "off",
+    "no-inner-declarations": [
+      "error",
+      "functions"
+    ],
+    "no-invalid-this": "error",
+    "no-iterator": "error",
+    "no-label-var": "error",
+    "no-labels": "error",
+    "no-lone-blocks": "error",
+    "no-lonely-if": "error",
+    "no-loop-func": "error",
+    "no-magic-numbers": "off",
+    "no-mixed-operators": "error",
+    "no-mixed-requires": "error",
+    "no-multi-assign": "off",
+    "no-multi-spaces": "error",
+    "no-multi-str": "error",
+    "no-multiple-empty-lines": "error",
+    "no-native-reassign": "error",
+    "no-negated-condition": "off",
+    "no-negated-in-lhs": "error",
+    "no-nested-ternary": "error",
+    "no-new": "error",
+    "no-new-func": "error",
+    "no-new-object": "error",
+    "no-new-require": "error",
+    "no-new-wrappers": "error",
+    "no-octal-escape": "error",
+    "no-param-reassign": "off",
+    "no-path-concat": "error",
+    "no-plusplus": "error",
+    "no-process-env": "error",
+    "no-process-exit": "error",
+    "no-proto": "error",
+    "no-prototype-builtins": "error",
+    "no-restricted-globals": "error",
+    "no-restricted-imports": "error",
+    "no-restricted-modules": "error",
+    "no-restricted-properties": "error",
+    "no-restricted-syntax": "error",
+    "no-return-assign": "error",
+    "no-return-await": "error",
+    "no-script-url": "error",
+    "no-self-compare": "error",
+    "no-sequences": "error",
+    "no-shadow": "off",
+    "no-shadow-restricted-names": "error",
+    "no-spaced-func": "error",
+    "no-sync": "error",
+    "no-tabs": "error",
+    "no-template-curly-in-string": "error",
+    "no-ternary": "off",
+    "no-throw-literal": "error",
+    "no-trailing-spaces": "error",
+    "no-undef-init": "error",
+    "no-undefined": "off",
+    "no-underscore-dangle": "error",
+    "no-unmodified-loop-condition": "error",
+    "no-unneeded-ternary": "error",
+    "no-unused-expressions": "error",
+    "no-use-before-define": "error",
+    "no-useless-call": "error",
+    "no-useless-computed-key": "error",
+    "no-useless-concat": "error",
+    "no-useless-constructor": "error",
+    "no-useless-rename": "error",
+    "no-useless-return": "error",
+    "no-var": "off",
+    "no-void": "error",
+    "no-warning-comments": "error",
+    "no-whitespace-before-property": "error",
+    "no-with": "error",
+    "nonblock-statement-body-position": "error",
+    "object-curly-newline": "off",
+    "object-curly-spacing": [
+      "error",
+      "never"
+    ],
+    "object-shorthand": "off",
+    "one-var": "off",
+    "one-var-declaration-per-line": "error",
+    "operator-assignment": [
+      "error",
+      "always"
+    ],
+    "operator-linebreak": "error",
+    "padded-blocks": "off",
+    "padding-line-between-statements": "error",
+    "prefer-arrow-callback": "off",
+    "prefer-const": "error",
+    "prefer-destructuring": "off",
+    "prefer-numeric-literals": "error",
+    "prefer-promise-reject-errors": "error",
+    "prefer-reflect": "off",
+    "prefer-rest-params": "error",
+    "prefer-spread": "error",
+    "prefer-template": "off",
+    "quote-props": "off",
+    "quotes": "off",
+    "radix": [
+      "error",
+      "always"
+    ],
+    "require-await": "error",
+    "require-jsdoc": "off",
+    "rest-spread-spacing": "error",
+    "semi": "error",
+    "semi-spacing": "error",
+    "semi-style": [
+      "error",
+      "last"
+    ],
+    "sort-imports": "error",
+    "sort-keys": "off",
+    "sort-vars": "error",
+    "space-before-blocks": "error",
+    "space-before-function-paren": "off",
+    "space-in-parens": [
+      "error",
+      "never"
+    ],
+    "space-infix-ops": "error",
+    "space-unary-ops": "error",
+    "spaced-comment": [
+      "error",
+      "always"
+    ],
+    "strict": [
+      "error",
+      "never"
+    ],
+    "switch-colon-spacing": "error",
+    "symbol-description": "error",
+    "template-curly-spacing": "error",
+    "template-tag-spacing": "error",
+    "unicode-bom": [
+      "error",
+      "never"
+    ],
+    "valid-jsdoc": "error",
+    "vars-on-top": "off",
+    "wrap-regex": "error",
+    "yield-star-spacing": "error",
+    "no-console": "off",
+    "yoda": [
+      "error",
+      "never"
+    ]
+  },
+  "globals": {"chrome": true}
+};

.gitignore

@@ -1,2 +1,4 @@
 .idea/
 .directory
+node_modules/
+web-ext-artifacts/

background.js

@@ -1,4 +1,5 @@
 function displayData(data, tabId, typo3) {
+    console.table(data);
     var icon;
     if (typo3) {
         chrome.pageAction.show(tabId);
@@ -31,53 +32,65 @@ function handleMessage(request, sender) {
             var data = result[request.url];
             if (!data || Date.now() - data.updated > 1000 * 60 * 60 * 24) {
                 data = {};
-
                 var xmlHttp = new XMLHttpRequest();
                 data.mask = {};
                 xmlHttp.onreadystatechange = function () {
                     if (xmlHttp.readyState === 4) {
                         data.mask.found = xmlHttp.status === 200;
+                        data.mask.type = "new";
                         data.mask.modified = xmlHttp.getResponseHeader('Last-Modified');
-                        var tvHttp = new XMLHttpRequest();
+                        var xml2Http = new XMLHttpRequest();
-                        data.tv = {};
+                        xml2Http.onreadystatechange = function () {
-                        tvHttp.onreadystatechange = function () {
+                            if (xml2Http.readyState === 4) {
-                            if (tvHttp.readyState === 4) {
+                                if (xml2Http.status === 200) {
-                                data.tv.found = tvHttp.status === 200;
+                                    data.mask.found = true;
-                                data.tv.modified = tvHttp.getResponseHeader('Last-Modified');
+                                    data.mask.type = "old";
+                                    data.mask.modified = xml2Http.getResponseHeader('Last-Modified');
+                                }
+                                var tvHttp = new XMLHttpRequest();
+                                data.tv = {};
+                                tvHttp.onreadystatechange = function () {
+                                    if (tvHttp.readyState === 4) {
+                                        data.tv.found = tvHttp.status === 200;
+                                        data.tv.modified = tvHttp.getResponseHeader('Last-Modified');
 
-                                var cl = new XMLHttpRequest();
+                                        var cl = new XMLHttpRequest();
-                                cl.onreadystatechange = function () {
+                                        cl.onreadystatechange = function () {
-                                    if (cl.readyState === 4) {
+                                            if (cl.readyState === 4) {
-                                        if (cl.status === 200) {
+                                                if (cl.status === 200) {
-                                            var changelog = cl.responseText.split('\n', 1)[0];
+                                                    var changelog = cl.responseText.split('\n', 1)[0];
-                                            var regex = /(\d\.)+(\d+)/;
+                                                    var regex = /(\d\.)+(\d+)/;
-                                            var match = regex.exec(changelog);
+                                                    var match = regex.exec(changelog);
-                                            data.t3version = match[0];
+                                                    data.t3version = match[0];
-                                        }
+                                                }
-                                        console.log("saving data");
+                                                console.log("saving data");
-                                        data.updated = Date.now();
+                                                data.updated = Date.now();
 
-                                        displayData(data, tabId, true);
+                                                displayData(data, tabId, true);
 
-                                        var storage = {};
+                                                var storage = {};
-                                        storage[request.url] = data;
+                                                storage[request.url] = data;
-                                        chrome.storage.local.set(storage);
+                                                chrome.storage.local.set(storage);
+                                            }
+                                        };
+
+                                        cl.open("GET", request.url + "/typo3_src/ChangeLog", true);
+                                        console.info("request changelog");
+                                        cl.send();
                                     }
                                 };
-
+                                tvHttp.open("GET", request.url + "/typo3conf/ext/templavoila/ext_icon.gif", true);
-                                cl.open("GET", request.url + "/typo3_src/ChangeLog", true);
+                                console.info("request tv icon");
-                                console.log("request changelog");
+                                tvHttp.send();
-                                cl.send();
                             }
                         };
-                        tvHttp.open("GET", request.url + "/typo3conf/ext/templavoila/ext_icon.gif", true);
+                        xml2Http.open("GET", request.url + "/typo3conf/ext/mask/ext_icon.gif", true);
-                        console.log("request tv icon");
+                        console.info("request old mask icon");
-                        tvHttp.send();
+                        xml2Http.send();
                     }
-                }
+                };
-                ;
+                xmlHttp.open("GET", request.url + "/typo3conf/ext/mask/Resources/Public/Icons/Extension.svg", true);
-                xmlHttp.open("GET", request.url + "/typo3conf/ext/mask/ext_icon.gif", true);
+                console.info("request new mask icon");
-                console.log("request mask icon");
                 xmlHttp.send();
             }
             else {

manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Mask Detector",
   "short_name": "mask-detector",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "author": "Lukas Winkler",
   "description": "find websites using the mask Typo3 extension",
   "icons": {
@@ -32,6 +32,12 @@
       "background.js"
     ]
   },
+  "applications": {
+    "gecko": {
+      "id": "{2b6c2a2b-8cdf-4847-b184-b25d58656722}",
+      "strict_min_version": "42.0"
+    }
+  },
   "options_ui": {
     "page": "options.html",
     "chrome_style": true

options.html

@@ -2,6 +2,7 @@
 <html lang="de">
 <head>
     <meta charset="UTF-8">
+    <link rel="stylesheet" href="style.css">
     <title>Mask Detector</title>
 </head>
 <body style="text-align: center">

options.js

@@ -6,4 +6,4 @@ document.getElementById("clearCache").addEventListener("click", function () {
 
 document.getElementById("close").addEventListener("click", function () {
     window.close();
-});
+});

package.json

@@ -0,0 +1,28 @@
+{
+  "name": "mask-detector",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "dependencies": {},
+  "devDependencies": {
+    "eslint": "^4.19.1",
+    "npm-run-all": "^4.1.3",
+    "web-ext": "^2.3.0"
+  },
+  "scripts": {
+    "build": "web-ext build --ignore-files '**/*.sh' 'docs/' 'yarn*'",
+    "webext_lint": "web-ext lint --warnings-as-errors --ignore-files 'libs/*' 'docs/' '**/*.sh' 'yarn*'",
+    "eslint": "eslint *.js",
+    "all": "npm-run-all --parallel webext_lint eslint --sequential build"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Findus23/mask-detector.git"
+  },
+  "author": "",
+  "license": "GPL-3.0",
+  "bugs": {
+    "url": "https://github.com/Findus23/mask-detector/issues"
+  },
+  "homepage": "https://github.com/Findus23/mask-detector#readme"
+}

popup.html

@@ -2,11 +2,13 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
+    <link rel="stylesheet" href="style.css">
     <title>Mask Detector</title>
 </head>
 <body>
 <div id="typo3Version"></div>
 <div id="lastModified" style="width: 200px"></div>
+<div id="maskVersion" style="width: 200px"></div>
 <script src="popup.js"></script>
 </body>
 </html>

popup.js

@@ -10,6 +10,10 @@ chrome.tabs.query({active: true}, function (tabs) {
                 text = result[key].tv.modified;
             }
         }
+        if (result[key].mask && result[key].mask.type) {
+            document.getElementById("maskVersion").innerText = "Mask " +
+                ((result[key].mask.type === "old") ? "<= 3.2.0" : "> 3.2.0");
+        }
         if (text) {
             document.getElementById("lastModified").innerText = text;
         }

style.css

@@ -0,0 +1,3 @@
+body {
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+}