Merge pull request #84 from labthings/improved-dns-sd

Improved DNS-SD

Author: jtc42

examples/simple_extensions.py

@@ -168,7 +168,6 @@ def get(self):
 # Create LabThings Flask app
 app, labthing = create_app(
     __name__,
-    prefix="/api",
     title="My Lab Device API",
     description="Test LabThing-based API",
     version="0.1.0",

examples/static/index.html

@@ -0,0 +1 @@
+<h1>Hello world</h1>

examples/static/subfolder/index.html

@@ -0,0 +1 @@
+<h1>Hello subfolder</h1>

src/labthings/server/extensions.py

@@ -54,6 +54,9 @@ def __init__(
         self.add_view(
             self.static_view_class, f"{static_url_path}/<path:path>", endpoint="static"
         )
+        self.add_view(
+            self.static_view_class, f"{static_url_path}", endpoint="static_root"
+        )
 
     @property
     def views(self):

src/labthings/server/view/builder.py

@@ -7,7 +7,9 @@
 from . import View, ActionView, PropertyView
 from ..spec.utilities import compile_view_spec
 
-from flask import send_from_directory
+import os
+import glob
+from flask import send_file, abort
 import uuid
 
 
@@ -124,8 +126,19 @@ def static_from(static_folder: str, name=None):
         name = f"static-{uid}"
 
     # Create inner functions
-    def _get(self, path):
-        return send_from_directory(static_folder, path)
+    def _get(self, path=""):
+        full_path = os.path.join(static_folder, path)
+        if not os.path.exists(full_path):
+            return abort(404)
+
+        if os.path.isfile(full_path):
+            return send_file(full_path)
+
+        if os.path.isdir(full_path):
+            indexes = glob.glob(os.path.join(full_path, "index.*"))
+            if not indexes:
+                return abort(404)
+            return send_file(indexes[0])
 
     # Generate a basic property class
     generated_class = type(name, (View, object), {"get": _get})

src/labthings/server/wsgi/gevent.py

@@ -37,35 +37,53 @@ def __init__(
         self.wsgi_server = None
         self.zeroconf_server = None
         self.service_info = None
+        self.service_infos = []
 
         # Events
         self.started_event = gevent.event.Event()
 
     def register_zeroconf(self):
         if self.labthing:
-            self.service_info = ServiceInfo(
-                "_labthings._tcp.local.",
-                f"{self.labthing.safe_title}._labthings._tcp.local.",
-                port=self.port,
-                properties={
-                    "path": self.labthing.url_prefix,
-                    "title": self.labthing.title,
-                    "description": self.labthing.description,
-                    "types": ";".join(self.labthing.types),
-                },
-                addresses={
-                    socket.inet_aton(i)
-                    for i in get_all_addresses()
-                    if i not in ("127.0.0.1", "0.0.0.0")
-                },
+            # Get list of host addresses
+            mdns_addresses = {
+                socket.inet_aton(i)
+                for i in get_all_addresses()
+                if i not in ("127.0.0.1", "0.0.0.0")
+            }
+            # LabThing service
+            self.service_infos.append(
+                ServiceInfo(
+                    "_labthing._tcp.local.",
+                    f"{self.labthing.safe_title}._labthing._tcp.local.",
+                    port=self.port,
+                    properties={
+                        "path": self.labthing.url_prefix,
+                        "title": self.labthing.title,
+                        "description": self.labthing.description,
+                        "types": ";".join(self.labthing.types),
+                    },
+                    addresses=mdns_addresses,
+                )
+            )
+            # Mozilla WebThing service
+            self.service_infos.append(
+                ServiceInfo(
+                    "_webthing._tcp.local.",
+                    f"{self.labthing.safe_title}._webthing._tcp.local.",
+                    port=self.port,
+                    properties={"path": self.labthing.url_prefix},
+                    addresses=mdns_addresses,
+                )
             )
             self.zeroconf_server = Zeroconf(ip_version=IPVersion.V4Only)
-            self.zeroconf_server.register_service(self.service_info)
+            for service in self.service_infos:
+                self.zeroconf_server.register_service(service)
 
     def stop(self, timeout=1):
         # Unregister zeroconf service
         if self.zeroconf_server:
-            self.zeroconf_server.unregister_service(self.service_info)
+            for service in self.service_infos:
+                self.zeroconf_server.unregister_service(service)
             self.zeroconf_server.close()
             self.zeroconf_server = None
         # Stop WSGI server with timeout