Update examples to use mg_http_reply

examples/device-dashboard/net.c

@@ -63,22 +63,23 @@ static struct user *getuser(struct mg_http_message *hm) {
 }
 
 // Notify all config watchers about the config change
-static void send_notification(struct mg_mgr *mgr, const char *name,
-                              const char *data) {
+static void send_notification(struct mg_mgr *mgr, const char *fmt, ...) {
   struct mg_connection *c;
   for (c = mgr->conns; c != NULL; c = c->next) {
-    if (c->label[0] != 'W') continue;
-    mg_ws_printf(c, WEBSOCKET_OP_TEXT, "{%Q:%Q,%Q:%s}", "name", name, "data",
-                 data);
+    if (c->label[0] == 'W') {
+      va_list ap;
+      va_start(ap, fmt);
+      mg_ws_vprintf(c, WEBSOCKET_OP_TEXT, fmt, &ap);
+      va_end(ap);
+    }
   }
 }
 
 // Send simulated metrics data to the dashboard, for chart rendering
 static void timer_metrics_fn(void *param) {
-  char buf[50];
-  mg_snprintf(buf, sizeof(buf), "[%lu, %d]", (unsigned long) time(NULL),
-              10 + (int) ((double) rand() * 10 / RAND_MAX));
-  send_notification(param, "metrics", buf);
+  send_notification(param, "{%Q:%Q,%Q:[%lu, %d]}", "name", "metrics", "data",
+                    (unsigned long) time(NULL),
+                    10 + (int) ((double) rand() * 10 / RAND_MAX));
 }
 
 // MQTT event handler function
@@ -87,15 +88,13 @@ static void mqtt_fn(struct mg_connection *c, int ev, void *ev_data, void *fnd) {
     s_connected = true;
     c->is_hexdumping = 1;
     mg_mqtt_sub(s_mqtt, mg_str(s_config.sub), 2);
-    send_notification(c->mgr, "config", "null");
+    send_notification(c->mgr, "{%Q:%Q,%Q:null}", "name", "config", "data");
   } else if (ev == MG_EV_MQTT_MSG) {
     struct mg_mqtt_message *mm = ev_data;
-    char buf[100], *p = buf;
-    mg_asprintf(&p, sizeof(buf), "{%Q: %.*Q, %Q: %.*Q, %Q: %d}", "topic",
-                (int) mm->topic.len, mm->topic.ptr, "data", (int) mm->data.len,
-                mm->data.ptr, "qos", (int) mm->qos);
-    send_notification(c->mgr, "message", p);
-    if (p != buf) free(p);
+    send_notification(c->mgr, "{%Q:%Q,%Q:{%Q: %.*Q, %Q: %.*Q, %Q: %d}}", "name",
+                      "message", "data", "topic", (int) mm->topic.len,
+                      mm->topic.ptr, "data", (int) mm->data.len, mm->data.ptr,
+                      "qos", (int) mm->qos);
   } else if (ev == MG_EV_MQTT_CMD) {
     struct mg_mqtt_message *mm = (struct mg_mqtt_message *) ev_data;
     MG_DEBUG(("cmd %d qos %d", mm->cmd, mm->qos));
@@ -103,7 +102,7 @@ static void mqtt_fn(struct mg_connection *c, int ev, void *ev_data, void *fnd) {
     s_mqtt = NULL;
     if (s_connected) {
       s_connected = false;
-      send_notification(c->mgr, "config", "null");
+      send_notification(c->mgr, "{%Q:%Q,%Q:null}", "name", "config", "data");
     }
   }
   (void) fnd;
@@ -113,7 +112,7 @@ static void mqtt_fn(struct mg_connection *c, int ev, void *ev_data, void *fnd) {
 static void timer_mqtt_fn(void *param) {
   struct mg_mgr *mgr = (struct mg_mgr *) param;
   if (s_mqtt == NULL) {
-    struct mg_mqtt_opts opts = { 0 };
+    struct mg_mqtt_opts opts = {0};
     s_mqtt = mg_mqtt_connect(mgr, s_config.url, &opts, mqtt_fn, NULL);
   }
 }
@@ -136,7 +135,7 @@ void device_dashboard_fn(struct mg_connection *c, int ev, void *ev_data,
       mg_http_reply(c, 200, "", "hi\n");  // Testing endpoint
     } else if (u == NULL && mg_http_match_uri(hm, "/api/#")) {
       // All URIs starting with /api/ must be authenticated
-      mg_printf(c, "%s", "HTTP/1.1 403 Denied\r\nContent-Length: 0\r\n\r\n");
+      mg_http_reply(c, 403, "", "Denied\n");
     } else if (mg_http_match_uri(hm, "/api/config/get")) {
       mg_http_reply(c, 200, NULL, "{%Q:%Q,%Q:%Q,%Q:%Q,%Q:%s}\n", "url",
                     s_config.url, "pub", s_config.pub, "sub", s_config.sub,
@@ -148,10 +147,10 @@ void device_dashboard_fn(struct mg_connection *c, int ev, void *ev_data,
         update_config(&hm->body, "pub", &s_config.pub);
         update_config(&hm->body, "sub", &s_config.sub);
         if (s_mqtt) s_mqtt->is_closing = 1;  // Ask to disconnect from MQTT
-        send_notification(fn_data, "config", "null");
-        mg_printf(c, "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n");
+        send_notification(fn_data, "{%Q:%Q,%Q:null}", "name", "config", "data");
+        mg_http_reply(c, 200, "", "ok\n");
       } else {
-        mg_printf(c, "%s", "HTTP/1.1 403 Denied\r\nContent-Length: 0\r\n\r\n");
+        mg_http_reply(c, 403, "", "Denied\n");
       }
     } else if (mg_http_match_uri(hm, "/api/message/send")) {
       char buf[256];
@@ -159,11 +158,10 @@ void device_dashboard_fn(struct mg_connection *c, int ev, void *ev_data,
           mg_http_get_var(&hm->body, "message", buf, sizeof(buf)) > 0) {
         mg_mqtt_pub(s_mqtt, mg_str(s_config.pub), mg_str(buf), 1, false);
       }
-      mg_printf(c, "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n");
+      mg_http_reply(c, 200, "", "ok\n");
     } else if (mg_http_match_uri(hm, "/api/watch")) {
       c->label[0] = 'W';  // Mark ourselves as a event listener
       mg_ws_upgrade(c, hm, NULL);
-      // mg_printf(c, "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n");
     } else if (mg_http_match_uri(hm, "/api/login")) {
       mg_http_reply(c, 200, NULL, "{%Q:%Q,%Q:%Q}\n", "user", u->name, "token",
                     u->token);

examples/device-dashboard/web_root/main.js

@@ -119,7 +119,7 @@ const Configuration = function(props) {
   const updatepub = ev => update('pub', pub);
   const updatesub = ev => update('sub', sub);
 
-  console.log(props, [url, pub, sub]);
+  // console.log(props, [url, pub, sub]);
   return html`
 <div class="section">
   <h3 style="background: #c03434; color: #fff; padding: 0.4em;">
@@ -319,12 +319,12 @@ const App = function(props) {
     var tid, wsURI = proto + '//' + l.host + '/api/watch'
     var reconnect = function() {
       var ws = new WebSocket(wsURI);
-      ws.onopen = () => console.log('ws connected');
+      // ws.onopen = () => console.log('ws connected');
       ws.onmessage = function(ev) {
         try {
           var msg = JSON.parse(ev.data);
           PubSub.publish(msg);
-          if (msg.name != 'metrics') console.log('ws->', msg);
+          // if (msg.name != 'metrics') console.log('ws->', msg);
         } catch (e) {
           console.log('Invalid ws frame:', ev.data);  // eslint-disable-line
         }

examples/webui-login/main.c

@@ -49,7 +49,7 @@ void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
     struct user *u = getuser(hm);
     if (u == NULL && mg_http_match_uri(hm, "/api/#")) {
       // All URIs starting with /api/ must be authenticated
-      mg_printf(c, "%s", "HTTP/1.1 403 Denied\r\nContent-Length: 0\r\n\r\n");
+      mg_http_reply(c, 403, "", "Denied\n");
     } else if (mg_http_match_uri(hm, "/api/data")) {
       mg_http_reply(c, 200, "Content-Type: application/json\r\n",
                     "{%Q:%Q,%Q:%Q}\n", "text", "Hello!", "data", "somedata");

examples/webui-plain/main.c

@@ -43,7 +43,7 @@ static void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
       update_config(json, "$.url", &s_config.url);
       update_config(json, "$.pub", &s_config.pub);
       update_config(json, "$.sub", &s_config.sub);
-      mg_printf(c, "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n");
+      mg_http_reply(c, 200, "", "ok\n");
     } else {
       struct mg_http_serve_opts opts = {.root_dir = s_root_dir};
       mg_http_serve_dir(c, ev_data, &opts);