0x2620
/
openmedialibrary
1
0
Fork 0
Code Issues 131 Pull Requests Releases Wiki Activity

use local nodes for requests

This commit is contained in:
j 2014-05-13 12:36:02 +02:00
parent 0c18dad1b5
commit 2f821bf6a7
6 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oml/changelog.py
View File

@ -211,8 +211,10 @@ class Changelog(db.Model):
user.info['users'] = {}
user.info['users'][peerid] = username
user.save()
User.get_or_create(peerid)
#fixme, add username to user?
peer = User.get_or_create(peerid)
if not 'username' in peer.info:
peer.info['username'] = username
peer.save()
return True
def action_removepeer(self, user, timestamp, peerid):

2
oml/item/query.py
View File

@ -15,7 +15,7 @@ def parse(data):
for key in ('keys', 'group', 'list', 'range', 'sort', 'query'):
if key in data:
query[key] = data[key]
print data
#print data
query['qs'] = oxflask.query.Parser(models.Item).find(data)
if 'query' in query and 'conditions' in query['query'] and query['query']['conditions']:
conditions = query['query']['conditions']

2
oml/node/server.py
View File

@ -46,7 +46,7 @@ class NodeHandler(tornado.web.RequestHandler):
content = {}
if valid(key, data, sig):
action, args = json.loads(data)
print 'action', action, args
print key, 'action', action, args
if action == 'ping':
content = {
'ip': request.remote_addr

41
oml/nodes.py
View File

@ -41,6 +41,8 @@ class Node(object):
if local:
url = 'http://[%s]:%s' % (local['host'], local['port'])
print 'using local peer discovery to access node', url
elif not self.host:
return None
else:
if ':' in self.host:
url = 'http://[%s]:%s' % (self.host, self.port)
@ -48,7 +50,7 @@ class Node(object):
url = 'http://%s:%s' % (self.host, self.port)
return url
def resolve_host(self):
def resolve(self):
r = directory.get(self.vk)
if r:
self.host = r['host']
@ -64,9 +66,13 @@ class Node(object):
return None
def request(self, action, *args):
if not self.host:
self.resolve_host()
if not self.host:
url = self.url
if not url:
self.resolve()
url = self.url
if not self.url:
print 'unable to find host', self.user_id
self.online = False
return None
content = json.dumps([action, args])
sig = settings.sk.sign(content, encoding=ENCODING)
@ -78,16 +84,18 @@ class Node(object):
'X-Ed25519-Key': settings.USER_ID,
'X-Ed25519-Signature': sig,
}
r = requests.post(self.url, data=content, headers=headers)
r = requests.post(url, data=content, headers=headers)
if r.status_code == 403:
print 'REMOTE ENDED PEERING'
if self.user.peered:
self.user.update_peering(False)
self.online = False
data = r.content
sig = r.headers.get('X-Ed25519-Signature')
if sig and self._valid(data, sig):
response = json.loads(data)
else:
print 'invalid signature', data
response = None
return response
@ -104,7 +112,7 @@ class Node(object):
return user.models.User.get_or_create(self.user_id)
def go_online(self):
self.resolve_host()
self.resolve()
if self.user.peered:
try:
self.online = False
@ -166,25 +174,28 @@ class Node(object):
return True
def rejectPeering(self, message):
r = self.request('rejectPeering', message)
print 'reject peering!!!', self.user
p = self.user
p.update_peering(False)
self.go_online()
r = self.request('rejectPeering', message)
print 'reject peering!!!', r
self.online = False
return True
def removePeering(self, message):
print 'remove peering!!!', self.user
r = self.request('removePeering', message)
p = self.user
p.update_peering(False)
self.go_online()
if p.peered:
p.update_peering(False)
r = self.request('removePeering', message)
self.online = False
return True
def cancelPeering(self, message):
r = self.request('cancelPeering', message)
p = self.user
p.update_peering(False)
self.go_online()
self.online = False
r = self.request('cancelPeering', message)
return True
def download(self, item):
@ -248,7 +259,6 @@ class Nodes(Thread):
return id in self._nodes and self._nodes[id].download(item)
def _call(self, target, action, *args):
print 'call', target, action, args
if target == 'all':
nodes = self._nodes.values()
elif target == 'online':
@ -262,12 +272,14 @@ class Nodes(Thread):
if user_id not in self._nodes:
from user.models import User
self._nodes[user_id] = Node(self, User.get_or_create(user_id))
'''
else:
self._nodes[user_id].online = True
trigger_event('status', {
'id': user_id,
'status': 'online'
})
'''
def run(self):
with self._app.app_context():
@ -277,7 +289,6 @@ class Nodes(Thread):
if args[0] == 'add':
self._add_node(args[1])
else:
print 'next', args
self._call(*args)
def join(self):

6
oml/user/api.py
View File

@ -205,9 +205,9 @@ actions.register(rejectPeering, cache=False)
@returns_json
def removePeering(request):
data = json.loads(request.form['data']) if 'data' in request.form else {}
p = models.User.get_or_create(data['id'])
state.nodes.queue('add', p.id)
state.nodes.queue(p.id, 'removePeering', data.get('message', ''))
u = models.User.get_or_create(data['id'])
state.nodes.queue('add', u.id)
state.nodes.queue(u.id, 'removePeering', data.get('message', ''))
return {}
actions.register(removePeering, cache=False)

12
oml/user/models.py
View File

@ -65,6 +65,7 @@ class User(db.Model):
return [l.json() for l in self.lists.order_by('position')]
def update_peering(self, peered, username=None):
was_peering = self.peered
if peered:
self.pending = ''
self.peered = True
@ -72,20 +73,23 @@ class User(db.Model):
self.info['username'] = username
self.set_nickname(self.info.get('username', 'anonymous'))
Changelog.record(state.user(), 'addpeer', self.id, self.nickname)
if not was_peering:
Changelog.record(state.user(), 'addpeer', self.id, self.nickname)
else:
self.pending = ''
self.peered = False
self.nickname = None
self.save()
List.query.filter_by(user_id=self.id).delete()
for i in self.items:
i.users.remove(self)
if not i.users:
print 'last user, remove'
db.session.delete(i)
else:
i.update_lists()
Changelog.query.filter_by(user_id=self.id).delete()
Changelog.record(state.user(), 'removepeer', self.id)
self.save()
if was_peering:
Changelog.record(state.user(), 'removepeer', self.id)
self.save()
def set_nickname(self, nickname):