From d8b3af3815dcb4bed73bebf5c1659b6dd325c78e Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 1 Nov 2021 09:33:04 +1300
Subject: [PATCH] Expose webserver_port to the native API (#2640)

---
 esphome/components/api/api.proto          |  2 ++
 esphome/components/api/api_connection.cpp |  3 +++
 esphome/components/api/api_pb2.cpp        | 10 ++++++++++
 esphome/components/api/api_pb2.h          |  1 +
 esphome/components/web_server/__init__.py |  1 +
 esphome/core/defines.h                    |  3 +++
 6 files changed, 20 insertions(+)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index 3c6a36f032..b1ac998608 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -182,6 +182,8 @@ message DeviceInfoResponse {
   // The esphome project details if set
   string project_name = 8;
   string project_version = 9;
+
+  uint32 webserver_port = 10;
 }
 
 message ListEntitiesRequest {
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index 2151d6165c..79c53ee840 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -759,6 +759,9 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
 #ifdef ESPHOME_PROJECT_NAME
   resp.project_name = ESPHOME_PROJECT_NAME;
   resp.project_version = ESPHOME_PROJECT_VERSION;
+#endif
+#ifdef USE_WEBSERVER
+  resp.webserver_port = WEBSERVER_PORT;
 #endif
   return resp;
 }
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 17fc14c868..1d59d98f52 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -396,6 +396,10 @@ bool DeviceInfoResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
       this->has_deep_sleep = value.as_bool();
       return true;
     }
+    case 10: {
+      this->webserver_port = value.as_uint32();
+      return true;
+    }
     default:
       return false;
   }
@@ -444,6 +448,7 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(7, this->has_deep_sleep);
   buffer.encode_string(8, this->project_name);
   buffer.encode_string(9, this->project_version);
+  buffer.encode_uint32(10, this->webserver_port);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DeviceInfoResponse::dump_to(std::string &out) const {
@@ -484,6 +489,11 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
   out.append("  project_version: ");
   out.append("'").append(this->project_version).append("'");
   out.append("\n");
+
+  out.append("  webserver_port: ");
+  sprintf(buffer, "%u", this->webserver_port);
+  out.append(buffer);
+  out.append("\n");
   out.append("}");
 }
 #endif
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index eea9ab06f6..af85ed6856 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -224,6 +224,7 @@ class DeviceInfoResponse : public ProtoMessage {
   bool has_deep_sleep{false};
   std::string project_name{};
   std::string project_version{};
+  uint32_t webserver_port{0};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
diff --git a/esphome/components/web_server/__init__.py b/esphome/components/web_server/__init__.py
index 240ba7c8a0..ba2d866593 100644
--- a/esphome/components/web_server/__init__.py
+++ b/esphome/components/web_server/__init__.py
@@ -54,6 +54,7 @@ async def to_code(config):
 
     cg.add(paren.set_port(config[CONF_PORT]))
     cg.add_define("WEBSERVER_PORT", config[CONF_PORT])
+    cg.add_define("USE_WEBSERVER")
     cg.add(var.set_css_url(config[CONF_CSS_URL]))
     cg.add(var.set_js_url(config[CONF_JS_URL]))
     if CONF_AUTH in config:
diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index b44987a768..dc07bde196 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -36,8 +36,11 @@
 #define USE_SWITCH
 #define USE_TEXT_SENSOR
 #define USE_TIME
+#define USE_WEBSERVER
 #define USE_WIFI
 
+#define WEBSERVER_PORT 80  // NOLINT
+
 // Arduino-specific feature flags
 #ifdef USE_ARDUINO
 #define USE_CAPTIVE_PORTAL