update LICENSE and add port highlight with special ports

Author: makeding

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

@@ -56,8 +56,7 @@ return network.registerProtocol('ipip6h', {
 		o.datatype = 'ip4addr("nomask")';
 		o.placeholder = '111.0.0.1';
 
-		o = s.taboption('general', form.Value, 'interface_id', _('IPv6 Interface ID'),
-			_('IPv6 interface identifier (last 64 bits). Will be combined with WAN6 prefix to create a virtual IPv6 address. Example: 0011:4514:1b00:0000'));
+		o = s.taboption('general', form.Value, 'interface_id', _('IPv6 Interface ID'));
 		o.placeholder = '0011:4514:1b00:0000';
 		o.rmempty = false;
 		o.validate = function (_section_id, value) {

htdocs/luci-static/resources/view/fleth.js

@@ -8,7 +8,15 @@
 
 // fix css paading (kusa
 const fleth_style = document.createElement("style");
-fleth_style.innerHTML = `.cbi-value-field { padding-top: 6px; }`;
+fleth_style.innerHTML = `
+  .cbi-value-field { padding-top: 6px; }
+  .port-highlight {
+    background-color: rgb(207, 226, 255);
+    padding: 1px 4px;
+    border-radius: 3px;
+    font-weight: 500;
+  }
+`;
 document.head.appendChild(fleth_style);
 
 return view.extend({
@@ -26,52 +34,29 @@ return view.extend({
       let areaValue = area || "UNKNOWN";
       const mapeIsUnknown = mape_status.length <= 1 || mape_status[0] === "UNKNOWN";
 
-      // Special handling for NURO
-      if (mape_status[0] === "NURO") {
-        areaValue = "UNKNOWN(NURO)";
-      }
-      // If MAP-E is UNKNOWN, check pending status first
+      // Base return object with common fields
+      const baseData = {
+        mape_status: mape_status,
+        prefix_length: prefix_length || "UNKNOWN",
+        mapIsPatched: mapsh_status === "patched",
+      };
+
+      if (mape_status[0] === "NURO") areaValue = "UNKNOWN(NURO)";
+
       if (mapeIsUnknown) {
         return L.resolveDefault(fs.exec("/usr/sbin/fleth", ["pending_status"]), { stdout: "" })
           .then(function (pendingResult) {
             const pendingStatus = (pendingResult.stdout || "").trim();
-            // If pending status detected, return with pending flag
             if (pendingStatus.endsWith("_pending")) {
-              const detectedArea = pendingStatus.split('_')[0];
-              return {
-                area: detectedArea,
-                dslite_provider: "UNKNOWN",
-                mape_status: mape_status,
-                prefix_length: prefix_length || "UNKNOWN",
-                isPending: true,
-                mapIsPatched: mapsh_status === "patched",
-              };
+              return { ...baseData, area: pendingStatus.split('_')[0], dslite_provider: "UNKNOWN", isPending: true };
             }
-            // No pending status, check DS-Lite provider
             return L.resolveDefault(fs.exec("/usr/sbin/fleth", ["get_dslite_provider"]), { stdout: "" })
               .then(function (dsliteResult) {
-                const dslite_provider = (dsliteResult.stdout || "").trim();
-                return {
-                  area: areaValue,
-                  dslite_provider: dslite_provider || "UNKNOWN",
-                  mape_status: mape_status,
-                  prefix_length: prefix_length || "UNKNOWN",
-                  isPending: false,
-                  mapIsPatched: mapsh_status === "patched",
-                };
+                return { ...baseData, area: areaValue, dslite_provider: (dsliteResult.stdout || "").trim() || "UNKNOWN", isPending: false };
               });
           });
-      } else {
-        // MAP-E detected, no need to check DS-Lite or pending
-        return {
-          area: areaValue,
-          dslite_provider: "UNKNOWN",
-          mape_status: mape_status,
-          prefix_length: prefix_length || "UNKNOWN",
-          isPending: false,
-          mapIsPatched: mapsh_status === "patched",
-        };
       }
+      return { ...baseData, area: areaValue, dslite_provider: "UNKNOWN", isPending: false };
     });
   },
 
@@ -151,9 +136,49 @@ return view.extend({
       mapeDetailFields.forEach((field, i) => {
         const [fieldName, fieldLabel] = field;
         o = s.taboption("info", form.DummyValue, fieldName, _(fieldLabel));
-        o.cfgvalue = function () {
-          return data.mape_status[i + 1] || "";
-        };
+
+        // Special rendering for Available ports
+        if (fieldName === "mape_map_ports") {
+          o.rawhtml = true;
+          o.cfgvalue = function () {
+            const portsString = data.mape_status[i + 1] || "";
+            if (!portsString) return "";
+
+            // Split ports into individual numbers
+            const ports = portsString.split(/\s+/).filter(p => p);
+            const highlightedPorts = ports.map(port => {
+              const len = port.length;
+              const half = len / 2;
+              const reversed = port.split('').reverse().join('');
+              const counts = {};
+              for (let c of port) counts[c] = (counts[c] || 0) + 1;
+
+              const isSpecial = /(\d)\1{2,}/.test(port) || // consecutive repeats
+                port.endsWith('0') || // ends with 0
+                (len >= 2 && len % 2 === 0 && port.substring(0, half) === port.substring(half)) || // ABAB
+                (len >= 3 && port === reversed) || // palindrome
+                Object.values(counts).some(n => n >= 3); // frequent digit
+
+              return isSpecial ? '<span class="port-highlight">' + port + '</span>' : port;
+            });
+
+            return highlightedPorts.join(' ');
+          };
+          // Override render to display as div instead of input
+          o.render = function () {
+            const value = this.cfgvalue();
+            const contentDiv = E('div', { 'style': 'line-height: 1.8; word-wrap: break-word;' });
+            contentDiv.innerHTML = value;
+            return E('div', { 'class': 'cbi-value' }, [
+              E('label', { 'class': 'cbi-value-title' }, _(fieldLabel)),
+              E('div', { 'class': 'cbi-value-field' }, contentDiv)
+            ]);
+          }.bind(o);
+        } else {
+          o.cfgvalue = function () {
+            return data.mape_status[i + 1] || "";
+          };
+        }
       });
     }
 
@@ -252,7 +277,7 @@ return view.extend({
     o.title = _("map.sh Management");
     o.cfgvalue = function () {
       return _("OpenWrt's map.sh has bugs: only the first port group works and ICMP is broken. Click below to replace with the fixed version.") +
-             ' <a href="https://github.com/fakemanhk/openwrt-jp-ipoe/tree/main" target="_blank" style="color: #0088cc;">(' + _("See more") + ')</a>';
+        ' <a href="https://github.com/fakemanhk/openwrt-jp-ipoe/tree/main" target="_blank" style="color: #0088cc;">(' + _("See more") + ')</a>';
     };
     o.rawhtml = true;
 
@@ -274,12 +299,12 @@ return view.extend({
     };
     o.rawhtml = true;
 
-    o = s.taboption("tools", form.Button, "_replace_mapsh");
+    o = s.taboption("tools", form.Button, "_patch_mapsh");
     o.title = "&#160;";
-    o.inputtitle = _("Replace");
+    o.inputtitle = _("Patch");
     o.inputstyle = data.mapIsPatched ? "cbi-button-action" : "cbi-button-apply";
     o.onclick = L.bind(function (m) {
-      return this.replaceMapSh(m);
+      return this.patchMapSh(m);
     }, this, m);
 
     o = s.taboption("tools", form.Button, "_restore_mapsh");
@@ -289,15 +314,15 @@ return view.extend({
     o.onclick = L.bind(function (m) {
       return this.restoreMapSh(m);
     }, this, m);
-    o.depends("_replace_mapsh", "");
+    o.depends("_patch_mapsh", "");
 
     const renderedNode = await m.render();
 
     // Hide footer when tools tab is active
-    setTimeout(function() {
+    setTimeout(function () {
       const footer = document.querySelector('.cbi-page-actions');
 
-      const toggleFooter = function() {
+      const toggleFooter = function () {
         // Check if tools tab is active
         const toolsActive = document.querySelector('.cbi-tab[data-tab="tools"]');
         if (footer) {
@@ -312,8 +337,8 @@ return view.extend({
       const tabMenu = document.querySelector('.cbi-tabmenu');
       if (tabMenu) {
         const tabItems = tabMenu.querySelectorAll('li[data-tab]');
-        tabItems.forEach(function(tabItem) {
-          tabItem.addEventListener('click', function() {
+        tabItems.forEach(function (tabItem) {
+          tabItem.addEventListener('click', function () {
             setTimeout(toggleFooter, 10);
           });
         });
@@ -374,7 +399,7 @@ return view.extend({
 
   manageMapSh: function (mapObj, action) {
     const actionConfig = {
-      replace: { verb: _('Replacing'), gerund: _('Downloading...') },
+      patch: { verb: _('Patching'), gerund: _('Downloading...') },
       restore: { verb: _('Restoring'), gerund: _('Restoring...') }
     };
 
@@ -388,15 +413,15 @@ return view.extend({
             E('p', { 'class': 'spinning' }, config.gerund)
           ]);
 
-          return fs.exec('/usr/sbin/fleth', [action + '_mapsh']);
+          return fs.exec('/usr/sbin/fleth', [action + '_map.sh']);
         })
         .then(function (result) {
           ui.hideModal();
 
           if (result.code === 0 && result.stdout.trim() === 'SUCCESS') {
             ui.addNotification(null, E('p', _('Operation completed successfully! Please restart the network interface manually.')), 'info');
 
-            setTimeout(function() {
+            setTimeout(function () {
               window.location.reload();
             }, 5000);
           } else {
@@ -419,8 +444,8 @@ return view.extend({
     });
   },
 
-  replaceMapSh: function (mapObj) {
-    return this.manageMapSh(mapObj, 'replace');
+  patchMapSh: function (mapObj) {
+    return this.manageMapSh(mapObj, 'patch');
   },
 
   restoreMapSh: function (mapObj) {

po/ja/fleth.po

@@ -158,8 +158,6 @@ msgstr "トンネルインターフェース用のパブリック IPv4 アドレ
 msgid "IPv6 Interface ID"
 msgstr "IPv6 インターフェース ID"
 
-msgid "IPv6 interface identifier (last 64 bits). Will be combined with WAN6 prefix to create a virtual IPv6 address. Example: 0011:4514:1b00:0000"
-msgstr "IPv6 インターフェース識別子（下位 64 ビット）。WAN6 プレフィックスと組み合わせて仮想 IPv6 アドレスを作成します。例：0011:4514:1b00:0000"
 
 msgid "IPv6 Interface ID is required"
 msgstr "IPv6 インターフェース ID は必須です"
@@ -182,74 +180,20 @@ msgstr "パッチ版"
 msgid "Original version"
 msgstr "オリジナル版"
 
-msgid "Replace MAP.sh"
-msgstr "map.sh を置き換える"
-
-msgid "Restore Original MAP.sh"
-msgstr "オリジナル map.sh に戻す"
-
-msgid "Replacing MAP.sh"
-msgstr "map.sh を置き換え中"
-
-msgid "Downloading and replacing MAP.sh..."
-msgstr "map.sh をダウンロードして置き換え中..."
-
-msgid "Restoring MAP.sh"
-msgstr "map.sh を復元中"
-
-msgid "Restoring original MAP.sh..."
-msgstr "オリジナル map.sh を復元中..."
-
-msgid "map.sh replaced successfully! Please restart the network interface if needed."
-msgstr "map.sh の置き換えに成功しました！変更を有効にするには、手動でネットワークインターフェースを再起動してください。"
-
-msgid "Original map.sh restored successfully! Please restart the network interface if needed."
-msgstr "オリジナル map.sh の復元に成功しました！変更を有効にするには、手動でネットワークインターフェースを再起動してください。"
-
-msgid "Failed to replace MAP.sh:"
-msgstr "map.sh の置き換えに失敗しました："
-
-msgid "Failed to restore MAP.sh:"
-msgstr "map.sh の復元に失敗しました："
-
-msgid "Error replacing MAP.sh:"
-msgstr "map.sh の置き換え中にエラーが発生しました："
-
-msgid "Error restoring MAP.sh:"
-msgstr "map.sh の復元中にエラーが発生しました："
-
-msgid "Replace"
-msgstr "置き換える"
+msgid "Patch"
+msgstr "パッチする"
 
 msgid "Restore"
 msgstr "復元"
 
-msgid "Replacing"
-msgstr "置き換え中"
+msgid "Patching"
+msgstr "パッチ中"
 
 msgid "Downloading..."
 msgstr "ダウンロード中..."
 
-msgid "Restoring"
-msgstr "復元中"
-
 msgid "Restoring..."
 msgstr "復元中..."
 
-msgid "Replaced successfully! Please restart the network interface manually."
-msgstr "置き換え完了！手動でネットワークインターフェースを再起動してください。"
-
-msgid "Restored successfully! Please restart the network interface manually."
-msgstr "復元完了！手動でネットワークインターフェースを再起動してください。"
-
-msgid "Failed to replace:"
-msgstr "置き換え失敗："
-
-msgid "Failed to restore:"
-msgstr "復元失敗："
-
-msgid "Error replacing:"
-msgstr "置き換えエラー："
-
-msgid "Error restoring:"
-msgstr "復元エラー："
+msgid "Operation completed successfully! Please restart the network interface manually."
+msgstr "操作が完了しました！手動でネットワークインターフェースを再起動してください。"