self.sessions = []
threading.Thread.__init__(self)
self.daemon = True
+ self.request_queue = queue.Queue()
+ self.response_queue = queue.Queue()
def add_session(self, session):
with self.lock:
self.sessions.append(session)
+ def push_response(self, session, item):
+ self.response_queue.put((session,item))
+
+ def pop_response(self):
+ return self.response_queue.get()
+
+ def push_request(self, session, item):
+ self.request_queue.put((session,item))
+
+ def pop_request(self):
+ return self.request_queue.get()
+
def run(self):
if self.shared is None:
raise TypeError("self.shared not set in Processor")
# If session is still alive then re-add it back
# to our internal register
self.add_session(session)
- self.process(session)
- def process(self, session):
- request = session.pop_request()
+ session, request = self.pop_request()
+ self.process(session, request)
+
+ self.stop()
+
+ def stop(self):
+ pass
+
+ def process(self, session, request):
print "New request", request
- # Execute and when ready, you call
- # session.push_response(response)
+ # Do stuff...
+ # response = request
+ # When ready, you call
+ # self.push_response(session,response)
+
+ def update_from_blocknum(self,block_number):
+ for session in self.sessions:
+ if session.numblocks_sub is not None:
+ response = { 'id':session.numblocks_sub, 'result':block_number }
+ self.push_response(session,response)
+
+ def update_from_address(self,addr):
+ for session in self.sessions:
+ m = session.addresses_sub.get(addr)
+ if m:
+ status = self.get_status( addr )
+ message_id, last_status = m
+ if status != last_status:
+ session.subscribe_to_address(message_id, status)
+ response = { 'id':message_id, 'result':status }
+ self.push_response(session,response)
+
+ def get_status(self,addr):
+ # return status of an address
+ # return store.get_status(addr)
+ pass
+
class Session:
self.address = address
self._stopped = False
self.lock = threading.Lock()
-
- self.request_queue = queue.Queue()
- self.response_queue = queue.Queue()
+ self.numblocks_sub = None
+ self.addresses_sub = {}
+ print "new session", address
def stop(self):
self._connection.close()
else:
return self._connection
- def push_request(self, item):
- self.request_queue.put(item)
-
- def pop_request(self):
- return self.request_queue.get()
-
- def push_response(self):
- self.response_queue.put(item)
+ def subscribe_to_numblocks(self,message_id):
+ with self.lock:
+ self.numblocks_sub = message_id
+
+ def subscribe_to_address(self,address,message_id,status):
+ with self.lock:
+ self.addresses_sub[address] = message_id,status
- def pop_response(self):
- return self.response_queue.get()
-class TcpClientResponder(threading.Thread):
+class TcpResponder(threading.Thread):
- def __init__(self, shared, session):
+ def __init__(self, shared, processor):
self.shared = shared
- self.session = session
+ self.processor = processor
threading.Thread.__init__(self)
def run(self):
- while not self.shared.stopped() or self.session.stopped():
- response = self.session.pop_response()
+ while not self.shared.stopped():
+ session,response = self.processor.pop_response()
raw_response = json.dumps(response)
# Possible race condition here by having session
# close connection?
# I assume Python connections are thread safe interfaces
- connection = self.session.connection()
try:
+ connection = session.connection()
connection.send(raw_response + "\n")
except:
- self.session.stop()
+ session.stop()
class TcpClientRequestor(threading.Thread):
- def __init__(self, shared, session):
+ def __init__(self, shared, processor, session):
self.shared = shared
+ self.processor = processor
self.message = ""
self.session = session
threading.Thread.__init__(self)
def run(self):
while not self.shared.stopped():
if not self.update():
- self.session.stop()
- return
+ break
+
+ while self.parse():
+ pass
def update(self):
data = self.receive()
- if data is None:
+ if not data:
# close_session
- self.stop()
+ self.session.stop()
return False
self.message += data
- if not self.parse():
- return False
return True
def receive(self):
try:
return self.session.connection().recv(1024)
except socket.error:
- return None
+ return ''
def parse(self):
- while True:
- raw_buffer = self.message.find('\n')
- if raw_buffer == -1:
- return True
+ raw_buffer = self.message.find('\n')
+ if raw_buffer == -1:
+ return False
- command = self.message[0:raw_buffer].strip()
- self.message = self.message[raw_buffer + 1:]
- if command == 'quit':
- return False
+ raw_command = self.message[0:raw_buffer].strip()
+ self.message = self.message[raw_buffer + 1:]
+ if raw_command == 'quit':
+ self.session.stop()
+ return False
- try:
- command = json.loads(command)
- except:
- print "json error", repr(command)
- continue
+ try:
+ command = json.loads(raw_command)
+ except:
+ self.processor.push_response(self.session,
+ {"error": "bad JSON", "request": raw_command})
+ return True
- try:
- message_id = command.get('id')
- method = command.get('method')
- params = command.get('params')
- except:
- print "syntax error", repr(command), self.session.address[0]
- continue
+ try:
+ # Try to load vital fields, and return an error if
+ # unsuccessful.
+ message_id = command['id']
+ method = command['method']
+ except KeyError:
+ # Return an error JSON in response.
+ self.processor.push_response(self.session,
+ {"error": "syntax error", "request": raw_command})
+ else:
+ self.processor.push_request(self.session,command)
- self.session.push_request((message_id, method, params))
- print message_id, method, params
+ return True
class TcpServer(threading.Thread):
- def __init__(self, shared, processor):
+ def __init__(self, shared, processor, host, port):
self.shared = shared
self.processor = processor
self.clients = []
threading.Thread.__init__(self)
self.daemon = True
+ self.host = host
+ self.port = port
def run(self):
print "TCP server started."
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
- sock.bind(("localhost", 50001))
+ sock.bind((self.host, self.port))
sock.listen(1)
+ responder = TcpResponder(self.shared, self.processor)
+ responder.start()
while not self.shared.stopped():
session = Session(*sock.accept())
- client_req = TcpClientRequestor(self.shared, session)
+ client_req = TcpClientRequestor(self.shared, self.processor, session)
client_req.start()
- client_res = TcpClientResponder(self.shared, session)
- client_res.start()
self.processor.add_session(session)
class Shared:
processor.shared = shared
processor.start()
# Create various transports we need
- transports = TcpServer(shared, processor),
+ transports = TcpServer(shared, processor, "176.31.24.241", 50001),
for server in transports:
server.start()
while not shared.stopped():
git://git.novaco.in / electrum-server.git / blobdiff