ocp-vscode 2.3.1__tar.gz → 2.3.2__tar.gz

{ocp_vscode-2.3.1 → ocp_vscode-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocp_vscode
-Version: 2.3.1
+Version: 2.3.2
 Summary: OCP CAD Viewer for VSCode
 Home-page: https://github.com/bernhard-42/vscode-ocp-cad-viewer
 Author: Bernhard Walter
@@ -21,6 +21,6 @@ Requires-Dist: ocp-tessellate<2.4.0,>=2.3.2
 Requires-Dist: requests
 Requires-Dist: ipykernel
 Requires-Dist: orjson
-Requires-Dist: websockets<11.1,>=11.0
+Requires-Dist: websockets>=12.0
 
 An extension to show OCP cad CAD objects (CadQuery, build123d) in VS Code via threejs

{ocp_vscode-2.3.1 → ocp_vscode-2.3.2}/README.md

@@ -21,7 +21,7 @@ _OCP CAD Viewer_ for VS Code is an extension to show [CadQuery](https://github.c
 
 ### Installation
 
-1. Open the VS Code Marketplace, and search and install _OCP CAD Viewer 2.2.1_.
+1. Open the VS Code Marketplace, and search and install _OCP CAD Viewer 2.3.2_.
 
     Afterwards the OCP viewer is available in the VS Code sidebar:
 
@@ -202,14 +202,18 @@ NATIVE_TESSELLATOR=1 OCP_VSCODE_PYTEST=1 pytest -v -s pytests/
 
 ## Changes
 
+v2.3.2
+- Fix regression that Python script hang in threading before exit ([#73](https://github.com/bernhard-42/vscode-ocp-cad-viewer/issues/60))
+
 v2.3.1
 - Add latest ocp-tessellate to fixed regression with handling instances
 - Make native default if ocp-addons exists
 
 v2.3.0
-- Add newest ocp-tessellate to allow using native tessellator from ocp_addons
-- Fine tune communication to ensure the memory view of buffers will be passed through to javascript for performance
-- Use of the new protocol v3 of three-cad-viewer
+Fine tune communication to ensure the memory view of buffers will be passed through to javascript for performance (*)
+Use of the new protocol v3 of three-cad-viewer
+Fix show_all regressions https://github.com/bernhard-42/vscode-ocp-cad-viewer/issues/71. It should also properly catch exceptions now to not interrupt viausl debugging
+Add newest ocp-tessellate to allow using native tessellator from ocp_addons
 
 v2.2.2
 - Fix regression in measure tools

{ocp_vscode-2.3.1 → ocp_vscode-2.3.2}/ocp_vscode/__init__.py

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "2.3.1"
+__version__ = "2.3.2"
 
 import os
 

{ocp_vscode-2.3.1 → ocp_vscode-2.3.2}/ocp_vscode/comms.py

@@ -8,7 +8,10 @@ import socket
 
 from pathlib import Path
 
-from websockets.sync.client import connect
+# TODO:
+# As soon as websockets 12.1 is released, replace with
+#   "from websockets.sync.client import connect"
+from .daemonize import connect
 
 import orjson
 from ocp_tessellate.utils import Timer
@@ -34,7 +37,7 @@ CMD_URL = "ws://127.0.0.1"
 CMD_PORT = 3939
 
 INIT_DONE = False
-
+WS = None
 
 #
 # Send data to the viewer
@@ -110,6 +113,8 @@ def set_port(port):
 
 def _send(data, message_type, port=None, timeit=False):
     """Send data to the viewer"""
+    global WS
+
     if port is None:
         if not INIT_DONE:
             find_and_set_port()
@@ -132,13 +137,14 @@ def _send(data, message_type, port=None, timeit=False):
                 j = b"S:" + j
 
         with Timer(timeit, "", f"websocket send {len(j)/1024/1024:.3f} MB", 1):
-            ws = connect(f"{CMD_URL}:{port}")
-            ws.send(j)
+            if WS is None:
+                WS = connect(f"{CMD_URL}:{port}")
+            WS.send(j)
 
             result = None
             if message_type == MessageType.COMMAND:
                 try:
-                    result = json.loads(ws.recv())
+                    result = json.loads(WS.recv())
                 except Exception as ex:  # pylint: disable=broad-except
                     print(ex)
 

ocp_vscode-2.3.2/ocp_vscode/daemonize.py

@@ -0,0 +1,199 @@
+# Copyright (c) Aymeric Augustin and contributors
+# see https://github.com/python-websockets/websockets/blob/main/LICENSE
+
+import logging
+import socket
+import threading
+import uuid
+from typing import Optional, Dict
+
+from websockets.sync.client import ClientProtocol, connect as _connect
+from websockets.sync.connection import Connection
+from websockets.sync.messages import Assembler
+from websockets.sync.utils import Deadline
+from websockets.datastructures import HeadersLike
+from websockets.protocol import Protocol
+from websockets.http import USER_AGENT
+from websockets.http11 import Request, Response
+from websockets.protocol import CONNECTING, OPEN, Event
+from websockets.typing import LoggerLike
+
+
+class DaemonConnection(Connection):
+    """
+    Threaded implementation of a WebSocket connection.
+
+    :class:`Connection` provides APIs shared between WebSocket servers and
+    clients.
+
+    You shouldn't use it directly. Instead, use
+    :class:`~websockets.sync.client.ClientConnection` or
+    :class:`~websockets.sync.server.ServerConnection`.
+
+    """
+
+    recv_bufsize = 65536
+
+    def __init__(
+        self,
+        socket: socket.socket,
+        protocol: Protocol,
+        *,
+        close_timeout: Optional[float] = 10,
+    ) -> None:
+        self.socket = socket
+        self.protocol = protocol
+        self.close_timeout = close_timeout
+
+        # Inject reference to this instance in the protocol's logger.
+        self.protocol.logger = logging.LoggerAdapter(
+            self.protocol.logger,
+            {"websocket": self},
+        )
+
+        # Copy attributes from the protocol for convenience.
+        self.id: uuid.UUID = self.protocol.id
+        """Unique identifier of the connection. Useful in logs."""
+        self.logger: LoggerLike = self.protocol.logger
+        """Logger for this connection."""
+        self.debug = self.protocol.debug
+
+        # HTTP handshake request and response.
+        self.request: Optional[Request] = None
+        """Opening handshake request."""
+        self.response: Optional[Response] = None
+        """Opening handshake response."""
+
+        # Mutex serializing interactions with the protocol.
+        self.protocol_mutex = threading.Lock()
+
+        # Assembler turning frames into messages and serializing reads.
+        self.recv_messages = Assembler()
+
+        # Whether we are busy sending a fragmented message.
+        self.send_in_progress = False
+
+        # Deadline for the closing handshake.
+        self.close_deadline: Optional[Deadline] = None
+
+        # Mapping of ping IDs to pong waiters, in chronological order.
+        self.pings: Dict[bytes, threading.Event] = {}
+
+        # Receiving events from the socket.
+
+        # !!! Start patch based on 12.0 (this is the only patched line) !!!
+        # self.recv_events_thread = threading.Thread(target=self.recv_events)
+        self.recv_events_thread = threading.Thread(target=self.recv_events, daemon=True)
+        # !!! End patch !!!
+
+        self.recv_events_thread.start()
+
+        # Exception raised in recv_events, to be chained to ConnectionClosed
+        # in the user thread in order to show why the TCP connection dropped.
+        self.recv_events_exc: Optional[BaseException] = None
+
+
+class DaemonClientConnection(DaemonConnection):
+    """
+    Threaded implementation of a WebSocket client connection.
+
+    :class:`ClientConnection` provides :meth:`recv` and :meth:`send` methods for
+    receiving and sending messages.
+
+    It supports iteration to receive messages::
+
+        for message in websocket:
+            process(message)
+
+    The iterator exits normally when the connection is closed with close code
+    1000 (OK) or 1001 (going away) or without a close code. It raises a
+    :exc:`~websockets.exceptions.ConnectionClosedError` when the connection is
+    closed with any other code.
+
+    Args:
+        socket: Socket connected to a WebSocket server.
+        protocol: Sans-I/O connection.
+        close_timeout: Timeout for closing the connection in seconds.
+
+    """
+
+    def __init__(
+        self,
+        socket: socket.socket,
+        protocol: ClientProtocol,
+        *,
+        close_timeout: Optional[float] = 10,
+    ) -> None:
+        self.protocol: ClientProtocol
+        self.response_rcvd = threading.Event()
+        super().__init__(
+            socket,
+            protocol,
+            close_timeout=close_timeout,
+        )
+
+    def handshake(
+        self,
+        additional_headers: Optional[HeadersLike] = None,
+        user_agent_header: Optional[str] = USER_AGENT,
+        timeout: Optional[float] = None,
+    ) -> None:
+        """
+        Perform the opening handshake.
+
+        """
+        with self.send_context(expected_state=CONNECTING):
+            self.request = self.protocol.connect()
+            if additional_headers is not None:
+                self.request.headers.update(additional_headers)
+            if user_agent_header is not None:
+                self.request.headers["User-Agent"] = user_agent_header
+            self.protocol.send_request(self.request)
+
+        if not self.response_rcvd.wait(timeout):
+            self.close_socket()
+            self.recv_events_thread.join()
+            raise TimeoutError("timed out during handshake")
+
+        if self.response is None:
+            self.close_socket()
+            self.recv_events_thread.join()
+            raise ConnectionError("connection closed during handshake")
+
+        if self.protocol.state is not OPEN:
+            self.recv_events_thread.join(self.close_timeout)
+            self.close_socket()
+            self.recv_events_thread.join()
+
+        if self.protocol.handshake_exc is not None:
+            raise self.protocol.handshake_exc
+
+    def process_event(self, event: Event) -> None:
+        """
+        Process one incoming event.
+
+        """
+        # First event - handshake response.
+        if self.response is None:
+            assert isinstance(event, Response)
+            self.response = event
+            self.response_rcvd.set()
+        # Later events - frames.
+        else:
+            super().process_event(event)
+
+    def recv_events(self) -> None:
+        """
+        Read incoming data from the socket and process events.
+
+        """
+        try:
+            super().recv_events()
+        finally:
+            # If the connection is closed during the handshake, unblock it.
+            self.response_rcvd.set()
+
+
+# Simple shim
+def connect(url):
+    return _connect(url, create_connection=DaemonClientConnection)

{ocp_vscode-2.3.1 → ocp_vscode-2.3.2}/ocp_vscode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocp_vscode
-Version: 2.3.1
+Version: 2.3.2
 Summary: OCP CAD Viewer for VSCode
 Home-page: https://github.com/bernhard-42/vscode-ocp-cad-viewer
 Author: Bernhard Walter
@@ -21,6 +21,6 @@ Requires-Dist: ocp-tessellate<2.4.0,>=2.3.2
 Requires-Dist: requests
 Requires-Dist: ipykernel
 Requires-Dist: orjson
-Requires-Dist: websockets<11.1,>=11.0
+Requires-Dist: websockets>=12.0
 
 An extension to show OCP cad CAD objects (CadQuery, build123d) in VS Code via threejs

{ocp_vscode-2.3.1 → ocp_vscode-2.3.2}/ocp_vscode.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ ocp_vscode/build123d.py
 ocp_vscode/colors.py
 ocp_vscode/comms.py
 ocp_vscode/config.py
+ocp_vscode/daemonize.py
 ocp_vscode/show.py
 ocp_vscode/state.py
 ocp_vscode.egg-info/PKG-INFO

{ocp_vscode-2.3.1 → ocp_vscode-2.3.2}/ocp_vscode.egg-info/requires.txt

@@ -2,4 +2,4 @@ ocp-tessellate<2.4.0,>=2.3.2
 requests
 ipykernel
 orjson
-websockets<11.1,>=11.0
+websockets>=12.0

{ocp_vscode-2.3.1 → ocp_vscode-2.3.2}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.3.1
+current_version = 2.3.2
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?P<release>\D*)(?P<build>\d*)

{ocp_vscode-2.3.1 → ocp_vscode-2.3.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup_args = {
     "name": "ocp_vscode",
-    "version": "2.3.1",
+    "version": "2.3.2",
     "description": "OCP CAD Viewer for VSCode",
     "long_description": "An extension to show OCP cad CAD objects (CadQuery, build123d) in VS Code via threejs",
     "include_package_data": True,
@@ -12,7 +12,7 @@ setup_args = {
         "requests",
         "ipykernel",
         "orjson",
-        "websockets>=11.0,<11.1",
+        "websockets>=12.0",
     ],
     "packages": find_packages(),
     "zip_safe": False,