X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=processor.py;h=20fdbfd7e26b914c1be6a7157195a46cabe0a11f;hb=3051f46df11fc6c9ebe321c9ef6d726e65310129;hp=446c37fc3e49ab65e066429e6681b1afdc37853c;hpb=27bd2d1754b5949678d1ee7ff5efad4b3c8bef6f;p=electrum-server.git

diff --git a/processor.py b/processor.py
index 446c37f..20fdbfd 100644
--- a/processor.py
+++ b/processor.py
@@ -40,8 +40,8 @@ class Processor(threading.Thread):
         pass
 
     def push_response(self, response):
-        print "response", response
-        #self.dispatcher.request_dispatcher.push_response(response)
+        #print "response", response
+        self.dispatcher.request_dispatcher.push_response(response)
 
 
 
@@ -51,7 +51,8 @@ class Dispatcher:
         self.shared = Shared()
         self.request_dispatcher = RequestDispatcher(self.shared)
         self.request_dispatcher.start()
-        self.response_dispatcher = ResponseDispatcher(self.shared, self.request_dispatcher)
+        self.response_dispatcher = \
+            ResponseDispatcher(self.shared, self.request_dispatcher)
         self.response_dispatcher.start()
 
     def register(self, prefix, processor):
@@ -88,6 +89,11 @@ class RequestDispatcher(threading.Thread):
     def pop_request(self):
         return self.request_queue.get()
 
+    def get_session_by_address(self, address):
+        for x in self.sessions:
+            if x.address == address:
+                return x
+
     def get_session_id(self, internal_id):
         with self.lock:
             return self.internal_ids.pop(internal_id)
@@ -163,25 +169,51 @@ class Session:
         self.subscriptions = []
         self.address = ''
         self.name = ''
+        self.version = 'unknown'
+        self.time = time.time()
         threading.Timer(2, self.info).start()
 
+    # Debugging method. Doesn't need to be threadsafe.
     def info(self):
-        for s in self.subscriptions:
-            m, p = s
-            if m == 'blockchain.address.subscribe':
-                addr = p[0]
+        for sub in self.subscriptions:
+            #print sub
+            method = sub[0]
+            if method == 'blockchain.address.subscribe':
+                addr = sub[1]
                 break
         else:
             addr = None
-        print timestr(), self.name, self.address, addr, len(self.subscriptions), self.version
+
+        if self.subscriptions:
+            print timestr(), self.name, self.address, addr,\
+                len(self.subscriptions), self.version
 
     def stopped(self):
         with self.lock:
             return self._stopped
 
     def subscribe_to_service(self, method, params):
+        subdesc = self.build_subdesc(method, params)
+        with self.lock:
+            if subdesc is not None:
+                self.subscriptions.append(subdesc)
+
+    # subdesc = A subscription description
+    @staticmethod
+    def build_subdesc(method, params):
+        if method == "blockchain.numblocks.subscribe":
+            return method,
+        elif method == "blockchain.address.subscribe":
+            if not params:
+                return None
+            else:
+                return method, params[0]
+        else:
+            return None
+
+    def contains_subscription(self, subdesc):
         with self.lock:
-            self.subscriptions.append((method, params))
+            return subdesc in self.subscriptions
     
 
 class ResponseDispatcher(threading.Thread):
@@ -194,25 +226,37 @@ class ResponseDispatcher(threading.Thread):
 
     def run(self):
         while not self.shared.stopped():
-            response = self.processor.pop_response()
-            #print "pop response", response
-            internal_id = response.get('id')
-            params = response.get('params', [])
-
-            # This is wrong. "params" and "method" should never
-            # be in a response.
-            if internal_id is None:
-                method = response.get('method')
-                if method is None:
-                    print "no method", response
-                    continue
-                for session in self.processor.sessions:
-                    if not session.stopped():
-                        if (method,params) in session.subscriptions:
-                            session.send_response(response)
+            self.update()
+
+    def update(self):
+        response = self.processor.pop_response()
+        #print "pop response", response
+        internal_id = response.get('id')
+        method = response.get('method')
+        params = response.get('params')
+
+        # A notification
+        if internal_id is None: # and method is not None and params is not None:
+            self.notification(method, params, response)
+        # A response
+        elif internal_id is not None: # and method is None and params is None:
+            self.send_response(internal_id, response)
+        else:
+            print "no method", response
+
+    def notification(self, method, params, response):
+        subdesc = Session.build_subdesc(method, params)
+        for session in self.processor.sessions:
+            if session.stopped():
                 continue
+            if session.contains_subscription(subdesc):
+                session.send_response(response)
 
-            session, message_id = self.processor.get_session_id(internal_id)
+    def send_response(self, internal_id, response):
+        session, message_id = self.processor.get_session_id(internal_id)
+        if session:
             response['id'] = message_id
             session.send_response(response)
+        else:
+            print "send_response: no session", message_id, internal_id, response