X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=processor.py;h=8596625e7b92a8d53acaad3186818d48f616e918;hb=6037a6adcdb140a5a8b291d8d761bee2da320809;hp=be61c73adab9632a78dcc5181079892e68967987;hpb=6aa3171194992e77be00b68287f1fedeb43c8fce;p=electrum-server.git diff --git a/processor.py b/processor.py index be61c73..8596625 100644 --- a/processor.py +++ b/processor.py @@ -35,13 +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 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: @@ -50,7 +62,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): @@ -87,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) @@ -103,39 +121,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.queue.put(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: @@ -162,25 +201,54 @@ class Session: self.subscriptions = [] 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. 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.headers.subscribe": + return method, + elif method in ["blockchain.address.subscribe", "blockchain.address.subscribe2"]: + 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): @@ -193,25 +261,40 @@ 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') + + 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: + 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