pull/20/head
quadrismegistus 4 years ago
parent 4e74bc8151
commit 61b69f2da0

@ -9,9 +9,9 @@ import asyncio,time
# logger.setLevel(logging.DEBUG) # logger.setLevel(logging.DEBUG)
sys.path.append('../p2p') sys.path.append('../p2p')
# logger.info(os.getcwd(), sys.path) # logger.info(os.getcwd(), sys.path)
BSEP=b'\n\n\n\n' BSEP=b'||||||||||'
BSEP2=b'\t\n\t\n' BSEP2=b'@@@@@@@@@@'
BSEP3=b'\r\r\r\r' BSEP3=b'##########'
NODE_SLEEP_FOR=1 NODE_SLEEP_FOR=1
try: try:
@ -211,7 +211,7 @@ class Api(object):
# return res # return res
# return await _get() # return await _get()
def encode_data(self,val,sep=BSEP,sep2=BSEP2,do_encrypt=True,encrypt_for_pubkey=None,private_signature_key=None): def encode_data(self,val,sep=BSEP,sep2=BSEP2,do_encrypt=False,encrypt_for_pubkey=None,private_signature_key=None):
assert type(val)==bytes assert type(val)==bytes
""" """
What do we want to store with What do we want to store with
@ -295,7 +295,8 @@ class Api(object):
decryption_tools decryption_tools
]) ])
print('FINAL PACKET:',final_packet,type(final_packet)) self.log('FINAL PACKET:',final_packet,type(final_packet))
stop
return final_packet return final_packet
@ -396,7 +397,7 @@ class Api(object):
if encode_data and encrypt_for_pubkey is not None and type(value)==bytes: if encode_data and encrypt_for_pubkey is not None and type(value)==bytes:
x = self.encode_data( x = self.encode_data(
val = value, val = value,
do_encrypt=True, do_encrypt=False,
encrypt_for_pubkey=encrypt_for_pubkey, encrypt_for_pubkey=encrypt_for_pubkey,
private_signature_key=private_signature_key private_signature_key=private_signature_key
) )
@ -433,7 +434,7 @@ class Api(object):
return await _set() return await _set()
async def get_json(self,key_or_keys,decode_data=True): async def get_json(self,key_or_keys,decode_data=False):
def jsonize_res(res0): def jsonize_res(res0):
# parse differently? # parse differently?
@ -709,7 +710,7 @@ class Api(object):
return r return r
async def get_post(self,post_id): async def get_post(self,post_id):
return await self.get_json_val(post_id,decode_data=True) return await self.get_json_val(post_id,decode_data=False)
async def get_posts(self,uri='/inbox/earth'): async def get_posts(self,uri='/inbox/earth'):
self.log(f'api.get_posts(uri={uri}) --> ...') self.log(f'api.get_posts(uri={uri}) --> ...')

@ -190,7 +190,7 @@ class Server:
spider = ValueSpiderCrawl(self.protocol, node, nearest, self.ksize, self.alpha) spider = ValueSpiderCrawl(self.protocol, node, nearest, self.ksize, self.alpha)
self.log(f'spider crawling... {spider}') self.log(f'spider crawling... {spider}')
found = await spider.find() found = await spider.find()
self.log('spider found <-',found,'for key',key) self.log('spider found <-',found,'for key',key,'(',dkey,')')
await asyncio.sleep(5) await asyncio.sleep(5)
self.log(f"Eventually found for key {key} value {found}") self.log(f"Eventually found for key {key} value {found}")

Loading…
Cancel
Save