homie-mqtt 1.3.0 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64cfaf8cbbff82a3059c8fcfa639efc39f006241cd79aaadb6bce200eb82a9cc
-  data.tar.gz: d9045a9c729515c2912aeb11b20c5ecad9885b7e0f4df95263e688d74d72f077
+  metadata.gz: fe33f7f3d3d6588a385857dfad083584df0de5af3e66e540732dc3307b7d8a0f
+  data.tar.gz: ba032b7b5760ac2a71915ebbbc4e3671cceff13bcf3b75bba3181b86a0b3c015
 SHA512:
-  metadata.gz: 04ea1126fe4310cc758ddf23fe859f380a0250baf0998a1fab3d695c6f18e6087028dd35de8f619414ec0512d46ac24fb6fb91cae2821729c18b2a91b209455d
-  data.tar.gz: 6200b420bed16a9267cdde8f7192c52d8cd72568dcb72e35247620bd4b71031069a12986b41290329c199bfbf0fc7abdbf25a81d8fdbe1bcce7906b09a883673
+  metadata.gz: f7dabb99327ba052edef139511680ab1a9c5c90e21ce0c3229585e238846f5a2f6abd42365bb2f73cf43767b55e41ad091d45d1c5003fd86d91599d52e73347f
+  data.tar.gz: a302d00a71bcde1495604da147e2d0e200a0dc686a074cd285e95d1861bc334007cd94a45d79d206c19c80dc5bd93dcec504c07488ae362cc94d592986663a8f

data/lib/mqtt/homie/device.rb

@@ -6,6 +6,8 @@ module MQTT
   module Homie
     class Device < Base
       attr_reader :root_topic, :state, :mqtt
+      attr_accessor :logger
+      attr_accessor :out_of_band_topic_proc
 
       def initialize(id, name, root_topic: nil, mqtt: nil, clear_topics: true, &block)
         super(id, name)
@@ -13,7 +15,7 @@ module MQTT
         @state = :init
         @nodes = {}
         @published = false
-        @block = block
+        @out_of_band_topic_proc = block
         mqtt = MQTT::Client.new(mqtt) if mqtt.is_a?(String)
         @mqtt = mqtt || MQTT::Client.new
         @mqtt.set_will("#{topic}/$state", "lost", retain: true, qos: 1)
@@ -87,12 +89,13 @@ module MQTT
             Thread.current.report_on_exception = false
 
             mqtt.get do |packet|
+              logger&.debug("received packet at #{packet.topic} with payload #{packet.payload.inspect}")
               match = packet.topic.match(topic_regex)
               node = @nodes[match[:node]] if match
               property = node[match[:property]] if node
 
               unless property&.settable?
-                @block&.call(topic, packet.payload)
+                @out_of_band_topic_proc&.call(packet.topic, packet.payload)
                 next
               end
 

data/lib/mqtt/homie/property.rb

@@ -6,7 +6,7 @@ module MQTT
       attr_reader :node, :datatype, :format, :unit, :value
 
       def initialize(node, id, name, datatype, value = nil, format: nil, retained: true, unit: nil, &block)
-        raise ArgumentError, "Invalid Homie datatype" unless %s{string integer float boolean enum color}
+        raise ArgumentError, "Invalid Homie datatype" unless %i[string integer float boolean enum color datetime duration].include?(datatype)
         raise ArgumentError, "retained must be boolean" unless [true, false].include?(retained)
         format = format.join(",") if format.is_a?(Array) && datatype == :enum
         if %i{integer float}.include?(datatype) && format.is_a?(Range)
@@ -51,7 +51,7 @@ module MQTT
       def value=(value)
         if @value != value
           @value = value if retained?
-          mqtt.publish(topic, value.to_s, retain: retained?, qos: 1) if @published
+          publish_value if @published
         end
       end
 
@@ -109,6 +109,18 @@ module MQTT
           elsif format == 'hsv'
             return if value.first > 360 || value[1..2].max > 100
           end
+        when :datetime
+          begin
+            value = Time.parse(value)
+          rescue ArgumentError
+            return
+          end
+        when :duration
+          begin
+            value = ActiveSupport::Duration.parse(value)
+          rescue ActiveSupport::Duration::ISO8601Parser::ParsingError
+            return
+          end
         end
 
         @block.arity == 2 ? @block.call(value, self) : @block.call(value)
@@ -128,7 +140,7 @@ module MQTT
           mqtt.publish("#{topic}/$settable", "true", retain: true, qos: 1) if settable?
           mqtt.publish("#{topic}/$retained", "false", retain: true, qos: 1) unless retained?
           mqtt.publish("#{topic}/$unit", unit, retain: true, qos: 1) if unit
-          mqtt.publish(topic, value.to_s, retain: retained?, qos: 1) unless value.nil?
+          publish_value unless value.nil?
           subscribe
         end
 
@@ -152,6 +164,17 @@ module MQTT
         mqtt.unsubscribe("#{topic}/set") if settable?
         mqtt.publish(topic, retain: retained?, qos: 0) if !value.nil? && retained?
       end
+
+      private
+
+      def publish_value
+        serialized = value
+        serialized = serialized&.iso8601 if %i[datetime duration].include?(datatype)
+        serialized = serialized.to_s
+
+        node.device.logger&.debug("publishing #{serialized.inspect} to #{topic}")
+        mqtt.publish(topic, serialized, retain: retained?, qos: 1)
+      end
     end
   end
 end

data/lib/mqtt/homie/version.rb

@@ -2,6 +2,6 @@
 
 module MQTT
   module Homie
-    VERSION = '1.3.0'
+    VERSION = '1.4.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: homie-mqtt
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.4
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt-ccutrer