RubyGems - weblink - Versions diffs - 1.1.2 → 1.2.0 - Mend

weblink 1.1.2 → 1.2.0

Files changed (10) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13496b146b017e1d415d1fb4ee27b36deb894f158882dc376490be51a6920184
-  data.tar.gz: cf4643c4a79bb42f8f2b79e05197915e866d90d54be68689aa3df628f237385e
+  metadata.gz: b4a93ba7190197aa4341d503368788b21e1830a74e6742b7a11bcd9d9c476081
+  data.tar.gz: e391b3eb02aca0480107e6b5dee359ada21cdf90d03ea9764d68c7714cb07b7d
 SHA512:
-  metadata.gz: 11b4b83e40f513ef9b4cbeb3ae532dc5c794da491e0adc06b69fa9c3736c80148998d26c1cf0eef78ff1cced9bfea691806bfebf7fb1bbd6ec720f453936d695
-  data.tar.gz: d2083018ee29d25126c5379524bd59af249e55ac8b3b5030517b7ba905a2d122a5851a9fcb43611b215799acaeefbed3a88e4163946ef68c8426b01d2ff9ed8b
+  metadata.gz: 854a0d477c54eddc352f22cf02c8c6a428c1378b07fdf788d988aa03effdb9b7aed989ce9a3c48e655e72b0c8be137b051f9693ea9fd19b335a6ccc453aaebb2
+  data.tar.gz: 73b5b1d25d472437858b3a09cb4e9071a6731f1ef507c66bf9098b4629a658809ac286606bd91e3e3ae7e5ccec6f2f6268fa5301d407b25983f5244939cf8e69

data/CHANGELOG CHANGED Viewed

@@ -1,3 +1,8 @@
+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 CHANGED Viewed

	@@ -1 +1 @@
1	- 1.1.2
1	+ 1.2.0

data/lib/weblink.rb CHANGED Viewed

@@ -19,12 +19,14 @@ class Weblink
       ip = Socket.getifaddrs.find { |ifa| ifa.addr&.ipv4_private? }
       if ip
         public = File.expand_path('../public', __dir__)
+        # TODO: check if the process failed
+        # TODO: don't suppress errors
         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."
+          "Make sure that you are connected to your other device."
         )
       end
     end
@@ -59,11 +61,11 @@ class Weblink
   private
   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|
+    type, host, port = @opts.values_at(:proxy_type, :proxy_host, :proxy_port)
+    sig = EventMachine.start_server(host, port, Relay, 'client') do |relay|
       # Dogpile effect
-      control_ws.send_text(@opts[:proxy_type]) if @websockets.size < min_ws_num
-      @websockets.pop { |ws| rel.start(ws) }
+      control_ws.send_text(type) if @websockets.size < min_ws_num
+      @websockets.pop { |ws| relay.start(ws) }
     end
     control_ws.onclose { EventMachine.stop_server(sig) }
   end
@@ -75,8 +77,13 @@ class Weblink
     end
     xff = handshake.headers_downcased['x-forwarded-for']
     with_retry(timeout: 3) do
-      EventMachine.connect(socket, Relay, 'server', xff) do |rel|
-        rel.start(ws)
+      EventMachine.connect(socket, Relay, 'server', xff) do |relay|
+        relay.start(ws)
+        # TODO: Instead of creating a timer per websocket, it might be more
+        # efficient to create a single timer and iterate over all open
+        # websockets.
+        timer = EventMachine.add_periodic_timer(45) { ws.ping }
+        ws.onclose { timer.cancel }
       end
     end
   end

data/public/index.html CHANGED Viewed

@@ -2,35 +2,43 @@
 <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">
     <style>
       html, body {
         height: 100%;
+        background-color: #3f9cff;
+        font-family: sans-serif;
       }
       body {
         align-items: center;
-        background-color: #3f9cff;
         color: white;
         display: flex;
         justify-content: center;
+        flex-direction: column;
       }
       h1 {
-        font-family: sans-serif;
-        font-size: 8em;
+        font-size: 3rem;
       }
     </style>
   </head>
   <body>
     <h1>weblink</h1>
+    <div class="settings">
+      <input type="checkbox" id="nosleep" />
+      <label for="nosleep">Prevent screen from sleeping</label>
+    </div>
     <script>
-      function connect(client_addr, server_addr, proxy) {
-        var client, server = new WebSocket(server_addr + "/proxy/" + proxy);
+      function connect(clientAddr, serverAddr, proxy) {
+        var client;
+        var server = new WebSocket(serverAddr + "/proxy/" + proxy);
         server.onerror = function(event) { console.error("server/error"); };
         server.onopen = function() {
-          client = new WebSocket(client_addr + "/client");
+          client = new WebSocket(clientAddr + "/client");
           client.onerror =  function(event) { console.error("client/error"); };
@@ -56,18 +64,24 @@
         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");
+      var clientAddr = "ws://" + location.hostname + ":8000";
+      var serverAddr = params.server || "wss://weblinkapp.herokuapp.com";
+      var batchSize = Number(params.batch) || 4;
+      var control = new WebSocket(clientAddr + "/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);
+        for (var i = 0; i < batchSize; i++) {
+          connect(clientAddr, serverAddr, msg.data);
         }
       };
     </script>
   </body>
+  <script
+    src="https://cdnjs.cloudflare.com/ajax/libs/nosleep/0.12.0/NoSleep.min.js"
+    type="text/javascript"
+    crossorigin="anonymous"
+  ></script>
+  <script src="index.js" type="text/javascript"></script>
 </html>

data/public/index.js ADDED Viewed

@@ -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 CHANGED Viewed

@@ -1,39 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weblink
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - soylent
-autorequire:
+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: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
@@ -63,8 +38,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-description:
-email:
+description:
+email:
 executables:
 - weblink
 extensions: []
@@ -82,12 +57,13 @@ files:
 - public/favicon-32x32.png
 - public/favicon.ico
 - public/index.html
+- public/index.js
 - public/weblink.js
 - public/weblink.webmanifest
 homepage: https://github.com/soylent/weblink
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,8 +78,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.4
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key:
 specification_version: 4
 summary: Web browser gateway
 test_files: []

checksums.yaml.gz.sig DELETED Viewed

Binary file

data.tar.gz.sig DELETED Viewed

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

metadata.gz.sig DELETED Viewed

Binary file