netpump 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 298b321a2b63596d5247b8d8cd807722c5062249f8f2c9e1b44b30b030a528f3
-  data.tar.gz: c534a39e90383b0ac3896c8060d233dbd02c26c83563ed7d8c9d331b81c91370
+  metadata.gz: 2f72c49ca8c96dafbb9aa62b8742af225bc1117dac402989e1f0ed5612e61f41
+  data.tar.gz: 48322987d7bb48bffefe9d04f752e866ece76e972cffda9b034aed26c41ca959
 SHA512:
-  metadata.gz: 95a11534001077454e72c94f94c81a2e816b613f9ab643ebaaeb06bbcf3e40f7210799130457d0af56677d2c0e5ac73ff8701426f778551c837f5b0ef9c3c711
-  data.tar.gz: c0a4abe22639b9667cdfdf879f63a2c05e96c8ed3eac0d3376506b3d2e094724d5c18933ca9464ad099a87560545dbac91a55324ee82707f337d3eb2cf3a567c
+  metadata.gz: edb4d71ba4c318196880e0d6195255e3fc26c526586d82c6897ae12a43bd88dab8912d26134eb1246d540672ff40770e94dc614629bc3d9360476a1e661149f5
+  data.tar.gz: cbfe25169670f0dbe03813b0c5903aeb9f3644579331377f3c9f4fde3d99c3a26439fae2a3d8113f4e4db6dbbffeeeea32e492bd3b38607d846e734b66887d84

data/CHANGELOG

@@ -1,10 +1,18 @@
+1.0.1
+
+Simplify sequential and parallel request tests
+Dump backtrace only if $VERBOSE is true
+Manage $LOAD_PATH externally
+Abort on unhandled exception
+
 1.0.0
 
-* Add backpressure mechanism to keep memory usage bounded
+* Rename weblink to netpump
+* Add direct client mode, where client connects to the server directly
+* Add backpressure handling to keep memory usage low and bounded
 * Add websocket pool timeout
 * Add more unbind reasons
 * Add option to set the server URL, remove the server query param
-* Add direct client mode
 
 1.3.0
 

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/bin/netpump

@@ -2,12 +2,7 @@
 
 Process.setproctitle "netpump"
 $stdin.close
-if $PROGRAM_NAME.include?("/")
-  $VERBOSE = true
-  $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
-else
-  $VERBOSE = nil
-end
+$VERBOSE = $PROGRAM_NAME == __FILE__ || nil
 
 require "optparse"
 require "uri"
@@ -59,7 +54,7 @@ op = OptionParser.new do |op|
     copts[:proxy_port] = port
   end
 
-  op.on("--server-url URL", WSS, "netpump server url (example: wss://example.org)") do |url|
+  op.on("--server-url URL", WSS, "netpump server url (example: wss://netpump.org)") do |url|
     copts[:server_url] = url
   end
 
@@ -97,7 +92,10 @@ else
   end
 end
 
-EventMachine.error_handler { |e| log "[!] unexpected errback.", error: e }
+EventMachine.error_handler do |e|
+  log "[!] error: #{e.message}."
+  EventMachine.stop
+end
 EventMachine.run do
   trap(:INT) { puts; EventMachine.stop }
   if sopts.delete(:server)
@@ -108,7 +106,4 @@ EventMachine.run do
     client = Netpump::Client.new(**copts)
     client.start
   end
-rescue => e
-  log "[!] #{e.message}."
-  EventMachine.stop
 end

data/lib/netpump/client.rb

@@ -21,8 +21,8 @@ module Netpump
       websocket_pool_timeout: 60.0
     )
       @mode = mode
-      @host = host
-      @port = port
+      @host = host if mode == "browser"
+      @port = port if mode == "browser"
       @proxy_host = proxy_host
       @proxy_port = proxy_port
       @server_url = URI(server_url)
@@ -31,7 +31,7 @@ module Netpump
       @websocket_pool_size = websocket_pool_size
       @websocket_pool_timeout = websocket_pool_timeout
       @control_ws = nil
-      @log = lambda { |msg, **ctx| log(msg, loc: true, **ctx) }
+      @log = lambda { |msg, **ctx| log(msg, c: true, **ctx) }
       @ready = EventMachine::Completion.new
     end
 
@@ -58,10 +58,10 @@ module Netpump
         case path
         when "/"
           ws.serve_file(PUBLIC_DIR.join("netpump.html"))
-          @log.call "[~] http request.", method: "GET", path: path, ip: ws.remote_ip
+          @log.call "[~] http request.", ip: ws.remote_ip, method: "GET", path: path
         when "/favicon.svg"
           ws.serve_file(PUBLIC_DIR.join("favicon.svg"))
-          @log.call "[~] http request.", method: "GET", path: path, ip: ws.remote_ip
+          @log.call "[~] http request.", ip: ws.remote_ip, method: "GET", path: path
         when "/ws/loc/control"
           next false if @control_ws
           ws.onopen do |_handshake|
@@ -100,7 +100,7 @@ module Netpump
     end
 
     def start_proxy_server
-      proxy = EventMachine.start_server(@proxy_host, @proxy_port, Relay, "loc") do |relay|
+      proxy = EventMachine.start_server(@proxy_host, @proxy_port, Relay, "c") do |relay|
         bind(relay)
       end
       @log.call "[+] proxy server is ready.", type: "https", host: @proxy_host, port: @proxy_port

data/lib/netpump/log.rb

@@ -7,7 +7,7 @@ def log(msg, **context)
     case v
     when Exception
       line << " #{k}=#{v.message.inspect}"
-      line << " backtrace=#{v.backtrace}" if !$VERBOSE.nil? && v.backtrace
+      line << " backtrace=#{v.backtrace}" if $VERBOSE && v.backtrace
     when true
       line << " #{k}"
     when false, nil, ""

data/lib/netpump/server.rb

@@ -11,7 +11,7 @@ module Netpump
       @port = port
       @proxy_host = proxy_host
       @proxy_port = proxy_port
-      @log = lambda { |msg, **ctx| log(msg, rem: true, **ctx) }
+      @log = lambda { |msg, **ctx| log(msg, s: true, **ctx) }
     end
 
     def start
@@ -48,7 +48,7 @@ module Netpump
     end
 
     def bind(ws, ip)
-      EventMachine.connect(@proxy_host, @proxy_port, Relay, "rem") do |relay|
+      EventMachine.connect(@proxy_host, @proxy_port, Relay, "s") do |relay|
         fail "inactivity timeout" unless relay.comm_inactivity_timeout.zero?
         relay.bind(ws, ip).callback { bind(ws, ip) }
       end

data/public/netpump.html

@@ -20,12 +20,6 @@
         text-align: center;
         color: white;
       }
-      dd {
-        margin: 0;
-      }
-      input[type="checkbox"] {
-        margin-right: 0.5em;
-      }
       header {
         margin: 1em 0;
       }
@@ -36,6 +30,12 @@
       header svg {
         width: 4em;
       }
+      dd {
+        margin: 0;
+      }
+      input[type="checkbox"] {
+        margin-right: 0.5em;
+      }
     </style>
   </head>
   <body>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netpump
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - soylent
@@ -52,6 +52,7 @@ files:
 - lib/netpump/log.rb
 - lib/netpump/relay.rb
 - lib/netpump/server.rb
+- public/favicon.png
 - public/favicon.svg
 - public/netpump.html
 homepage: https://netpump.org