make the mixer connect to the CoinJoin channel in the lobby if it's i…

…n mixing state.
darkwallet · Apr 8, 2014 · 5d986ca · 5d986ca
1 parent 8618a6d
commit 5d986ca
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 25 deletions.
diff --git a/js/backend/services/lobby.js b/js/backend/services/lobby.js
@@ -4,6 +4,7 @@ function(Services, Transport, Channel) {
 
   function LobbyService(core) {
     var lobbyTransport;
+    var self = this;
 
      // Transport service managing background lobby transport
     Services.start('lobby',
@@ -18,14 +19,20 @@ function(Services, Transport, Channel) {
       }, function(port) {
          // Connected
          console.log('bus: lobby client connected');
-         if (!lobbyTransport) {
-             console.log('init lobby transport');
-             var identity = core.getCurrentIdentity();
-             lobbyTransport = new Transport(identity, core.getObeliskClient());
-             lobbyTransport.update = function() { Services.post('gui', {'type': 'update'}) };
-       }
+
+         // Ensure the lobby transport is created
+         self.getLobbyTransport();
     });
-    this.getLobbyTransport = function() { return lobbyTransport; }
+
+    this.getLobbyTransport = function() {
+      if (!lobbyTransport) {
+        console.log('[lobby] init lobby transport');
+        var identity = core.getCurrentIdentity();
+        lobbyTransport = new Transport(identity, core.getObeliskClient());
+        lobbyTransport.update = function() { Services.post('gui', {'type': 'update'}) };
+      }
+      return lobbyTransport;
+    }
   }
 
   return LobbyService;

diff --git a/js/backend/services/mixer.js b/js/backend/services/mixer.js
@@ -1,35 +1,60 @@
-define(['backend/services'],
-function(Services) {
+define(['backend/services', 'backend/channels/catchan'],
+function(Services, Channel) {
   'use strict';
+
+  /*
+   * Service managing mixing.
+   * @constructor
+   */
   function MixerService(core) {
     var self = this;
+    this.core = core;
 
     // Port for communication with other services
     Services.connect('obelisk', function(data) {
       // WakeUp when connected to obelisk
       if (data.type == 'connected') {
-        var client = core.getClient();
-        var identity = core.getCurrentIdentity();
-
-        // Check to see we have anything to mix
-        var anyMixing = false;
-        identity.wallet.pockets.forEach(function(pocket) {
-          if (pocket.mixing) {
-            anyMixing = true;
-          }
-        });
-
-        // If any is mixing make sure we are connected
-        if (anyMixing) {
-          self.connectMixer();
-        }
+        self.onConnect(data);
       }
 
     });
   }
 
-  MixerService.prototype.connectMixer = function() {
+  /*
+   * React to a new obelisk connection
+   */
+  MixerService.prototype.onConnect = function() {
+    var client = this.core.getClient();
+    var identity = this.core.getCurrentIdentity();
+
+    // Check to see we have anything to mix
+    var anyMixing = false;
+    identity.wallet.pockets.forEach(function(pocket) {
+      if (pocket.mixing) {
+        anyMixing = true;
+      }
+    });
+
+    // If any is mixing make sure we are connected
+    if (anyMixing) {
+      this.ensureMixing();
+    }
+  }
+
+  /*
+   * Initialize the mixer connection
+   */
+  MixerService.prototype.ensureMixing = function() {
     console.log("[mixer] Connect...");
+    var lobbyTransport = this.core.getLobbyTransport();
+    var channel = lobbyTransport.initChannel('CoinJoin', Channel);
+    channel.addCallback('lobby', function(data) { self.onLobbyMessage(data); })
+  }
+
+  /*
+   * Lobby message arrived
+   */
+  MixerService.prototype.onLobbyMessage = function(data) {
   }
 
   return MixerService;