Webextension ready (#22)

* Fix messaging, make compatible with webext
* Fix `updateHistoryUrls` action handling

app/services/cliqz.js

@@ -5,24 +5,42 @@ import spanan from 'npm:spanan';
 
 const Spanan = spanan.default;
 
+function createSpananForModule(moduleName) {
+  const spanan = new Spanan(({ uuid, action, args }) => {
+    const message = {
+      module: moduleName,
+      action,
+      requestId: uuid,
+      args
+    };
+    const onResponse = (response) => {
+      if (!response) {
+        return;
+      }
+      spanan.handleMessage({
+        uuid,
+        response: response.response
+      });
+    };
+
+    const promise = chrome.runtime.sendMessage(message, onResponse);
+
+    if (promise && promise.then) {
+      promise.then(onResponse);
+    }
+  });
+
+  return spanan;
+}
+
 export default Ember.Service.extend({
   historySync: Ember.inject.service('history-sync'),
 
   init() {
     this._super(...arguments);
 
-    const history = new Spanan(({ uuid, action, args }) => {
-      const message = {
-        target: 'cliqz',
-        module: 'history',
-        action,
-        requestId: uuid,
-        args,
-      };
-      chrome.runtime.sendMessage(message);
-    });
+    const history = createSpananForModule('history');
     const historyProxy = history.createProxy();
-
     this.deleteVisit = historyProxy.deleteVisit;
     this.deleteVisits = historyProxy.deleteVisits;
     this.showHistoryDeletionPopup = historyProxy.showHistoryDeletionPopup;
@@ -34,30 +52,19 @@ export default Ember.Service.extend({
     this.openUrl = historyProxy.openUrl;
     this.selectTabAtIndex = historyProxy.selectTabAtIndex;
 
-    const core = new Spanan(({ uuid, action, args }) => {
-      const message = {
-        target: 'cliqz',
-        module: 'core',
-        action,
-        requestId: uuid,
-        args,
-      };
-      chrome.runtime.sendMessage(message);
-    });
+    const core = createSpananForModule('core');
     const coreProxy = core.createProxy();
-
     this.getCliqzStatus = coreProxy.status;
     this.queryCliqz = coreProxy.queryCliqz;
     this.redoQuery = coreProxy.redoQuery;
     this.sendTelemetry = coreProxy.sendTelemetry;
     this.openFeedbackPage = coreProxy.openFeedbackPage;
 
-
-    chrome.runtime.onMessage.addListener(message => {
+    chrome.runtime.onMessage.addListener((message) => {
       if(message.action === "updateHistoryUrls" && message.message) {
         this.get('historySync').updateHistoryUrls(message.message.urls);
       }
-
+  
       if (message.response) {
         const spananMessage = {
           uuid: message.requestId,
@@ -68,5 +75,4 @@ export default Ember.Service.extend({
       }
     });
   },
-
 });

config/environment.js

@@ -50,7 +50,7 @@ module.exports = function(environment) {
   }
 
   if (environment === 'production') {
-    ENV.rootURL = 'resource://cliqz/cliqz-history/';
+    ENV.rootURL = '';
   }
 
   return ENV;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cliqz-history",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "description": "",
   "license": "MPL-2.0",
   "author": "",
@@ -11,6 +11,7 @@
   "repository": "",
   "scripts": {
     "build": "ember build --environment production",
+    "build-watch": "ember build --environment production --watch",
     "start": "ember server -p 3000",
     "test": "ember test"
   },