weblink 1.1.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13496b146b017e1d415d1fb4ee27b36deb894f158882dc376490be51a6920184
-  data.tar.gz: cf4643c4a79bb42f8f2b79e05197915e866d90d54be68689aa3df628f237385e
+  metadata.gz: 6e829338fc3dde9de2d16c8ec3b7278bfd225b55ed9bbc253219932f9426da32
+  data.tar.gz: 8d0e86f6bb6fe90ba4faa513fcb347983c92c2df2743d5238ee04b2897de5e27
 SHA512:
-  metadata.gz: 11b4b83e40f513ef9b4cbeb3ae532dc5c794da491e0adc06b69fa9c3736c80148998d26c1cf0eef78ff1cced9bfea691806bfebf7fb1bbd6ec720f453936d695
-  data.tar.gz: d2083018ee29d25126c5379524bd59af249e55ac8b3b5030517b7ba905a2d122a5851a9fcb43611b215799acaeefbed3a88e4163946ef68c8426b01d2ff9ed8b
+  metadata.gz: 517605ab3723104d2d58cba140cdd4bbe99d5e76ff5dd25012e2cc02fb8a59b70ad65ad15e6c2bd914b898b138645a3b80e637dc36c3b253196ffe8b31bf9916
+  data.tar.gz: 9bd7f163a3039161decee833f62846455e8319e8cb5e407121c802ee888646fee97ac2eaa0ccc39861d07cc2884ef93fd7d88455945c85bf2731cdd0ed7812c5

data/CHANGELOG

@@ -1,3 +1,18 @@
+1.3.0
+
+* Run all servers in one event loop
+* Replace webrick with a simple static file server
+* Add websocket pool
+* Add extensive logging
+* Show connection count in browser
+* Drop SOCKS5 support
+* Drop web manifest
+
+1.2.0
+
+* Prevent screen from sleeping (@zakir8)
+* Send pings to keep websockets alive
+
 1.1.2
 
 * Add webrick as a runtime dependency

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.3.0

data/bin/weblink

@@ -1,10 +1,12 @@
-#!/usr/bin/env -S ruby -w
+#!/usr/bin/env -S ruby
 
-$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
+$VERBOSE = nil
+$>.sync = true
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 
-require 'optparse'
-require 'uri'
-require 'weblink'
+require "optparse"
+require "uri"
+require "weblink"
 
 opts = {}
 
@@ -13,47 +15,42 @@ op = OptionParser.new do |op|
 
   op.banner =
     "Usage: weblink [options]\n" \
-    'Web browser gateway'
+    "Web browser gateway"
 
-  op.separator ''
-  op.separator 'Options'
+  op.separator ""
+  op.separator "Options"
 
-  op.on('-c', '--client', 'Starts weblink client (default)') do
+  op.on("-c", "--client", "start weblink client (default)") do
     opts[:client] = true
   end
 
-  op.on('-s', '--server', 'Starts weblink server') do
+  op.on("-s", "--server", "start weblink server") do
     opts[:server] = true
   end
 
-  op.on('-a', '--host HOST', String, 'Address to bind to (default: 0.0.0.0)') do |host|
+  op.on("-h", "--host HOST", String, "weblink server host (default: 0.0.0.0)") do |host|
     opts[:host] = host
   end
 
-  op.on('-p', '--port PORT', Integer, 'Use PORT (default: 8000)') do |port|
+  op.on("-p", "--port PORT", Integer, "weblink server port (default: 8080)") do |port|
     opts[:port] = port
   end
 
-  op.on('--proxy-type TYPE', String, 'https or socks5 (default: https)') do |type|
-    raise OptionParser::InvalidArgument, type unless type == 'https' || type == 'socks5'
-    opts[:proxy_type] = type
+  op.on("--proxy-host HOST", String, "proxy server host (default: 0.0.0.0)") do |host|
+    opts[:proxy_host_loc] = host
   end
 
-  op.on('--proxy-host HOST', String, 'Address to bind proxy to(default: 0.0.0.0)') do |host|
-    opts[:proxy_host] = host
+  op.on("--proxy-port PORT", Integer, "proxy server port (default: 3128)") do |port|
+    opts[:proxy_port_loc] = port
   end
 
-  op.on('--proxy-port PORT', Integer, 'Use proxy PORT (default: 3128)') do |port|
-    opts[:proxy_port] = port
-  end
-
-  op.on('-v', '--version', 'Show version and exit') do
-    version = File.expand_path('../VERSION', __dir__)
+  op.on_tail("--version", "print version") do
+    version = File.expand_path("../VERSION", __dir__)
     puts(File.read(version))
     exit
   end
 
-  op.on_tail('-h', '--help', 'Print this help') do
+  op.on_tail("--help", "print this help") do
     puts(op)
     exit
   end
@@ -63,19 +60,7 @@ begin
   op.parse!
 rescue OptionParser::ParseError => e
   op.abort(e)
-else
-  opts[:client] = true unless opts[:client] || opts[:server]
-  if opts[:client] && (opts[:host] || opts[:port])
-    abort('Changing host or port is not supported yet in client mode')
-  end
-  opts[:host] ||= '0.0.0.0'
-  opts[:port] ||= 8000
-  opts[:proxy_type] ||= 'https'
-  opts[:proxy_host] ||= '0.0.0.0'
-  opts[:proxy_port] ||= 3128
 end
 
-weblink = Weblink.new(opts)
-weblink.start
-
-# vim: ft=ruby
+weblink = Weblink.new(**opts)
+weblink.run

data/lib/relay.rb

@@ -1,61 +1,85 @@
-require 'csv'
-require 'time'
-
 class Relay < EventMachine::Connection
-  def initialize(tag, xff = nil)
+  def initialize(side, logproc)
     super
     pause
-    @tag = tag
-    @xff = xff
-    @remote_port, @remote_ip = unpack_sockaddr_in(get_peername)
-    @websocket = nil
-    @ws_remote_ip = nil
-    @ws_remote_port = nil
+    @ws = nil
+    @sig = nil
+    @completion = nil
+    @closed = false
+    @unbind_sent = false
+    @unbind_recv = false
+    @remote_ip = nil
+    @connection_inactivity_timeout = 0.0
+    @log = lambda { |msg, **ctx| logproc[msg, side: side, ip: @remote_ip, sig: @sig, **ctx] }
   end
 
-  def start(websocket)
-    @websocket = websocket
-    @websocket.onbinary do |msg|
-      log('recv', msg.bytesize)
-      send_data(msg)
+  def bind(ws, remote_ip)
+    @ws = ws
+    @sig = "#{ws.signature}.#{signature}"
+    @completion = EventMachine::Completion.new
+    @closed = false
+    @unbind_sent = false
+    @unbind_recv = false
+    @remote_ip = remote_ip
+    @connection_inactivity_timeout = comm_inactivity_timeout
+    @log.call "[+] bind."
+    @ws.onbinary do |data|
+      if @closed
+        @log.call "[~] data discard, bound closed.", connerror: error?, bytes: data.bytesize
+      else
+        send_data(data)
+      end
+    end
+    @ws.onmessage do |msg|
+      if msg == "unbind"
+        @unbind_recv = true
+        if @unbind_sent
+          @completion.succeed
+        else
+          close_connection
+        end
+      else
+        @log.call "[!] unexpected text on websocket.", msg: msg
+      end
+    end
+    @ws.onclose do
+      close_connection
+      @completion.fail
+      close_info = @ws.instance_variable_get(:@handler).instance_variable_get(:@close_info) || {}
+      code = close_info[:code]
+      reason = close_info[:reason]
+      if reason
+        reason = reason.empty? ? nil : reason.inspect
+      end
+      @log.call "[-] websocket is closed.", code: code, reason: reason
     end
-    @websocket.onerror { |err| log('ws/error', err) }
-    @websocket.onclose { close_connection_after_writing }
-    @ws_remote_port, @ws_remote_ip = unpack_sockaddr_in(websocket.get_peername)
     resume
+    @completion
   end
 
   def receive_data(data)
-    log('sent', data.bytesize)
-    @websocket.send_binary(data)
+    @ws.send_binary(data)
   end
 
-  def unbind
-    log('close')
-    # Status code 1000 indicates indicates a normal closure.
-    @websocket&.close(1000) if @websocket&.state == :connected
-  end
-
-  private
-
-  def log(event, comment = nil)
-    row = [
-      Time.now.iso8601(3),
-      @tag,
-      @xff,
-      @remote_ip,
-      @remote_port&.to_s,
-      @ws_remote_ip,
-      @ws_remote_port&.to_s,
-      event,
-      comment&.to_s,
-    ]
-
-    puts CSV.generate_line(row, col_sep: ' ', write_nil_value: '-')
-  end
-
-  def unpack_sockaddr_in(sock)
-    Socket.unpack_sockaddr_in(sock) if sock
-  rescue ArgumentError
+  def unbind(errno)
+    if errno
+      if errno == Errno::ETIMEDOUT && @connection_inactivity_timeout > 0
+        reason = "inactivity"
+      elsif errno.respond_to?(:exception)
+        reason = errno.exception.message
+        reason[0] = reason[0].downcase
+      else
+        # win: errno can be set to :unknown on windows
+        reason = errno.to_s
+      end
+      reason = reason.inspect
+    end
+    @log.call "[-] unbind.", reason: reason
+    @closed = true
+    if @ws&.state == :connected
+      @ws.send_text("unbind")
+      @unbind_sent = true
+      @completion&.succeed if @unbind_recv
+    end
   end
 end

data/lib/static_files.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "pathname"
+
+module StaticFiles
+  def receive_data(data)
+    file = asset_file(data) or return super
+    send_data "HTTP/1.1 200 OK\r\n\r\n"
+    # win: send/stream_file_data do not work on windows
+    send_data file.read
+    close_connection_after_writing
+  end
+
+  DIR = Pathname(__dir__).parent.join("public").freeze
+  private_constant :DIR
+
+  INDEX = "index.html"
+  private_constant :INDEX
+
+  private
+
+  def asset_file(data)
+    match = data.match(/^(HEAD|GET) \/(?<path>[\w.-]*)?(?:\?\S*)? HTTP/) or return
+    path = match[:path]
+    path = INDEX if path.empty?
+    file = DIR.join(path)
+    file if file.file? && file.readable?
+  end
+end

data/lib/weblink.rb

@@ -1,95 +1,186 @@
-require 'em-websocket'
-require 'eventmachine'
-require 'socket'
-require 'tempfile'
-require 'relay'
+require "eventmachine"
+require "em-websocket"
+require "socket"
+require "uri"
+require "relay"
+require "static_files"
 
 class Weblink
-  def initialize(opts)
-    @opts = opts
-    @https = Tempfile.new('weblink')
-    @socks5 = Tempfile.new('weblink')
-    @websockets = EventMachine::Queue.new
+  def initialize(
+    client: nil,
+    server: nil,
+    host: "0.0.0.0",
+    port: "8080",
+    connection_inactivity_timeout: 30.0,
+    proxy_host_loc: "0.0.0.0",
+    proxy_port_loc: 3128,
+    proxy_host_rem: "127.0.0.1",
+    proxy_port_rem: 55000,
+    websocket_pool_batch_size: 1,
+    websocket_pool_max_size: 20
+  )
+    @client = client || client == server
+    @server = server
+    @host = host
+    @port = port
+    @connection_inactivity_timeout = connection_inactivity_timeout
+    @proxy_host_loc = proxy_host_loc
+    @proxy_port_loc = proxy_port_loc
+    @proxy_host_rem = proxy_host_rem
+    @proxy_port_rem = proxy_port_rem
+    @websocket_pool = EventMachine::Queue.new
+    @websocket_pool_batch_size = websocket_pool_batch_size
+    @websocket_pool_max_size = websocket_pool_max_size
   end
 
-  def start
-    trap(:EXIT) { Process.waitall }
+  def run
+    EventMachine.epoll
+    EventMachine.error_handler do |e|
+      log "[!] unexpected errback", error: e
+    end
+    EventMachine.run do
+      trap(:INT) { puts; stop_eventmachine "[-] shutting down weblink.", signal: "sigint" }
+      trap(:TERM) { stop_eventmachine "[-] shutting down weblink.", signal: "sigterm" }
 
-    if @opts[:client]
-      ip = Socket.getifaddrs.find { |ifa| ifa.addr&.ipv4_private? }
-      if ip
-        public = File.expand_path('../public', __dir__)
-        spawn('ruby', '-run', '-ehttpd', '--', public, err: IO::NULL)
-        puts "Open http://#{ip.addr.ip_address}:8080/ on your other device."
-      else
-        abort(
-          "Could not find an interface to listen on. " \
-          "Make sure that you are connected to your device."
-        )
-      end
+      log "[+] starting weblink.", client: @client, server: @server, epoll: EventMachine.epoll?
+
+      start_proxy_rem if @server
+      start_websocket_server
+      print_open_url if @client
     end
+  end
+
+  private
 
