Fix option intializtion order

Author: Jyyjy

build/UserALEWebExtension/background.js

@@ -29,7 +29,7 @@ function _typeof(o) {
   }, _typeof(o);
 }
 
-var version = "2.4.0";
+var version$1 = "2.4.0";
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1019,7 +1019,7 @@ var started = false;
 
 // Start up Userale
 config.on = false;
-config.useraleVersion = version;
+config.useraleVersion = version$1;
 configure(config, getInitialSettings());
 initPackager(logs, config);
 if (config.autostart) {
@@ -1052,6 +1052,9 @@ function setup(config) {
   }
 }
 
+// Export the Userale API
+var version = version$1;
+
 /**
  * Updates the current configuration
  * object with the provided values.
@@ -1119,8 +1122,18 @@ var browser = browser || chrome;
  * limitations under the License.
  */
 
-browser.storage.local.get("useraleConfig", function (res) {
-  options(res.config);
+
+// Initalize userale plugin options
+var defaultConfig = {
+  useraleConfig: {
+    url: 'http://localhost:8000',
+    userId: 'pluginUser',
+    toolName: 'useralePlugin',
+    version: version
+  }
+};
+browser.storage.local.get(defaultConfig, function (res) {
+  options(res.useraleConfig);
 });
 function dispatchTabMessage(message) {
   browser.tabs.query({}, function (tabs) {
@@ -1135,6 +1148,8 @@ browser.runtime.onMessage.addListener(function (message) {
       options(message.payload);
       dispatchTabMessage(message);
       break;
+
+    // Handles logs rerouted from content and option scripts 
     case ADD_LOG:
       log(message.payload);
       break;
@@ -1151,7 +1166,7 @@ function packageTabLog(tabId, data, type) {
 }
 function packageDetailedTabLog(tab, data, type) {
   Object.assign(data, {
-    'type': type
+    'tabEvent': type
   });
   packageCustomLog(data, function () {
     return tab;

build/UserALEWebExtension/content.js

@@ -1100,6 +1100,7 @@ function options(newConfig) {
 // browser is defined in firefox, but chrome uses the 'chrome' global.
 var browser = browser || chrome;
 function rerouteLog(log) {
+  console.log(log);
   browser.runtime.sendMessage({
     type: ADD_LOG,
     payload: log
@@ -1127,7 +1128,7 @@ function rerouteLog(log) {
  */
 
 browser.storage.local.get("useraleConfig", function (res) {
-  options(res.config);
+  options(res.useraleConfig);
   addCallbacks({
     reroute: rerouteLog
   });