vuer 0.0.26rc3__py3-none-any.whl → 0.0.27__py3-none-any.whl

vuer/base.py

@@ -42,10 +42,12 @@ async def handle_file_request(request, root, filename=None):
         filename = request.match_info["filename"]
 
     filepath = Path(root) / filename
+    print(filepath)
 
     if not filepath.is_file():
         raise web.HTTPNotFound()
 
+    print("return the file")
     return web.FileResponse(filepath)
 
 
@@ -82,17 +84,21 @@ class Server:
         ws_handler = partial(
             websocket_handler, handler=handler, max_msg_size=self.WEBSOCKET_MAX_SIZE
         )
-        self._route(path, ws_handler, method="GET")
+        self._route(path, ws_handler)
 
     @staticmethod
     def _add_task(fn: Coroutine, name=None):
         loop = asyncio.get_event_loop()
         loop.create_task(fn, name=name)
 
-    def _static(self, path, root, filename=None):
-        _fn = partial(handle_file_request, root=root, filename=None)
+    def _static(self, path, root):
+        _fn = partial(handle_file_request, root=root)
         self._route(f"{path}/{{filename:.*}}", _fn, method="GET")
 
+    def _static_file(self, path, root, filename=None):
+        _fn = partial(handle_file_request, root=root, filename=filename)
+        self._route(f"{path}", _fn, method="GET")
+
     def run(self):
         async def init_server():
             runner = web.AppRunner(self.app)

vuer/server.py

@@ -6,14 +6,15 @@ from pathlib import Path
 from typing import cast, Callable, Coroutine, Dict
 from uuid import uuid4
 
-from aiohttp.web_request import Request
+from aiohttp.hdrs import UPGRADE
+from aiohttp.web_request import Request, BaseRequest
 from aiohttp.web_response import Response
 from aiohttp.web_ws import WebSocketResponse
 from msgpack import packb, unpackb
 from params_proto import Proto, PrefixProto
 from websockets import ConnectionClosedError
 
