From ff6a092eccfd196326ba498c9b0a9ffcbe283abe Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Wed, 27 Dec 2017 20:19:41 -0500
Subject: [PATCH] extract whisper

---
 js/embark.js           | 83 +++++++++++++++---------------------------
 js/embarkjs/whisper.js | 52 ++++++++++++++++++++++++--
 2 files changed, 78 insertions(+), 57 deletions(-)

diff --git a/js/embark.js b/js/embark.js
index 83c41d909..d4e9b0c31 100644
--- a/js/embark.js
+++ b/js/embark.js
@@ -238,65 +238,42 @@ EmbarkJS.Messages.isNewWeb3 = function() {
   return parseInt(_web3.version.api.split('.')[0], 10) >= 1;
 };
 
-EmbarkJS.Messages.getWhisperVersion = function(cb) {
-  if (this.isNewWeb3()) {
-    this.currentMessages.web3.shh.getVersion(function(err, version) {
-      cb(err, version);
-    });
-  } else {
-    this.currentMessages.web3.version.getWhisper(function(err, res) {
-      cb(err, web3.version.whisper);
-    });
-  }
+EmbarkJS.Messages.Providers = {};
+
+EmbarkJS.Messages.registerProvider = function(providerName, obj) {
+  EmbarkJS.Messages.Providers[providerName] = obj;
 };
 
 EmbarkJS.Messages.setProvider = function(provider, options) {
     var self = this;
     var ipfs;
-    if (provider === 'whisper') {
-        this.providerName = 'whisper';
-        this.currentMessages = EmbarkJS.Messages.Whisper;
-        let provider;
-        if (options === undefined) {
-            provider = "localhost:8546";
-        } else {
-            provider = options.server + ':' + options.port;
-        }
-        if (this.isNewWeb3()) {
-          self.currentMessages.web3 = new Web3(new Web3.providers.WebsocketProvider("ws://" + provider));
-        } else {
-          self.currentMessages.web3 = new Web3(new Web3.providers.HttpProvider("http://" + provider));
-        }
-        self.getWhisperVersion(function(err, version) {
-            if (err) {
-                console.log("whisper not available");
-            } else if (version >= 5) {
-                if (self.web3CompatibleWithV5()) {
-                  self.currentMessages.web3.shh.newSymKey().then((id) => {self.currentMessages.symKeyID = id;});
-                  self.currentMessages.web3.shh.newKeyPair().then((id) => {self.currentMessages.sig = id;});
-                } else {
-                  console.log("this version of whisper in this node");
-                }
-            } else {
-                self.currentMessages.identity = self.currentMessages.web3.shh.newIdentity();
-            }
-            self.currentMessages.whisperVersion = self.currentMessages.web3.version.whisper;
-        });
-    } else if (provider === 'orbit') {
-        this.providerName = 'orbit';
-        this.currentMessages = EmbarkJS.Messages.Orbit;
-        if (options === undefined) {
-            ipfs = HaadIpfsApi('localhost', '5001');
-        } else {
-            ipfs = HaadIpfsApi(options.host, options.port);
-        }
-        this.currentMessages.orbit = new Orbit(ipfs);
-        if (typeof(web3) === "undefined") {
-          this.currentMessages.orbit.connect(Math.random().toString(36).substring(2));
-        } else {
-          this.currentMessages.orbit.connect(web3.eth.accounts[0]);
-        }
+  if (provider === 'whisper') {
+    let provider = this.Providers[provider];
+
+    if (!provider) {
+      throw new Error('Unknown storage provider');
+    } 
+
+    this.currentMessages = provider;
+
+    return provider.setProvider(options);
+
+  } else if (provider === 'orbit') {
+
+    this.providerName = 'orbit';
+    this.currentMessages = EmbarkJS.Messages.Orbit;
+    if (options === undefined) {
+      ipfs = HaadIpfsApi('localhost', '5001');
     } else {
+      ipfs = HaadIpfsApi(options.host, options.port);
+    }
+    this.currentMessages.orbit = new Orbit(ipfs);
+    if (typeof(web3) === "undefined") {
+      this.currentMessages.orbit.connect(Math.random().toString(36).substring(2));
+    } else {
+      this.currentMessages.orbit.connect(web3.eth.accounts[0]);
+    }
+  } else {
         throw Error('Unknown message provider');
     }
 };
diff --git a/js/embarkjs/whisper.js b/js/embarkjs/whisper.js
index 51ff36fc5..70d2244b9 100644
--- a/js/embarkjs/whisper.js
+++ b/js/embarkjs/whisper.js
@@ -1,6 +1,48 @@
-EmbarkJS.Messages.Whisper = {};
+let __embarkWhisper = {};
 
-EmbarkJS.Messages.Whisper.sendMessage = function(options) {
+__embarkWhisper.setProvider = function(options) {
+  const self = this;
+  let provider;
+  if (options === undefined) {
+    provider = "localhost:8546";
+  } else {
+    provider = options.server + ':' + options.port;
+  }
+  if (EmbarkJS.isNewWeb3()) {
+    self.web3 = new Web3(new Web3.providers.WebsocketProvider("ws://" + provider));
+  } else {
+    self.web3 = new Web3(new Web3.providers.HttpProvider("http://" + provider));
+  }
+  self.getWhisperVersion(function(err, version) {
+    if (err) {
+      console.log("whisper not available");
+    } else if (version >= 5) {
+      if (self.web3CompatibleWithV5()) {
+        self.web3.shh.newSymKey().then((id) => {self.currentMessages.symKeyID = id;});
+        self.web3.shh.newKeyPair().then((id) => {self.currentMessages.sig = id;});
+      } else {
+        console.log("this version of whisper in this node");
+      }
+    } else {
+      self.currentMessages.identity = self.currentMessages.web3.shh.newIdentity();
+    }
+    self.currentMessages.whisperVersion = self.currentMessages.web3.version.whisper;
+  });
+};
+
+__embarkWhisper.getWhisperVersion = function(cb) {
+  if (this.isNewWeb3()) {
+    this.currentMessages.web3.shh.getVersion(function(err, version) {
+      cb(err, version);
+    });
+  } else {
+    this.currentMessages.web3.version.getWhisper(function(err, res) {
+      cb(err, web3.version.whisper);
+    });
+  }
+};
+
+__embarkWhisper.sendMessage = function(options) {
   var topics, data, ttl, priority, payload;
   if (EmbarkJS.Messages.isNewWeb3()) {
     topics = options.topic || options.topics;
@@ -67,11 +109,11 @@ EmbarkJS.Messages.Whisper.sendMessage = function(options) {
       priority: priority
     };
 
-    return EmbarkJS.Messages.currentMessages.web3.shh.post(message, function() { });
+    return this.web3.shh.post(message, function() { });
   }
 };
 
-EmbarkJS.Messages.Whisper.listenTo = function(options) {
+__embarkWhisper.listenTo = function(options) {
   var topics, _topics, messageEvents;
   if (EmbarkJS.Messages.isNewWeb3()) {
     messageEvents = function() {
@@ -175,3 +217,5 @@ EmbarkJS.Messages.Whisper.listenTo = function(options) {
     return promise;
   }
 };
+
+EmbarkJS.Storage.registerProvider('whisper', __embarkWhisper);