webhookdump 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8059f6d3d71855659bc058943a450ac3b78a9d730f3f308b93c73d6caaf530cb
-  data.tar.gz: 511b3a0ad1a0ed04711fd33195caf6b764ff29bd57878d65f70168c5e353c497
+  metadata.gz: 976fd8974e7388af85639b08f57d932998bf1127ebcc65858f34e67353e9647c
+  data.tar.gz: 146b4246ccfc22144b89f817677dcfa96334da61ec038fd5429bbe510f036bc0
 SHA512:
-  metadata.gz: 2698835ace895a826fd7ec0a8ff97de918eff38f1fda0a582da350b1a9c12e231b3fd3b4d87fafe2a639ff2ac80843799c05052d93efe5bb1e0f5c25492931cc
-  data.tar.gz: 9d43df9add8d623c99357f8569b08f3bebc3412e5fc6d2951d8ece22a718628c6376f7617befde4396ed32ff71ccf4a2876d8f5d01fc16528a5b19364afb2dd4
+  metadata.gz: 5fd044b73a0e0653c2a110b2b4d8244bc40796b79eab92819b922da5533d7a5b86222f03da7affc9d9a68b12ffcf828c34df9cb3c6cfb301d1b9fa9f97bc7476
+  data.tar.gz: 30c3dec40840ace2ca8a74ae5ddb6cda6a2163e8907c87b7d1c7dfc5688028ddd6793b49cdb414b17a81bd5a3fe4c28ca51d8be7e79f3f3705a783b19f97c29e

data/lib/version.rb

@@ -1,3 +1,3 @@
 module WebhookDump
-  VERSION = '0.0.3'
+  VERSION = '0.0.5'
 end

data/lib/webhook_dump.rb

@@ -6,14 +6,16 @@ require 'faraday'
 
 module WebhookDump 
   class CLI < Thor
-    WEBSOCKET_URL = 'wss://webhookdump.link/cable'
-    WEBSOCKET_URL_DEV = 'ws://localhost:3000/cable'
+    WEBSOCKET_HOST = 'webhookdump.link'
+    WEBSOCKET_HOST_DEV = 'localhost:3000'
 
     option :dev, type: :boolean, default: false, desc: 'Use development environment'
 
     desc "forward WEBHOOKDUMP_ID FORWARD_URL", "Forward events from WebhookDump to a target URL"
 
     def forward(webhookdump_id, forward_url)
+      validate_settings(webhookdump_id, forward_url)
+
       EM.run do
         puts "Start forwarding events from WebhookDump #{webhookdump_id} to #{forward_url}"
 
@@ -61,7 +63,7 @@ module WebhookDump
 
     def close_websocket_connection(ws)
       ws.on :close do |event|
-        reason = event.reason != ' ' ? 'Probably invalid WebhookDump ID' : event.reason
+        reason = event.reason != ' ' ? 'Invalid WebhookDump ID' : event.reason
         puts "Connection closed, #{event.code}, #{reason}"
 
         EM.stop
@@ -69,11 +71,18 @@ module WebhookDump
     end
 
     def init_faye_websocket_connection(webhookdump_id)
-      Faye::WebSocket::Client.new("#{WEBSOCKET_URL_DEV}?id=#{webhookdump_id}")
+      Faye::WebSocket::Client.new("#{websocket_url}?id=#{webhookdump_id}")
+    end
+
+    def websocket_host
+      options[:dev] ? WEBSOCKET_HOST_DEV : WEBSOCKET_HOST
     end
 
     def websocket_url
-      options[:dev] ? WEBSOCKET_URL_DEV : WEBSOCKET_URL
+      protocol = 'wss'
+      protocol = 'ws' if options[:dev]
+
+      "#{protocol}://#{websocket_host}/cable"
     end
 
     def forward_message(forward_url, message)
@@ -114,6 +123,12 @@ module WebhookDump
 
       {}
     end
+
+    def validate_settings(webhookdump_id, forward_url)
+      if forward_url.include? "#{websocket_host}/#{webhookdump_id}"
+        puts "Error: Forward URL is the same as the incoming request URL. This would cause an infinite loop."
+        exit 1
+      end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webhookdump
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Risal Hidayat
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor