move network dialog in a new class; simplify interface.get_servers
[electrum-nvc.git] / lib / interface.py
index 635afcd..dfae823 100644 (file)
@@ -21,25 +21,44 @@ import random, socket, ast, re, ssl
 import threading, traceback, sys, time, json, Queue
 
 from version import ELECTRUM_VERSION, PROTOCOL_VERSION
-from util import print_error
+from util import print_error, print_msg
 
 
 DEFAULT_TIMEOUT = 5
-DEFAULT_SERVERS = [ 
-    'electrum.bitcoin.cz:p:50001:t',
-    'electrum.novit.ro:p:50001:t', 
-    'electrum.be::50001:t',
-    'electrum.bysh.me::50001:t',
-    'electrum.pdmc.net:p:50001:t',
-    'electrum.no-ip.org::50001:t',
-    'ecdsa.org:p:50001:t'
-    ]
+DEFAULT_PORTS = {'t':'50001', 's':'50002', 'h':'8081', 'g':'8082'}
+
+DEFAULT_SERVERS = {
+    'electrum.thecoinwillprevail.com': {'h': '8081', 's': '50002', 't': '50001'},
+    'the9ull.homelinux.org': {'h': '8082', 't': '50001'},
+    'electra.datemas.de': {'h': '8081', 's': '50002', 't': '50001', 'g': '808'},
+    'electrum.datemas.de': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
+    'ecdsa.org': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
+    'electrum.mooo.com': {'h': '8081', 't': '50001'},
+    'btcback.com': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
+    'electrum.bitcoins.sk': {'h': '8081', 's': '50002', 't': '50001', 'g': '8'},
+    'electrum.no-ip.org': {'h': '80', 's': '50002', 't': '50001', 'g': '443'},
+    'electrum.drollette.com': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
+    'btc.it-zone.org': {'h': '80', 's': '110', 't': '50001', 'g': '443'},
+    'electrum.yacoin.com': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
+    'electrum.be': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'}
+}
+
+
+
+def filter_protocol(servers, p):
+    l = []
+    for k, protocols in servers.items():
+        if p in protocols:
+            l.append( ':'.join([k, protocols[p], p]) )
+    return l
+    
+
 
 proxy_modes = ['socks4', 'socks5', 'http']
 
 
 def pick_random_server():
-    return random.choice( DEFAULT_SERVERS )
+    return random.choice( filter_protocol(DEFAULT_SERVERS,'s') )
 
 
 
@@ -68,7 +87,8 @@ class Interface(threading.Thread):
         #json
         self.message_id = 0
         self.unanswered_requests = {}
-
+        #banner
+        self.banner = ''
 
 
     def queue_json_response(self, c):
@@ -97,28 +117,39 @@ class Interface(threading.Thread):
             if method == 'server.version':
                 self.server_version = result
 
+            elif method == 'server.banner':
+                self.banner = result
+                self.trigger_callback('banner')
+
             elif method == 'server.peers.subscribe':
                 servers = {}
                 for item in result:
-                    s = []
+
                     host = item[1]
-                    ports = []
+                    out = {}
+
                     version = None
-                    pruning = False
+                    pruning_level = '-'
                     if len(item) > 2:
                         for v in item[2]:
-                            if re.match("[stgh]\d+", v):
-                                ports.append((v[0], v[1:]))
+                            if re.match("[stgh]\d*", v):
+                                protocol, port = v[0], v[1:]
+                                if port == '': port = DEFAULT_PORTS[protocol]
+                                out[protocol] = port
                             elif re.match("v(.?)+", v):
                                 version = v[1:]
-                            elif v == 'p':
-                                pruning = True
+                            elif re.match("p\d*", v):
+                                pruning_level = v[1:]
+                                if pruning_level == '': pruning_level = '0'
                     try: 
                         is_recent = float(version)>=float(PROTOCOL_VERSION)
                     except:
                         is_recent = False
-                    if ports and is_recent:
-                        servers[host] = {'ports':ports, 'pruning':pruning}
+
+                    if out and is_recent:
+                        out['pruning'] = pruning_level
+                        servers[host] = out 
+
                 self.servers = servers
                 self.trigger_callback('peers')
 
@@ -169,8 +200,20 @@ class Interface(threading.Thread):
     def init_http(self, host, port, proxy=None, use_ssl=True):
         self.init_server(host, port, proxy, use_ssl)
         self.session_id = None
-        self.connection_msg = ('https' if self.use_ssl else 'http') + '://%s:%d'%( self.host, self.port )
         self.is_connected = True
+        self.connection_msg = ('https' if self.use_ssl else 'http') + '://%s:%d'%( self.host, self.port )
+        try:
+            self.poll()
+        except:
+            print_error("http init session failed")
+            self.is_connected = False
+            return
+
+        if self.session_id:
+            print_error('http session:',self.session_id)
+            self.is_connected = True
+        else:
+            self.is_connected = False
 
     def run_http(self):
         self.is_connected = True
@@ -196,6 +239,7 @@ class Interface(threading.Thread):
 
     def send_http(self, messages, channel='default'):
         import urllib2, json, time, cookielib
+        print_error( "send_http", messages )
         
         if self.proxy:
             import socks
@@ -227,8 +271,11 @@ class Interface(threading.Thread):
         if self.session_id:
             headers['cookie'] = 'SESSION=%s'%self.session_id
 
-        req = urllib2.Request(self.connection_msg, data_json, headers)
-        response_stream = urllib2.urlopen(req)
+        try:
+            req = urllib2.Request(self.connection_msg, data_json, headers)
+            response_stream = urllib2.urlopen(req, timeout=DEFAULT_TIMEOUT)
+        except:
+            return
 
         for index, cookie in enumerate(cj):
             if cookie.name=='SESSION':
@@ -271,26 +318,28 @@ class Interface(threading.Thread):
             s.setproxy(proxy_modes.index(self.proxy["mode"]) + 1, self.proxy["host"], int(self.proxy["port"]) )
 
         if self.use_ssl:
-            s = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_SSLv23)
+            s = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_SSLv23, do_handshake_on_connect=True)
             
         s.settimeout(2)
         s.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
 
         try:
             s.connect(( self.host.encode('ascii'), int(self.port)))
-            s.settimeout(60)
-            self.s = s
-            self.is_connected = True
         except:
+            traceback.print_exc(file=sys.stdout)
             self.is_connected = False
             self.s = None
+            return
 
+        s.settimeout(60)
+        self.s = s
+        self.is_connected = True
 
     def run_tcp(self):
         try:
+            #if self.use_ssl: self.s.do_handshake()
             out = ''
             while self.is_connected:
-
                 try: 
                     timeout = False
                     msg = self.s.recv(1024)
@@ -298,6 +347,14 @@ class Interface(threading.Thread):
                     timeout = True
                 except ssl.SSLError:
                     timeout = True
+                except socket.error, err:
+                    if err.errno in [11, 10035]:
+                        print_error("socket errno", err.errno)
+                        time.sleep(0.1)
+                        continue
+                    else:
+                        traceback.print_exc(file=sys.stdout)
+                        raise
 
                 if timeout:
                     # ping the server with server.version, as a real ping does not exist yet
@@ -349,7 +406,7 @@ class Interface(threading.Thread):
 
 
     def __init__(self, config=None, loop=False):
-        self.server = None
+        self.server = random.choice(filter_protocol(DEFAULT_SERVERS, 's'))
         self.proxy = None
 
         if config is None:
@@ -372,6 +429,7 @@ class Interface(threading.Thread):
         self.servers = {} # actual list from IRC
         self.rtime = 0
         self.bytes_received = 0
+        self.is_connected = False
 
 
 
@@ -379,18 +437,22 @@ class Interface(threading.Thread):
         if self.config.get('server'):
             self.init_with_server(self.config)
         else:
-            print "Using random server..."
-            servers = DEFAULT_SERVERS[:]
+            if self.config.get('auto_cycle') is None:
+                self.config.set_key('auto_cycle', True, False)
+
+        if not self.is_connected and self.config.get('auto_cycle'):
+            print_msg("Using random server...")
+            servers = filter_protocol(DEFAULT_SERVERS, 's')
             while servers:
                 server = random.choice( servers )
                 servers.remove(server)
+                print server
                 self.config.set_key('server', server, False)
                 self.init_with_server(self.config)
                 if self.is_connected: break
 
-            if not servers:
+            if not self.is_connected:
                 print 'no server available'
-                self.is_connected = False
                 self.connect_event.set() # to finish start
                 self.server = 'ecdsa.org:50001:t'
                 self.proxy = None
@@ -399,6 +461,7 @@ class Interface(threading.Thread):
         self.connect_event.set()
         if self.is_connected:
             self.send([('server.version', [ELECTRUM_VERSION, PROTOCOL_VERSION])])
+            self.send([('server.banner',[])])
             self.trigger_callback('connected')
         else:
             self.trigger_callback('notconnected')
@@ -440,6 +503,9 @@ class Interface(threading.Thread):
                     if message not in self.subscriptions[channel]:
                         self.subscriptions[channel].append(message)
 
+        if not self.is_connected: 
+            return
+
         if self.protocol in 'st':
             with self.lock:
                 out = self.send_tcp(messages, channel)
@@ -486,37 +552,23 @@ class Interface(threading.Thread):
             print "changing server:", server, proxy
             self.server = server
             self.proxy = proxy
-            if self.protocol in 'st' and self.s:
+            if self.is_connected and self.protocol in 'st' and self.s:
                 self.s.shutdown(socket.SHUT_RDWR)
                 self.s.close()
             self.is_connected = False  # this exits the polling loop
             self.trigger_callback('disconnecting') # for actively disconnecting
 
     def stop(self):
-        if self.protocol in 'st' and self.s:
+        if self.is_connected and self.protocol in 'st' and self.s:
             self.s.shutdown(socket.SHUT_RDWR)
             self.s.close()
 
 
-    def get_servers_list(self):
-        plist = {}
+    def get_servers(self):
         if not self.servers:
-            servers_list = {}
-            for x in DEFAULT_SERVERS:
-                h,pruning,port,protocol = x.split(':')
-                servers_list[h] = {'ports':[(protocol,port)], 'pruning':pruning}
+            return DEFAULT_SERVERS
         else:
-            servers_list = self.servers
-        
-        for _host, v in servers_list.items():
-            pp = v['ports']
-            z = {}
-            for item2 in pp:
-                _protocol, _port = item2
-                z[_protocol] = _port
-            plist[_host] = z
-                
-        return plist, servers_list
+            return self.servers
 
 
     def is_empty(self, channel):
@@ -556,10 +608,14 @@ class Interface(threading.Thread):
         return out
 
 
-    def start(self):
+    def start(self, wait=True):
         threading.Thread.start(self)
-        # wait until connection is established
-        self.connect_event.wait()
+        if wait:
+            # wait until connection is established
+            self.connect_event.wait()
+            if not self.is_connected:
+                return False
+        return True
 
     def run(self):
         while True: