move src/configs/ to configs/ so it's easier to change them

README.md

@@ -16,10 +16,12 @@ Please visit [this page](http://uku.im/contributors) for an up-to-date list of o
 
 ## Development
 
-Update URL and server configs under the folder `src/configs/`.
+Update URLs and server configs under the folder `configs/`.
 
 Run `npm ci` to install dependencies exactly as they are listed in the package-lock.json file.
 
 Run `npm run lint` to check the coding style of all source code.
 
 Run `npm run test` to create a zip file for uploading to Chrome Web Store and run tests against it.
+
+Change `headerless` in `jest-puppeteer.config.js` to `false` to see the browser UI while the tests are running.

configs/servers.mjs

@@ -0,0 +1,11 @@
+// _PROXY_PROTOCOL can be HTTP, HTTPS, or SOCKS5
+export const DEFAULT_PROXY_PROTOCOL = 'HTTPS';
+export const DEFAULT_PROXY_ADDRESS = 'secure.uku.im:8443';
+export const BACKUP_PROXY_PROTOCOL = 'HTTPS';
+export const BACKUP_PROXY_ADDRESS = 'secure.uku.im:993';
+
+// For debugging
+// export const DEFAULT_PROXY_PROTOCOL = 'SOCKS5';
+// export const DEFAULT_PROXY_ADDRESS = '127.0.0.1:1086';
+// export const BACKUP_PROXY_PROTOCOL = 'SOCKS5';
+// export const BACKUP_PROXY_ADDRESS = '127.0.0.1:1086';

jest-puppeteer.config.js

@@ -5,7 +5,7 @@ const CRX_PATH = path.resolve(__dirname, './dist/unzipped_chrome_extension');
 module.exports = {
   launch: {
     headless: 'chrome', // Extensions won't load if headerless=true
-    // headless: false,  // Add this to debug
+    // headless: false,  // Use this option for debugging
     args: [
       `--disable-extensions-except=${CRX_PATH}`,
       `--load-extension=${CRX_PATH}`,

src/modules/_header.mjs

@@ -3,7 +3,7 @@
  */
 
 
-import {HEADER_URLS} from '../configs/urls.mjs';
+import {HEADER_URLS} from '../../configs/urls.mjs';
 
 
 function newRandomIp() {

src/modules/_proxy.mjs

@@ -3,10 +3,10 @@
  */
 
 
-import {PROXY_BYPASS_URLS, PROXY_URLS} from '../configs/urls.mjs';
+import {PROXY_BYPASS_URLS, PROXY_URLS} from '../../configs/urls.mjs';
 import {
   DEFAULT_PROXY_PROTOCOL, DEFAULT_PROXY_ADDRESS, BACKUP_PROXY_PROTOCOL, BACKUP_PROXY_ADDRESS}
-  from '../configs/servers.mjs';
+  from '../../configs/servers.mjs';
 import {urls2pac} from './_url_utils.mjs';
 
 

src/modules/settings.mjs

@@ -44,8 +44,8 @@ function applyModeSettings(mode) {
     const setProxy = async () => {
       const customProxy = await getCustomProxy();
       if (typeof customProxy === 'undefined' ||
-      typeof customProxy.proc === 'undefined' ||
-      typeof customProxy.addr === 'undefined') {
+          typeof customProxy.proc === 'undefined' ||
+          typeof customProxy.addr === 'undefined') {
         return Proxy.setDefaultProxy();
       } else {
         return Proxy.setCustomProxy(customProxy.proc, customProxy.addr);

src/options.mjs

@@ -1,7 +1,7 @@
 import './modules/crash_report.mjs';
 
 import * as Settings from './modules/settings.mjs';
-import {DEFAULT_PROXY_PROTOCOL, DEFAULT_PROXY_ADDRESS} from './configs/servers.mjs';
+import {DEFAULT_PROXY_PROTOCOL, DEFAULT_PROXY_ADDRESS} from '../configs/servers.mjs';
 
 
 function showProxyMessage(type, content) {

tools/create_zip.js

@@ -7,16 +7,14 @@ const archiver = require('archiver');
 
 
 const TOP_FOLDER_LOCATION = path.join(__dirname, '../');
-const SERVER_CONFIG_FILE_LOCATION = path.join(
-    TOP_FOLDER_LOCATION, 'src/configs/servers.mjs');
-const OUTPUT_ZIP_FILE_LOCATION = path.join(
-    TOP_FOLDER_LOCATION, 'dist/upload_to_chrome_store.zip');
+const OUTPUT_ZIP_FILE_LOCATION = path.join(TOP_FOLDER_LOCATION, 'dist/upload_to_chrome_store.zip');
 
 const FILES_TO_BE_ZIPPED = [
   'manifest.json',
-  'src',
-  'icons',
   '_locales',
+  'configs',
+  'icons',
+  'src',
   'COPYING.txt',
 ];
 const EXCLUDED_FILE_PATTERNS = [
@@ -37,13 +35,6 @@ const EXCLUDED_FILE_PATTERNS = [
 ];
 
 
-// Do some sanity checks before we start
-const serverConfig = fs.readFileSync(SERVER_CONFIG_FILE_LOCATION, 'utf8');
-if (serverConfig.includes('localhost') || serverConfig.includes('127.0.0.1')) {
-  console.error('ERROR: Remove 127.0.0.1 / localhost from servers.mjs and try again');
-  process.exit(-1);
-}
-
 // Make sure the output folder exists
 fs.mkdirSync(path.dirname(OUTPUT_ZIP_FILE_LOCATION), {recursive: true});
 // Create output stream

tools/produce_regex.mjs

@@ -1,4 +1,4 @@
-import {PROXY_URLS} from '../src/configs/urls.mjs';
+import {PROXY_URLS} from '../configs/urls.mjs';
 import {produceSquidRegexList} from './_regex_utils.mjs';
 
 console.log(produceSquidRegexList(PROXY_URLS).join('\n') + '\n');