X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=processor.py;h=dfe61285ba17a63206aad8821086aa87284cade4;hb=827d26f24ef2148c4eb22bab764a7b2798233334;hp=503492dead4a2f52a6f41e7a0ede4543f2f7b2ce;hpb=44b9b864a61e6d40575abe363e6f4cccf49f7613;p=electrum-server.git

diff --git a/processor.py b/processor.py
index 503492d..dfe6128 100644
--- a/processor.py
+++ b/processor.py
@@ -35,14 +35,28 @@ class Processor(threading.Thread):
         threading.Thread.__init__(self)
         self.daemon = True
         self.dispatcher = None
+        self.queue = queue.Queue()
 
     def process(self, request):
         pass
 
+    def add_request(self, request):
+        self.queue.put(request)
+
     def push_response(self, 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 +103,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 +124,60 @@ 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]
+
+        is_new = session.protocol_version >= 0.5
+
+        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.add_request(request)
 
         if method in ['server.version']:
             session.version = params[0]
+            try:
+                session.protocol_version = float(params[1])
+            except:
+                pass
 
+    def get_sessions(self):
+        with self.lock:
+            r = self.sessions[:]
+        return r
 
     def add_session(self, session):
         with self.lock:
@@ -165,6 +205,8 @@ class Session:
         self.address = ''
         self.name = ''
         self.version = 'unknown'
+        self.protocol_version = 0.
+        self.time = time.time()
         threading.Timer(2, self.info).start()
 
     # Debugging method. Doesn't need to be threadsafe.
@@ -197,7 +239,9 @@ class Session:
     def build_subdesc(method, params):
         if method == "blockchain.numblocks.subscribe":
             return method,
-        elif method == "blockchain.address.subscribe":
+        elif method == "blockchain.headers.subscribe":
+            return method,
+        elif method in ["blockchain.address.subscribe", "blockchain.address.subscribe2"]:
             if not params:
                 return None
             else:
@@ -244,10 +288,15 @@ class ResponseDispatcher(threading.Thread):
             if session.stopped():
                 continue
             if session.contains_subscription(subdesc):
+                if response.get('method') == "blockchain.address.subscribe2":
+                    response['method'] = "blockchain.address.subscribe"
                 session.send_response(response)
 
     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