cycls 0.0.2.18__tar.gz → 0.0.2.19__tar.gz

{cycls-0.0.2.18 → cycls-0.0.2.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cycls
-Version: 0.0.2.18
+Version: 0.0.2.19
 Summary: Cycls SDK
 Author: Mohammed Jamal
 Author-email: mj@cycls.com

{cycls-0.0.2.18 → cycls-0.0.2.19}/cycls/cycls.py

@@ -20,6 +20,7 @@ class Message(BaseModel):
     id: str
     history: Optional[List[Dict[str, str]]] = None
 
+# too dirty
 def find_available_port(start_port):
     port = start_port
     while True:
@@ -29,7 +30,6 @@ def find_available_port(start_port):
             port += 1
 
 import asyncssh, asyncio
-
 async def create_ssh_tunnel(x,y,z='tuns.sh'):
     try:
         async with asyncssh.connect(z,client_keys=[key_path],known_hosts=None) as conn:
@@ -45,17 +45,16 @@ def register(handles, network, url, mode):
             response = client.post(f"{network}/register", json={"handles":handles, "url":url, "mode":mode})
             if response.status_code==200:
                 data = (response.json()).get("content")
-                for i in data:print(f"✦/✧ {i[0]} | {network}/{i[1]}")
+                for i in data:
+                    if i[0]=="new":
+                        print(f"✦/✧ {i[0]}     | {network}/{i[1]}")
+                    else:
+                        print(f"✦/✧ {i[0]} | {network}/{i[1]}")
             else:
                 print("✦/✧ failed to register ⚠️")
     except Exception as e:
         print(f"An error occurred: {e}")
 
-async def run_server(x,y):
-    config = uvicorn.Config(x, host="127.0.0.1", port=y, log_level="error") # loop="asyncio"
-    server = uvicorn.Server(config)
-    await server.serve()
-
 class Cycls:
     def __init__(self, url="", network="https://cycls.com", port=find_available_port(8001)):
         import uuid
@@ -75,7 +74,7 @@ class Cycls:
             def sync_wrapper(*args, **kwargs):
                 return StreamingResponse(func(*args, **kwargs))
             wrapper = async_wrapper if inspect.iscoroutinefunction(func) else sync_wrapper
-            self.apps["@"+handle] = wrapper
+            self.apps[handle] = wrapper
             return wrapper
         return decorator
     
@@ -90,9 +89,19 @@ class Cycls:
 
     def push(self):
         self.server.post("/gateway")(self.gateway)
-        asyncio.run(self.publish())
+        @self.server.on_event("startup")
+        def startup_event():
+            asyncio.create_task(create_ssh_tunnel(f"{self.subdomain}-cycls", self.port))
+
+        self.publish()
+
+        try:
+            uvicorn.run(self.server, host="127.0.0.1", port=self.port, log_level="error")
+        except KeyboardInterrupt:
+            print(f"\n✦/✧ exit    | done")
 
-    async def publish(self):
+    def publish(self):
+        # prod catch is too dirty
         prod=False
         if self.url != "":
             prod=True
@@ -104,21 +113,6 @@ class Cycls:
         else:
             self.url = f"http://{self.subdomain}-cycls.tuns.sh"
             print("✦/✧","mode    | development")
-            # print("✦/✧",f"url {self.url}")
             register(list(self.apps.keys()), self.network, self.url+"/gateway", "dev")
-            t1 = asyncio.create_task(create_ssh_tunnel(f"{self.subdomain}-cycls", self.port))
-
-        t2 = asyncio.create_task(run_server(self.server,self.port))
-
-        try:
-            if not prod:
-                await asyncio.gather(t1, t2)
-            else:
-                await asyncio.gather(t2)
-        except KeyboardInterrupt:
-            # print("🔥")
-            tasks = asyncio.all_tasks()
-            for task in tasks:
-                task.cancel()
-
+        
 # poetry publish --build

{cycls-0.0.2.18 → cycls-0.0.2.19}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cycls"
-version = "0.0.2.18"
+version = "0.0.2.19"
 
 packages = [{ include = "cycls" }]
 description = "Cycls SDK"