v3.4.2

Author: z0ccc

modules/ext/.env.schema

@@ -9,7 +9,8 @@ WEB_EXT_SESSION_POLLER_INTERVAL=
 
 # defaults to 50
 WEB_EXT_AUTH_ERROR_COUNT_MAX=
-# defaults to 5000 (ms) 
+
+# defaults to 250 (ms) 
 WEB_EXT_AUTH_RESET_MIN_INTERVAL=
 
 # can be set to 80 to get around HTTP 2 throttling limitation

modules/ext/.testing.schema.env

@@ -4,6 +4,8 @@ TEST_ASSET_URL=https://assets.windscribe.com
 TEST_ADMIN_API_URL=http://api-admin.prd.ws.int
 TEST_ADMIN_USER=
 TEST_ADMIN_PASSWORD=
+TEST_USER=
+TEST_PASSWORD=
 
 # Optional
 

modules/ext/automated_tests/chrome.tests.js

@@ -35,7 +35,7 @@ rimraf(userDataDir, () => {})
 // Access chrome object in Extensions
 // https://github.com/GoogleChrome/puppeteer/issues/2878
 
-const EXT_LOAD_DELAY = 100
+const EXT_LOAD_DELAY = 2000
 const extPopupHtml = 'popup.html'
 const port = process.env.TEST_SERVER_PORT || 1337
 let browser, bgPage, page, expressServerListener
@@ -45,7 +45,7 @@ let launchBrowser = () =>
     headless: false,
     devtools: false,
     dumpio: true,
-    product: 'firefox',
+    product: 'chrome',
     args: [
       `--disable-extensions-except=${extPath}`,
       `--load-extension=${extPath}`,
@@ -78,15 +78,15 @@ let setupBrowser = async ({ showPopup }) => {
 
   if (showPopup) {
     await page.goto(`chrome-extension://${extID}/${extPopupHtml}`)
-    await page.waitFor(3000)
+    await page.waitForTimeout(3000)
     await page.reload()
     await page.tracing.start({
       path: path.resolve(`./automated_tests/traces/trace.json`),
     })
   }
 
   // wait for page to load
-  await page.waitFor(3000)
+  await page.waitForTimeout(3000)
   const backgroundPageTarget = targets.find(
     target => target.type() === 'background_page',
   )
@@ -104,7 +104,7 @@ describe('chrome extension', () => {
   const logicTests = argv.logic ? getLogicTests(argv.whitelist) : []
   const e2eTests = argv.e2e ? getE2eTests(argv.whitelist) : []
   const ghostTests = argv.ghost ? getGhostTests(argv.whitelist) : []
-  const allTests = [...logicTests, ...e2eTests, ...ghostTests]
+  const allTests = [...e2eTests, ...logicTests, ...ghostTests]
 
   for (let t of allTests) {
     // eslint-disable-next-line no-loop-func
@@ -115,7 +115,10 @@ describe('chrome extension', () => {
 
       if (t.eval) {
         const evalRes = await bgPage.evaluate(t.eval, {
-          testUser: global.TEST_USER,
+          testUser: {
+            username: process.env.TEST_USER,
+            password: process.env.TEST_PASSWORD,
+          },
         })
         t.assert(evalRes)
       }
@@ -129,7 +132,7 @@ describe('chrome extension', () => {
         await screenshot(page, t.name)
       }
 
-      await page.waitFor(500)
+      await page.waitForTimeout(500)
     })
   }
 

modules/ext/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ext",
-  "version": "3.4.0",
+  "version": "3.4.2",
   "private": true,
   "dependencies": {
     "@babel/plugin-proposal-export-default-from": "~7.8.3",
@@ -126,15 +126,15 @@
     "jsdom-global": "~3.0.2",
     "meow": "~6.0.0",
     "mocha": "~7.0.0",
-    "puppeteer": "~2.0.0",
+    "puppeteer": "~12.0.0",
     "react-test-renderer": "^16.13.1",
     "react-testing-library": "^8.0.1",
     "rimraf": "~3.0.0",
     "slack": "~11.0.2",
     "web-ext": "~4.0.0",
     "webpack-dev-server": "^3.11.0"
   },
-  "uBlockVersion": "ws-v1.41.8",
+  "uBlockVersion": "ws-v1.42.4",
   "main": "index.js",
   "license": "MIT"
 }

modules/ext/public/manifest/base.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Windscribe - Free Proxy and Ad Blocker",
   "short_name": "Windscribe",
-  "version": "3.4.0",
+  "version": "3.4.2",
   "description": "Windscribe helps you mask your physical location, circumvent censorship, and block ads and trackers on websites you use every day",
   "content_security_policy": "script-src 'self'; object-src 'self';",
   "default_locale": "en",

modules/ext/src/assets/connected-ring.svg

@@ -100,7 +100,7 @@ const ACTIVITY = 'background_setup'
   store.dispatch(actions.bgReady.set(true))
 })()
 
-// if (process.NODE_ENV !== 'production') {
-//   // If this were imported at the top of the file it would be bundled in even when in prod.
-//   import('tests/setup').then(module => module.default())
-// }
+if (process.NODE_ENV !== 'production') {
+  // If this were imported at the top of the file it would be bundled in even when in prod.
+  import('tests/setup').then(module => module.default())
+}

modules/ext/src/assets/onproxyfailure-ring.svg

@@ -243,25 +243,6 @@ const OtherExtension = ({ close }) => {
   )
 }
 
-const ConfirmAdvancedMode = ({ close, toggleAdvancedMode }) => {
-  const { t } = useTranslation()
-  return (
-    <>
-      <ConfirmButton onClick={close}>
-        <Text fontSize={1} p={1} level={3}>
-          {t('Take me back')}
-        </Text>
-      </ConfirmButton>
-
-      <CancelButton onClick={toggleAdvancedMode}>
-        <Text fontSize={1} p={1} level={3}>
-          {t("Yes, I'm sure")}
-        </Text>
-      </CancelButton>
-    </>
-  )
-}
-
 const GhostNotAllowed = ({ close, goToSignUp }) => {
   const { t } = useTranslation()
   return (
@@ -392,13 +373,6 @@ const getContent = ({ status, t }) => {
         img: rateUsGarry,
         AdditionalComponent: RateUs,
       }
-    case 'confirmAdvancedMode':
-      return {
-        title: t('Are you sure?'),
-        message: t('This will disable all of your current blocker settings.'),
-        img: cautionGarry,
-        AdditionalComponent: ConfirmAdvancedMode,
-      }
     case 'somethingWeird':
       return {
         title: t('Something went wrong'),

modules/ext/src/background.js

@@ -41,7 +41,7 @@ export default ({
   const goBack = () =>
     dispatch(actions.scrollToConnected.set(true)) &&
     dispatch(actions.view.back())
-  const [prevPage] = view.previous.reverse()
+  const prevPage = view.previous[view.previous.length - 1]
 
   return (
     <Flex {...restProps} flexDirection="column">