waithook 0.3.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b32b080839c1c70aad64787e2c4ac0f34fe1dbda59282224a033017ae653621d
-  data.tar.gz: 2adcded9aec179705c2e623aae4a78751ca3c3c057b083744382f7e45934c3fc
+  metadata.gz: 5df3978af4bd4dc3330d86dd3a1948d082d1642882163066ec4e09d9b63245b2
+  data.tar.gz: af869d9efc1604f24b3fd1455767f06d5af75d62c5a225611b87b450e21f4bc1
 SHA512:
-  metadata.gz: d9ed5c757660fcaef33a48243d7695d7b7a2af1c007043c38898cdba459e49aa1ecade64071a5faf15217148269a6e40ab9aea1bd2b8fe4e583bb5270b64fe2d
-  data.tar.gz: 5dee2730756b927ba2ac01757de9add47a28fd8c53c4f1f7c60fa53f6453445dd33cb4f6e2cc8cacf7a2af9572b5b2d57fb059b561ba63d1a1599fedd3aeee24
+  metadata.gz: f2aa1c1079788668a57c3483708aa5158f3fb2b9abdfa8fafb227027ed83c085d970b97d65068a34373cfcb5edcae0ffc481351b1ebc53ee726f7f707eaaadec
+  data.tar.gz: 19c9797a9712c5df295515da8a5b299132ec2176364094d7b6d5f7ca96e502aa986e379a6be94fad05c5109114bc7b7423c9ce6550bf2e1d7d903b5209c7d5a5

data/.gitignore

@@ -1,2 +1,3 @@
 *.gem
-doc
+doc
+.idea/

data/Gemfile.lock

@@ -1,27 +1,27 @@
 PATH
   remote: .
   specs:
-    waithook (0.3.3)
+    waithook (0.4.0)
       websocket (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ansi (1.5.0)
-    builder (3.2.3)
-    excon (0.60.0)
-    minitest (5.11.3)
-    minitest-reporters (1.1.19)
+    builder (3.3.0)
+    excon (0.112.0)
+    minitest (5.25.1)
+    minitest-reporters (1.7.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    public_suffix (3.0.2)
-    rake (12.3.0)
-    ruby-progressbar (1.9.0)
-    websocket (1.2.5)
+    public_suffix (6.0.1)
+    rake (13.2.1)
+    ruby-progressbar (1.13.0)
+    websocket (1.2.11)
 
 PLATFORMS
   ruby
@@ -34,4 +34,4 @@ DEPENDENCIES
   waithook!
 
 BUNDLED WITH
-   1.16.1
+   2.5.11

data/bin/waithook

@@ -23,6 +23,10 @@ begin
     opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
       options[:verbose] = v
     end
+    opts.on("--[no-]debug", "Run verbosely") do |v|
+      options[:verbose] = v
+    end
+
     opts.on("-f URL", "--forward URL", "Forward to HTTP server") do |value|
       options[:forward] = value
     end

data/lib/waithook/cli.rb

@@ -39,7 +39,7 @@ class Waithook
 
       while true
         message = waithook.wait_message
-        puts message.message
+        puts message.pretty_print
         if options[:forward]
           Thread.new do
             begin
@@ -61,4 +61,4 @@ class Waithook
       end
     end
   end
-end
+end

data/lib/waithook/version.rb

@@ -1,3 +1,3 @@
 class Waithook
-  VERSION = "0.3.4"
+  VERSION = "0.4.1"
 end

data/lib/waithook/websocket_client.rb

@@ -199,6 +199,10 @@ class Waithook
     def _process_frame(message)
       logger.trace "Received :#{message.type} #{message.data ? "DATA: #{message.data}" : "(no data)"}"
 
+      if message.type == :pong
+        logger.debug "Got pong"
+      end
+
       if message.type == :ping
         send_pong!
       end
@@ -208,6 +212,13 @@ class Waithook
       end
     end
 
+    def ping_sender(interval = 60)
+      while @is_open
+        send_ping!
+        sleep interval
+      end
+    end
+
     def _wait_frames!
       while char = @socket.getc
         @frame_parser << char

data/lib/waithook.rb

@@ -47,7 +47,7 @@ class Waithook
 
   # Filter (Proc), can be used to to filter incoming messages
   attr_accessor :filter
-  # Array of all recieved messages
+  # Array of all received messages
   attr_accessor :messages
   # Websocket client, instance of Waithook::WebsocketClient
   attr_reader :client
@@ -106,9 +106,23 @@ class Waithook
     raise "Waithook connection already started" if @started
     @started = true
     @client.connect!.wait_handshake!
+    start_pinger_thread!
+
     self
   end
 
+  def start_pinger_thread!
+    Thread.new do
+      begin
+        logger.debug("Sending ping every 60 seconds")
+        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")}")
+      end
+    end
+  end
+
   # Whenever connected to server or not
   def started?
     !!@started
@@ -116,7 +130,7 @@ class Waithook
 
   # Send all incoming webhook requests to running HTTP server
   #
-  #   webhook = Waithook.subscribe(path: 'my-webhoooks').forward_to('http://localhost:3000/notification')
+  #   webhook = Waithook.subscribe(path: 'my-webhooks').forward_to('http://localhost:3000/notification')
   #
   def forward_to(url, options = {})
     webhook = wait_message(options)
@@ -132,7 +146,7 @@ class Waithook
     Timeout.timeout(timeout) do
       while true
         _, data = @client.wait_message
-        webhook = Webhook.new(data)
+        webhook = Webhook.new(data, logger)
         if @filter && @filter.call(webhook) || !@filter
           @messages << webhook
           return webhook
@@ -140,7 +154,7 @@ class Waithook
       end
     end
   rescue Timeout::Error => error
-    time_diff = (Time.now.to_f - start_time).round(3)
+    time_diff = (Time.now.to_f - start_time.to_i).round(3)
     logger.error "#{error.class}: #{error.message} (after #{time_diff} seconds)"
     raise error if raise_timeout_error
     return nil
@@ -166,13 +180,37 @@ class Waithook
     # Raw message from waithook server
     attr_reader :message
 
-    def initialize(payload)
+    def initialize(payload, logger = nil)
       @message = payload
       data = JSON.parse(@message)
       @url = data['url']
       @headers = data['headers']
       @body = data['body']
       @method = data['method']
+      @logger = logger
+    end
+
+    def pretty_print
+      if @body.start_with?('{') && @body.end_with?('}') || @body.start_with?('[') && @body.end_with?(']')
+        begin
+          body_data = JSON.parse(body)
+          pretty_body = JSON.pretty_generate(body_data)
+          data_without_body = JSON.parse(@message)
+          data_without_body.delete('body')
+
+          begin
+            require 'coderay'
+            pretty_body = CodeRay.scan(pretty_body, :json).term
+          rescue => error
+            logger&.debug("Error while trying to use CodeRay: #{error.message}")
+          end
+          return "#{JSON.pretty_generate(data_without_body)}\nBody:\n#{pretty_body}"
+        rescue JSON::ParserError => error
+          logger&.debug("Error while parsing json body: #{error.message}")
+        end
+      end
+
+      return message
     end
 
     # Returns Hash.
@@ -183,9 +221,11 @@ 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-webhoooks').wait_message
+    #   webhook = Waithook.subscribe(path: 'my-webhooks').wait_message
     #   webhook.send_to('http://localhost:3000/notification')
     #
     def send_to(url)
@@ -207,7 +247,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

metadata

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