glottis 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13566b8129e3820451ffdbeceac479488ee0c7c5
-  data.tar.gz: c35a76b88803bcd3441f13dd67cd513e62fbd1ff
+  metadata.gz: 2884f76bb99f4bdec3dd3f76388f9938767ae903
+  data.tar.gz: 7c765d282c0826521fb4eb2bc9eb3e638676935c
 SHA512:
-  metadata.gz: 6c03142ff57480a928bb64ee71a0065dc9fbfcde3fd595111f6978c8633ad54fdccc2b38e146f2fdb6c65f59fc04bb9f077a049d91bbb99d1508ca05afb884f3
-  data.tar.gz: a49d9b2a97e3fd40764964c5ec6dba856235cdd499e22553f8909b7727a868a1c3bacd20c398dfa41d49d48f8a5e4702b90cc7877248b91e9f421444841a9bcf
+  metadata.gz: 1c37f77138f8fd920f199023a2cc41091b55df36dabb27901491e0dfc14e9815d033af075c4dc378fcdc8b287bf9dfbdbce281e287cf2714b84a1367c13e7fd5
+  data.tar.gz: 83e91d51ae13a21ab278c7e9697e5e55dffed2c488cb5c2a794830c266f873e581781a05ca42feaccdcf9e01da32d0f1bc762c05fb15b97f951d19d55993bd4a

data/README.md

@@ -17,3 +17,5 @@ To install this gem onto your local machine, run `bundle exec rake install`.
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/maxdeliso/glottis.
+
+[![Gem Version](https://badge.fury.io/rb/glottis.svg)](https://badge.fury.io/rb/glottis)

data/lib/glottis/client.rb

@@ -2,7 +2,8 @@ require 'thread'
 require 'logger'
 require 'glottis/handlers/console_input_handler'
 require 'glottis/handlers/console_output_handler'
-require 'glottis/handlers/remote_handler'
+require 'glottis/handlers/remote_input_handler'
+require 'glottis/handlers/remote_output_handler'
 
 module Glottis
   # Client class, used to interact with the host specified.
@@ -26,7 +27,8 @@ module Glottis
       @handlers = [
         Handlers::ConsoleInputHandler.new(@outgoing),
         Handlers::ConsoleOutputHandler.new(@incoming),
-        Handlers::RemoteHandler.new(@outgoing, @incoming, @host, @port)
+        Handlers::RemoteInputHandler.new(@incoming, @host, @port),
+        Handlers::RemoteOutputHandler.new(@outgoing, @host, @port)
       ]
 
       @handlers.each(&:join)

data/lib/glottis/handlers/remote_input_handler.rb

@@ -0,0 +1,53 @@
+require 'logger'
+require 'uri'
+require 'net/http'
+require 'json'
+
+module Glottis
+  module Handlers
+    # This class manages a TCP connection with a valyx server.
+    class RemoteInputHandler < Thread
+      PROTOCOL = 'http'.freeze
+      STREAM_DELIMITER = "\0".freeze
+      READ_TIMEOUT = 3600 # this needs to be high
+      REMOTE_PATHS = {
+        get_message_stream: '/api/messages/stream'
+      }.freeze
+
+      def initialize(incoming, host, port)
+        @incoming = incoming
+        @host = host
+        @port = port
+
+        setup_http
+
+        super do
+          @http.start 
+          read_loop
+        end
+      end
+
+      def cleanup
+        @http.finish if @http.started?
+      end
+
+      private
+
+      def setup_http
+        @http = Net::HTTP.new(@host, @port)
+        @http.open_timeout = 1
+        @http.read_timeout = READ_TIMEOUT
+      end
+
+      def read_loop
+        Client.logger.info('reading stream...')
+        @http.get(REMOTE_PATHS.fetch(:get_message_stream)) do |chunk|
+          Client.logger.debug("got chunk of length: #{chunk.length}")
+          chunk.split(STREAM_DELIMITER).each do |msg_data|
+            @incoming.push(JSON.parse(msg_data))
+          end # each
+        end # get
+      end # read_loop
+    end # RemoteInputHandler
+  end # Handlers
+end # Glottis

data/lib/glottis/handlers/{remote_handler.rb → remote_output_handler.rb}

@@ -6,22 +6,19 @@ require 'json'
 module Glottis
   module Handlers
     # This class manages a TCP connection with a valyx server.
-    class RemoteHandler < Thread
+    class RemoteOutputHandler < Thread
       POLL_INTERVAL = 0.1
       PROTOCOL = 'http'.freeze
 
       REMOTE_PATHS = {
         get_session: '/api/session',
-        get_messages: '/api/messages',
         post_message: '/api/message'
       }.freeze
 
-      def initialize(outgoing, incoming, host, port)
+      def initialize(outgoing, host, port)
         @outgoing = outgoing
-        @incoming = incoming
         @host = host
         @port = port
-        @received_count = 0
 
         setup_http
 
@@ -30,10 +27,7 @@ module Glottis
           request_session
 
           loop do
-            request_messages
             send_queued
-
-            sleep POLL_INTERVAL
           end
         end
       end
@@ -49,7 +43,6 @@ module Glottis
         # TODO: make these configurable somewhere
         @http.open_timeout = 1
         @http.read_timeout = 1
-        @http.continue_timeout = 1
       end
 
       def request_session
@@ -94,30 +87,21 @@ module Glottis
         process_new_messages(messages_req.body)
       end
 
-      def process_new_messages(messages_data)
-        new_messages = JSON.parse(messages_data)
-        Client.logger.debug("received #{new_messages.size} new messages")
-        @received_count += new_messages.size
-        new_messages.each { |msg| @incoming.push(msg) }
-      end
-
       def send_queued
-        while @outgoing.size > 0
-          Client.logger.info("processing message with #{@outgoing.size} messages outgoing")
+        Client.logger.info("processing message with #{@outgoing.size} messages outgoing")
 
-          message_data = {
-            from: @sid,
-            to: '*',
-            msg: @outgoing.pop
-          }.to_json
+        message_data = {
+          from: @sid,
+          to: '*',
+          msg: @outgoing.pop
+        }.to_json
 
-          post_req = @http.post(REMOTE_PATHS.fetch(:post_message), message_data)
+        post_req = @http.post(REMOTE_PATHS.fetch(:post_message), message_data)
 
-          if_not_ok(post_req) do |err|
-            Client.logger.warn("failed to post message: #{err}")
-          end
+        if_not_ok(post_req) do |err|
+          Client.logger.warn("failed to post message: #{message_data} #{err}")
         end
       end # send_queued
-    end # RemoteHandler
+    end # RemoteOutputHandler
   end # Handlers
 end # Glottis

data/lib/glottis/version.rb

@@ -1,4 +1,4 @@
 # Autogenerated version module.
 module Glottis
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glottis
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Max DeLiso
@@ -118,7 +118,8 @@ files:
 - lib/glottis/exceptions/user_exited_exception.rb
 - lib/glottis/handlers/console_input_handler.rb
 - lib/glottis/handlers/console_output_handler.rb
-- lib/glottis/handlers/remote_handler.rb
+- lib/glottis/handlers/remote_input_handler.rb
+- lib/glottis/handlers/remote_output_handler.rb
 - lib/glottis/version.rb
 homepage: https://github.com/maxdeliso/glottis
 licenses: