Fix muted errors

New bug spotted: "GETed with success" is logged twice for
proxy.pac.

extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js

@@ -634,8 +634,8 @@ ${
     if (ifNothingToCook) {
       return originalSet(details, cb);
     }
-    const getPacData = (cb) =>
+    const getPacData = (getPacCb) =>
-      pac.data ? cb(null, pac.data) : window.apis.httpLib.get(autoConfigUrl, cb);
+      pac.data ? getPacCb(null, pac.data) : window.apis.httpLib.get(autoConfigUrl, getPacCb);
 
     getPacData((err, pacData) => {
       if (err) {
@@ -644,27 +644,27 @@ ${
       }
       const pacMods = getCurrentConfigs();
       const cookedData = pacKitchen.cook( pacData, pacMods );
+      const setCb = (/* No args. */) => {
+
+        kitchenState(ifIncontinence, null);
+        cb && cb();
+
+      };
 
       if (window.apis.platform.ifFirefox) {
         const autoConfigUrl = URL.createObjectURL(new Blob([cookedData], {
           type: 'application/x-ns-proxy-autoconfig',
         }));
-        originalSet({
+        return originalSet({
           value: {
             proxyType: 'autoConfig',
             autoConfigUrl,
           },
-        }, chromified(cb));
+        }, setCb);
-        return;
       }
 
       details.value.pacScript.data = cookedData;
-      originalSet({value: details.value}, (/* No args. */) => {
+      return originalSet({ value: details.value }, setCb);
-
-        kitchenState(ifIncontinence, null);
-        cb && cb();
-
-      });
     });
   };
 

extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js

@@ -66,12 +66,15 @@
         return;
       }
       delete settings.levelOfControl;
-      const setProxyAsync = () => new Promise((setResolve, setReject) =>
+      const setProxyAsync = () => new Promise((setResolve, setReject) => {
+
+        console.log('Restoring chrome proxy settings...');
         chrome.proxy.settings.set(
           settings,
           chromified((err) => err ? setReject(err) : setResolve()),
-        ),
+        );
-      );
+      });
+      console.log('Clearing chrome proxy settings...');
       chrome.proxy.settings.clear({}, chromified((clearErr) => {
         if (clearErr) {
           reject(clearErr);
@@ -86,41 +89,35 @@
     pacData = mandatory(), cb = throwIfError,
   ) {
 
-    console.log('Clearing chrome proxy settings...');
+    const config = {
-    chrome.proxy.settings.clear({}, chromified((clearErr) => {
+      mode: 'pac_script',
+      pacScript: {
+        mandatory: false,
+        data: pacData,
+      },
+    };
+    console.log('Setting chrome proxy settings...');
+    chrome.proxy.settings.set( { value: config }, chromified((err) => {
 
-      if (clearErr) {
+      console.log('ERRORR?:', err);
-        return cb(clearErr);
+      if (err) {
+        return cb(err);
       }
-      const config = {
+      handlers.updateControlState( () => {
-        mode: 'pac_script',
+
-        pacScript: {
+        if ( !handlers.ifControlled ) {
-          mandatory: false,
+
-          data: pacData,
+          console.warn('Failed, other extension is in control.');
-        },
+          return cb(
-      };
+            new Error( window.utils.messages.whichExtensionHtml() ),
-      console.log('Setting chrome proxy settings...');
+          );
-      chrome.proxy.settings.set( { value: config }, chromified((err) => {
 
-        if (err) {
-          return cb(err);
         }
-        handlers.updateControlState( () => {
+        console.log('Successfuly set PAC in proxy settings.');
+        cb();
 
-          if ( !handlers.ifControlled ) {
+      });
 
-            console.warn('Failed, other extension is in control.');
-            return cb(
-              new Error( window.utils.messages.whichExtensionHtml() ),
-            );
-
-          }
-          console.log('Successfuly set PAC in proxy settings..');
-          cb();
-
-        });
-
-      }));
     }));
   };
 
@@ -186,7 +183,15 @@
             ),
           ),
           Promise.reject(),
-        ),
+        )/*
+        .catch(
+          clarifyThen(
+            chrome.i18n.getMessage('FailedToDownloadPacScriptFromAddresses') + ': [ '
+            + provider.pacUrls.join(' , ') + ' ].',
+            cb,
+          ),
+        )
+        */
     );
 
     pacDataPromise.then(
@@ -200,7 +205,6 @@
             Object.assign(res || {}, {lastModified: lastModifiedStr}),
           ),
         );
-
       },
 
       clarifyThen(
@@ -208,7 +212,6 @@
         + provider.pacUrls.join(' , ') + ' ].',
         cb,
       ),
-
     );
   };
 
@@ -540,7 +543,7 @@
             'Periodic PAC update triggered:',
             new Date().toLocaleString('ru-RU'),
           );
-          antiCensorRu.syncWithPacProviderAsync(() => {/* swallow */});
+          antiCensorRu.syncWithPacProviderAsync(() => { /* Swallow. */ });
         }
 
       })
@@ -564,7 +567,8 @@
       // INSTALL
       console.log('Installing...');
       handlers.switch('on', 'ext-error');
-      return chrome.runtime.openOptionsPage();
+      chrome.runtime.openOptionsPage();
+      return;
     }
 
     // LAUNCH, RELOAD, UPDATE