X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=processor.py;h=3761332fac8d556cb98a1c87be30276744cf3612;hb=5f23ed78162f41e990cb3fcb30e9606a15a8d3a6;hp=40054082f3b24eacdeefa6aade193be4a9e2a1e7;hpb=ec5f0c1796f754a1831c48daadae4c24b81d430b;p=electrum-server.git

diff --git a/processor.py b/processor.py
index 4005408..3761332 100644
--- a/processor.py
+++ b/processor.py
@@ -35,14 +35,25 @@ class Processor(threading.Thread):
         threading.Thread.__init__(self)
         self.daemon = True
         self.dispatcher = None
+        self.queue = queue.Queue()
 
     def process(self, request):
         pass
 
     def push_response(self, response):
-        print "response", response
+        #print "response", response
         self.dispatcher.request_dispatcher.push_response(response)
 
+    def run(self):
+        while not self.shared.stopped():
+            request = self.queue.get(10000000000)
+            try:
+                self.process(request)
+            except:
+                traceback.print_exc(file=sys.stdout)
+
+        print "processor terminating"
+            
 
 
 class Dispatcher:
@@ -89,6 +100,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)
@@ -105,39 +121,59 @@ class RequestDispatcher(threading.Thread):
             raise TypeError("self.shared not set in Processor")
         while not self.shared.stopped():
             session, request = self.pop_request()
-            self.process(session, request)
+            try:
+                self.do_dispatch(session, request)
+            except:
+                traceback.print_exc(file=sys.stdout)
+                
 
         self.stop()
 
     def stop(self):
         pass
 
-    def process(self, session, request):
+    def do_dispatch(self, session, request):
+        """ dispatch request to the relevant processor """
+
         method = request['method']
         params = request.get('params',[])
-
         suffix = method.split('.')[-1]
+
+        try:
+            is_new = float(session.version) >= 1.3
+        except:
+            is_new = False
+
+        if is_new and method == 'blockchain.address.get_history': 
+            method = 'blockchain.address.get_history2'
+            request['method'] = method
+
         if suffix == 'subscribe':
+            if is_new and method == 'blockchain.address.subscribe': 
+                method = 'blockchain.address.subscribe2'
+                request['method'] = method
+
             session.subscribe_to_service(method, params)
 
         # store session and id locally
         request['id'] = self.store_session_id(session, request['id'])
 
-        # dispatch request to the relevant module..
         prefix = request['method'].split('.')[0]
         try:
             p = self.processors[prefix]
         except:
             print "error: no processor for", prefix
             return
-        try:
-            p.process(request)
-        except:
-            traceback.print_exc(file=sys.stdout)
+
+        p.queue.put(request)
 
         if method in ['server.version']:
             session.version = params[0]
 
+    def get_sessions(self):
+        with self.lock:
+            r = self.sessions[:]
+        return r
 
     def add_session(self, session):
         with self.lock:
@@ -164,20 +200,24 @@ class Session:
         self.subscriptions = []
         self.address = ''
         self.name = ''
-        #threading.Timer(2, self.info).start()
+        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 sub in self.subscriptions:
-            print sub
-            method, params = sub
+            #print sub
+            method = sub[0]
             if method == 'blockchain.address.subscribe':
-                addr = params[0]
+                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:
@@ -186,14 +226,17 @@ class Session:
     def subscribe_to_service(self, method, params):
         subdesc = self.build_subdesc(method, params)
         with self.lock:
-            self.subscriptions.append(subdesc)
+            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.get_history":
+        elif method == "blockchain.headers.subscribe":
+            return method,
+        elif method in ["blockchain.address.subscribe", "blockchain.address.subscribe2"]:
             if not params:
                 return None
             else:
@@ -225,11 +268,14 @@ class ResponseDispatcher(threading.Thread):
         method = response.get('method')
         params = response.get('params')
 
+        if method == "blockchain.address.subscribe2":
+            method = "blockchain.address.subscribe"
+
         # A notification
-        if internal_id is None and method is not None and params is not None:
+        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:
+        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
@@ -244,6 +290,9 @@ class ResponseDispatcher(threading.Thread):
 
     def send_response(self, internal_id, response):
         session, message_id = self.processor.get_session_id(internal_id)
-        response['id'] = message_id
-        session.send_response(response)
+        if session:
+            response['id'] = message_id
+            session.send_response(response)
+        else:
+            print "send_response: no session", message_id, internal_id, response