updates

komrade/backend/mazes.py

@@ -3,16 +3,13 @@ from komrade import *
 
 log=print
 
-# def get_tor_python_session():
-#     tor = TorClient()
-#     with tor.get_guard() as guard:
-#         adapter = TorHttpAdapter(guard, 3, retries=RETRIES)
+def tor_request(url):
+    return tor_request_in_python(url)
+    # return tor_request_in_proxy(url)
 
-#         with requests.Session() as s:
-#             s.headers.update({'User-Agent': 'Mozilla/5.0'})
-#             s.mount('http://', adapter)
-#             s.mount('https://', adapter)
-#             return s
+def tor_request_in_proxy(url):
+    with get_tor_proxy_session() as s:
+        return s.get(url,timeout=60)
 
 def tor_request_in_python(url):
     tor = TorClient()
@@ -56,22 +53,6 @@ def get_async_tor_proxy_session():
 
 
 
-def tor_request(url,method='get',data=None):
-    with get_tor_proxy_session() as s:
-        if method=='get':
-            return s.get(url)
-        elif method=='post':
-            log('data',data)
-            return s.post(url,data=data)
-
-
-def request(Q,**kwargs):
-    log('request() Q:',Q)
-    res = tor_request(Q,**kwargs)
-    log('reqeust() <-',res)
-    return res
-    
-
 def test_torpy():
     hostname = KOMRADE_ONION
     from torpy import TorClient

komrade/backend/switchboard.py

@@ -59,7 +59,7 @@ class TheSwitchboard(FlaskView, Logger):
 
         # step 3: give to The Operator
         try:
-            return 'Success! your message was: '+str(data)
+            # return 'Success! your message was: '+str(data)
             res = OPERATOR.route(data)
             return res
         except Exception as e:

komrade/backend/the_operator.py

@@ -30,6 +30,8 @@ class TheOperator(Operator):
     def route(self, data):
         # step 1 split:
         data_unencr,data_encr = data.split(BSEP)
+        self.log('data_unencr =',data_unencr)
+        self.log('data_encr =',data_encr)
         if data_encr and 'name' in data_unencr:
             name=data_unencr['name']
             keychain=data_unencr.get('keychain',{})

komrade/backend/the_telephone.py

@@ -21,7 +21,7 @@ class TheTelephone(Logger):
         msg=msg.replace('/','_')
         URL = OPERATOR_API_URL + msg + '/'
         self.log("DIALING THE OPERATOR:",URL)
-        r=tor_request_in_python(URL)
+        r=tor_request(URL)
         print(r)
         print(r.text)
         return r
@@ -78,10 +78,9 @@ class TheTelephone(Logger):
 
 
     def forge_new_keys(self, name, pubkey_is_public=False):
-        req_json = {'forge_new_keys':{'name':name, 'pubkey_is_public':pubkey_is_public}}
-        req_json_s = jsonify(req_json)
-        req_json_s_encr = SMessage()
-        return self.sess.post(json=req_json)
+        req_json = {'_route':'forge_new_keys','name':name, 'pubkey_is_public':pubkey_is_public}
+        # req_json_s = jsonify(req_json)
+        return self.req(json_coming_from_phone = req_json)
 
 
 
@@ -91,8 +90,11 @@ def test_call():
     # caller.boot(create=True)
     # print(caller.keychain())
     phone = TheTelephone(caller=caller)
-    res = phone.req({'name':'marx', 'pubkey_is_public':True})
-    print(res)
+    # req_json = {'_route':'forge_new_keys','name':name, 'pubkey_is_public':pubkey_is_public}}
+    # req_json_s = jsonify(req_json)
+    # res = phone.req({'forge_new_keys':{'name':'marx', 'pubkey_is_public':True}})
+    # print(res)
+    phone.forge_new_keys('marx4')
 
 ## main
 if __name__=='__main__': test_call()