esphome 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1caa16ccd3799a2a3139eb844270d03908ad2a90e039545fe22965e44e2a4631
-  data.tar.gz: a2112bfaf0021a412a49850b755656f9ae4690ed1433729c30274c88ec2d4396
+  metadata.gz: f93b29cfdfc4ad5759deb07b724b95a126dc957868761ff632468dc60fa411b8
+  data.tar.gz: 4a86702fe2ddd63049607882f92be4274fc16bedd808431ae083483143435bc0
 SHA512:
-  metadata.gz: 86a427ef2f9ce500abd913bc435cd10e8951f539122723699606f840f3cd9bc9f7e0babdf7b0572c1137e144c5bb392277bbfb61777bdd755789a59e8e709b73
-  data.tar.gz: 1625c81170abda661eaacf6938d5e54dbcab261b21397d5da870276be09c046432b16c8596580c41dbdf11e83e68629b2272b308bcbbc32bc4194104488a009e
+  metadata.gz: 27009b78580310aa7e285dc1fce69db2c9167a3db7f0f69267ed069d308e7f816189625f040bc3f265c6d2d112fec2c3509f56c0d8db8cc06a90f9d868db038f
+  data.tar.gz: 635d6166274d1937632f9ce90514fb0eb1eee8fa8a5c4aa4277e7f889bb6a329d4feb9853ad9857c350b28cde831f3c25b0270622daa96da2a28ef11fedb640d

data/exe/esphome-monitor

@@ -1,157 +1,41 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "curses"
-require "esphome"
-require "time"
-
-ANSI_COLOR_MAP = {
-  30 => Curses::COLOR_BLACK,
-  31 => Curses::COLOR_RED,
-  32 => Curses::COLOR_GREEN,
-  33 => Curses::COLOR_YELLOW,
-  34 => Curses::COLOR_BLUE,
-  35 => Curses::COLOR_MAGENTA,
-  36 => Curses::COLOR_CYAN,
-  37 => Curses::COLOR_WHITE
-}.freeze
-
-# Regex to match ANSI color codes (like \e[31m)
-ANSI_ESCAPE_REGEX = /\e\[(\d+(?:;\d+)*)m/
-
-def parse_sgr_codes(codes)
-  color = nil
-  attr = Curses::A_NORMAL
-
-  codes.each do |code|
-    code = code.to_i
-    if ANSI_COLOR_MAP.key?(code)
-      color = ANSI_COLOR_MAP[code]
-    elsif code == 1
-      attr |= Curses::A_BOLD
-    elsif code == 4
-      attr |= Curses::A_UNDERLINE
-    elsif code.zero?
-      attr = Curses::A_NORMAL
-      color = nil
-    end
-  end
-
-  [color, attr]
-end
-
-def parse_ansi_and_render(line)
-  @win.clrtoeol
-  current_color = nil
-  current_attr = Curses::A_NORMAL
-
-  line.split(ANSI_ESCAPE_REGEX).each_with_index do |part, i|
-    if i.odd?
-      codes = part.split(";").map(&:to_i)
-      current_color, current_attr = parse_sgr_codes(codes)
-    elsif current_color
-      pair_id = current_color + 1
-      @win.attron(Curses.color_pair(pair_id) | current_attr) do
-        @win.addstr(part)
-      end
-    else
-      @win.attron(current_attr) do
-        @win.addstr(part)
-      end
-    end
+require "esphome/cli/monitor"
+
+if ARGV.size == 1
+  uri = "http://localhost:6052/"
+  device_name = ARGV[0]
+elsif ARGV.size == 2 && ARGV[0].include?(":")
+  uri, device_name = ARGV
+elsif ARGV.size == 2
+  address, encryption_key = ARGV
+else
+  warn "Usage: esphome-monitor ([<uri>] <device_name> | <address> <encryption_key>)"
+  warn "Example: esphome-monitor http://localhost:6052/ my_device"
+  warn "  If URI is omitted, it defaults to http://localhost:6052/"
+  exit(-1)
+end
+
+if uri
+  require "esphome/dashboard"
+
+  dashboard = ESPHome::Dashboard.new(uri)
+
+  device = dashboard.devices.find { |d| d["name"] == device_name }
+  unless device
+    warn "Device not found: #{device_name}"
+    exit 1
   end
-end
 
-@device = ESPHome::Device.new(ARGV[0], ARGV[1], logger: Logger.new(IO::NULL))
-
-def print_entity(entity, clear_line: true)
-  return unless @entities.key?(entity.key) # has an unsupported entity
-
-  @win.setpos(@entities[entity.key] + 3, 0)
-  @win.clrtoeol if clear_line
-  name = "#{entity.class.name.split("::").last} - #{entity.name}"
-  @win.addstr("#{name.ljust(40)}: [#{Time.now.strftime("%H:%M:%S")}] #{entity.formatted_state}")
-end
-
-def visible_lines
-  @win.maxy - @entities.size - 5
-end
-
-def render_log(visible_lines = nil)
-  visible_lines ||= self.visible_lines
-
-  @log_lines.each_with_index do |log_line, idx|
-    break if idx >= visible_lines
-
-    @win.setpos(@entities.size + 4 + idx, 0)
-
-    parse_ansi_and_render(log_line)
+  address = device["address"]
+  encryption_key = dashboard.encryption_key(device["configuration"])
+  unless encryption_key
+    warn "No encryption key found for device #{device_name}"
+    exit 1
   end
 end
 
-def render_all
-  @win.clear
-  @win.setpos(0, 0)
-  @win.addstr("ESPHome")
-  @win.setpos(1, 0)
-  @win.addstr("#{@device.friendly_name.ljust(45)} (#{@device.esphome_version} - #{@device.compilation_time})")
-  @win.setpos(2, 0)
-  @win.addstr("=" * 80)
-
-  @device.entities.each_value do |entity|
-    next unless entity.is_a?(ESPHome::Entity::HasState)
+device = ESPHome::Device.new(address, encryption_key, logger: Logger.new(IO::NULL))
 
-    print_entity(entity, clear_line: false)
-  end
-
-  render_log
-
-  @win.refresh
-end
-
-Signal.trap("SIGWINCH") do
-  render_all
-end
-
-@log_lines = []
-
-@device.on_message do |entity_or_log_line|
-  if entity_or_log_line.is_a?(String)
-    visible_lines = self.visible_lines
-    @log_lines << "[#{Time.now.strftime("%H:%M:%S")}]#{entity_or_log_line}"
-    @log_lines.shift if @log_lines.size > [20, visible_lines].max
-
-    render_log
-  else
-    print_entity(entity_or_log_line)
-  end
-  @win.refresh
-end
-
-@device.connect
-
-@entities = {}
-@device.entities.values.grep(ESPHome::Entity::HasState).sort_by(&:name).each_with_index do |entity, idx|
-  @entities[entity.key] = idx
-end
-
-Curses.init_screen
-begin
-  Curses.noecho
-  Curses.start_color
-  Curses.use_default_colors
-  @win = Curses.stdscr
-  ANSI_COLOR_MAP.each_value do |color|
-    Curses.init_pair(color + 1, color, -1)
-  end
-
-  render_all
-
-  @device.stream_states
-  @device.stream_log(dump_config: true)
-  @device.loop
-rescue Interrupt
-  # exitting
-ensure
-  Curses.close_screen
-end
+ESPHome::Cli::Monitor.run(device)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: esphome
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Cody Cutrer
 bindir: exe
 cert_chain: []
-date: 2025-07-01 00:00:00.000000000 Z
+date: 2025-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -37,6 +37,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.31'
+- !ruby/object:Gem::Dependency
+  name: httpx
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement