openrewrite-remote 0.14.0__py3-none-any.whl → 0.15.0__py3-none-any.whl

{openrewrite_remote-0.14.0.dist-info → openrewrite_remote-0.15.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: openrewrite-remote
-Version: 0.14.0
+Version: 0.15.0
 Summary: Remoting functionality for the OpenRewrite library.
 Author-email: "Moderne Inc." <support@moderne.io>
 License: Moderne, Inc. Commercial License

{openrewrite_remote-0.14.0.dist-info → openrewrite_remote-0.15.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ rewrite_remote/receiver.py,sha256=b2jMNwTfnWM0oDNjJQSWV1z_ahJ0kDZEXYdwNc4riIw,20
 rewrite_remote/remote_utils.py,sha256=gU9hN-aHxy9NF4uRqjd4OhvgPrNfDyCt3y1PtrWMCgA,10677
 rewrite_remote/remoting.py,sha256=yS2sYMPPBq0gt1xalmCTLbH4VXbBqNl-EXj8ZfgA5UM,13525
 rewrite_remote/sender.py,sha256=PXX0hrmeHKEge_7qWEMqNn4KYleDrFUQqhBDWTq1pus,18993
-rewrite_remote/server.py,sha256=TQ1cK6eAiJgY0ZAGl4huu5urI2Cm9DJpl-k8Is-IM1M,9466
+rewrite_remote/server.py,sha256=0-Y0e2eoXZctVELWK0M1VfsV8pPGFxwmzAL35dWb47E,9576
 rewrite_remote/type_utils.py,sha256=qzQ2X97U8yRskjOo3F5qcFVebW2bPYFU32EpCKL-KNU,4400
 rewrite_remote/handlers/__init__.py,sha256=ED6jHcYiuYpr_0vjGz0zx2lrrmJT9sDJCzIljoDfmlM,65
 rewrite_remote/handlers/handler_helpers.py,sha256=xvAKAVGH56Hrjp9sbilp4v1a2_ra0L63YjXurF5K5o0,512
@@ -17,8 +17,8 @@ rewrite_remote/handlers/pypi_manager.py,sha256=XulTdZUm5aTme7Qn-jaUvlgO6N9bKS03U
 rewrite_remote/handlers/recipe_install_handler.py,sha256=SsY7oXEJqE3mKUM_msnV0i-aUXmeUWpYjq_121ui3Z8,4920
 rewrite_remote/handlers/run_recipe_load_and_visitor_handler.py,sha256=BmsKjV38LenewWvun8cknGk_oR3GoinmmsXtWKUWUak,4085
 rewrite_remote/handlers/types.py,sha256=5TK_oFp-7iy1iACWisuQJsa_WHTsqcPrV9nQTZ-_xgo,518
-openrewrite_remote-0.14.0.dist-info/METADATA,sha256=ydjRf-SRkjLYHaWICk1zDeKw8gKDhL11Y_hm_kB29AM,386
-openrewrite_remote-0.14.0.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
-openrewrite_remote-0.14.0.dist-info/entry_points.txt,sha256=SMukuF7TPjQr3IZIcH8f98-_QBCqYSbYXYrVv-5UzRI,69
-openrewrite_remote-0.14.0.dist-info/top_level.txt,sha256=ansTioSZ-62aH3F2L3d1Bua0pJF4GOtgQ1PpG-CzcP0,15
-openrewrite_remote-0.14.0.dist-info/RECORD,,
+openrewrite_remote-0.15.0.dist-info/METADATA,sha256=N19AOSrTQ4rSurzMUOfn4YBg0caA-a5fNMRPzy9H0VI,386
+openrewrite_remote-0.15.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+openrewrite_remote-0.15.0.dist-info/entry_points.txt,sha256=SMukuF7TPjQr3IZIcH8f98-_QBCqYSbYXYrVv-5UzRI,69
+openrewrite_remote-0.15.0.dist-info/top_level.txt,sha256=ansTioSZ-62aH3F2L3d1Bua0pJF4GOtgQ1PpG-CzcP0,15
+openrewrite_remote-0.15.0.dist-info/RECORD,,

{openrewrite_remote-0.14.0.dist-info → openrewrite_remote-0.15.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.7.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

rewrite_remote/server.py

@@ -1,7 +1,9 @@
 # type: ignore
 import importlib
 import importlib.resources
+import logging
 import os
+import select
 import socket
 import sys
 import time
@@ -10,21 +12,7 @@ import zipfile
 from io import BytesIO, StringIO
 
 import cbor2
-import select
 from cbor2 import dumps
-from rewrite import (
-    ParserInput,
-    InMemoryExecutionContext,
-    ExecutionContext,
-    ParseError,
-    Recipe,
-)
-from rewrite.java.remote import *
-from rewrite.python import Py
-from rewrite.python.parser import PythonParserBuilder
-from rewrite.python.remote.receiver import PythonReceiver
-from rewrite.python.remote.sender import PythonSender
-
 from rewrite_remote.handlers.hello_world_handler import hello_world_handler
 from rewrite_remote.handlers.list_projects_handler import list_projects_handler
 from rewrite_remote.handlers.parse_project_sources_handler import (
@@ -37,20 +25,40 @@ from rewrite_remote.handlers.recipe_install_handler import (
 from rewrite_remote.handlers.run_recipe_load_and_visitor_handler import (
     run_recipe_load_and_visitor_handler,
 )
-from rewrite_remote.receiver import ReceiverContext
 from rewrite_remote.remoting import (
     RemotePrinterFactory,
     RemotingContext,
     RemotingMessageType,
     RemotingMessenger,
 )
-from rewrite_remote.sender import ParseErrorSender, SenderContext
+from rewrite_remote.sender import ParseErrorSender
+
+from rewrite import (
+    ParserInput,
+    InMemoryExecutionContext,
+    ExecutionContext,
+    ParseError,
+    Recipe,
+)
+from rewrite.java.remote import *
+from rewrite.python import Py
+from rewrite.python.parser import PythonParserBuilder
+from rewrite.python.remote.receiver import PythonReceiver
+from rewrite.python.remote.sender import PythonSender
 
 INACTIVITY_TIMEOUT = 300  # 5 minutes
 _OK: int = 0
 _ERROR: int = 1
 
 
+# Configure logging
+logging.basicConfig(
+    level=logging.DEBUG,
+    format='%(asctime)s - %(levelname)s - %(message)s',
+)
+logger = logging.getLogger('server')
+logger.setLevel(logging.DEBUG)
+
 def register_remoting_factories() -> None:
     SenderContext.register(ParseError, ParseErrorSender)
     SenderContext.register(Py, PythonSender)
@@ -109,7 +117,7 @@ class Server:
             with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as s:
                 s.bind(self._path)
                 s.listen()
-                print(f"Server listening on Unix domain socket: {self._path}")
+                logger.info(f"Server listening on Unix domain socket: {self._path}")
                 while True:
                     conn, _ = s.accept()
                     with conn:
@@ -119,7 +127,7 @@ class Server:
                 s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
                 s.bind(("localhost", self._port))
                 s.listen(5)
-                print(f"Server listening on port {self._port}")
+                logger.info(f"Server listening on port {self._port}")
                 last_activity_time = time.time()
                 while True:
                     s.settimeout(5)
@@ -132,7 +140,7 @@ class Server:
                     except socket.timeout:
                         current_time = time.time()
                         if current_time - last_activity_time >= self.timeout:
-                            print("No new connections for 5 minutes, shutting down server.")
+                            logger.info("No new connections for 5 minutes, shutting down server.")
                             break
 
     def handle_client(self, sock: socket.socket) -> None:
@@ -148,15 +156,11 @@ class Server:
                 assert cbor2.load(BytesIO(message_type)) == RemotingMessageType.Request
                 self._messenger.process_request(sock)
 
-                readable, _, _ = select.select([sock], [], [], 0.01)
-                if sock not in readable:
-                    return
-
         except (OSError, IOError):
-            # the socket was closed
+            logger.error("Socket was closed unexpectedly")
             return
         except Exception as e:
-            print(f"An error occurred while handling client: {e}")
+            logger.error(f"An error occurred while handling client: {e}")
             traceback.print_exc()
             if sock.fileno() != -1:
                 try:
@@ -165,12 +169,10 @@ class Server:
                     sock.send(dumps(_ERROR))
                     sock.send(dumps(traceback.format_exc()))
                 except (OSError, IOError):
-                    # the socket was closed
+                    logger.error("Failed to send error response, socket was closed")
                     return
                 except Exception as inner_exception:
-                    print(inner_exception)
-        finally:
-            sock.close()
+                    logger.error(f"An error occurred while sending error response: {inner_exception}")
 
     def parse_python_source(
         self,