From 314bf57b943099eebdc6451692d0cd76d0c6ebc7 Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Wed, 22 Nov 2017 12:13:45 +0500
Subject: [PATCH 01/18] First working version

---
 .../src/extension-common/00-init-apis.js      | 35 ++++++++
 .../extension-common/11-error-handlers-api.js | 38 ++++----
 .../extension-common/35-pac-kitchen-api.js    | 12 ++-
 .../src/extension-common/default.pac.js       | 17 ++++
 .../src/extension-common/manifest.tmpl.json   |  4 +-
 .../src/extension-common/pages/debug/index.js | 89 ++++++++++---------
 .../pages/options/package-lock.json           | 22 +++++
 .../options/src/components/PacChooser.js      | 14 +--
 8 files changed, 161 insertions(+), 70 deletions(-)
 create mode 100644 extensions/chromium/runet-censorship-bypass/src/extension-common/default.pac.js

diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/00-init-apis.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/00-init-apis.js
index 1b1566c..eeb2f6c 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/00-init-apis.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/00-init-apis.js
@@ -241,6 +241,9 @@
   const compareVersions = (a, b) => versionToInt(a) - versionToInt(b);
 
   window.apis = {
+    platform: {
+      ifFirefox: navigator.userAgent.toLowerCase().includes('firefox'),
+    },
     version: {
       ifMini: false,
       build: chrome.runtime.getManifest().version.replace(/\d+\.\d+\./g, ''),
@@ -249,4 +252,36 @@
     },
   };
 
+  // Shims for FireFox
+
+  if (!chrome.proxy.settings) {
+
+    let currentSettings = {};
+
+    chrome.proxy.settings = {
+      get: (_, cb) => {
+
+        currentSettings.levelOfControl = 'controlled_by_this_extension'; // May be lie, but this field is required.
+        cb(currentSettings);
+
+      },
+      onChange: {
+        addListener: () => {},
+      },
+      set: (details, cb) => {
+
+        browser.proxy.unregister();
+        browser.proxy.register('./default.pac.js');
+
+
+        browser.proxy.onProxyError.addListener((...err) => { console.log('ERROR IN PAC:', ...err)  });
+
+        browser.runtime.sendMessage(details, {toProxyScript: true});
+        currentSettings = details;
+        cb();
+
+      },
+    };
+  }
+
 }
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/11-error-handlers-api.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/11-error-handlers-api.js
index 96d3263..67ac40e 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/11-error-handlers-api.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/11-error-handlers-api.js
@@ -8,6 +8,9 @@
   const errorJsonReplacer = function errorJsonReplacer(key, value) {
 
     // fooWindow.ErrorEvent !== barWindow.ErrorEvent
+    if (value === window) {
+      return; // STUPID, because other window object may be passed.
+    }
     if (!( value && value.constructor
       && ['Error', 'Event'].some(
         (suff) => value.constructor.name.endsWith(suff)
@@ -114,20 +117,22 @@
 
     isControllable(details) {
 
-      this.ifControllable = window.utils.areSettingsControllableFor(details);
+      if (details) {
+        this.ifControllable = window.utils.areSettingsControllableFor(details);
 
-      if (this.ifControllable) {
-        this.ifControlled = window.utils.areSettingsControlledFor(details);
-      } else {
-        this.ifControlled = false;
-      }
+        if (this.ifControllable) {
+          this.ifControlled = window.utils.areSettingsControlledFor(details);
+        } else {
+          this.ifControlled = false;
+        }
 
-      if (this.ifControlled) {
-        chrome.browserAction.setIcon( {path: './icons/default-128.png'} );
-      } else {
-        chrome.browserAction.setIcon({
-          path: './icons/default-grayscale-128.png',
-        });
+        if (this.ifControlled) {
+          chrome.browserAction.setIcon( {path: './icons/default-128.png'} );
+        } else {
+          chrome.browserAction.setIcon({
+            path: './icons/default-grayscale-128.png',
+          });
+        }
       }
 
       return this.ifControllable;
@@ -136,7 +141,9 @@
 
     isControlled(details) {
 
-      this.isControllable(details);
+      if (details) {
+        this.isControllable(details);
+      }
       return this.ifControlled;
 
     },
@@ -175,16 +182,15 @@
       const message = errOrMessage.message || errOrMessage.toString();
       chrome.notifications.create(
         id,
-        {
+        Object.assign({
           title: title,
           message: message,
           contextMessage: context,
-          requireInteraction: ifSticky,
           type: 'basic',
           iconUrl: './icons/' + icon,
           appIconMaskUrl: './icons/default-mask-128.png',
           isClickable: true,
-        }
+        }, window.apis.platform.ifFirefox ? {} : { requireInteraction: ifSticky }),
       );
 
     },
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
index 64e2c03..ecfede7 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
@@ -317,11 +317,11 @@
 
       return pacMods.ifNoMods ? pacData : pacData + `${ kitchenStartsMark }
 /******/
-/******/;+function(global) {
+/******/;(function(global) {
 /******/  "use strict";
 /******/
 /******/  const originalFindProxyForURL = FindProxyForURL;
-/******/  global.FindProxyForURL = function(url, host) {
+/******/  const tmp = function(url, host) {
 /******/
     ${
       function() {
@@ -453,7 +453,13 @@ ${        pacMods.filteredCustomsString
 
   };
 
-}(this);`;
+  if (global) {
+/******/  global.FindProxyForURL = tmp;
+  } else {
+/******/ FindProxyForURL = tmp;
+  }
+
+})(this);`;
 
     },
 
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/default.pac.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/default.pac.js
new file mode 100644
index 0000000..6b4603b
--- /dev/null
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/default.pac.js
@@ -0,0 +1,17 @@
+var coolFind = () => {};
+this.FindProxyForURL = function (...args) {
+  return coolFind(...args);
+};
+
+const dnsResolve = this.dnsResolve || (() => null); // Welcome to hell! Someone forgot dns.
+
+browser.runtime.onMessage.addListener((details) => {
+  const pacData =
+    details && details.value && details.value.pacScript && details.value.pacScript.data;
+  if (!pacData) {
+    throw new Error('Never install empty PAC scripts!');
+  }
+  coolFind = (function() { eval(pacData); return FindProxyForURL; })();
+
+});
+
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/manifest.tmpl.json b/extensions/chromium/runet-censorship-bypass/src/extension-common/manifest.tmpl.json
index ad52cb9..b9d38df 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/manifest.tmpl.json
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/manifest.tmpl.json
@@ -45,5 +45,7 @@
   "options_ui": {
      "page": "/pages/options/index.html",
      "chrome_style": false
-   }
+   },
+
+  "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'"
 }
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/debug/index.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/debug/index.js
index ef0e255..6157146 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/debug/index.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/debug/index.js
@@ -1,60 +1,63 @@
 'use strict';
 
-const setStatusTo = (msg) => document.getElementById('status').innerHTML = msg;
+chrome.runtime.getBackgroundPage((bgWin) => {
 
-const red = (text) => '<span style="color: red">' + text + '</span>';
+  const setStatusTo = (msg) => document.getElementById('status').innerHTML = msg;
 
-const editor = window.ace.edit('editor');
-editor.getSession().setOptions({
-  mode: 'ace/mode/javascript',
-  useSoftTabs: true,
-});
-
-chrome.proxy.settings.onChange.addListener(
-  (details) => setStatusTo(red( details.levelOfControl + '!') )
-);
-
-function _read() {
-
-  chrome.proxy.settings.get({}, (details) => {
-
-    let control = details.levelOfControl;
-    if (control.startsWith('controlled_by_other')) {
-      control = red(control);
-    }
-    setStatusTo(control);
-    console.log(details);
-    const pac = details.value.pacScript;
-    const data = pac && pac.data || 'PAC скрипт не установлен.';
-    editor.setValue( data );
+  const red = (text) => '<span style="color: red">' + text + '</span>';
 
+  const editor = window.ace.edit('editor');
+  editor.getSession().setOptions({
+    mode: 'ace/mode/javascript',
+    useSoftTabs: true,
   });
 
-}
+  bgWin.chrome.proxy.settings.onChange.addListener(
+    (details) => setStatusTo(red( details.levelOfControl + '!') )
+  );
 
-document.querySelector('#read-button').onclick = _read;
+  function _read() {
 
-document.querySelector('#save-button').onclick = () => {
+    bgWin.chrome.proxy.settings.get({}, (details) => {
+
+      let control = details.levelOfControl;
+      if (control.startsWith('controlled_by_other')) {
+        control = red(control);
+      }
+      setStatusTo(control);
+      console.log(details);
+      const pac = details.value.pacScript;
+      const data = pac && pac.data || 'PAC скрипт не установлен.';
+      editor.setValue( data );
+
+    });
+
+  }
+
+  document.querySelector('#read-button').onclick = _read;
+
+  document.querySelector('#save-button').onclick = () => {
+
+    const config = {
+      mode: 'pac_script',
+      pacScript: {
+        mandatory: false,
+        data: editor.getValue(),
+      },
+    };
+    bgWin.chrome.proxy.settings.set( {value: config}, () => alert('Saved!') );
 
-  const config = {
-    mode: 'pac_script',
-    pacScript: {
-      mandatory: false,
-      data: editor.getValue(),
-    },
   };
-  chrome.proxy.settings.set( {value: config}, () => alert('Saved!') );
 
-};
+  document.querySelector('#clear-button').onclick = () => {
 
-document.querySelector('#clear-button').onclick = () => {
+    bgWin.chrome.proxy.settings.clear({}, () => {
 
-  chrome.proxy.settings.clear({}, () => {
+      alert('Cleared! Reading...');
+      _read();
 
-    alert('Cleared! Reading...');
-    _read();
+    });
 
-  });
-
-};
+  };
 
+})
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/package-lock.json b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/package-lock.json
index 849d0e2..c29d856 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/package-lock.json
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/package-lock.json
@@ -1205,10 +1205,21 @@
       "integrity": "sha512-H1b0LNa197L/y2eBcVSQxpldkgzK15HU3xG1hCn0xJ4rxRSo6n78/fabBqyuUYMA1CtVa1Z7WnAVa9FKvlFecQ==",
       "dev": true,
       "requires": {
+        "inferno": "3.8.0",
         "inferno-shared": "3.8.0",
         "inferno-vnode-flags": "3.8.0"
       },
       "dependencies": {
+        "inferno": {
+          "version": "3.8.0",
+          "resolved": "https://registry.npmjs.org/inferno/-/inferno-3.8.0.tgz",
+          "integrity": "sha512-6s/hAYOrKNB0a8FDNHTJlz13d9uup7fVpvfd+2XPzxE69h8WgtMl+CSTIxHkW8RuEcc+hFAqi0ScsXVkMor5pw==",
+          "dev": true,
+          "requires": {
+            "inferno-shared": "3.8.0",
+            "inferno-vnode-flags": "3.8.0"
+          }
+        },
         "inferno-vnode-flags": {
           "version": "3.8.0",
           "resolved": "https://registry.npmjs.org/inferno-vnode-flags/-/inferno-vnode-flags-3.8.0.tgz",
@@ -1223,11 +1234,22 @@
       "integrity": "sha512-OOCSFxgnQUYvT8bhkE7OearfQi4NXevHVE49rExHhbf6m7U/AW5uQ/Ji8+BmX//sQY4YjQIvZnD/t1O+UEEBgA==",
       "dev": true,
       "requires": {
+        "inferno": "3.8.0",
         "inferno-component": "3.8.0",
         "inferno-shared": "3.8.0",
         "inferno-vnode-flags": "3.8.0"
       },
       "dependencies": {
+        "inferno": {
+          "version": "3.8.0",
+          "resolved": "https://registry.npmjs.org/inferno/-/inferno-3.8.0.tgz",
+          "integrity": "sha512-6s/hAYOrKNB0a8FDNHTJlz13d9uup7fVpvfd+2XPzxE69h8WgtMl+CSTIxHkW8RuEcc+hFAqi0ScsXVkMor5pw==",
+          "dev": true,
+          "requires": {
+            "inferno-shared": "3.8.0",
+            "inferno-vnode-flags": "3.8.0"
+          }
+        },
         "inferno-vnode-flags": {
           "version": "3.8.0",
           "resolved": "https://registry.npmjs.org/inferno-vnode-flags/-/inferno-vnode-flags-3.8.0.tgz",
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/PacChooser.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/PacChooser.js
index 894c146..47de8ec 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/PacChooser.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/PacChooser.js
@@ -63,7 +63,7 @@ export default function getPacChooser(theState) {
       this.updatePac = function updatePac(onSuccess) {
         props.funs.conduct(
           'Обновляем...',
-          (cb) => props.apis.antiCensorRu.syncWithPacProviderAsync(cb),
+          (cb) => theState.apis.antiCensorRu.syncWithPacProviderAsync(cb),
           'Обновлено.',
           onSuccess
         );
@@ -75,7 +75,7 @@ export default function getPacChooser(theState) {
 
     getCurrentProviderId() {
 
-      return this.props.apis.antiCensorRu.getCurrentPacProviderKey() || 'none';
+      return theState.apis.antiCensorRu.getCurrentPacProviderKey() || 'none';
 
     }
 
@@ -94,7 +94,7 @@ export default function getPacChooser(theState) {
       const pacKey = event.target.id;
       if (
         pacKey === (
-          this.props.apis.antiCensorRu.getCurrentPacProviderKey() || 'none'
+          theState.apis.antiCensorRu.getCurrentPacProviderKey() || 'none'
         )
       ) {
         return false;
@@ -102,7 +102,7 @@ export default function getPacChooser(theState) {
       if (pacKey === 'none') {
         this.props.funs.conduct(
           'Отключение...',
-          (cb) => this.props.apis.antiCensorRu.clearPacAsync(cb),
+          (cb) => theState.apis.antiCensorRu.clearPacAsync(cb),
           'Отключено.',
           () => this.setState({ chosenPacName: 'none' }),
           checkChosenProvider
@@ -110,7 +110,7 @@ export default function getPacChooser(theState) {
       } else {
         this.props.funs.conduct(
           'Установка...',
-          (cb) => this.props.apis.antiCensorRu.installPacAsync(pacKey, cb),
+          (cb) => theState.apis.antiCensorRu.installPacAsync(pacKey, cb),
           'PAC-скрипт установлен.',
           checkChosenProvider
         );
@@ -127,7 +127,7 @@ export default function getPacChooser(theState) {
           {props.flags.ifInsideOptionsPage && (<header>PAC-скрипт:</header>)}
           <ul>
             {
-              [...props.apis.antiCensorRu.getSortedEntriesForProviders(), {key: 'none', label: 'Отключить'}].map((provConf) =>
+              [...theState.apis.antiCensorRu.getSortedEntriesForProviders(), {key: 'none', label: 'Отключить'}].map((provConf) =>
                 (<InfoLi
                   onClick={this.radioClickHandler}
                   conf={provConf}
@@ -159,7 +159,7 @@ export default function getPacChooser(theState) {
 
     componentDidMount() {
 
-      if (this.props.apis.antiCensorRu.ifFirstInstall) {
+      if (theState.apis.antiCensorRu.ifFirstInstall) {
         this.updatePac();
       }
 

From 688eef70db309e05ec7db2e96f6c46d6e071455b Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Wed, 22 Nov 2017 13:13:28 +0500
Subject: [PATCH 02/18] Bump beta to 0.0.1.11

---
 .../chromium/runet-censorship-bypass/src/templates-data.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/chromium/runet-censorship-bypass/src/templates-data.js b/extensions/chromium/runet-censorship-bypass/src/templates-data.js
index 3bdf0b9..8904f20 100644
--- a/extensions/chromium/runet-censorship-bypass/src/templates-data.js
+++ b/extensions/chromium/runet-censorship-bypass/src/templates-data.js
@@ -47,7 +47,7 @@ exports.contexts.beta = Object.assign({}, commonContext, {
     // 'https://rebrand.ly/ac-beta-pac',
     ...pacUrls,
   ],
-  version: '1.6',
+  version: '1.11',
   versionSuffix: '',
   nameSuffixEn: ' FOR TESTING',
   nameSuffixRu: ' ДЛЯ ТЕСТОВ',

From 8a9eb02d6e630d42540924a5bf53e77d7a745b6f Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Wed, 22 Nov 2017 14:33:03 +0500
Subject: [PATCH 03/18] Bump beta to 0.0.1.12

---
 .../chromium/runet-censorship-bypass/src/templates-data.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/chromium/runet-censorship-bypass/src/templates-data.js b/extensions/chromium/runet-censorship-bypass/src/templates-data.js
index 8904f20..ec8a314 100644
--- a/extensions/chromium/runet-censorship-bypass/src/templates-data.js
+++ b/extensions/chromium/runet-censorship-bypass/src/templates-data.js
@@ -47,7 +47,7 @@ exports.contexts.beta = Object.assign({}, commonContext, {
     // 'https://rebrand.ly/ac-beta-pac',
     ...pacUrls,
   ],
-  version: '1.11',
+  version: '1.12',
   versionSuffix: '',
   nameSuffixEn: ' FOR TESTING',
   nameSuffixRu: ' ДЛЯ ТЕСТОВ',

From 609017da1aede263ccc810f5fc10a27e54dfa991 Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Wed, 22 Nov 2017 15:18:18 +0500
Subject: [PATCH 04/18] Bump beta to 0.0.1.13

---
 .../chromium/runet-censorship-bypass/src/templates-data.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/chromium/runet-censorship-bypass/src/templates-data.js b/extensions/chromium/runet-censorship-bypass/src/templates-data.js
index ec8a314..7eb8e78 100644
--- a/extensions/chromium/runet-censorship-bypass/src/templates-data.js
+++ b/extensions/chromium/runet-censorship-bypass/src/templates-data.js
@@ -47,7 +47,7 @@ exports.contexts.beta = Object.assign({}, commonContext, {
     // 'https://rebrand.ly/ac-beta-pac',
     ...pacUrls,
   ],
-  version: '1.12',
+  version: '1.13',
   versionSuffix: '',
   nameSuffixEn: ' FOR TESTING',
   nameSuffixRu: ' ДЛЯ ТЕСТОВ',

From aa21b5ad9ee200dcb2ea3286d0c35d073f26cd83 Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Wed, 22 Nov 2017 15:19:02 +0500
Subject: [PATCH 05/18] Make Firefox load PAC on each start

---
 .../37-sync-pac-script-with-pac-provider-api.tmpl.js   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js
index 9c07766..81edbc5 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js
@@ -242,6 +242,12 @@
 
     },
 
+    clearLastModified() {
+
+      this.setLastModified(0);
+
+    },
+
     mustBeKey(key = mandatory()) {
 
       if ( !(key === null || this.pacProviders[key]) ) {
@@ -519,6 +525,10 @@
         // LAUNCH, RELOAD, ENABLE
         antiCensorRu.pacProviders = oldStorage.pacProviders;
         console.log('Extension launched, reloaded or enabled.');
+        if (window.apis.platform.ifFirefox) {
+          antiCensorRu.clearLastModified();
+          await new Promise((r) => antiCensorRu.syncWithPacProviderAsync(r)); // On each launch, ffx has no memory.
+        }
         return resolve();
 
       }

From a35ab098d4e62fba6b2a664a9b602bec2943a7e3 Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Wed, 22 Nov 2017 15:34:01 +0500
Subject: [PATCH 06/18] Bump beta to 0.0.1.14

---
 .../chromium/runet-censorship-bypass/src/templates-data.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/chromium/runet-censorship-bypass/src/templates-data.js b/extensions/chromium/runet-censorship-bypass/src/templates-data.js
index 7eb8e78..59860c5 100644
--- a/extensions/chromium/runet-censorship-bypass/src/templates-data.js
+++ b/extensions/chromium/runet-censorship-bypass/src/templates-data.js
@@ -47,7 +47,7 @@ exports.contexts.beta = Object.assign({}, commonContext, {
     // 'https://rebrand.ly/ac-beta-pac',
     ...pacUrls,
   ],
-  version: '1.13',
+  version: '1.14',
   versionSuffix: '',
   nameSuffixEn: ' FOR TESTING',
   nameSuffixRu: ' ДЛЯ ТЕСТОВ',

From 4738bcf9af72e26008abf643dc01a67e65ea96e2 Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Wed, 22 Nov 2017 16:03:20 +0500
Subject: [PATCH 07/18] Persist state between relaunches for Firefox

---
 .../src/extension-common/00-init-apis.js            | 13 ++++++++++---
 ...37-sync-pac-script-with-pac-provider-api.tmpl.js | 10 ----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/00-init-apis.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/00-init-apis.js
index eeb2f6c..c4bf71e 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/00-init-apis.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/00-init-apis.js
@@ -256,11 +256,13 @@
 
   if (!chrome.proxy.settings) {
 
-    let currentSettings = {};
+    const ffxStore = window.utils.createStorage('firefox-only');
+
 
     chrome.proxy.settings = {
       get: (_, cb) => {
 
+        let currentSettings = ffxStore('proxySettings') || {};
         currentSettings.levelOfControl = 'controlled_by_this_extension'; // May be lie, but this field is required.
         cb(currentSettings);
 
@@ -274,14 +276,19 @@
         browser.proxy.register('./default.pac.js');
 
 
-        browser.proxy.onProxyError.addListener((...err) => { console.log('ERROR IN PAC:', ...err)  });
+        // browser.proxy.onProxyError.addListener((...err) => { console.log('ERROR IN PAC:', ...err)  });
 
         browser.runtime.sendMessage(details, {toProxyScript: true});
-        currentSettings = details;
+        ffxStore('proxySettings', details);
         cb();
 
       },
     };
+    const proxySettings = ffxStore('proxySettings');
+    if (proxySettings) {
+      chrome.proxy.settings.set(proxySettings);
+    }
+
   }
 
 }
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js
index 81edbc5..9c07766 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js
@@ -242,12 +242,6 @@
 
     },
 
-    clearLastModified() {
-
-      this.setLastModified(0);
-
-    },
-
     mustBeKey(key = mandatory()) {
 
       if ( !(key === null || this.pacProviders[key]) ) {
@@ -525,10 +519,6 @@
         // LAUNCH, RELOAD, ENABLE
         antiCensorRu.pacProviders = oldStorage.pacProviders;
         console.log('Extension launched, reloaded or enabled.');
-        if (window.apis.platform.ifFirefox) {
-          antiCensorRu.clearLastModified();
-          await new Promise((r) => antiCensorRu.syncWithPacProviderAsync(r)); // On each launch, ffx has no memory.
-        }
         return resolve();
 
       }

From 1191a5e0432e49243e2d9313d5d1eb74ce158995 Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Sat, 25 Nov 2017 19:32:01 +0500
Subject: [PATCH 08/18] Fix bug with undefined cb

---
 .../src/extension-common/00-init-apis.js                      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/00-init-apis.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/00-init-apis.js
index c4bf71e..ce40fcf 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/00-init-apis.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/00-init-apis.js
@@ -264,7 +264,7 @@
 
         let currentSettings = ffxStore('proxySettings') || {};
         currentSettings.levelOfControl = 'controlled_by_this_extension'; // May be lie, but this field is required.
-        cb(currentSettings);
+        cb && cb(currentSettings);
 
       },
       onChange: {
@@ -280,7 +280,7 @@
 
         browser.runtime.sendMessage(details, {toProxyScript: true});
         ffxStore('proxySettings', details);
-        cb();
+        cb && cb();
 
       },
     };

From bca0135b77cea01bd199f95854e04387a992e1ca Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Sat, 25 Nov 2017 20:23:43 +0500
Subject: [PATCH 09/18] Add install note

---
 extensions/chromium/runet-censorship-bypass/howto.txt | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 extensions/chromium/runet-censorship-bypass/howto.txt

diff --git a/extensions/chromium/runet-censorship-bypass/howto.txt b/extensions/chromium/runet-censorship-bypass/howto.txt
new file mode 100644
index 0000000..89f0076
--- /dev/null
+++ b/extensions/chromium/runet-censorship-bypass/howto.txt
@@ -0,0 +1,6 @@
+npm instll
+cd src/extension-common/pages/options/
+npm install
+cd -
+npm start
+use your build/extension-beta

From 466fe1451d3603a51db815b6e5c472f33280dbb5 Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Sat, 25 Nov 2017 20:30:46 +0500
Subject: [PATCH 10/18] Rename files, more verbose instructions

---
 .../runet-censorship-bypass/README.md         | 44 +++++++------------
 .../runet-censorship-bypass/description.md    | 26 +++++++++++
 .../runet-censorship-bypass/howto.txt         |  6 ---
 3 files changed, 43 insertions(+), 33 deletions(-)
 create mode 100644 extensions/chromium/runet-censorship-bypass/description.md
 delete mode 100644 extensions/chromium/runet-censorship-bypass/howto.txt

diff --git a/extensions/chromium/runet-censorship-bypass/README.md b/extensions/chromium/runet-censorship-bypass/README.md
index 888109a..7e3e365 100644
--- a/extensions/chromium/runet-censorship-bypass/README.md
+++ b/extensions/chromium/runet-censorship-bypass/README.md
@@ -1,30 +1,20 @@
-# Dev
+# Install
 
-Linting JS: `npm run lint`
+```
+npm instll
+cd src/extension-common/pages/options/
+npm install
+cd -
+npm start
+use your build/extension-beta
+```
 
-# О расширении
+# Release
 
-Обход интернет-цензуры в России пока что не является преступлением.
-
-Расширение позволяет обходить блокировки РосКомНадзора, давая вам доступ
-к библиотекам, энциклопедиям, сайтам оппозиционеров, а также к неповинным
-сайтам, случайно заблокированным в силу разных причин.
-
-Проксирует только заблокированные сайты, оставляя нетронутыми все остальные.
-
-Устанавливает PAC-скрипт, работающий через сервера anticenz.org и antizapret.prostovpn.org.
-
-Обновляет PAC-скрипт каждые 4 часа, что составляет примерно 7MB трафика в сутки.
-Также расширение постоянно потребляет ~15MB памяти для информирования о блокировках через иконку.
-
-Синяя лента – кампания фонда EFF в защиту свобод слова, прессы и союзов.
-
-Если расширение не работает: https://git.io/vgDDj
-
-Антицензура на Реддите: https://www.reddit.com/r/anticensorship_russia
-Группа в G+: https://goo.gl/Lh0Cjh
-История изменений: https://github.com/ilyaigpetrov/anti-censorship-russia/releases
-
-# Дополнительно
-
-Иконка синей ленты: http://www.iconsdb.com/icon-sets/cardboard-blue-icons/ribbon-12-icon.html
+1. `vim src/extension-common/pages/options/src/components/App.js`
+2. Change github link there.
+3. `npm run release`
+4. Change back: `vim src/extension-common/pages/options/src/components/App.js`
+5. `vim src/templates-data.js` and bump version.
+6. Commit bumped version.
+7. Merge development to production (usually after deployment and testing and many patches).
diff --git a/extensions/chromium/runet-censorship-bypass/description.md b/extensions/chromium/runet-censorship-bypass/description.md
new file mode 100644
index 0000000..6f28dbb
--- /dev/null
+++ b/extensions/chromium/runet-censorship-bypass/description.md
@@ -0,0 +1,26 @@
+# О расширении
+
+Обход интернет-цензуры в России пока что не является преступлением.
+
+Расширение позволяет обходить блокировки РосКомНадзора, давая вам доступ
+к библиотекам, энциклопедиям, сайтам оппозиционеров, а также к неповинным
+сайтам, случайно заблокированным в силу разных причин.
+
+Проксирует только заблокированные сайты, оставляя нетронутыми все остальные.
+
+Устанавливает PAC-скрипт, работающий через сервера anticenz.org и antizapret.prostovpn.org.
+
+Обновляет PAC-скрипт каждые 4 часа, что составляет примерно 7MB трафика в сутки.
+Также расширение постоянно потребляет ~15MB памяти для информирования о блокировках через иконку.
+
+Синяя лента – кампания фонда EFF в защиту свобод слова, прессы и союзов.
+
+Если расширение не работает: https://git.io/vgDDj
+
+Антицензура на Реддите: https://www.reddit.com/r/anticensorship_russia
+Группа в G+: https://goo.gl/Lh0Cjh
+История изменений: https://github.com/ilyaigpetrov/anti-censorship-russia/releases
+
+# Дополнительно
+
+Иконка синей ленты: http://www.iconsdb.com/icon-sets/cardboard-blue-icons/ribbon-12-icon.html
diff --git a/extensions/chromium/runet-censorship-bypass/howto.txt b/extensions/chromium/runet-censorship-bypass/howto.txt
deleted file mode 100644
index 89f0076..0000000
--- a/extensions/chromium/runet-censorship-bypass/howto.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-npm instll
-cd src/extension-common/pages/options/
-npm install
-cd -
-npm start
-use your build/extension-beta

From 73bb56e5e0fc5f2f4f748a1726339ab0d6ccab6a Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Sat, 25 Nov 2017 21:36:42 +0500
Subject: [PATCH 11/18] Open options page expanded while on addons page

---
 .../src/extension-common/pages/options/src/index.js             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/index.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/index.js
index af5329d..feb5271 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/index.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/index.js
@@ -35,7 +35,7 @@ chrome.runtime.getBackgroundPage( (bgWindow) =>
         )
       );
 
-      theState.flags.ifInsideOptionsPage = !currentTab || currentTab.url.startsWith('chrome://extensions/?options=');
+      theState.flags.ifInsideOptionsPage = !currentTab || currentTab.url.startsWith('chrome://extensions/?options=') || currentTab.url.startsWith('about:addons');
       theState.currentTab = currentTab;
 
       // STATE DEFINED, COMPOSE.

From e5b47999b676d11908ad19c1552a6327dccf2d18 Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Tue, 28 Nov 2017 17:54:50 +0500
Subject: [PATCH 12/18] Build subpages in beta mode when using start

---
 extensions/chromium/runet-censorship-bypass/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extensions/chromium/runet-censorship-bypass/package.json b/extensions/chromium/runet-censorship-bypass/package.json
index a05f423..68eea3a 100644
--- a/extensions/chromium/runet-censorship-bypass/package.json
+++ b/extensions/chromium/runet-censorship-bypass/package.json
@@ -8,7 +8,8 @@
     "gulp": "gulp",
     "test": "mocha --recursive ./src/**/test/*",
     "subpages": "cd ./src/extension-common/pages/options/ && npm run build && cd -",
-    "start": "npm run subpages && npm run gulp build:beta",
+    "subpages:dev": "cd ./src/extension-common/pages/options/ && npm run build:dev:nocomp && cd -",
+    "start": "npm run subpages:dev && npm run gulp build:beta",
     "release": "npm run subpages && npm run gulp build:all"
   },
   "author": "Ilya Ig. Petrov",

From 0b80a6bd18cd55dd153752b2b31982d0ec585e4c Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Tue, 28 Nov 2017 22:19:13 +0500
Subject: [PATCH 13/18] Release firefox edition separately

---
 .../runet-censorship-bypass/gulpfile.js       | 58 ++++++++-----------
 .../src/extension-common/manifest.tmpl.json   |  1 +
 .../01-chrome-proxy-settings.js               | 42 ++++++++++++++
 .../src/templates-data.js                     | 14 +++++
 4 files changed, 81 insertions(+), 34 deletions(-)
 create mode 100644 extensions/chromium/runet-censorship-bypass/src/extension-firefox/01-chrome-proxy-settings.js

diff --git a/extensions/chromium/runet-censorship-bypass/gulpfile.js b/extensions/chromium/runet-censorship-bypass/gulpfile.js
index 89f6afa..1d751a6 100644
--- a/extensions/chromium/runet-censorship-bypass/gulpfile.js
+++ b/extensions/chromium/runet-censorship-bypass/gulpfile.js
@@ -56,52 +56,31 @@ const contexts = require('./src/templates-data').contexts;
 
 const excFolder = (name) => [`!./src/**/${name}`, `!./src/**/${name}/**/*`];
 const excluded = [ ...excFolder('test') , ...excFolder('node_modules'), ...excFolder('src') ];
-const commonWoTests = ['./src/extension-common/**/*', ...excluded];
 
 const miniDst = './build/extension-mini';
 const fullDst = './build/extension-full';
 const betaDst = './build/extension-beta';
+const firefoxDst = './build/extension-firefox';
 
-gulp.task('_cp-common', ['clean'], function(cb) {
+const commonSrc = './src/extension-common/**/*';;
+const miniSrc = './src/extension-mini/**/*';
+const fullSrc = './src/extension-full/**/*';
+const firefoxSrc = './src/extension-firefox/**/*';
 
-  let fins = 0;
-  const intheend = () => {
-    if (++fins === 2) {
-      cb();
-    }
-  };
+const joinSrc = (...args) => [...args, ...excluded];
 
-  gulp.src(commonWoTests)
-    //.pipe(changed(miniDst))
-    .pipe(templatePlugin(contexts.mini))
-    .pipe(gulp.dest(miniDst))
-    .on('end', intheend);
+gulp.task('_cp-mini', function(cb) {
 
-  gulp.src(commonWoTests)
-    //.pipe(changed(fullDst))
-    .pipe(templatePlugin(contexts.full))
-    .pipe(gulp.dest(fullDst))
-    .on('end', intheend);
-
-  gulp.src(commonWoTests)
-    //.pipe(changed(fullDst))
-    .pipe(templatePlugin(contexts.beta))
-    .pipe(gulp.dest(betaDst))
-    .on('end', intheend);
-});
-
-gulp.task('_cp-mini', ['_cp-common'], function(cb) {
-
-  gulp.src(['./src/extension-mini/**/*', ...excluded])
+  gulp.src(joinSrc(commonSrc, miniSrc))
     //.pipe(changed(miniDst))
     .pipe(templatePlugin(contexts.mini))
     .pipe(gulp.dest(miniDst))
     .on('end', cb);
 });
 
-gulp.task('_cp-full', ['_cp-common'], function(cb) {
+gulp.task('_cp-full', function(cb) {
 
-  gulp.src(['./src/extension-full/**/*', ...excluded])
+  gulp.src(joinSrc(commonSrc, fullSrc))
     //.pipe(changed(fullDst))
     .pipe(templatePlugin(contexts.full))
     .pipe(gulp.dest(fullDst))
@@ -109,9 +88,19 @@ gulp.task('_cp-full', ['_cp-common'], function(cb) {
 
 });
 
-gulp.task('_cp-beta', ['_cp-common'], function(cb) {
+gulp.task('_cp-firefox', function(cb) {
 
-  gulp.src(['./src/extension-full/**/*', ...excluded])
+    gulp.src(joinSrc(commonSrc, fullSrc, firefoxSrc))
+    //.pipe(changed(fullDst))
+    .pipe(templatePlugin(contexts.firefox))
+    .pipe(gulp.dest(firefoxDst))
+    .on('end', cb);
+
+});
+
+gulp.task('_cp-beta', function(cb) {
+
+    gulp.src(joinSrc(commonSrc, fullSrc))
     //.pipe(changed(fullDst))
     .pipe(templatePlugin(contexts.beta))
     .pipe(gulp.dest(betaDst))
@@ -119,5 +108,6 @@ gulp.task('_cp-beta', ['_cp-common'], function(cb) {
 
 });
 
-gulp.task('build:all', ['_cp-mini', '_cp-full', '_cp-beta']);
+gulp.task('build:all', ['_cp-mini', '_cp-full', '_cp-beta', '_cp-firefox']);
 gulp.task('build:beta', ['_cp-beta']);
+gulp.task('build:firefox', ['_cp-firefox']);
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/manifest.tmpl.json b/extensions/chromium/runet-censorship-bypass/src/extension-common/manifest.tmpl.json
index b9d38df..6e1cb73 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/manifest.tmpl.json
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/manifest.tmpl.json
@@ -27,6 +27,7 @@
     ${persistent}
     "scripts": [
         "00-init-apis.js"
+      ${scripts_0x}
       , "11-error-handlers-api.js"
       , "12-errors-lib.js"
       , "13-http-lib.js"
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-firefox/01-chrome-proxy-settings.js b/extensions/chromium/runet-censorship-bypass/src/extension-firefox/01-chrome-proxy-settings.js
new file mode 100644
index 0000000..d892eb4
--- /dev/null
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-firefox/01-chrome-proxy-settings.js
@@ -0,0 +1,42 @@
+'use strict';
+
+{
+
+  if (!chrome.proxy.settings) {
+
+    const ffxStore = window.utils.createStorage('firefox-only');
+
+
+    chrome.proxy.settings = {
+      get: (_, cb) => {
+
+        let currentSettings = ffxStore('proxySettings') || {};
+        currentSettings.levelOfControl = 'controlled_by_this_extension'; // May be lie, but this field is required.
+        cb && cb(currentSettings);
+
+      },
+      onChange: {
+        addListener: () => {},
+      },
+      set: (details, cb) => {
+
+        browser.proxy.unregister();
+        browser.proxy.register('./default.pac.js');
+
+
+        // browser.proxy.onProxyError.addListener((...err) => { console.log('ERROR IN PAC:', ...err)  });
+
+        browser.runtime.sendMessage(details, {toProxyScript: true});
+        ffxStore('proxySettings', details);
+        cb && cb();
+
+      },
+    };
+    const proxySettings = ffxStore('proxySettings');
+    if (proxySettings) {
+      chrome.proxy.settings.set(proxySettings);
+    }
+
+  }
+
+}
diff --git a/extensions/chromium/runet-censorship-bypass/src/templates-data.js b/extensions/chromium/runet-censorship-bypass/src/templates-data.js
index 59860c5..1470d19 100644
--- a/extensions/chromium/runet-censorship-bypass/src/templates-data.js
+++ b/extensions/chromium/runet-censorship-bypass/src/templates-data.js
@@ -28,6 +28,7 @@ exports.contexts.full = Object.assign({}, commonContext, {
   nameSuffixRu: '',
   extra_permissions,
   persistent: '',
+  scripts_0x: '',
   scripts_2x: ', "20-ip-to-host-api.js"',
   scripts_8x: ', "80-error-menu.js", "83-last-errors.js", "85-block-informer.js"',
 });
@@ -38,10 +39,22 @@ exports.contexts.mini = Object.assign({}, commonContext, {
   nameSuffixRu: ' МИНИ',
   extra_permissions: '',
   persistent: '"persistent": false,',
+  scripts_0x: '',
   scripts_2x: ', "20-for-mini-only.js"',
   scripts_8x: '',
 });
 
+exports.contexts.firefox = Object.assign({}, commonContext, {
+  versionSuffix: '',
+  nameSuffixEn: '',
+  nameSuffixRu: '',
+  extra_permissions,
+  persistent: '',
+  scripts_0x: ', "01-chrome-proxy-settings.js"',
+  scripts_2x: ', "20-ip-to-host-api.js"',
+  scripts_8x: ', "80-error-menu.js", "83-last-errors.js", "85-block-informer.js"',
+});
+
 exports.contexts.beta = Object.assign({}, commonContext, {
   anticensorityPacUrls: [
     // 'https://rebrand.ly/ac-beta-pac',
@@ -53,6 +66,7 @@ exports.contexts.beta = Object.assign({}, commonContext, {
   nameSuffixRu: ' ДЛЯ ТЕСТОВ',
   extra_permissions,
   persistent: '',
+  scripts_0x: '',
   scripts_2x: ', "20-ip-to-host-api.js"',
   scripts_8x: ', "80-error-menu.js", "83-last-errors.js", "85-block-informer.js"',
 });

From 498f35df71bd4554d6b1efd2df8e8a94a59a7d64 Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Tue, 28 Nov 2017 23:29:12 +0500
Subject: [PATCH 14/18] Fix bug with no rule returned from PAC

---
 .../src/extension-common/35-pac-kitchen-api.js                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
index ecfede7..69bf4cb 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
@@ -423,7 +423,7 @@ ${        pacMods.filteredCustomsString
            pacMods.ifUsePacScriptProxies
         ) {
           return res + `
-/******/    return pacScriptProxies + directIfAllowed;`;
+/******/    return (pacScriptProxies + directIfAllowed) || "DIRECT";`;
         }
 
         return res + `

From a07ecfeaf2cdb8f87f0e820f8bb2f6f376a92177 Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Wed, 29 Nov 2017 13:05:00 +0500
Subject: [PATCH 15/18] Add more error to ignore list

---
 .../src/extension-common/11-error-handlers-api.js           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/11-error-handlers-api.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/11-error-handlers-api.js
index 67ac40e..379ced1 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/11-error-handlers-api.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/11-error-handlers-api.js
@@ -259,7 +259,11 @@
         error: "net::ERR_PAC_SCRIPT_FAILED",
         fatal: false,
     */
-    const ifConFail = details.error === 'net::ERR_PROXY_CONNECTION_FAILED';
+    const ifConFail = [
+      'net::ERR_TUNNEL_CONNECTION_FAILED',
+      'net::ERR_PROXY_CONNECTION_FAILED',
+    ].includes(details.error);
+
     if (ifConFail) {
       // Happens if you return neither prixies nor "DIRECT".
       // Ignore it.

From 30875cb9a17c5620d93efb439c289145c4812a3c Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Wed, 29 Nov 2017 13:09:19 +0500
Subject: [PATCH 16/18] Bump extension version to 0.0.1.15

---
 .../chromium/runet-censorship-bypass/src/templates-data.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/chromium/runet-censorship-bypass/src/templates-data.js b/extensions/chromium/runet-censorship-bypass/src/templates-data.js
index 1470d19..2488ef1 100644
--- a/extensions/chromium/runet-censorship-bypass/src/templates-data.js
+++ b/extensions/chromium/runet-censorship-bypass/src/templates-data.js
@@ -12,7 +12,7 @@ const pacUrls = [
 ];
 
 const commonContext = {
-  version: '1.11',
+  version: '1.15',
   anticensorityPacUrls: [
     ...pacUrls,
   ],

From a86b9f6a0e145d8179dc6f03147dd5445b08ab83 Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Wed, 29 Nov 2017 13:36:02 +0500
Subject: [PATCH 17/18] PAC kitchen prettier output

---
 .../src/extension-common/11-error-handlers-api.js  |  2 +-
 .../src/extension-common/35-pac-kitchen-api.js     | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/11-error-handlers-api.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/11-error-handlers-api.js
index 379ced1..9090c55 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/11-error-handlers-api.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/11-error-handlers-api.js
@@ -272,7 +272,7 @@
     console.warn('PAC ERROR', details);
     // TOOD: add "view pac script at this line" button.
     handlers.mayNotify('pac-error', 'Ошибка PAC!',
-      details.error + '\n' + details.details,
+      (details.error || details.message /* Firefox */) + '\n' + details.details,
       {icon: 'pac-error-128.png'}
     );
 
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
index 69bf4cb..1d0ad68 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
@@ -451,15 +451,15 @@ ${        pacMods.filteredCustomsString
       }()
     }
 
-  };
+/******/  };
 
-  if (global) {
-/******/  global.FindProxyForURL = tmp;
-  } else {
-/******/ FindProxyForURL = tmp;
-  }
+/******/  if (global) {
+/******/    global.FindProxyForURL = tmp;
+/******/  } else {
+/******/    FindProxyForURL = tmp;
+/******/  }
 
-})(this);`;
+/*****/})(this);`;
 
     },
 

From c2a3c23e7e1e486b4de08cec16f4bc2d6b0346cc Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Wed, 29 Nov 2017 14:27:45 +0500
Subject: [PATCH 18/18] Bump 0.0.1.16

---
 .../chromium/runet-censorship-bypass/src/templates-data.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/chromium/runet-censorship-bypass/src/templates-data.js b/extensions/chromium/runet-censorship-bypass/src/templates-data.js
index 2488ef1..ffa4bc4 100644
--- a/extensions/chromium/runet-censorship-bypass/src/templates-data.js
+++ b/extensions/chromium/runet-censorship-bypass/src/templates-data.js
@@ -12,7 +12,7 @@ const pacUrls = [
 ];
 
 const commonContext = {
-  version: '1.15',
+  version: '1.16',
   anticensorityPacUrls: [
     ...pacUrls,
   ],