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)
+ if session is not None:
+ is_new = session.protocol_version >= 0.5
+ if suffix == 'subscribe':
+ session.subscribe_to_service(method, params)
# store session and id locally
request['id'] = self.store_session_id(session, request['id'])
return method,
elif method == "blockchain.headers.subscribe":
return method,
- elif method in ["blockchain.address.subscribe", "blockchain.address.subscribe2"]:
+ elif method in ["blockchain.address.subscribe"]:
if not params:
return None
else:
class ResponseDispatcher(threading.Thread):
- def __init__(self, shared, processor):
+ def __init__(self, shared, request_dispatcher):
self.shared = shared
- self.processor = processor
+ self.request_dispatcher = request_dispatcher
threading.Thread.__init__(self)
self.daemon = True
self.update()
def update(self):
- response = self.processor.pop_response()
+ response = self.request_dispatcher.pop_response()
#print "pop response", response
internal_id = response.get('id')
method = response.get('method')
# A notification
if internal_id is None: # and method is not None and params is not None:
- self.notification(method, params, response)
+ found = self.notification(method, params, response)
+ if not found and method == 'blockchain.address.subscribe':
+ self.request_dispatcher.push_request(None,{'method':method.replace('.subscribe', '.unsubscribe'), 'params':params, 'id':None})
+ pass
# A response
- elif internal_id is not None: # and method is None and params is None:
+ elif internal_id is not None:
self.send_response(internal_id, response)
else:
print_log( "no method", response)
def notification(self, method, params, response):
subdesc = Session.build_subdesc(method, params)
- for session in self.processor.sessions:
+ found = False
+ for session in self.request_dispatcher.sessions:
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)
+ found = True
+ if not found: print "no subscriber for", subdesc
+ return found
def send_response(self, internal_id, response):
- session, message_id = self.processor.get_session_id(internal_id)
+ session, message_id = self.request_dispatcher.get_session_id(internal_id)
if session:
response['id'] = message_id
session.send_response(response)