dsf-python 3.6.0b2__tar.gz → 3.6.0b2.post2__tar.gz

{dsf_python-3.6.0b2/src/dsf_python.egg-info → dsf_python-3.6.0b2.post2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dsf-python
-Version: 3.6.0b2
+Version: 3.6.0b2.post2
 Summary: Python interface to access DuetSoftwareFramework
 Home-page: https://github.com/Duet3D/dsf-python
 Author: Duet3D Ltd.

{dsf_python-3.6.0b2 → dsf_python-3.6.0b2.post2}/setup.py

@@ -6,7 +6,7 @@ long_description = open("README.md", encoding="utf-8").read()
 
 setuptools.setup(
     name="dsf-python",
-    version="3.6.0-b2",
+    version="3.6.0-b2.post2",
     description="Python interface to access DuetSoftwareFramework",
     long_description=long_description,
     long_description_content_type="text/markdown",

{dsf_python-3.6.0b2 → dsf_python-3.6.0b2.post2}/src/dsf/__init__.py

@@ -1,3 +1,5 @@
+__version__ = "3.6.0-b2.post2"
+
 # path to unix socket file
 SOCKET_FILE = "/run/dsf/dcs.sock"
 

{dsf_python-3.6.0b2 → dsf_python-3.6.0b2.post2}/src/dsf/http.py

@@ -1,5 +1,8 @@
 import asyncio
 import json
+import socket
+import stat
+import errno
 import os
 from concurrent.futures import ThreadPoolExecutor
 from enum import Enum
@@ -11,10 +14,11 @@ from .object_model import HttpEndpointType
 class HttpResponseType(str, Enum):
     """Enumeration of supported HTTP responses"""
 
-    StatusCode = "StatusCode"
-    PlainText = "PlainText"
-    JSON = "JSON"
-    File = "File"
+    StatusCode = "statuscode"
+    PlainText = "plainText"
+    JSON = "json"
+    File = "file"
+    URI = "uri"
 
 
 class ReceivedHttpRequest:
@@ -47,7 +51,7 @@ class HttpEndpointConnection:
         """Close the connection"""
         self.writer.close()
 
-    async def read_request(self):
+    async def read_request(self) -> ReceivedHttpRequest:
         """
         Read information about the last HTTP request.
         Note that a call to this method may fail!
@@ -67,9 +71,9 @@ class HttpEndpointConnection:
         try:
             await self.send(
                 {
-                    "StatusCode": status_code,
-                    "Response": response,
-                    "ResponseType": response_type,
+                    "statusCode": status_code,
+                    "response": response,
+                    "responseType": response_type,
                 }
             )
         finally:
@@ -149,11 +153,47 @@ class HttpEndpointUnixSocket:
         """Set the handler to handle client connections"""
         self.handler = handler
 
+    def _create_socket(self, path: str):
+        path = os.fspath(path)
+        sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+
+        # Check for abstract socket. `str` and `bytes` paths are supported.
+        if path[0] not in (0, '\x00'):
+            try:
+                if stat.S_ISSOCK(os.stat(path).st_mode):
+                    os.remove(path)
+            except FileNotFoundError:
+                pass
+            except OSError as err:
+                # Directory may have permissions only to create socket.
+                # logger.error('Unable to check or remove stale UNIX socket '
+                #                 '%r: %r', path, err)
+                pass
+
+        try:
+            sock.bind(path)
+            os.chmod(path, os.stat(path).st_mode | stat.S_IWGRP | stat.S_IRGRP)
+        except OSError as exc:
+            sock.close()
+            if exc.errno == errno.EADDRINUSE:
+                # Let's improve the error message by adding
+                # with what exact address it occurs.
+                msg = f'Address {path!r} is already in use'
+                raise OSError(errno.EADDRINUSE, msg) from None
+            else:
+                raise
+        except:
+            sock.close()
+            raise
+
+        return sock
+
     def start_connection_listener(self):
         try:
             self._loop = asyncio.new_event_loop()
+            sock = self._create_socket(self.socket_file)
             self._server = asyncio.start_unix_server(
-                self.handle_connection, self.socket_file, backlog=self.backlog
+                self.handle_connection, sock=sock, backlog=self.backlog
             )
             self._loop.create_task(self._server)
             self._loop.run_forever()

{dsf_python-3.6.0b2 → dsf_python-3.6.0b2.post2/src/dsf_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dsf-python
-Version: 3.6.0b2
+Version: 3.6.0b2.post2
 Summary: Python interface to access DuetSoftwareFramework
 Home-page: https://github.com/Duet3D/dsf-python
 Author: Duet3D Ltd.