Make ws gateway act as http server too

diff --git a/debian/gps303.conf b/debian/gps303.conf
index 9b8ea5bab6b9513069dec159243633ee9eccceb4..d77b58aab50dfcf23240e9957c91007ec8af9896 100644 (file)
--- a/debian/gps303.conf
+++ b/debian/gps303.conf
@@ -5,6 +5,7 @@ listenurl = ipc:///var/lib/gps303/responses
 
 [wsgateway]
 port = 5049
+htmlfile = /var/lib/gps303/index.html
 
 [storage]
 dbfn = /var/lib/gps303/gps303.sqlite

diff --git a/gps303/wsgateway.py b/gps303/wsgateway.py
index cc1cb7ec08dc0db5baafbfd89545e60bdced85d2..15a6517d0c61ac14535f346545b1c03607abcc1a 100644 (file)
--- a/gps303/wsgateway.py
+++ b/gps303/wsgateway.py
@@ -4,13 +4,68 @@ from logging import getLogger
 from socket import socket, AF_INET6, SOCK_STREAM, SOL_SOCKET, SO_REUSEADDR
 from time import time
 from wsproto import ConnectionType, WSConnection
-from wsproto.events import AcceptConnection, CloseConnection, Message, Ping, Request, TextMessage
+from wsproto.events import (
+    AcceptConnection,
+    CloseConnection,
+    Message,
+    Ping,
+    Request,
+    TextMessage,
+)
+from wsproto.utilities import RemoteProtocolError
 import zmq
 
 from . import common
 from .zmsg import LocEvt
 
 log = getLogger("gps303/wsgateway")
+htmldata = None
+
+
+def try_http(data, fd, e):
+    global htmldata
+    try:
+        lines = data.decode().split("\r\n")
+        request = lines[0]
+        headers = lines[1:]
+        op, resource, proto = request.split(" ")
+        log.debug(
+            "HTTP %s for %s, proto %s from fd %d, headers: %s",
+            op,
+            resource,
+            proto,
+            fd,
+            headers,
+        )
+        if op == "GET":
+            if htmldata is None:
+                return (
+                    f"{proto} 500 No data configured\r\n"
+                    f"Content-Type: text/plain\r\n\r\n"
+                    f"HTML data not configure on the server\r\n".encode()
+                )
+            elif resource == "/":
+                length = len(htmldata.encode("utf-8"))
+                return (
+                    f"{proto} 200 Ok\r\n"
+                    f"Content-Type: text/html; charset=utf-8\r\n"
+                    f"Content-Length: {length:d}\r\n\r\n" + htmldata
+                ).encode("utf-8")
+            else:
+                return (
+                    f"{proto} 404 File not found\r\n"
+                    f"Content-Type: text/plain\r\n\r\n"
+                    f"We can only serve \"/\"\r\n".encode()
+                )
+        else:
+            return (
+                f"{proto} 400 Bad request\r\n"
+                "Content-Type: text/plain\r\n\r\n"
+                "Bad request\r\n".encode()
+            )
+    except ValueError:
+        log.warning("Unparseable data from fd %d: %s", fd, data)
+        raise e
 
 
 class Client:
@@ -44,22 +99,33 @@ class Client:
             )
             self.ws.receive_data(None)
             return None
-        self.ws.receive_data(data)
-        msgs = []
-        for event in self.ws.events():
-            if isinstance(event, Request):
-                log.debug("WebSocket upgrade on fd %d", self.sock.fileno())
-                #self.ws_data += self.ws.send(event.response())  # Why not?!
-                self.ws_data += self.ws.send(AcceptConnection())
-            elif isinstance(event, (CloseConnection, Ping)):
-                log.debug("%s on fd %d", event, self.sock.fileno())
-                self.ws_data += self.ws.send(event.response())
-            elif isinstance(event, TextMessage):
-                # TODO: save imei "subscription"
-                log.debug("%s on fd %d", event, self.sock.fileno())
-                msgs.append(event.data)
-            else:
-                log.warning("%s on fd %d", event, self.sock.fileno())
+        try:
+            self.ws.receive_data(data)
+        except RemoteProtocolError as e:
+            log.debug(
+                "Websocket error on fd %d, try plain http (%s)",
+                self.sock.fileno(),
+                e,
+            )
+            self.ws_data = try_http(data, self.sock.fileno(), e)
+            log.debug("Sending HTTP response to %d", self.sock.fileno())
+            msgs = None
+        else:
+            msgs = []
+            for event in self.ws.events():
+                if isinstance(event, Request):
+                    log.debug("WebSocket upgrade on fd %d", self.sock.fileno())
+                    # self.ws_data += self.ws.send(event.response())  # Why not?!
+                    self.ws_data += self.ws.send(AcceptConnection())
+                elif isinstance(event, (CloseConnection, Ping)):
+                    log.debug("%s on fd %d", event, self.sock.fileno())
+                    self.ws_data += self.ws.send(event.response())
+                elif isinstance(event, TextMessage):
+                    # TODO: save imei "subscription"
+                    log.debug("%s on fd %d", event, self.sock.fileno())
+                    msgs.append(event.data)
+                else:
+                    log.warning("%s on fd %d", event, self.sock.fileno())
         if self.ws_data:  # Temp hack
             self.write()
         return msgs
@@ -74,9 +140,8 @@ class Client:
             self.ws_data = self.ws_data[sent:]
         except OSError as e:
             log.error(
-                "Sending to fd %d (IMEI %s): %s",
+                "Sending to fd %d: %s",
                 self.sock.fileno(),
-                self.imei,
                 e,
             )
             self.ws_data = b""
@@ -113,7 +178,16 @@ class Clients:
             clnt.send(msgs)
             clnt.write()
 
+
 def runserver(conf):
+    global htmldata
+    try:
+        with open(
+            conf.get("wsgateway", "htmlfile"), encoding="utf-8"
+        ) as fl:
+            htmldata = fl.read()
+    except OSError:
+        pass
     zctx = zmq.Context()
     zsub = zctx.socket(zmq.SUB)
     zsub.connect(conf.get("lookaside", "publishurl"))
@@ -148,9 +222,7 @@ def runserver(conf):
                 elif fl & zmq.POLLIN:
                     received = clients.recv(sk)
                     if received is None:
-                        log.debug(
-                            "Client gone from fd %d", sk
-                        )
+                        log.debug("Client gone from fd %d", sk)
                         tostop.append(sk)
                     else:
                         for msg in received: