cycls 0.0.2.16__tar.gz → 0.0.2.18__tar.gz

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

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

cycls-0.0.2.18/cycls/__init__.py

@@ -0,0 +1 @@
+from .cycls import Cycls

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

@@ -34,7 +34,7 @@ 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:
             listener = await conn.forward_remote_port(x, 80, 'localhost', y)
-            print("✦/✧","tunnel\n")
+            print("✦/✧","tunnel  | open\n")
             await listener.wait_closed()
     except (OSError, asyncssh.Error) as e:
         print("✦/✧",f"tunnel disconnected: {e}")
@@ -45,14 +45,14 @@ 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: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")
+    config = uvicorn.Config(x, host="127.0.0.1", port=y, log_level="error") # loop="asyncio"
     server = uvicorn.Server(config)
     await server.serve()
 
@@ -97,19 +97,28 @@ class Cycls:
         if self.url != "":
             prod=True
 
-        print(f"✦/✧ serving at port: {self.port}")
+        print(f"✦/✧ port    | {self.port}")
         if prod:
             print("✦/✧",f"production mode | url: {self.url}")
             register(list(self.apps.keys()), self.network, self.url+"/gateway", "prod")
         else:
             self.url = f"http://{self.subdomain}-cycls.tuns.sh"
-            print("✦/✧","development mode")
+            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))
-        
-        await asyncio.gather(t1, t2) if not prod else await asyncio.gather(t2)
+
+        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.16 → cycls-0.0.2.18}/pyproject.toml

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

cycls-0.0.2.16/cycls/__init__.py

@@ -1 +0,0 @@
-from .cycls import Cycls, Text, Message