WIP: Switch from commonjs to ESM

scripts/getpsl.py

@@ -16,15 +16,11 @@
 file_text = '''/* eslint-disable */
 "use strict";
 
-[(function(exports) {
-
 const publicSuffixes = new Map(
 %s
 );
 
-Object.assign(exports, {publicSuffixes});
-
-})].map(func => typeof exports == 'undefined' ? define('/domains/psl', func) : func(exports));'''
+export {publicSuffixes};'''
 
 
 def get_psl_text():

src/js/browser_compat.js

@@ -1,8 +1,7 @@
 "use strict";
 
-[(function(exports) {
 
-const shim = require('./shim');
+import {shims as shim} from './shim.js';
 
 /*
  * Firefox & Chrome now take different values in opt_extraInfoSpec
@@ -19,6 +18,4 @@ function getOnHeadersReceivedOptions({OnHeadersReceivedOptions} = shim) {
   return ["BLOCKING", "RESPONSE_HEADERS", "RESPONSEHEADERS", "EXTRA_HEADERS"].map(x => OnHeadersReceivedOptions[x]).filter(x => x);
 }
 
-Object.assign(exports, {getOnBeforeRequestOptions, getOnBeforeSendHeadersOptions, getOnHeadersReceivedOptions});
-
-})].map(func => typeof exports == 'undefined' ? define('/browser_compat', func) : func(exports));
+export {getOnBeforeRequestOptions, getOnBeforeSendHeadersOptions, getOnHeadersReceivedOptions};

src/js/browser_utils.js

@@ -0,0 +1,66 @@
+import {activeIcons, inactiveIcons} from './constants.js';
+
+import {shims} from './shim.js';
+const {tabsQuery, tabsGet, setIcon, setBadgeText} = shims;
+
+
+async function currentTab() {
+  const active = true, lastFocusedWindow = true;
+  return new Promise(resolve => {
+    tabsQuery({active, lastFocusedWindow}, tabsFirstTry => {
+      if (tabsFirstTry.length > 0) {
+        resolve(tabsFirstTry[0]);
+      } else { // tab not focused
+        tabsQuery({active}, tabsSecondTry => {
+          resolve(tabsSecondTry[0]);
+        });
+      }
+    });
+  });
+}
+
+function errorOccurred() {
+  if (typeof chrome !== 'undefined' && chrome.runtime.lastError) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+async function tabExists(tabId) {
+  if (tabId >= 0) {
+    return await new Promise(resolve => {
+      tabsGet(tabId, () => {
+        if (!errorOccurred()) {
+          resolve(true);
+        } else {
+          resolve(false);
+        }
+      });
+    });
+  } else {
+    return true;
+  }
+}
+
+// todo after setIcon return's a promise, make this return a promise
+async function setTabIconActive(tabId, active) {
+  if (await tabExists(tabId)) {
+    let icons = active ? activeIcons : inactiveIcons;
+    setIcon({tabId: tabId, path: icons});
+  }
+}
+
+async function safeSetBadgeText(tabId, text) {
+  if (await tabExists(tabId)) {
+    setBadgeText({text, tabId});
+  }
+}
+
+export {
+  currentTab,
+  errorOccurred,
+  tabExists,
+  setTabIconActive,
+  safeSetBadgeText, 
+}

src/js/constants.js

@@ -1,7 +1,5 @@
 "use strict";
 
-[(function(exports) {
-
 // disk name
 const DISK_NAME = 'p055um';
 
@@ -78,7 +76,7 @@ const REMOVE_ACTION = 'remove_action';
 
 const GET_DEBUG_LOG = 'get_debug_log';
 
-Object.assign(exports, {
+export {
   DISK_NAME,
   responses,
   NO_ACTION,
@@ -102,6 +100,4 @@ Object.assign(exports, {
   POPUP,
   REMOVE_ACTION,
   GET_DEBUG_LOG,
-});
-
-})].map(func => typeof exports == 'undefined' ? define('/constants', func) : func(exports));
+};

src/js/contentscripts/fingercounting.js

@@ -1,6 +1,5 @@
 "use strict";
 
-[(function(exports) {
 /**
  * This watches methods that are commonly used for fingerprinting, and reports
  * when a suspicious number of them are used by one script.
@@ -298,6 +297,4 @@ function makeFingerCounting(event_id = 0, init = true) {
   }
 }
 
-Object.assign(exports, {makeFingerCounting});
-
-})].map(func => typeof exports == 'undefined' ? define('/contentscripts/fingercounting', func) : func(exports));
+export {makeFingerCounting};

src/js/disk_map.js

@@ -11,7 +11,6 @@
  * resource intensive. So instead we do this.
  */
 
-[(function(exports) {
 
 class DiskMap {
   constructor(name, disk) {
@@ -89,6 +88,4 @@ class DiskMap {
   }
 }
 
-Object.assign(exports, {DiskMap});
-
-})].map(func => typeof exports == 'undefined' ? define('/disk_map', func) : func(exports));
+export {DiskMap};

src/js/domains/basedomain.js

@@ -10,10 +10,8 @@
 
 "use strict";
 
-[(function(exports) {
-
-const {publicSuffixes} = require('./psl'),
-    {memoize} = require('../utils');
+import {publicSuffixes} from './psl.js';
+import {memoize} from '../utils.js';
 
 const re_ipv4 = /[0-9]$/;
 
@@ -70,6 +68,4 @@ function getBaseDomain(/**String*/ hostname) {
 }
 getBaseDomain = memoize(getBaseDomain, (x) => x, 1000);
 
-Object.assign(exports, {getBaseDomain});
-
-})].map(func => typeof exports == 'undefined' ? define('/domains/basedomain', func) : func(exports));
+export {getBaseDomain};

src/js/domains/mdfp.js

@@ -1,8 +1,6 @@
 "use strict";
 
-[(function(exports) {
-
-const {memoize, lazyDef} = require('../utils');
+import {memoize} from '../utils.js';
 
 
 let multiDomainFirstPartiesArray = [
@@ -321,11 +319,20 @@ class MultiDomainFirstParties {
   }
 }
 
-lazyDef(exports, 'isMdfp', () => {
+/*
+ * Function wrapper that lets us call initFunc to initialize the function.
+ * the initFunc should return the function
+ */
+function withInit(initFunc) {
+  let func = null
+  return function() {
+    return (func ? func : func = initFunc()).apply(null, arguments);
+  }
+}
+
+const isMdfp = withInit(() => {
   let mdfp = new MultiDomainFirstParties();
-  return {isMdfp: mdfp.isMdfp.bind(mdfp)};
+  return mdfp.isMdfp.bind(mdfp);
 });
 
-Object.assign(exports, {MultiDomainFirstParties});
-
-})].map(func => typeof exports == 'undefined' ? define('/domains/mdfp', func) : func(exports));
+export {MultiDomainFirstParties, isMdfp};

src/js/domains/parties.js

@@ -1,10 +1,8 @@
 "use strict";
 
-[(function(exports) {
-
-const {memoize} = require('../utils'),
-  {getBaseDomain} = require('./basedomain'),
-  {isMdfp} = require('./mdfp');
+import {memoize} from '../utils.js';
+import {getBaseDomain} from './basedomain.js';
+import {isMdfp} from './mdfp.js';
 
 function isThirdParty(d1, d2) {
   let b1 = getBaseDomain(d1),
@@ -17,6 +15,4 @@ function isThirdParty(d1, d2) {
 }
 isThirdParty = memoize(isThirdParty, ([a, b]) => a + ' ' + b, 1000);
 
-Object.assign(exports, {isThirdParty});
-
-})].map(func => typeof exports == 'undefined' ? define('/domains/parties', func) : func(exports));
+export {isThirdParty};