async'ify worker-util, reduce indirection

background/background-worker.js

@@ -2,9 +2,9 @@
 'use strict';
 
 importScripts('/js/worker-util.js');
-const {loadScript, createAPI} = workerUtil;
+const {loadScript} = workerUtil;
 
-createAPI({
+workerUtil.createAPI({
   parseMozFormat(arg) {
     loadScript('/vendor-overwrites/csslint/parserlib.js', '/js/moz-parser.js');
     return parseMozFormat(arg);

edit/editor-worker.js

@@ -2,9 +2,9 @@
 'use strict';
 
 importScripts('/js/worker-util.js');
-const {createAPI, loadScript} = workerUtil;
+const {loadScript} = workerUtil;
 
-createAPI({
+workerUtil.createAPI({
   csslint: (code, config) => {
     loadScript('/vendor-overwrites/csslint/parserlib.js', '/vendor-overwrites/csslint/csslint.js');
     return CSSLint.verify(code, config).messages

js/worker-util.js

@@ -1,17 +1,12 @@
-/* global importScripts */
-/* exported workerUtil */
 'use strict';
 
-const workerUtil = (() => {
+const workerUtil = {
-  const loadedScripts = new Set();
-  return {createWorker, createAPI, loadScript, cloneError};
 
-  function createWorker({url, lifeTime = 300}) {
+  createWorker({url, lifeTime = 300}) {
     let worker;
     let id;
     let timer;
     const pendingResponse = new Map();
-
     return new Proxy({}, {
       get: (target, prop) =>
         (...args) => {
@@ -19,7 +14,7 @@ const workerUtil = (() => {
             init();
           }
           return invoke(prop, args);
-        }
+        },
     });
 
     function init() {
@@ -34,10 +29,9 @@ const workerUtil = (() => {
       worker = null;
     }
 
-    function onMessage(e) {
+    function onMessage({data: {id, data, error}}) {
-      const message = e.data;
+      pendingResponse.get(id)[error ? 'reject' : 'resolve'](data);
-      pendingResponse.get(message.id)[message.error ? 'reject' : 'resolve'](message.data);
+      pendingResponse.delete(id);
-      pendingResponse.delete(message.id);
       if (!pendingResponse.size && lifeTime >= 0) {
         timer = setTimeout(uninit, lifeTime * 1000);
       }
@@ -47,36 +41,26 @@ const workerUtil = (() => {
       return new Promise((resolve, reject) => {
         pendingResponse.set(id, {resolve, reject});
         clearTimeout(timer);
-        worker.postMessage({
+        worker.postMessage({id, action, args});
-          id,
-          action,
-          args
-        });
         id++;
       });
     }
-  }
+  },
 
-  function createAPI(methods) {
+  createAPI(methods) {
-    self.onmessage = e => {
+    self.onmessage = async ({data: {id, action, args}}) => {
-      const message = e.data;
+      let data, error;
-      Promise.resolve()
+      try {
-        .then(() => methods[message.action](...message.args))
+        data = await methods[action](...args);
-        .then(result => ({
+      } catch (err) {
-          id: message.id,
+        error = true;
-          error: false,
+        data = workerUtil.cloneError(err);
-          data: result
+      }
-        }))
+      self.postMessage({id, data, error});
-        .catch(err => ({
-          id: message.id,
-          error: true,
-          data: cloneError(err)
-        }))
-        .then(data => self.postMessage(data));
     };
-  }
+  },
 
-  function cloneError(err) {
+  cloneError(err) {
     return Object.assign({
       name: err.name,
       stack: err.stack,
@@ -85,14 +69,16 @@ const workerUtil = (() => {
       columnNumber: err.columnNumber,
       fileName: err.fileName
     }, err);
-  }
+  },
 
-  function loadScript(...scripts) {
+  loadScript(...urls) {
-    const urls = scripts.filter(u => !loadedScripts.has(u));
+    urls = urls.filter(u => !workerUtil._loadedScripts.has(u));
     if (!urls.length) {
       return;
     }
-    importScripts(...urls);
+    self.importScripts(...urls);
-    urls.forEach(u => loadedScripts.add(u));
+    urls.forEach(u => workerUtil._loadedScripts.add(u));
-  }
+  },
-})();
+
+  _loadedScripts: new Set(),
+};