esphome 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7290628c333abc933faa1582a521381217a7c518b0db41cd476f61644f90fa1a
-  data.tar.gz: 52a9eda4cff49e44c4695bd7b0bb9e911052cca5178f5a6092810845bf638909
+  metadata.gz: 7692692de1d32a122a21c669572fec6232e0fccf0876251548259d446de6727c
+  data.tar.gz: c20a4ac0dad1f3243bd274652474c1a6566dd274578c54939e0b228e19aba8f1
 SHA512:
-  metadata.gz: 29309825cb9b36c0a1991e41435c64fdad4d33d6472873aadec652cd1d76841e8dae3929f5f4b56a9998834af62f57bbcc550efe1482c00e65b3f4ca69bec9ea
-  data.tar.gz: c1eabdd29c70ce725e5949a6b2450a9f5c9087f10d45c1fe060f4a644c1a27b2f4c62ff599ab659b430a2083176730de2d4dd6d5af1b9e2d219243b2a20113b8
+  metadata.gz: 460d61c2a970646fb80a651b4dfc87c9a2755fb76f428514cb514ab71e49c34e0c49ab99c201c0cf3ff1431dcb63657ae318ca768c4b0f76b5bfef53c0009f5f
+  data.tar.gz: 17b8f36fddc959d299590ac3ed9746e9b876499216c70b89a912cd675cd5e03641c01c09321f6ef2856f701a94f7c9e51bb53ad73e566eb2d35ad1373518fa86

data/exe/esphome-monitor

@@ -17,6 +17,9 @@ connection_log_level = :warn
 device_log_level = :debug
 dump_config = false
 port = 6053
+diagnostic_entities = false
+config_entities = true
+states = false
 opts = OptionParser.new do |opts|
   opts.banner = <<~TEXT
     Usage: esphome-monitor ([<uri>] <device_name> | <address> <encryption_key>)
@@ -43,6 +46,15 @@ opts = OptionParser.new do |opts|
   opts.on("--dump-config", "Dump device configuration on connect (requires log streaming at info level)") do
     dump_config = true
   end
+  opts.on("--[no-]diagnostic-entities", "include diagnostic entities (default off)") do |v|
+    diagnostic_entities = v
+  end
+  opts.on("--[no-]config-entities", "include configuration entities (default on)") do |v|
+    config_entities = v
+  end
+  opts.on("--[no-]states", "Log entity state changes (default off)") do |v|
+    states = v
+  end
   opts.on("-h", "--help", "Show this help message") do
     puts opts
     exit
@@ -75,4 +87,12 @@ end
 
 device = ESPHome::Device.new(address, encryption_key, port:)
 
-ESPHome::Cli::Monitor.run(device, connection_log_level:, device_log_level:, log_level:, actions:, dump_config:)
+ESPHome::Cli::Monitor.run(device,
+                          connection_log_level:,
+                          device_log_level:,
+                          log_level:,
+                          actions:,
+                          dump_config:,
+                          diagnostic_entities:,
+                          config_entities:,
+                          states:)

data/lib/esphome/cli/monitor.rb

@@ -47,7 +47,10 @@ module ESPHome
                      device_log_level: nil,
                      connection_log_level: nil,
                      log_level: nil,
-                     dump_config: false)
+                     dump_config: false,
+                     diagnostic_entities: true,
+                     config_entities: true,
+                     states: false)
         @device = device
         @win = nil
         @entities_by_key = {}
@@ -61,6 +64,9 @@ module ESPHome
         @logger = LoggerWrapper.new(self, level: log_level || Logger::INFO)
         @actions = actions
         @dump_config = dump_config
+        @diagnostic_entities = diagnostic_entities
+        @config_entities = config_entities
+        @states = states
         @winch_trapped = false
         @logwin = nil
         @screen_initialized = false
@@ -79,9 +85,17 @@ module ESPHome
 
       def run
         @device.on_message do |entity_or_log_line|
-          if entity_or_log_line.respond_to?(:key) && (entity_wrapper = @entities_by_key[entity_or_log_line.key])
-            entity_wrapper.touch
-            queue_ui_event(:entity, entity_wrapper)
+          if entity_or_log_line.respond_to?(:key)
+            key = entity_or_log_line.key
+            if (entity_wrapper = @entities_by_key[key])
+              entity_wrapper.touch
+              log_entity_state(entity_wrapper.__getobj__) if @states
+              queue_ui_event(:entity, entity_wrapper)
+            elsif @device.entities.key?(key)
+              # ignored diagnostic or config entity
+            else
+              logger.warn("Unexpected entity #{entity_or_log_line.inspect}")
+            end
           elsif entity_or_log_line.is_a?(Action)
             logger.info(entity_or_log_line.inspect)
           else
@@ -91,10 +105,16 @@ module ESPHome
 
         @device.on_connect do
           logger.info("Connected")
-          @name_width = @device.entities.values.map { |e| e.name.length }.max || 0
+          entities = @device.entities.values.select do |entity|
+            next false if entity.entity_category == :diagnostic && !@diagnostic_entities
+            next false if entity.entity_category == :config && !@config_entities
+
+            true
+          end
+          @name_width = entities.map { |e| e.name.length }.max || 0
           @entities_by_key = {}
           @entities = []
-          @device.entities.values.sort_by(&:name).each_with_index do |entity, idx|
+          entities.sort_by(&:name).each_with_index do |entity, idx|
             simple_name = entity.class.name.split("::").last
             entity_class = if Entities.const_defined?(simple_name)
                              Entities.const_get(simple_name, false)
@@ -190,6 +210,11 @@ module ESPHome
         @device.disconnect
       end
 
+      def log_entity_state(entity)
+        type = entity.class.name.split("::").last.gsub(/[A-Z]/) { |c| "_#{c.downcase}" }[1..]
+        add(nil, "\e[36m[S][#{type}]: '#{entity.name}' >> #{entity.formatted_state}\e[0m")
+      end
+
       def add(_level, message = nil, progname = nil, render: true)
         if message.nil?
           message = if block_given?

data/lib/esphome/device.rb

@@ -246,7 +246,6 @@ module ESPHome
         elsif message.is_a?(Api::DisconnectRequest)
           send(Api::DisconnectResponse.new)
           disconnected
-          @on_disconnect_callback.each(&:call)
         elsif message.is_a?(Api::DisconnectResponse)
           disconnected
         elsif message.is_a?(Api::PingResponse)
@@ -346,10 +345,12 @@ module ESPHome
     end
 
     def disconnected
+      was_connected = connected?
       @socket&.close
       @socket = nil
       @noise = nil
       @entities = nil
+      @on_disconnect_callback.each(&:call) if was_connected
     end
 
     def write_frame(data)

data/lib/esphome/serial_proxy.rb

@@ -47,6 +47,9 @@ module ESPHome
         loop_thread = io.instance_variable_set(:@loop_thread, Thread.new do
           Thread.current.report_on_exception = false
           device.loop
+        rescue ConnectionClosedError, NotConnectedError
+          # Readers observe the disconnect as EOF; joining the loop must not mask it.
+          nil
         rescue IOError
           raise unless io.closed?
         end)
@@ -257,6 +260,7 @@ module ESPHome
       loop do
         data = @mutex.synchronize do
           raise EOFError if @closed && @buffer.empty?
+          raise EOFError, "serial proxy disconnected" if @buffer.empty? && !device.connected?
 
           @buffer.slice!(0, maxlen) unless @buffer.empty?
         end
@@ -281,7 +285,8 @@ module ESPHome
 
         deadline = monotonic_time + timeout if timeout
         Kernel.loop do
-          return nil if @closed || !device.connected?
+          return nil if @closed
+          raise EOFError, "serial proxy disconnected" unless device.connected?
 
           remaining = deadline && (deadline - monotonic_time)
           return nil if deadline && remaining <= 0
@@ -361,6 +366,8 @@ module ESPHome
           result = yield
           return result unless result.nil?
 
+          raise EOFError, "serial proxy disconnected" unless device.connected?
+
           @data_ready.wait(@mutex)
         end
       end

data/lib/esphome/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ESPHome
-  VERSION = "1.1.1"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: esphome
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Cody Cutrer
 bindir: exe
 cert_chain: []
-date: 2026-07-26 00:00:00.000000000 Z
+date: 2026-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses