netpump 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6931a624fa28d354c72f47c02c06fe7041784c0a7f31668e66099d3fd3ee37e8
-  data.tar.gz: f9a71688a43c7fee6ba692cabd7f3b7903ebdd40388c762f0b643c6e80f0767e
+  metadata.gz: f5b100cc632515db3f10a3f896cc9693868779f1b46ba669e733f94ef2a947ae
+  data.tar.gz: a121111da173f5315a621678e987f2ff5bd22699c4b062a13f280741fb6eac21
 SHA512:
-  metadata.gz: 25589fad75f1b12458b5b83273ffae665ab1cf4a31badeb1714d611f20e29de4a97567f06fe9472538021e95ca9bfd7dfbdf20665781c3a08fd3e60091dd54a5
-  data.tar.gz: ef0cfa5f786bc386f589d0fd9612a5165ae4051827a6b9b0e3e5561baee74da3cc9247eccfafed53610532436ea02795013c457e320da701aa295ffaed28f841
+  metadata.gz: a6cf3afbf87b63067b8c5ec0728ebd8546ec9fa74ebe3ceaa8a8dd9df4e6dffaeb612a9fa3aab92f4e973ef86f06a3a8da01f79dc5cc653cca1d364ba485f7e7
+  data.tar.gz: f0570c7cbe13d4709368f9f82dd620649de65ab6d7266113b8201b72def271c9a421bfb17100ebf7344e4f4cc07d1ad18936e1a46d3987d50ca3efff2fd19771

data/CHANGELOG

@@ -1,3 +1,7 @@
+1.0.3
+
+Minor improvements
+
 1.0.2
 
 Simplify argv parsing code

data/bin/netpump

@@ -12,7 +12,7 @@ copts = {}
 sopts = {}
 
 op = OptionParser.new do |op|
-  op.version = "1.0.2"
+  op.version = "1.0.3"
   op.summary_width = 24
   op.banner = "Usage: netpump [options]"
   op.separator ""

data/lib/eventmachine/websocket/client.rb

@@ -42,7 +42,7 @@ module EventMachine::WebSocket
     private
 
     def dispatch(data)
-      @parser << data
+      @parser << data if @parser
     rescue HTTP::Parser::Error => e
       debug [:error, e]
       trigger_on_error(e)

data/lib/eventmachine/websocket/server.rb

@@ -1,9 +1,9 @@
 module EventMachine::WebSocket::Server
-  def self.start(host, port, &block)
-    EventMachine::WebSocket.run(host: host, port: port, block: block) do |ws|
+  def self.start(host, port, log, &block)
+    EventMachine::WebSocket.run(host: host, port: port, block: block, log: log) do |ws|
       ws.onerror do |e|
         if EventMachine::WebSocket::WebSocketError === e
-          log "[!] websocket error.", error: e
+          log.call "[!] websocket error.", error: e
         else
           fail e
         end
@@ -20,7 +20,7 @@ module EventMachine::WebSocket::Server
         send_error = lambda do |status|
           send_data("HTTP/1.1 #{status}\r\n\r\n#{status}")
           close_connection_after_writing
-          log "[!] http client error.", method: method, path: path, status: status
+          @options[:log].call "[!] http client error.", method: method, path: path, status: status
         end
         if method != "GET"
           send_error.call(405)

data/lib/netpump/client.rb

@@ -61,7 +61,7 @@ module Netpump
     private_constant :PUBLIC_DIR
 
     def start_websocket_server
-      EventMachine::WebSocket::Server.start(@host, @port) do |path, ws|
+      EventMachine::WebSocket::Server.start(@host, @port, @log) do |path, ws|
         case path
         when "/"
           ws.serve_file(PUBLIC_DIR.join("netpump.html"))
@@ -98,7 +98,7 @@ module Netpump
     end
 
     def print_open_url
-      ip = Socket.getifaddrs.find { |ifa| ifa.addr&.ipv4_private? } or raise(
+      ip = Socket.getifaddrs.select { |ifa| ifa.addr&.ipv4? }.last or raise(
         "could not find an interface to listen on; " \
         "make sure that you are connected to your device."
       )
@@ -119,7 +119,8 @@ module Netpump
         case @mode
         when "direct"
           host = @server_url.host
-          port = @server_url.port
+          # Fallback to port 443 on older rubies.
+          port = @server_url.port || 443
           begin
             EventMachine.connect(host, port, EventMachine::WebSocket::Client, url: @server_url) do |ws|
               ws.onopen do

data/lib/netpump/server.rb

@@ -28,10 +28,10 @@ module Netpump
     private
 
     def start_websocket_server
-      EventMachine::WebSocket::Server.start(@host, @port) do |path, ws|
+      EventMachine::WebSocket::Server.start(@host, @port, @log) do |path, ws|
         case path
         when "/", "/healthcheck"
-          @log.call "[~] http request.", method: "GET", path: path, ip: ws.remote_ip
+          @log.call "[~] http request.", ip: ws.remote_ip, method: "GET", path: path, status: 200
           ws.send_healthcheck_response
         when "/ws/rem/relay"
           ws.onopen do |handshake|

data/public/netpump.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="viewport" content="width=device-width" />
     <title>netpump</title>
     <link rel="icon" href="favicon.svg" type="image/svg+xml" />
     <style>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netpump
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - soylent