Workaround SpeedifyUI cache, fix VPNbypass

SmoothWAN · Apr 27, 2022 · 9fcb2c4 · 9fcb2c4
1 parent 6530131
commit 9fcb2c4
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 18 deletions.
diff --git a/devconfigs/rpi4/files/usr/lib/lua/luci/view/admin_status/index.htm b/devconfigs/rpi4/files/usr/lib/lua/luci/view/admin_status/index.htm
@@ -6,9 +6,16 @@
 
 <%+header%>
 
-<h2>Speedify UI - <a href="http://172.17.17.2/spdui">Fullscreen</a> </h2>
+<h2>Speedify UI - <a id="fullscreen" href="http://172.17.17.2/spdui">Fullscreen</a> </h2>
 <div class="iframe-embed-wrapper iframe-embed-responsive-16by9">
-    <iframe class="iframe-embed" src="/spdui"></iframe>
+        <iframe class="iframe-embed" id="spdui"></iframe>
+        <script>
+        var rand = Math.floor((Math.random()*1000000)+1);
+        var iframe = document.getElementById('spdui');
+        var fullscreen = document.getElementById('fullscreen');
+        iframe.src = "/spdui/?uid="+rand;
+        fullscreen.href = "http://172.17.17.2/spdui/?uid="+rand;
+        </script>
 </div>
 
 <h2 name="content"><%:Status%></h2>
@@ -17,6 +24,7 @@ <h2 name="content"><%:Status%></h2>
 	<div class="spinning"><%:Loading view…%></div>
 </div>
 
+
 <script type="text/javascript">//<![CDATA[
 function progressbar(query, value, max, byte)
 {

diff --git a/devconfigs/rpi4/files/usr/lib/lua/luci/view/themes/bootstrap/header.htm b/devconfigs/rpi4/files/usr/lib/lua/luci/view/themes/bootstrap/header.htm
@@ -25,7 +25,7 @@
 		<meta http-Equiv="Cache-Control" Content="no-cache" />
 		<meta http-Equiv="Pragma" Content="no-cache" />
 		<meta http-Equiv="Expires" Content="0" />
-		<title><%=striptags( ("SmoothWAN v0.99.5") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
+		<title><%=striptags( ("SmoothWAN v0.99.6") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
 		<meta name="viewport" content="initial-scale=1.0">
 		<link rel="stylesheet" href="<%=media%>/cascade.css?v=git-21.298.68362-d24760e">
 		<link rel="stylesheet" media="only screen and (max-device-width: 854px)" href="<%=media%>/mobile.css?v=git-21.298.68362-d24760e" type="text/css" />

diff --git a/devconfigs/rpi4/files/www/spdui/index.html b/devconfigs/rpi4/files/www/spdui/index.html
@@ -31,10 +31,13 @@
 <div class="par">
       Speedify is not setup. <br/>
       <br/>
-      Visit 'Network->Multi-WAN Setup' to configure USB ethernets/Cellular if  needed. <br/>
-      Navigate the menu bar above to VPN->Speedify to install Speedify. <br/>
-      Toggle "Connect at Startup" in Speedify after logging in. <br/> <br/> <br/>
-      Press CTRL-SHIFT-R or clear browser cache or open a new tab in case this text remains after installation.
+      Quick Setup: <br/>
+      <br/>
+      1) Plug at least one USB ethernet adapter with internet access. <br/>
+      2)Navigate the menu bar above to VPN->Speedify to install Speedify and configure. <br/>
+      3)Visit Network->Multi-WAN USB to rename WAN adapters if needed. <br/>
+      4)Change administration password at System -> Administration. <br/>
     </div>
     </body>
 </html>
+
diff --git a/devconfigs/x86_64/files/usr/lib/lua/luci/view/admin_status/index.htm b/devconfigs/x86_64/files/usr/lib/lua/luci/view/admin_status/index.htm
@@ -6,11 +6,19 @@
 
 <%+header%>
 
-<h2>Speedify UI - <a href="http://172.17.17.2/spdui">Fullscreen</a> </h2>
+<h2>Speedify UI - <a id="fullscreen" href="http://172.17.17.2/spdui">Fullscreen</a> </h2>
 <div class="iframe-embed-wrapper iframe-embed-responsive-16by9">
-    <iframe class="iframe-embed" src="/spdui"></iframe>
+        <iframe class="iframe-embed" id="spdui"></iframe>
+        <script>
+        var rand = Math.floor((Math.random()*1000000)+1);
+        var iframe = document.getElementById('spdui');
+        var fullscreen = document.getElementById('fullscreen');
+        iframe.src = "/spdui/?uid="+rand;
+        fullscreen.href = "http://172.17.17.2/spdui/?uid="+rand;
+        </script>
 </div>
 
+
 <h2 name="content"><%:Status%></h2>
 
 <div id="view">

diff --git a/devconfigs/x86_64/files/www/spdui/index.html b/devconfigs/x86_64/files/www/spdui/index.html
@@ -31,10 +31,13 @@
 <div class="par">
       Speedify is not setup. <br/>
       <br/>
-      Visit Network->Multi-WAN Interface to set up internet sources. <br/>
-      Navigate the menu bar above to VPN->Speedify to install Speedify. <br/>
-      Toggle "Connect at Startup" in Speedify after logging in. <br/> <br/> <br/>
-      Press CTRL-SHIFT-R or clear browser cache or open a new tab in case this text remains after installation.
+      Quick Setup: <br/>
+      <br/>
+      1) Plug at least one USB ethernet adapter with internet access. <br/>
+      2)Navigate the menu bar above to VPN->Speedify to install Speedify and configure. <br/>
+      3)Visit Network->Multi-WAN USB to rename WAN adapters if needed. <br/>
+      4)Change administration password at System -> Administration. <br/>
     </div>
     </body>
 </html>
+
diff --git a/packages/Packages b/packages/Packages
@@ -68,15 +68,15 @@ SHA256sum: d5aa924b746539415c0b0636a290af29ede96c60fe6478680533e6f981d44d48
 Description:  Install and configure Tailscale from LuCI/WebUI.
 
 Package: vpnbypass
-Version: 1.3.4-1
+Version: 1.3.5-1
 Depends: libc, ipset, iptables
 License: GPL-3.0-or-later
 Section: net
 Architecture: all
-Installed-Size: 2320
-Filename: vpnbypass_1.3.4-1_all.ipk
-Size: 3421
-SHA256sum: 335f6c915bf42e0bc2c92e57e5c6d0551ad882ad8c198b0a17ec523b6109c5e7
+Installed-Size: 2319
+Filename: vpnbypass_1.3.5-1_all.ipk
+Size: 3435
+SHA256sum: 9a1f50662dbc052e26c9a1587eabc0c1235ea16c58e3d620b70aafab651538be
 Description:  This service can be used to enable simple VPN split tunnelling.
  Supports accessing domains, IP ranges outside of your VPN tunnel.
  Also supports dedicating local ports/IP ranges for direct

diff --git a/packages/vpnbypass_1.3.4-1_all.ipk b/packages/vpnbypass_1.3.4-1_all.ipk
diff --git a/packages/vpnbypass_1.3.5-1_all.ipk b/packages/vpnbypass_1.3.5-1_all.ipk