flic 0.0.1 → 0.0.2

data/lib/flic/protocol.rb

@@ -5,6 +5,7 @@ module Flic
     class Error < StandardError; end
 
     autoload :Commands, 'flic/protocol/commands'
+    autoload :Connection, 'flic/protocol/connection'
     autoload :Events, 'flic/protocol/events'
     autoload :PacketHeader, 'flic/protocol/packet_header'
     autoload :Primitives, 'flic/protocol/primitives'

data/lib/flic/protocol/commands/change_mode_parameters.rb

@@ -1,6 +1,7 @@
 require 'flic/protocol/commands'
 require 'flic/protocol/commands/command'
 require 'flic/protocol/primitives/latency_mode'
+require 'flic/protocol/primitives/disconnect_time'
 
 module Flic
   module Protocol
@@ -8,9 +9,9 @@ module Flic
       class ChangeModeParameters < Command
         endian :little
 
-        uint32 :connection_id
+        uint32 :connection_channel_id
         latency_mode :latency_mode
-        uint16 :auto_disconnect_time
+        disconnect_time :auto_disconnect_time
       end
     end
   end

data/lib/flic/protocol/commands/create_connection_channel.rb

@@ -2,6 +2,7 @@ require 'flic/protocol/commands'
 require 'flic/protocol/commands/command'
 require 'flic/protocol/primitives/bluetooth_address'
 require 'flic/protocol/primitives/latency_mode'
+require 'flic/protocol/primitives/disconnect_time'
 
 module Flic
   module Protocol
@@ -9,11 +10,11 @@ module Flic
       class CreateConnectionChannel < Command
         endian :little
 
-        uint32 :connection_id
+        uint32 :connection_channel_id
         bluetooth_address :bluetooth_address
 
         latency_mode :latency_mode
-        uint16 :auto_disconnect_time, initial_value: 512 # 512 means disabled
+        disconnect_time :auto_disconnect_time
       end
     end
   end

data/lib/flic/protocol/commands/remove_connection_channel.rb

@@ -7,7 +7,7 @@ module Flic
       class RemoveConnectionChannel < Command
         endian :little
 
-        uint32 :connection_id
+        uint32 :connection_channel_id
       end
     end
   end

data/lib/flic/{client → protocol}/connection.rb

@@ -1,32 +1,15 @@
-require 'flic'
-require 'flic/client'
 require 'flic/protocol'
 
-require 'socket'
-
 module Flic
-  class Client
+  module Protocol
     class Connection
-      class Error < StandardError; end
       class ConnectionClosedError < Error; end
+      class NilResponse < Error; end
 
-      class << self
-        def open(*args)
-          client = new(*args)
-
-          begin
-            yield client
-          ensure
-            client.close
-          end
-        end
-      end
-
-      attr_reader :hostname, :port
+      attr_reader :socket
 
-      def initialize(hostname = 'localhost', port = 5551, *additional_socket_args)
-        @hostname, @port = hostname, port
-        @socket = TCPSocket.new(hostname, port, *additional_socket_args)
+      def initialize(socket)
+        @socket = socket
         @read_semaphore = Mutex.new
         @write_semaphore = Mutex.new
       end
@@ -35,12 +18,16 @@ module Flic
         send_packet Protocol.serialize_command(command)
       end
 
-      def recv_event
-        Protocol.parse_event(recv_packet)
+      def recv_command
+        Protocol.parse_event(recv_command)
       end
 
-      def listen
-        loop { yield recv_event }
+      def send_event(event)
+        send_packet Protocol.serialize_event(event)
+      end
+
+      def recv_event
+        Protocol.parse_event(recv_packet)
       end
 
       def closed?
@@ -71,10 +58,17 @@ module Flic
         @read_semaphore.synchronize do
           packet_header = Protocol::PacketHeader.new
           packet_header_bytes = @socket.read packet_header.num_bytes
+
+          raise NilResponse unless packet_header_bytes
+
           packet_header.read(packet_header_bytes)
 
           @socket.read(packet_header.byte_length)
         end
+      rescue NilResponse
+        @socket.close
+
+        retry
       rescue IOError
         if closed?
           raise ConnectionClosedError

data/lib/flic/protocol/events/button_click_or_hold.rb

@@ -9,7 +9,7 @@ module Flic
       class ButtonClickOrHold < Event
         endian :little
 
-        uint32 :connection_id
+        uint32 :connection_channel_id
         click_type :click_type
         boolean :was_queued
         uint32 :time_difference

data/lib/flic/protocol/events/button_single_or_double_click.rb

@@ -9,7 +9,7 @@ module Flic
       class ButtonSingleOrDoubleClick < Event
         endian :little
 
-        uint32 :connection_id
+        uint32 :connection_channel_id
         click_type :click_type
         boolean :was_queued
         uint32 :time_difference

data/lib/flic/protocol/events/button_single_or_double_click_or_hold.rb

@@ -9,7 +9,7 @@ module Flic
       class ButtonSingleOrDoubleClickOrHold < Event
         endian :little
 
