interop 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3354d110f9c8fd23ec9681841e3403ec92b57d1d8247b2b856795f52344cc387
-  data.tar.gz: a9ecc3aaa1428509a120c7cfba1582ff28a237abbe86898ab0a31b034e8dfd76
+  metadata.gz: c223f2bcb37a0232a64aada70c36947472db2cb1f3f93f4c240f8ef506521244
+  data.tar.gz: c138b462718e569d020a416451a89b81b8a04ed8a100cba3a528bf39b03c82f8
 SHA512:
-  metadata.gz: 238204d49f14974ee72c8ece083866204a187788e55f3f3ad9047bf697f085480561d6f632cd183914c923605ca190cbdd6ac31b51d5cc0e9179bec149c556a3
-  data.tar.gz: 1aa9d43425c0f37a5671947a88448289c9d9bf3775a261e7d8fbf0bca99e34909c0364bb1148fcbf47b3d6643abe75dc7558bde358be6f4906973f0b4a579cff
+  metadata.gz: 220ec6f89e51f1ffdc00657ff52f2a1d16a143dad472b5604c396adfb83748b3bb037203d79df524625c33b2c17232f80cf61045a05a2af6ba4a1792a41d1976
+  data.tar.gz: 7e24d2f42c7346248e14d04a981c0480f60746901272e9c01cbbbde442900fd2b151e02785bad850d112879d5a58abf545cf88baddc14f2f4abe39f0bc80f51c

data/lib/interop/message.rb

@@ -53,7 +53,7 @@ module Hx
       end
 
       # @param [ContentType, ContentTypes] decoder
-      def decode(decoder)
+      def decode(decoder = ContentType::STANDARD)
         decoder.decode self
       end
 

data/lib/interop/rpc/base.rb

@@ -1,15 +1,17 @@
 require 'interop/connection'
 require 'interop/rpc/dispatcher'
 require 'interop/rpc/controller'
+require 'interop/task_group'
 
 module Hx
   module Interop
     module RPC
       # Base class for RPC Client and Server
       class Base
-        def initialize(reader, writer = reader)
+        def initialize(reader, writer = reader, task_group: TaskGroup.new)
           @connection = Connection.build(reader, writer)
           @dispatcher = Dispatcher.new
+          @tasks      = task_group
           yield self if block_given?
           @io_thread = Thread.new do
             run
@@ -20,7 +22,8 @@ module Hx
 
         # TODO: custom exception handler?
 
-        # Wait for the process to finish (i.e. for the connection to close).
+        # Wait for the process to finish (i.e. for the connection to close). Does not wait for running requests/event
+        # handlers to complete.
         def wait
           @io_thread.join
           raise @error if @error # TODO: wrap in something specific, to preserve backtrace
@@ -48,7 +51,7 @@ module Hx
 
         def run
           @connection.read_all do |request|
-            Thread.new do
+            @tasks.run do
               yield request
             rescue StandardError => e
               @io_thread.raise e

data/lib/interop/stream_adapter.rb

@@ -0,0 +1,17 @@
+module Hx
+  module Interop
+    # Base class for StreamReader and StreamWriter
+    class StreamAdapter
+      # @param [IO, StringIO] stream
+      def initialize(stream)
+        if stream.is_a? IO
+          stream.sync = true
+          stream.binmode
+        end
+
+        @stream = stream
+        @mutex  = Mutex.new
+      end
+    end
+  end
+end

data/lib/interop/stream_reader.rb

@@ -2,22 +2,17 @@ require 'set'
 
 require 'interop/message'
 require 'interop/reader'
+require 'interop/stream_adapter'
 
 module Hx
   module Interop
     # Reads messages from a stream (e.g. STDIN)
-    class StreamReader
+    class StreamReader < StreamAdapter
       include Reader
 
       # Acceptable line terminators
       NEWLINES = Set.new(%W[\n \r\n]).freeze
 
-      # @param [IO, StringIO] stream
-      def initialize(stream)
-        @stream = stream
-        @mutex  = Mutex.new
-      end
-
       protected
 
       def _read

data/lib/interop/stream_writer.rb

@@ -1,18 +1,13 @@
 require 'interop/message'
 require 'interop/writer'
+require 'interop/stream_adapter'
 
 module Hx
   module Interop
     # Writes messages to a stream (e.g. STDOUT)
-    class StreamWriter
+    class StreamWriter < StreamAdapter
       include Writer
 
-      # @param [IO, StringIO] stream
-      def initialize(stream)
-        @stream = stream
-        @mutex  = Mutex.new
-      end
-
       protected
 
       # @param [Message] message

data/lib/interop/task_group.rb

@@ -0,0 +1,32 @@
+module Hx
+  module Interop
+    # Allows blocking on running tasks
+    class TaskGroup
+      def initialize
+        @count     = 0
+        @mutex     = Mutex.new
+        @condition = ConditionVariable.new
+      end
+
+      # Run the given block in a new thread. Calls to #wait will block until it has finished running.
+      def run
+        @mutex.synchronize { @count += 1 }
+        Thread.new do
+          yield
+        ensure
+          @mutex.synchronize do
+            @count -= 1
+            @condition.broadcast if @count.zero?
+          end
+        end
+      end
+
+      # Block until all threads created by #run have finished.
+      def wait
+        @mutex.synchronize do
+          @condition.wait(@mutex) while @count.positive?
+        end
+      end
+    end
+  end
+end

data/lib/interop/version.rb

@@ -1,5 +1,5 @@
 module Hx
   module Interop
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: interop
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Neil E. Pearson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies: []
 description: Ruby implementation of hx/interop cross-language interop abstraction
 email:
@@ -40,8 +40,10 @@ files:
 - lib/interop/rpc/dispatcher.rb
 - lib/interop/rpc/magic.rb
 - lib/interop/rpc/server.rb
+- lib/interop/stream_adapter.rb
 - lib/interop/stream_reader.rb
 - lib/interop/stream_writer.rb
+- lib/interop/task_group.rb
 - lib/interop/version.rb
 - lib/interop/writer.rb
 homepage: https://github.com/hx/interop