BDE-226 introduce a base class for dynamically introspecting service …

…worker components

src/main/browser-store.js

@@ -1,8 +1,20 @@
-class BrowserStore {
+import ServiceWorkerComponent from './service-worker-component';
+
+class BrowserStore extends ServiceWorkerComponent {
   constructor(worker, namespace = 'nuxeo-browser-extension.') {
-    this.worker = worker;
+    super(worker);
+
+    // Define propertie
     this.namespace = namespace;
 
+    // Bind methods
+    Object.getOwnPropertyNames(Object.getPrototypeOf(this))
+      .filter((prop) => typeof this[prop] === 'function' && prop !== 'constructor')
+      .forEach((method) => {
+        this[method] = this[method].bind(this);
+      });
+
+    // Define functors
     this.keysOf = (data) => {
       if (Array.isArray(data)) {
         return data;
@@ -31,13 +43,6 @@ class BrowserStore {
       // call the function to get the default value
       return data[key]();
     };
-
-    // Bind methods
-    Object.getOwnPropertyNames(Object.getPrototypeOf(this))
-      .filter((prop) => typeof this[prop] === 'function' && prop !== 'constructor')
-      .forEach((method) => {
-        this[method] = this[method].bind(this);
-      });
   }
 
   get(input) {

src/main/connect-locator.js

@@ -1,21 +1,24 @@
 import CryptoJS from 'crypto-js';
+import ServiceWorkerComponent from './service-worker-component';
 
-class ConnectLocator {
+class ConnectLocator extends ServiceWorkerComponent {
   constructor(worker) {
-    this.worker = worker;
-    // Declare private methods
-    this.credentialsKeyOf = (location) => {
-      const hash = CryptoJS
-        .SHA512(location.toString())
-        .toString();
-      return `connect-locator.${hash}`;
-    };
+    super(worker);
+
     // Bind methods
     Object.getOwnPropertyNames(Object.getPrototypeOf(this))
       .filter((prop) => typeof this[prop] === 'function' && prop !== 'constructor')
       .forEach((method) => {
         this[method] = this[method].bind(this);
       });
+
+    // Declare functors
+    this.credentialsKeyOf = (location) => {
+      const hash = CryptoJS
+        .SHA512(location.toString())
+        .toString();
+      return `connect-locator.${hash}`;
+    };
   }
 
   withUrl(input) {

src/main/declarative-net-engine.js

@@ -1,4 +1,5 @@
 /* eslint-disable max-classes-per-file */
+import ServiceWorkerComponent from './service-worker-component';
 
 class BaseRule {
   constructor() {
@@ -146,9 +147,11 @@ class RedirectRule extends BaseRule {
   }
 }
 
-class DeclarativeNetEngine {
+class DeclarativeNetEngine extends ServiceWorkerComponent {
   constructor(worker) {
-    this.worker = worker;
+    super(worker);
+
+    // Define properties
     this.rules = new Map();
     this.rulesToAdd = [];
     this.rulesToRemove = [];
@@ -160,7 +163,7 @@ class DeclarativeNetEngine {
         this[method] = this[method].bind(this);
       });
 
-    // Private functions
+    // Define functors
     this.requestOf = (rulesToAdd, rulesToRemove) => ({
       addRules: rulesToAdd.map((rule) => rule.toJson()),
       removeRuleIds: rulesToRemove.map((rule) => rule.hashCode()),

src/main/designer-live-preview.js

@@ -18,16 +18,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { resolve } from 'nuxeo/lib/deps/promise';
 import DeclarativeNetComponents from './declarative-net-engine';
+import ServiceWorkerComponent from './service-worker-component';
 
 const BasicAuthenticationHeaderRule = DeclarativeNetComponents.BasicAuthenticationHeaderRule;
 const RedirectRule = DeclarativeNetComponents.RedirectRule;
 
-class DesignerLivePreview {
+class DesignerLivePreview extends ServiceWorkerComponent {
   // eslint-disable-next-line no-unused-vars
   constructor(worker) {
-    this.worker = worker;
+    super(worker);
 
     // Set defaukt properties for the class
     this.undoByProjectNames = new Map();
@@ -124,12 +124,12 @@ class DesignerLivePreview {
   modifyUrlForUIPath(url) {
     const fragments = url.pathname.split('/');
     if (fragments[2] !== 'ui') {
-      return resolve(url);
+      return Promise.resolve(url);
     }
     fragments.splice(3, 0, ''); // Insert an empty string after 'ui'
     const newUrl = new URL(url);
     newUrl.pathname = fragments.join('/');
-    return resolve(newUrl);
+    return Promise.resolve(newUrl);
   }
 
   toggle(projectName) {

src/main/desktop-notifier.js

@@ -15,11 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import ServiceWorkerComponent from './service-worker-component';
+
 const namespacedIdOf = (id) => `nuxeo-web-extension-${id}`;
 
-class DesktopNotifier {
+class DesktopNotifier extends ServiceWorkerComponent {
   constructor(worker) {
-    this.worker = worker;
+    super(worker);
 
     // Bind methods
     Object.getOwnPropertyNames(Object.getPrototypeOf(this))

src/main/document-browser.js

@@ -1,14 +1,15 @@
 /* eslint-disable comma-dangle */
 import DOMPurify from 'dompurify';
+import ServiceWorkerComponent from './service-worker-component';
 
 const uuidPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 const pathPattern = /^\//;
 const selectFromPattern = /SELECT .* FROM /i;
 const webuiPattern = /nuxeo\/ui\/#!\//;
 
-class DocumentBrowser {
+class DocumentBrowser extends ServiceWorkerComponent {
   constructor(worker) {
-    this.worker = worker;
+    super(worker);
 
     // Bind methods
     Object.getOwnPropertyNames(Object.getPrototypeOf(this))
@@ -18,7 +19,8 @@ class DocumentBrowser {
       });
   }
 
-  listenToChromeEvents() {
+  // eslint-disable-next-line no-unused-vars
+  activate(self) {
     const cleanupFunctions = [];
 
     chrome.omnibox.onInputEntered.addListener(this.openDocument);
@@ -73,7 +75,7 @@ class DocumentBrowser {
           }
           return `nxdoc/default/${uid}/view_documents`;
         }
-        this.browserNavigator.loadNewExtensionTab(pathOf(doc.uid), true);
+        this.tabNavigationHandler.loadNewExtensionTab(pathOf(doc.uid), true);
       })
       .catch((error) => {
         console.log(error);

src/main/json-highlighter.js

@@ -1,6 +1,10 @@
-class JsonHighlighter {
+import ServiceWorkerComponent from './service-worker-component';
+
+class JsonHighlighter extends ServiceWorkerComponent {
   // eslint-disable-next-line no-unused-vars
   constructor(worker) {
+    super(worker);
+
     this._input = '';
 
     // Bind methods

src/main/main-firefox.js

@@ -28,4 +28,4 @@ console.log(`Service Worker: ${buildTime} - ${buildVersion} - ${browserVendor} -
 const serviceWorker = new ServiceWorker(developmentMode, buildTime, buildVersion, browserVendor);
 
 // eslint-disable-next-line no-unused-vars
-const undoListeningHandler = serviceWorker.listenToChromeEvents();
+const undoListeningHandler = serviceWorker.activate();

src/main/manifest-chrome.json

@@ -13,7 +13,7 @@
   },
   "permissions": [
     "storage",
-    "cookies",
+    "contextMenus",
     "tabs",
     "activeTab",
     "notifications",

src/main/repository-indexer.js

@@ -14,9 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-class RepositoryIndexer {
+import ServiceWorkerComponent from './service-worker-component';
+
+class RepositoryIndexer extends ServiceWorkerComponent {
   constructor(worker) {
-    this.worker = worker;
+    super(worker);
+
     this.waiting = undefined;
 
     // Bind methods

src/main/runtime-build-info.js

@@ -1,17 +1,21 @@
 /* eslint-disable max-classes-per-file */
+import ServiceWorkerComponent from './service-worker-component';
+
+class RuntimeBuildInfo extends ServiceWorkerComponent {
+  constructor(worker, buildTime, buildVersion, browserVendor) {
+    super(worker);
 
-class RuntimeBuildInfo {
-  constructor(buildTime, buildVersion, browserVendor) {
     this._developer = 'NOS Team <nuxeo>';
     this._browserVendor = browserVendor;
     this._buildTime = buildTime;
     this._buildVersion = buildVersion;
 
-    // binds methods to this
-    this.developer = this.developer.bind(this);
-    this.browserVendor = this.browserVendor.bind(this);
-    this.buildTime = this.buildTime.bind(this);
-    this.buildVersion = this.buildVersion.bind(this);
+    // Bind methods
+    Object.getOwnPropertyNames(Object.getPrototypeOf(this))
+      .filter((prop) => typeof this[prop] === 'function' && prop !== 'constructor')
+      .forEach((method) => {
+        this[method] = this[method].bind(this);
+      });
   }
 
   developer() {
@@ -31,8 +35,9 @@ class RuntimeBuildInfo {
   }
 }
 
-class DevelopmentMode {
-  constructor(isEnabled) {
+class DevelopmentMode extends ServiceWorkerComponent {
+  constructor(worker, isEnabled) {
+    super(worker);
     this._isEnabled = isEnabled;
 
     // bind this methods