From 86d07b79c3bdabeaede699d69ad27c6a51ddfbe6 Mon Sep 17 00:00:00 2001
From: ilyaigpetrov <ilyaigpetrov@gmail.com>
Date: Fri, 27 Aug 2021 16:19:50 +0000
Subject: [PATCH] make extension robust to dns failures (test0)

---
 ...7-sync-pac-script-with-pac-provider-api.tmpl.js | 14 +++++++-------
 .../src/extension-full/20-ip-to-host-api.js        |  3 +--
 2 files changed, 8 insertions(+), 9 deletions(-)

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 513abb4..032c03d 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
@@ -469,24 +469,24 @@
               reject([err, ...warns]);
               return;
             }
-            resolve(err, res, ...warns);
+            resolve([err, res, ...warns]);
           },
         ),
       );
 
-      const ipsErrorPromise = !ifUnattended
+      const ipsPromise = !ifUnattended
         ? updateIpsAsync()
         : tryPromiseSeveralTimesAsync(updateIpsAsync, [20, 40, 60]);
 
-      Promise.all([pacSetPromise, ipsErrorPromise]).then(
-        ([[pacErr, pacRes, ...pacWarns], ipsErr]) => {
+      Promise.all([pacSetPromise, ipsPromise]).then(
+        ([[pacErr, pacRes, ...pacWarns], [ipsErr, ipsRes, ...ipsWarns]]) => {
 
-          if (pacErr && ipsErr) {
+          if (pacErr) {
             return cb(pacErr, pacRes);
           }
           const warns = pacWarns;
-          if (ipsErr) {
-            warns.push(ipsErr);
+          if (ipsErr || ipsWarns.length) {
+            warns.push(...[ipsErr], ...ipsWarns);
           }
           this.pushToStorageAsync(
             (pushErr) => cb(pacErr || pushErr, null, ...warns),
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-full/20-ip-to-host-api.js b/extensions/chromium/runet-censorship-bypass/src/extension-full/20-ip-to-host-api.js
index 3e6c8f6..88926c9 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-full/20-ip-to-host-api.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-full/20-ip-to-host-api.js
@@ -115,7 +115,7 @@
     const promises = types.map(
       (type) => new Promise((resolve) =>
         httpLib.get(
-          `https://dnsssssss.google.com/resolve?type=${type}&name=${host}&random_padding=${generateRandomHexString(30,500)}`,
+          `https://dns.google.com/resolve?type=${type}&name=${host}&random_padding=${generateRandomHexString(30,500)}`,
           (err, res) => {
 
             if (res) {
@@ -282,7 +282,6 @@
             ' блокировок может не отображаться.'
           );
         }
-        console.log('IP ERRORS:', ipErrors); // TODO:
         cb(null, null, ipErrors);
       });
     },