meshchat 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 677204be2321055039fb7d40db56bf98240b65c5
-  data.tar.gz: 7183a0315be9faa2f4730c3a6f3c5d718ae184b6
+  metadata.gz: 56aa2cb171ad17cc1b7d19162c0bf720af173103
+  data.tar.gz: 6da9f9913dcd1b4cc59a7934582b77836c01bdf7
 SHA512:
-  metadata.gz: cdf0dfc6e780ce78e04f0986ea82c895e3ced5a76ef0e69184e655aa5d2e3d411a5a53505fdc5f127d3e1820c75f053f15c72fd928eb8f6c23badc5fb1da3853
-  data.tar.gz: 78e642349854b82423d953819e49f326046b5096f3c876611acdc12e1e5584cd98ae1c62d886f044867bf8176f4d247d88621dc009ed2467a54683ad9cdcdd1a
+  metadata.gz: 9422fdcb2ad7a3b3ab943a9c37ba3a9af90e0c16da7c65c9db51eacab1c36360c7b5e0d6a77e1f991f94b94c6cf947dd79ea66cfd56fba70a32d8e0e49970911
+  data.tar.gz: af6d8c3895ae4659a9c0485296efc7078efacbb22f795c62960ae7cec0fd3e2332242433b37de97a91b8e12e4ea821c3592822209599337139dd223fab06ef2e

data/lib/meshchat.rb

@@ -73,7 +73,8 @@ module Meshchat
     input_receiver = Ui::CLI.new(
       message_dispatcher,
       message_dispatcher._message_factory,
-      display)
+      display
+    )
 
     # by default the app_config[:input] is
     # Meshchat::Cli::KeyboardLineInput

data/lib/meshchat/debug.rb

@@ -31,6 +31,14 @@ module Meshchat
       Display.debug('Subscribed to relay...')
     end
 
+    def connected_to_relay
+      Display.debug('Connected to relay...')
+    end
+
+    def disconnected_from_relay
+      Display.debug('Disconnected from relay...')
+    end
+
     def received_message_from_relay(message, relay_url)
       Display.debug('RECEIVING on RELAY: ' + relay_url)
       Display.debug('RECEIVING on RELAY: ')

data/lib/meshchat/network/incoming/request_processor.rb

@@ -11,7 +11,8 @@ module Meshchat
           @_message_processor = MessageProcessor.new(
             network: network,
             message_dispatcher: message_dispatcher,
-            location: location)
+            location: location
+          )
         end
 
         # @param [String] request_body - the encrypted message as a json string

data/lib/meshchat/network/local/connection.rb

@@ -39,7 +39,8 @@ module Meshchat
             head: {
               'Accept' => 'application/json',
               'Content-Type' => 'application/json'
-            })
+            }
+          )
 
           http.errback &error_callback
           # example things available in the callback

data/lib/meshchat/network/local/server.rb

@@ -19,7 +19,8 @@ module Meshchat
           @_message_dispatcher = message_dispatcher
           @_request_processor = Incoming::RequestProcessor.new(
             network: NETWORK_LOCAL,
-            message_dispatcher: message_dispatcher)
+            message_dispatcher: message_dispatcher
+          )
         end
 
         def process_http_request

data/lib/meshchat/network/message/base.rb

@@ -25,7 +25,8 @@ module Meshchat
           sender:             {},
           payload:            {},
           message_dispatcher: nil,
-          message_factory:    nil)
+          message_factory:    nil
+        )
 
           if payload.present?
             @payload = payload.deep_stringify_keys

data/lib/meshchat/network/message/node_list.rb

@@ -48,11 +48,13 @@ module Meshchat
 
           we_only_have_message = _message_factory.create(
             NODE_LIST_DIFF,
-            data: { message: we_only_have })
+            data: { message: we_only_have }
+          )
 
           they_only_have_message = _message_factory.create(
             NODE_LIST_DIFF,
-            data: { message: they_only_have })
+            data: { message: they_only_have }
+          )
 
           # give the sender our list
           _message_dispatcher.send_message(
@@ -66,7 +68,8 @@ module Meshchat
           Node.online.each do |node|
             _message_dispatcher.send_message(
               node: node,
-              message: they_only_have_message)
+              message: they_only_have_message
+            )
           end
         end
       end

data/lib/meshchat/network/message/node_list_hash.rb

