Code polishing

Added storage versioning for cleaner upgrades in the future

Convert all promise usage into async/await

Perform initialization based on runtime event, not when opening preferences page (every time at that!)

Improve input validation checks

Fix name edit box size

Author: drcheap

background.js

@@ -1,22 +1,68 @@
-function handleCommand(command)
+const STORAGE_VERSION = 2;
+
+async function initialize(details)
 {
-   console.log("(background) handling command: " + command);
+   console.log("(init) Initializing...");
 
-   if(command.startsWith(PREFIX_PRESET))
+   // Preset initialization, if needed
+   let storage = await browser.storage.local.get(["presets","version"]);
+
+   if(!Array.isArray(storage.presets))
+   {
+      console.log("(init) No presets found, initializing...");
+      storage.presets = [];
+      await browser.storage.local.set({"presets": storage.presets});
+   }
+   else
    {
-      browser.storage.local.get("presets").then((obj) => {
-         if(obj != undefined)
+      if(storage.version === undefined)
+      {
+         // Had non-versioned preset storage, so treat it as version 1
+         storage.version = 1;
+      }
+   }
+
+   if(Number.isInteger(storage.version))
+   {
+      if(storage.version < STORAGE_VERSION)
+      {
+         // Storage is old, do any necessary upgrades to remain compatible
+
+         if(storage.version == 1)
          {
-            let presets = obj.presets;
-            let presetNum = parseInt(command.substring(PREFIX_PRESET.length));
-            if(presetNum <= presets.length)
-            {
-               let presetId = presets[presetNum - 1].id;
-               applyPreset(presetId);
-            }
+            console.log("(update) Migrating storage from version 1 to 2...");
+            await browser.storage.local.set({"version": 2});
+            storage.version = 2;
          }
-      });
+
+         // (future storage updates here)
+      }
+   }
+   else
+   {
+      console.log("(init) No storage version tag found, initializing...");
+      await browser.storage.local.set({"version": STORAGE_VERSION});
+   }
+
+   console.log("(init) Initialization complete, " + storage.presets.length + " presets found");
+}
+
+async function handleCommand(command)
+{
+   console.log("(background) handling command: " + command);
+
+   if(command.startsWith(PREFIX_PRESET))
+   {
+      let presetNum = parseInt(command.substring(PREFIX_PRESET.length));
+      let storage = await browser.storage.local.get("presets");
+      let presets = storage.presets;
+      if(presetNum <= presets.length)
+      {
+         let presetId = presets[presetNum - 1].id;
+         applyPreset(presetId);
+      }
    }
 }
 
+browser.runtime.onInstalled.addListener(initialize);
 browser.commands.onCommand.addListener(handleCommand);

common.js

@@ -1,26 +1,22 @@
 const PREFIX_PRESET = "preset-";
 
-function applyPreset(presetId)
+async function applyPreset(presetId)
 {
    console.log("(common) applying preset: " + presetId);
 
-   browser.storage.local.get("presets").then((obj) => {
-      if(obj != undefined)
+   let storage = await browser.storage.local.get("presets");
+   let presets = storage.presets;
+   for(let i = 0;i < presets.length;i++)
+   {
+      if(presets[i].id == presetId)
       {
-         let presets = obj.presets;
-         for(let i = 0;i < presets.length;i++)
-         {
-            if(presets[i].id == presetId)
-            {
-               resizeWindow(presets[i].width,presets[i].height);
-               break;
-            }
-         }
+         resizeWindow(presets[i].width,presets[i].height);
+         break;
       }
-   });
+   }
 }
 
-function resizeWindow(newWidth, newHeight)
+async function resizeWindow(newWidth, newHeight)
 {
    console.log("(common) resizing to: " + newWidth + "x" + newHeight);
 
@@ -29,7 +25,6 @@ function resizeWindow(newWidth, newHeight)
       "height": parseInt(newHeight)
    };
 
-   browser.windows.getCurrent().then((currentWindow) => {
-      browser.windows.update(currentWindow.id, updateInfo);
-   });
+   let currentWindow = await browser.windows.getCurrent();
+   browser.windows.update(currentWindow.id, updateInfo);
 }

manifest.json

@@ -1,7 +1,7 @@
 {
    "manifest_version": 2,
    "name": "WindowSizer",
-   "version": "0.6.1",
+   "version": "0.7.0",
    "author": "Dr. Cheap",
    "description": "Quickly resize the window to one of your favorite sizes",
    "homepage_url": "https://addons.mozilla.org/firefox/addon/windowsizer",