Merge branch 'load-balancing-for-static-contents' into 'master'

Load balancing for static contents

See merge request KevinRoebert/ClearUrls!50

.gitlab-ci.yml

@@ -9,18 +9,6 @@ stages:
   - build
   - deploy
 
-hash rules:
-    stage: build
-    script:
-        - sha256sum data/data.min.json | awk '{print $1}' > rules.min.hash
-        - node build_tools/minifyDataJSON.js "data/data.min.json" "data.minify.json"
-        - sha256sum data.minify.json | awk '{print $1}' > rules.minify.hash
-    artifacts:
-        paths:
-            - rules.min.hash
-            - data.minify.json
-            - rules.minify.hash
-
 build firefox:
   stage: build
   script:
@@ -50,8 +38,13 @@ pages:
   stage: deploy
   script:
     - mkdir public
+    - mkdir public/data
     - mv GitLabPages/* public/
     - cp img/clearurls.svg public/clearurls.svg
+    - cp data/data.min.json public/data/data.min.json
+    - sha256sum public/data/data.min.json | awk '{print $1}' > public/data/rules.min.hash
+    - node build_tools/minifyDataJSON.js "public/data/data.min.json" "public/data/data.minify.json"
+    - sha256sum public/data/data.minify.json | awk '{print $1}' > public/data/rules.minify.hash
   artifacts:
     paths:
       - public

CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.9.3.1] - 2019-11-15
+
+### Compatibility note
+- Require Firefox >= 55
+- Require Chrome >= 22
+
+### Changed
+- Changed data and hash URL to GitLab Pages, to prevent hitting the GitLab infrastructure directly [#295](https://gitlab.com/KevinRoebert/ClearUrls/issues/295#note_245456134).
+
 ## [1.9.3] - 2019-11-15
 
 ### Compatibility note

core_js/storage.js

@@ -198,8 +198,8 @@ function initSettings() {
     storage.log = {"log": []};
     storage.statisticsStatus = true;
     storage.badged_color = "ffa500";
-    storage.hashURL = "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/rules.minify.hash?job=hash%20rules";
+    storage.hashURL = "https://kevinroebert.gitlab.io/ClearUrls/data/rules.minify.hash";
-    storage.ruleURL = "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/data.minify.json?job=hash%20rules";
+    storage.ruleURL = "https://kevinroebert.gitlab.io/ClearUrls/data/data.minify.json";
     storage.contextMenuEnabled = true;
     storage.historyListenerEnabled = true;
     storage.localHostsSkipping = true;
@@ -220,19 +220,23 @@ function initSettings() {
 function replaceOldURLs(url) {
     switch (url) {
         case "https://raw.githubusercontent.com/KevinRoebert/ClearUrls/master/data/rules.hash?flush_cache=true":
-            return "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/rules.minify.hash?job=hash%20rules";
+            return "https://kevinroebert.gitlab.io/ClearUrls/data/rules.minify.hash";
         case "https://raw.githubusercontent.com/KevinRoebert/ClearUrls/master/data/data.json?flush_cache=true":
-            return "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/data.minify.json?job=hash%20rules";
+            return "https://kevinroebert.gitlab.io/ClearUrls/data/data.minify.json";
         case "https://gitlab.com/KevinRoebert/ClearUrls/raw/master/data/rules.hash":
-            return "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/rules.minify.hash?job=hash%20rules";
+            return "https://kevinroebert.gitlab.io/ClearUrls/data/rules.minify.hash";
         case "https://gitlab.com/KevinRoebert/ClearUrls/raw/master/data/data.json":
-            return "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/data.minify.json?job=hash%20rules";
+            return "https://kevinroebert.gitlab.io/ClearUrls/data/data.minify.json";
         case "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/rules.min.hash?job=hash%20rules":
-            return "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/rules.minify.hash?job=hash%20rules";
+            return "https://kevinroebert.gitlab.io/ClearUrls/data/rules.minify.hash";
         case "https://gitlab.com/KevinRoebert/ClearUrls/raw/master/data/data.min.json":
-            return "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/data.minify.json?job=hash%20rules";
+            return "https://kevinroebert.gitlab.io/ClearUrls/data/data.minify.json";
         case "https://gitlab.com/KevinRoebert/ClearUrls/raw/master/data/data.minify.json":
-            return "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/data.minify.json?job=hash%20rules";
+            return "https://kevinroebert.gitlab.io/ClearUrls/data/data.minify.json";
+        case "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/data.minify.json?job=hash%20rules":
+            return "https://kevinroebert.gitlab.io/ClearUrls/data/data.minify.json";
+        case "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/rules.minify.hash?job=hash%20rules":
+            return "https://kevinroebert.gitlab.io/ClearUrls/data/rules.minify.hash";
         default:
             return url;
     }

manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "ClearURLs",
-    "version": "1.9.3",
+    "version": "1.9.3.1",
     "author": "Kevin Röbert",
     "description": "Remove tracking elements from URLs.",
     "homepage_url": "https://gitlab.com/KevinRoebert/ClearUrls",