-    if @opts[:server]
-      begin
-        spawn('proxxxy', "https://#{@https.path}", "socks5://#{@socks5.path}")
-      rescue Errno::ENOENT
-        abort('Please install proxxxy v2 to run weblink server')
+  def start_websocket_server
+    EventMachine::WebSocket.run(host: @host, port: @port) do |ws|
+      raise "websocket inactivity timeout" unless ws.comm_inactivity_timeout.zero?
+      # Static server is only needed in client mode, but we need this to deploy
+      # the server to Render because it sends HEAD / requests to check if the
+      # app is up.
+      ws.singleton_class.include(StaticFiles)
+      ws.onerror do |e|
+        log "[!] websocket error.", error: e
+      end
+      ws.onopen do |handshake|
+        xff = handshake.headers_downcased["x-forwarded-for"]&.split(",", 2)&.first
+        remote_ip = xff || ws.remote_ip
+        ctx = {ip: remote_ip, sig: ws.signature}
+        path = handshake.path
+        if @client && path == "/ws/loc/control"
+          log "[+] device is connected.", side: "loc", **ctx
+          start_proxy_loc(ws, remote_ip)
+        elsif @client && path == "/ws/loc/relay"
+          log "[+] websocket is open.", side: "loc", **ctx
+          @websocket_pool.push(ws)
+        elsif @server && path == "/ws/rem/relay"
+          log "[+] websocket is open.", side: "rem", **ctx
+          bind_to_proxy(ws, remote_ip)
+        else
+          log "[!] unexpected request.", path: handshake.path
+        end
       end
     end
+  rescue RuntimeError => e
+    stop_eventmachine "[!] websocket server error.", error: e
+  else
+    log "[+] websocket server is ready.", host: @host, port: @port
+  end
 
-    EventMachine::WebSocket.start(@opts) do |ws|
-      ws.onopen do |handshake|
-        case handshake.path
-        when '/control'
-          start_client(ws)
-          puts 'Ready'
-        when '/client'
-          @websockets.push(ws)
-        when '/proxy/socks5'
-          proxy(ws, handshake, @socks5.path)
-        when '/proxy/https'
-          proxy(ws, handshake, @https.path)
+  def start_proxy_loc(control_ws, remote_ip)
+    bind_websocket = lambda do |relay|
+      # Dogpile effect if batch size > 1.
+      if @websocket_pool.empty?
+        control_ws.send_text(@websocket_pool_batch_size.to_s)
+        log "[~] websocket is requested.", side: "loc", cnt: @websocket_pool_batch_size, waitcnt: @websocket_pool.num_waiting
+      end
+      @websocket_pool.pop do |ws|
+        if ws.state == :connected
+          relay.set_comm_inactivity_timeout @connection_inactivity_timeout
+          relay.bind(ws, remote_ip).callback do
+            if @websocket_pool.size < @websocket_pool_max_size
+              @websocket_pool.push(ws)
+            else
+              ws.close(1000, "purge")
+            end
+          end
         else
-          warn("Unexpected request: #{handshake.path.inspect}")
+          log "[!] websocket is dead, retrying.", side: "loc", state: ws.state
+          EventMachine.next_tick { bind_websocket.(relay) }
         end
       end
     end
+    begin
+      sig = EventMachine.start_server(@proxy_host_loc, @proxy_port_loc, Relay, "loc", method(:log), &bind_websocket)
+    rescue RuntimeError => e
+      stop_eventmachine "[!] local proxy server error.", error: e
+    else
+      control_ws.onclose do
+        EventMachine.stop_server(sig)
+        log "[-] device is disconnected.", side: "loc"
+        log "[-] local proxy is stopped.", side: "loc"
+      end
+      log "[+] local proxy is ready.", side: "loc", type: "https", host: @proxy_host_loc, port: @proxy_port_loc
+    end
   end
 
-  private
+  def print_open_url
+    ip = Socket.getifaddrs.find { |ifa| ifa.addr&.ipv4_private? } or abort(
+      "[!] could not find an interface to listen on; " \
+      "make sure that you are connected to your device."
+    )
+    open_url = URI::HTTP.build(host: ip.addr.ip_address, port: @port)
+    log "[~] waiting for device to connect.", side: "loc", url: open_url
+  end
 
