waithook 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 587f43be470d0045276f76af9a9518cde2c4c0fda3a48894a09bc8a4c053b78d
-  data.tar.gz: bb935b3ba35498e9250f4df4f7f750939defd5c08eb6bbf6501bbfdec97dca74
+  metadata.gz: c3df6454a557d19f38729b89f1874b43111ab2d367c9f6f018064ad012d3ff2a
+  data.tar.gz: f933b2e75524e3301afbe50c8e56bbb525cea7a5503a15071cfad2ab4bd7ff59
 SHA512:
-  metadata.gz: a8e43d129c6ba5043ce3b5aa1f279f3c16e104392f4d54ae6f3cb3a21b788037705933bbd037315477c7f29e919d0233b83d7c7fc2ced9de1dcbf670c20e06f2
-  data.tar.gz: 62a00aa0dd68c73d4e1ed57cc941e1797f8c6e43df03ccb8d5d84001728925ff043100dbb72c98790cf1a61dcbe20e32b62c0141755a0113e1f84668070a7cca
+  metadata.gz: 8f6403f65b5bf735376deea1d9eb4157b66d87428e1c13717c71b80045bfa898487863e15d9a206c59575652cfaa6003dc14885746f1dcd22a2f6ebec03eac1a
+  data.tar.gz: b7f95a852f39039a4832f5a0f5889163e92fb855ade1b7e33a9c5b3ad5dbd0d587f393f8925156d5e8102f055eef0f7843e93be2f5122c1d9934bdbfca0ba70d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    waithook (0.4.0)
+    waithook (0.4.2)
       websocket (~> 1.2)
 
 GEM

data/example/example.rb

@@ -1,7 +1,7 @@
 require 'looksee'
 require 'net/http'
 
-require './websocket-client'
+require_relative '../lib/waithook/websocket_client'
 
 HOST = 'localhost'
 PORT = 3012

data/example/real_server_test.rb

@@ -1,7 +1,7 @@
 require 'looksee'
 require 'excon'
 
-require './websocket-client'
+require_relative '../lib/waithook/websocket_client'
 
 #HOST = 'localhost'
 #PORT = 3012

data/example/waithook_example.rb

@@ -1,7 +1,7 @@
-require_relative './waithook'
+require_relative '../lib/waithook'
 require 'excon'
 
-waithook = Waithook.subscribe('my-super-test', host: 'localhost', port: 3012)
+waithook = Waithook.subscribe(path: 'my-super-test', host: 'localhost', port: 3012)
 
 Excon.post('http://localhost:3012/my-super-test', body: Time.now.to_s)
 

data/lib/waithook/cli.rb

@@ -61,4 +61,4 @@ class Waithook
       end
     end
   end
-end
+end

data/lib/waithook/version.rb

@@ -1,3 +1,3 @@
 class Waithook
-  VERSION = "0.4.0"
+  VERSION = "0.4.2"
 end

data/lib/waithook/websocket_client.rb

@@ -79,7 +79,7 @@ class Waithook
       end
     end
 
-    # Estabilish connection to server and send initial handshake
+    # Establish connection to server and send initial handshake
     def connect!
       logger.info "Connecting to #{@host} #{@port}"
 
@@ -118,7 +118,7 @@ class Waithook
     def _start_parser!
       @reader, @writter = IO.pipe
       @processing_thread = Thread.new do
-        Thread.current.abort_on_exception = true
+        # Thread.current.abort_on_exception = true
         begin
           logger.debug "Start reading in thread"
           handshake_response = _wait_handshake_response
@@ -129,8 +129,14 @@ class Waithook
           _handshake_recieved!
           _wait_frames!
         rescue Object => error
+          # if got error - close socket and end thread
+          # @last_connection_error will be detected in #wait_message and raised to caller thread,
+          # so caller can decide to reconnect or do something else
+          @last_connection_error = error
+          close!(send_close: false, kill_processing_thread: false) rescue nil
+          @messages.close
+
           logger.error "#{error.class}: #{error.message}\n#{error.backtrace.join("\n")}"
