Restore ubuntu build, add Shelly.GetDebugInfo

Author: rojer

mos.yml

@@ -1,6 +1,6 @@
 author: 'Deomid "rojer" Ryabkov'
 description: A HomeKit firmware for Shelly switches
-version: 2.0.8
+version: 2.0.10
 platform: esp8266
 
 libs_version: latest
@@ -59,7 +59,6 @@ libs:
   - origin: https://github.com/mongoose-os-libs/mqtt
   - origin: https://github.com/mongoose-os-libs/rpc-service-config
   - origin: https://github.com/mongoose-os-libs/rpc-service-fs
-  - origin: https://github.com/mongoose-os-libs/rpc-service-ota
   - origin: https://github.com/mongoose-os-libs/rpc-uart
   - origin: https://github.com/mongoose-os-libs/http-server
   - origin: https://github.com/mongoose-os-libs/rpc-mqtt

src/shelly_debug.cpp

@@ -17,48 +17,87 @@
 
 #include "shelly_debug.h"
 
+#include "mgos.h"
 #include "mgos_http_server.h"
 
 #include "HAPAccessoryServer+Internal.h"
+#include "HAPPlatformTCPStreamManager+Init.h"
 
 static HAPPlatformKeyValueStoreRef s_kvs;
+static HAPPlatformTCPStreamManagerRef s_tcpm;
 
-static void shelly_debug_handler(struct mg_connection *nc, int ev,
-                                 void *ev_data, void *user_data) {
-  if (ev != MG_EV_HTTP_REQUEST) return;
+void shelly_debug_write_nc(struct mg_connection *nc) {
   uint16_t cn;
   if (HAPAccessoryServerGetCN(s_kvs, &cn) != kHAPError_None) {
     cn = 0;
   }
-  mg_send_response_line(nc, 200,
-                        "Content-Type: text/html\r\n"
-                        "Connection: close\r\n");
-  mg_printf(nc, "<pre>\r\n");
-  mg_printf(nc, "Config number: %u\r\n", cn);
+  HAPPlatformTCPStreamManagerStats tcpm_stats = {};
+  HAPPlatformTCPStreamManagerGetStats(s_tcpm, &tcpm_stats);
+  mg_printf(nc,
+            "App: %s %s %s\r\n"
+            "Uptime: %.2lf\r\n"
+            "RAM: %lu free, %lu min free\r\n"
+            "HAP config number: %u\r\n"
+            "HAP connection stats: %u/%u/%u\r\n",
+            MGOS_APP, mgos_sys_ro_vars_get_fw_version(),
+            mgos_sys_ro_vars_get_fw_id(), mgos_uptime(),
+            (unsigned long) mgos_get_free_heap_size(),
+            (unsigned long) mgos_get_min_free_heap_size(), cn,
+            (unsigned) tcpm_stats.numPendingTCPStreams,
+            (unsigned) tcpm_stats.numActiveTCPStreams,
+            (unsigned) tcpm_stats.maxNumTCPStreams);
   mg_printf(nc, "HAP connections:\r\n");
-  time_t now = mg_time();
+  time_t now_wall = mg_time();
+  int64_t now_micros = mgos_uptime_micros();
   int num_hap_connections = 0;
   struct mg_connection *nc2 = NULL;
-  for (nc2 = mg_next(nc->mgr, NULL); nc2 != NULL; nc2 = mg_next(nc->mgr, nc2)) {
+  struct mg_mgr *mgr = mgos_get_mgr();
+  for (nc2 = mg_next(mgr, NULL); nc2 != NULL; nc2 = mg_next(mgr, nc2)) {
     if (nc2->listener == NULL ||
         ntohs(nc2->listener->sa.sin.sin_port) != 9000) {
       continue;
     }
     char addr[32];
     mg_sock_addr_to_str(&nc2->sa, addr, sizeof(addr),
                         MG_SOCK_STRINGIFY_IP | MG_SOCK_STRINGIFY_PORT);
-    mg_printf(nc, "  %s last_io %d\r\n", addr, (int) (now - nc2->last_io_time));
+    int last_io_age = (int) (now_wall - nc2->last_io_time);
+    int64_t last_read_age = 0;
+    HAPPlatformTCPStream *ts = (HAPPlatformTCPStream *) nc2->user_data;
+    if (ts != nullptr) {
+      last_read_age = now_micros - ts->lastRead;
+    }
+    mg_printf(nc, "  %s nc %pf %#lx io %d ts %p rd %lld\r\n", addr, nc2,
+              (unsigned long) nc2->flags, last_io_age, ts,
+              (long long) (last_read_age / 1000000));
     num_hap_connections++;
   }
   mg_printf(nc, " Total: %d", num_hap_connections);
+}
 
+void shelly_get_debug_info(std::string *out) {
+  struct mg_connection nc = {};
+  shelly_debug_write_nc(&nc);
+  *out = std::string(nc.send_mbuf.buf, nc.send_mbuf.len);
+  mbuf_free(&nc.send_mbuf);
+}
+
+static void shelly_debug_handler(struct mg_connection *nc, int ev,
+                                 void *ev_data, void *user_data) {
+  if (ev != MG_EV_HTTP_REQUEST) return;
+  mg_send_response_line(nc, 200,
+                        "Content-Type: text/html\r\n"
+                        "Connection: close\r\n");
+  mg_printf(nc, "<pre>\r\n");
+  shelly_debug_write_nc(nc);
   nc->flags |= MG_F_SEND_AND_CLOSE;
   (void) ev_data;
   (void) user_data;
 }
 
-bool shelly_debug_init(HAPPlatformKeyValueStoreRef kvs) {
+bool shelly_debug_init(HAPPlatformKeyValueStoreRef kvs,
+                       HAPPlatformTCPStreamManagerRef tcpm) {
   s_kvs = kvs;
+  s_tcpm = tcpm;
   mgos_register_http_endpoint("/debug/", shelly_debug_handler, NULL);
   return true;
 }

src/shelly_debug.h

@@ -15,6 +15,11 @@
  * limitations under the License.
  */
 
+#include <string>
+
 #include "HAP.h"
 
-bool shelly_debug_init(HAPPlatformKeyValueStoreRef kvs);
+void shelly_get_debug_info(std::string *out);
+
+bool shelly_debug_init(HAPPlatformKeyValueStoreRef kvs,
+                       HAPPlatformTCPStreamManagerRef tcpm);

src/shelly_main.cpp

@@ -72,20 +72,18 @@ static HAPAccessoryServerOptions s_server_options = {
     .ip =
         {
             .transport = &kHAPAccessoryServerTransport_IP,
-            .available = 0,
             .accessoryServerStorage = &s_ip_storage,
         },
     .ble =
         {
             .transport = nullptr,
-            .available = false,
             .accessoryServerStorage = nullptr,
             .preferredAdvertisingInterval = 0,
             .preferredNotificationDuration = 0,
         },
 };
 static HAPAccessoryServerCallbacks s_callbacks;
-static HAPPlatformTCPStreamManager s_tcp_stream_manager;
+static HAPPlatformTCPStreamManager s_tcpm;
 static HAPPlatformServiceDiscovery s_service_discovery;
 static HAPAccessoryServerRef s_server;
 
@@ -96,7 +94,7 @@ static HAPPlatform s_platform = {
     .setupNFC = NULL,
     .ip =
         {
-            .tcpStreamManager = &s_tcp_stream_manager,
+            .tcpStreamManager = &s_tcpm,
             .serviceDiscovery = &s_service_discovery,
         },
     .ble =
@@ -275,7 +273,7 @@ struct mgos_ade7953 *s_ade7953 = NULL;
 
 static void shelly_status_timer_cb(void *arg) {
   HAPPlatformTCPStreamManagerStats tcpm_stats = {};
-  HAPPlatformTCPStreamManagerGetStats(&s_tcp_stream_manager, &tcpm_stats);
+  HAPPlatformTCPStreamManagerGetStats(&s_tcpm, &tcpm_stats);
   LOG(LL_INFO, ("Uptime: %.2lf, conns %u/%u/%u, RAM: %lu, %lu free",
                 mgos_uptime(), (unsigned) tcpm_stats.numPendingTCPStreams,
                 (unsigned) tcpm_stats.numActiveTCPStreams,
@@ -302,13 +300,16 @@ static void shelly_status_timer_cb(void *arg) {
   check_led(LED_GPIO, LED_ON);
 #ifdef MGOS_HAVE_OTA_COMMON
   // If committed, set up inactive app slot as location for core dumps.
+  static bool s_cd_area_set = false;
   struct mgos_ota_status ota_status;
-  if (mgos_ota_is_committed() && mgos_ota_get_status(&ota_status)) {
+  if (!s_cd_area_set && mgos_ota_is_committed() &&
+      mgos_ota_get_status(&ota_status)) {
     rboot_config bcfg = rboot_get_config();
     int cd_slot = (ota_status.partition == 0 ? 1 : 0);
     uint32_t cd_addr = bcfg.roms[cd_slot];
     uint32_t cd_size = bcfg.roms_sizes[cd_slot];
     esp_core_dump_set_flash_area(cd_addr, cd_size);
+    s_cd_area_set = true;
   }
 #endif
   (void) arg;
@@ -419,7 +420,7 @@ bool shelly_app_init() {
       .port = kHAPNetworkPort_Any,
       .maxConcurrentTCPStreams = NUM_SESSIONS,
   };
-  HAPPlatformTCPStreamManagerCreate(&s_tcp_stream_manager, &tcpm_opts);
+  HAPPlatformTCPStreamManagerCreate(&s_tcpm, &tcpm_opts);
 
   // Service discovery.
   static const HAPPlatformServiceDiscoveryOptions sd_opts = {};
@@ -486,9 +487,9 @@ bool shelly_app_init() {
     mgos_gpio_setup_input(BTN_GPIO, MGOS_GPIO_PULL_UP);
   }
 
-  shelly_rpc_service_init(&s_server, &s_kvs, &s_tcp_stream_manager);
+  shelly_rpc_service_init(&s_server, &s_kvs, &s_tcpm);
 
-  shelly_debug_init(&s_kvs);
+  shelly_debug_init(&s_kvs, &s_tcpm);
 
   return true;
 }

src/shelly_rpc_service.cpp

@@ -23,6 +23,7 @@
 
 #include "HAPAccessoryServer+Internal.h"
 
+#include "shelly_debug.h"
 #include "shelly_sw_service.h"
 
 static HAPAccessoryServerRef *s_server;
@@ -32,8 +33,10 @@ static HAPPlatformTCPStreamManagerRef s_tcpm;
 static void shelly_get_info_handler(struct mg_rpc_request_info *ri,
                                     void *cb_arg, struct mg_rpc_frame_info *fi,
                                     struct mg_str args) {
+#ifdef MGOS_HAVE_WIFI
   const char *ssid = mgos_sys_config_get_wifi_sta_ssid();
   const char *pass = mgos_sys_config_get_wifi_sta_pass();
+#endif
   bool hap_provisioned = !mgos_conf_str_empty(mgos_sys_config_get_hap_salt());
   bool hap_paired = HAPAccessoryServerIsPaired(s_server);
 #ifdef MGOS_CONFIG_HAVE_SW1
@@ -65,7 +68,9 @@ static void shelly_get_info_handler(struct mg_rpc_request_info *ri,
 #endif
       "},"
 #endif
+#ifdef MGOS_HAVE_WIFI
       "wifi_en: %B, wifi_ssid: %Q, wifi_pass: %Q, "
+#endif
       "hap_provisioned: %B, hap_paired: %B, "
       "hap_ip_conns_pending: %u, hap_ip_conns_active: %u, "
       "hap_ip_conns_max: %u}",
@@ -92,9 +97,11 @@ static void shelly_get_info_handler(struct mg_rpc_request_info *ri,
       sw2.apower, sw2.aenergy,
 #endif
 #endif
+#ifdef MGOS_HAVE_WIFI
       mgos_sys_config_get_wifi_sta_enable(), (ssid ? ssid : ""),
-      (pass ? pass : ""), hap_provisioned, hap_paired,
-      (unsigned) tcpm_stats.numPendingTCPStreams,
+      (pass ? pass : ""),
+#endif
+      hap_provisioned, hap_paired, (unsigned) tcpm_stats.numPendingTCPStreams,
       (unsigned) tcpm_stats.numActiveTCPStreams,
       (unsigned) tcpm_stats.maxNumTCPStreams);
   (void) cb_arg;
@@ -152,6 +159,18 @@ static void shelly_set_config_handler(struct mg_rpc_request_info *ri,
   (void) fi;
 }
 
+static void shelly_get_debug_info_handler(struct mg_rpc_request_info *ri,
+                                          void *cb_arg,
+                                          struct mg_rpc_frame_info *fi,
+                                          struct mg_str args) {
+  std::string res;
+  shelly_get_debug_info(&res);
+  mg_rpc_send_responsef(ri, "{info: %Q}", res.c_str());
+  (void) cb_arg;
+  (void) args;
+  (void) fi;
+}
+
 bool shelly_rpc_service_init(HAPAccessoryServerRef *server,
                              HAPPlatformKeyValueStoreRef kvs,
                              HAPPlatformTCPStreamManagerRef tcpm) {
@@ -163,5 +182,7 @@ bool shelly_rpc_service_init(HAPAccessoryServerRef *server,
   mg_rpc_add_handler(mgos_rpc_get_global(), "Shelly.SetConfig",
                      "{config: %M, reboot: %B}", shelly_set_config_handler,
                      NULL);
+  mg_rpc_add_handler(mgos_rpc_get_global(), "Shelly.GetDebugInfo", "",
+                     shelly_get_debug_info_handler, NULL);
   return true;
 }