-  def start_client(control_ws, min_ws_num: 3)
-    host, port = @opts.values_at(:proxy_host, :proxy_port)
-    sig = EventMachine.start_server(host, port, Relay, 'client') do |rel|
-      # Dogpile effect
-      control_ws.send_text(@opts[:proxy_type]) if @websockets.size < min_ws_num
-      @websockets.pop { |ws| rel.start(ws) }
+  def start_proxy_rem
+    require "em/protocols/connect"
+  rescue LoadError
+    abort "[!] install proxxy v2 to run weblink server."
+  else
+    begin
+      EventMachine.start_server(@proxy_host_rem, @proxy_port_rem, EventMachine::Protocols::CONNECT, quiet: true) do |c|
+        raise unless c.comm_inactivity_timeout.zero?
+      end
+    rescue RuntimeError => e
+      stop_eventmachine "[!] remote proxy server error.", side: "rem", error: e
+    else
+      log "[+] remote proxy is ready.", side: "rem", type: "https", host: @proxy_host_rem, port: @proxy_port_rem
     end
-    control_ws.onclose { EventMachine.stop_server(sig) }
   end
 
-  def proxy(ws, handshake, socket)
-    unless @opts[:server]
-      warn 'weblink server is disabled'
-      return
-    end
-    xff = handshake.headers_downcased['x-forwarded-for']
-    with_retry(timeout: 3) do
-      EventMachine.connect(socket, Relay, 'server', xff) do |rel|
-        rel.start(ws)
-      end
+  def bind_to_proxy(ws, remote_ip)
+    EventMachine.connect(@proxy_host_rem, @proxy_port_rem, Relay, "rem", method(:log)) do |relay|
+      raise unless relay.comm_inactivity_timeout.zero?
+      relay.bind(ws, remote_ip).callback { bind_to_proxy(ws, remote_ip) }
     end
+  rescue RuntimeError => e
+    log "[!] proxy connection error.", error: e
+    ws.close(4000, "proxy connection error")
   end
 
-  def with_retry(timeout:, wait: 0.1)
-    elapsed = 0
-    begin
-      yield
-    rescue RuntimeError
-      if elapsed < timeout
-        elapsed += sleep(wait)
-        retry
+  def stop_eventmachine(msg, **ctx)
+    log msg, **ctx, fds: EventMachine.connection_count
+    EventMachine.stop
+  rescue RuntimeError => e
+    log "[!] event machine error.", error: e.cause
+  end
+
+  def log(msg, **context)
+    line = "%-35s" % msg
+    context.each do |k, v|
+      case v
+      when Exception
+        line << " #{k}=#{v.message.inspect}"
+        line << " backtrace=#{v.backtrace}" if v.backtrace
+      when true
+        line << " #{k}"
+      when false, nil, ""
+        # skip
+      else
+        line << " #{k}=#{v}"
       end
     end
+    $>.puts(line)
   end
 end

data/public/favicon.svg

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="15.763862mm"
+   height="15.763863mm"
+   viewBox="0 0 15.763862 15.763863"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" /><g
+     id="layer1"
+     transform="translate(-92.26936,-159.77363)"><circle
+       style="fill:#599af8;fill-opacity:1;stroke:none;stroke-width:0.236132;stroke-linejoin:round"
+       id="path1"
+       cx="100.1513"
+       cy="167.65556"
+       r="7.8819342" /><text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:11.2889px;font-family:Arial;-inkscape-font-specification:'Arial, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;writing-mode:lr-tb;direction:ltr;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.861247;stroke-linejoin:round"
+       x="95.738823"
+       y="170.58252"
+       id="text1"><tspan
+         id="tspan1"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:11.2889px;font-family:Arial;-inkscape-font-specification:'Arial, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ffffff;stroke-width:0.861247"
+         x="95.738823"
+         y="170.58252">w</tspan></text></g></svg>

data/public/index.html

@@ -1,73 +1,148 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>weblink</title>
-    <link rel="manifest" href="/weblink.webmanifest">
+    <link rel="icon" href="favicon.svg" type="image/svg+xml" />
     <style>
-      html, body {
+      html,
+      body {
         height: 100%;
+        background-color: #3f9cff;
+        font-family: arial, sans-serif;
       }
       body {
-        align-items: center;
-        background-color: #3f9cff;
-        color: white;
         display: flex;
+        flex-direction: column;
+        align-items: center;
         justify-content: center;
+        text-align: center;
+        color: white;
+      }
+      dd {
+        margin: 0;
       }
-      h1 {
-        font-family: sans-serif;
-        font-size: 8em;
+      input[type="checkbox"] {
+        margin-right: 0.5em;
       }
     </style>
   </head>
   <body>
     <h1>weblink</h1>
+    <div class="settings">
+      <label
+        ><input type="checkbox" id="nosleep" />Prevent screen from
+        sleeping</label
+      >
+    </div>
+    <dl class="stats">
+      <dt>Connections</dt>
+      <dd id="connectionCount">0</dd>
+    </dl>
     <script>
-      function connect(client_addr, server_addr, proxy) {
-        var client, server = new WebSocket(server_addr + "/proxy/" + proxy);
-
-        server.onerror = function(event) { console.error("server/error"); };
-
-        server.onopen = function() {
-          client = new WebSocket(client_addr + "/client");
-
-          client.onerror =  function(event) { console.error("client/error"); };
-
-          client.onopen = function() {
-            client.onmessage = function(msg) { server.send(msg.data); };
-            server.onmessage = function(msg) { client.send(msg.data); };
+      function createRelayWebSocketPair(localAddr, remoteAddr) {
+        // Local websocket.
+        var local;
+        // Connect to the remote websocket server first, so that when we
+        // connect to the local websocket server the whole chain is ready to
+        // use immediately.
+        var remote = new WebSocket(remoteAddr + "/ws/rem/relay");
+        // Log server errors.
+        remote.onerror = function (event) {
+          console.error("[!] remote/error", event);
+        };
+        // When the remote server closes its websocket, close the corresponding
+        // local websocket too.
+        remote.onclose = function (event) {
+          console.log("[-] remote/close", {
+            code: event.code,
+            reason: event.reason,
+            wasClean: event.wasClean,
+          });
+          if (local?.readyState === WebSocket.OPEN) {
+            local.close(1000, `bound close: ${event.code} ${event.reason}`);
+          }
+        };
+        remote.onopen = function () {
+          // Connect to the local websocket server to relay data.
+          local = new WebSocket(localAddr + "/ws/loc/relay");
+          // Log relay errors.
+          local.onerror = function (event) {
+            console.error("[!] local/error", event);
           };
-
-          client.onclose = function(event) {
-            console.log("client/close", event.code, event.reason);
-            if (server.readyState === WebSocket.OPEN) server.close();
+          // When the local websocket is closed, close the corresponding
+          // remote websocket.
+          local.onclose = function (event) {
+            if (local.cleanOpen) {
+              connections--;
+              connectionCount.textContent = connections;
+            }
+            console.log("[-] local/close", {
+              code: event.code,
+              reason: event.reason,
+              wasClean: event.wasClean,
+            });
+            if (remote.readyState === WebSocket.OPEN) {
+              remote.close(1000, `bound close: ${event.code} ${event.reason}`);
+            }
           };
-        };
+          // Relay data between the local and remote websockets.
+          local.onopen = function () {
+            connections++;
+            connectionCount.textContent = connections;
+            local.cleanOpen = true;
 
-        server.onclose = function(event) {
-          console.log("server/close", event.code, event.reason);
-          if (client.readyState === WebSocket.OPEN) client.close();
+            local.onmessage = function (msg) {
+              remote.send(msg.data);
+            };
+            remote.onmessage = function (msg) {
+              local.send(msg.data);
+            };
+          };
         };
       }
-
+      // Get the query params.
       var params = {};
-      window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/g, function(m, key, value) {
-        params[key] = decodeURIComponent(value);
-      });
-
-      var client_addr = "ws://" + location.hostname + ":8000";
-      var server_addr = params.server || "wss://weblinkapp.herokuapp.com";
-      var batch_size = Number(params.batch) || 4;
-      var control = new WebSocket(client_addr + "/control");
-
-      control.onerror = function(event) { console.error("control/error"); };
-      control.onclose = function(event) { console.log("control/close"); };
-      control.onmessage = function(msg) {
-        for (var i = 0; i < batch_size; i++) {
-          connect(client_addr, server_addr, msg.data);
+      window.location.href.replace(
+        /[?&]+([^=&]+)=([^&]*)/g,
+        function (m, key, value) {
+          params[key] = decodeURIComponent(value);
+        },
+      );
+      // Local weblink server.
+      var localAddr = "ws://" + location.host;
+      // Remote weblink server.
+      var remoteAddr = params.server || "wss://weblink-ouux.onrender.com";
+      // Establish a local control websocket to receive commands.
+      var control = new WebSocket(localAddr + "/ws/loc/control");
+      // Total number of local connections.
+      var connections = 0;
+      // Log control websocket errors.
+      control.onerror = function (event) {
+        console.error("[!] control/error", event);
+      };
+      // Log control websocket closure.
+      control.onclose = function (event) {
+        console.log("[-] control/close", {
+          code: event.code,
+          reason: event.reason,
+        });
+      };
+      // Add more connections on demand.
+      control.onmessage = function (msg) {
+        var connectionBatchSize = Number.parseInt(msg.data);
+        console.log("[~] control/batch", { count: connectionBatchSize });
+        for (var i = 0; i < connectionBatchSize; i++) {
+          createRelayWebSocketPair(localAddr, remoteAddr);
         }
       };
     </script>
+    <script
+      src="https://cdnjs.cloudflare.com/ajax/libs/nosleep/0.12.0/NoSleep.min.js"
+      type="text/javascript"
+      crossorigin="anonymous"
+    ></script>
+    <script src="nosleep.js" type="text/javascript"></script>
   </body>
 </html>

data/public/nosleep.js

@@ -0,0 +1,22 @@
+var noSleep = new NoSleep();
+var noSleepCheckbox = document.getElementById("nosleep");
+
+document.addEventListener("visibilitychange", function resetNoSleep(event) {
+  if (document.visibilityState === "visible") {
+    noSleep.disable();
+    noSleep = new NoSleep();
+    noSleepCheckbox.checked = false;
+  }
+});
+
+noSleepCheckbox.addEventListener("click", function toggleNoSleep(event) {
+  if (noSleep.isEnabled) {
+    noSleep.disable();
+  } else {
+    try {
+      noSleep.enable();
+    } catch (error) {
+      event.preventDefault();
+    }
+  }
+});

metadata

@@ -1,39 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weblink
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.3.0
 platform: ruby
 authors:
 - soylent
 autorequire:
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIEDjCCAvagAwIBAgIBATANBgkqhkiG9w0BAQsFADB3MRgwFgYDVQQDDA8xNTkz
-  ODYwX3NveWxlbnQxFTATBgoJkiaJk/IsZAEZFgV1c2VyczEXMBUGCgmSJomT8ixk
-  ARkWB25vcmVwbHkxFjAUBgoJkiaJk/IsZAEZFgZnaXRodWIxEzARBgoJkiaJk/Is
-  ZAEZFgNjb20wHhcNMjIwMTI3MDIzMTQwWhcNMjMwMTI3MDIzMTQwWjB3MRgwFgYD
-  VQQDDA8xNTkzODYwX3NveWxlbnQxFTATBgoJkiaJk/IsZAEZFgV1c2VyczEXMBUG
-  CgmSJomT8ixkARkWB25vcmVwbHkxFjAUBgoJkiaJk/IsZAEZFgZnaXRodWIxEzAR
-  BgoJkiaJk/IsZAEZFgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-  AQC2DMbzgA39U+3VTMjXn+0jnOQyLdmXQ5EXgSLKCgBLIcFTc9J47Th07Yb/f4Rz
-  Wh49/EkDBiDtLqFeKBYsj3q0e8tRCAs32NtVyl/4FDyJvWsK3R2tcXOVqxs48J3C
-  gG+rFLOcMC9YF4FPTkz4p3EYGFVjZTbiqyVVuIZzWtrwdZesBVgpBRyN8sEyNoi8
-  vcDiOmEwf9/TVMTDf/wu6a+i3LNVGYWlvgMJRssaAnj/IbFFtPTz30HxeTUdfJu8
-  YbwRspfFzcJGLf32E7vXfmHHqNzqjh4zD9sVpvTHbqLLsgVa+nYHPHAedzSZ5gZj
-  G1oZ7hZDCJoEPj0oCHT0qkuXAgMBAAGjgaQwgaEwCQYDVR0TBAIwADALBgNVHQ8E
-  BAMCBLAwHQYDVR0OBBYEFKy+nUcB8D5BOM6D96HKG/tp2nQWMDMGA1UdEQQsMCqB
-  KDE1OTM4NjArc295bGVudEB1c2Vycy5ub3JlcGx5LmdpdGh1Yi5jb20wMwYDVR0S
-  BCwwKoEoMTU5Mzg2MCtzb3lsZW50QHVzZXJzLm5vcmVwbHkuZ2l0aHViLmNvbTAN
-  BgkqhkiG9w0BAQsFAAOCAQEAsfJgulszbe+BgUP9xNYixuvm/R8Um5T8OAANmc+s
-  CvV3lD5XtFuw838TbWrqgN+7dVkzQYERTz8DjPtx+zlgzNS3GyMWNUZdOPLo/YkR
-  S7KfmAZlZhy1rcrARYsAouvP+1QttbiJ32L+z1JzAz2s1+4ySgl1OaQfosS04QGT
-  CnJ982/OGeG5xm7KFOqSzG4KnyEy4VH47aE4IQk+yP6R96neHdfOd/C7BcA6gbgH
-  lyshHS0Bgr1OKk3Vx8GtaIa7L9Z4RN0EWBL3QGlhiu55PrpPuAFDDuORJfpIqrph
-  XjC/3xZEDxBLYSjeFIgUMN6+/XGduQANkZ6167QsVu/yPg==
-  -----END CERTIFICATE-----
-date: 2022-03-05 00:00:00.000000000 Z
+cert_chain: []
+date: 2025-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
@@ -49,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: webrick
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 description:
 email:
 executables:
@@ -74,16 +35,12 @@ files:
 - VERSION
 - bin/weblink
 - lib/relay.rb
+- lib/static_files.rb
 - lib/weblink.rb
-- public/android-chrome-192x192.png
-- public/android-chrome-512x512.png
-- public/apple-touch-icon.png
-- public/favicon-16x16.png
-- public/favicon-32x32.png
 - public/favicon.ico
+- public/favicon.svg
 - public/index.html
-- public/weblink.js
-- public/weblink.webmanifest
+- public/nosleep.js
 homepage: https://github.com/soylent/weblink
 licenses: []
 metadata: {}
@@ -102,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.4
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Web browser gateway

data/public/weblink.js

@@ -1,59 +0,0 @@
-function connect(client_addr, server_addr) {
-  var client = new WebSocket(client_addr + "/client");
-  var server = new WebSocket(server_addr + "/server");
-
-  server.onerror = function(event) {
-    console.error("server/error");
-  };
-  client.onerror = function(event) {
-    console.error("client/error");
-  };
-
-  client.onopen = function() {
-    server.onopen = function() {
-      client.onmessage = function(msg) {
-        server.send(msg.data);
-      };
-      server.onmessage = function(msg) {
-        client.send(msg.data);
-      };
-    };
-  };
-
-  server.onclose = function(event) {
-    console.log("server/close", event.code, event.reason);
-
-    if (client.readyState === WebSocket.OPEN) client.close();
-  };
-
-  client.onclose = function(event) {
-    console.log("client/close", event.code, event.reason);
-
-    if (server.readyState === WebSocket.OPEN) server.close();
-  };
-}
-
-var params = {};
-window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/g, function(m, key, value) {
-  params[key] = value;
-});
-
-var client_addr = "ws://" + location.hostname + ":8000";
-var server_addr = params.server || "wss://weblinkapp.herokuapp.com";
-var batch_size = Number(params.batch) || 4;
-var control = new WebSocket(client_addr + "/control");
-
-control.onerror = function(event) {
-  console.error("control/error");
-};
-control.onclose = function(event) {
-  console.log("control/close");
-};
-control.onmessage = function(msg) {
-  for (var i = 0; i < batch_size; i++)
-    connect(
-      client_addr,
-      server_addr
-    );
-};
-control.onmessage();

data/public/weblink.webmanifest

@@ -1,19 +0,0 @@
-{
-  "background_color": "#3f9cff",
-  "display": "standalone",
-  "icons": [
-    {
-      "sizes": "192x192",
-      "src": "/android-chrome-192x192.png",
-      "type": "image/png"
-    },
-    {
-      "sizes": "512x512",
-      "src": "/android-chrome-512x512.png",
-      "type": "image/png"
-    }
-  ],
-  "name": "weblink",
-  "short_name": "weblink",
-  "theme_color": "#3f9cff"
-}

data.tar.gz.sig

@@ -1,2 +0,0 @@
-4�G��>DG+�����b��»1 ����~ɖ]/_�i��x�;u�,w���cXkw���|����2�F7�k`د�=�\����GQ�(N�߅L�X(h���&���9�X"������~���3?HP�؂��
-#8��;�d�X	���l}�(R��W^�����=*�4�OyU����T��M/U��B"��')���[Q^���6ss��&��W�w_�iߔ�&{�Lv���-��Wt��~<�.���0��$�;���