Merge branch 'v0.3.3'

Author: lrydzkowski

consts.js

@@ -14,7 +14,6 @@ class Consts {
   };
   static messageTypes = {
     gestures: 'gestures',
-    updateStorage: 'updateStorage',
-    getSettings: 'getSettings'
+    updateStorage: 'updateStorage'
   };
 }

content-scripts/canvas-event-handler.js

@@ -5,15 +5,14 @@ class CanvasEventHandler {
   #lineColor = '#000000';
   #lineWidth = 2;
 
-  constructor(canvas) {
+  constructor(canvas, storage) {
     this.#canvas = canvas;
     this.#context = canvas.getContext('2d');
     this.#resetPosition();
     const thisRef = this;
-    chrome.runtime.sendMessage({ type: Consts.messageTypes.getSettings }, function (response) {
-      console.debug(response);
-      thisRef.#lineColor = response?.lineColor ?? '#000000';
-      thisRef.#lineWidth = response?.lineWidth ?? 2;
+    storage.getSettingsAsync().then((settings) => {
+      thisRef.#lineColor = settings?.lineColor ?? '#000000';
+      thisRef.#lineWidth = settings?.lineWidth ?? 2;
     });
   }
 

content-scripts/content-event-handler.js

@@ -50,7 +50,6 @@ class ContentEventHandler {
 
     canvasHandler.removeFromDom();
     const gestures = gesturesHandler.getGestures();
-    console.debug(gestures);
     if (gestures.length === 0) {
       return;
     }

content-scripts/settings-storage.js

@@ -0,0 +1,22 @@
+class SettingsStorage {
+  #settingsStorageKey = 'simpleMouseGesturesSettings';
+
+  async getSettingsAsync() {
+    const settings = await this.#getFromStorageAsync(this.#settingsStorageKey);
+
+    return { ...settings };
+  }
+
+  async #getFromStorageAsync(storageKey) {
+    const value = await chrome.storage.local.get([storageKey]);
+    if (!value.hasOwnProperty(storageKey)) {
+      return;
+    }
+
+    try {
+      return JSON.parse(value[storageKey]);
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}

content.js

@@ -1,7 +1,8 @@
 const gesturesHandler = new GesturesHandler();
 const canvasBuilder = new CanvasBuilder();
 const canvas = canvasBuilder.build();
-const canvasEventHandler = new CanvasEventHandler(canvas);
+const storage = new SettingsStorage();
+const canvasEventHandler = new CanvasEventHandler(canvas, storage);
 canvasEventHandler.registerEvent();
 const canvasHandler = new CanvasHandler(canvasEventHandler, canvas);
 const contentEventHandler = new ContentEventHandler(gesturesHandler, canvasHandler);

manifest.json

@@ -2,8 +2,8 @@
   "manifest_version": 3,
   "name": "Simple Mouse Gestures",
   "description": "Extension that provides the ability to define mouse gestures that will run specific actions in your Google Chrome browser",
-  "version": "0.3.2",
-  "version_name": "0.3.2 beta",
+  "version": "0.3.3",
+  "version_name": "0.3.3 beta",
   "icons": {
     "16": "images/icon-16.png",
     "32": "images/icon-32.png",
@@ -19,6 +19,7 @@
         "content-scripts/canvas-builder.js",
         "content-scripts/canvas-event-handler.js",
         "content-scripts/canvas-handler.js",
+        "content-scripts/settings-storage.js",
         "content-scripts/content-event-handler.js",
         "content.js"
       ],

service-worker-scripts/operation-resolver.js

@@ -66,10 +66,8 @@ export class OperationResolver {
 
   async resolveAsync(gestures) {
     const serializedGestures = this.#serializeGestures(gestures);
-    console.debug(serializedGestures);
 
     const operationKey = this.#storage.getOperationKey(serializedGestures);
-    console.debug(operationKey);
     if (operationKey === undefined) {
       return;
     }
@@ -79,7 +77,6 @@ export class OperationResolver {
     }
 
     const element = OperationResolver.operations[operationKey];
-    console.debug(element);
     await element.operation.doAsync();
   }
 

service-worker-scripts/operations/go-back-operation.js

@@ -3,7 +3,7 @@ export class GoBackOperation {
     try {
       await chrome.tabs.goBack();
     } catch (error) {
-      console.debug(error);
+      console.error(error);
     }
   }
 }

service-worker-scripts/operations/go-forward-operation.js

@@ -3,7 +3,7 @@ export class GoForwardOperation {
     try {
       await chrome.tabs.goForward();
     } catch (error) {
-      console.debug(error);
+      console.error(error);
     }
   }
 }

service-worker-scripts/storage.js

@@ -40,7 +40,6 @@ export class Storage {
   }
 
   async #initMapAsync() {
-    console.log('initMapAsync');
     const map = await this.#getFromStorageAsync(this.#mapStorageKey);
     if (map !== undefined) {
       this.#map = map;
@@ -66,8 +65,6 @@ export class Storage {
 
   async #getFromStorageAsync(storageKey) {
     const value = await chrome.storage.local.get([storageKey]);
-    console.log('getFromStorage');
-    console.debug(value);
     if (!value.hasOwnProperty(storageKey)) {
       return;
     }
@@ -82,7 +79,6 @@ export class Storage {
   async #saveInStorageAsync(storageKey, data) {
     const obj = {};
     obj[storageKey] = JSON.stringify(data);
-    console.log(obj);
     await chrome.storage.local.set(obj);
   }
 }