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

diff --git a/processor.py b/processor.py
index 20fdbfd..c6972f8 100644
--- a/processor.py
+++ b/processor.py
@@ -13,6 +13,15 @@ def timestr():
     return time.strftime("[%d/%m/%Y-%H:%M:%S]")
 
 
+print_lock = threading.Lock()
+def print_log(*args):
+    args = [str(item) for item in args]
+    with print_lock:
+        sys.stderr.write(" ".join(args) + "\n")
+        sys.stderr.flush()
+
+
+
 class Shared:
 
     def __init__(self):
@@ -20,7 +29,7 @@ class Shared:
         self._stopped = False
 
     def stop(self):
-        print "Stopping Stratum"
+        print_log( "Stopping Stratum" )
         with self.lock:
             self._stopped = True
 
@@ -35,14 +44,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_log( "processor terminating")
+            
 
 
 class Dispatcher:
@@ -110,39 +133,64 @@ 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
+            print_log( "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
+
+            #if session.protocol_version < 0.6:
+            #    print_log("stopping session from old client", session.protocol_version)
+            #    session.stop()
 
+    def get_sessions(self):
+        with self.lock:
+            r = self.sessions[:]
+        return r
 
     def add_session(self, session):
         with self.lock:
@@ -170,6 +218,7 @@ class Session:
         self.address = ''
         self.name = ''
         self.version = 'unknown'
+        self.protocol_version = 0.
         self.time = time.time()
         threading.Timer(2, self.info).start()
 
@@ -185,8 +234,7 @@ class Session:
             addr = None
 
         if self.subscriptions:
-            print timestr(), self.name, self.address, addr,\
-                len(self.subscriptions), self.version
+            print_log( timestr(), self.name, self.address, addr, len(self.subscriptions), self.version )
 
     def stopped(self):
         with self.lock:
@@ -203,7 +251,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:
@@ -242,7 +292,7 @@ class ResponseDispatcher(threading.Thread):
         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
+            print_log( "no method", response)
 
     def notification(self, method, params, response):
         subdesc = Session.build_subdesc(method, params)
@@ -250,6 +300,8 @@ 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):
@@ -258,5 +310,5 @@ class ResponseDispatcher(threading.Thread):
             response['id'] = message_id
             session.send_response(response)
         else:
-            print "send_response: no session", message_id, internal_id, response
+            print_log( "send_response: no session", message_id, internal_id, response )