yeelight-client 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb98a134503f504391f1761d58cb09eb9679daf9ac1f7a9b70289ee00f05ab76
-  data.tar.gz: 0a0fee6c5ea0404fef06d81e1df180e42debdc1c5eab37b1abb30588655ae27f
+  metadata.gz: 83fbe6a22fa518845613a0a7601688afe2cc1dda13f485aecd1ea9817459d844
+  data.tar.gz: 4c22e9a33137a66ff286f1218350970f565e1c084efe942fe3d3d166544004f1
 SHA512:
-  metadata.gz: aa273c4520f489e82948d812e1cd3de64f9240463a818baa079ec1e982ff2f041fda57261911a7b234bba33c7402464f653948848aa0de4fb8495f65fa37213b
-  data.tar.gz: 3b631a17ca51965a6efc6386763e46c16d5d8e0cb36e5bc73fe3bc6e8a3efe1f6c56f1b5e68c6313ef32553789f1cdbba951f131050134ad966556cf9e779805
+  metadata.gz: 11038321442e83ea9c7d20f3b70ad0d840e85397bb3a64a2ad3d5321dad88c0341cd4554ed4bbf499880eab5c0679913522f6c00c370db86d66691c2b9224ea7
+  data.tar.gz: 7df23d9f91a23940763afdaf4d0781169cf0ad7259f9618d3b2db8af7ccfb85453f6adb6977c2b63480917ab1c42d55fdf99ac8fd03abee6d84bfbf9494a93aa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yeelight-client (1.0.2)
+    yeelight-client (1.0.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/yeelight_client.rb

@@ -3,12 +3,39 @@ require "yeelight_client/connection"
 require "yeelight_client/requests"
 require "yeelight_client/response"
 require "yeelight_client/response/result"
+require "yeelight_client/response/properties"
 require "yeelight_client/response/exception"
 require "yeelight_client/broadcast"
 
 class YeelightClient
   include Requests
 
+  SUPPORTED_PROPERTIES = %i[
+    power
+    bright
+    ct
+    rgb
+    hue
+    sat
+    color_mode
+    flowing
+    delayoff
+    flow_params
+    music_on
+    name
+    bg_power
+    bg_flowing
+    bg_flow_params
+    bg_ct
+    bg_lmode
+    bg_bright
+    bg_rgb
+    bg_hue
+    bg_sat
+    nl_br
+    active_mode
+  ]
+
   DEFAULT_PARAMS = {
     effect: "sudden".freeze,
     duration: 0
@@ -39,4 +66,8 @@ class YeelightClient
   def prep_params(params)
     DEFAULT_PARAMS.merge(params)
   end
+
+  def prep_props(props)
+    props.map(&:to_sym) & SUPPORTED_PROPERTIES
+  end
 end

data/lib/yeelight_client/requests.rb

@@ -2,6 +2,18 @@ class YeelightClient
   module Requests
     extend Handler
 
+    def get_prop(props: nil)
+      props = prep_props(props || PROPERTIES)
+
+      query = {
+        method: "get_prop",
+        params: props
+      }
+
+      responses = @connection.request(query)
+      responses.map { |response| Response::Properties.new(props, response) }
+    end
+
     def set_bright(value, params: {})
       params = prep_params(params)
         .slice(:effect, :duration)

data/lib/yeelight_client/response/exception.rb

@@ -25,6 +25,8 @@ class YeelightClient
       def detect_errors
         # EOFError - when lamp is busy
         case @exception
+        when JSON::ParserError
+          assign_errors(:invalid_json, :device_error)
         when EOFError
           assign_errors(:device_busy, :device_error)
         when Timeout::Error, Errno::ETIMEDOUT

data/lib/yeelight_client/response/properties.rb

@@ -0,0 +1,17 @@
+class YeelightClient
+  class Response
+    class Properties < YeelightClient::Response::Result
+      def initialize(*args)
+        @props = args[0]
+        super(*args[1..-1])
+      end
+
+      def data
+        return {} unless success?
+        result = @data["result"]
+        array = @props.map.with_index { |prop, i| [prop, result[i]] }
+        Hash[array]
+      end
+    end
+  end
+end

data/lib/yeelight_client/response/result.rb

@@ -2,15 +2,22 @@ class YeelightClient
   class Response
     class Result < YeelightClient::Response
       def data
-        return unless success?
-        super["result"]
+        return {} unless success?
+        @data["result"]
       end
 
-      # {"id"=>4, "error"=>{"code"=>-5000, "message"=>"general error"}}
-      # Result {"id":8232,"error":{"code":-1,"message":"client quota exceeded"}}
       def detect_errors
-        return unless success?
+        return if success?
+        message = @data.dig("error", "message")
 
+        case message
+        when /client quota exceeded/i
+          assign_errors(:request_quota, :device_error)
+        when /general error/i
+          assign_errors(:bad_request, :bad_input)
+        else
+          super
+        end
       end
     end
   end

data/lib/yeelight_client/version.rb

@@ -1,3 +1,3 @@
 class YeelightClient
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yeelight-client
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Andrew Ostroumov
@@ -107,6 +107,7 @@ files:
 - lib/yeelight_client/requests.rb
 - lib/yeelight_client/response.rb
 - lib/yeelight_client/response/exception.rb
+- lib/yeelight_client/response/properties.rb
 - lib/yeelight_client/response/result.rb
 - lib/yeelight_client/version.rb
 - yeelight-client.gemspec
@@ -128,8 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Yeelight Client