httpmsg: Allow polling of additional lines

Author: addshore

src/devices/zcard.toit

@@ -21,6 +21,7 @@ ZCARD-MESSAGES := [
     BatteryStatus.MT,
     AlarmControl.MT,
     LinkControl.MT,
+    1004, // LORA
     PresetPage.MT,
     TextPage.MT,
     MenuPage.MT,

src/protocol/Header.toit

@@ -16,6 +16,7 @@ class Header:
   static TYPE_FORWARD_TO := 14
 
   // For use with TYPE_MESSAGE_STATUS
+  static STATUS_OK /int ::= 0
   static STATUS_GENERIC_ERROR /int ::= 1
   static STATUS_MISSING_PARAMETER /int ::= 2
   static STATUS_METHOD_NOT_SUPPORTED /int ::= 3
@@ -28,6 +29,8 @@ class Header:
   static STATUS_UNKNOWN_MESSAGE /int ::= 10
 
   static STATUS_MAP /Map := {
+    // null: "null", // TODO ask toit to fix this, as null cannot be .geted
+    STATUS_OK: "OK",
     STATUS_GENERIC_ERROR: "Generic error",
     STATUS_MISSING_PARAMETER: "Missing parameter",
     STATUS_METHOD_NOT_SUPPORTED: "Method not supported",

src/services/httpmsg/html.toit

@@ -89,7 +89,37 @@ html-page device/devices.Device docsUrl/string custom-actions/Map -> string:
             console.error('Error:', error);
         });
     }