-        uint32 :connection_id
+        uint32 :connection_channel_id
         click_type :click_type
         boolean :was_queued
         uint32 :time_difference

data/lib/flic/protocol/events/button_up_or_down.rb

@@ -9,7 +9,7 @@ module Flic
       class ButtonUpOrDown < Event
         endian :little
 
-        uint32 :connection_id
+        uint32 :connection_channel_id
         click_type :click_type
         boolean :was_queued
         uint32 :time_difference

data/lib/flic/protocol/events/connection_channel_removed.rb

@@ -8,8 +8,8 @@ module Flic
       class ConnectionChannelRemoved < Event
         endian :little
 
-        uint32 :connection_id
-        removed_reason :removed_reason
+        uint32 :connection_channel_id
+        removed_reason :reason
       end
     end
   end

data/lib/flic/protocol/events/connection_status_changed.rb

@@ -9,7 +9,7 @@ module Flic
       class ConnectionStatusChanged < Event
         endian :little
 
-        uint32 :connection_id
+        uint32 :connection_channel_id
         connection_status :connection_status
 
         disconnect_reason :disconnect_reason    # only relevant when connection_status is :disconnected

data/lib/flic/protocol/events/create_connection_channel_response.rb

@@ -9,7 +9,7 @@ module Flic
       class CreateConnectionChannelResponse < Event
         endian :little
 
-        uint32 :connection_id
+        uint32 :connection_channel_id
         create_connection_channel_error :error
         connection_status :connection_status
       end

data/lib/flic/protocol/events/get_info_response.rb

@@ -19,9 +19,10 @@ module Flic
         uint8 :current_pending_connections
         boolean :currently_no_space_for_new_connection
 
-        uint16 :verified_buttons_length
-        array :verified_buttons, type: :bluetooth_address, initial_length: :verified_buttons_length
+        uint16 :verified_buttons_bluetooth_addresses_length
+        array :verified_buttons_bluetooth_addresses, type: :bluetooth_address, initial_length: :verified_buttons_bluetooth_addresses_length
       end
     end
   end
 end
+

data/lib/flic/protocol/primitives.rb

@@ -12,6 +12,7 @@ module Flic
       autoload :CreateConnectionChannelError, 'flic/protocol/primitives/create_connection_channel_error'
       autoload :DeviceName, 'flic/protocol/primitives/device_name'
       autoload :DisconnectReason, 'flic/protocol/primitives/disconnect_reason'
+      autoload :DisconnectTime, 'flic/protocol/primitives/disconnect_time'
       autoload :Enum, 'flic/protocol/primitives/enum'
       autoload :LatencyMode, 'flic/protocol/primitives/latency_mode'
       autoload :RemovedReason, 'flic/protocol/primitives/removed_reason'

data/lib/flic/protocol/primitives/disconnect_time.rb

@@ -0,0 +1,29 @@
+require 'flic/protocol/primitives'
+
+module Flic
+  module Primitives
+    class DisconnectTime < BinData::Primitive
+      endian :little
+
+      uint16 :time, initial_value: 512
+
+      def get
+        if time == 512
+          nil
+        else
+          time
+        end
+      end
+
+      def set(value)
+        if value == 512
+          raise RangeError, '512 is a special value that cannot be used for disconnect_time'
+        elsif value
+          self.time = value
+        else
+          self.time = 512
+        end
+      end
+    end
+  end
+end

data/lib/flic/simple_client.rb

@@ -0,0 +1,116 @@
+require 'flic'
+
+require 'thread'
+
+module Flic
+  class SimpleClient
+    class Error < StandardError; end
+    class ConnectionChannelRemoved; end
+
+    attr_reader :client
+
+    def initialize(*client_args)
+      @client = Client.new(*client_args)
+    end
+
+    def shutdown
+      client.shutdown
+      event_dispatch_thread.join
+    end
+
+    def buttons
+      server_info = process_events_until do |callback|
+        client.get_info(&callback)
+      end
+
+      server_info.verified_buttons_bluetooth_addresses
+    end
+
+    def connect_button
+      begin
+        scan_wizard = Client::ScanWizard.new
+
+        process_events_until do |callback|
+          scan_wizard.removed do |result, bluetooth_address, *|
+            if result == :success
+              callback.call(bluetooth_address)
+            else
+              callback.call(nil)
+            end
+          end
+
+          client.add_scan_wizard(scan_wizard)
+        end
+      ensure
+        client.remove_scan_wizard(scan_wizard)
+      end
+    end
+
+    def disconnect_button(button_bluetooth_address)
+      client.force_disconnect(button_bluetooth_address)
+    end
+
+    def listen(latency_mode, *button_bluetooth_addresses)
+      connection_channels = []
+      button_events = []
+      broken = false
+
+      begin
+        button_bluetooth_addresses.each do |button_bluetooth_addresses|
+          connection_channel = Client::ConnectionChannel.new(button_bluetooth_addresses, latency_mode)
+
+          connection_channel.button_up_or_down do |click_type, latency|
+            button_events << [button_bluetooth_addresses, click_type, latency]
+          end
+
+          connection_channel.button_single_click_or_double_click_or_hold do |click_type, latency|
+            button_events << [button_bluetooth_addresses, click_type, latency]
+          end
+
+          connection_channel.removed do
+            broken = true
+          end
+
+          connection_channels << connection_channel
+
+          client.add_connection_channel connection_channel
+        end
+
+
+        loop do
+          client.handle_next_event while !broken && button_events.empty?
+
+          button_events.each do |button_event|
+            yield *button_event
+          end
+
+          button_events.clear
+
+          raise ConnectionChannelRemoved, 'A connection channel was removed' if broken
+        end
+      ensure
+        connection_channels.each do |connection_channel|
+          client.remove_connection_channel connection_channel
+        end
+      end
+    end
+
+    private
+
+    def process_events_until
+      done = false
+      result = nil
+
+      callback = proc do |_result|
+        done = true
+        result = _result
+      end
+
+      yield callback
+
+      client.handle_next_event until done
+
+      result
+    end
+  end
+end

data/lib/flic/version.rb

@@ -1,3 +1,3 @@
 module Flic
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flic
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alec Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -96,11 +96,20 @@ files:
 - Rakefile
 - flic.gemspec
 - lib/flic.rb
+- lib/flic/callbacks.rb
 - lib/flic/client.rb
-- lib/flic/client/connection.rb
-- lib/flic/event_bus.rb
-- lib/flic/event_bus/driver.rb
-- lib/flic/event_bus/subscription.rb
+- lib/flic/client/connection_channel.rb
+- lib/flic/client/features.rb
+- lib/flic/client/features/connection_channel.rb
+- lib/flic/client/features/force_disconnect.rb
+- lib/flic/client/features/get_button_uuid.rb
+- lib/flic/client/features/get_info.rb
+- lib/flic/client/features/ping.rb
+- lib/flic/client/features/scan.rb
+- lib/flic/client/features/scan_wizard.rb
+- lib/flic/client/scan_wizard.rb
+- lib/flic/client/scanner.rb
+- lib/flic/client/server_info.rb
 - lib/flic/protocol.rb
 - lib/flic/protocol/commands.rb
 - lib/flic/protocol/commands/cancel_scan_wizard.rb
@@ -115,6 +124,7 @@ files:
 - lib/flic/protocol/commands/ping.rb
 - lib/flic/protocol/commands/remove_connection_channel.rb
 - lib/flic/protocol/commands/remove_scanner.rb
+- lib/flic/protocol/connection.rb
 - lib/flic/protocol/events.rb
 - lib/flic/protocol/events/advertisement_packet.rb
 - lib/flic/protocol/events/bluetooth_controller_state_change.rb
@@ -147,11 +157,13 @@ files:
 - lib/flic/protocol/primitives/create_connection_channel_error.rb
 - lib/flic/protocol/primitives/device_name.rb
 - lib/flic/protocol/primitives/disconnect_reason.rb
+- lib/flic/protocol/primitives/disconnect_time.rb
 - lib/flic/protocol/primitives/enum.rb
 - lib/flic/protocol/primitives/latency_mode.rb
 - lib/flic/protocol/primitives/removed_reason.rb
 - lib/flic/protocol/primitives/scan_wizard_result.rb
 - lib/flic/protocol/primitives/uuid.rb
+- lib/flic/simple_client.rb
 - lib/flic/version.rb
 homepage: https://github.com/anarchocurious/flic
 licenses:

data/lib/flic/event_bus.rb

@@ -1,81 +0,0 @@
-require 'flic'
-
-require 'thread'
-
-module Flic
-  class EventBus
-    class Error < StandardError; end
-    class EventBusShutdown < Error; end
-
-    autoload :Driver, 'flic/event_bus/driver'
-    autoload :Subscription, 'flic/event_bus/subscription'
-
-    def initialize
-      @semaphore = Mutex.new
-      @subscriptions = []
-      @is_shutdown = false
-    end
-
-    def subscribe(subscription = Subscription.new)
-      @semaphore.synchronize do
-        raise EventBusShutdown if shutdown?
-
-        @subscriptions << subscription
-      end
-
-      if block_given?
-        begin
-          yield subscription
-        ensure
-          unsubscribe subscription
-        end
-      end
-    end
-
-    def unsubscribe(subscription)
-      @semaphore.synchronize do
-        raise EventBusShutdown if shutdown?
-
-        @subscriptions.delete subscription
-      end
-
-      subscription.destroy
-    end
-
-    def listen
-      subscribe do |subscription|
-        subscription.listen do
-          yield
-        end
-      end
-    end
-
-    def broadcast(*args)
-      @semaphore.synchronize do
-        raise EventBusShutdown if shutdown?
-
-        @subscriptions.each do |subscription|
-          subscription.publish(*args)
-        end
-      end
-    end
-
-    def shutdown?
-      @is_shutdown
-    end
-
-    def shutdown
-      @semaphore.synchronize do
-        unless shutdown?
-          @is_shutdown = true
-
-          @subscriptions.each do |subscription|
-            subscription.destroy
-          end
-
-          @subscriptions.clear
-        end
-      end
-    end
-  end
-end