cwinfo/yggdrasil-map
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-map synced 2024-11-22 05:50:29 +00:00
Code Releases Activity

update crawler

Browse Source
This commit is contained in:
Arceliar 2019-12-25 17:27:34 -06:00
parent 4b5c832df7
commit e1638133b6
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/crawl-dht.py
View File

@ -26,6 +26,17 @@ def doRequest(req):
except: except:
return None return None
def getNodeInfo(key, coords):
try:
req = '{{"keepalive":true, "request":"getNodeInfo", "box_pub_key":"{}", "coords":"{}"}}'.format(key, coords)
ygg = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
ygg.connect(host_port)
ygg.send(req)
data = json.loads(ygg.recv(1024*15))
return data
except:
return None
visited = dict() # Add nodes after a successful lookup response visited = dict() # Add nodes after a successful lookup response
rumored = dict() # Add rumors about nodes to ping rumored = dict() # Add rumors about nodes to ping
timedout = dict() timedout = dict()
@ -45,8 +56,19 @@ def handleResponse(address, info, data):
now = time.time() now = time.time()
visited[str(address)] = {'box_pub_key':str(info['box_pub_key']), 'coords':str(info['coords']), 'time':now} visited[str(address)] = {'box_pub_key':str(info['box_pub_key']), 'coords':str(info['coords']), 'time':now}
if address in timedout: del timedout[address] if address in timedout: del timedout[address]
nodeinfo = getNodeInfo(str(info['box_pub_key']), str(info['coords']))
#print "\nDEBUG:", info, nodeinfo
if len(visited) > 1: sys.stdout.write(",\n") if len(visited) > 1: sys.stdout.write(",\n")
sys.stdout.write('"{}": ["{}", {}]'.format(address, info['coords'], int(now))) nodename = None
try:
if nodeinfo and 'response' in nodeinfo and 'nodeinfo' in nodeinfo['response'] and 'name' in nodeinfo['response']['nodeinfo']:
nodename = '"' + str(nodeinfo['response']['nodeinfo']['name']) + '"'
except:
pass
if nodename:
sys.stdout.write('"{}": ["{}", {}, {}]'.format(address, info['coords'], int(now), nodename))
else:
sys.stdout.write('"{}": ["{}", {}]'.format(address, info['coords'], int(now)))
sys.stdout.flush() sys.stdout.flush()
# End handleResponse # End handleResponse
@ -62,8 +84,8 @@ while len(rumored) > 0:
for k,v in rumored.iteritems(): for k,v in rumored.iteritems():
handleResponse(k, v, doRequest(getDHTPingRequest(v['box_pub_key'], v['coords']))) handleResponse(k, v, doRequest(getDHTPingRequest(v['box_pub_key'], v['coords'])))
# These next two are imperfect workarounds to deal with old kad nodes # These next two are imperfect workarounds to deal with old kad nodes
handleResponse(k, v, doRequest(getDHTPingRequest(v['box_pub_key'], v['coords'], '0'*128))) #handleResponse(k, v, doRequest(getDHTPingRequest(v['box_pub_key'], v['coords'], '0'*128)))
handleResponse(k, v, doRequest(getDHTPingRequest(v['box_pub_key'], v['coords'], 'f'*128))) #handleResponse(k, v, doRequest(getDHTPingRequest(v['box_pub_key'], v['coords'], 'f'*128)))
break break
del rumored[k] del rumored[k]
print '\n}}' print '\n}}'

3
web/updateGraph.py
View File

@ -5,7 +5,8 @@ import graphPlotter
import cgi import cgi
import urllib, json import urllib, json
url = "http://y.yakamo.org:3000/current" #url = "http://y.yakamo.org:3000/current"
url = "current"
# nodes indexed by coords # nodes indexed by coords
class NodeInfo: class NodeInfo: