mackuba.eu
A Ruby gem for streaming data from the Bluesky/ATProto firehose
refactored root url validation
+29
-26
+1
-5
lib/skyfall/firehose.rb
+1
-5
lib/skyfall/firehose.rb
···
19
19
20
20
@endpoint = check_endpoint(endpoint)
21
21
@cursor = check_cursor(cursor)
22
-
@root_url = @root_url.chomp('/')
23
-
24
-
if URI(@root_url).path != ''
25
-
raise ArgumentError, "Server parameter should not include any path"
26
-
end
22
+
@root_url = ensure_empty_path(@root_url)
27
23
end
28
24
29
25
def handle_message(msg)
+1
-6
lib/skyfall/jetstream.rb
+1
-6
lib/skyfall/jetstream.rb
···
12
12
require_relative 'jetstream/message'
13
13
super(server)
14
14
15
-
@root_url = @root_url.chomp('/')
16
-
17
-
if URI(@root_url).path != ''
18
-
raise ArgumentError, "Server parameter should not include any path"
19
-
end
20
-
21
15
@params = check_params(params)
22
16
@cursor = @params.delete(:cursor)
17
+
@root_url = ensure_empty_path(@root_url)
23
18
end
24
19
25
20
def handle_message(msg)
+27
-15
lib/skyfall/stream.rb
+27
-15
lib/skyfall/stream.rb
···
12
12
attr_accessor :auto_reconnect, :last_update, :user_agent
13
13
attr_accessor :heartbeat_timeout, :heartbeat_interval, :check_heartbeat
14
14
15
-
def initialize(service)
16
-
@root_url = build_root_url(service)
15
+
def initialize(server)
16
+
@root_url = build_root_url(server)
17
17
18
18
@handlers = {}
19
19
@auto_reconnect = true
···
188
188
@root_url
189
189
end
190
190
191
-
def build_root_url(service)
192
-
if service.is_a?(String)
193
-
if service.include?('/')
194
-
uri = URI(service)
195
-
if uri.scheme != 'ws' && uri.scheme != 'wss'
196
-
raise ArgumentError, "Service parameter should be a hostname or a ws:// or wss:// URL"
197
-
end
198
-
uri.to_s
199
-
else
200
-
service = "wss://#{service}"
201
-
uri = URI(service) # raises if invalid
202
-
service
191
+
def build_root_url(server)
192
+
if !server.is_a?(String)
193
+
raise ArgumentError, "Server parameter should be a string"
194
+
end
195
+
196
+
if server.include?('://')
197
+
uri = URI(server)
198
+
199
+
if uri.scheme != 'ws' && uri.scheme != 'wss'
200
+
raise ArgumentError, "Server parameter should be a hostname or a ws:// or wss:// URL"
203
201
end
202
+
203
+
uri.to_s
204
204
else
205
-
raise ArgumentError, "Service parameter should be a string"
205
+
server = "wss://#{server}"
206
+
uri = URI(server) # raises if invalid
207
+
server
208
+
end
209
+
end
210
+
211
+
def ensure_empty_path(url)
212
+
url = url.chomp('/')
213
+
214
+
if URI(url).path != ''
215
+
raise ArgumentError, "Server URL should only include a hostname, without any path"
206
216
end
217
+
218
+
url
207
219
end
208
220
end
209
221
end