-from vuer.base import Server
+from vuer.base import Server, handle_file_request, websocket_handler
 from vuer.events import (
     ClientEvent,
     NullEvent,
@@ -248,6 +249,9 @@ class VuerSession:
         yield from self.downlink_queue
 
 
+DEFAULT_PORT = 8012
+
+
 class Vuer(PrefixProto, Server):
     """Vuer Server
 
@@ -282,16 +286,16 @@ class Vuer(PrefixProto, Server):
     """
 
     name = "vuer"
-    uri = "ws://localhost:8012"
-    # change to vuer.dash.ml
     domain = "https://vuer.ai"
-    port = 8012
+    port = DEFAULT_PORT
     free_port = True
     static_root = "."
     queue_len = 100  # use a max length to avoid the memory from blowing up.
     cors = "https://vuer.ai,https://dash.ml,http://localhost:8000,http://127.0.0.1:8000,*"
     queries = Proto({}, help="query parameters to pass")
 
+    client_root = Path(__file__).parent / "client_build"
+
     device = "cuda"
 
     def _proxy(self, ws_id) -> "VuerSession":
@@ -432,11 +436,20 @@ class Vuer(PrefixProto, Server):
         Get the URL for the Tassa.
         :return: The URL for the Tassa.
         """
-        if self.queries:
-            query_str = "&".join([f"{k}={v}" for k, v in self.queries.items()])
-            return f"{self.domain}?ws={self.uri}&" + query_str
+        if self.port != DEFAULT_PORT:
+            uri = f"ws://localhost:{self.port}"
+
+            if self.queries:
+                query_str = "&".join([f"{k}={v}" for k, v in self.queries.items()])
+                return f"{self.domain}?ws={uri}&" + query_str
+
+            return f"{self.domain}?ws={uri}"
+        else:
+            if self.queries:
+                query_str = "&".join([f"{k}={v}" for k, v in self.queries.items()])
+                return f"{self.domain}?" + query_str
 
-        return f"{self.domain}?ws={self.uri}"
+            return f"{self.domain}"
 
     async def send(self, ws_id, event: ServerEvent = None, event_bytes=None):
         ws = self.ws[ws_id]
@@ -672,12 +685,31 @@ class Vuer(PrefixProto, Server):
 
         return ttl_handler()
 
+    async def socket_index(self, request: BaseRequest):
+        """This is the relay object for sending events to the server.
+
+        Todo: add API for specifying the websocket ID. Or just broadcast to all.
+        Todo: add type hint
+
+        Interface:
+            <uri>/relay?sid=<websocket_id>
+
+        :return:
+            - Status 200
+            - Status 400
+
+        """
+        headers = request.headers
+        if "websocket" != headers.get(UPGRADE, "").lower().strip():
+            return await handle_file_request(request, self.client_root, filename="index.html")
+        else:
+            return await websocket_handler(request, self.downlink)
+
     def run(self, kill=None, *args, **kwargs):
         import os
 
         # protocol, host, _ = self.uri.split(":")
         # port = int(_)
-
         if kill or self.free_port:
             import time
             from killport import kill_ports
@@ -685,12 +717,14 @@ class Vuer(PrefixProto, Server):
             kill_ports(ports=[self.port])
             time.sleep(0.01)
 
-        self._socket("", self.downlink)
-
         # Serve the client build locally.
-        self._static("/client", Path(__file__).parent / "client_build", filename="index.html")
-        self._static("/assets", Path(__file__).parent / "client_build/assets")
-        self._static("/hands", Path(__file__).parent / "client_build/hands")
+        # self._socket("", self.downlink)
+        # self._static_file("", Path(__file__).parent / "client_build", filename="index.html")
+
+        # use the same endpoint for websocket and file serving.
+        self._route("", self.socket_index, method="GET")
+        self._static("/assets", self.client_root / "assets")
+        self._static("/hands", self.client_root / "hands")
 
         # serve local files via /static endpoint
         self._static("/static", self.static_root)

{vuer-0.0.26rc3.dist-info → vuer-0.0.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vuer
-Version: 0.0.26rc3
+Version: 0.0.27
 Home-page: https://github.com/geyang/vuer
 Author: Ge Yang<ge.ike.yang@gmail.com>
 Author-email: ge.ike.yang@gmail.com

{vuer-0.0.26rc3.dist-info → vuer-0.0.27.dist-info}/RECORD

@@ -1,16 +1,16 @@
 vuer/__init__.py,sha256=cP-Ua-bx3mq-3hsnFHAbiGwTnm25hm4wcXp1KhMKCJg,455
-vuer/base.py,sha256=IahJKIdN7CbubU5mC_YLXhpXyQVq2EX1vupApICo314,3154
+vuer/base.py,sha256=9osGTVqkX4jDn2xwjaPFJ9PC9dYgLHqa-75lUYbPXpw,3338
 vuer/events.py,sha256=8AAzkfbm5jHkeMh17Z57n8YTxF4mheWC3Qbya4XkQSc,7291
 vuer/schemas.py,sha256=aZOocE02gO43SLLfeYSxxac0x38TmyTcfs_iFh5hsJ4,18152
 vuer/serdes.py,sha256=gD2iA9Yypu1QjocneOT3Nc0y6q_mdHn9zW1ko5j3I7c,2600
-vuer/server.py,sha256=JBArX9UCNGKHDjnzNHNW_DD1yPjN8p9l8KVP4DLbFSc,21230
+vuer/server.py,sha256=mNbRAR59AyZsF01OEBVrN77IOzCKn02zu-a7yI9hyxU,22398
 vuer/types.py,sha256=N2KLa0fl6z8Jm6cJwZoD8Vqrins_AayG5BCGk1p3Eek,1279
 vuer/__pycache__/__init__.cpython-38.pyc,sha256=TZwyVHL5u0P7WrGMPA7crPL24QD4IGqK_Mc49i_AhrE,580
-vuer/__pycache__/base.cpython-38.pyc,sha256=xujTmsYu8GhoivoH0-2kbMK-ypye2xPuw2jXJ6wcLRQ,3844
+vuer/__pycache__/base.cpython-38.pyc,sha256=5g9zSvLYkacji6nEgmytTtSsWmdwRfIUa4OiJACvDU0,4059
 vuer/__pycache__/events.cpython-38.pyc,sha256=zx3bXeJixqOyCFe2nA7qpq6jiCJ49kRaXO-xONGUyeQ,9616
 vuer/__pycache__/schemas.cpython-38.pyc,sha256=hvY9Aak8zE-zKcWiwuNe6DghOw9qH_zSe_FtkBOAPPk,23234
 vuer/__pycache__/serdes.cpython-38.pyc,sha256=KMxTjPEWuSGn2bqBAl5OLIDSCSoqfPDGfk3fvNnRDYA,2253
-vuer/__pycache__/server.cpython-38.pyc,sha256=Lgh3c7KWdlOZP2gAPS--QVE4XGz1hUGI8AtFNOCbtu0,19892
+vuer/__pycache__/server.cpython-38.pyc,sha256=nNWECHle-JuKsMTveG7APYe0mjeRDj-qByhoBfQqojU,20493
 vuer/__pycache__/types.cpython-38.pyc,sha256=IhlXtkT-XWM0V1420FDuoqIYnpvRvekYVkGqEK7fAV8,1819
 vuer/addons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vuer/addons/nerf_vuer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -53,9 +53,9 @@ vuer/schemas/__pycache__/__init__.cpython-38.pyc,sha256=NRnVrpIDBKne93xOUY1-Wpav
 vuer/schemas/__pycache__/drei_components.cpython-38.pyc,sha256=g_ufcKxf-XKfZLdUV-HqKnjIrgxGWFv51aHLWQgH-ws,7712
 vuer/schemas/__pycache__/html_components.cpython-38.pyc,sha256=q0DMFwNkYbnaH1A8w3BowMiQAlmGpFWOOKsjLVE6CIk,8215
 vuer/schemas/__pycache__/scene_components.cpython-38.pyc,sha256=NjlInOQt1FVLHXNmmQ_bkRb-GZp2ffbBLwZxmb2bpWc,21917
-vuer-0.0.26rc3.dist-info/LICENSE,sha256=MGF-inVBUaGe2mEjqT0g6XsHIXwoNXgNHqD7Z1MzR0k,1063
-vuer-0.0.26rc3.dist-info/METADATA,sha256=2o4EVFimCQZonokNg3I2cRutY6zsNdT-E-oUMETqdiY,5342
-vuer-0.0.26rc3.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-vuer-0.0.26rc3.dist-info/entry_points.txt,sha256=J_NM6fbpipmD9oP7cdxd1UyBR8mVEQVx0xjlE_56yss,41
-vuer-0.0.26rc3.dist-info/top_level.txt,sha256=ermmVkwvGFAK4gfSgDIwOmKpxwpqNt-oo7gVQQUSHok,5
-vuer-0.0.26rc3.dist-info/RECORD,,
+vuer-0.0.27.dist-info/LICENSE,sha256=MGF-inVBUaGe2mEjqT0g6XsHIXwoNXgNHqD7Z1MzR0k,1063
+vuer-0.0.27.dist-info/METADATA,sha256=OZJst5em2LrP9AuwFZmDtzP863P9p6KFTOmmPWlWvN8,5339
+vuer-0.0.27.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+vuer-0.0.27.dist-info/entry_points.txt,sha256=J_NM6fbpipmD9oP7cdxd1UyBR8mVEQVx0xjlE_56yss,41
+vuer-0.0.27.dist-info/top_level.txt,sha256=ermmVkwvGFAK4gfSgDIwOmKpxwpqNt-oo7gVQQUSHok,5
+vuer-0.0.27.dist-info/RECORD,,