@@ -20,7 +20,8 @@ module Meshchat
 
             node_list = _message_factory.create(
               NODE_LIST,
-              data: { message: Node.as_json })
+              data: { message: Node.as_json }
+            )
 
             _message_dispatcher.send_message(
               uid: payload['sender']['uid'],

data/lib/meshchat/network/message/whisper.rb

@@ -11,7 +11,8 @@ module Meshchat
           payload:            {},
           to:                 '',
           message_dispatcher: nil,
-          message_factory:    nil)
+          message_factory:    nil
+        )
 
           super(
             message:            message,

data/lib/meshchat/network/remote/relay.rb

@@ -9,26 +9,33 @@ module Meshchat
         # https://github.com/NullVoxPopuli/mesh-relay/blob/master/app/channels/mesh_relay_channel.rb
         CHANNEL = 'MeshRelayChannel'
 
-        attr_reader :_url, :_client, :_request_processor
+        attr_reader :_url, :_client, :_request_processor, :_message_queue
         attr_accessor :_connected
+
         delegate :perform, to: :_client
+        delegate :subscribed?, to: :_client
 
-        def initialize(url, message_dispatcher, connected: nil)
+        def initialize(url, message_dispatcher, subscribed_callback = nil)
           @_url = url
+          @_message_queue = []
           @_request_processor = Incoming::RequestProcessor.new(
             network: NETWORK_RELAY,
             location: url,
-            message_dispatcher: message_dispatcher)
+            message_dispatcher: message_dispatcher
+          )
 
-          setup(connected: connected)
+          setup(subscribed_callback: subscribed_callback)
         end
 
-        def setup(connected: nil)
+        def setup(subscribed_callback: nil)
           path = "#{_url}?uid=#{APP_CONFIG.user['uid']}"
           @_client = ActionCableClient.new(path, CHANNEL)
 
           # don't output anything upon connecting
-          _client.connected { self._connected = true }
+          _client.connected do
+            Debug.connected_to_relay
+            self._connected = true
+          end
 
           # If there are errors, report them!
           _client.errored do |message|
@@ -37,7 +44,7 @@ module Meshchat
 
           _client.subscribed do
             Debug.subscribed_to_relay
-            connected.call if connected
+            subscribed_callback.call if subscribed_callback
           end
 
           # forward the encrypted messages to our RequestProcessor
@@ -47,12 +54,17 @@ module Meshchat
           end
 
           _client.disconnected do
+            Debug.disconnected_from_relay
             self._connected = false
           end
 
           _client
         end
 
+        def send_now(payload)
+          _client.perform('chat', payload)
+        end
+
         def connected?
           _connected
         end

data/lib/meshchat/network/remote/relay_pool.rb

@@ -8,44 +8,71 @@ module Meshchat
         CHANNEL = 'MeshRelayChannel'
 
         attr_accessor :_message_dispatcher
-        attr_accessor :_active_relay
+        attr_accessor :_active_relay, :_waiting_for_subscription
         attr_accessor :_known_relays, :_available_relays
+        attr_accessor :_message_queue
 
         def initialize(message_dispatcher)
           @_message_dispatcher = message_dispatcher
           @_known_relays = APP_CONFIG.user['relays'] || []
           @_available_relays = APP_CONFIG.user['relays'] || []
+          @_message_queue = []
 
           find_initial_relay if @_known_relays.present?
+
+          EM.add_periodic_timer(5) { ensure_relay }
         end
 
         # TODO: add logic for just selecting the first available relay.
         #       we only need one connection.
         # @return [Array] an array of action cable clients
-        def find_initial_relay(connected: nil)
+        def find_initial_relay
           url = _known_relays.first
-          @_active_relay = Relay.new(
-            url, _message_dispatcher,
-            connected: connected)
+          self._waiting_for_subscription = true
+          @_active_relay = Relay.new(url, _message_dispatcher, lambda do
+            self._waiting_for_subscription = false
+            deplete_queue
+          end)
         end
 
         # @param [Hash] payload - the message payload
         def send_payload(payload)
           return if _active_relay.blank?
+          _message_queue << payload
+          ensure_connection do
+            deplete_queue
+          end
+        end
 
-          ensure_active_connection! do
-            _active_relay.perform('chat', payload)
+        def deplete_queue
+          until _message_queue.empty?
+            if _active_relay.subscribed?
+              payload = _message_queue.pop
+              _active_relay.send_now(payload)
+            end
           end
         end
 
-        def ensure_active_connection!(&block)
-          # TODO: make action_cable_client return a boolean
-          if !_active_relay.connected?
-            find_initial_relay(connected: block)
-          else
+        def ensure_connection
+          if _active_relay.connected? && _active_relay.subscribed?
             yield
+          else
+            # if the relay isn't already connected,
+            # it'll be built with a callback to deplete the queue
+            ensure_relay
           end
         end
+
+        def ensure_relay
+          return if _waiting_for_subscription
+          return if _active_relay.subscribed?
+          return if _active_relay.connected?
+
+          # clear the previous node
+          _active_relay = nil
+          # re-connect
+          find_initial_relay
+        end
       end
     end
   end

data/lib/meshchat/ui/cli/input_factory.rb

@@ -57,7 +57,8 @@ module Meshchat
 
         def whisper_for_locked_target(input)
           command = Command::Whisper.new(
-            input, _message_dispatcher, _message_factory, self)
+            input, _message_dispatcher, _message_factory, self
+          )
 
           command._target_node = _whisper_lock_target
           command

data/lib/meshchat/ui/cli/readline_input.rb

@@ -13,7 +13,6 @@ module Meshchat
         end
 
         module Handler
-
           def initialize
             Readline.callback_handler_install('> ') do |line|
               EventMachine.next_tick { handle_input(line) }
@@ -46,23 +45,18 @@ module Meshchat
           def callback_on_next_tick=(callback)
             @callback = callback
           end
-
         end
 
         class << self
           def autocompletes
             commands = Meshchat::Ui::Command::COMMAND_MAP.map { |k, _v| "/#{k}" }
-            aliases = Meshchat::Node.all.map { |n| "#{n.alias_name}" }
+            aliases = Meshchat::Node.all.map { |n| n.alias_name.to_s }
             commands + aliases
           end
 
-          def input_handler
-            @input_handler
-          end
+          attr_reader :input_handler
 
-          def input_handler=(handler)
-            @input_handler = handler
-          end
+          attr_writer :input_handler
         end
 
         def start
@@ -77,7 +71,6 @@ module Meshchat
           Readline.completion_proc = completion
         end
 
-
         # def initialize(*args)
         #   super(args)
         #
@@ -92,7 +85,6 @@ module Meshchat
         #
         #   Readline.readline('> ', true)
         # end
-
       end
     end
   end

data/lib/meshchat/ui/command/help.rb

@@ -10,7 +10,7 @@ module Meshchat
         def handle
           Meshchat::Ui::Command::COMMAND_MAP.each do |key, klass|
             if klass.respond_to?(:description)
-              line = "/%-18s %s" % [key, klass.description ]
+              line = '/%-18s %s' % [key, klass.description]
               Display.info line
             end
           end

data/lib/meshchat/ui/command/node_finder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Meshchat
   module Ui
     module Command
@@ -7,11 +8,9 @@ module Meshchat
         def find_by_target(string, &block)
           search_key = string.start_with?('#') ? :uid : :alias_name
           nodes = Node.where(search_key => string)
-          if nodes.length == 0
-            return Display.warning('No node by: ' + string)
-          end
+          return Display.warning('No node by: ' + string) if nodes.empty?
 
-          return block.call(nodes.first) if nodes.length == 1
+          return yield(nodes.first) if nodes.length == 1
 
           Display.warning I18n.t('node.multiple_with_alias', name: string)
           ask_for_specification(nodes, block)
@@ -21,7 +20,6 @@ module Meshchat
           # there are now more than 1 nodes
           display_nodes(nodes)
 
-
           # insert a callback into the input handler to run the next
           # time a line is received
           #
@@ -48,7 +46,7 @@ module Meshchat
             alias_name = node.alias_name
             uid = node.uid[0..5]
             last_seen = node.updated_at&.strftime('%B %e, %Y  %H:%M:%S') || 'never'
-            line = "%-2s | %-15s %-8s %s" % [i, alias_name, uid, last_seen]
+            line = '%-2s | %-15s %-8s %s' % [i, alias_name, uid, last_seen]
             Display.info line
           end
         end

data/lib/meshchat/ui/command/roll.rb

@@ -3,7 +3,7 @@ module Meshchat
   module Ui
     module Command
       class Roll < Command::Chat
-        REGEX = /(\d+)d(\d+)(\+(\d+))?/
+        REGEX = /(\d+)d(\d+)(([+-])(\d+))?/
 
         def self.description
           'rolls a die in the XdY+Z format'
@@ -11,12 +11,11 @@ module Meshchat
 
         def initialize(input, message_dispatcher, message_factory, input_factory)
           super
-          Display.debug input
           # input, X, Y, +Z, Z
-          _, num, size, _, modifier = REGEX.match(input).to_a.map(&:to_i)
+          _, num, size, modifier, _operator, number = REGEX.match(input).to_a
 
-          result = Array.new(num) { rand(size) + 1 }.inject(:+) + modifier
-          @_input = "rolls #{num}d#{size}#{modifier != 0 ? "+#{modifier}" : ''} and gets #{result}"
+          result = Array.new(num.to_i) { rand(size.to_i) + 1 }.inject(:+) + modifier.to_i
+          @_input = "rolls #{num}d#{size}#{modifier != 0 ? modifier : ''} and gets #{result}"
         end
 
         def show_myself(message)

data/lib/meshchat/ui/command/whisper.rb

@@ -31,7 +31,8 @@ module Meshchat
             data: {
               message: message,
               to: target
-            })
+            }
+          )
 
           Display.whisper m.display
 

data/lib/meshchat/ui/notifier/lib_notify.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Meshchat
   module Ui
     module Notifier

data/lib/meshchat/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Meshchat
-  VERSION = '0.12.0'
+  VERSION = '0.12.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meshchat
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - L. Preston Sego III
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -369,6 +369,6 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Meshchat-0.12.0
+summary: Meshchat-0.12.1
 test_files: []
 has_rdoc: