From c75c81ba73899c6aa01402cfda64172a2f133e85 Mon Sep 17 00:00:00 2001
From: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
Date: Thu, 2 Feb 2023 23:33:11 +0100
Subject: [PATCH] Move default port to config schema

---
 components/stream_server/__init__.py     | 5 ++---
 components/stream_server/stream_server.h | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/components/stream_server/__init__.py b/components/stream_server/__init__.py
index 64f2f58..e4a3dac 100644
--- a/components/stream_server/__init__.py
+++ b/components/stream_server/__init__.py
@@ -39,7 +39,7 @@ CONFIG_SCHEMA = (
     cv.Schema(
         {
             cv.GenerateID(): cv.declare_id(StreamServerComponent),
-            cv.Optional(CONF_PORT): cv.port,
+            cv.Optional(CONF_PORT, default=6638): cv.port,
             cv.Optional(CONF_BUFFER_SIZE, default=128): cv.All(
                 cv.positive_int, validate_buffer_size
             ),
@@ -52,8 +52,7 @@ CONFIG_SCHEMA = (
 
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
-    if CONF_PORT in config:
-        cg.add(var.set_port(config[CONF_PORT]))
+    cg.add(var.set_port(config[CONF_PORT]))
     cg.add(var.set_buffer_size(config[CONF_BUFFER_SIZE]))
 
     await cg.register_component(var, config)
diff --git a/components/stream_server/stream_server.h b/components/stream_server/stream_server.h
index 49dd93a..e188096 100644
--- a/components/stream_server/stream_server.h
+++ b/components/stream_server/stream_server.h
@@ -61,6 +61,7 @@ protected:
     };
 
     esphome::uart::UARTComponent *stream_{nullptr};
+    uint16_t port_;
     size_t buf_size_;
 
     std::unique_ptr<uint8_t[]> buf_{};
@@ -68,6 +69,5 @@ protected:
     size_t buf_tail_{0};
 
     std::unique_ptr<esphome::socket::Socket> socket_{};
-    uint16_t port_{6638};
     std::vector<Client> clients_{};
 };