glottis 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4738a04eaf3d36ff79c3b8b18e9408d825729e40a2314f76049aeb848e9fb23
-  data.tar.gz: 3bc4629dfdb5dbc0b9d55b78369fb4f5be2dc9032a0ac1b5b2f922fdff4b7a6d
+  metadata.gz: b19cc9121495467f570a8989b7cbd66aba5069f70bfa7044e36541ae8d407483
+  data.tar.gz: a854ee9fe9e2cfa2b0969e495b9853884738d202e7a1b21ccae2f8b36bc7f9e6
 SHA512:
-  metadata.gz: 8b36bbc01a00d869a1bd91f58ccc31348332244896e6bca5b6c2c2ba96ce8c1cdb8a16254a50fe4a4c005cc6b3d79a97f789bae8b4c01d6e084aa497f9bb4081
-  data.tar.gz: 74dcce5991937a677eddbe3ebd51de4f792cd0c47ecff50f4d606288fe12c880ef36b9e9c280de8c7f269bf1e82a50248b0d894e38c34b2be2924ad4de3b6070
+  metadata.gz: dc5f81d11d5ab1a4fee50a7e1384534799abb05d24ea34c47460d8c05d07834f3ce3a5684a945f824315d8e9df83e11fe67df1511b0dee8d08000b486eb090e6
+  data.tar.gz: 2de12c2620eda6634c55775794408f6569aaab040cfaa64de49639f17e7434d8dce573582b5e5cc7cd6f6fecca794a12aec10559c63f8a45d87f153fc9525269

data/CHANGELOG.md

@@ -5,15 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semmle.com/semver/1.0.0/).
 
-## [0.3.0] - 2026-07-24
+## [0.4.0] - 2026-07-24
+
+### Changed
+- Minor version release for full Ruby 3.4+ compatibility and modernized dependency stack.
+- Enhanced `RemoteInputHandler` with Server-Sent Events (SSE) stream parsing (`data: {...}`).
+- Enhanced `RemoteOutputHandler` with automatic session cookie forwarding (`SID`) and strict JSON payload formatting (`{"to": "*", "body": "..."}`).
+- Verified live end-to-end message streaming against the modernized Valyx server.
+
+## [0.3.1] - 2026-07-24
 
 ### Changed
 - Bumped required Ruby version to `>= 3.0.0`.
 - Removed `rb-readline` dependency in favor of Ruby standard library `reline`/`readline`.
 - Updated `slop` runtime dependency to `~> 4.10`.
+- Explicitly set `Content-Type: application/json` headers on outgoing HTTP request posts.
 - Modernized gemspec metadata and file list configuration.
 - Updated RuboCop configuration for Ruby 3.0+ compatibility (`Layout/LineLength`).
 - Migrated CI from Travis CI to GitHub Actions (`.github/workflows/ci.yml`).
 
 ### Added
-- Comprehensive RSpec test suite covering core client and handlers.
+- Comprehensive RSpec test suite covering core client, handlers, and live HTTP mock server integration.

data/README.md

@@ -17,7 +17,7 @@ Install the gem by executing:
 
 Or add it to your application's Gemfile:
 
-    $ gem 'glottis', '~> 0.3'
+    $ gem 'glottis', '~> 0.4'
 
 ## Usage
 

data/Rakefile

@@ -1,11 +1,10 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'rubocop/rake_task'
-require 'rspec/core/rake_task'
-
-RuboCop::RakeTask.new(:rubocop)
-RSpec::Core::RakeTask.new(:spec)
-
-task default: %i[rubocop spec]
-
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rubocop/rake_task'
+require 'rspec/core/rake_task'
+
+RuboCop::RakeTask.new(:rubocop)
+RSpec::Core::RakeTask.new(:spec)
+
+task default: %i[rubocop spec]

data/exe/glottis

