librevox 1.0.0.alpha1 → 1.0.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d47382ef56ccc15ea2aacf0e4bc5f4bf197fdb7338a25e7841a7f85a96ebe31
-  data.tar.gz: 86736dac97c19aaa298693bfe99c3f75a9b829777f37ea20d2932a1f5221dc3b
+  metadata.gz: 52c30042c2b87d8bce357c5aaaa49147988cacc455f39f48f3517e2c29337990
+  data.tar.gz: 8b8d1608e69f8f5a8637233224e2d25b7d601d98f095b68ba266be60a887bb7b
 SHA512:
-  metadata.gz: efea41f41b6e92608d8dbe69035cbc537c7c1da77c15767c92aa1679633d57c840f26ac37a740f4df3a9ef24a24103bad9bdf2a1ed514bc8d73fd33e0a9576f9
-  data.tar.gz: 6a1502164b5df5387b6f1a12c65d379f3fb13caec7a27201c4aa97d1122a22ac667021991802f8158b53e3bd91d2b8b4a0f401709ebee9973331b960bfecff67
+  metadata.gz: dd87a95e593d39615cf34ba02b343ba2ab4ef2f8f6862494e4c23d98daf8f1e7f252bb887c15a51440f4c1650ed2bbe8c8c41db89c50d50ff77bb60e4efb3c6e
+  data.tar.gz: 655726a4f85cb4a4f8f6a546d4c254118d32712fbbd7d8a36a82f22850dffaa7503e8f241576c209c673a71179f016102bc32d20bd0cdfee47e77f4a701a7cc1

data/README.md

@@ -171,12 +171,12 @@ Default ports are 8021 for inbound and 8084 for outbound.
 
 ## Closing Connections
 
-After a session ends (e.g. the caller hangs up), the outbound socket connection to FreeSWITCH remains open for post-session events. Close it manually when done to avoid lingering sessions. Use `done` (alias for `close_connection_after_writing`):
+After a session ends (e.g. the caller hangs up), the outbound socket connection to FreeSWITCH remains open for post-session events. Close it manually when done to avoid lingering sessions:
 
 ```ruby
 class MyOutbound < Librevox::Listener::Outbound
   event :channel_hangup do
-    done
+    disconnect
   end
 end
 ```

data/lib/librevox/client.rb

@@ -19,7 +19,7 @@ module Librevox
       listener = @handler.new(connection, @options)
 
       session_task = Async { listener.run_session }
-      listener.read_loop
+      connection.read_loop { |msg| listener.receive_message(msg) }
     ensure
       session_task&.stop
       connection.close

data/lib/librevox/listener/base.rb

@@ -50,7 +50,7 @@ module Librevox
 
       def command(msg)
         @command_mutex.acquire do
-          send_data "#{msg}\n\n"
+          write "#{msg}\n\n"
           @reply_queue.dequeue
         end
       end
@@ -81,25 +81,17 @@ module Librevox
       def on_event(event)
       end
 
-      def send_data(data)
+      def write(data)
         @connection&.write(data)
       end
 
-      def read_loop
-        while (msg = @connection.read_message)
-          receive_message(msg)
-        end
-      end
-
       def run_session
       end
 
-      def close_connection_after_writing
+      def disconnect
         @connection&.close
       end
 
-      alias :done :close_connection_after_writing
-
       private
 
       def invoke_event_hooks(resp)

data/lib/librevox/listener/outbound.rb

@@ -26,7 +26,7 @@ module Librevox
 
       def sendmsg(msg)
         @command_mutex.acquire do
-          send_data "sendmsg\n#{msg}\n\n"
+          write "sendmsg\n#{msg}\n\n"
           @reply_queue.dequeue          # command/reply ack
         end
         @app_complete_queue.dequeue     # CHANNEL_EXECUTE_COMPLETE

data/lib/librevox/protocol/connection.rb

@@ -24,6 +24,12 @@ module Librevox
         end
       end
 
+      def read_loop
+        while (msg = read_message)
+          yield msg
+        end
+      end
+
       def write(data)
         @stream.write(data)
         @stream.flush

data/lib/librevox/server.rb

@@ -18,7 +18,7 @@ module Librevox
       listener = @handler.new(connection)
 
       session_task = Async { listener.run_session }
-      listener.read_loop
+      connection.read_loop { |msg| listener.receive_message(msg) }
     rescue => e
       Librevox.logger.error "Session error: #{e.full_message}"
     ensure

data/lib/librevox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Librevox
-  VERSION = "1.0.0.alpha1"
+  VERSION = "1.0.0.alpha2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librevox
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha1
+  version: 1.0.0.alpha2
 platform: ruby
 authors:
 - Harry Vangberg