weblink 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c268c95b2cdcec3669dbf5c90f0753bc28949b6098744bd7c9f9e42aac24bb97
-  data.tar.gz: 44f0363bf19eae1f40a5a00fd962f60134a1db2a12e36aeda7bba04fe5090855
+  metadata.gz: d385e7232ce9202ce7b88e2ff864541243694f1b0a81fd40a8bb02b3ec0cc616
+  data.tar.gz: ae5d4588789bad44e61d29094cf9aa73c1e230bee61b32df9fa70e2a074fc3dd
 SHA512:
-  metadata.gz: 72ba709dd3bbdc06582bb20a83ab50090d8a60859698f4a00576122b0cd9687ed348b24d4ddbadc99219011750b897e4596605369c46e75655a821c7a76c4716
-  data.tar.gz: d729d225e330f6ab9714bd078893eeeecccb5d56e85f0f5d39c92f4b192a4fd9f94243789b94e0008b6264906d6a33c50f59682cb5afb215b0f21aa649202515
+  metadata.gz: 6a29a327435407af014c9bb887f4289536f5a28d6b1495dfd00e2892ee1396339efff8ae4b71b074ad256bab80808e22f41f1f9fa7857937a8fd61e08eabb3ad
+  data.tar.gz: 8d358c66cc2a55d79988f34b7e9997209e978e4d0828fa5ff3aa39a86f5c85be39fc9ff000c81ee900b009d0fda1118b46170b4c19ad03cdb3a404f90dc3738f

data/CHANGELOG

@@ -1,3 +1,9 @@
+1.1.0
+
+* Works on Windows
+* HTTPS proxy support
+
 1.0.0
 
 * First public release
+* SOCKS5 proxy support

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/bin/weblink

@@ -1,5 +1,4 @@
 #!/usr/bin/env -S ruby -w
-# frozen_string_literal: true
 
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 
@@ -35,11 +34,16 @@ op = OptionParser.new do |op|
     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
+  end
+
   op.on('--proxy-host HOST', String, 'Address to bind proxy to(default: 0.0.0.0)') do |host|
     opts[:proxy_host] = host
   end
 
-  op.on('--proxy-port PORT', Integer, 'Use proxy PORT (default: 1080)') do |port|
+  op.on('--proxy-port PORT', Integer, 'Use proxy PORT (default: 3128)') do |port|
     opts[:proxy_port] = port
   end
 
@@ -66,8 +70,9 @@ else
   end
   opts[:host] ||= '0.0.0.0'
   opts[:port] ||= 8000
+  opts[:proxy_type] ||= 'https'
   opts[:proxy_host] ||= '0.0.0.0'
-  opts[:proxy_port] ||= 1080
+  opts[:proxy_port] ||= 3128
 end
 
 weblink = Weblink.new(opts)

data/lib/relay.rb

@@ -3,6 +3,7 @@ require 'time'
 
 class Relay < EventMachine::Connection
   def initialize(tag, xff = nil)
+    super
     pause
     @tag = tag
     @xff = xff

data/lib/weblink.rb

@@ -7,7 +7,8 @@ require 'relay'
 class Weblink
   def initialize(opts)
     @opts = opts
-    @proxxxy_socket = Tempfile.new('weblink')
+    @https = Tempfile.new('weblink')
+    @socks5 = Tempfile.new('weblink')
     @websockets = EventMachine::Queue.new
   end
 
@@ -16,7 +17,7 @@ class Weblink
 
     if @opts[:client]
       public = File.expand_path('../public', __dir__)
-      spawn('ruby', '-run', '-ehttpd', '--', public, err: '/dev/null')
+      spawn('ruby', '-run', '-ehttpd', '--', public, err: IO::NULL)
 
       ip = Socket.getifaddrs.find { |ifa| ifa.addr.ipv4_private? }
       puts "Open http://#{ip.addr.ip_address}:8080/ on your other device." if ip
@@ -24,7 +25,7 @@ class Weblink
 
     if @opts[:server]
       begin
-        spawn('proxxxy', "socks5://#{@proxxxy_socket.path}")
+        spawn('proxxxy', "https://#{@https.path}", "socks5://#{@socks5.path}")
       rescue Errno::ENOENT
         abort('Please install proxxxy v2 to run weblink server')
       end
@@ -38,8 +39,10 @@ class Weblink
           puts 'Ready'
         when '/client'
           @websockets.push(ws)
-        when '/server'
-          proxy(ws, handshake)
+        when '/proxy/socks5'
+          proxy(ws, handshake, @socks5.path)
+        when '/proxy/https'
+          proxy(ws, handshake, @https.path)
         else
           warn("Unexpected request: #{handshake.path.inspect}")
         end
@@ -53,20 +56,20 @@ class Weblink
     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('more_ws') if @websockets.size < min_ws_num
+      control_ws.send_text(@opts[:proxy_type]) if @websockets.size < min_ws_num
       @websockets.pop { |ws| rel.start(ws) }
     end
     control_ws.onclose { EventMachine.stop_server(sig) }
   end
 
-  def proxy(ws, handshake)
+  def proxy(ws, handshake, socket)
     unless @opts[:server]
       warn 'weblink server is disabled'
       return
     end
     xff = handshake.headers_downcased['x-forwarded-for']
     with_retry(3) do
-      EventMachine.connect(@proxxxy_socket.path, Relay, 'server', xff) do |rel|
+      EventMachine.connect(socket, Relay, 'server', xff) do |rel|
         rel.start(ws)
       end
     end

data/public/index.html

@@ -1,67 +1,73 @@
+<!DOCTYPE html>
 <html>
   <head>
     <meta charset="utf-8" />
     <title>weblink</title>
     <link rel="manifest" href="/weblink.webmanifest">
     <style>
+      html, body {
+        height: 100%;
+      }
       body {
+        align-items: center;
         background-color: #3f9cff;
         color: white;
+        display: flex;
+        justify-content: center;
       }
       h1 {
-        align-items: center;
-        display: flex;
         font-family: sans-serif;
         font-size: 8em;
-        justify-content: center;
-        height: 100%;
       }
     </style>
   </head>
   <body>
     <h1>weblink</h1>
     <script>
-      function connect({ client_addr, server_addr }) {
-        const client = new WebSocket(client_addr + "/client");
-        const server = new WebSocket(server_addr + "/server");
+      function connect(client_addr, server_addr, proxy) {
+        var client, server = new WebSocket(server_addr + "/proxy/" + proxy);
 
         server.onerror = function(event) { console.error("server/error"); };
-        client.onerror =  function(event) { console.error("client/error"); };
 
-        client.onopen = function() {
-          server.onopen = function() {
+        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); };
           };
+
+          client.onclose = function(event) {
+            console.log("client/close", event.code, event.reason);
+            if (server.readyState === WebSocket.OPEN) server.close();
+          };
         };
 
         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();
-        };
       }
 
-      const url = new URL(location.href);
-      const client_addr = `ws://${location.hostname}:8000`;
-      const server_addr = url.searchParams.get("server") || "wss://weblinkapp.herokuapp.com";
-      const batch_size = Number(url.searchParams.get("batch")) || 4
-      const control = new WebSocket(client_addr + "/control");
+      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 });
+          connect(client_addr, server_addr, msg.data);
         }
       };
-      control.onmessage();
     </script>
   </body>
 </html>

data/public/weblink.js

@@ -0,0 +1,59 @@
+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();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weblink
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - soylent
@@ -28,7 +28,7 @@ cert_chain:
   VIAqJBK/gwFlRxVYjmi2w4Ouc4wL8HtX104yQqOuD9gVPN6PJecue66As7i2I/2q
   EARmnubhy24GUdxEooHV6pOs1mLLRuFepMgBnHfs
   -----END CERTIFICATE-----
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2020-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
@@ -63,6 +63,7 @@ files:
 - public/favicon-32x32.png
 - public/favicon.ico
 - public/index.html
+- public/weblink.js
 - public/weblink.webmanifest
 homepage: https://github.com/soylent/weblink
 licenses: []