-          raise error
         end
       end
     end
@@ -150,7 +156,7 @@ class Waithook
       _send_frame(:text, payload)
     end
 
-    # Wait for new message (thread safe, all waiting threads will recieve a message)
+    # Wait for new message (thread safe, all waiting threads will receive a message)
     # Message format [type, data], e.g. <tt>[:text, "hello world"]</tt>
     def wait_new_message
       waiter = Waiter.new
@@ -158,14 +164,27 @@ class Waithook
       waiter.wait
     end
 
-    # Synchroniously waiting for new message. Not thread safe, only one thread will receive message
+    # Synchronously waiting for new message. Not thread safe, only one thread will receive message
     # Message format [type, data], e.g. <tt>[:text, "hello world"]</tt>
     def wait_message
-      @messages.pop
+      begin
+        message = @messages.pop
+        if (!message || message.first == nil) && @messages.closed? && @last_connection_error
+          raise @last_connection_error
+        end
+
+        return message
+      rescue => error
+        if @last_connection_error
+          raise @last_connection_error
+        else
+          raise error
+        end
+      end
     end
 
     # Wait until server handshake recieved.
-    # Once it's recieved - we can are listening for new messages
+    # Once it's received - we can are listening for new messages
     # and connection is ready for sending data
     def wait_handshake!
       return true if @handshake_received
@@ -240,16 +259,20 @@ class Waithook
       data.join("")
     end
 
+    def socket_open?
+      @socket && !@socket.closed?
+    end
+
     # Send <tt>:close</tt> message to socket and close socket connection
-    def close!(options = {send_close: true})
+    def close!(send_close: true, kill_processing_thread: true)
       unless @is_open
         logger.info "Already closed"
         return false
       end
 
       logger.info "Disconnecting from #{@host} #{@port}"
-      @processing_thread.kill
-      _send_frame(:close) if options[:send_close]
+      @processing_thread.kill if kill_processing_thread
+      _send_frame(:close) if send_close
       @socket.close
       @is_open = false
 

data/lib/waithook.rb

@@ -118,7 +118,11 @@ class Waithook
         client.ping_sender
         logger.debug("Exit ping sender thread")
       rescue => error
-        logger.warn("Error in ping sender thread: #{error.message} (#{error.class})\n#{error.backtrace.join("\n")}")
+        if error.message == "closed stream" && !@client.socket_open?
+          logger.debug("Connection closed, stopping ping sender thread")
+        else
+          logger.warn("Error in ping sender thread: #{error.message} (#{error.class})\n#{error.backtrace.join("\n")}")
+        end
       end
     end
   end
@@ -221,6 +225,8 @@ class Waithook
       end
     end
 
+    SKIP_FORWARD_HEADERS = %w[host content-length connection accept-encoding accept content-encoding]
+
     # Send webhook information to other HTTP server
     #
     #   webhook = Waithook.subscribe(path: 'my-webhooks').wait_message
@@ -245,7 +251,9 @@ class Waithook
 
         request = http_klass.new(uri)
         headers.each do |key, value|
-          request[key] = value
+          if !SKIP_FORWARD_HEADERS.include?(key.to_s.downcase)
+            request[key] = value
+          end
         end
 
         if body

data/tests/waithook_test.rb

@@ -96,4 +96,20 @@ describe "Waithook" do
 
     assert_includes(out, "Timeout::Error: execution expired")
   end
+
+  it "should throw exception when got socket error" do
+    waithook = default_client(logger: true)
+    socket = waithook.client.instance_variable_get(:@socket)
+    socket.close
+
+    captured_error = nil
+    begin
+      waithook.wait_message(raise_on_timeout: false)
+    rescue => error
+      captured_error = error
+    end
+
+    assert_instance_of(IOError, captured_error)
+    assert_equal("stream closed in another thread", captured_error.message)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waithook
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Pavel Evstigneev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-22 00:00:00.000000000 Z
+date: 2024-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket