cycls 0.0.2.11__tar.gz → 0.0.2.13__tar.gz

{cycls-0.0.2.11 → cycls-0.0.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cycls
-Version: 0.0.2.11
+Version: 0.0.2.13
 Summary: Cycls SDK
 Author: Mohammed Jamal
 Author-email: mj@cycls.com
@@ -11,12 +11,22 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Requires-Dist: asyncssh (>=2.14.2,<3.0.0)
 Requires-Dist: fastapi (>=0.111.0,<0.112.0)
 Requires-Dist: httpx (>=0.27.0,<0.28.0)
 Description-Content-Type: text/markdown
 
 </br></br><p align="center"><img src="https://cycls.com/static/assets/favicon.svg" alt="Cycls"></p></br>
 
+<div align="center">
+    <a href="https://pypi.org/project/cycls/" target="_blank" rel="noopener noreferrer">
+        <img loading="lazy" src="https://img.shields.io/pypi/v/cycls.svg" alt="PyPI" class="img_ev3q" style="display: inline;">
+    </a>
+    <a href="https://discord.gg/BMnaMatDC7" target="_blank" rel="noopener noreferrer">
+        <img loading="lazy" src="https://img.shields.io/discord/1175782747164389466" alt="Discord" class="img_ev3q" style="display: inline;">
+    </a>
+</div>
+
 # cycls.py
 
 ```sh

{cycls-0.0.2.11 → cycls-0.0.2.13}/README.md

@@ -1,5 +1,14 @@
 </br></br><p align="center"><img src="https://cycls.com/static/assets/favicon.svg" alt="Cycls"></p></br>
 
+<div align="center">
+    <a href="https://pypi.org/project/cycls/" target="_blank" rel="noopener noreferrer">
+        <img loading="lazy" src="https://img.shields.io/pypi/v/cycls.svg" alt="PyPI" class="img_ev3q" style="display: inline;">
+    </a>
+    <a href="https://discord.gg/BMnaMatDC7" target="_blank" rel="noopener noreferrer">
+        <img loading="lazy" src="https://img.shields.io/discord/1175782747164389466" alt="Discord" class="img_ev3q" style="display: inline;">
+    </a>
+</div>
+
 # cycls.py
 
 ```sh

cycls-0.0.2.13/cycls/cycls.py

@@ -0,0 +1,116 @@
+from fastapi import FastAPI, Request
+from fastapi.responses import StreamingResponse
+from pydantic import BaseModel
+from typing import List, Dict, Optional
+
+from functools import wraps
+import uvicorn, socket, httpx
+import inspect
+
+import logging
+logging.basicConfig(level=logging.ERROR)
+
+import os
+current_dir = os.path.dirname(os.path.abspath(__file__))
+key_path = os.path.join(current_dir, 'tuns')
+
+class Message(BaseModel):
+    handle: str
+    content: str
+    id: str
+    history: Optional[List[Dict[str, str]]] = None
+
+def find_available_port(start_port):
+    port = start_port
+    while True:
+        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+            if s.connect_ex(('localhost', port)) != 0:
+                return 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:
+            listener = await conn.forward_remote_port(x, 80, 'localhost', y)
+            print("✦/✧","tunnel\n")
+            await listener.wait_closed()
+    except (OSError, asyncssh.Error) as e:
+        print("✦/✧",f"tunnel disconnected: {e}")
+
+def register(handles, network, url, mode):
+    try:
+        with httpx.Client() as client:
+            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]}")
+            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")
+    server = uvicorn.Server(config)
+    await server.serve()
+
+class Cycls:
+    def __init__(self, url="", network="https://cycls.com", port=find_available_port(8001)):
+        import uuid
+        self.subdomain = str(uuid.uuid4())[:8]
+        self.server = FastAPI()
+        self.network = network
+        self.port = port
+        self.url = url
+        self.apps = {}
+
+    def __call__(self, handle):
+        def decorator(func):
+            @wraps(func)
+            async def async_wrapper(*args, **kwargs):
+                return await func(*args, **kwargs)
+            @wraps(func)
+            def sync_wrapper(*args, **kwargs):
+                return func(*args, **kwargs)
+            wrapper = async_wrapper if inspect.iscoroutinefunction(func) else sync_wrapper
+            self.apps["@"+handle] = wrapper
+            return wrapper
+        return decorator
+    
+    async def gateway(self, request: Request):
+        data = await request.json()
+        handle = data.get('handle')
+        if handle in self.apps:
+            func = self.apps[handle]
+            message = Message(**data)
+            return await func(message) if inspect.iscoroutinefunction(func) else func(message)
+        return {"error": "Handle not found"}
+
+    def push(self):
+        self.server.post("/gateway")(self.gateway)
+        asyncio.run(self.publish())
+
+    async def publish(self):
+        prod=False
+        if self.url != "":
+            prod=True
+
+        print(f"✦/✧ serving at 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("✦/✧",f"url {self.url}")
+            register(list(self.apps.keys()), self.network, self.url+"/gateway", "dev")
+            t2 = asyncio.create_task(run_server(self.server,self.port))
+
+        t1 = asyncio.create_task(create_ssh_tunnel(f"{self.subdomain}-cycls", self.port))
+        await asyncio.gather(t1, t2) if not prod else asyncio.gather(t2)
+
+Text = StreamingResponse
+
+# poetry publish --build

cycls-0.0.2.13/cycls/tuns

@@ -0,0 +1,27 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn
+NhAAAAAwEAAQAAAQEAxq9z8nrMUnCRBSDhOcUeAZ//dolIg7RQoXM+Yo6aPACuqRMjo70b
+wzXotyIqFRHe5eLntoa5FLj4n/3/uKVjy+f0xwPxquzTRESJehmUNN7WXaXQt2TX7BmMeo
+vxWiQ69qzcQMQx7FNJNKSsA4Ynw9fIg/NDvEAtnYotmcF37finCJzj3OOxAaAB53bAzfY2
+GD0JL+W8bzuMXpyZaqD+33selRNLqWVbcgNrJW6IDtZXvT1gBRsVsycbNrBrwFuhafnLW1
+KAP/ZLLRP4w+BUgJVJVu9PqTfTrAcnDwspduNJqAtYPMbvuoToip1kYwws3wl8hHpsal67
+U5xZeOn+5QAAA9i3Fmc8txZnPAAAAAdzc2gtcnNhAAABAQDGr3PyesxScJEFIOE5xR4Bn/
+92iUiDtFChcz5ijpo8AK6pEyOjvRvDNei3IioVEd7l4ue2hrkUuPif/f+4pWPL5/THA/Gq
+7NNERIl6GZQ03tZdpdC3ZNfsGYx6i/FaJDr2rNxAxDHsU0k0pKwDhifD18iD80O8QC2dii
+2ZwXft+KcInOPc47EBoAHndsDN9jYYPQkv5bxvO4xenJlqoP7fex6VE0upZVtyA2slbogO
+1le9PWAFGxWzJxs2sGvAW6Fp+ctbUoA/9kstE/jD4FSAlUlW70+pN9OsBycPCyl240moC1
+g8xu+6hOiKnWRjDCzfCXyEemxqXrtTnFl46f7lAAAAAwEAAQAAAQBFcWl7JMRpRALL4hQW
+VvkH5F4rlgwMTGeqJld1pxXtRufFHHVmc2BSuHLgH0bKGnbnrokCWNAzl/r+II7SgKwCxs
+3dCVncPe4RfEr4rBwK5p/SF3R9xPdbBAr/gg4XTXZ2ZTCOSoSQbwO1LKEakjcv0im5RLs1
+/tBysasChIZgW9x4gGj7Kv4kz6Ojak/enlylwoz4q/dxaX9wV0op8YbnBubI3PS4gosYyz
+fR9QAQbLrugo79xM9MpH1XjpQmk4UkuJX+OWqtZHq4Q2ZLuCoN4dv/mDcijAa/+lVtzerj
+Ku6XtUREHRfdbKi88j+E7N4CfLW26UmV5xQhRjC8m+b5AAAAgQDoBpIUKoLEVVsWjc6n/e
+TGip/qTlzcakODPELOzFK13GCAb/gj/sPxT6tUa382X9jcotgFSYBnO2TFA8gbBSXovWZv
+zrXsNwfQBnvKih1Wngsq/bk7MYUvNPC0zomX0/dPi+riNb/5jLSEy5uICY4swMnsYb2Eyw
+5CO+eHC9yiWAAAAIEA6Rx6TvBlMvqt5YbmdOX6LdNi9KNbh4ZmimFJu95IuvYUDol0aDa+
+qc85GPBXt/vU6+mD3A1somE2WI2P0sswdYn+g7pbBdItA3NcCuqBFl735bOU6CQ5mygY2P
+B/AE43+jeQUFfjBM+lDJNB8adffyBOQBhgmGAqGCq/p6GtgvMAAACBANoxpAHC8Q4cm4No
+vsCefODzNUqgsOtgrJXfp3aDVx2pL9Ua71EAh2e5eWvr8YdvmhgU7ophAeEezQqt0nrQYW
+xheJQQd1hgm50DY9ssKNcFHd8BkLwGVRbgDfwhPLDektZZqRlbrVsqIBkDurVI764h2v8M
+G/fyU3Xv57Ed1vzHAAAAHm1vaGFtbWVkYWxydWpheWlATW9oYW1tZWRzLUFpcgECAwQ=
+-----END OPENSSH PRIVATE KEY-----

{cycls-0.0.2.11 → cycls-0.0.2.13}/pyproject.toml

@@ -1,9 +1,6 @@
 [tool.poetry]
-#name = "cycls-dev"
-#version = "0.0.1.3"
-
 name = "cycls"
-version = "0.0.2.11"
+version = "0.0.2.13"
 
 packages = [{ include = "cycls" }]
 description = "Cycls SDK"
@@ -14,6 +11,7 @@ readme = "README.md"
 python = "^3.8"
 fastapi = "^0.111.0"
 httpx = "^0.27.0"
+asyncssh = "^2.14.2"
 
 
 [build-system]

cycls-0.0.2.11/cycls/cycls.py

@@ -1,114 +0,0 @@
-from fastapi import FastAPI, Request
-from fastapi.responses import StreamingResponse, PlainTextResponse
-from pydantic import BaseModel
-
-from functools import wraps
-import uvicorn, socket, httpx
-import inspect
-
-from concurrent.futures import ThreadPoolExecutor
-import time, subprocess
-
-import os
-current_dir = os.path.dirname(os.path.abspath(__file__))
-key_path = os.path.join(current_dir, 'key.pub')
-# print(key_path)
-
-from typing import List, Dict
-class Message(BaseModel):
-    handle: str
-    content: str
-    history: List[Dict[str, str]] = []
-
-def find_available_port(start_port):
-    port = start_port
-    while True:
-        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-            if s.connect_ex(('localhost', port)) != 0:
-                return port
-            port += 1
-
-class Cycls:
-    def __init__(self,network="https://cycls.com", port=find_available_port(8001),url="",debug=False):
-        self.handle = None
-        self.server = FastAPI()
-        self.network = network
-        self.port = port
-        self.url = url
-        self.debug = debug
-
-    def __call__(self, handle):
-        self.handle = handle
-        def decorator(func):
-            if inspect.iscoroutinefunction(func):
-                @wraps(func)
-                async def async_wrapper(*args, **kwargs):
-                    return await func(*args, **kwargs)
-                self.server.post('/main')(async_wrapper)
-                self.publish()
-                return async_wrapper
-            else:
-                @wraps(func)
-                def sync_wrapper(*args, **kwargs):
-                    return func(*args, **kwargs)
-                self.server.post('/main')(sync_wrapper)
-                self.publish()
-                return sync_wrapper
-        return decorator
-
-    def publish(self):
-        prod=False
-        if self.url != "":
-            prod=True
-
-        if self.debug: print("✦/✧ debug = True")
-        if prod:
-            print("✦/✧","production mode",f"(url: {self.url}, port: {self.port})")
-        else:
-            print("✦/✧","development mode",f"(port: {self.port})")
-            # self.url = f"https://{self.handle}-cycls.tuns.sh"
-            self.url = f"https://{self.handle}-cycls.serveo.net"
-
-        print("")
-        print("✦/✧",f"https://cycls.com/@{self.handle}")
-        print("")
-
-        with ThreadPoolExecutor() as executor:
-            if not prod:
-                self.register('dev')
-                executor.submit(self.tunnel)
-            else:
-                self.register('prod')
-
-            if self.debug:
-                executor.submit(uvicorn.run(self.server, host="127.0.0.1", port=self.port)) # perhaps keep traces?
-            else:
-                executor.submit(uvicorn.run(self.server, host="127.0.0.1", port=self.port, log_level="critical")) # perhaps keep traces?
-
-    def register(self, mode):
-        try:
-            with httpx.Client() as client:
-                response = client.post(f"{self.network}/register", json={"handle": f"@{self.handle}", "url": self.url, "mode": mode})
-                if response.status_code==200:
-                    print(f"✦/✧ published 🎉")
-                    print("")
-                else:
-                    print("✦/✧ failed to register ⚠️") # exit app
-        except Exception as e:
-            print(f"An error occurred: {e}")
-
-    def tunnel(self):
-        # ssh_command = ['ssh', '-q', '-i', 'tuns', '-o', 'StrictHostKeyChecking=no', '-R', f'{self.handle}-cycls:80:localhost:{self.port}', 'tuns.sh']
-        # ssh_command = ['ssh', '-q', '-i', 'key.pub', '-o', 'StrictHostKeyChecking=no', '-R', f'{self.handle}-cycls:80:localhost:{self.port}', 'serveo.net']
-        ssh_command = ['ssh', '-q', '-i', key_path, '-o', 'StrictHostKeyChecking=no', '-R', f'{self.handle}-cycls:80:localhost:{self.port}', 'serveo.net']
-        try:
-            if self.debug: 
-                process = subprocess.run(ssh_command,stdin=subprocess.DEVNULL) # very tricky! STDIN is what was messing with me
-            else:
-                process = subprocess.run(ssh_command, stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-        except Exception as e:
-            print(f"An error occurred: {e}") # exit app
-
-Text = StreamingResponse
-
-# poetry publish --build

cycls-0.0.2.11/cycls/key.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC022DIsZ11836rKBvsXcd1H7AMbirWyFSZczn3KkwaheLE90DigO/WkYhPMP5XJ9L5MIGM9nemiQhciZdN9f7z9o0xJh72ZI2+tl5Fa77a9r+IsuWbhn8fNGIkzvyYx8zwSTZV/f2nMYr4I7sjTVFVlH2Een6R8RCZpJPe9Q4ph+k2BCp4DeKzCuOrH6t//flm4vZnP8EXXXpSxic0TpbSL+Is7jeRsZdA4/7LrASCxzxnz4e0RCyy61B/TCkOHbSk06SPjoykA9amMMQ3T0OaO72bimiiCbRqEudgX0gNSVTxcRpmPARNJJDk72gAuOwAD3cpvIiW1nPu6Zhgb2VozQhsN+Rmh3ZjlYRvBVsHbwAkGb0iTBrtLA9ghiPLD2oXWdRI6P5XnNvSRyRXcrt59e1w9Z6XmKOmRl94NYciaMqH1qEEVnNCWUZyYKpMWRseL7v95FSNEoIL47+I4OPTF657sxZHlE85Oxei858kS6/b8GUT4yJgCq/PnhjN7UtGYCVRSv6UHGgXGvLMZAtHmbs3RlhEeLsluPvzgsDhmO6XzdKgh/MZIHKMIP/BEU11FT2lh/kB4EP48dqQPJMFNefB1ybEC509RCSdzaDATYIGRi7+FV4B1O15nC3EQTudFJl7io3chsLbkayAbGRInYVUJ0WDA5Et7ekIKRPdfw== m@m