-
+    function poll() {
+        fetch('/poll')
+        .then(response => response.text())
+        .then(text => {
+            const lines = text.split('\\n');
+            lines.forEach(line => {
+                if (line.trim() !== '') {
+                    const d = document.getElementById('l');
+                    d.prepend(document.createElement('br'));
+                    const p = document.createElement('span');
+                    p.textContent = line;
+                    d.prepend(p);
+                    const matches = line.match(/(\\d{1,3}(\\s\\d{1,3})+)/g);
+                    if (matches) {
+                        matches.forEach(b => {
+                            const a = document.createElement('a');
+                            a.href = "$(docsUrl)/devices/api/parse?bytes=" + b;
+                            a.textContent = "(parse)";
+                            a.target = "_blank";
+                            d.prepend(document.createTextNode(' '));
+                            d.prepend(a);
+                        });
+                    }
+                }
+            });
+        })
+        .catch((error) => {
+            console.error('Error:', error);
+        });
+    }
+    setInterval(poll, 2000);
     let fetching = false;
 </script>
 </body></html>"""

src/services/httpmsg/msgs.toit

@@ -17,7 +17,7 @@ sample-messages := {
         "$(messages.BatteryStatus.MT) Battery": (messages.BatteryStatus.getMsg).bytesForProtocol,
     },
     "Actions": {
-        "$(messages.TxNow.MT) Transmit Now": (messages.TxNow.doMsg --data="hello".to-byte-array).bytesForProtocol,
+        "$(messages.TxNow.MT) Cellular 'Transmit Now'": (messages.TxNow.doMsg --data="hello".to-byte-array).bytesForProtocol,
     },
     "Screen": {
         "$(messages.PresetPage.MT) Home page": messages.PresetPage.toMsg.bytesForProtocol,
@@ -41,6 +41,11 @@ sample-messages := {
         "Duration 0": (messages.AlarmControl.doMsg --duration=0).bytesForProtocol,
         "3s pattern 4 intensity 1": (messages.AlarmControl.doMsg --duration=3 --buzzerPattern=4 --buzzerIntensity=1).bytesForProtocol,
     },
+    "1004 LORA": {
+      "Transmit": #[0X03, 0X18, 0X00, 0XEC, 0X03, 0X01, 0X00, 0X05, 0X01, 0X04, 0X02, 0X00, 0X02, 0X0A, 0X04, 0X6C, 0X62, 0X6C, 0X62, 0X02, 0X10, 0X27, 0X80, 0X55],
+      "Subscribe": #[0X03, 0X0E, 0X00, 0XEC, 0X03, 0X01, 0X00, 0X05, 0X01, 0X03, 0X00, 0X00, 0XC5, 0XD8],
+      "Unsubscribe": #[0X03, 0X0E, 0X00, 0XEC, 0X03, 0X01, 0X00, 0X05, 0X01, 0X05, 0X00, 0X00, 0X65, 0X6A],
+    },
     // "GSM": {
     //     "SET Normal mode": #[0x03, 0x17, 0x00, 0x31, 0x00, 0x01, 0x00, 0x05, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x75, 0x30],
     //     "SET Airplane mode 10s": #[0x03, 0x23, 0x00, 0x31, 0x00, 0x01, 0x00, 0x05, 0x01, 0x01, 0x02, 0x00, 0x01, 0x02, 0x01, 0x00, 0x04, 0x0A, 0x00, 0x00, 0x00, 0x38, 0x8B],

src/services/httpmsg/service.toit

@@ -9,6 +9,7 @@ import .html
 import http
 import net
 import log
+import monitor show Channel
 
 // Hosts a small HTTP server that serves a page for directly sending bytes or messages to a Lightbug device
 class HttpMsg:
@@ -53,6 +54,8 @@ class HttpMsg:
       handle-page request writer
     else if resource == "/post":
       handle-post request writer
+    else if resource == "/poll":
+      handle-poll request writer
     else :
       writer.headers.set "Content-Type" "text/plain"
       writer.write_headers 404
@@ -96,15 +99,48 @@ class HttpMsg:
         if response == false:
           writer.out.write "$(msg.msgId) No response...\n"
         else:
-          if response-message-formatter_ != null:
-            response-message-formatter_.call writer response "$(msg.msgId) Response $(response.msgId):"
-          else:
-            writer.out.write "$(msg.msgId) Response $(response.msgId): $(stringifyAllBytes response.bytesForProtocol --short=true --commas=false --hex=false)\n"
+          write-msg-out writer response
         tasksDone++
     while tasksDone < tasksWaiting:
       sleep (Duration --ms=100)
     writer.close
 
+  write-msg-out writer/http.ResponseWriter msg/protocol.Message:
+    if response-message-formatter_ != null:
+      response-message-formatter_.call writer msg "$(msg.msgId) Response $(msg.msgId):"
+    else:
+      writer.out.write "$(msg.msgId) Response $(msg.msgId): $(stringifyAllBytes msg.bytesForProtocol --short=true --commas=false --hex=false)\n"
+
+  // It might be more efficient to store messages that have been received, to send
+  // TODO having a "force-send" on monitor would be nice..
+  polling-queue /Channel := Channel 10
+  queue-output-for-polling line/string:
+    if polling-queue.size > 10:
+      log.warn "Dropping line from queue as it is full"
+      polling-queue.receive
+      polling-queue.send line
+    else:
+      polling-queue.send line
+  polling-messages /Channel := Channel 10
+  queue-messages-for-polling msg/protocol.Message:
+    if polling-messages.size > 10:
+      log.warn "Dropping message from queue as it is full"
+      polling-messages.receive
+      polling-messages.send msg
+    else:
+      polling-messages.send msg
+
+  handle-poll request/http.RequestIncoming writer/http.ResponseWriter:
+    writer.headers.set "Content-Type" "text/plain"
+    writer.headers.set "Access-Control-Allow-Origin" "*"
+    writer.write_headers 200
+    while polling-queue.size > 0:
+      writer.out.write polling-queue.receive
+    while polling-messages.size > 0:
+      write-msg-out writer polling-messages.receive
+    writer.close
+
+
 list-to-byte-array l/List -> ByteArray:
   b := ByteArray l.size
   for i := 0; i < l.size; i++: