esphome 0.6.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a5451a87964a40d165ef4ca77b495e96c1cefb3a5868199713291adf524fe41
-  data.tar.gz: 3019f79e68e524def14f2070a2df85e33029d06ade92449a7bab773d06da345d
+  metadata.gz: 33d62455a361134b7827505b3522fe5793cec979e80341d413faf96dcdb28e71
+  data.tar.gz: 5e40a30af957deca20e72bade19dd9920b250816bc3d3e94da3d38704f7f6f3b
 SHA512:
-  metadata.gz: c6fb19598d6575c3466a9f6aadd6dc4c25b36bfe516a8749bdc258d9a994b0ce2fba96356f933675babe033432923105edadfdc72243373aacaf5a7e798820c1
-  data.tar.gz: 40fe976911ca7cf97c93f482b47038e951916457faca363c73a53573594928f51938a83626753d5bd7e1e2ffe76ec037a67460428240e08c1911abcc66571063
+  metadata.gz: 1aab44a24e5fce3acd11c7d37c0d0995cd70e472bda890012218a3db3f99202f6bd4ffbd5cbadd942957cdf8f929ae862096d5779d16d967cd1e264059795ac3
+  data.tar.gz: 03f1fb2e2bee356d445b58d3a38eebb357d5df249d8340a3ca099b5a76447cf1979bf19a93ffd1474b5b283a82880504d3c8f7effc2271eb234d590e5ca5852d

data/exe/esphome-monitor

@@ -3,13 +3,20 @@
 
 require "optparse"
 
+require "esphome/cli/completion"
 require "esphome/cli/monitor"
 
+if ENV["COMP_LINE"]
+  ESPHome::Cli::Completion.run
+  exit
+end
+
 actions = true
 log_level = :info
 connection_log_level = :warn
 device_log_level = :debug
 dump_config = false
+port = 6053
 opts = OptionParser.new do |opts|
   opts.banner = <<~TEXT
     Usage: esphome-monitor ([<uri>] <device_name> | <address> <encryption_key>)
@@ -18,6 +25,9 @@ opts = OptionParser.new do |opts|
       If URI is omitted, it defaults to http://localhost:6052/
   TEXT
 
+  opts.on("--port=VALUE", Integer, "Device port to connect to (default 6053)") do |value|
+    port = value
+  end
   opts.on("--[no-]actions", "Subscribe to Home Assistant actions (default on)") do |v|
     actions = v
   end
@@ -41,7 +51,7 @@ end
 opts.parse!
 
 if ARGV.size == 1
-  uri = "http://localhost:6052/"
+  uri = ESPHome::Dashboard::DEFAULT_URI
   device_name = ARGV[0]
 elsif ARGV.size == 2 && ARGV[0].include?(":")
   uri, device_name = ARGV
@@ -55,22 +65,14 @@ 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
-
-  address = device["address"]
-  encryption_key = dashboard.encryption_key(device["configuration"])
-  unless encryption_key
-    warn "No encryption key found for device #{device_name}"
+  begin
+    address, encryption_key = ESPHome::Dashboard.address_and_encryption_key(uri, device_name)
+  rescue ESPHome::DashboardError => e
+    warn e.message
     exit 1
   end
 end
 
-device = ESPHome::Device.new(address, encryption_key)
+device = ESPHome::Device.new(address, encryption_key, port:)
 
 ESPHome::Cli::Monitor.run(device, connection_log_level:, device_log_level:, log_level:, actions:, dump_config:)

data/exe/esphome-serial-proxy

@@ -0,0 +1,132 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "io/console"
+require "optparse"
+
+require "esphome/cli/completion"
+
+if ENV["COMP_LINE"]
+  ESPHome::Cli::Completion.run
+  exit
+end
+
+require "esphome/serial_proxy"
+
+baud = nil
+data_bits = nil
+parity = nil
+stop_bits = nil
+
+opts = OptionParser.new do |opts|
+  opts.banner = <<~TEXT
+    Usage: esphome-serial-proxy ([<uri>] <device_name> [instance] | <address> <encryption_key> [instance])
+
+    Examples:
+      esphome-serial-proxy my_device
+      esphome-serial-proxy http://localhost:6052/ my_device uart0
+      esphome-serial-proxy 192.168.1.10 BASE64_ENCRYPTION_KEY 1
+  TEXT
+
+  opts.on("--baud=VALUE", Integer, "Serial baud rate") do |value|
+    baud = value
+  end
+  opts.on("--data-bits=VALUE", Integer, "Serial data bits") do |value|
+    data_bits = value
+  end
+  opts.on("--parity=VALUE", "Serial parity (`none`, `even`, or `odd`)") do |value|
+    parity = value.to_sym
+  end
+  opts.on("--stop-bits=VALUE", Integer, "Serial stop bits") do |value|
+    stop_bits = value
+  end
+  opts.on("-h", "--help", "Show this help message") do
+    puts opts
+    exit
+  end
+end
+opts.parse!
+
+dashboard_uri = nil
+device_name = nil
+address = nil
+encryption_key = nil
+instance = nil
+
+if ARGV.size == 1
+  dashboard_uri = ESPHome::Dashboard::DEFAULT_URI
+  device_name = ARGV[0]
+elsif ARGV.size == 2 && ARGV[0].include?(":")
+  dashboard_uri, device_name = ARGV
+elsif ARGV.size == 2
+  address, encryption_key = ARGV
+elsif ARGV.size == 3 && ARGV[0].include?(":")
+  dashboard_uri, device_name, instance = ARGV
+elsif ARGV.size == 3
+  address, encryption_key, instance = ARGV
+else
+  warn opts
+  exit(-1)
+end
+
+if dashboard_uri
+  require "esphome/dashboard"
+
+  begin
+    address, encryption_key = ESPHome::Dashboard.address_and_encryption_key(dashboard_uri, device_name)
+  rescue ESPHome::DashboardError => e
+    warn e.message
+    exit 1
+  end
+end
+
+stdin_thread = nil
+interactive = $stdin.tty?
+session = proc do
+  $stdin.binmode
+  $stdout.binmode
+  $stderr.binmode
+  $stdout.sync = true
+
+  ESPHome::SerialProxy.open(address,
+                            encryption_key,
+                            instance,
+                            baud:,
+                            data_bits:,
+                            parity:,
+                            stop_bits:) do |proxy|
+    stdin_thread = Thread.new do
+      Kernel.loop do
+        chunk = $stdin.readpartial(64 * 1024)
+        if interactive && (eof = chunk.index("\x04"))
+          proxy.write(chunk.byteslice(0, eof)) if eof.positive?
+          proxy.close
+          break
+        end
+
+        proxy.write(chunk)
+      end
+    rescue EOFError
+      nil
+    end
+
+    begin
+      Kernel.loop do
+        $stdout.write(proxy.readpartial(64 * 1024))
+      end
+    rescue EOFError
+      nil
+    ensure
+      stdin_thread.kill if stdin_thread&.alive?
+      stdin_thread&.join
+    end
+  end
+end
+
+if interactive
+  $stdin.raw(intr: true) do
+    session.call
+  end
+else
+  session.call
+end

data/lib/esphome/action.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module ESPHome
+  class Action
+    class << self
+      def from_protobuf(message)
+        data = message.data.to_h { |kv| [kv.key, kv.value] }
+        data_template = message.data_template.to_h { |kv| [kv.key, kv.value] }
+        variables = message.variables.to_h { |kv| [kv.key, kv.value] }
+        if message.is_event
+          if message.service == TagScanned::SERVICE &&
+             data.keys == ["tag_id"] &&
+             data_template.empty? &&
+             variables.empty?
+            TagScanned.new(data["tag_id"])
+          else
+            Event.new(message.service, data, data_template, variables)
+          end
+        else
+          Action.new(message.service, data, data_template, variables)
+        end
+      end
+    end
+
+    attr_reader :service, :data, :data_template, :variables
+
+    def initialize(service, data = {}, data_template = {}, variables = {})
+      @service = service
+      @data = data
+      @data_template = data_template
+      @variables = variables
+    end
+
+    def inspect
+      "#<#{self.class.name} service=#{service} " \
+        "data=#{data.inspect} " \
+        "data_template=#{data_template.inspect} " \
+        "variables=#{variables.inspect}>"
+    end
+  end
+
+  class Event < Action; end
+
+  class TagScanned < Event
+    SERVICE = "esphome.tag_scanned"
+
+    def initialize(tag_id)
+      super(SERVICE, { "tag_id" => tag_id })
+    end
+
+    def inspect
+      "#<#{self.class.name} tag_id=#{data["tag_id"].inspect}>"
+    end
+  end
+end

data/lib/esphome/api/README.md

@@ -0,0 +1,3 @@
+Just copy api.proto from esphome's repository and re-add `option ruby_package = "ESPHome::Api";` at the top.
+Then regenerate with `protoc --ruby_out=. api.proto api_options.proto`, and finally edit the `require` in api_pb.rb to be `require_relative`.
+Be sure to add any new messages to api.rb, and check for changes in the messages themselves.