change fleth-hook.js script injection to ipip6h.js for firewall forwards page

Author: makeding

htdocs/luci-static/resources/protocol/ipip6h.js

@@ -7,7 +7,15 @@
 'require tools.widgets as widgets';
 
 network.registerPatternVirtual(/^ipip6h-.+$/);
-
+if (location.pathname === '/cgi-bin/luci/admin/network/firewall/forwards') {
+	try {
+		const script = document.createElement('script');
+		script.src = '/luci-static/resources/view/fleth-hook.js';
+		document.head.appendChild(script);
+	} catch (error) {
+		console.warn(error);
+	}
+}
 return network.registerProtocol('ipip6h', {
 	getI18n: function () {
 		return _('IPv4 over IPv6 (fleth edition)');
@@ -101,7 +109,7 @@ return network.registerProtocol('ipip6h', {
 		o = s.taboption('general', form.Button, '_fill_from_ipv4', _('Fill from IPv4'));
 		o.inputtitle = _('Use IPv4 → Hex');
 		o.inputstyle = 'apply';
-		o.onclick = function() {
+		o.onclick = function () {
 			var ip4Input = document.querySelector('[data-name="ip4ifaddr"] input');
 			var ifIdInput = document.querySelector('[data-name="interface_id"] input');
 			if (ip4Input && ifIdInput) {
@@ -116,7 +124,7 @@ return network.registerProtocol('ipip6h', {
 		o = s.taboption('general', form.Button, '_fill_ones', _('Fill with 1 (Softbank)'));
 		o.inputtitle = _('1111:1111:1111:1111');
 		o.inputstyle = 'apply';
-		o.onclick = function() {
+		o.onclick = function () {
 			var ifIdInput = document.querySelector('[data-name="interface_id"] input');
 			if (ifIdInput) {
 				ifIdInput.value = '1111:1111:1111:1111';
@@ -149,12 +157,12 @@ return network.registerProtocol('ipip6h', {
 		o.datatype = 'range(1280,1500)';
 
 
-		setTimeout(function() {
+		setTimeout(function () {
 			var ip4Input = document.querySelector('[data-name="ip4ifaddr"] input');
 			var ifIdInput = document.querySelector('[data-name="interface_id"] input');
 
 			if (ip4Input && ifIdInput) {
-				ip4Input.addEventListener('input', function() {
+				ip4Input.addEventListener('input', function () {
 					var peerInput = document.querySelector('[data-name="peeraddr"] input[type="hidden"]');
 					if (peerInput && peerInput.value === '2404:9200:225:100::65') {
 						var hex = ipv4ToHex(ip4Input.value);

root/usr/sbin/fleth

@@ -497,13 +497,10 @@ elif [ "$1" = "mapsh_status" ]; then
     else
         echo "patched"
     fi
-elif [ "$1" = "hook_none.js" ]; then
-    if ! grep -q 'fleth-hook.js' /www/luci-static/resources/protocol/none.js; then
-        $0 restore_none.js
-        sed -i "s|return|if(location.pathname==='/cgi-bin/luci/admin/network/firewall/forwards'){try{const script=document.createElement('script');script.src='/luci-static/resources/view/fleth-hook.js';document.head.appendChild(script);}catch(error){console.warn(error);}}return|" /www/luci-static/resources/protocol/none.js
+elif [ "$1" = "hook_none.js" || "$1" = "restore_none.js" ]; then
+    if grep -q "fleth-hook.js" /www/luci-static/resources/protocol/none.js 2>/dev/null; then
+        printf "'use strict';'require network';return network.registerProtocol('none',{getI18n:function(){return _('Unmanaged');}});" > /www/luci-static/resources/protocol/none.js
     fi
-elif [ "$1" = "restore_none.js" ]; then
-    printf "'use strict';'require network';return network.registerProtocol('none',{getI18n:function(){return _('Unmanaged');}});" > /www/luci-static/resources/protocol/none.js
 elif [ "$1" = "setup_ipv6_slaac" ]; then
     # Configure IPv6 SLAAC for NEXT(1Gbps) without Hikari Denwa (/64)
     logger -t fleth "Starting IPv6 SLAAC configuration"
@@ -682,8 +679,6 @@ else
     echo "File Patches:"
     echo "  patch_map.sh          Patch map.sh with fixed version (backup created if not exists)."
     echo "  restore_map.sh        Restore original map.sh from backup."
-    echo "  hook_none.js          Install the fleth hook in none.js to hook port-forward page."
-    echo "  restore_none.js       Restore the none.js to its default state."
     echo ""
     echo "To modify settings, try these examples below:"
     echo "uci show fleth.global"