hap_client 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1563b1509e5f1e6f88c06ecdf588fdd43c75dddb82e3b3dbeb1090d4bcc9146b
-  data.tar.gz: e6968e093e0b00a77e4c046783dfecaa86aeefe2f10a5ecd224000e99d48cb33
+  metadata.gz: 06df4fc89f6507b7c23e719dda77142ffaa4d49362af671659f1c4a0308218cc
+  data.tar.gz: 5b76e602105df2387c5290420d085bb8dd7d5bc6a0edd4eb38c10540021c9c58
 SHA512:
-  metadata.gz: 017ca3ba5512e19e51ddc1031f5f478d1cf40bf564593a06ddc0dded6cc25156ab6c9c2e0d53a38a11956b47118c427c285669767467ee7617faaa6af613c7b5
-  data.tar.gz: 7ede4a9834f3d7e1fe4f66b2bd3ec9c83b4e9ff332a7fd82e415f3ee89a41e72e77fdb04efda19f73d52edb0b8415cac7c7b0129a85909d9eb93e08fdf3a06f1
+  metadata.gz: af58a2db3e43f5a67f14cbd00ab45e96f9daa0ade9112d0f217232d0ba4fb5a0de22d26ec32d8c1c6d3cb8a3ba8b8cc220ecc7a374b0da77e977005f5336d5d1
+  data.tar.gz: 961526453a5f82f3b19825c36f6275a742cb782e0975629949aa57805169348dc78d48b9c7fcc081e8cc826af53348cdd84e34033dcf65501fb2984a9a417f4a

data/lib/hap_client/parser.rb

@@ -9,6 +9,10 @@ module HAP
     def receive_data(data)
       if encryption_ready?
         data = decrypt(data)
+
+        if data.start_with?("EVENT/")
+          data.sub!("EVENT/","HTTP/")
+        end
       end
 
       @parser << data

data/lib/hap_client/request.rb

@@ -4,6 +4,41 @@ module HAP
   module Request
     include EncryptionRequest
 
+    def init_request()
+      @req_queue = EM::Queue.new
+      @res_queue = EM::Queue.new
+
+      response_work = nil
+
+      request_work = Proc.new do |req|
+        if encryption_ready?
+          encrypt(req).each do |r|
+            if @socket.nil?
+              send_data(r)
+            else
+              @socket.write(r)
+            end
+          end
+        else
+          if @socket.nil?
+            send_data(req)
+          else
+            @socket.write(req)
+          end
+        end
+
+        init_parser()
+
+        @res_queue.pop(&response_work)
+      end
+
+      response_work = Proc.new do |res|
+        @req_queue.pop(&request_work)
+      end
+
+      @req_queue.pop(&request_work)
+    end
+
     def get(url)
       request("GET", url)
     end
@@ -46,23 +81,7 @@ module HAP
         req << data.to_s
       end
 
-      if encryption_ready?
-        encrypt(req).each do |r|
-          if @socket.nil?
-            send_data(r)
-          else
-            @socket.write(r)
-          end
-        end
-      else
-        if @socket.nil?
-          send_data(req)
-        else
-          @socket.write(req)
-        end
-      end
-
-      init_parser()
+      @req_queue.push(req)
     end
   end
 end

data/lib/hap_client/version.rb

@@ -1,3 +1,3 @@
 module HapClient
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/hap_client.rb

@@ -16,6 +16,9 @@ module HAP
       @name = "Unknown Client"
       @mode = :init
       @values = {}
+      @ids = {}
+
+      init_request()
       init_log()
     end
 
@@ -23,35 +26,39 @@ module HAP
       info("Set Value #{aid}:#{iid} to #{value}")
       data = {
         "characteristics" => [{
-                                "aid" => aid,
-                                "iid" => iid,
-                                "value" => value
+                                "aid" => aid.to_i,
+                                "iid" => iid.to_i,
+                                "value" => value.to_i
                               }]
       }
 
       put("/characteristics", "application/hap+json", JSON.generate(data))
     end
 
-    def subscribe(aid, iid)
-      info("Subscribe to #{aid} #{iid}")
+    def subscribe(&block)
+      events = []
+      @values.each do |service|
+        service[1].each do |val|
+          value = val[1]
+          if value[:perms].include?("ev")
+            info("Subscribe to #{value[:aid]}:#{value[:iid]}")
+            events.push({
+                          :aid => value[:aid],
+                          :iid => value[:iid],
+                          :ev => true
+                        })
+          end
+        end
+      end
+
       data = {
-        "characteristics" => [{
-                                "aid" => aid,
-                                "iid" => iid,
-                                "ev" => "true"
-                              }]
+        :characteristics => events
       }
 
       put("/characteristics", "application/hap+json", JSON.generate(data))
-    end
 
-    def subscribe_to_all()
-      @values.each do |service|
-        service.each do |val|
-          if val[:perms].include?("ev")
-            subscribe(val[:aid], val[:iid])
-          end
-        end
+      if block_given?
+        @callback = block
       end
     end
 
@@ -64,6 +71,27 @@ module HAP
       end
     end
 
+    def get_value(aid, iid)
+      @values[aid][iid][:value]
+    end
+
+    def get_type(aid, iid)
+      @ids[aid][iid]
+    end
+
+    def get_id(service_id, characteristic_id)
+      @services.each do |service|
+        if service[:type] == service_id
+          service[:characteristics].each do |char|
+            if char[:type] == characteristic_id
+              return char
+            end
+          end
+        end
+      end
+      return nil
+    end
+
     def to_s
       @name
     end
@@ -71,6 +99,8 @@ module HAP
     private
 
     def parse_message(data)
+      @res_queue.push(1)
+
       case @mode
       when :pair_setup
         pair_setup_parse(data)
@@ -90,19 +120,38 @@ module HAP
     end
 
     def parse_accessories(data)
-      data = JSON.parse(data, :symbolize_names=>true)
+      begin
+        data = JSON.parse(data, :symbolize_names=>true)
+      rescue JSON::ParserError => e
+        error(e.inspect)
+        error(data)
+        return nil
+      end
 
-      services = data[:accessories][0][:services]
+      if data[:accessories]
+        @services = data[:accessories][0][:services]
 
-      services.each do |service|
-        @values[service[:type]] = {}
+        @services.each do |service|
+          @values[service[:type]] = {}
+          @ids[service[:iid]] = {}
 
-        parse_characteristics(service)
+          parse_characteristics(service)
+        end
+      elsif data[:characteristics]
+        parse_event(data)
+        init_parser
       end
 
       return data
     end
 
+    def parse_event(data)
+      val = data[:characteristics]
+      val.each do |value|
+        on_event(value[:aid], value[:iid], value[:value])
+      end
+    end
+
     def parse_characteristics(service)
       service[:characteristics].each do |char|
         val = char[:value]
@@ -110,9 +159,13 @@ module HAP
         @values[service[:type]][char[:type]] = {
           :aid => char[:aid],
           :iid => char[:iid],
-          :perms => char[:perms},
+          :perms => char[:perms],
           :value => val
         }
+        @ids[char[:aid]][char[:iid]] = {
+          :service => service[:type],
+          :characteristic => char[:type]
+        }
 
         if service[:type] == "3E"
           case char[:type]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hap_client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Andreas Bomholtz