X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=server.py;h=1c9a409de820fd863b20b738a2e6affb3618a037;hb=aa3bd16ea7859ac656d58e3f0b8cd06b3e88af05;hp=b975c2bd05eb4525f1f8a6cd717c7a3691a2995d;hpb=fbd9f69a11594a85f3152c9d5f2ec2390880eddc;p=electrum-server.git diff --git a/server.py b/server.py index b975c2b..1c9a409 100755 --- a/server.py +++ b/server.py @@ -66,16 +66,12 @@ except: password = config.get('server','password') stopping = False -block_number = -1 sessions = {} -sessions_sub_numblocks = {} # sessions that have subscribed to the service m_sessions = [{}] # served by http peer_list = {} -wallets = {} # for ultra-light clients such as bccapi - from Queue import Queue input_queue = Queue() output_queue = Queue() @@ -137,7 +133,7 @@ def poll_session(session_id): sessions[session_id]['last_time'] = time.time() ret, addresses = modified_addresses(session) if ret: sessions[session_id]['addresses'] = addresses - return repr( (block_number,ret)) + return repr( (store.block_number,ret)) def poll_session_json(session_id, message_id): @@ -163,52 +159,16 @@ def poll_session_json(session_id, message_id): return out -def do_update_address(addr): - # an address was involved in a transaction; we check if it was subscribed to in a session - # the address can be subscribed in several sessions; the cache should ensure that we don't do redundant requests - - for session_id in sessions.keys(): - session = sessions[session_id] - if session.get('type') != 'persistent': continue - addresses = session['addresses'].keys() - - if addr in addresses: - status = store.get_status( addr ) - message_id, last_status = session['addresses'][addr] - if last_status != status: - #print "sending new status for %s:"%addr, status - send_status(session_id,message_id,addr,status) - sessions[session_id]['addresses'][addr] = (message_id,status) - - -def send_numblocks(session_id): - message_id = sessions_sub_numblocks[session_id] - out = json.dumps( {'id':message_id, 'result':block_number} ) - output_queue.put((session_id, out)) - -def send_status(session_id, message_id, address, status): - out = json.dumps( { 'id':message_id, 'result':status } ) - output_queue.put((session_id, out)) def address_get_history_json(_,message_id,address): return store.get_history(address) -def subscribe_to_numblocks(session_id, message_id): - sessions_sub_numblocks[session_id] = message_id - send_numblocks(session_id) - def subscribe_to_numblocks_json(session_id, message_id): global m_sessions m_sessions[0][session_id]['numblocks'] = message_id,block_number return block_number -def subscribe_to_address(session_id, message_id, address): - status = store.get_status(address) - sessions[session_id]['addresses'][address] = (message_id, status) - sessions[session_id]['last_time'] = time.time() - send_status(session_id, message_id, address, status) - def add_address_to_session_json(session_id, message_id, address): global m_sessions sessions = m_sessions[0] @@ -240,22 +200,13 @@ def client_version_json(session_id, _, version): sessions[session_id]['version'] = version m_sessions[0] = sessions -def create_session_json(_, __): - sessions = m_sessions[0] - session_id = random_string(10) - print "creating session", session_id - sessions[session_id] = { 'addresses':{}, 'numblocks':('','') } - sessions[session_id]['last_time'] = time.time() - m_sessions[0] = sessions - return session_id - def get_banner(_,__): return config.get('server','banner').replace('\\n','\n') def update_session(session_id,addresses): - """deprecated in 0.42""" + """deprecated in 0.42, wad replaced by add_address_to_session""" sessions[session_id]['addresses'] = {} for a in addresses: sessions[session_id]['addresses'][a] = '' @@ -376,129 +327,61 @@ def do_command(cmd, data, ipaddr): return out - -#################################################################### - -def tcp_server_thread(): - thread.start_new_thread(process_input_queue, ()) - thread.start_new_thread(process_output_queue, ()) - - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - s.bind((config.get('server','host'), 50001)) - s.listen(1) +def clean_session_thread(): while not stopping: - conn, addr = s.accept() - try: - thread.start_new_thread(tcp_client_thread, (addr, conn,)) - except: - # can't start new thread if there is no memory.. - traceback.print_exc(file=sys.stdout) - - -def close_session(session_id): - #print "lost connection", session_id - sessions.pop(session_id) - if session_id in sessions_sub_numblocks: - sessions_sub_numblocks.pop(session_id) - + time.sleep(30) + t = time.time() + for k,s in sessions.items(): + if s.get('type') == 'persistent': continue + t0 = s['last_time'] + if t - t0 > 5*60: + sessions.pop(k) + print "lost session", k + -# one thread per client. put requests in a queue. -def tcp_client_thread(ipaddr,conn): - """ use a persistent connection. put commands in a queue.""" +#################################################################### - print timestr(), "TCP session", ipaddr - global sessions - session_id = random_string(10) - sessions[session_id] = { 'conn':conn, 'addresses':{}, 'version':'unknown', 'type':'persistent' } +import stratum - ipaddr = ipaddr[0] - msg = '' +class AbeProcessor(stratum.Processor): + def process(self,request): + message_id = request['id'] + method = request['method'] + params = request.get('params',[]) + #print request - while not stopping: - try: - d = conn.recv(1024) - except socket.error: - d = '' - if not d: - close_session(session_id) - break - - msg += d - while True: - s = msg.find('\n') - if s ==-1: - break - else: - c = msg[0:s].strip() - msg = msg[s+1:] - if c == 'quit': - conn.close() - close_session(session_id) - return - try: - c = json.loads(c) - except: - print "json error", repr(c) - continue - try: - message_id = c.get('id') - method = c.get('method') - params = c.get('params') - except: - print "syntax error", repr(c), ipaddr - continue - - # add to queue - input_queue.put((session_id, message_id, method, params)) - - - -# read commands from the input queue. perform requests, etc. this should be called from the main thread. -def process_input_queue(): - while not stopping: - session_id, message_id, method, data = input_queue.get() - if session_id not in sessions.keys(): - continue - out = None - if method == 'address.subscribe': - address = data[0] - subscribe_to_address(session_id,message_id,address) - elif method == 'numblocks.subscribe': - subscribe_to_numblocks(session_id,message_id) + result = '' + if method == 'numblocks.subscribe': + result = store.block_number + elif method == 'address.subscribe': + address = params[0] + store.watch_address(address) + status = store.get_status(address) + result = status elif method == 'client.version': - sessions[session_id]['version'] = data[0] + #session.version = params[0] + pass elif method == 'server.banner': - out = { 'result':config.get('server','banner').replace('\\n','\n') } + result = config.get('server','banner').replace('\\n','\n') elif method == 'server.peers': - out = { 'result':peer_list.values() } + result = peer_list.values() elif method == 'address.get_history': - address = data[0] - out = { 'result':store.get_history( address ) } + address = params[0] + result = store.get_history( address ) elif method == 'transaction.broadcast': - txo = store.send_tx(data[0]) + txo = store.send_tx(params[0]) print "sent tx:", txo - out = {'result':txo } + result = txo else: - print "unknown command", method - if out: - out['id'] = message_id - out = json.dumps( out ) - output_queue.put((session_id, out)) + print "unknown method", request -# this is a separate thread -def process_output_queue(): - while not stopping: - session_id, out = output_queue.get() - session = sessions.get(session_id) - if session: - try: - conn = session.get('conn') - conn.send(out+'\n') - except: - close_session(session_id) - + if result!='': + response = { 'id':message_id, 'method':method, 'params':params, 'result':result } + self.push_response(response) + + def get_status(self,addr): + return store.get_status(addr) @@ -507,17 +390,6 @@ def process_output_queue(): -def clean_session_thread(): - while not stopping: - time.sleep(30) - t = time.time() - for k,s in sessions.items(): - if s.get('type') == 'persistent': continue - t0 = s['last_time'] - if t - t0 > 5*60: - sessions.pop(k) - print "lost session", k - def irc_thread(): global peer_list @@ -616,30 +488,33 @@ if __name__ == '__main__': # supported protocols thread.start_new_thread(native_server_thread, ()) - thread.start_new_thread(tcp_server_thread, ()) - thread.start_new_thread(http_server_thread, ()) thread.start_new_thread(clean_session_thread, ()) - if (config.get('server','irc') == 'yes' ): - thread.start_new_thread(irc_thread, ()) + #thread.start_new_thread(http_server_thread, ()) - print "starting Electrum server" - old_block_number = None - while not stopping: - block_number = store.main_iteration() + processor = AbeProcessor() + shared = stratum.Shared() + # Bind shared to processor since constructor is user defined + processor.shared = shared + processor.start() - if block_number != old_block_number: - old_block_number = block_number - for session_id in sessions_sub_numblocks.keys(): - send_numblocks(session_id) - while True: - try: - addr = store.address_queue.get(False) - except: - break - do_update_address(addr) + # Create various transports we need + + #tcp stratum + tcpserver = stratum.TcpServer(shared, processor, "ecdsa.org",50001) + tcpserver.start() + + #http stratum + from StratumJSONRPCServer import HttpServer + server = HttpServer(shared, processor, "ecdsa.org",8081) + server.start() - time.sleep(10) + + if (config.get('server','irc') == 'yes' ): + thread.start_new_thread(irc_thread, ()) + + print "starting Electrum server" + store.run(processor) print "server stopped"