Always advertise ESP bridge identity

Author: Maksym Shtembuliak

components/eybond_collector/at_handler.cpp

@@ -46,6 +46,15 @@ bool normalize_command(const std::string &raw, std::string *out) {
   return true;
 }
 
+std::string vdtu_value(const CollectorProfile &profile) {
+  if (!profile.vdtu.empty()) {
+    return profile.vdtu;
+  }
+  return std::string("esp-collector,") + BRIDGE_VERSION +
+         ";features=local_only,no_cloud,wifi_params,endpoint_write" +
+         ";uart=" + profile.uart;
+}
+
 }  // namespace
 
 bool parse_at_line(const std::string &line, AtCommand *out) {
@@ -128,10 +137,10 @@ std::string build_at_reply(const AtCommand &command, const CollectorProfile &pro
     return build_at_response(name, profile.wifi_scan_list);
   }
   if (name == "VDTU") {
-    // Virtual-DTU capability probe: lets a future integration version detect
-    // the bridge. With an empty profile.vdtu this is byte-identical to the
-    // factory reference reply for unknown commands.
-    return build_at_response(name, profile.vdtu);
+    // Virtual-DTU capability probe. The public ESP bridge must fail closed to
+    // "local bridge" identity; an empty/factory-like reply makes HA expose
+    // cloud-only controls for a virtual collector.
+    return build_at_response(name, vdtu_value(profile));
   }
   return build_at_response(name, "");
 }

components/eybond_collector/profile.h

@@ -8,7 +8,7 @@
 namespace eybond {
 
 // Bridge firmware version, advertised via AT+VDTU (virtual-DTU capability probe).
-constexpr const char *BRIDGE_VERSION = "0.1.3";
+constexpr const char *BRIDGE_VERSION = "0.1.4";
 
 struct CollectorProfile {
   std::string pn;  // set at startup (config override or synthesized from MAC)
@@ -20,8 +20,9 @@ struct CollectorProfile {
   std::string link_status = "connected";
   std::string wifi_scan_list;  // AT+INTPARA49
   // AT+VDTU capability string ("esp-collector,<ver>;features=...;uart=...").
-  // Empty -> reply carries an empty value, byte-identical to the factory
-  // reference behavior for unknown commands; the platform glue opts in.
+  // The firmware must always identify itself as an ESP bridge. If this field is
+  // empty, the AT handler emits a minimal fallback identity instead of a
+  // factory-like empty reply.
   std::string vdtu;
 };
 

host_tests/test_at.cpp

@@ -82,15 +82,18 @@ TEST(at_lower_case_normalized) {
 }
 
 TEST(at_vdtu_capability_probe) {
-  // Default profile: no capability string -> byte-identical to the factory
-  // reference reply for an unknown command.
-  CHECK_STR(reply_for("AT+VDTU?\r\n"), "AT+VDTU:\r\n");
+  // Default profile still advertises the ESP bridge identity. The firmware must
+  // not fall back to a factory-like empty VDTU reply because HA uses this probe
+  // to hide cloud-only controls for virtual collectors.
+  CHECK_STR(reply_for("AT+VDTU?\r\n"),
+            "AT+VDTU:esp-collector,0.1.4;features=local_only,no_cloud,wifi_params,endpoint_write;"
+            "uart=2400,8,1,NONE\r\n");
 
   CollectorProfile profile = test_profile();
-  profile.vdtu = "esp-collector,0.1.3;features=local_only,no_cloud,wifi_params,endpoint_write;uart=2400,8,1,NONE;spacing_ms=850;queue=4";
+  profile.vdtu = "esp-collector,0.1.4;features=local_only,no_cloud,wifi_params,endpoint_write;uart=2400,8,1,NONE;spacing_ms=850;queue=4";
   AtCommand command;
   CHECK(parse_at_line("AT+VDTU?\r\n", &command));
   CHECK_STR(build_at_reply(command, profile, test_runtime()),
-            "AT+VDTU:esp-collector,0.1.3;features=local_only,no_cloud,wifi_params,endpoint_write;uart=2400,8,1,NONE;"
+            "AT+VDTU:esp-collector,0.1.4;features=local_only,no_cloud,wifi_params,endpoint_write;uart=2400,8,1,NONE;"
             "spacing_ms=850;queue=4\r\n");
 }

host_tests/test_core.cpp

@@ -354,14 +354,14 @@ TEST(core_vdtu_capabilities_string) {
   CollectorProfile profile = Fixture::make_profile();
   CoreConfig config;
   CHECK_STR(build_vdtu_capabilities(profile, config),
-            "esp-collector,0.1.3;features=local_only,no_cloud,wifi_params,endpoint_write;uart=2400,8,1,NONE;"
+            "esp-collector,0.1.4;features=local_only,no_cloud,wifi_params,endpoint_write;uart=2400,8,1,NONE;"
             "spacing_ms=850;queue=4");
 
   config.command_spacing_ms = 100;
   config.forward_queue_limit = 8;
   profile.uart = "9600,8,1,NONE";
   CHECK_STR(build_vdtu_capabilities(profile, config),
-            "esp-collector,0.1.3;features=local_only,no_cloud,wifi_params,endpoint_write;uart=9600,8,1,NONE;"
+            "esp-collector,0.1.4;features=local_only,no_cloud,wifi_params,endpoint_write;uart=9600,8,1,NONE;"
             "spacing_ms=100;queue=8");
 }
 
@@ -383,7 +383,7 @@ TEST(core_vdtu_served_over_tcp) {
   const auto calls = actions.take();
   CHECK(calls.size() == 1);
   CHECK_STR(std::string(calls[0].data.begin(), calls[0].data.end()),
-            "AT+VDTU:esp-collector,0.1.3;features=local_only,no_cloud,wifi_params,endpoint_write;uart=2400,8,1,NONE;"
+            "AT+VDTU:esp-collector,0.1.4;features=local_only,no_cloud,wifi_params,endpoint_write;uart=2400,8,1,NONE;"
             "spacing_ms=850;queue=4\r\n");
 }