@@ -1,24 +1,23 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'slop'
-require 'glottis'
-
-opts = Slop.parse do |o|
-  o.string '--host', 'a hostname', default: 'localhost'
-  o.integer '--port', 'TCP port', default: 8080
-  o.bool '-v', '--verbose', 'enable verbose mode'
-  o.on '-V', '--version', 'print the version' do
-    puts "glottis #{Glottis::VERSION}"
-    exit
-  end
-  o.on '-h', '--help' do
-    puts o
-    exit
-  end
-end
-
-Glottis::Client.new(opts[:host],
-                    opts[:port],
-                    verbose: opts[:verbose]).run
-
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'slop'
+require 'glottis'
+
+opts = Slop.parse do |o|
+  o.string '--host', 'a hostname', default: 'localhost'
+  o.integer '--port', 'TCP port', default: 8080
+  o.bool '-v', '--verbose', 'enable verbose mode'
+  o.on '-V', '--version', 'print the version' do
+    puts "glottis #{Glottis::VERSION}"
+    exit
+  end
+  o.on '-h', '--help' do
+    puts o
+    exit
+  end
+end
+
+Glottis::Client.new(opts[:host],
+                    opts[:port],
+                    verbose: opts[:verbose]).run

data/glottis.gemspec

@@ -20,19 +20,18 @@ Gem::Specification.new do |spec|
   spec.metadata['bug_tracker_uri'] = 'https://github.com/maxdeliso/glottis/issues'
   spec.metadata['rubygems_mfa_required'] = 'true'
 
-  spec.files         = Dir.glob('{exe,lib}/**/*') + %w[Rakefile README.md CHANGELOG.md glottis.gemspec]
-  spec.files         = spec.files.select { |f| File.file?(f) }
+  spec.files         = Dir.glob('{exe,lib}/**/*').select { |f| File.file?(f) } +
+                       %w[Rakefile README.md CHANGELOG.md glottis.gemspec]
 
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'slop', '~> 4.10'
+  spec.add_dependency 'slop', '~> 4.10'
 
-  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'bundler', '>= 2.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 1.0'
+  spec.add_development_dependency 'webrick', '~> 1.8'
 end
-
-

data/lib/glottis/client.rb

@@ -25,32 +25,42 @@ module Glottis
     def run
       Client.logger.info('starting...')
 
-      @handlers = [
-        Handlers::ConsoleInputHandler.new(@outgoing),
-        Handlers::ConsoleOutputHandler.new(@incoming),
-        Handlers::RemoteInputHandler.new(@incoming, @host, @port),
-        Handlers::RemoteOutputHandler.new(@outgoing, @host, @port)
-      ]
-
-      @handlers.each(&:start)
+      start_handlers
       @handlers.each(&:join)
     rescue Glottis::Exceptions::UserExitedException
       Client.logger.info('User exited.')
     rescue Interrupt
       Client.logger.info('Received interrupt signal. Exiting...')
-    rescue Errno::ECONNREFUSED => conn_ref
-      Client.logger.error("Failed to connect to host: #{conn_ref.message}")
-    rescue StandardError => ex
-      Client.logger.warn("Shutting down due to error: #{ex.message}")
+    rescue Errno::ECONNREFUSED => e
+      Client.logger.error("Failed to connect to host: #{e.message}")
+    rescue StandardError => e
+      Client.logger.warn("Shutting down due to error: #{e.message}")
     ensure
       stop_handlers
     end
 
     private
 
+    def start_handlers
+      remote_output = Handlers::RemoteOutputHandler.new(@outgoing, @host, @port)
+      remote_output.start
+
+      sleep 0.1 until remote_output.cookie || remote_output.sid
+
+      cookie = remote_output.cookie
+      remote_input = Handlers::RemoteInputHandler.new(@incoming, @host, @port, cookie)
+      remote_input.start
+
+      @handlers = [
+        Handlers::ConsoleInputHandler.new(@outgoing).start,
+        Handlers::ConsoleOutputHandler.new(@incoming).start,
+        remote_input,
+        remote_output
+      ]
+    end
+
     def stop_handlers
       @handlers.each(&:cleanup)
     end
   end
 end
-

data/lib/glottis/exceptions/glottis_exception.rb

@@ -1,9 +1,8 @@
-# frozen_string_literal: true
-
-module Glottis
-  module Exceptions
-    class GlottisException < StandardError
-    end
-  end
-end
-
+# frozen_string_literal: true
+
+module Glottis
+  module Exceptions
+    class GlottisException < StandardError
+    end
+  end
+end

data/lib/glottis/exceptions/user_exited_exception.rb

@@ -1,11 +1,10 @@
-# frozen_string_literal: true
-
-require 'glottis/exceptions/glottis_exception'
-
-module Glottis
-  module Exceptions
-    class UserExitedException < GlottisException
-    end
-  end
-end
-
+# frozen_string_literal: true
+
+require 'glottis/exceptions/glottis_exception'
+
+module Glottis
+  module Exceptions
+    class UserExitedException < GlottisException
+    end
+  end
+end

data/lib/glottis/handlers/console_input_handler.rb

@@ -1,50 +1,52 @@
-# frozen_string_literal: true
-
-require 'glottis/exceptions/user_exited_exception'
-require 'readline'
-
-module Glottis
-  module Handlers
-    # Holds a reference to the outgoing message queue and posts console input.
-    class ConsoleInputHandler
-      USER_PROMPT = '> '
-
-      def initialize(outgoing)
-        @outgoing = outgoing
-        @running = false
-        @thread = nil
-      end
-
-      def start
-        @running = true
-        @thread = Thread.new { run_loop }
-        self
-      end
-
-      def join
-        @thread&.join
-      end
-
-      def cleanup
-        @running = false
-        @thread&.kill if @thread&.alive?
-      end
-
-      private
-
-      def run_loop
-        while @running
-          user_input = Readline.readline(USER_PROMPT, true)
-
-          raise Glottis::Exceptions::UserExitedException, 'User exited readline stream' if user_input.nil?
-
-          @outgoing.push(user_input)
-        end
-      rescue Glottis::Exceptions::UserExitedException => ex
-        Client.logger.info("Console input ended: #{ex.message}")
-        raise ex
-      end
-    end
-  end
-end
-
+# frozen_string_literal: true
+
+require 'glottis/exceptions/user_exited_exception'
+require 'readline'
+
+module Glottis
+  module Handlers
+    # Holds a reference to the outgoing message queue and posts console input.
+    class ConsoleInputHandler
+      USER_PROMPT = '> '
+
+      def initialize(outgoing)
+        @outgoing = outgoing
+        @running = false
+        @thread = nil
+      end
+
+      def start
+        @running = true
+        @thread = Thread.new { run_loop }
+        self
+      end
+
+      def join
+        @thread&.join
+      end
+
+      def cleanup
+        @running = false
+        @thread&.kill if @thread&.alive?
+      end
+
+      private
+
+      def run_loop
+        while @running
+          user_input = Readline.readline(USER_PROMPT, true)
+
+          if user_input.nil?
+            raise Glottis::Exceptions::UserExitedException,
+                  'User exited readline stream'
+          end
+
+          @outgoing.push(user_input)
+        end
+      rescue Glottis::Exceptions::UserExitedException => e
+        Client.logger.info("Console input ended: #{e.message}")
+        raise e
+      end
+    end
+  end
+end

data/lib/glottis/handlers/console_output_handler.rb

@@ -1,41 +1,40 @@
-# frozen_string_literal: true
-
-module Glottis
-  module Handlers
-    # Holds a reference to incoming message queue and prints messages to stdout.
-    class ConsoleOutputHandler
-      def initialize(incoming)
-        @incoming = incoming
-        @running = false
-        @thread = nil
-      end
-
-      def start
-        @running = true
-        @thread = Thread.new { run_loop }
-        self
-      end
-
-      def join
-        @thread&.join
-      end
-
-      def cleanup
-        @running = false
-        @thread&.kill if @thread&.alive?
-      end
-
-      private
-
-      def run_loop
-        while @running
-          new_msg = @incoming.pop
-          break if new_msg.nil? || new_msg == :shutdown
-
-          puts "#{new_msg['from']}, #{new_msg['to']}, #{new_msg['msg']}"
-        end
-      end
-    end
-  end
-end
-
+# frozen_string_literal: true
+
+module Glottis
+  module Handlers
+    # Holds a reference to incoming message queue and prints messages to stdout.
+    class ConsoleOutputHandler
+      def initialize(incoming)
+        @incoming = incoming
+        @running = false
+        @thread = nil
+      end
+
+      def start
+        @running = true
+        @thread = Thread.new { run_loop }
+        self
+      end
+
+      def join
+        @thread&.join
+      end
+
+      def cleanup
+        @running = false
+        @thread&.kill if @thread&.alive?
+      end
+
+      private
+
+      def run_loop
+        while @running
+          new_msg = @incoming.pop
+          break if new_msg.nil? || new_msg == :shutdown
+
+          puts "#{new_msg['from']}, #{new_msg['to']}, #{new_msg['msg']}"
+        end
+      end
+    end
+  end
+end

data/lib/glottis/handlers/remote_input_handler.rb

@@ -13,13 +13,15 @@ module Glottis
       STREAM_DELIMITER = "\0"
       READ_TIMEOUT = 3600
       REMOTE_PATHS = {
-        get_message_stream: '/api/messages/stream'
+        get_message_stream: '/api/v1/messages/stream',
+        legacy_message_stream: '/api/messages/stream'
       }.freeze
 
-      def initialize(incoming, host, port)
+      def initialize(incoming, host, port, cookie = nil)
         @incoming = incoming
         @host = host
         @port = port
+        @cookie = cookie
         @running = false
         @thread = nil
         @buffer = String.new
@@ -49,39 +51,67 @@ module Glottis
 
       def setup_http
         @http = Net::HTTP.new(@host, @port)
-        @http.open_timeout = 1
+        @http.open_timeout = 2
         @http.read_timeout = READ_TIMEOUT
       end
 
       def read_loop
         Client.logger.info('reading stream...')
-        @http.get(REMOTE_PATHS.fetch(:get_message_stream)) do |chunk|
+        headers = @cookie ? { 'Cookie' => @cookie } : {}
+
+        stream_request(headers) do |chunk|
           break unless @running
 
-          Client.logger.debug("got chunk of length: #{chunk.length}")
           process_chunk(chunk)
         end
-      rescue StandardError => ex
-        Client.logger.error("Error reading message stream: #{ex.message}") if @running
+      rescue StandardError => e
+        Client.logger.error("Error reading message stream: #{e.message}") if @running
+      end
+
+      def stream_request(headers, &block)
+        req = Net::HTTP::Get.new(REMOTE_PATHS.fetch(:get_message_stream), headers)
+
+        @http.request(req) do |response|
+          if Integer(response.code) == 404
+            legacy_req = Net::HTTP::Get.new(REMOTE_PATHS.fetch(:legacy_message_stream), headers)
+            @http.request(legacy_req) { |legacy_resp| legacy_resp.read_body(&block) }
+          else
+            response.read_body(&block)
+          end
+        end
       end
 
       def process_chunk(chunk)
         @buffer << chunk
 
+        # Process SSE format ("data: {...}\n\n")
+        while (line_end = @buffer.index("\n"))
+          line = @buffer.slice!(0..line_end).strip
+          next if line.empty? || line.start_with?(':')
+
+          if line.start_with?('data:')
+            json_str = line.sub(/^data:\s*/, '').chomp
+            parse_and_push(json_str)
+          end
+        end
+
+        # Process null-delimited format
         while (delimiter_index = @buffer.index(STREAM_DELIMITER))
           msg_raw = @buffer.slice!(0..delimiter_index)
           msg_data = msg_raw.chomp(STREAM_DELIMITER)
-          next if msg_data.empty?
-
-          begin
-            parsed_msg = JSON.parse(msg_data)
-            @incoming.push(parsed_msg)
-          rescue JSON::ParserError => err
-            Client.logger.warn("Failed to parse JSON payload: #{err.message}")
-          end
+          parse_and_push(msg_data)
         end
       end
+
+      def parse_and_push(raw)
+        return if raw.empty?
+
+        parsed_msg = JSON.parse(raw)
+        parsed_msg['msg'] ||= parsed_msg['body']
+        @incoming.push(parsed_msg)
+      rescue JSON::ParserError => e
+        Client.logger.warn("Failed to parse JSON payload: #{e.message}")
+      end
     end
   end
 end
-

data/lib/glottis/handlers/remote_output_handler.rb

@@ -13,10 +13,14 @@ module Glottis
       PROTOCOL = 'http'
 
       REMOTE_PATHS = {
-        get_session: '/api/session',
-        post_message: '/api/message'
+        get_session: '/api/v1/session',
+        legacy_session: '/api/session',
+        post_message: '/api/v1/messages',
+        legacy_post_message: '/api/message'
       }.freeze
 
+      attr_reader :cookie, :sid
+
       def initialize(outgoing, host, port)
         @outgoing = outgoing
         @host = host
@@ -24,6 +28,7 @@ module Glottis
         @running = false
         @thread = nil
         @sid = nil
+        @cookie = nil
         setup_http
       end
 
@@ -33,9 +38,7 @@ module Glottis
           @http.start
           request_session
 
-          while @running
-            send_queued
-          end
+          send_queued while @running
         end
         self
       end
@@ -54,26 +57,47 @@ module Glottis
 
       def setup_http
         @http = Net::HTTP.new(@host, @port)
-        @http.open_timeout = 1
-        @http.read_timeout = 1
+        @http.open_timeout = 2
+        @http.read_timeout = 2
       end
 
       def request_session
         Client.logger.info('making initial request for session...')
 
-        session_req = @http.get(REMOTE_PATHS.fetch(:get_session))
-        response = JSON.parse(session_req.body)
+        headers = { 'Content-Type' => 'application/json' }
+        session_req = fetch_session(headers)
+
+        code = Integer(session_req.code)
+        raise "failed to retrieve session: #{session_req.body}" unless [200, 201].include?(code)
+
+        parse_session_response(session_req)
+      end
+
+      def fetch_session(headers)
+        req = @http.post(REMOTE_PATHS.fetch(:get_session), '', headers)
+        return req if Integer(req.code) != 404
+
+        @http.get(REMOTE_PATHS.fetch(:legacy_session))
+      end
+
+      def parse_session_response(session_req)
+        if session_req['set-cookie']
+          raw_cookie = session_req['set-cookie']
+          @cookie = raw_cookie.split(';').first
+        end
 
-        if Integer(session_req.code) != 201
-          raise "failed to retrieve session: #{response}"
+        response = begin
+          JSON.parse(session_req.body)
+        rescue StandardError
+          {}
         end
 
-        @sid = response['sid']
+        @sid = response['username'] || response['sid'] || @cookie
         Client.logger.info("current session id: #{@sid}")
       end
 
-      def if_not_ok(http_req, ok_code = 200)
-        yield http_req.body if Integer(http_req.code) != ok_code
+      def if_not_ok(http_req, ok_codes = [200, 201])
+        yield http_req.body unless ok_codes.include?(Integer(http_req.code))
       end
 
       def send_queued
@@ -82,19 +106,21 @@ module Glottis
 
         Client.logger.info("processing message with #{@outgoing.size} messages outgoing")
 
-        message_data = {
-          from: @sid,
-          to: '*',
-          msg: raw_msg
-        }.to_json
+        headers = { 'Content-Type' => 'application/json' }
+        headers['Cookie'] = @cookie if @cookie
 
-        post_req = @http.post(REMOTE_PATHS.fetch(:post_message), message_data)
+        modern_data = { to: '*', body: raw_msg }.to_json
+        post_req = @http.post(REMOTE_PATHS.fetch(:post_message), modern_data, headers)
+
+        if Integer(post_req.code) == 404
+          legacy_data = { from: @sid, to: '*', msg: raw_msg }.to_json
+          post_req = @http.post(REMOTE_PATHS.fetch(:legacy_post_message), legacy_data, headers)
+        end
 
         if_not_ok(post_req) do |err|
-          Client.logger.warn("failed to post message: #{message_data} #{err}")
+          Client.logger.warn("failed to post message: #{raw_msg} #{err}")
         end
       end
     end
   end
 end
-

data/lib/glottis/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Glottis
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/glottis.rb

@@ -1,5 +1,4 @@
-# frozen_string_literal: true
-
-require 'glottis/version'
-require 'glottis/client'
-
+# frozen_string_literal: true
+
+require 'glottis/version'
+require 'glottis/client'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glottis
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Max DeLiso
@@ -27,14 +27,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -79,6 +79,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 email:
 - maxdeliso@gmail.com
 executables:
@@ -123,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: simple http messaging client
 test_files: []