cocoro-mqtt 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 829c0ed1013a8f61cc02611d36a5036422e7fb72060c0a9b40b95448e0c87125
-  data.tar.gz: e50ffd67e68a416cd2e1ee8c04145c517077233de3156bd9d41b59da3ba93cdc
+  metadata.gz: 17ad5dcb799245f106467a794c3a47d0b6ec421e56431e009ba4d7095a094519
+  data.tar.gz: 1c1c237183c7ce207ff74e342828754fea895e052ee98568c941aff2e0bfd845
 SHA512:
-  metadata.gz: d9c3ff5857f048fbe49c6346262d479af7f50668ba709c22d58e11881452d19ffd5e94cabc0f02602fec74b203b5639fa6c63bfe12122f9fb7574fc1514fc2c9
-  data.tar.gz: 9ed7bb19376bbb2b81daaa7b46d2a173123d25833044119edba3fc369fcb957038244d6cf54711cfbe4f8a32495f20b36159781c53300ed1c33a0ba7882d0757
+  metadata.gz: 1880a2e64f6ed06a1e6f16f66ca65b5016d18167cf93f7ea241742026737a8d65964f811070063322c891abbc8e121b4921372332afb85df32ad5dd0b9649d70
+  data.tar.gz: dfa32f243c7a21e67d3244da1c8edb01f4f505e2e618a3c86b3ac217b21abf136688b5a0307bfb493a01d03ebc4173fba884266ba1563093cc5d5d8917377fa3

data/Gemfile.lock

@@ -2,14 +2,14 @@ PATH
   remote: .
   specs:
     cocoro-mqtt (0.1.0)
-      cocoro (~> 0.1)
+      cocoro (~> 0.2)
       mqtt (~> 0.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    cocoro (0.1.0)
+    cocoro (0.2.0)
       faraday (~> 1.8)
       faraday-cookie_jar (>= 0.0.7)
       faraday_middleware (~> 1.2)

data/cocoro-mqtt.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "cocoro", "~> 0.1"
+  spec.add_dependency "cocoro", "~> 0.2"
   spec.add_dependency "mqtt", "~> 0.5"
 
   spec.add_development_dependency "rake", "~> 13.0"

data/lib/cocoro/mqtt/version.rb

@@ -2,6 +2,6 @@
 
 module Cocoro
   class Mqtt
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/cocoro/mqtt.rb

@@ -24,7 +24,7 @@ module Cocoro
 
     def start
       @mqtt.connect do |client|
-        @cocoro.devices.each do |device|
+        air_cleaners.each do |device|
           subscribe_to_device_command_topics(device, client)
           make_device_discoverable(device, client)
         end
@@ -36,9 +36,13 @@ module Cocoro
 
     protected
 
+    def air_cleaners
+      @air_cleaners ||= @cocoro.devices.select { |d| d.type == "AIR_CLEANER" }
+    end
+
     def keep_publishing_state_updates(client)
       loop do
-        @cocoro.devices.each do |device|
+        air_cleaners.each do |device|
           refresh_device_state(device, client)
         end
         sleep @interval
@@ -66,12 +70,13 @@ module Cocoro
 
     def handle_command(client, topic, message)
       _, id, target = topic.split("/")
-      device = @cocoro.devices.find { |d| d.echonet_node == id }
+      device = air_cleaners.find { |d| d.echonet_node == id }
       if device.nil?
         @logger.error { "Unknown device: #{id} (#{topic})" }
         return
       end
 
+      @logger.info { "Executing '#{message}' command at '#{topic}'" }
       case target
       when "on"
         device.set_power_on!(message == "ON")
@@ -89,7 +94,6 @@ module Cocoro
     end
 
     def publish_device_state(device, client, status)
-      # TODO: availability
       id = device.echonet_node
       client.publish("cocoro/#{id}/on/state", status.power_on? ? "ON" : "OFF")
       client.publish("cocoro/#{id}/mode/state", status.air_volume)
@@ -100,9 +104,9 @@ module Cocoro
       client.publish("cocoro/#{id}/humidity/state", status.humidity)
       client.publish("cocoro/#{id}/air_cleaned/state", status.total_air_cleaned)
       client.publish("cocoro/#{id}/pm25/state", status.pm25)
-      client.publish("cocoro/#{id}/odor/state", status.smell)
+      client.publish("cocoro/#{id}/odor/state", status.odor)
       client.publish("cocoro/#{id}/dust/state", status.dust)
-      client.publish("cocoro/#{id}/overall_dirtiness/state", status.overall_cleanliness)
+      client.publish("cocoro/#{id}/overall_dirtiness/state", status.overall_dirtiness)
     end
 
     def subscribe_to_device_command_topics(device, client)
@@ -117,16 +121,24 @@ module Cocoro
 
     def make_device_discoverable(device, client)
       id = device.echonet_node
+      device_description = {
+        "manufacturer" => device.maker,
+        "model" => device.model,
+        "name" => device.name,
+        "identifiers" => [id]
+      }
+      availabile_only_when_on = {
+        "topic" => "cocoro/#{id}/on/state",
+        "payload_available" => "ON",
+        "payload_not_available" => "OFF"
+      }
       client.publish(
         "homeassistant/fan/airpurifier/#{id}/config",
         JSON.dump(
           "~" => "cocoro/#{id}",
           "name" => "#{device.name} Air Purifier",
-          "device" => {
-            "manufacturer" => "SHARP",
-            "name" => device.name,
-            "identifiers" => [id]
-          },
+          "unique_id" => "#{id}_airpurifier",
+          "device" => device_description,
           "icon" => "mdi:air-purifier",
           "state_topic" => "~/on/state",
           "command_topic" => "~/on/set",
@@ -140,6 +152,9 @@ module Cocoro
         JSON.dump(
           "~" => "cocoro/#{id}/humidifier",
           "name" => "#{device.name} Humidifier",
+          "unique_id" => "#{id}_humidifier",
+          "device" => device_description,
+          "availability" => [availabile_only_when_on],
           "state_topic" => "~/state",
           "command_topic" => "~/set",
           "icon" => "mdi:air-humidifier"
@@ -150,6 +165,8 @@ module Cocoro
         JSON.dump(
           "~" => "cocoro/#{id}/light",
           "name" => "#{device.name} Light",
+          "unique_id" => "#{id}_light",
+          "device" => device_description,
           "device_class" => "light",
           "state_topic" => "~/state"
         )
@@ -159,6 +176,8 @@ module Cocoro
         JSON.dump(
           "~" => "cocoro/#{id}/empty_water_tank",
           "name" => "#{device.name} Empty Water Tank",
+          "unique_id" => "#{id}_empty_water_tank",
+          "device" => device_description,
           "device_class" => "problem",
           "state_topic" => "~/state",
           "icon" => "mdi:water"
@@ -169,6 +188,9 @@ module Cocoro
         JSON.dump(
           "~" => "cocoro/#{id}/temperature",
           "name" => "#{device.name} Temperature",
+          "unique_id" => "#{id}_temperature",
+          "device" => device_description,
+          "availability" => [availabile_only_when_on],
           "device_class" => "temperature",
           "state_topic" => "~/state",
           "unit_of_measurement" => "°C"
@@ -179,6 +201,9 @@ module Cocoro
         JSON.dump(
           "~" => "cocoro/#{id}/humidity",
           "name" => "#{device.name} Humidity",
+          "unique_id" => "#{id}_humidity",
+          "device" => device_description,
+          "availability" => [availabile_only_when_on],
           "device_class" => "humidity",
           "state_topic" => "~/state",
           "unit_of_measurement" => "%"
@@ -189,6 +214,8 @@ module Cocoro
         JSON.dump(
           "~" => "cocoro/#{id}/air_cleaned",
           "name" => "#{device.name} Total Air Cleaned",
+          "unique_id" => "#{id}_air_cleaned",
+          "device" => device_description,
           "device_class" => "gas",
           "state_topic" => "~/state",
           "unit_of_measurement" => "m³"
@@ -199,6 +226,9 @@ module Cocoro
         JSON.dump(
           "~" => "cocoro/#{id}/pm25",
           "name" => "#{device.name} PM 2.5",
+          "unique_id" => "#{id}_pm25",
+          "device" => device_description,
+          "availability" => [availabile_only_when_on],
           "device_class" => "pm25",
           "state_topic" => "~/state",
           "unit_of_measurement" => "µg/m³"
@@ -209,6 +239,9 @@ module Cocoro
         JSON.dump(
           "~" => "cocoro/#{id}/odor",
           "name" => "#{device.name} Odor",
+          "unique_id" => "#{id}_odor",
+          "device" => device_description,
+          "availability" => [availabile_only_when_on],
           "state_topic" => "~/state",
           "icon" => "mdi:scent",
           "unit_of_measurement" => "%"
@@ -219,6 +252,9 @@ module Cocoro
         JSON.dump(
           "~" => "cocoro/#{id}/dust",
           "name" => "#{device.name} Dust",
+          "unique_id" => "#{id}_dust",
+          "device" => device_description,
+          "availability" => [availabile_only_when_on],
           "state_topic" => "~/state",
           "icon" => "mdi:broom",
           "unit_of_measurement" => "%"
@@ -229,6 +265,9 @@ module Cocoro
         JSON.dump(
           "~" => "cocoro/#{id}/overall_dirtiness",
           "name" => "#{device.name} Overall Air Dirtiness",
+          "unique_id" => "#{id}_overall_dirtiness",
+          "device" => device_description,
+          "availability" => [availabile_only_when_on],
           "state_topic" => "~/state",
           "icon" => "mdi:delete",
           "unit_of_measurement" => "%"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoro-mqtt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tomasz Szczęśniak-Szlagowski
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2022-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoro
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: mqtt
   requirement: !ruby/object:Gem::Requirement