From a4c01fa552002c44438d0e15948f5c7a6b6bc3dc Mon Sep 17 00:00:00 2001
From: kenzok8 <kenzok8@users.noreply.github.com>
Date: Tue, 2 Dec 2025 04:25:44 +0800
Subject: [PATCH] update 2025-12-02 04:25:44

---
 luci-app-passwall2/Makefile                   |   2 +-
 .../resources/view/passwall2/Sortable.min.js  |   2 +
 .../luasrc/controller/passwall2.lua           |  34 +-
 .../cbi/passwall2/client/node_subscribe.lua   |   2 +-
 .../model/cbi/passwall2/client/type/ray.lua   |  13 +-
 luci-app-passwall2/luasrc/passwall2/api.lua   |  61 +-
 .../luasrc/passwall2/util_xray.lua            |   3 +-
 .../luasrc/view/passwall2/log/log.htm         |  22 +-
 .../passwall2/node_list/link_add_node.htm     |   2 +-
 .../view/passwall2/node_list/node_list.htm    | 375 +++++--
 .../luasrc/view/passwall2/server/log.htm      |  23 +-
 luci-app-passwall2/po/zh-cn/passwall2.po      |  20 +-
 luci-app-passwall2/po/zh-tw/passwall2.po      | 918 +++++++++---------
 .../root/usr/share/passwall2/haproxy.lua      |  14 +-
 .../usr/share/passwall2/helper_dnsmasq.lua    |   4 +-
 .../root/usr/share/passwall2/rule_update.lua  |  40 +-
 .../root/usr/share/passwall2/subscribe.lua    | 111 ++-
 xray-core/Makefile                            |   4 +-
 18 files changed, 1008 insertions(+), 642 deletions(-)
 create mode 100644 luci-app-passwall2/htdocs/luci-static/resources/view/passwall2/Sortable.min.js

diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile
index 76bbb2270..76dd6f82a 100644
--- a/luci-app-passwall2/Makefile
+++ b/luci-app-passwall2/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall2
-PKG_VERSION:=25.11.18
+PKG_VERSION:=25.12.2
 PKG_RELEASE:=1
 PKG_PO_VERSION:=$(PKG_VERSION)
 
diff --git a/luci-app-passwall2/htdocs/luci-static/resources/view/passwall2/Sortable.min.js b/luci-app-passwall2/htdocs/luci-static/resources/view/passwall2/Sortable.min.js
new file mode 100644
index 000000000..95423a649
--- /dev/null
+++ b/luci-app-passwall2/htdocs/luci-static/resources/view/passwall2/Sortable.min.js
@@ -0,0 +1,2 @@
+/*! Sortable 1.15.6 - MIT | git://github.com/SortableJS/Sortable.git */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t=t||self).Sortable=e()}(this,function(){"use strict";function e(e,t){var n,o=Object.keys(e);return Object.getOwnPropertySymbols&&(n=Object.getOwnPropertySymbols(e),t&&(n=n.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),o.push.apply(o,n)),o}function I(o){for(var t=1;t<arguments.length;t++){var i=null!=arguments[t]?arguments[t]:{};t%2?e(Object(i),!0).forEach(function(t){var e,n;e=o,t=i[n=t],n in e?Object.defineProperty(e,n,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[n]=t}):Object.getOwnPropertyDescriptors?Object.defineProperties(o,Object.getOwnPropertyDescriptors(i)):e(Object(i)).forEach(function(t){Object.defineProperty(o,t,Object.getOwnPropertyDescriptor(i,t))})}return o}function o(t){return(o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function a(){return(a=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n,o=arguments[e];for(n in o)Object.prototype.hasOwnProperty.call(o,n)&&(t[n]=o[n])}return t}).apply(this,arguments)}function i(t,e){if(null==t)return{};var n,o=function(t,e){if(null==t)return{};for(var n,o={},i=Object.keys(t),r=0;r<i.length;r++)n=i[r],0<=e.indexOf(n)||(o[n]=t[n]);return o}(t,e);if(Object.getOwnPropertySymbols)for(var i=Object.getOwnPropertySymbols(t),r=0;r<i.length;r++)n=i[r],0<=e.indexOf(n)||Object.prototype.propertyIsEnumerable.call(t,n)&&(o[n]=t[n]);return o}function r(t){return function(t){if(Array.isArray(t))return l(t)}(t)||function(t){if("undefined"!=typeof Symbol&&null!=t[Symbol.iterator]||null!=t["@@iterator"])return Array.from(t)}(t)||function(t,e){if(t){if("string"==typeof t)return l(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);return"Map"===(n="Object"===n&&t.constructor?t.constructor.name:n)||"Set"===n?Array.from(t):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?l(t,e):void 0}}(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function l(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,o=new Array(e);n<e;n++)o[n]=t[n];return o}function t(t){if("undefined"!=typeof window&&window.navigator)return!!navigator.userAgent.match(t)}var y=t(/(?:Trident.*rv[ :]?11\.|msie|iemobile|Windows Phone)/i),w=t(/Edge/i),s=t(/firefox/i),u=t(/safari/i)&&!t(/chrome/i)&&!t(/android/i),c=t(/iP(ad|od|hone)/i),n=t(/chrome/i)&&t(/android/i),d={capture:!1,passive:!1};function h(t,e,n){t.addEventListener(e,n,!y&&d)}function p(t,e,n){t.removeEventListener(e,n,!y&&d)}function f(t,e){if(e&&(">"===e[0]&&(e=e.substring(1)),t))try{if(t.matches)return t.matches(e);if(t.msMatchesSelector)return t.msMatchesSelector(e);if(t.webkitMatchesSelector)return t.webkitMatchesSelector(e)}catch(t){return}}function g(t){return t.host&&t!==document&&t.host.nodeType?t.host:t.parentNode}function P(t,e,n,o){if(t){n=n||document;do{if(null!=e&&(">"!==e[0]||t.parentNode===n)&&f(t,e)||o&&t===n)return t}while(t!==n&&(t=g(t)))}return null}var m,v=/\s+/g;function k(t,e,n){var o;t&&e&&(t.classList?t.classList[n?"add":"remove"](e):(o=(" "+t.className+" ").replace(v," ").replace(" "+e+" "," "),t.className=(o+(n?" "+e:"")).replace(v," ")))}function R(t,e,n){var o=t&&t.style;if(o){if(void 0===n)return document.defaultView&&document.defaultView.getComputedStyle?n=document.defaultView.getComputedStyle(t,""):t.currentStyle&&(n=t.currentStyle),void 0===e?n:n[e];o[e=!(e in o||-1!==e.indexOf("webkit"))?"-webkit-"+e:e]=n+("string"==typeof n?"":"px")}}function b(t,e){var n="";if("string"==typeof t)n=t;else do{var o=R(t,"transform")}while(o&&"none"!==o&&(n=o+" "+n),!e&&(t=t.parentNode));var i=window.DOMMatrix||window.WebKitCSSMatrix||window.CSSMatrix||window.MSCSSMatrix;return i&&new i(n)}function D(t,e,n){if(t){var o=t.getElementsByTagName(e),i=0,r=o.length;if(n)for(;i<r;i++)n(o[i],i);return o}return[]}function O(){var t=document.scrollingElement;return t||document.documentElement}function X(t,e,n,o,i){if(t.getBoundingClientRect||t===window){var r,a,l,s,c,u,d=t!==window&&t.parentNode&&t!==O()?(a=(r=t.getBoundingClientRect()).top,l=r.left,s=r.bottom,c=r.right,u=r.height,r.width):(l=a=0,s=window.innerHeight,c=window.innerWidth,u=window.innerHeight,window.innerWidth);if((e||n)&&t!==window&&(i=i||t.parentNode,!y))do{if(i&&i.getBoundingClientRect&&("none"!==R(i,"transform")||n&&"static"!==R(i,"position"))){var h=i.getBoundingClientRect();a-=h.top+parseInt(R(i,"border-top-width")),l-=h.left+parseInt(R(i,"border-left-width")),s=a+r.height,c=l+r.width;break}}while(i=i.parentNode);return o&&t!==window&&(o=(e=b(i||t))&&e.a,t=e&&e.d,e&&(s=(a/=t)+(u/=t),c=(l/=o)+(d/=o))),{top:a,left:l,bottom:s,right:c,width:d,height:u}}}function Y(t,e,n){for(var o=M(t,!0),i=X(t)[e];o;){var r=X(o)[n];if(!("top"===n||"left"===n?r<=i:i<=r))return o;if(o===O())break;o=M(o,!1)}return!1}function B(t,e,n,o){for(var i=0,r=0,a=t.children;r<a.length;){if("none"!==a[r].style.display&&a[r]!==jt.ghost&&(o||a[r]!==jt.dragged)&&P(a[r],n.draggable,t,!1)){if(i===e)return a[r];i++}r++}return null}function F(t,e){for(var n=t.lastElementChild;n&&(n===jt.ghost||"none"===R(n,"display")||e&&!f(n,e));)n=n.previousElementSibling;return n||null}function j(t,e){var n=0;if(!t||!t.parentNode)return-1;for(;t=t.previousElementSibling;)"TEMPLATE"===t.nodeName.toUpperCase()||t===jt.clone||e&&!f(t,e)||n++;return n}function E(t){var e=0,n=0,o=O();if(t)do{var i=b(t),r=i.a,i=i.d}while(e+=t.scrollLeft*r,n+=t.scrollTop*i,t!==o&&(t=t.parentNode));return[e,n]}function M(t,e){if(!t||!t.getBoundingClientRect)return O();var n=t,o=!1;do{if(n.clientWidth<n.scrollWidth||n.clientHeight<n.scrollHeight){var i=R(n);if(n.clientWidth<n.scrollWidth&&("auto"==i.overflowX||"scroll"==i.overflowX)||n.clientHeight<n.scrollHeight&&("auto"==i.overflowY||"scroll"==i.overflowY)){if(!n.getBoundingClientRect||n===document.body)return O();if(o||e)return n;o=!0}}}while(n=n.parentNode);return O()}function S(t,e){return Math.round(t.top)===Math.round(e.top)&&Math.round(t.left)===Math.round(e.left)&&Math.round(t.height)===Math.round(e.height)&&Math.round(t.width)===Math.round(e.width)}function _(e,n){return function(){var t;m||(1===(t=arguments).length?e.call(this,t[0]):e.apply(this,t),m=setTimeout(function(){m=void 0},n))}}function H(t,e,n){t.scrollLeft+=e,t.scrollTop+=n}function C(t){var e=window.Polymer,n=window.jQuery||window.Zepto;return e&&e.dom?e.dom(t).cloneNode(!0):n?n(t).clone(!0)[0]:t.cloneNode(!0)}function T(t,e){R(t,"position","absolute"),R(t,"top",e.top),R(t,"left",e.left),R(t,"width",e.width),R(t,"height",e.height)}function x(t){R(t,"position",""),R(t,"top",""),R(t,"left",""),R(t,"width",""),R(t,"height","")}function L(n,o,i){var r={};return Array.from(n.children).forEach(function(t){var e;P(t,o.draggable,n,!1)&&!t.animated&&t!==i&&(e=X(t),r.left=Math.min(null!==(t=r.left)&&void 0!==t?t:1/0,e.left),r.top=Math.min(null!==(t=r.top)&&void 0!==t?t:1/0,e.top),r.right=Math.max(null!==(t=r.right)&&void 0!==t?t:-1/0,e.right),r.bottom=Math.max(null!==(t=r.bottom)&&void 0!==t?t:-1/0,e.bottom))}),r.width=r.right-r.left,r.height=r.bottom-r.top,r.x=r.left,r.y=r.top,r}var K="Sortable"+(new Date).getTime();function A(){var e,o=[];return{captureAnimationState:function(){o=[],this.options.animation&&[].slice.call(this.el.children).forEach(function(t){var e,n;"none"!==R(t,"display")&&t!==jt.ghost&&(o.push({target:t,rect:X(t)}),e=I({},o[o.length-1].rect),!t.thisAnimationDuration||(n=b(t,!0))&&(e.top-=n.f,e.left-=n.e),t.fromRect=e)})},addAnimationState:function(t){o.push(t)},removeAnimationState:function(t){o.splice(function(t,e){for(var n in t)if(t.hasOwnProperty(n))for(var o in e)if(e.hasOwnProperty(o)&&e[o]===t[n][o])return Number(n);return-1}(o,{target:t}),1)},animateAll:function(t){var c=this;if(!this.options.animation)return clearTimeout(e),void("function"==typeof t&&t());var u=!1,d=0;o.forEach(function(t){var e=0,n=t.target,o=n.fromRect,i=X(n),r=n.prevFromRect,a=n.prevToRect,l=t.rect,s=b(n,!0);s&&(i.top-=s.f,i.left-=s.e),n.toRect=i,n.thisAnimationDuration&&S(r,i)&&!S(o,i)&&(l.top-i.top)/(l.left-i.left)==(o.top-i.top)/(o.left-i.left)&&(t=l,s=r,r=a,a=c.options,e=Math.sqrt(Math.pow(s.top-t.top,2)+Math.pow(s.left-t.left,2))/Math.sqrt(Math.pow(s.top-r.top,2)+Math.pow(s.left-r.left,2))*a.animation),S(i,o)||(n.prevFromRect=o,n.prevToRect=i,e=e||c.options.animation,c.animate(n,l,i,e)),e&&(u=!0,d=Math.max(d,e),clearTimeout(n.animationResetTimer),n.animationResetTimer=setTimeout(function(){n.animationTime=0,n.prevFromRect=null,n.fromRect=null,n.prevToRect=null,n.thisAnimationDuration=null},e),n.thisAnimationDuration=e)}),clearTimeout(e),u?e=setTimeout(function(){"function"==typeof t&&t()},d):"function"==typeof t&&t(),o=[]},animate:function(t,e,n,o){var i,r;o&&(R(t,"transition",""),R(t,"transform",""),i=(r=b(this.el))&&r.a,r=r&&r.d,i=(e.left-n.left)/(i||1),r=(e.top-n.top)/(r||1),t.animatingX=!!i,t.animatingY=!!r,R(t,"transform","translate3d("+i+"px,"+r+"px,0)"),this.forRepaintDummy=t.offsetWidth,R(t,"transition","transform "+o+"ms"+(this.options.easing?" "+this.options.easing:"")),R(t,"transform","translate3d(0,0,0)"),"number"==typeof t.animated&&clearTimeout(t.animated),t.animated=setTimeout(function(){R(t,"transition",""),R(t,"transform",""),t.animated=!1,t.animatingX=!1,t.animatingY=!1},o))}}}var N=[],W={initializeByDefault:!0},z={mount:function(e){for(var t in W)!W.hasOwnProperty(t)||t in e||(e[t]=W[t]);N.forEach(function(t){if(t.pluginName===e.pluginName)throw"Sortable: Cannot mount plugin ".concat(e.pluginName," more than once")}),N.push(e)},pluginEvent:function(e,n,o){var t=this;this.eventCanceled=!1,o.cancel=function(){t.eventCanceled=!0};var i=e+"Global";N.forEach(function(t){n[t.pluginName]&&(n[t.pluginName][i]&&n[t.pluginName][i](I({sortable:n},o)),n.options[t.pluginName]&&n[t.pluginName][e]&&n[t.pluginName][e](I({sortable:n},o)))})},initializePlugins:function(n,o,i,t){for(var e in N.forEach(function(t){var e=t.pluginName;(n.options[e]||t.initializeByDefault)&&((t=new t(n,o,n.options)).sortable=n,t.options=n.options,n[e]=t,a(i,t.defaults))}),n.options){var r;n.options.hasOwnProperty(e)&&(void 0!==(r=this.modifyOption(n,e,n.options[e]))&&(n.options[e]=r))}},getEventProperties:function(e,n){var o={};return N.forEach(function(t){"function"==typeof t.eventProperties&&a(o,t.eventProperties.call(n[t.pluginName],e))}),o},modifyOption:function(e,n,o){var i;return N.forEach(function(t){e[t.pluginName]&&t.optionListeners&&"function"==typeof t.optionListeners[n]&&(i=t.optionListeners[n].call(e[t.pluginName],o))}),i}};function G(t){var e=t.sortable,n=t.rootEl,o=t.name,i=t.targetEl,r=t.cloneEl,a=t.toEl,l=t.fromEl,s=t.oldIndex,c=t.newIndex,u=t.oldDraggableIndex,d=t.newDraggableIndex,h=t.originalEvent,p=t.putSortable,f=t.extraEventProperties;if(e=e||n&&n[K]){var g,m=e.options,t="on"+o.charAt(0).toUpperCase()+o.substr(1);!window.CustomEvent||y||w?(g=document.createEvent("Event")).initEvent(o,!0,!0):g=new CustomEvent(o,{bubbles:!0,cancelable:!0}),g.to=a||n,g.from=l||n,g.item=i||n,g.clone=r,g.oldIndex=s,g.newIndex=c,g.oldDraggableIndex=u,g.newDraggableIndex=d,g.originalEvent=h,g.pullMode=p?p.lastPutMode:void 0;var v,b=I(I({},f),z.getEventProperties(o,e));for(v in b)g[v]=b[v];n&&n.dispatchEvent(g),m[t]&&m[t].call(e,g)}}function U(t,e){var n=(o=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{}).evt,o=i(o,q);z.pluginEvent.bind(jt)(t,e,I({dragEl:Z,parentEl:$,ghostEl:Q,rootEl:J,nextEl:tt,lastDownEl:et,cloneEl:nt,cloneHidden:ot,dragStarted:mt,putSortable:ct,activeSortable:jt.active,originalEvent:n,oldIndex:it,oldDraggableIndex:at,newIndex:rt,newDraggableIndex:lt,hideGhostForTarget:Xt,unhideGhostForTarget:Yt,cloneNowHidden:function(){ot=!0},cloneNowShown:function(){ot=!1},dispatchSortableEvent:function(t){V({sortable:e,name:t,originalEvent:n})}},o))}var q=["evt"];function V(t){G(I({putSortable:ct,cloneEl:nt,targetEl:Z,rootEl:J,oldIndex:it,oldDraggableIndex:at,newIndex:rt,newDraggableIndex:lt},t))}var Z,$,Q,J,tt,et,nt,ot,it,rt,at,lt,st,ct,ut,dt,ht,pt,ft,gt,mt,vt,bt,yt,wt,Dt=!1,Et=!1,St=[],_t=!1,Ct=!1,Tt=[],xt=!1,Ot=[],Mt="undefined"!=typeof document,At=c,Nt=w||y?"cssFloat":"float",It=Mt&&!n&&!c&&"draggable"in document.createElement("div"),Pt=function(){if(Mt){if(y)return!1;var t=document.createElement("x");return t.style.cssText="pointer-events:auto","auto"===t.style.pointerEvents}}(),kt=function(t,e){var n=R(t),o=parseInt(n.width)-parseInt(n.paddingLeft)-parseInt(n.paddingRight)-parseInt(n.borderLeftWidth)-parseInt(n.borderRightWidth),i=B(t,0,e),r=B(t,1,e),a=i&&R(i),l=r&&R(r),s=a&&parseInt(a.marginLeft)+parseInt(a.marginRight)+X(i).width,t=l&&parseInt(l.marginLeft)+parseInt(l.marginRight)+X(r).width;if("flex"===n.display)return"column"===n.flexDirection||"column-reverse"===n.flexDirection?"vertical":"horizontal";if("grid"===n.display)return n.gridTemplateColumns.split(" ").length<=1?"vertical":"horizontal";if(i&&a.float&&"none"!==a.float){e="left"===a.float?"left":"right";return!r||"both"!==l.clear&&l.clear!==e?"horizontal":"vertical"}return i&&("block"===a.display||"flex"===a.display||"table"===a.display||"grid"===a.display||o<=s&&"none"===n[Nt]||r&&"none"===n[Nt]&&o<s+t)?"vertical":"horizontal"},Rt=function(t){function l(r,a){return function(t,e,n,o){var i=t.options.group.name&&e.options.group.name&&t.options.group.name===e.options.group.name;if(null==r&&(a||i))return!0;if(null==r||!1===r)return!1;if(a&&"clone"===r)return r;if("function"==typeof r)return l(r(t,e,n,o),a)(t,e,n,o);e=(a?t:e).options.group.name;return!0===r||"string"==typeof r&&r===e||r.join&&-1<r.indexOf(e)}}var e={},n=t.group;n&&"object"==o(n)||(n={name:n}),e.name=n.name,e.checkPull=l(n.pull,!0),e.checkPut=l(n.put),e.revertClone=n.revertClone,t.group=e},Xt=function(){!Pt&&Q&&R(Q,"display","none")},Yt=function(){!Pt&&Q&&R(Q,"display","")};Mt&&!n&&document.addEventListener("click",function(t){if(Et)return t.preventDefault(),t.stopPropagation&&t.stopPropagation(),t.stopImmediatePropagation&&t.stopImmediatePropagation(),Et=!1},!0);function Bt(t){if(Z){t=t.touches?t.touches[0]:t;var e=(i=t.clientX,r=t.clientY,St.some(function(t){var e=t[K].options.emptyInsertThreshold;if(e&&!F(t)){var n=X(t),o=i>=n.left-e&&i<=n.right+e,e=r>=n.top-e&&r<=n.bottom+e;return o&&e?a=t:void 0}}),a);if(e){var n,o={};for(n in t)t.hasOwnProperty(n)&&(o[n]=t[n]);o.target=o.rootEl=e,o.preventDefault=void 0,o.stopPropagation=void 0,e[K]._onDragOver(o)}}var i,r,a}function Ft(t){Z&&Z.parentNode[K]._isOutsideThisEl(t.target)}function jt(t,e){if(!t||!t.nodeType||1!==t.nodeType)throw"Sortable: `el` must be an HTMLElement, not ".concat({}.toString.call(t));this.el=t,this.options=e=a({},e),t[K]=this;var n,o,i={group:null,sort:!0,disabled:!1,store:null,handle:null,draggable:/^[uo]l$/i.test(t.nodeName)?">li":">*",swapThreshold:1,invertSwap:!1,invertedSwapThreshold:null,removeCloneOnHide:!0,direction:function(){return kt(t,this.options)},ghostClass:"sortable-ghost",chosenClass:"sortable-chosen",dragClass:"sortable-drag",ignore:"a, img",filter:null,preventOnFilter:!0,animation:0,easing:null,setData:function(t,e){t.setData("Text",e.textContent)},dropBubble:!1,dragoverBubble:!1,dataIdAttr:"data-id",delay:0,delayOnTouchOnly:!1,touchStartThreshold:(Number.parseInt?Number:window).parseInt(window.devicePixelRatio,10)||1,forceFallback:!1,fallbackClass:"sortable-fallback",fallbackOnBody:!1,fallbackTolerance:0,fallbackOffset:{x:0,y:0},supportPointer:!1!==jt.supportPointer&&"PointerEvent"in window&&(!u||c),emptyInsertThreshold:5};for(n in z.initializePlugins(this,t,i),i)n in e||(e[n]=i[n]);for(o in Rt(e),this)"_"===o.charAt(0)&&"function"==typeof this[o]&&(this[o]=this[o].bind(this));this.nativeDraggable=!e.forceFallback&&It,this.nativeDraggable&&(this.options.touchStartThreshold=1),e.supportPointer?h(t,"pointerdown",this._onTapStart):(h(t,"mousedown",this._onTapStart),h(t,"touchstart",this._onTapStart)),this.nativeDraggable&&(h(t,"dragover",this),h(t,"dragenter",this)),St.push(this.el),e.store&&e.store.get&&this.sort(e.store.get(this)||[]),a(this,A())}function Ht(t,e,n,o,i,r,a,l){var s,c,u=t[K],d=u.options.onMove;return!window.CustomEvent||y||w?(s=document.createEvent("Event")).initEvent("move",!0,!0):s=new CustomEvent("move",{bubbles:!0,cancelable:!0}),s.to=e,s.from=t,s.dragged=n,s.draggedRect=o,s.related=i||e,s.relatedRect=r||X(e),s.willInsertAfter=l,s.originalEvent=a,t.dispatchEvent(s),c=d?d.call(u,s,a):c}function Lt(t){t.draggable=!1}function Kt(){xt=!1}function Wt(t){return setTimeout(t,0)}function zt(t){return clearTimeout(t)}jt.prototype={constructor:jt,_isOutsideThisEl:function(t){this.el.contains(t)||t===this.el||(vt=null)},_getDirection:function(t,e){return"function"==typeof this.options.direction?this.options.direction.call(this,t,e,Z):this.options.direction},_onTapStart:function(e){if(e.cancelable){var n=this,o=this.el,t=this.options,i=t.preventOnFilter,r=e.type,a=e.touches&&e.touches[0]||e.pointerType&&"touch"===e.pointerType&&e,l=(a||e).target,s=e.target.shadowRoot&&(e.path&&e.path[0]||e.composedPath&&e.composedPath()[0])||l,c=t.filter;if(!function(t){Ot.length=0;var e=t.getElementsByTagName("input"),n=e.length;for(;n--;){var o=e[n];o.checked&&Ot.push(o)}}(o),!Z&&!(/mousedown|pointerdown/.test(r)&&0!==e.button||t.disabled)&&!s.isContentEditable&&(this.nativeDraggable||!u||!l||"SELECT"!==l.tagName.toUpperCase())&&!((l=P(l,t.draggable,o,!1))&&l.animated||et===l)){if(it=j(l),at=j(l,t.draggable),"function"==typeof c){if(c.call(this,e,l,this))return V({sortable:n,rootEl:s,name:"filter",targetEl:l,toEl:o,fromEl:o}),U("filter",n,{evt:e}),void(i&&e.preventDefault())}else if(c=c&&c.split(",").some(function(t){if(t=P(s,t.trim(),o,!1))return V({sortable:n,rootEl:t,name:"filter",targetEl:l,fromEl:o,toEl:o}),U("filter",n,{evt:e}),!0}))return void(i&&e.preventDefault());t.handle&&!P(s,t.handle,o,!1)||this._prepareDragStart(e,a,l)}}},_prepareDragStart:function(t,e,n){var o,i=this,r=i.el,a=i.options,l=r.ownerDocument;n&&!Z&&n.parentNode===r&&(o=X(n),J=r,$=(Z=n).parentNode,tt=Z.nextSibling,et=n,st=a.group,ut={target:jt.dragged=Z,clientX:(e||t).clientX,clientY:(e||t).clientY},ft=ut.clientX-o.left,gt=ut.clientY-o.top,this._lastX=(e||t).clientX,this._lastY=(e||t).clientY,Z.style["will-change"]="all",o=function(){U("delayEnded",i,{evt:t}),jt.eventCanceled?i._onDrop():(i._disableDelayedDragEvents(),!s&&i.nativeDraggable&&(Z.draggable=!0),i._triggerDragStart(t,e),V({sortable:i,name:"choose",originalEvent:t}),k(Z,a.chosenClass,!0))},a.ignore.split(",").forEach(function(t){D(Z,t.trim(),Lt)}),h(l,"dragover",Bt),h(l,"mousemove",Bt),h(l,"touchmove",Bt),a.supportPointer?(h(l,"pointerup",i._onDrop),this.nativeDraggable||h(l,"pointercancel",i._onDrop)):(h(l,"mouseup",i._onDrop),h(l,"touchend",i._onDrop),h(l,"touchcancel",i._onDrop)),s&&this.nativeDraggable&&(this.options.touchStartThreshold=4,Z.draggable=!0),U("delayStart",this,{evt:t}),!a.delay||a.delayOnTouchOnly&&!e||this.nativeDraggable&&(w||y)?o():jt.eventCanceled?this._onDrop():(a.supportPointer?(h(l,"pointerup",i._disableDelayedDrag),h(l,"pointercancel",i._disableDelayedDrag)):(h(l,"mouseup",i._disableDelayedDrag),h(l,"touchend",i._disableDelayedDrag),h(l,"touchcancel",i._disableDelayedDrag)),h(l,"mousemove",i._delayedDragTouchMoveHandler),h(l,"touchmove",i._delayedDragTouchMoveHandler),a.supportPointer&&h(l,"pointermove",i._delayedDragTouchMoveHandler),i._dragStartTimer=setTimeout(o,a.delay)))},_delayedDragTouchMoveHandler:function(t){t=t.touches?t.touches[0]:t;Math.max(Math.abs(t.clientX-this._lastX),Math.abs(t.clientY-this._lastY))>=Math.floor(this.options.touchStartThreshold/(this.nativeDraggable&&window.devicePixelRatio||1))&&this._disableDelayedDrag()},_disableDelayedDrag:function(){Z&&Lt(Z),clearTimeout(this._dragStartTimer),this._disableDelayedDragEvents()},_disableDelayedDragEvents:function(){var t=this.el.ownerDocument;p(t,"mouseup",this._disableDelayedDrag),p(t,"touchend",this._disableDelayedDrag),p(t,"touchcancel",this._disableDelayedDrag),p(t,"pointerup",this._disableDelayedDrag),p(t,"pointercancel",this._disableDelayedDrag),p(t,"mousemove",this._delayedDragTouchMoveHandler),p(t,"touchmove",this._delayedDragTouchMoveHandler),p(t,"pointermove",this._delayedDragTouchMoveHandler)},_triggerDragStart:function(t,e){e=e||"touch"==t.pointerType&&t,!this.nativeDraggable||e?this.options.supportPointer?h(document,"pointermove",this._onTouchMove):h(document,e?"touchmove":"mousemove",this._onTouchMove):(h(Z,"dragend",this),h(J,"dragstart",this._onDragStart));try{document.selection?Wt(function(){document.selection.empty()}):window.getSelection().removeAllRanges()}catch(t){}},_dragStarted:function(t,e){var n;Dt=!1,J&&Z?(U("dragStarted",this,{evt:e}),this.nativeDraggable&&h(document,"dragover",Ft),n=this.options,t||k(Z,n.dragClass,!1),k(Z,n.ghostClass,!0),jt.active=this,t&&this._appendGhost(),V({sortable:this,name:"start",originalEvent:e})):this._nulling()},_emulateDragOver:function(){if(dt){this._lastX=dt.clientX,this._lastY=dt.clientY,Xt();for(var t=document.elementFromPoint(dt.clientX,dt.clientY),e=t;t&&t.shadowRoot&&(t=t.shadowRoot.elementFromPoint(dt.clientX,dt.clientY))!==e;)e=t;if(Z.parentNode[K]._isOutsideThisEl(t),e)do{if(e[K])if(e[K]._onDragOver({clientX:dt.clientX,clientY:dt.clientY,target:t,rootEl:e})&&!this.options.dragoverBubble)break}while(e=g(t=e));Yt()}},_onTouchMove:function(t){if(ut){var e=this.options,n=e.fallbackTolerance,o=e.fallbackOffset,i=t.touches?t.touches[0]:t,r=Q&&b(Q,!0),a=Q&&r&&r.a,l=Q&&r&&r.d,e=At&&wt&&E(wt),a=(i.clientX-ut.clientX+o.x)/(a||1)+(e?e[0]-Tt[0]:0)/(a||1),l=(i.clientY-ut.clientY+o.y)/(l||1)+(e?e[1]-Tt[1]:0)/(l||1);if(!jt.active&&!Dt){if(n&&Math.max(Math.abs(i.clientX-this._lastX),Math.abs(i.clientY-this._lastY))<n)return;this._onDragStart(t,!0)}Q&&(r?(r.e+=a-(ht||0),r.f+=l-(pt||0)):r={a:1,b:0,c:0,d:1,e:a,f:l},r="matrix(".concat(r.a,",").concat(r.b,",").concat(r.c,",").concat(r.d,",").concat(r.e,",").concat(r.f,")"),R(Q,"webkitTransform",r),R(Q,"mozTransform",r),R(Q,"msTransform",r),R(Q,"transform",r),ht=a,pt=l,dt=i),t.cancelable&&t.preventDefault()}},_appendGhost:function(){if(!Q){var t=this.options.fallbackOnBody?document.body:J,e=X(Z,!0,At,!0,t),n=this.options;if(At){for(wt=t;"static"===R(wt,"position")&&"none"===R(wt,"transform")&&wt!==document;)wt=wt.parentNode;wt!==document.body&&wt!==document.documentElement?(wt===document&&(wt=O()),e.top+=wt.scrollTop,e.left+=wt.scrollLeft):wt=O(),Tt=E(wt)}k(Q=Z.cloneNode(!0),n.ghostClass,!1),k(Q,n.fallbackClass,!0),k(Q,n.dragClass,!0),R(Q,"transition",""),R(Q,"transform",""),R(Q,"box-sizing","border-box"),R(Q,"margin",0),R(Q,"top",e.top),R(Q,"left",e.left),R(Q,"width",e.width),R(Q,"height",e.height),R(Q,"opacity","0.8"),R(Q,"position",At?"absolute":"fixed"),R(Q,"zIndex","100000"),R(Q,"pointerEvents","none"),jt.ghost=Q,t.appendChild(Q),R(Q,"transform-origin",ft/parseInt(Q.style.width)*100+"% "+gt/parseInt(Q.style.height)*100+"%")}},_onDragStart:function(t,e){var n=this,o=t.dataTransfer,i=n.options;U("dragStart",this,{evt:t}),jt.eventCanceled?this._onDrop():(U("setupClone",this),jt.eventCanceled||((nt=C(Z)).removeAttribute("id"),nt.draggable=!1,nt.style["will-change"]="",this._hideClone(),k(nt,this.options.chosenClass,!1),jt.clone=nt),n.cloneId=Wt(function(){U("clone",n),jt.eventCanceled||(n.options.removeCloneOnHide||J.insertBefore(nt,Z),n._hideClone(),V({sortable:n,name:"clone"}))}),e||k(Z,i.dragClass,!0),e?(Et=!0,n._loopId=setInterval(n._emulateDragOver,50)):(p(document,"mouseup",n._onDrop),p(document,"touchend",n._onDrop),p(document,"touchcancel",n._onDrop),o&&(o.effectAllowed="move",i.setData&&i.setData.call(n,o,Z)),h(document,"drop",n),R(Z,"transform","translateZ(0)")),Dt=!0,n._dragStartId=Wt(n._dragStarted.bind(n,e,t)),h(document,"selectstart",n),mt=!0,window.getSelection().removeAllRanges(),u&&R(document.body,"user-select","none"))},_onDragOver:function(n){var o,i,r,t,e,a=this.el,l=n.target,s=this.options,c=s.group,u=jt.active,d=st===c,h=s.sort,p=ct||u,f=this,g=!1;if(!xt){if(void 0!==n.preventDefault&&n.cancelable&&n.preventDefault(),l=P(l,s.draggable,a,!0),O("dragOver"),jt.eventCanceled)return g;if(Z.contains(n.target)||l.animated&&l.animatingX&&l.animatingY||f._ignoreWhileAnimating===l)return A(!1);if(Et=!1,u&&!s.disabled&&(d?h||(i=$!==J):ct===this||(this.lastPutMode=st.checkPull(this,u,Z,n))&&c.checkPut(this,u,Z,n))){if(r="vertical"===this._getDirection(n,l),o=X(Z),O("dragOverValid"),jt.eventCanceled)return g;if(i)return $=J,M(),this._hideClone(),O("revert"),jt.eventCanceled||(tt?J.insertBefore(Z,tt):J.appendChild(Z)),A(!0);var m=F(a,s.draggable);if(m&&(S=n,c=r,x=X(F((E=this).el,E.options.draggable)),E=L(E.el,E.options,Q),!(c?S.clientX>E.right+10||S.clientY>x.bottom&&S.clientX>x.left:S.clientY>E.bottom+10||S.clientX>x.right&&S.clientY>x.top)||m.animated)){if(m&&(t=n,e=r,C=X(B((_=this).el,0,_.options,!0)),_=L(_.el,_.options,Q),e?t.clientX<_.left-10||t.clientY<C.top&&t.clientX<C.right:t.clientY<_.top-10||t.clientY<C.bottom&&t.clientX<C.left)){var v=B(a,0,s,!0);if(v===Z)return A(!1);if(D=X(l=v),!1!==Ht(J,a,Z,o,l,D,n,!1))return M(),a.insertBefore(Z,v),$=a,N(),A(!0)}else if(l.parentNode===a){var b,y,w,D=X(l),E=Z.parentNode!==a,S=(S=Z.animated&&Z.toRect||o,x=l.animated&&l.toRect||D,_=(e=r)?S.left:S.top,t=e?S.right:S.bottom,C=e?S.width:S.height,v=e?x.left:x.top,S=e?x.right:x.bottom,x=e?x.width:x.height,!(_===v||t===S||_+C/2===v+x/2)),_=r?"top":"left",C=Y(l,"top","top")||Y(Z,"top","top"),v=C?C.scrollTop:void 0;if(vt!==l&&(y=D[_],_t=!1,Ct=!S&&s.invertSwap||E),0!==(b=function(t,e,n,o,i,r,a,l){var s=o?t.clientY:t.clientX,c=o?n.height:n.width,t=o?n.top:n.left,o=o?n.bottom:n.right,n=!1;if(!a)if(l&&yt<c*i){if(_t=!_t&&(1===bt?t+c*r/2<s:s<o-c*r/2)?!0:_t)n=!0;else if(1===bt?s<t+yt:o-yt<s)return-bt}else if(t+c*(1-i)/2<s&&s<o-c*(1-i)/2)return function(t){return j(Z)<j(t)?1:-1}(e);if((n=n||a)&&(s<t+c*r/2||o-c*r/2<s))return t+c/2<s?1:-1;return 0}(n,l,D,r,S?1:s.swapThreshold,null==s.invertedSwapThreshold?s.swapThreshold:s.invertedSwapThreshold,Ct,vt===l)))for(var T=j(Z);(w=$.children[T-=b])&&("none"===R(w,"display")||w===Q););if(0===b||w===l)return A(!1);bt=b;var x=(vt=l).nextElementSibling,E=!1,S=Ht(J,a,Z,o,l,D,n,E=1===b);if(!1!==S)return 1!==S&&-1!==S||(E=1===S),xt=!0,setTimeout(Kt,30),M(),E&&!x?a.appendChild(Z):l.parentNode.insertBefore(Z,E?x:l),C&&H(C,0,v-C.scrollTop),$=Z.parentNode,void 0===y||Ct||(yt=Math.abs(y-X(l)[_])),N(),A(!0)}}else{if(m===Z)return A(!1);if((l=m&&a===n.target?m:l)&&(D=X(l)),!1!==Ht(J,a,Z,o,l,D,n,!!l))return M(),m&&m.nextSibling?a.insertBefore(Z,m.nextSibling):a.appendChild(Z),$=a,N(),A(!0)}if(a.contains(Z))return A(!1)}return!1}function O(t,e){U(t,f,I({evt:n,isOwner:d,axis:r?"vertical":"horizontal",revert:i,dragRect:o,targetRect:D,canSort:h,fromSortable:p,target:l,completed:A,onMove:function(t,e){return Ht(J,a,Z,o,t,X(t),n,e)},changed:N},e))}function M(){O("dragOverAnimationCapture"),f.captureAnimationState(),f!==p&&p.captureAnimationState()}function A(t){return O("dragOverCompleted",{insertion:t}),t&&(d?u._hideClone():u._showClone(f),f!==p&&(k(Z,(ct||u).options.ghostClass,!1),k(Z,s.ghostClass,!0)),ct!==f&&f!==jt.active?ct=f:f===jt.active&&ct&&(ct=null),p===f&&(f._ignoreWhileAnimating=l),f.animateAll(function(){O("dragOverAnimationComplete"),f._ignoreWhileAnimating=null}),f!==p&&(p.animateAll(),p._ignoreWhileAnimating=null)),(l===Z&&!Z.animated||l===a&&!l.animated)&&(vt=null),s.dragoverBubble||n.rootEl||l===document||(Z.parentNode[K]._isOutsideThisEl(n.target),t||Bt(n)),!s.dragoverBubble&&n.stopPropagation&&n.stopPropagation(),g=!0}function N(){rt=j(Z),lt=j(Z,s.draggable),V({sortable:f,name:"change",toEl:a,newIndex:rt,newDraggableIndex:lt,originalEvent:n})}},_ignoreWhileAnimating:null,_offMoveEvents:function(){p(document,"mousemove",this._onTouchMove),p(document,"touchmove",this._onTouchMove),p(document,"pointermove",this._onTouchMove),p(document,"dragover",Bt),p(document,"mousemove",Bt),p(document,"touchmove",Bt)},_offUpEvents:function(){var t=this.el.ownerDocument;p(t,"mouseup",this._onDrop),p(t,"touchend",this._onDrop),p(t,"pointerup",this._onDrop),p(t,"pointercancel",this._onDrop),p(t,"touchcancel",this._onDrop),p(document,"selectstart",this)},_onDrop:function(t){var e=this.el,n=this.options;rt=j(Z),lt=j(Z,n.draggable),U("drop",this,{evt:t}),$=Z&&Z.parentNode,rt=j(Z),lt=j(Z,n.draggable),jt.eventCanceled||(_t=Ct=Dt=!1,clearInterval(this._loopId),clearTimeout(this._dragStartTimer),zt(this.cloneId),zt(this._dragStartId),this.nativeDraggable&&(p(document,"drop",this),p(e,"dragstart",this._onDragStart)),this._offMoveEvents(),this._offUpEvents(),u&&R(document.body,"user-select",""),R(Z,"transform",""),t&&(mt&&(t.cancelable&&t.preventDefault(),n.dropBubble||t.stopPropagation()),Q&&Q.parentNode&&Q.parentNode.removeChild(Q),(J===$||ct&&"clone"!==ct.lastPutMode)&&nt&&nt.parentNode&&nt.parentNode.removeChild(nt),Z&&(this.nativeDraggable&&p(Z,"dragend",this),Lt(Z),Z.style["will-change"]="",mt&&!Dt&&k(Z,(ct||this).options.ghostClass,!1),k(Z,this.options.chosenClass,!1),V({sortable:this,name:"unchoose",toEl:$,newIndex:null,newDraggableIndex:null,originalEvent:t}),J!==$?(0<=rt&&(V({rootEl:$,name:"add",toEl:$,fromEl:J,originalEvent:t}),V({sortable:this,name:"remove",toEl:$,originalEvent:t}),V({rootEl:$,name:"sort",toEl:$,fromEl:J,originalEvent:t}),V({sortable:this,name:"sort",toEl:$,originalEvent:t})),ct&&ct.save()):rt!==it&&0<=rt&&(V({sortable:this,name:"update",toEl:$,originalEvent:t}),V({sortable:this,name:"sort",toEl:$,originalEvent:t})),jt.active&&(null!=rt&&-1!==rt||(rt=it,lt=at),V({sortable:this,name:"end",toEl:$,originalEvent:t}),this.save())))),this._nulling()},_nulling:function(){U("nulling",this),J=Z=$=Q=tt=nt=et=ot=ut=dt=mt=rt=lt=it=at=vt=bt=ct=st=jt.dragged=jt.ghost=jt.clone=jt.active=null,Ot.forEach(function(t){t.checked=!0}),Ot.length=ht=pt=0},handleEvent:function(t){switch(t.type){case"drop":case"dragend":this._onDrop(t);break;case"dragenter":case"dragover":Z&&(this._onDragOver(t),function(t){t.dataTransfer&&(t.dataTransfer.dropEffect="move");t.cancelable&&t.preventDefault()}(t));break;case"selectstart":t.preventDefault()}},toArray:function(){for(var t,e=[],n=this.el.children,o=0,i=n.length,r=this.options;o<i;o++)P(t=n[o],r.draggable,this.el,!1)&&e.push(t.getAttribute(r.dataIdAttr)||function(t){var e=t.tagName+t.className+t.src+t.href+t.textContent,n=e.length,o=0;for(;n--;)o+=e.charCodeAt(n);return o.toString(36)}(t));return e},sort:function(t,e){var n={},o=this.el;this.toArray().forEach(function(t,e){e=o.children[e];P(e,this.options.draggable,o,!1)&&(n[t]=e)},this),e&&this.captureAnimationState(),t.forEach(function(t){n[t]&&(o.removeChild(n[t]),o.appendChild(n[t]))}),e&&this.animateAll()},save:function(){var t=this.options.store;t&&t.set&&t.set(this)},closest:function(t,e){return P(t,e||this.options.draggable,this.el,!1)},option:function(t,e){var n=this.options;if(void 0===e)return n[t];var o=z.modifyOption(this,t,e);n[t]=void 0!==o?o:e,"group"===t&&Rt(n)},destroy:function(){U("destroy",this);var t=this.el;t[K]=null,p(t,"mousedown",this._onTapStart),p(t,"touchstart",this._onTapStart),p(t,"pointerdown",this._onTapStart),this.nativeDraggable&&(p(t,"dragover",this),p(t,"dragenter",this)),Array.prototype.forEach.call(t.querySelectorAll("[draggable]"),function(t){t.removeAttribute("draggable")}),this._onDrop(),this._disableDelayedDragEvents(),St.splice(St.indexOf(this.el),1),this.el=t=null},_hideClone:function(){ot||(U("hideClone",this),jt.eventCanceled||(R(nt,"display","none"),this.options.removeCloneOnHide&&nt.parentNode&&nt.parentNode.removeChild(nt),ot=!0))},_showClone:function(t){"clone"===t.lastPutMode?ot&&(U("showClone",this),jt.eventCanceled||(Z.parentNode!=J||this.options.group.revertClone?tt?J.insertBefore(nt,tt):J.appendChild(nt):J.insertBefore(nt,Z),this.options.group.revertClone&&this.animate(Z,nt),R(nt,"display",""),ot=!1)):this._hideClone()}},Mt&&h(document,"touchmove",function(t){(jt.active||Dt)&&t.cancelable&&t.preventDefault()}),jt.utils={on:h,off:p,css:R,find:D,is:function(t,e){return!!P(t,e,t,!1)},extend:function(t,e){if(t&&e)for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n]);return t},throttle:_,closest:P,toggleClass:k,clone:C,index:j,nextTick:Wt,cancelNextTick:zt,detectDirection:kt,getChild:B,expando:K},jt.get=function(t){return t[K]},jt.mount=function(){for(var t=arguments.length,e=new Array(t),n=0;n<t;n++)e[n]=arguments[n];(e=e[0].constructor===Array?e[0]:e).forEach(function(t){if(!t.prototype||!t.prototype.constructor)throw"Sortable: Mounted plugin must be a constructor function, not ".concat({}.toString.call(t));t.utils&&(jt.utils=I(I({},jt.utils),t.utils)),z.mount(t)})},jt.create=function(t,e){return new jt(t,e)};var Gt,Ut,qt,Vt,Zt,$t,Qt=[],Jt=!(jt.version="1.15.6");function te(){Qt.forEach(function(t){clearInterval(t.pid)}),Qt=[]}function ee(){clearInterval($t)}var ne,oe=_(function(n,t,e,o){if(t.scroll){var i,r=(n.touches?n.touches[0]:n).clientX,a=(n.touches?n.touches[0]:n).clientY,l=t.scrollSensitivity,s=t.scrollSpeed,c=O(),u=!1;Ut!==e&&(Ut=e,te(),Gt=t.scroll,i=t.scrollFn,!0===Gt&&(Gt=M(e,!0)));var d=0,h=Gt;do{var p=h,f=X(p),g=f.top,m=f.bottom,v=f.left,b=f.right,y=f.width,w=f.height,D=void 0,E=void 0,S=p.scrollWidth,_=p.scrollHeight,C=R(p),T=p.scrollLeft,f=p.scrollTop,E=p===c?(D=y<S&&("auto"===C.overflowX||"scroll"===C.overflowX||"visible"===C.overflowX),w<_&&("auto"===C.overflowY||"scroll"===C.overflowY||"visible"===C.overflowY)):(D=y<S&&("auto"===C.overflowX||"scroll"===C.overflowX),w<_&&("auto"===C.overflowY||"scroll"===C.overflowY)),T=D&&(Math.abs(b-r)<=l&&T+y<S)-(Math.abs(v-r)<=l&&!!T),f=E&&(Math.abs(m-a)<=l&&f+w<_)-(Math.abs(g-a)<=l&&!!f);if(!Qt[d])for(var x=0;x<=d;x++)Qt[x]||(Qt[x]={});Qt[d].vx==T&&Qt[d].vy==f&&Qt[d].el===p||(Qt[d].el=p,Qt[d].vx=T,Qt[d].vy=f,clearInterval(Qt[d].pid),0==T&&0==f||(u=!0,Qt[d].pid=setInterval(function(){o&&0===this.layer&&jt.active._onTouchMove(Zt);var t=Qt[this.layer].vy?Qt[this.layer].vy*s:0,e=Qt[this.layer].vx?Qt[this.layer].vx*s:0;"function"==typeof i&&"continue"!==i.call(jt.dragged.parentNode[K],e,t,n,Zt,Qt[this.layer].el)||H(Qt[this.layer].el,e,t)}.bind({layer:d}),24))),d++}while(t.bubbleScroll&&h!==c&&(h=M(h,!1)));Jt=u}},30),n=function(t){var e=t.originalEvent,n=t.putSortable,o=t.dragEl,i=t.activeSortable,r=t.dispatchSortableEvent,a=t.hideGhostForTarget,t=t.unhideGhostForTarget;e&&(i=n||i,a(),e=e.changedTouches&&e.changedTouches.length?e.changedTouches[0]:e,e=document.elementFromPoint(e.clientX,e.clientY),t(),i&&!i.el.contains(e)&&(r("spill"),this.onSpill({dragEl:o,putSortable:n})))};function ie(){}function re(){}ie.prototype={startIndex:null,dragStart:function(t){t=t.oldDraggableIndex;this.startIndex=t},onSpill:function(t){var e=t.dragEl,n=t.putSortable;this.sortable.captureAnimationState(),n&&n.captureAnimationState();t=B(this.sortable.el,this.startIndex,this.options);t?this.sortable.el.insertBefore(e,t):this.sortable.el.appendChild(e),this.sortable.animateAll(),n&&n.animateAll()},drop:n},a(ie,{pluginName:"revertOnSpill"}),re.prototype={onSpill:function(t){var e=t.dragEl,t=t.putSortable||this.sortable;t.captureAnimationState(),e.parentNode&&e.parentNode.removeChild(e),t.animateAll()},drop:n},a(re,{pluginName:"removeOnSpill"});var ae,le,se,ce,ue,de=[],he=[],pe=!1,fe=!1,ge=!1;function me(n,o){he.forEach(function(t,e){e=o.children[t.sortableIndex+(n?Number(e):0)];e?o.insertBefore(t,e):o.appendChild(t)})}function ve(){de.forEach(function(t){t!==se&&t.parentNode&&t.parentNode.removeChild(t)})}return jt.mount(new function(){function t(){for(var t in this.defaults={scroll:!0,forceAutoScrollFallback:!1,scrollSensitivity:30,scrollSpeed:10,bubbleScroll:!0},this)"_"===t.charAt(0)&&"function"==typeof this[t]&&(this[t]=this[t].bind(this))}return t.prototype={dragStarted:function(t){t=t.originalEvent;this.sortable.nativeDraggable?h(document,"dragover",this._handleAutoScroll):this.options.supportPointer?h(document,"pointermove",this._handleFallbackAutoScroll):t.touches?h(document,"touchmove",this._handleFallbackAutoScroll):h(document,"mousemove",this._handleFallbackAutoScroll)},dragOverCompleted:function(t){t=t.originalEvent;this.options.dragOverBubble||t.rootEl||this._handleAutoScroll(t)},drop:function(){this.sortable.nativeDraggable?p(document,"dragover",this._handleAutoScroll):(p(document,"pointermove",this._handleFallbackAutoScroll),p(document,"touchmove",this._handleFallbackAutoScroll),p(document,"mousemove",this._handleFallbackAutoScroll)),ee(),te(),clearTimeout(m),m=void 0},nulling:function(){Zt=Ut=Gt=Jt=$t=qt=Vt=null,Qt.length=0},_handleFallbackAutoScroll:function(t){this._handleAutoScroll(t,!0)},_handleAutoScroll:function(e,n){var o,i=this,r=(e.touches?e.touches[0]:e).clientX,a=(e.touches?e.touches[0]:e).clientY,t=document.elementFromPoint(r,a);Zt=e,n||this.options.forceAutoScrollFallback||w||y||u?(oe(e,this.options,t,n),o=M(t,!0),!Jt||$t&&r===qt&&a===Vt||($t&&ee(),$t=setInterval(function(){var t=M(document.elementFromPoint(r,a),!0);t!==o&&(o=t,te()),oe(e,i.options,t,n)},10),qt=r,Vt=a)):this.options.bubbleScroll&&M(t,!0)!==O()?oe(e,this.options,M(t,!1),!1):te()}},a(t,{pluginName:"scroll",initializeByDefault:!0})}),jt.mount(re,ie),jt.mount(new function(){function t(){this.defaults={swapClass:"sortable-swap-highlight"}}return t.prototype={dragStart:function(t){t=t.dragEl;ne=t},dragOverValid:function(t){var e=t.completed,n=t.target,o=t.onMove,i=t.activeSortable,r=t.changed,a=t.cancel;i.options.swap&&(t=this.sortable.el,i=this.options,n&&n!==t&&(t=ne,ne=!1!==o(n)?(k(n,i.swapClass,!0),n):null,t&&t!==ne&&k(t,i.swapClass,!1)),r(),e(!0),a())},drop:function(t){var e,n,o=t.activeSortable,i=t.putSortable,r=t.dragEl,a=i||this.sortable,l=this.options;ne&&k(ne,l.swapClass,!1),ne&&(l.swap||i&&i.options.swap)&&r!==ne&&(a.captureAnimationState(),a!==o&&o.captureAnimationState(),n=ne,t=(e=r).parentNode,l=n.parentNode,t&&l&&!t.isEqualNode(n)&&!l.isEqualNode(e)&&(i=j(e),r=j(n),t.isEqualNode(l)&&i<r&&r++,t.insertBefore(n,t.children[i]),l.insertBefore(e,l.children[r])),a.animateAll(),a!==o&&o.animateAll())},nulling:function(){ne=null}},a(t,{pluginName:"swap",eventProperties:function(){return{swapItem:ne}}})}),jt.mount(new function(){function t(o){for(var t in this)"_"===t.charAt(0)&&"function"==typeof this[t]&&(this[t]=this[t].bind(this));o.options.avoidImplicitDeselect||(o.options.supportPointer?h(document,"pointerup",this._deselectMultiDrag):(h(document,"mouseup",this._deselectMultiDrag),h(document,"touchend",this._deselectMultiDrag))),h(document,"keydown",this._checkKeyDown),h(document,"keyup",this._checkKeyUp),this.defaults={selectedClass:"sortable-selected",multiDragKey:null,avoidImplicitDeselect:!1,setData:function(t,e){var n="";de.length&&le===o?de.forEach(function(t,e){n+=(e?", ":"")+t.textContent}):n=e.textContent,t.setData("Text",n)}}}return t.prototype={multiDragKeyDown:!1,isMultiDrag:!1,delayStartGlobal:function(t){t=t.dragEl;se=t},delayEnded:function(){this.isMultiDrag=~de.indexOf(se)},setupClone:function(t){var e=t.sortable,t=t.cancel;if(this.isMultiDrag){for(var n=0;n<de.length;n++)he.push(C(de[n])),he[n].sortableIndex=de[n].sortableIndex,he[n].draggable=!1,he[n].style["will-change"]="",k(he[n],this.options.selectedClass,!1),de[n]===se&&k(he[n],this.options.chosenClass,!1);e._hideClone(),t()}},clone:function(t){var e=t.sortable,n=t.rootEl,o=t.dispatchSortableEvent,t=t.cancel;this.isMultiDrag&&(this.options.removeCloneOnHide||de.length&&le===e&&(me(!0,n),o("clone"),t()))},showClone:function(t){var e=t.cloneNowShown,n=t.rootEl,t=t.cancel;this.isMultiDrag&&(me(!1,n),he.forEach(function(t){R(t,"display","")}),e(),ue=!1,t())},hideClone:function(t){var e=this,n=(t.sortable,t.cloneNowHidden),t=t.cancel;this.isMultiDrag&&(he.forEach(function(t){R(t,"display","none"),e.options.removeCloneOnHide&&t.parentNode&&t.parentNode.removeChild(t)}),n(),ue=!0,t())},dragStartGlobal:function(t){t.sortable;!this.isMultiDrag&&le&&le.multiDrag._deselectMultiDrag(),de.forEach(function(t){t.sortableIndex=j(t)}),de=de.sort(function(t,e){return t.sortableIndex-e.sortableIndex}),ge=!0},dragStarted:function(t){var e,n=this,t=t.sortable;this.isMultiDrag&&(this.options.sort&&(t.captureAnimationState(),this.options.animation&&(de.forEach(function(t){t!==se&&R(t,"position","absolute")}),e=X(se,!1,!0,!0),de.forEach(function(t){t!==se&&T(t,e)}),pe=fe=!0)),t.animateAll(function(){pe=fe=!1,n.options.animation&&de.forEach(function(t){x(t)}),n.options.sort&&ve()}))},dragOver:function(t){var e=t.target,n=t.completed,t=t.cancel;fe&&~de.indexOf(e)&&(n(!1),t())},revert:function(t){var n,o,e=t.fromSortable,i=t.rootEl,r=t.sortable,a=t.dragRect;1<de.length&&(de.forEach(function(t){r.addAnimationState({target:t,rect:fe?X(t):a}),x(t),t.fromRect=a,e.removeAnimationState(t)}),fe=!1,n=!this.options.removeCloneOnHide,o=i,de.forEach(function(t,e){e=o.children[t.sortableIndex+(n?Number(e):0)];e?o.insertBefore(t,e):o.appendChild(t)}))},dragOverCompleted:function(t){var e,n=t.sortable,o=t.isOwner,i=t.insertion,r=t.activeSortable,a=t.parentEl,l=t.putSortable,t=this.options;i&&(o&&r._hideClone(),pe=!1,t.animation&&1<de.length&&(fe||!o&&!r.options.sort&&!l)&&(e=X(se,!1,!0,!0),de.forEach(function(t){t!==se&&(T(t,e),a.appendChild(t))}),fe=!0),o||(fe||ve(),1<de.length?(o=ue,r._showClone(n),r.options.animation&&!ue&&o&&he.forEach(function(t){r.addAnimationState({target:t,rect:ce}),t.fromRect=ce,t.thisAnimationDuration=null})):r._showClone(n)))},dragOverAnimationCapture:function(t){var e=t.dragRect,n=t.isOwner,t=t.activeSortable;de.forEach(function(t){t.thisAnimationDuration=null}),t.options.animation&&!n&&t.multiDrag.isMultiDrag&&(ce=a({},e),e=b(se,!0),ce.top-=e.f,ce.left-=e.e)},dragOverAnimationComplete:function(){fe&&(fe=!1,ve())},drop:function(t){var o,i,r,a,n,e,l,s=t.originalEvent,c=t.rootEl,u=t.parentEl,d=t.sortable,h=t.dispatchSortableEvent,p=t.oldIndex,t=t.putSortable,f=t||this.sortable;s&&(o=this.options,i=u.children,ge||(o.multiDragKey&&!this.multiDragKeyDown&&this._deselectMultiDrag(),k(se,o.selectedClass,!~de.indexOf(se)),~de.indexOf(se)?(de.splice(de.indexOf(se),1),ae=null,G({sortable:d,rootEl:c,name:"deselect",targetEl:se,originalEvent:s})):(de.push(se),G({sortable:d,rootEl:c,name:"select",targetEl:se,originalEvent:s}),s.shiftKey&&ae&&d.el.contains(ae)?(r=j(ae),a=j(se),~r&&~a&&r!==a&&function(){for(var e,t=r<a?(e=r,a):(e=a,r+1),n=o.filter;e<t;e++)~de.indexOf(i[e])||P(i[e],o.draggable,u,!1)&&(n&&("function"==typeof n?n.call(d,s,i[e],d):n.split(",").some(function(t){return P(i[e],t.trim(),u,!1)}))||(k(i[e],o.selectedClass,!0),de.push(i[e]),G({sortable:d,rootEl:c,name:"select",targetEl:i[e],originalEvent:s})))}()):ae=se,le=f)),ge&&this.isMultiDrag&&(fe=!1,(u[K].options.sort||u!==c)&&1<de.length&&(n=X(se),e=j(se,":not(."+this.options.selectedClass+")"),!pe&&o.animation&&(se.thisAnimationDuration=null),f.captureAnimationState(),pe||(o.animation&&(se.fromRect=n,de.forEach(function(t){var e;t.thisAnimationDuration=null,t!==se&&(e=fe?X(t):n,t.fromRect=e,f.addAnimationState({target:t,rect:e}))})),ve(),de.forEach(function(t){i[e]?u.insertBefore(t,i[e]):u.appendChild(t),e++}),p===j(se)&&(l=!1,de.forEach(function(t){t.sortableIndex!==j(t)&&(l=!0)}),l&&(h("update"),h("sort")))),de.forEach(function(t){x(t)}),f.animateAll()),le=f),(c===u||t&&"clone"!==t.lastPutMode)&&he.forEach(function(t){t.parentNode&&t.parentNode.removeChild(t)}))},nullingGlobal:function(){this.isMultiDrag=ge=!1,he.length=0},destroyGlobal:function(){this._deselectMultiDrag(),p(document,"pointerup",this._deselectMultiDrag),p(document,"mouseup",this._deselectMultiDrag),p(document,"touchend",this._deselectMultiDrag),p(document,"keydown",this._checkKeyDown),p(document,"keyup",this._checkKeyUp)},_deselectMultiDrag:function(t){if(!(void 0!==ge&&ge||le!==this.sortable||t&&P(t.target,this.options.draggable,this.sortable.el,!1)||t&&0!==t.button))for(;de.length;){var e=de[0];k(e,this.options.selectedClass,!1),de.shift(),G({sortable:this.sortable,rootEl:this.sortable.el,name:"deselect",targetEl:e,originalEvent:t})}},_checkKeyDown:function(t){t.key===this.options.multiDragKey&&(this.multiDragKeyDown=!0)},_checkKeyUp:function(t){t.key===this.options.multiDragKey&&(this.multiDragKeyDown=!1)}},a(t,{pluginName:"multiDrag",utils:{select:function(t){var e=t.parentNode[K];e&&e.options.multiDrag&&!~de.indexOf(t)&&(le&&le!==e&&(le.multiDrag._deselectMultiDrag(),le=e),k(t,e.options.selectedClass,!0),de.push(t))},deselect:function(t){var e=t.parentNode[K],n=de.indexOf(t);e&&e.options.multiDrag&&~n&&(k(t,e.options.selectedClass,!1),de.splice(n,1))}},eventProperties:function(){var n=this,o=[],i=[];return de.forEach(function(t){var e;o.push({multiDragElement:t,index:t.sortableIndex}),e=fe&&t!==se?-1:fe?j(t,":not(."+n.options.selectedClass+")"):j(t),i.push({multiDragElement:t,index:e})}),{items:r(de),clones:[].concat(he),oldIndicies:o,newIndicies:i}},optionListeners:{multiDragKey:function(t){return"ctrl"===(t=t.toLowerCase())?t="Control":1<t.length&&(t=t.charAt(0).toUpperCase()+t.substr(1)),t}}})}),jt});
\ No newline at end of file
diff --git a/luci-app-passwall2/luasrc/controller/passwall2.lua b/luci-app-passwall2/luasrc/controller/passwall2.lua
index 991bc92bc..1c7e92e17 100644
--- a/luci-app-passwall2/luasrc/controller/passwall2.lua
+++ b/luci-app-passwall2/luasrc/controller/passwall2.lua
@@ -80,6 +80,7 @@ function index()
 	entry({"admin", "services", appname, "clear_all_nodes"}, call("clear_all_nodes")).leaf = true
 	entry({"admin", "services", appname, "delete_select_nodes"}, call("delete_select_nodes")).leaf = true
 	entry({"admin", "services", appname, "get_node"}, call("get_node")).leaf = true
+	entry({"admin", "services", appname, "save_node_order"}, call("save_node_order")).leaf = true
 	entry({"admin", "services", appname, "update_rules"}, call("update_rules")).leaf = true
 	entry({"admin", "services", appname, "subscribe_del_node"}, call("subscribe_del_node")).leaf = true
 	entry({"admin", "services", appname, "subscribe_del_all"}, call("subscribe_del_all")).leaf = true
@@ -504,7 +505,7 @@ function get_node()
 	local result = {}
 	local show_node_info = api.uci_get_type("global_other", "show_node_info", "0")
 
-	function add_is_ipv6_key(o)
+	local function add_is_ipv6_key(o)
 		if o and o.address and show_node_info == "1" then
 			local f = api.get_ipv6_full(o.address)
 			if f ~= "" then
@@ -518,14 +519,35 @@ function get_node()
 		result = uci:get_all(appname, id)
 		add_is_ipv6_key(result)
 	else
+		local default_nodes = {}
+		local other_nodes = {}
 		uci:foreach(appname, "nodes", function(t)
 			add_is_ipv6_key(t)
-			result[#result + 1] = t
+			if not t.group or t.group == "" then
+				default_nodes[#default_nodes + 1] = t
+			else
+				other_nodes[#other_nodes + 1] = t
+			end
 		end)
+		for i = 1, #default_nodes do result[#result + 1] = default_nodes[i] end
+		for i = 1, #other_nodes do result[#result + 1] = other_nodes[i] end
 	end
 	http_write_json(result)
 end
 
+function save_node_order()
+	local ids = http.formvalue("ids") or ""
+	local new_order = {}
+	for id in ids:gmatch("([^,]+)") do
+		new_order[#new_order + 1] = id
+	end
+	for idx, name in ipairs(new_order) do
+		luci.sys.call(string.format("uci -q reorder %s.%s=%d", appname, name, idx - 1))
+	end
+	api.sh_uci_commit(appname)
+	http_write_json({ status = "ok" })
+end
+
 function update_rules()
 	local update = http.formvalue("update")
 	luci.sys.call("lua /usr/share/passwall2/rule_update.lua log '" .. update .. "' > /dev/null 2>&1 &")
@@ -631,7 +653,7 @@ function restore_backup()
 		fp:close()
 		if chunk_index + 1 == total_chunks then
 			api.sys.call("echo '' > /tmp/log/passwall2.log")
-			api.log(string.format(" * PassWall2 %s", i18n.translate("Configuration file uploaded successfully…")))
+			api.log(0, string.format(" * PassWall2 %s", i18n.translate("Configuration file uploaded successfully…")))
 			local temp_dir = '/tmp/passwall2_bak'
 			api.sys.call("mkdir -p " .. temp_dir)
 			if api.sys.call("tar -xzf " .. file_path .. " -C " .. temp_dir) == 0 then
@@ -641,13 +663,13 @@ function restore_backup()
 						api.sys.call("cp -f " .. temp_file .. " " .. backup_file)
 					end
 				end
-				api.log(string.format(" * PassWall2 %s", i18n.translate("Configuration restored successfully…")))
-				api.log(string.format(" * PassWall2 %s", i18n.translate("Service restarting…")))
+				api.log(0, string.format(" * PassWall2 %s", i18n.translate("Configuration restored successfully…")))
+				api.log(0, string.format(" * PassWall2 %s", i18n.translate("Service restarting…")))
 				luci.sys.call('/etc/init.d/passwall2 restart > /dev/null 2>&1 &')
 				luci.sys.call('/etc/init.d/passwall2_server restart > /dev/null 2>&1 &')
 				result = { status = "success", message = "Upload completed", path = file_path }
 			else
-				api.log(string.format(" * PassWall2 %s", i18n.translate("Configuration file decompression failed, please try again!")))
+				api.log(0, string.format(" * PassWall2 %s", i18n.translate("Configuration file decompression failed, please try again!")))
 				result = { status = "error", message = "Decompression failed" }
 			end
 			api.sys.call("rm -rf " .. temp_dir)
diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/node_subscribe.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/node_subscribe.lua
index cd7cc8118..327b488cf 100644
--- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/node_subscribe.lua
+++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/node_subscribe.lua
@@ -209,7 +209,7 @@ o.cfgvalue = function(t, n)
 	str = str ~= "" and "<br>" .. str or ""
 	local num = 0
 	m.uci:foreach(appname, "nodes", function(s)
-		if s["group"] ~= "" and s["group"] == remark then
+		if s["group"] and s["group"]:lower() == remark:lower() then
 			num = num + 1
 		end
 	end)
diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ray.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ray.lua
index fbd6aabdf..231965e29 100644
--- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ray.lua
+++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/type/ray.lua
@@ -390,6 +390,9 @@ o = s:option(Flag, _n("tls_allowInsecure"), translate("allowInsecure"), translat
 o.default = "0"
 o:depends({ [_n("tls")] = true, [_n("reality")] = false })
 
+o = s:option(Value, _n("tls_chain_fingerprint"), translate("TLS Chain Fingerprint (SHA256)"), translate("Once set, connects only when the server’s chain fingerprint matches."))
+o:depends({ [_n("tls")] = true, [_n("reality")] = false })
+
 o = s:option(Flag, _n("ech"), translate("ECH"))
 o.default = "0"
 o:depends({ [_n("tls")] = true, [_n("flow")] = "", [_n("reality")] = false })
@@ -616,8 +619,14 @@ o = s:option(TextValue, _n("xhttp_extra"), " ", translate("An XHttpObject in JSO
 o:depends({ [_n("use_xhttp_extra")] = true })
 o.rows = 15
 o.wrap = "off"
+o.custom_cfgvalue = function(self, section, value)
+	local raw = m:get(section, "xhttp_extra")
+	if raw then
+		return api.base64Decode(raw)
+	end
+end
 o.custom_write = function(self, section, value)
-	m:set(section, self.option:sub(1 + #option_prefix), value)
+	m:set(section, "xhttp_extra", api.base64Encode(value))
 	local success, data = pcall(jsonc.parse, value)
 	if success and data then
 		local address = (data.extra and data.extra.downloadSettings and data.extra.downloadSettings.address)
@@ -640,7 +649,7 @@ o.validate = function(self, value)
 	return value
 end
 o.custom_remove = function(self, section, value)
-	m:del(section, self.option:sub(1 + #option_prefix))
+	m:del(section, "xhttp_extra")
 	m:del(section, "download_address")
 end
 
diff --git a/luci-app-passwall2/luasrc/passwall2/api.lua b/luci-app-passwall2/luasrc/passwall2/api.lua
index d17f59145..b56192610 100644
--- a/luci-app-passwall2/luasrc/passwall2/api.lua
+++ b/luci-app-passwall2/luasrc/passwall2/api.lua
@@ -31,8 +31,8 @@ if lang == "auto" then
 end
 i18n.setlanguage(lang)
 
-function log(...)
-	local result = os.date("%Y-%m-%d %H:%M:%S: ") .. table.concat({...}, " ")
+function echolog(...)
+	local result = table.concat({...}, " ")
 	local f, err = io.open(LOG_FILE, "a")
 	if f and err == nil then
 		f:write(result .. "\n")
@@ -40,6 +40,23 @@ function log(...)
 	end
 end
 
+function echolog_date(...)
+	local result = os.date("%Y-%m-%d %H:%M:%S: ") .. table.concat({...}, " ")
+	echolog(result)
+end
+
+function log(level, ...)
+	local indent = ""
+	if level >= 1 then
+		for i = 1, level, 1 do
+			indent = indent .. "  "
+		end
+		echolog_date(indent .. "- " .. table.concat({...}, " "))
+	else
+		echolog_date(table.concat({...}, " "))
+	end
+end
+
 function is_old_uci()
 	return sys.call("grep -E 'require[ \t]*\"uci\"' /usr/lib/lua/luci/model/uci.lua >/dev/null 2>&1") == 0
 end
@@ -118,19 +135,15 @@ function exec_call(cmd)
 end
 
 function base64Decode(text)
-	local raw = text
 	if not text then return '' end
-	text = text:gsub("%z", "")
-	text = text:gsub("%c", "")
-	text = text:gsub("_", "/")
-	text = text:gsub("-", "+")
-	local mod4 = #text % 4
-	text = text .. string.sub('====', mod4 + 1)
-	local result = nixio.bin.b64decode(text)
+	local encoded = text:gsub("%z", ""):gsub("%c", ""):gsub("_", "/"):gsub("-", "+")
+	local mod4 = #encoded % 4
+	encoded = encoded .. string.sub('====', mod4 + 1)
+	local result = nixio.bin.b64decode(encoded)
 	if result then
 		return result:gsub("%z", "")
 	else
-		return raw
+		return text
 	end
 end
 
@@ -229,9 +242,13 @@ function url(...)
 	return require "luci.dispatcher".build_url(url)
 end
 
-function trim(text)
-	if not text or text == "" then return "" end
-	return text:match("^%s*(.-)%s*$")
+function trim(s)
+	local len = #s
+	local i, j = 1, len
+	while i <= len and s:byte(i) <= 32 do i = i + 1 end
+	while j >= i and s:byte(j) <= 32 do j = j - 1 end
+	if i > j then return "" end
+	return s:sub(i, j)
 end
 
 function split(full, sep)
@@ -450,6 +467,8 @@ end
 function get_valid_nodes()
 	local show_node_info = uci_get_type("global_other", "show_node_info") or "0"
 	local nodes = {}
+	local default_nodes = {}
+	local other_nodes = {}
 	uci:foreach(appname, "nodes", function(e)
 		e.id = e[".name"]
 		if e.type and e.remarks then
@@ -458,7 +477,11 @@ function get_valid_nodes()
 				if type == "sing-box" then type = "Sing-Box" end
 				e["remark"] = "%s：[%s] " % {type .. " " .. i18n.translatef(e.protocol), e.remarks}
 				e["node_type"] = "special"
-				nodes[#nodes + 1] = e
+				if not e.group or e.group == "" then
+					default_nodes[#default_nodes + 1] = e
+				else
+					other_nodes[#other_nodes + 1] = e
+				end
 			end
 			local port = e.port or e.hysteria_hop or e.hysteria2_hop
 			if port and e.address then
@@ -498,11 +521,17 @@ function get_valid_nodes()
 						e["remark"] = "%s：[%s] %s:%s" % {type, e.remarks, address, port}
 					end
 					e.node_type = "normal"
-					nodes[#nodes + 1] = e
+					if not e.group or e.group == "" then
+						default_nodes[#default_nodes + 1] = e
+					else
+						other_nodes[#other_nodes + 1] = e
+					end
 				end
 			end
 		end
 	end)
+	for i = 1, #default_nodes do nodes[#nodes + 1] = default_nodes[i] end
+	for i = 1, #other_nodes do nodes[#nodes + 1] = other_nodes[i] end
 	return nodes
 end
 
diff --git a/luci-app-passwall2/luasrc/passwall2/util_xray.lua b/luci-app-passwall2/luasrc/passwall2/util_xray.lua
index 503a8dbc8..02cf298a3 100644
--- a/luci-app-passwall2/luasrc/passwall2/util_xray.lua
+++ b/luci-app-passwall2/luasrc/passwall2/util_xray.lua
@@ -151,6 +151,7 @@ function gen_outbound(flag, node, tag, proxy_table)
 					serverName = node.tls_serverName,
 					allowInsecure = (node.tls_allowInsecure == "1") and true or false,
 					fingerprint = (node.type == "Xray" and node.utls == "1" and node.fingerprint and node.fingerprint ~= "") and node.fingerprint or nil,
+					pinnedPeerCertificateChainSha256 = node.tls_chain_fingerprint and { node.tls_chain_fingerprint } or nil,
 					echConfigList = (node.ech == "1") and node.ech_config or nil,
 					echForceQuery = (node.ech == "1") and (node.ech_ForceQuery or "none") or nil
 				} or nil,
@@ -218,7 +219,7 @@ function gen_outbound(flag, node, tag, proxy_table)
 					host = node.xhttp_host,
 					-- If the code contains an "extra" section, retrieve the contents of "extra"; otherwise, assign the value directly to "extra".
 					extra = node.xhttp_extra and (function()
-							local success, parsed = pcall(jsonc.parse, node.xhttp_extra)
+							local success, parsed = pcall(jsonc.parse, api.base64Decode(node.xhttp_extra))
 							if success then
 								return parsed.extra or parsed
 							else
diff --git a/luci-app-passwall2/luasrc/view/passwall2/log/log.htm b/luci-app-passwall2/luasrc/view/passwall2/log/log.htm
index 0df1e39ce..4e6714ed7 100644
--- a/luci-app-passwall2/luasrc/view/passwall2/log/log.htm
+++ b/luci-app-passwall2/luasrc/view/passwall2/log/log.htm
@@ -3,13 +3,19 @@ local api = require "luci.passwall2.api"
 -%>
 <script type="text/javascript">
 	//<![CDATA[
+	var log_textarea = null;
+	var first_load_done = false;
+
+	function scrollToBottom() {
+		log_textarea.scrollTop = log_textarea.scrollHeight;
+	}
+
 	function clearlog(btn) {
 		XHR.get('<%=api.url("clear_log")%>', null,
 			function(x, data) {
-				if(x && x.status == 200) {
-					var log_textarea = document.getElementById('log_textarea');
+				if(x && x.status == 200 && log_textarea) {
 					log_textarea.innerHTML = "";
-					log_textarea.scrollTop = log_textarea.scrollHeight;
+					scrollToBottom();
 				}
 			}
 		);
@@ -17,8 +23,16 @@ local api = require "luci.passwall2.api"
 	XHR.poll(5, '<%=api.url("get_log")%>', null,
 		function(x, data) {
 			if(x && x.status == 200) {
-				var log_textarea = document.getElementById('log_textarea');
+				if (!log_textarea) log_textarea = document.getElementById('log_textarea');
+				var wasBottom = (log_textarea.scrollTop + log_textarea.clientHeight >= log_textarea.scrollHeight - 10);
 				log_textarea.innerHTML = x.responseText;
+				if (!first_load_done) {
+					scrollToBottom();
+					first_load_done = true;
+				}
+				else if (wasBottom) {
+					scrollToBottom();
+				}
 			}
 		}
 	);
diff --git a/luci-app-passwall2/luasrc/view/passwall2/node_list/link_add_node.htm b/luci-app-passwall2/luasrc/view/passwall2/node_list/link_add_node.htm
index 39d039803..2a3e7b23f 100644
--- a/luci-app-passwall2/luasrc/view/passwall2/node_list/link_add_node.htm
+++ b/luci-app-passwall2/luasrc/view/passwall2/node_list/link_add_node.htm
@@ -52,7 +52,7 @@ local api = require "luci.passwall2.api"
 	function add_node() {
 		var nodes_link = document.getElementById("nodes_link").value;
 		var group = (document.querySelector('#addlink_group_custom input[type="hidden"]')?.value || "default");
-		nodes_link = nodes_link.replace(/\t/g, "").replace(/\r\n|\r/g, "\n").trim();
+		nodes_link = nodes_link.replace(/\t/g, "").replace(/\r\n|\r/g, "\n").replace(/<[^>]*>/g, '').trim();
 		if (nodes_link != "") {
 			var s = nodes_link.split('://');
 			if (s.length > 1) {
diff --git a/luci-app-passwall2/luasrc/view/passwall2/node_list/node_list.htm b/luci-app-passwall2/luasrc/view/passwall2/node_list/node_list.htm
index 331452ce6..f140ee674 100644
--- a/luci-app-passwall2/luasrc/view/passwall2/node_list/node_list.htm
+++ b/luci-app-passwall2/luasrc/view/passwall2/node_list/node_list.htm
@@ -18,6 +18,7 @@ if node then
 	end
 end
 -%>
+<script src="<%=resource%>/view/<%=api.appname%>/Sortable.min.js"></script>
 
 <style>
 table th, .table .th {
@@ -55,9 +56,9 @@ table td, .table .td {
 }
 
 @media (prefers-color-scheme: dark) {
-    ._now_use_bg {
-        background: #4a90e2 !important;
-    }
+	._now_use_bg {
+		background: #4a90e2 !important;
+	}
 }
 
 .td.cbi-section-actions {
@@ -70,20 +71,112 @@ table td, .table .td {
 	gap: 4px;
 }
 
-.node-wrapper .cbi-input-checkbox {
-	flex-grow: 0 !important;
-	flex-basis: auto;
-}
-
 .cbi-tabmenu > li {
-    margin-right: 2px !important;
+	margin-right: 2px !important;
 }
 
 .cbi-tabmenu > li:last-child {
-    margin-right: 0 !important;
+	margin-right: 0 !important;
 }
 
+.node-wrapper .drag-handle {
+	cursor: grab !important;
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 20px;
+	font-weight: 100;
+	padding: 0 !important;
+	line-height: inherit;
+	user-select: none;
+	color: #00000070;
+	align-self: stretch;
+}
 
+#cbi-passwall2-nodes .pw-checkbox, #cbi-passwall2-nodes th:nth-child(1) {
+	padding-right: 0px;
+}
+
+#select_all_btn {
+	display: none;
+}
+
+/* enable flex for small screens*/
+@media screen and (max-width: 1152px) {
+	.cbi-section-table-row {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+		justify-content: space-between;
+	}
+
+	#cbi-passwall2-nodes-default-fieldset {
+		margin: 0;
+	}
+
+	.cbi-section-table-titles {
+		display: none !important;
+	}
+
+	/* meticulously control how each component occupies the limited space we have */
+	#cbi-passwall2-nodes .pw-checkbox, #cbi-passwall2-nodes th:nth-child(1) {
+		flex: 0 0 40px;
+		min-width: 0;
+	}
+
+	#cbi-passwall2-nodes .pw-remark {
+		flex: 1 1 30%;
+		min-width: 0;
+	}
+
+	#cbi-passwall2-nodes .pw-ping, #cbi-passwall2-nodes .pw-tcping, #cbi-passwall2-nodes .pw-urltest {
+		flex: 0 0 50px;
+		white-space: nowrap;
+		min-width: 0;
+	}
+
+	.pw-actions {
+		padding-top: 0 !important;
+		border-top-width: 0 !important;
+		flex: 1 1 350px;
+	}
+
+	#select_all_btn {
+		display: inline-block !important;
+	}
+}
+
+/* shrink actionbar even further for mobile devices */
+@media screen and (max-width: 500px) {
+	.node-wrapper {
+		gap: 0;
+	}
+
+	.cbi-button {
+		margin-left: 0 !important;
+		margin-right: 1px !important;
+	}
+
+	.pw-actions {
+		padding-left: 5px!important;
+		padding-right: 5px !important;
+	}
+}
+
+.sortable-chosen {
+	background-color: rgba(220, 235, 245, 0.4) !important;
+	opacity: 0.7;
+}
+
+.sortable-ghost {
+	background: #cce5ff !important;
+	height: 3px !important;
+}
+
+.dragging-row {
+	background-color: rgba(131, 191, 255, 0.7) !important;
+	box-shadow: 0 4px 6px rgba(0,0,0,0.1);
+}
 </style>
 
 <% if api.is_js_luci() then -%>
@@ -102,11 +195,7 @@ table td, .table .td {
 	function cbi_t_switch(section, tab) {
 		if( cbi_t[section] && cbi_t[section][tab] ) {
 			// Before switching tabs, first deselect all currently active tabs.
-			var btn = document.getElementById("select_all_btn");
-			if (btn) {
-				dechecked_all_node(btn);
-			}
-
+			dechecked_all_node();
 			var o = cbi_t[section][tab];
 			var h = document.getElementById('tab.' + section);
 			for( var tid in cbi_t[section] ) {
@@ -131,10 +220,7 @@ table td, .table .td {
 		if (typeof(cbi_t_switch) === "function") {
 			var old_switch = cbi_t_switch;
 			cbi_t_switch = function(section, tab) {
-				var btn = document.getElementById("select_all_btn");
-				if (btn) {
-					dechecked_all_node(btn);
-				}
+				dechecked_all_node();
 				return old_switch(section, tab);
 			};
 		}
@@ -225,47 +311,70 @@ table td, .table .td {
 		document.getElementById("set_node_div").style.display="none";
 		document.getElementById("set_node_name").innerHTML = "";
 	}
-	
-	function _cbi_row_top(id) {
-		//It has been damaged and awaits repair or other solutions.
-		var dom = document.getElementById("cbi-passwall2-" + id);
-		if (dom) {
-			var trs = document.getElementById("cbi-passwall2-nodes").getElementsByClassName("cbi-section-table-row");
-			if (trs && trs.length > 0) {
-				for (var i = 0; i < trs.length; i++) {
-					var up = dom.getElementsByClassName("cbi-button-up");
-					if (up) {
-						cbi_row_swap(up[0], true, 'cbi.sts.passwall2.nodes');
-					}
-				}
-			}
+
+	function row_top(btn) {
+		const row = btn.closest("tr");
+		if (!row) return;
+		const parent = row.parentNode;
+		let firstDataRow = parent.querySelector("tr:not(.cbi-section-table-titles)");
+		if (firstDataRow && firstDataRow !== row) {
+			parent.insertBefore(row, firstDataRow);
 		}
 	}
-	
+
+	function set_select_all_state(sectionChecked) {
+		var visibleContainer = document.querySelector('#cbi-passwall2-nodes > .cbi-tabcontainer[style*="display:block"], #cbi-passwall2-nodes > .cbi-tabcontainer[style*="display: block"]');
+		if (!visibleContainer) return;
+		var nodes = visibleContainer.getElementsByClassName("nodes_select");
+		var selectAllChk = visibleContainer.querySelector(".nodes_select_all");
+		var selectAllBtn = document.getElementById("select_all_btn");
+		for (var i = 0; i < nodes.length; i++) {
+			nodes[i].checked = sectionChecked;
+		}
+		if (selectAllChk) {
+			selectAllChk.checked = sectionChecked;
+			selectAllChk.title = sectionChecked ? "<%:DeSelect all%>" : "<%:Select all%>";
+			selectAllChk.setAttribute("onclick", sectionChecked ? "dechecked_all_node(this)" : "checked_all_node(this)");
+		}
+		if (selectAllBtn) {
+			selectAllBtn.value = sectionChecked ? "<%:DeSelect all%>" : "<%:Select all%>";
+			selectAllBtn.setAttribute("onclick", sectionChecked ? "dechecked_all_node(this)" : "checked_all_node(this)");
+		}
+	}
+
 	function checked_all_node(btn) {
-		var visibleContainer = document.querySelector('#cbi-passwall2-nodes > .cbi-tabcontainer[style*="display:block"], #cbi-passwall2-nodes > .cbi-tabcontainer[style*="display: block"]');
-		if (!visibleContainer) return;
-		var doms = visibleContainer.getElementsByClassName("nodes_select");
-		if (doms && doms.length > 0) {
-			for (var i = 0 ; i < doms.length; i++) {
-				doms[i].checked = true;
-			}
-			btn.value = "<%:DeSelect all%>";
-			btn.setAttribute("onclick", "dechecked_all_node(this)");
-		}
+		set_select_all_state(true);
 	}
-	
+
 	function dechecked_all_node(btn) {
+		set_select_all_state(false);
+	}
+
+	function update_select_state() {
 		var visibleContainer = document.querySelector('#cbi-passwall2-nodes > .cbi-tabcontainer[style*="display:block"], #cbi-passwall2-nodes > .cbi-tabcontainer[style*="display: block"]');
 		if (!visibleContainer) return;
-		var doms = visibleContainer.getElementsByClassName("nodes_select");
-		if (doms && doms.length > 0) {
-			for (var i = 0 ; i < doms.length; i++) {
-				doms[i].checked = false;
-			}
-			btn.value = "<%:Select all%>";
-			btn.setAttribute("onclick", "checked_all_node(this)");
+		var nodes = visibleContainer.getElementsByClassName("nodes_select");
+		if (!nodes.length) return;
+		var selectAllChk = visibleContainer.querySelector(".nodes_select_all");
+		var selectAllBtn = document.getElementById("select_all_btn");
+		var checkedCount = 0;
+		for (var i = 0; i < nodes.length; i++) {
+			if (nodes[i].checked) checkedCount++;
 		}
+		var allChecked = checkedCount === nodes.length;
+		var title = allChecked ? "<%:DeSelect all%>" : "<%:Select all%>";
+		var onclickFunc = allChecked ? "dechecked_all_node(this)" : "checked_all_node(this)";
+
+		function updateElement(el) {
+			if (!el) return;
+			if ("checked" in el) el.checked = allChecked;
+			if ("title" in el) el.title = title;
+			if ("value" in el) el.value = title;
+			el.setAttribute("onclick", onclickFunc);
+		}
+
+		updateElement(selectAllChk);
+		updateElement(selectAllBtn);
 	}
 	
 	function delete_select_nodes() {
@@ -321,6 +430,66 @@ table td, .table .td {
 		return { address: address, port: port };
 	}
 	
+	function get_node_order(group) {
+		let table = document.getElementById("cbi-passwall2-nodes-" + group + "-table");
+		if (!table) {
+			return;
+		}
+		let rows = table.querySelectorAll("tr.cbi-section-table-row");
+		if (!rows || rows.length === 0) {
+			return;
+		}
+		var ids = [];
+		rows.forEach(function(row) {
+			var id = row.id.replace("cbi-passwall2-", "");
+			ids.push(id);
+		});
+		return ids;
+	}
+
+	function save_current_page_order(group) {
+		var table = document.getElementById("cbi-passwall2-nodes-" + group + "-table");
+		if (!table) {
+			alert("<%:No table!%>");
+			return;
+		}
+		var rows = table.querySelectorAll("tr.cbi-section-table-row");
+		if (!rows || rows.length === 0) {
+			alert("<%:No nodes!%>");
+			return;
+		}
+		var btn = document.getElementById("save_order_btn_" + group);
+		if (btn) {
+			btn.style.display = "none";
+			btn.disabled = true;
+		}
+		var ids = [];
+		rows.forEach(function(row) {
+			var id = row.id.replace("cbi-passwall2-", "");
+			ids.push(id);
+		});
+		XHR.get('<%=api.url("save_node_order")%>', {
+				group: group,
+				ids: ids.join(",")
+			},
+			function(x, result) {
+				if (btn) {
+					btn.style.display = null;
+					btn.disabled = false;
+				}
+				if (x && x.status === 200) {
+					origin_group_node_order[group] = get_node_order(group);
+					alert("<%:Saved current page order successfully.%>");
+					if (btn) {
+						btn.style.display = "none";
+					}
+				} else {
+					alert("<%:Save failed!%>");
+				}
+			}
+		);
+	}
+
 	function get_now_use_node() {
 		XHR.get('<%=api.url("get_now_use_node")%>', null,
 			function(x, result) {
@@ -505,6 +674,79 @@ table td, .table .td {
 			}
 		}
 	}
+
+	function arraysEqual(a, b) {
+		if (a === b) return true;
+		if (a == null || b == null) return false;
+		if (a.length !== b.length) return false;
+		for (let i = 0; i < a.length; i++) {
+			if (a[i] !== b[i]) return false;
+		}
+		return true;
+	}
+
+	// List drag and rearrange
+	function initSortableForTable(table) {
+		if (!table) return null;
+		let group = table.id.replace("cbi-passwall2-nodes-", "").replace("-table", "")
+		var root = table.querySelector('tbody') || table;
+		if (root._sortable_initialized) return root._sortable_instance;
+		root._sortable_initialized = true;
+		var opts = {
+			handle: ".drag-handle",
+			draggable: "tr.cbi-section-table-row",
+			animation: 150,
+			ghostClass: "dragging-row",
+			fallbackOnBody: true,
+			forceFallback: false,
+			swapThreshold: 0.65,
+			onEnd: function (evt) {
+				//save_current_page_order(group); // Auto save
+				let save_order_btn = document.getElementById("save_order_btn_" + group);
+				if (save_order_btn) {
+					const new_order = get_node_order(group);
+					if (!arraysEqual(new_order, origin_group_node_order[group])) {
+						save_order_btn.style.display = null;
+					} else {
+						save_order_btn.style.display = "none";
+					}
+				}
+			}
+		};
+		try {
+			var instance = Sortable.create(root, opts);
+			root._sortable_instance = instance;
+			return instance;
+		} catch (err) {
+			root._sortable_initialized = false;
+			console.error("Sortable init failed:", err);
+			return null;
+		}
+	}
+
+	function initAllSortable(group_nodes) {
+		if (typeof Sortable === 'undefined') {
+			var retries = 0;
+			var maxRetries = 25;
+			var t = setInterval(function () {
+				retries++;
+				if (typeof Sortable !== 'undefined') {
+					clearInterval(t);
+					for (var group in group_nodes) {
+						var table = document.getElementById("cbi-passwall2-nodes-" + group + "-table");
+						initSortableForTable(table);
+					}
+				} else if (retries >= maxRetries) {
+					clearInterval(t);
+				}
+			}, 200);
+		} else {
+			for (var group in group_nodes) {
+				var table = document.getElementById("cbi-passwall2-nodes-" + group + "-table");
+				initSortableForTable(table);
+			}
+		}
+	}
 </script>
 
 
@@ -512,6 +754,9 @@ table td, .table .td {
 	<fieldset class="cbi-section cbi-tblsection" id="cbi-passwall2-nodes-{{group}}-fieldset">
 		<table class="table cbi-section-table" id="cbi-passwall2-nodes-{{group}}-table" style="">
 			<tr class="tr cbi-section-table-titles anonymous">
+				<th class="th cbi-section-table-cell" style="width:20px">
+					<input class="cbi-input-checkbox nodes_select_all" type="checkbox" onclick="checked_all_node(this)" title="<%:Select all%>"/>
+				</th>
 				<th class="th cbi-section-table-cell" style="width:40%"><%:Remarks%></th>
 				<th class="th cbi-section-table-cell" style="width:8%">Ping</th>
 				<th class="th cbi-section-table-cell" style="width:8%">TCPing</th>
@@ -522,6 +767,7 @@ table td, .table .td {
 		</table>
 		<div class="cbi-section-create cbi-tblsection-create">
 			<input class="cbi-button cbi-button-add" type="button" value="<%:Add%>" onclick="to_add_node()">
+			<input class="cbi-button cbi-button-apply" style="display: none" type="button" id="save_order_btn_{{group}}" value="<%:Save Order%>" onclick="save_current_page_order('{{group}}')">
 		</div>
 	</fieldset>
 </script>
@@ -531,19 +777,21 @@ table td, .table .td {
 		<input class="hidden" id="cbid.passwall2.{{id}}.remarks" value="{{remarks_val}}"/>
 		<input class="hidden" id="cbid.passwall2.{{id}}.address" value="{{address_val}}"/>
 		<input class="hidden" id="cbid.passwall2.{{id}}.port" value="{{port_val}}"/>
-		<td class="td cbi-value-field">{{remarks}}</td>
-		<td class="td cbi-value-field">{{ping}}</td>
-		<td class="td cbi-value-field">{{tcping}}</td>
-		<td class="td cbi-value-field">{{url_test}}</td>
-		<td class="td cbi-section-table-cell nowrap cbi-section-actions">
+		<td class="td cbi-value-field pw-checkbox">
+			<input class="cbi-input-checkbox nodes_select" type="checkbox" cbid="{{id}}" onclick="update_select_state()"/>
+		</td>
+		<td class="td cbi-value-field pw-remark">{{remarks}}</td>
+		<td class="td cbi-value-field pw-ping">{{ping}}</td>
+		<td class="td cbi-value-field pw-tcping">{{tcping}}</td>
+		<td class="td cbi-value-field pw-urltest">{{url_test}}</td>
+		<td class="td cbi-section-table-cell nowrap cbi-section-actions pw-actions">
 			<div class="node-wrapper">
-				<!--It has been damaged and awaits repair or other solutions.-->
-				<!--<input class="btn cbi-button" type="button" value="<%:To Top%>" onclick="_cbi_row_top('{{id}}')"/>-->
-				<input class="cbi-input-checkbox nodes_select" type="checkbox" cbid="{{id}}" />
+				<input class="btn cbi-button cbi-button-edit" type="button" value="<%:To Top%>" onclick="row_top(this)" title="<%:To Top%>"/>
 				<input class="btn cbi-button cbi-button-apply" type="button" value="<%:Use%>" id="apply_{{id}}" onclick="open_set_node_div('{{id}}')"/>
 				<input class="btn cbi-button cbi-button-add" type="button" value="<%:Copy%>" onclick="copy_node('{{id}}')"/>
 				<input class="btn cbi-button cbi-button-edit" type="button" value="<%:Edit%>" onclick="location.href='<%=api.url("node_config")%>/{{id}}'" alt="<%:Edit%>" title="<%:Edit%>">
 				<input class="btn cbi-button cbi-button-remove" type="button" value="<%:Delete%>" onclick="del_node('{{id}}')" alt="<%:Delete%>" title="<%:Delete%>">
+				<span class="drag-handle center" title="<%:Drag to reorder%>">⠿</span>
 			</div>
 		</td>
 	</tr>
@@ -705,6 +953,13 @@ table td, .table .td {
 				cbi_t_switch("passwall2.nodes", default_group)
 			}
 			
+			origin_group_node_order = {};
+			for (let group in group_nodes) {
+				origin_group_node_order[group] = get_node_order(group);
+			}
+
+			initAllSortable(group_nodes);
+
 			//clear expire data
 			if (localStorage && localStorage.length > 0) {
 				const now = Date.now();
diff --git a/luci-app-passwall2/luasrc/view/passwall2/server/log.htm b/luci-app-passwall2/luasrc/view/passwall2/server/log.htm
index 4bb5c2dad..28d9dd259 100644
--- a/luci-app-passwall2/luasrc/view/passwall2/server/log.htm
+++ b/luci-app-passwall2/luasrc/view/passwall2/server/log.htm
@@ -3,13 +3,19 @@ local api = require "luci.passwall2.api"
 -%>
 <script type="text/javascript">
 	//<![CDATA[
+	var log_textarea = null;
+	var first_load_done = false;
+
+	function scrollToBottom() {
+		log_textarea.scrollTop = log_textarea.scrollHeight;
+	}
+
 	function clear_log(btn) {
 		XHR.get('<%=api.url("server_clear_log")%>', null,
 			function(x, data) {
-				if(x && x.status == 200) {
-					var log_textarea = document.getElementById('log_textarea');
+				if(x && x.status == 200 && log_textarea) {
 					log_textarea.innerHTML = "";
-					log_textarea.scrollTop = log_textarea.scrollHeight;
+					scrollToBottom();
 				}
 			}
 		);
@@ -17,9 +23,16 @@ local api = require "luci.passwall2.api"
 	XHR.poll(3, '<%=api.url("server_get_log")%>', null,
 		function(x, data) {
 			if(x && x.status == 200) {
-				var log_textarea = document.getElementById('log_textarea');
+				if (!log_textarea) log_textarea = document.getElementById('log_textarea');
+				var wasBottom = (log_textarea.scrollTop + log_textarea.clientHeight >= log_textarea.scrollHeight - 10);
 				log_textarea.innerHTML = x.responseText;
-				log_textarea.scrollTop = log_textarea.scrollHeight;
+				if (!first_load_done) {
+					scrollToBottom();
+					first_load_done = true;
+				}
+				else if (wasBottom) {
+					scrollToBottom();
+				}
 			}
 		}
 	);
diff --git a/luci-app-passwall2/po/zh-cn/passwall2.po b/luci-app-passwall2/po/zh-cn/passwall2.po
index b0ebdaeb6..dc2cab83f 100644
--- a/luci-app-passwall2/po/zh-cn/passwall2.po
+++ b/luci-app-passwall2/po/zh-cn/passwall2.po
@@ -325,6 +325,15 @@ msgstr "节点备注"
 msgid "Add Mode"
 msgstr "添加方式"
 
+msgid "Save Order"
+msgstr "保存当前顺序"
+
+msgid "Saved current page order successfully."
+msgstr "保存当前页面顺序成功。"
+
+msgid "Drag to reorder"
+msgstr "拖动以重排"
+
 msgid "Type"
 msgstr "类型"
 
@@ -1573,6 +1582,12 @@ msgstr "协议参数。 如果启用会随机浪费流量。"
 msgid "Protocol parameter. Enable length block encryption."
 msgstr "协议参数。启用长度块加密。"
 
+msgid "TLS Chain Fingerprint (SHA256)"
+msgstr "TLS 证书链指纹（SHA256）"
+
+msgid "Once set, connects only when the server’s chain fingerprint matches."
+msgstr "设置后，仅在服务器证书链指纹匹配时连接。"
+
 msgid "ECH Config"
 msgstr "ECH 配置"
 
@@ -2180,7 +2195,7 @@ msgid "%s type node subscriptions are not currently supported, skip this node."
 msgstr "暂时不支持 %s 类型的节点订阅，跳过此节点。"
 
 msgid "Update [%s]"
-msgstr "'更新【%s】"
+msgstr "更新【%s】"
 
 msgid "Matching node:"
 msgstr "匹配节点："
@@ -2203,6 +2218,9 @@ msgstr "第五匹配节点："
 msgid "Unable to find the best matching node, now replaced with:"
 msgstr "无法找到最匹配的节点，当前已更换为："
 
+msgid "Unable to find a new node. Please confirm and process manually."
+msgstr "无法匹配到新节点，请手动确认处理。"
+
 msgid "No node information updates are available."
 msgstr "没有可用的节点信息更新。"
 
diff --git a/luci-app-passwall2/po/zh-tw/passwall2.po b/luci-app-passwall2/po/zh-tw/passwall2.po
index 7553d50cc..cc87892e2 100644
--- a/luci-app-passwall2/po/zh-tw/passwall2.po
+++ b/luci-app-passwall2/po/zh-tw/passwall2.po
@@ -1,4 +1,4 @@
-msgid "Auto"
+msgid "Auto"
 msgstr "自動"
 
 msgid "RUNNING"
@@ -11,28 +11,28 @@ msgid "Working..."
 msgstr "連接正常"
 
 msgid "Problem detected!"
-msgstr "連接失败"
+msgstr "連接失敗"
 
 msgid "Touch Check"
-msgstr "点我检測"
+msgstr "點我檢測"
 
 msgid "Kernel Unsupported"
-msgstr "内核不支持"
+msgstr "內核不支持"
 
 msgid "Basic Settings"
 msgstr "基本設置"
 
 msgid "Node List"
-msgstr "节点列表"
+msgstr "節點列表"
 
 msgid "Other Settings"
 msgstr "高級設置"
 
 msgid "Load Balancing"
-msgstr "负载均衡"
+msgstr "負載均衡"
 
 msgid "Enter interface"
-msgstr "进入界面"
+msgstr "進入界面"
 
 msgid "Rule Manage"
 msgstr "規則管理"
@@ -41,16 +41,16 @@ msgid "Rule List"
 msgstr "規則列表"
 
 msgid "Access control"
-msgstr "访问控制"
+msgstr "訪問控制"
 
 msgid "Watch Logs"
-msgstr "查看日志"
+msgstr "查看日誌"
 
 msgid "Node Config"
-msgstr "节点配置"
+msgstr "節點配置"
 
 msgid "Running Status"
-msgstr "運行状態"
+msgstr "運行狀態"
 
 msgid "Baidu Connection"
 msgstr "百度連接"
@@ -65,10 +65,10 @@ msgid "Instagram Connection"
 msgstr "Instagram連接"
 
 msgid "Node Check"
-msgstr "节点检測"
+msgstr "節點檢測"
 
 msgid "Check..."
-msgstr "检測中..."
+msgstr "檢測中..."
 
 msgid "Clear"
 msgstr "清除"
@@ -77,10 +77,10 @@ msgid "Main switch"
 msgstr "主開關"
 
 msgid "Node"
-msgstr "节点"
+msgstr "節點"
 
 msgid "Edit Current Node"
-msgstr "编辑當前节点"
+msgstr "編輯當前節點"
 
 msgid "Localhost Proxy"
 msgstr "路由器本機代理"
@@ -92,31 +92,31 @@ msgid "Client Proxy"
 msgstr "客戶端代理"
 
 msgid "When selected, devices in LAN can transparent proxy. Otherwise, it will not be proxy. But you can still use access control to allow the designated device to proxy."
-msgstr "當勾選時，局域網内的設備可以透明代理。否則，将不代理。但您仍然可以使用访问控制允许指定的設備代理。"
+msgstr "當勾選時，局域網內的設備可以透明代理。否則，將不代理。但您仍然可以使用訪問控制允許指定的設備代理。"
 
 msgid "Socks Config"
 msgstr "Socks 配置"
 
 msgid "Socks Node"
-msgstr "Socks 节点"
+msgstr "Socks 節點"
 
 msgid "Current Node"
-msgstr "當前节点"
+msgstr "當前節點"
 
 msgid "Listen Port"
-msgstr "监听端口"
+msgstr "監聽端口"
 
 msgid "0 is not use"
-msgstr "0为不使用"
+msgstr "0為不使用"
 
 msgid "Current node: %s"
-msgstr "當前节点：%s"
+msgstr "當前節點：%s"
 
 msgid "IP:Port mode acceptable, multi value split with english comma."
-msgstr "接受 IP:Port 形式的输入，多个以英文逗号分隔。"
+msgstr "接受 IP:Port 形式的輸入，多個以英文逗号分隔。"
 
 msgid "Direct DNS Protocol"
-msgstr "直連 DNS 协议"
+msgstr "直連 DNS 協議"
 
 msgid "Direct DNS"
 msgstr "直連 DNS"
@@ -128,55 +128,55 @@ msgid "Direct DNS EDNS Client Subnet"
 msgstr "直連 DNS EDNS Client Subnet"
 
 msgid "Remote DNS Protocol"
-msgstr "远程 DNS 协议"
+msgstr "遠程 DNS 協議"
 
 msgid "Remote DNS"
-msgstr "远程 DNS"
+msgstr "遠程 DNS"
 
 msgid "Remote DNS DoH"
-msgstr "远程 DNS DoH"
+msgstr "遠程 DNS DoH"
 
 msgid "Remote DNS EDNS Client Subnet"
-msgstr "远程 DNS EDNS Client Subnet"
+msgstr "遠程 DNS EDNS Client Subnet"
 
 msgid "Notify the DNS server when the DNS query is notified, the location of the client (cannot be a private IP address)."
-msgstr "用于 DNS 查询時通知 DNS 服務器，客戶端所在的地理位置（不能是私有 IP 地址）。"
+msgstr "用於 DNS 查詢時通知 DNS 服務器，客戶端所在的地理位置（不能是私有 IP 地址）。"
 
 msgid "This feature requires the DNS server to support the Edns Client Subnet (RFC7871)."
 msgstr "此功能需要 DNS 服務器支持 EDNS Client Subnet（RFC7871）。"
 
 msgid "Remote DNS Outbound"
-msgstr "远程 DNS 出站"
+msgstr "遠程 DNS 出站"
 
 msgid "Remote"
-msgstr "远程"
+msgstr "遠程"
 
 msgid "Direct"
 msgstr "直連"
 
 msgid "Direct Query Strategy"
-msgstr "直連查询策略"
+msgstr "直連查詢策略"
 
 msgid "Remote Query Strategy"
-msgstr "远程查询策略"
+msgstr "遠程查詢策略"
 
 msgid "Use FakeDNS work in the domain that proxy."
 msgstr "需要代理的域名使用 FakeDNS。"
 
 msgid "Domain Override"
-msgstr "域名重写"
+msgstr "域名重寫"
 
 msgid "Direct DNS result write to IPSet"
-msgstr "直連 DNS 解析结果写入到 IPSet"
+msgstr "直連 DNS 解析結果寫入到 IPSet"
 
 msgid "Perform the matching direct domain name rules into IP to IPSet/NFTSet, and then connect directly (not entering the core). Maybe conflict with some special circumstances."
-msgstr "将匹配到的直連規則的域名解析IP写入到 IPSet/NFTSet，然後直連（不进入内核）。可能和某些特殊情况冲突。"
+msgstr "將匹配到的直連規則的域名解析IP寫入到 IPSet/NFTSet，然後直連（不進入內核）。可能和某些特殊情況衝突。"
 
 msgid "DNS Redirect"
 msgstr "DNS 重定向"
 
 msgid "Force special DNS server to need proxy devices."
-msgstr "强制需要代理的設備使用专用 DNS 服務器。"
+msgstr "強制需要代理的設備使用專用 DNS 服務器。"
 
 msgid "Clear IPSET"
 msgstr "清空 IPSET"
@@ -185,67 +185,67 @@ msgid "Clear NFTSET"
 msgstr "清空 NFTSET"
 
 msgid "Try this feature if the rule modification does not take effect."
-msgstr "如果修改規則後没有生效，请尝試此功能。"
+msgstr "如果修改規則後沒有生效，請嘗試此功能。"
 
 msgid "About DNS issues:"
-msgstr "關于DNS问题："
+msgstr "關於DNS問題："
 
 msgid "Some browsers may have built-in DNS, be sure to close. Example: Chrome. Settings - Security and Privacy - Security - Use secure DNS disabled."
-msgstr "部分浏覽器可能有内置的DNS，请務必關闭。如：chrome。 設置 - 安全和隐私設置 - 使用安全 DNS 關闭。"
+msgstr "部分瀏覽器可能有內置的DNS，請務必關閉。如：chrome。 設置 - 安全和隱私設置 - 使用安全 DNS 關閉。"
 
 msgid "Sometimes after restart, you can not internet. At this time, close all browsers (important), Windows Client, please `ipconfig /flushdns`. Please close the WiFi on the phone, cut the flight mode and then cut back."
-msgstr "有時候重啟後，上不了。这時请先關闭所有浏覽器（重要），Windows客戶端请`ipconfig /flushdns`。手機端请關闭WIFI，切一下飞行模式再切回来。"
+msgstr "有時候重啟後，上不了。這時請先關閉所有瀏覽器（重要），Windows客戶端請`ipconfig /flushdns`。手機端請關閉WIFI，切一下飛行模式再切回來。"
 
 msgid "The client DNS and the default gateway must point to this router."
-msgstr "客戶端DNS和默認網關必须指向本路由器。"
+msgstr "客戶端DNS和默認網關必須指向本路由器。"
 
 msgid "If you have a wrong DNS process, the consequences are at your own risk!"
-msgstr "如果你自行配置了错误的DNS流程，後果自负！"
+msgstr "如果你自行配置了錯誤的DNS流程，後果自负！"
 
 msgid "Hide menu method, input example in the address bar:"
-msgstr "隐藏菜单方法，地址栏输入例："
+msgstr "隱藏菜單方法，地址栏輸入例："
 
 msgid "After the hidden to the display, input example in the address bar:"
-msgstr "當你隐藏後想再次顯示，地址栏输入例："
+msgstr "當你隱藏後想再次顯示，地址栏輸入例："
 
 msgid "Are you sure to hide?"
-msgstr "你确定要隐藏吗？"
+msgstr "你確定要隱藏吗？"
 
 msgid "DNS related issues:"
-msgstr "DNS相關问题："
+msgstr "DNS相關問題："
 
 msgid "Certain browsers such as Chrome have built-in DNS service, which may affect DNS resolution settings. You can go to 'Settings -> Privacy and security -> Use secure DNS' menu to turn it off."
-msgstr "某些浏覽器如Chrome等内置此功能,这会影响設置的DNS解析。您可以进入 '設置->私隐和安全->使用安全DNS' 菜单,将其關闭。"
+msgstr "某些瀏覽器如Chrome等內置此功能,這会影響設置的DNS解析。您可以進入 '設置->私隱和安全->使用安全DNS' 菜單,將其關閉。"
 
 msgid "If you are unable to access the internet after reboot, please try clearing the cache of your terminal devices (make sure to close all open browser application windows first, this step is especially important):"
-msgstr "如果在重啟後无法上網,请尝試清除终端設備的缓存（先關闭所有正在使用的浏覽器應用程序，这一步尤其重要）："
+msgstr "如果在重啟後無法上網,請嘗試清除终端設備的缓存（先關閉所有正在使用的瀏覽器應用程序，這一步尤其重要）："
 
 msgid "For Windows systems, open Command Prompt and run the command 'ipconfig /flushdns'."
-msgstr "对于Windows系统,请在命令提示符中運行命令 'ipconfig /flushdns'."
+msgstr "對於Windows系統,請在命令提示符中運行命令 'ipconfig /flushdns'."
 
 msgid "For Mac systems, open Terminal and run the command 'sudo killall -HUP mDNSResponder'."
-msgstr "对于Mac系统，在终端中運行命令 'sudo killall -HUP mDNSResponder'."
+msgstr "對於Mac系統，在终端中運行命令 'sudo killall -HUP mDNSResponder'."
 
 msgid "For mobile devices, you can clear it by reconnecting to the network, such as toggling Airplane Mode and reconnecting to WiFi."
-msgstr "对于移動設備,可通过重新接入網絡的方式清除。比如開關一次飞行模式,重新連接WiFi。"
+msgstr "對於移動設備,可通過重新接入網絡的方式清除。比如開關一次飛行模式,重新連接WiFi。"
 
 msgid "Please make sure your device's network settings point both the DNS server and default gateway to this router, to ensure DNS queries are properly routed."
-msgstr "请确認您設備的網絡設置,客戶端DNS服務器和默認網關應均指向本路由器,以确保DNS查询正确路由。"
+msgstr "請確認您設備的網絡設置,客戶端DNS服務器和默認網關應均指向本路由器,以確保DNS查詢正確路由。"
 
 msgid "Browser access:"
-msgstr "浏覽器访问："
+msgstr "瀏覽器訪問："
 
 msgid "Hide in main menu:"
-msgstr "在主菜单中隐藏："
+msgstr "在主菜單中隱藏："
 
 msgid "Show in main menu:"
-msgstr "在主菜单中顯示："
+msgstr "在主菜單中顯示："
 
 msgid "DNS Export Of Multi WAN"
-msgstr "国内DNS指定解析出口"
+msgstr "国內DNS指定解析出口"
 
 msgid "Node Export Of Multi WAN"
-msgstr "节点指定出口"
+msgstr "節點指定出口"
 
 msgid "Only support Multi Wan."
 msgstr "只有多線接入才有效。"
@@ -257,34 +257,34 @@ msgid "custom"
 msgstr "自定义"
 
 msgid "If not available, try clearing the cache."
-msgstr "如果无法使用，请尝試清除缓存。"
+msgstr "如果無法使用，請嘗試清除缓存。"
 
 msgid "Operation"
 msgstr "操作"
 
 msgid "Add Node"
-msgstr "添加节点"
+msgstr "添加節點"
 
 msgid "Add the node via the link"
-msgstr "通过链接添加节点"
+msgstr "通過鏈接添加節點"
 
 msgid "Enter share links, one per line. Subscription links are not supported!"
-msgstr "输入分享链接，支持多个节点，每行一个。请勿输入订阅链接！"
+msgstr "輸入分享鏈接，支持多個節點，每行一個。請勿輸入訂閱鏈接！"
 
 msgid "Please enter the correct link."
-msgstr "请输入正确的链接。"
+msgstr "請輸入正確的鏈接。"
 
 msgid "Clear all nodes"
-msgstr "清空所有节点"
+msgstr "清空所有節點"
 
 msgid "Are you sure to clear all nodes?"
-msgstr "你确定要清空所有节点吗？"
+msgstr "你確定要清空所有節點吗？"
 
 msgid "Error"
-msgstr "错误"
+msgstr "錯誤"
 
 msgid "Delete select nodes"
-msgstr "删除選择的节点"
+msgstr "刪除選择的節點"
 
 msgid "To Top"
 msgstr "置顶"
@@ -302,58 +302,67 @@ msgid "DeSelect all"
 msgstr "全不選"
 
 msgid "Are you sure to delete select nodes?"
-msgstr "你确定要删除選择的节点吗？"
+msgstr "你確定要刪除選择的節點吗？"
 
 msgid "You no select nodes !"
-msgstr "你没有選择任何节点！"
+msgstr "你沒有選择任何節點！"
 
 msgid "Are you sure set to"
-msgstr "你确定要設为"
+msgstr "你確定要設為"
 
 msgid "the server?"
 msgstr "服務器吗？"
 
 msgid "You choose node is:"
-msgstr "你選择的节点是："
+msgstr "你選择的節點是："
 
 msgid "Timeout"
 msgstr "超時"
 
 msgid "Node Remarks"
-msgstr "节点備注"
+msgstr "節點備注"
 
 msgid "Add Mode"
 msgstr "添加方式"
 
+msgid "Save Order"
+msgstr "儲存當前順序"
+
+msgid "Saved current page order successfully."
+msgstr "儲存目前頁面順序成功。"
+
+msgid "Drag to reorder"
+msgstr "拖曳以重排"
+
 msgid "Type"
-msgstr "类型"
+msgstr "類型"
 
 msgid "_balancing"
-msgstr "负载均衡"
+msgstr "負載均衡"
 
 msgid "_shunt"
 msgstr "分流"
 
 msgid "Balancing"
-msgstr "负载均衡"
+msgstr "負載均衡"
 
 msgid "Balancing Strategy"
-msgstr "负载均衡策略"
+msgstr "負載均衡策略"
 
 msgid "Fallback Node"
-msgstr "後備节点"
+msgstr "後備節點"
 
 msgid "Use Custom Probe URL"
 msgstr "使用自定义探測網址"
 
 msgid "By default the built-in probe URL will be used, enable this option to use a custom probe URL."
-msgstr "默認使用内置的探測網址，啟用此選項以使用自定义探測網址。"
+msgstr "默認使用內置的探測網址，啟用此選項以使用自定义探測網址。"
 
 msgid "Probe URL"
 msgstr "探測網址"
 
 msgid "The URL used to detect the connection status."
-msgstr "用于检測連接状態的網址。"
+msgstr "用於檢測連接状態的網址。"
 
 msgid "Probe Interval"
 msgstr "探測間隔"
@@ -362,16 +371,16 @@ msgid "The interval between initiating probes."
 msgstr "發起探測的間隔。"
 
 msgid "The time format is numbers + units, such as '10s', '2h45m', and the supported time units are <code>s</code>, <code>m</code>, <code>h</code>, which correspond to seconds, minutes, and hours, respectively."
-msgstr "時間格式为數字+单位，比如<code>&quot;10s&quot;</code>, <code>&quot;2h45m&quot;</code>，支持的時間单位有 <code>s</code>，<code>m</code>，<code>h</code>，分别对應秒、分、時。"
+msgstr "時間格式為數字+單位，比如<code>&quot;10s&quot;</code>, <code>&quot;2h45m&quot;</code>，支持的時間單位有 <code>s</code>，<code>m</code>，<code>h</code>，分别對應秒、分、時。"
 
 msgid "When the unit is not filled in, it defaults to seconds."
-msgstr "未填写单位時，默認为秒。"
+msgstr "未填寫單位時，默認為秒。"
 
 msgid "Preferred Node Count"
-msgstr "優選节点數量"
+msgstr "優選節點數量"
 
 msgid "The load balancer selects the optimal number of nodes, and traffic is randomly distributed among them."
-msgstr "负载均衡器選出最優节点的个數，流量将在这几个节点中随機分配。"
+msgstr "負載均衡器選出最優節點的個數，流量將在這几個節點中随機分配。"
 
 msgid "Shunt"
 msgstr "分流"
@@ -380,10 +389,10 @@ msgid "Preproxy"
 msgstr "前置代理"
 
 msgid "Preproxy Node"
-msgstr "前置代理节点"
+msgstr "前置代理節點"
 
 msgid "Set the node to be used as a pre-proxy. Each rule (including <code>Default</code>) has a separate switch that controls whether this rule uses the pre-proxy or not."
-msgstr "設置用作前置代理的节点。每条規則（包括<code>默認</code>）都有独立開關控制本規則是否使用前置代理。"
+msgstr "設置用作前置代理的節點。每条規則（包括<code>默認</code>）都有独立開關控制本規則是否使用前置代理。"
 
 msgid "Direct Connection"
 msgstr "直連"
@@ -395,13 +404,13 @@ msgid "Default Preproxy"
 msgstr "默認前置代理"
 
 msgid "There are no available nodes, please add or subscribe nodes first."
-msgstr "没有可用节点，请先添加或订阅节点。"
+msgstr "沒有可用節點，請先添加或訂閱節點。"
 
 msgid "No shunt rules? Click me to go to add."
-msgstr "没有分流規則？点我前往去添加。"
+msgstr "沒有分流規則？點我前往去添加。"
 
 msgid "When using, localhost will connect this node first and then use this node to connect the default node."
-msgstr "當使用時，本機将首先連接到此节点，然後再使用此节点連接到默認节点落地。"
+msgstr "當使用時，本機將首先連接到此節點，然後再使用此節點連接到默認節點落地。"
 
 msgid "Domain Strategy"
 msgstr "域名解析策略"
@@ -413,16 +422,16 @@ msgid "'AsIs': Only use domain for routing. Default value."
 msgstr "AsIs：只使用域名进行路由選择。默認值。"
 
 msgid "'IPIfNonMatch': When no rule matches current domain, resolves it into IP addresses (A or AAAA records) and try all rules again."
-msgstr "IPIfNonMatch：當域名没有匹配任何規則時，将域名解析成 IP（A 記錄或 AAAA 記錄）再次进行匹配。"
+msgstr "IPIfNonMatch：當域名沒有匹配任何規則時，將域名解析成 IP（A 記錄或 AAAA 記錄）再次进行匹配。"
 
 msgid "'IPOnDemand': As long as there is a IP-based rule, resolves the domain into IP immediately."
-msgstr "IPOnDemand：當匹配時碰到任何基于 IP 的規則，将域名立即解析为 IP 进行匹配。"
+msgstr "IPOnDemand：當匹配時碰到任何基於 IP 的規則，將域名立即解析為 IP 进行匹配。"
 
 msgid "Load balancing node list"
-msgstr "负载均衡节点列表"
+msgstr "負載均衡節點列表"
 
 msgid "Load balancing node list, <a target='_blank' href='https://xtls.github.io/config/routing.html#balancerobject'>document</a>"
-msgstr "负载均衡节点列表，<a target='_blank' href='https://xtls.github.io/config/routing.html#balancerobject'>文档原理</a>"
+msgstr "負載均衡節點列表，<a target='_blank' href='https://xtls.github.io/config/routing.html#balancerobject'>文檔原理</a>"
 
 msgid "From Share URL"
 msgstr "導入分享URL"
@@ -440,25 +449,25 @@ msgid "Import Finished"
 msgstr "導入完成："
 
 msgid "Not a supported scheme:"
-msgstr "不支持这种样式的："
+msgstr "不支持這种樣式的："
 
 msgid "Invalid Share URL Format"
-msgstr "无效的分享URL信息"
+msgstr "無效的分享URL信息"
 
 msgid "Paste Share URL Here"
 msgstr "在此处粘贴分享信息"
 
 msgid "Share URL to clipboard unable."
-msgstr "无法分享URL到剪贴板。"
+msgstr "無法分享URL到剪贴板。"
 
 msgid "Share URL to clipboard successfully."
 msgstr "成功復制分享URL到剪贴板。"
 
 msgid "Faltal on get option, please help in debug:"
-msgstr "代码错误，请协助捉虫："
+msgstr "代码錯誤，請協助捉蟲："
 
 msgid "Faltal on set option, please help in debug:"
-msgstr "代码错误，请协助捉虫："
+msgstr "代码錯誤，請協助捉蟲："
 
 msgid "Address"
 msgstr "地址"
@@ -467,37 +476,37 @@ msgid "Address (Support Domain Name)"
 msgstr "地址（支持域名）"
 
 msgid "Trojan Verify Cert"
-msgstr "验证证书"
+msgstr "驗證證書"
 
 msgid "Trojan Cert Path"
-msgstr "证书路径"
+msgstr "證書路径"
 
 msgid "Finger Print"
-msgstr "指纹伪造"
+msgstr "指紋伪造"
 
 msgid "Avoid using randomized, unless you have to."
-msgstr "避免使用 randomized , 除非你必须要。"
+msgstr "避免使用 randomized , 除非你必須要。"
 
 msgid "Original"
 msgstr "原版"
 
 msgid "Transport Plugin"
-msgstr "传输层插件"
+msgstr "傳輸層插件"
 
 msgid "Shadowsocks secondary encryption"
 msgstr "Shadowsocks 二次加密"
 
 msgid "Obfs Type"
-msgstr "混淆类型"
+msgstr "混淆類型"
 
 msgid "Obfs Password"
-msgstr "混淆密码"
+msgstr "混淆密碼"
 
 msgid "Auth Type"
-msgstr "認证类型"
+msgstr "認證類型"
 
 msgid "Auth Password"
-msgstr "認证密码"
+msgstr "認證密碼"
 
 msgid "Commands the client to use the BBR flow control algorithm"
 msgstr "命令客戶端使用 BBR 流量控制算法"
@@ -506,7 +515,7 @@ msgid "PinSHA256"
 msgstr "PinSHA256"
 
 msgid "Certificate fingerprint"
-msgstr "证书指纹"
+msgstr "證書指紋"
 
 msgid "Max upload Mbps"
 msgstr "最大上行(Mbps)"
@@ -521,13 +530,13 @@ msgid "QUIC connection receive window"
 msgstr "QUIC 連接接收窗口"
 
 msgid "QUIC concurrent bidirectional streams"
-msgstr "QUIC 并發双向流的最大數量"
+msgstr "QUIC 並發双向流的最大數量"
 
 msgid "Disable MTU detection"
-msgstr "禁用 MTU 检測"
+msgstr "禁用 MTU 檢測"
 
 msgid "ignoreClientBandwidth"
-msgstr "忽略客戶端带宽設置"
+msgstr "忽略客戶端帶宽設置"
 
 msgid "Lazy Start"
 msgstr "延迟啟動"
@@ -536,13 +545,13 @@ msgid "Encrypt Method"
 msgstr "加密方式"
 
 msgid "Encrypt Key"
-msgstr "加密密钥"
+msgstr "加密密鑰"
 
 msgid "Latency"
 msgstr "延迟"
 
 msgid "Automatic detection delay"
-msgstr "自動检測延迟"
+msgstr "自動檢測延迟"
 
 msgid "Show server address and port"
 msgstr "顯示服務器地址和端口"
@@ -554,7 +563,7 @@ msgid "Test"
 msgstr "測試"
 
 msgid "Node num"
-msgstr "节点數量"
+msgstr "節點數量"
 
 msgid "Self add"
 msgstr "自添"
@@ -572,25 +581,25 @@ msgid "Delay Settings"
 msgstr "定時配置"
 
 msgid "Open and close Daemon"
-msgstr "啟動守护进程"
+msgstr "啟動守護進程"
 
 msgid "Delay Start"
 msgstr "開機時延時啟動"
 
 msgid "Units:seconds"
-msgstr "单位：秒"
+msgstr "單位：秒"
 
 msgid "Units:minutes"
-msgstr "单位：分钟"
+msgstr "單位：分鐘"
 
 msgid "stop automatically mode"
-msgstr "定時關闭模式"
+msgstr "定時關閉模式"
 
 msgid "stop Time(Every day)"
-msgstr "關闭時間(每天)"
+msgstr "關閉時間(每天)"
 
 msgid "stop Interval(Hour)"
-msgstr "關闭間隔(小時)"
+msgstr "關閉間隔(小時)"
 
 msgid "start automatically mode"
 msgstr "定時開啟模式"
@@ -620,13 +629,13 @@ msgid "UDP No Redir Ports"
 msgstr "UDP不转發端口"
 
 msgid "Fill in the ports you don't want to be forwarded by the agent, with the highest priority."
-msgstr "填写你不希望被代理转發的端口，優先級最高。"
+msgstr "填寫你不希望被代理转發的端口，優先級最高。"
 
 msgid "If you don't want to let the device in the list to go proxy, please choose all."
-msgstr "如果您不想让列表中的設備走代理，请選择全部。"
+msgstr "如果您不想让列表中的設備走代理，請選择全部。"
 
 msgid "The port settings support single ports and ranges.<br>Separate multiple ports with commas (,).<br>Example: 21,80,443,1000:2000."
-msgstr "以上端口設置支持单端口和端口范围。<br>多个端口用英文逗号(,)隔開。<br>例：21,80,443,1000:2000。"
+msgstr "以上端口設置支持單端口和端口範圍。<br>多個端口用英文逗号(,)隔開。<br>例：21,80,443,1000:2000。"
 
 msgid "TCP Proxy Drop Ports"
 msgstr "TCP转發屏蔽端口"
@@ -662,7 +671,7 @@ msgid "Default"
 msgstr "默認"
 
 msgid "Close"
-msgstr "關闭"
+msgstr "關閉"
 
 msgid "Hijacking ICMP (PING)"
 msgstr "劫持ICMP (PING)"
@@ -677,13 +686,13 @@ msgid "TCP Proxy Way"
 msgstr "TCP代理方式"
 
 msgid "Auto Switch"
-msgstr "自動切换"
+msgstr "自動切換"
 
 msgid "When there is no server, an automatic reconnect scheme is used"
-msgstr "當没有服務器時，則使用自動重連方案"
+msgstr "當沒有服務器時，則使用自動重連方案"
 
 msgid "How often to test"
-msgstr "多久检測一次"
+msgstr "多久檢測一次"
 
 msgid "Timeout seconds"
 msgstr "超時秒數"
@@ -692,88 +701,88 @@ msgid "Timeout retry num"
 msgstr "超時重試次數"
 
 msgid "Automatic switching cannot be used when this option is checked"
-msgstr "當勾選此選項時，不能使用自動切换"
+msgstr "當勾選此選項時，不能使用自動切換"
 
 msgid "Main node"
-msgstr "主节点"
+msgstr "主節點"
 
 msgid "List of backup nodes"
-msgstr "備用节点的列表"
+msgstr "備用節點的列表"
 
 msgid "Restore Switch"
-msgstr "恢復切换"
+msgstr "恢復切換"
 
 msgid "When detects main node is available, switch back to the main node."
-msgstr "當检測到主节点可用時，切换回主节点。"
+msgstr "當檢測到主節點可用時，切換回主節點。"
 
 msgid "If the main node is shunt"
-msgstr "如果主节点是分流"
+msgstr "如果主節點是分流"
 
 msgid "Switch it"
 msgstr "切掉它"
 
 msgid "Applying to the default node"
-msgstr "應用于默認节点"
+msgstr "應用於默認節點"
 
 msgid "Applying to the default preproxy node"
-msgstr "應用于默認前置节点"
+msgstr "應用於默認前置節點"
 
 msgid "Add nodes to the standby node list by keywords"
-msgstr "通过關键字添加节点到備用节点列表"
+msgstr "通過關键字添加節點到備用節點列表"
 
 msgid "Delete nodes in the standby node list by keywords"
-msgstr "通过關键字删除備用节点列表的节点"
+msgstr "通過關键字刪除備用節點列表的節點"
 
 msgid "Please enter the node keyword, pay attention to distinguish between spaces, uppercase and lowercase."
-msgstr "请输入节点關键字，注意区分空格、大写和小写。"
+msgstr "請輸入節點關键字，注意区分空格、大寫和小寫。"
 
 msgid "Enable Load Balancing"
-msgstr "開啟负载均衡"
+msgstr "開啟負載均衡"
 
 msgid "Console Login Auth"
-msgstr "控制臺登錄認证"
+msgstr "控制臺登錄認證"
 
 msgid "Console Username"
 msgstr "控制臺账号"
 
 msgid "Console Password"
-msgstr "控制臺密码"
+msgstr "控制臺密碼"
 
 msgid "Console Port"
 msgstr "控制臺端口"
 
 msgid "In the browser input routing IP plus port access, such as:192.168.1.1:1188"
-msgstr "在浏覽器输入路由IP加端口访问，如：192.168.1.1:1188"
+msgstr "在瀏覽器輸入路由IP加端口訪問，如：192.168.1.1:1188"
 
 msgid "Haproxy Port"
-msgstr "负载均衡端口"
+msgstr "負載均衡端口"
 
 msgid "Health Check Type"
-msgstr "健康检查类型"
+msgstr "健康檢查類型"
 
 msgid "Inner implement"
-msgstr "内置實现"
+msgstr "內置實现"
 
 msgid "Health Check Inter"
-msgstr "健康检查节点間隔時間"
+msgstr "健康檢查節點間隔時間"
 
 msgid "When the URL test is used, the load balancing node will be converted into a Socks node. when node list set customizing, must be a Socks node, otherwise the health check will be invalid."
-msgstr "當使用URL測試時，负载均衡节点将转换成Socks节点。下面的节点列表自定义時必须为Socks节点，否則健康检查将无效。"
+msgstr "當使用URL測試時，負載均衡節點將转換成Socks節點。下面的節點列表自定义時必須為Socks節點，否則健康檢查將無效。"
 
 msgid "Add a node, Export Of Multi WAN Only support Multi Wan. Load specific gravity range 1-256. Multiple primary servers can be load balanced, standby will only be enabled when the primary server is offline! Multiple groups can be set, Haproxy port same one for each group."
-msgstr "添加节点，指定出口功能是为多WAN用戶准備的。负载比重范围1-256。多个主服務器可以负载均衡，備用只有在主服務器离線時才会啟用！可以設置多个组，负载均衡端口相同則为一组。"
+msgstr "添加節點，指定出口功能是為多WAN用戶准備的。負載比重範圍1-256。多個主服務器可以負載均衡，備用只有在主服務器离線時才会啟用！可以設置多個组，負載均衡端口相同則為一组。"
 
 msgid "Note that the node configuration parameters for load balancing must be consistent when use TCP health check type, otherwise it cannot be used normally!"
-msgstr "注意，當使用TCP健康检查時负载均衡的节点配置参數必须一致，否則无法正常使用！"
+msgstr "注意，當使用TCP健康檢查時負載均衡的節點配置參數必須一致，否則無法正常使用！"
 
 msgid "Node Address"
-msgstr "节点地址"
+msgstr "節點地址"
 
 msgid "Node Port"
-msgstr "节点端口"
+msgstr "節點端口"
 
 msgid "Node Weight"
-msgstr "负载比重"
+msgstr "負載比重"
 
 msgid "Export Of Multi WAN"
 msgstr "多WAN指定出口"
@@ -791,13 +800,13 @@ msgid "Standby"
 msgstr "備用"
 
 msgid "Check update"
-msgstr "检查更新"
+msgstr "檢查更新"
 
 msgid "Force update"
-msgstr "强制更新"
+msgstr "強制更新"
 
 msgid "The latest version: %s, currently does not support automatic update, if you need to update, please compile or download the ipk and then manually install."
-msgstr "最新版本：%s，目前暂不支持自動更新，如需更新，请自行编译或下载ipk然後手動安装。"
+msgstr "最新版本：%s，目前暫不支持自動更新，如需更新，請自行编译或下載ipk然後手動安装。"
 
 msgid "Enable custom URL"
 msgstr "啟用自定义規則地址"
@@ -857,22 +866,22 @@ msgid "Location of V2ray/Xray asset"
 msgstr "V2ray/Xray 资源文件目錄"
 
 msgid "This variable specifies a directory where geoip.dat and geosite.dat files are."
-msgstr "此变量指定geoip.dat和geosite.dat文件所在的目錄。"
+msgstr "此變量指定geoip.dat和geosite.dat文件所在的目錄。"
 
 msgid "Enable Geo Data Parsing"
 msgstr "開啟 Geo 數据解析"
 
 msgid "Analyzes and preloads GeoIP/Geosite data to enhance the shunt performance of Sing-box/Xray."
-msgstr "分析和预加载 GeoIP/Geosite 數据，以增强 Sing-box/Xray 的分流效果。"
+msgstr "分析和预加载 GeoIP/Geosite 數据，以增強 Sing-box/Xray 的分流效果。"
 
 msgid "Note: Increases resource usage."
-msgstr "注：会增加一些系统资源的開销。"
+msgstr "注：会增加一些系統资源的開销。"
 
 msgid "Shunt Rule"
 msgstr "分流規則"
 
 msgid "Please note attention to the priority, the higher the order, the higher the priority."
-msgstr "请注意優先級问题，排序越上面優先級越高。"
+msgstr "請注意優先級問題，排序越上面優先級越高。"
 
 msgid "Update..."
 msgstr "更新中"
@@ -884,7 +893,7 @@ msgid "Update successful"
 msgstr "更新成功"
 
 msgid "Click to update"
-msgstr "点击更新"
+msgstr "點击更新"
 
 msgid "Updating..."
 msgstr "更新中"
@@ -893,13 +902,13 @@ msgid "Retry"
 msgstr "重試"
 
 msgid "Unexpected error"
-msgstr "意外错误"
+msgstr "意外錯誤"
 
 msgid "Updating, are you sure to close?"
-msgstr "正在更新，你确認要關闭吗？"
+msgstr "正在更新，你確認要關閉吗？"
 
 msgid "Downloading..."
-msgstr "下载中"
+msgstr "下載中"
 
 msgid "Unpacking..."
 msgstr "解压中"
@@ -911,13 +920,13 @@ msgid "App Update"
 msgstr "组件更新"
 
 msgid "Please confirm that your firmware supports FPU."
-msgstr "请确認你的固件支持FPU。"
+msgstr "請確認你的固件支持FPU。"
 
 msgid "if you want to run from memory, change the path, /tmp beginning then save the application and update it manually."
-msgstr "如果你希望从内存中運行，请更改路径，/tmp 開头，然後保存應用後，再手動更新。"
+msgstr "如果你希望从內存中運行，請更改路径，/tmp 開头，然後保存應用後，再手動更新。"
 
 msgid "Make sure there is enough space to install %s"
-msgstr "确保有足够的空間安装 %s"
+msgstr "確保有足够的空間安装 %s"
 
 msgid "App Path"
 msgstr "程序路径"
@@ -929,52 +938,52 @@ msgid "%s Client App Path"
 msgstr "%s 客戶端程序路径"
 
 msgid "Node Subscribe"
-msgstr "节点订阅"
+msgstr "節點訂閱"
 
 msgid "Subscribe Remark"
-msgstr "订阅備注（機场）"
+msgstr "訂閱備注（機场）"
 
 msgid "Subscribe Info"
-msgstr "订阅信息"
+msgstr "訂閱信息"
 
 msgid "Subscribe URL"
-msgstr "订阅網址"
+msgstr "訂閱網址"
 
 msgid "Subscribe URL Access Method"
-msgstr "订阅網址访问方式"
+msgstr "訂閱網址訪問方式"
 
 msgid "When adding a new subscription, please save and apply before manually subscribing. If you only change the subscription URL, you can subscribe manually, and the system will save it automatically."
-msgstr "新增订阅请先保存并應用後再手動订阅；如仅修改订阅地址，可直接手動订阅，系统将自動保存。"
+msgstr "新增訂閱請先保存並應用後再手動訂閱；如仅修改訂閱地址，可直接手動訂閱，系統將自動保存。"
 
 msgid "Please save and apply before manually subscribing."
-msgstr "请先保存并應用後再手動订阅。"
+msgstr "請先保存並應用後再手動訂閱。"
 
 msgid "Subscribe URL cannot be empty."
-msgstr "订阅網址不能为空。"
+msgstr "訂閱網址不能為空。"
 
 msgid "Subscribe via proxy"
-msgstr "通过代理订阅"
+msgstr "通過代理訂閱"
 
 msgid "Enable auto update subscribe"
-msgstr "開啟自動更新订阅"
+msgstr "開啟自動更新訂閱"
 
 msgid "Manual subscription"
-msgstr "手動订阅"
+msgstr "手動訂閱"
 
 msgid "Delete All Subscribe Node"
-msgstr "删除所有订阅节点"
+msgstr "刪除所有訂閱節點"
 
 msgid "Delete the subscribed node"
-msgstr "删除已订阅的节点"
+msgstr "刪除已訂閱的節點"
 
 msgid "Are you sure you want to delete all subscribed nodes?"
-msgstr "您确定要删除所有已订阅的节点吗？"
+msgstr "您確定要刪除所有已訂閱的節點吗？"
 
 msgid "Manual subscription All"
-msgstr "手動订阅全部"
+msgstr "手動訂閱全部"
 
 msgid "This remark already exists, please change a new remark."
-msgstr "此備注已存在，请改一个新的備注。"
+msgstr "此備注已存在，請改一個新的備注。"
 
 msgid "Remark cannot be empty."
 msgstr "備注不能爲空。"
@@ -983,19 +992,19 @@ msgid "URL cannot be empty."
 msgstr "網址不能爲空。"
 
 msgid "Filter keyword Mode"
-msgstr "过滤關键字模式"
+msgstr "過濾關键字模式"
 
 msgid "Discard List"
-msgstr "丢弃列表"
+msgstr "丟棄列表"
 
 msgid "Keep List"
 msgstr "保留列表"
 
 msgid "Discard List,But Keep List First"
-msgstr "丢弃列表，但保留列表優先"
+msgstr "丟棄列表，但保留列表優先"
 
 msgid "Keep List,But Discard List First"
-msgstr "保留列表，但丢弃列表優先"
+msgstr "保留列表，但丟棄列表優先"
 
 msgid "Use global config"
 msgstr "使用全局配置"
@@ -1007,16 +1016,16 @@ msgid "Add"
 msgstr "添加"
 
 msgid "ACLs"
-msgstr "访问控制"
+msgstr "訪問控制"
 
 msgid "ACLs is a tools which used to designate specific IP proxy mode."
-msgstr "访问控制列表是用于指定特殊IP代理模式的工具。"
+msgstr "訪問控制列表是用於指定特殊IP代理模式的工具。"
 
 msgid "Example:"
 msgstr "例："
 
 msgid "IP range"
-msgstr "IP 范围"
+msgstr "IP 範圍"
 
 msgid "Source Interface"
 msgstr "源接口"
@@ -1043,64 +1052,64 @@ msgid "Route Hosts"
 msgstr "路由Hosts文件"
 
 msgid "Join the direct hosts list of domain names will not proxy."
-msgstr "加入的域名不走代理，对所有模式有效。且優先級最高。"
+msgstr "加入的域名不走代理，對所有模式有效。且優先級最高。"
 
 msgid "These had been joined ip addresses will not proxy. Please input the ip address or ip address segment,every line can input only one ip address. For example: 192.168.0.0/24 or 223.5.5.5."
-msgstr "加入的IP段不走代理，对所有模式有效。且優先級最高。可输入IP地址或地址段，如：192.168.0.0/24或223.5.5.5，每个地址段一行。"
+msgstr "加入的IP段不走代理，對所有模式有效。且優先級最高。可輸入IP地址或地址段，如：192.168.0.0/24或223.5.5.5，每個地址段一行。"
 
 msgid "These had been joined websites will use proxy. Please input the domain names of websites, every line can input only one website domain. For example: google.com."
-msgstr "加入的域名将走代理。输入網站域名，如：google.com，每个地址段一行。"
+msgstr "加入的域名將走代理。輸入網站域名，如：google.com，每個地址段一行。"
 
 msgid "These had been joined ip addresses will use proxy. Please input the ip address or ip address segment, every line can input only one ip address. For example: 35.24.0.0/24 or 8.8.4.4."
-msgstr "加入的IP段将走代理。可输入IP地址或地址段，如：35.24.0.0/24或8.8.4.4，每个地址段一行。"
+msgstr "加入的IP段將走代理。可輸入IP地址或地址段，如：35.24.0.0/24或8.8.4.4，每個地址段一行。"
 
 msgid "These had been joined websites will be block. Please input the domain names of websites, every line can input only one website domain. For example: twitter.com."
-msgstr "加入的域名将屏蔽。输入網站域名，如：twitter.com，每个地址段一行。"
+msgstr "加入的域名將屏蔽。輸入網站域名，如：twitter.com，每個地址段一行。"
 
 msgid "The list is the IPv4 LAN IP list, which represents the direct connection IP of the LAN. If you need the LAN IP in the proxy list, please clear it from the list. Do not modify this list by default."
-msgstr "列表中为IPv4的局域網IP列表，代表局域網直連IP。如果需要代理列表中的局域網IP，请将其在该列表中清除,并将其添加到代理列表中。默認情况下不要修改这个列表。"
+msgstr "列表中為IPv4的局域網IP列表，代表局域網直連IP。如果需要代理列表中的局域網IP，請將其在该列表中清除,並將其添加到代理列表中。默認情況下不要修改這個列表。"
 
 msgid "The list is the IPv6 LAN IP list, which represents the direct connection IP of the LAN. If you need the LAN IP in the proxy list, please clear it from the list. Do not modify this list by default."
-msgstr "列表中为IPv6的局域網IP列表，代表局域網直連IP。如果需要代理列表中的局域網IP，请将其在该列表中清除,并将其添加到代理列表中。默認情况下不要修改这个列表。"
+msgstr "列表中為IPv6的局域網IP列表，代表局域網直連IP。如果需要代理列表中的局域網IP，請將其在该列表中清除,並將其添加到代理列表中。默認情況下不要修改這個列表。"
 
 msgid "Configure routing etc/hosts file, if you don't know what you are doing, please don't change the content."
-msgstr "配置路由etc/hosts文件，如果你不知道自己在做什么，请不要改動内容。"
+msgstr "配置路由etc/hosts文件，如果你不知道自己在做什麼，請不要改動內容。"
 
 msgid "These had been joined ip addresses will be block. Please input the ip address or ip address segment, every line can input only one ip address."
-msgstr "加入的IP段将屏蔽。可输入IP地址或地址段，每个地址段一行。"
+msgstr "加入的IP段將屏蔽。可輸入IP地址或地址段，每個地址段一行。"
 
 msgid "Inbound Tag"
-msgstr "入站标签"
+msgstr "入站標签"
 
 msgid "Transparent proxy"
 msgstr "透明代理"
 
 msgid "Not valid domain name, please re-enter!"
-msgstr "不是有效域名，请重新输入！"
+msgstr "不是有效域名，請重新輸入！"
 
 msgid "Not valid IP format, please re-enter!"
-msgstr "不是有效IP格式，请重新输入！"
+msgstr "不是有效IP格式，請重新輸入！"
 
 msgid "Not valid IPv4 format, please re-enter!"
-msgstr "不是有效IPv4格式，请重新输入！"
+msgstr "不是有效IPv4格式，請重新輸入！"
 
 msgid "Not valid IPv6 format, please re-enter!"
-msgstr "不是有效IPv6格式，请重新输入！"
+msgstr "不是有效IPv6格式，請重新輸入！"
 
 msgid "Not true format, please re-enter!"
-msgstr "不是正确的格式，请重新输入！"
+msgstr "不是正確的格式，請重新輸入！"
 
 msgid "Plaintext: If this string matches any part of the targeting domain, this rule takes effet. Example: rule 'sina.com' matches targeting domain 'sina.com', 'sina.com.cn' and 'www.sina.com', but not 'sina.cn'."
-msgstr "纯字符串: 當此字符串匹配目标域名中任意部分，该規則生效。比如'sina.com'可以匹配'sina.com'、'sina.com.cn'和'www.sina.com'，但不匹配'sina.cn'。"
+msgstr "純字符串: 當此字符串匹配目標域名中任意部分，该規則生效。比如'sina.com'可以匹配'sina.com'、'sina.com.cn'和'www.sina.com'，但不匹配'sina.cn'。"
 
 msgid "Regular expression: Begining with 'regexp:', the rest is a regular expression. When the regexp matches targeting domain, this rule takes effect. Example: rule 'regexp:\\.goo.*\\.com$' matches 'www.google.com' and 'fonts.googleapis.com', but not 'google.com'."
-msgstr "正則表达式: 由'regexp:'開始，余下部分是一个正則表达式。當此正則表达式匹配目标域名時，该規則生效。例如'regexp:\\.goo.*\\.com$'匹配'www.google.com'、'fonts.googleapis.com'，但不匹配'google.com'。"
+msgstr "正則表达式: 由'regexp:'開始，余下部分是一個正則表达式。當此正則表达式匹配目標域名時，该規則生效。例如'regexp:\\.goo.*\\.com$'匹配'www.google.com'、'fonts.googleapis.com'，但不匹配'google.com'。"
 
 msgid "Subdomain (recommended): Begining with 'domain:' and the rest is a domain. When the targeting domain is exactly the value, or is a subdomain of the value, this rule takes effect. Example: rule 'domain:v2ray.com' matches 'www.v2ray.com', 'v2ray.com', but not 'xv2ray.com'."
-msgstr "子域名 (推荐): 由'domain:'開始，余下部分是一个域名。當此域名是目标域名或其子域名時，该規則生效。例如'domain:v2ray.com'匹配'www.v2ray.com'、'v2ray.com'，但不匹配'xv2ray.com'。"
+msgstr "子域名 (推荐): 由'domain:'開始，余下部分是一個域名。當此域名是目標域名或其子域名時，该規則生效。例如'domain:v2ray.com'匹配'www.v2ray.com'、'v2ray.com'，但不匹配'xv2ray.com'。"
 
 msgid "Full domain: Begining with 'full:' and the rest is a domain. When the targeting domain is exactly the value, the rule takes effect. Example: rule 'domain:v2ray.com' matches 'v2ray.com', but not 'www.v2ray.com'."
-msgstr "完整匹配: 由'full:'開始，余下部分是一个域名。當此域名完整匹配目标域名時，该規則生效。例如'full:v2ray.com'匹配'v2ray.com'但不匹配'www.v2ray.com'。"
+msgstr "完整匹配: 由'full:'開始，余下部分是一個域名。當此域名完整匹配目標域名時，该規則生效。例如'full:v2ray.com'匹配'v2ray.com'但不匹配'www.v2ray.com'。"
 
 msgid "Sing-Box rule-set: Begining with 'rule-set:remote:' or 'rule-set:local:'"
 msgstr "Sing-Box 規則集： 由 'rule-set:remote:' 或 'rule-set:local:' 開始"
@@ -1109,7 +1118,7 @@ msgid "Such as:"
 msgstr "例如："
 
 msgid "Pre-defined domain list: Begining with 'geosite:' and the rest is a name, such as geosite:google or geosite:cn."
-msgstr "预定义域名列表：由'geosite:'開头，余下部分是一个名称，如geosite:google或者geosite:cn。"
+msgstr "预定义域名列表：由'geosite:'開头，余下部分是一個名称，如geosite:google或者geosite:cn。"
 
 msgid "Annotation: Begining with #"
 msgstr "注释: 由 # 開头"
@@ -1127,16 +1136,16 @@ msgid "CIDR: such as '127.0.0.0/8'."
 msgstr "CIDR: 形如'10.0.0.0/8'."
 
 msgid "GeoIP: such as 'geoip:cn'. It begins with geoip: (lower case) and followed by two letter of country code."
-msgstr "GeoIP: 形如'geoip:cn'，必须以geoip:（小写）開头，後面跟双字符国家代码，支持几乎所有可以上網的国家。"
+msgstr "GeoIP: 形如'geoip:cn'，必須以geoip:（小寫）開头，後面跟双字符国家代码，支持几乎所有可以上網的国家。"
 
 msgid "Clear logs"
-msgstr "清空日志"
+msgstr "清空日誌"
 
 msgid "Password"
-msgstr "密码"
+msgstr "密碼"
 
 msgid "IV Check"
-msgstr "IV 检查"
+msgstr "IV 檢查"
 
 msgid "UDP over TCP"
 msgstr "TCP 封装 UDP"
@@ -1154,55 +1163,55 @@ msgid "plugin"
 msgstr "插件"
 
 msgid "Supports custom SIP003 plugins, Make sure the plugin is installed."
-msgstr "支持自定义 SIP003 插件，请确保插件已安装。"
+msgstr "支持自定义 SIP003 插件，請確保插件已安装。"
 
 msgid "opts"
 msgstr "插件選項"
 
 msgid "Protocol"
-msgstr "协议名称"
+msgstr "協議名称"
 
 msgid "Protocol_param"
-msgstr "协议参數"
+msgstr "協議參數"
 
 msgid "Obfs"
 msgstr "混淆"
 
 msgid "Obfs_param"
-msgstr "混淆参數"
+msgstr "混淆參數"
 
 msgid "Plugin Name"
 msgstr "插件名称"
 
 msgid "Plugin Arguments"
-msgstr "插件参數"
+msgstr "插件參數"
 
 msgid "Naiveproxy Protocol"
-msgstr "Naiveproxy协议"
+msgstr "Naiveproxy協議"
 
 msgid "User Level"
 msgstr "用戶等級(level)"
 
 msgid "Transport"
-msgstr "传输方式"
+msgstr "傳輸方式"
 
 msgid "Public Key"
-msgstr "公钥"
+msgstr "公鑰"
 
 msgid "Private Key"
-msgstr "私钥"
+msgstr "私鑰"
 
 msgid "Pre shared key"
-msgstr "额外的对称加密密钥"
+msgstr "额外的對称加密密鑰"
 
 msgid "Local Address"
 msgstr "本地地址"
 
 msgid "System interface"
-msgstr "系统接口"
+msgstr "系統接口"
 
 msgid "System interface name"
-msgstr "系统接口名称"
+msgstr "系統接口名称"
 
 msgid "Decimal numbers separated by \",\" or Base64-encoded strings."
 msgstr "用“,”隔開的十进制數字或 Base64 编码字符串。"
@@ -1211,19 +1220,19 @@ msgid "Camouflage Domain"
 msgstr "伪装域名"
 
 msgid "Camouflage Type"
-msgstr "伪装类型"
+msgstr "伪装類型"
 
 msgid "Transport Layer Encryption"
-msgstr "传输层加密"
+msgstr "傳輸層加密"
 
 msgid "Whether or not transport layer encryption is enabled, \"none\" for unencrypted, \"tls\" for using TLS, \"xtls\" for using XTLS."
-msgstr "是否啟入传输层加密，支持的選項有 \"none\" 表示不加密，\"tls\" 表示使用 TLS，\"xtls\" 表示使用 XTLS。"
+msgstr "是否啟入傳輸層加密，支持的選項有 \"none\" 表示不加密，\"tls\" 表示使用 TLS，\"xtls\" 表示使用 XTLS。"
 
 msgid "Original Trojan only supported 'tls', please choose 'tls'."
-msgstr "原版Trojan只支持'tls'，请選择'tls'。"
+msgstr "原版Trojan只支持'tls'，請選择'tls'。"
 
 msgid "Transfer mode"
-msgstr "传输模式"
+msgstr "傳輸模式"
 
 msgid "Do not send server name in ClientHello."
 msgstr "不要在 ClientHello 中發送服務器名称."
@@ -1232,25 +1241,25 @@ msgid "Domain"
 msgstr "域名"
 
 msgid "allowInsecure"
-msgstr "允许不安全連接"
+msgstr "允許不安全連接"
 
 msgid "Whether unsafe connections are allowed. When checked, Certificate validation will be skipped."
-msgstr "是否允许不安全連接。當勾選時，将跳过证书验证。"
+msgstr "是否允許不安全連接。當勾選時，將跳過證書驗證。"
 
 msgid "%s Node Use Type"
-msgstr "%s 节点使用类型"
+msgstr "%s 節點使用類型"
 
 msgid "Set the TUIC proxy server ip address"
-msgstr "指定远程TUIC服務器IP"
+msgstr "指定遠程TUIC服務器IP"
 
 msgid "TUIC User Password For Connect Remote Server"
-msgstr "用于远程TUIC服務器連接的密码"
+msgstr "用於遠程TUIC服務器連接的密碼"
 
 msgid "TUIC UserName For Local Socks"
-msgstr "用于本地Socks服務器連接的用戶名"
+msgstr "用於本地Socks服務器連接的用戶名"
 
 msgid "TUIC Password For Local Socks"
-msgstr "用于本地Socks服務器連接的密码"
+msgstr "用於本地Socks服務器連接的密碼"
 
 msgid "UDP relay mode"
 msgstr "UDP中继模式"
@@ -1259,58 +1268,58 @@ msgid "Congestion control algorithm"
 msgstr "拥塞控制算法"
 
 msgid "Heartbeat interval(second)"
-msgstr "保活心跳包發送間隔（单位：秒）"
+msgstr "保活心跳包發送間隔（單位：秒）"
 
 msgid "Timeout for establishing a connection to server(second)"
-msgstr "連接超時時間（单位：秒）"
+msgstr "連接超時時間（單位：秒）"
 
 msgid "Garbage collection interval(second)"
-msgstr "UDP數据包片残片清理間隔（单位：秒）"
+msgstr "UDP數据包片残片清理間隔（單位：秒）"
 
 msgid "Garbage collection lifetime(second)"
-msgstr "UDP數据包残片在服務器的保留時間（单位：秒）"
+msgstr "UDP數据包残片在服務器的保留時間（單位：秒）"
 
 msgid "Disable SNI"
-msgstr "關闭SNI服務器名称指示"
+msgstr "關閉SNI服務器名称指示"
 
 msgid "Enable 0-RTT QUIC handshake"
 msgstr "客戶端啟用 0-RTT QUIC 連接握手"
 
 msgid "TUIC send window"
-msgstr "發送窗口（无需确認即可發送的最大字节數：默認8Mb*2）"
+msgstr "發送窗口（無需確認即可發送的最大字节數：默認8Mb*2）"
 
 msgid "TUIC receive window"
-msgstr "接收窗口（无需确認即可接收的最大字节數：默認8Mb）"
+msgstr "接收窗口（無需確認即可接收的最大字节數：默認8Mb）"
 
 msgid "TUIC Maximum packet size the socks5 server can receive from external, in bytes"
-msgstr "TUIC socks5 服務器可以从外部接收的最大數据包大小（以字节为单位）"
+msgstr "TUIC socks5 服務器可以从外部接收的最大數据包大小（以字节為單位）"
 
 msgid "Set if the listening socket should be dual-stack"
-msgstr "設置监听套接字为双栈"
+msgstr "設置監聽套接字為双栈"
 
 msgid "<br />none: default, no masquerade, data sent is packets with no characteristics.<br />srtp: disguised as an SRTP packet, it will be recognized as video call data (such as FaceTime).<br />utp: packets disguised as uTP will be recognized as bittorrent downloaded data.<br />wechat-video: packets disguised as WeChat video calls.<br />dtls: disguised as DTLS 1.2 packet.<br />wireguard: disguised as a WireGuard packet. (not really WireGuard protocol)<br />dns: Disguising traffic as DNS requests."
-msgstr "<br />none：默認值，不进行伪装，發送的數据是没有特征的數据包。<br />srtp：伪装成 SRTP 數据包，会被识别为視频通话數据（如 FaceTime）。<br />utp：伪装成 uTP 數据包，会被识别为 BT 下载數据。<br />wechat-video：伪装成微信視频通话的數据包。<br />dtls：伪装成 DTLS 1.2 數据包。<br />wireguard：伪装成 WireGuard 數据包。(并不是真正的 WireGuard 协议)<br />dns：把流量伪装成 DNS 请求。"
+msgstr "<br />none：默認值，不进行伪装，發送的數据是沒有特征的數据包。<br />srtp：伪装成 SRTP 數据包，会被识别為視频通话數据（如 FaceTime）。<br />utp：伪装成 uTP 數据包，会被识别為 BT 下載數据。<br />wechat-video：伪装成微信視频通话的數据包。<br />dtls：伪装成 DTLS 1.2 數据包。<br />wireguard：伪装成 WireGuard 數据包。(並不是真正的 WireGuard 協議)<br />dns：把流量伪装成 DNS 請求。"
 
 msgid "Use it together with the DNS disguised type. You can fill in any domain."
-msgstr "配合伪装类型 DNS 使用，可随便填一个域名。"
+msgstr "配合伪装類型 DNS 使用，可随便填一個域名。"
 
 msgid "Auth"
-msgstr "身份認证"
+msgstr "身份認證"
 
 msgid "Socks for authentication"
-msgstr "Socks認证方式"
+msgstr "Socks認證方式"
 
 msgid "Socks protocol authentication, support anonymous and password."
-msgstr "Socks 协议的認证方式，支持匿名方式和账号密码方式。"
+msgstr "Socks 協議的認證方式，支持匿名方式和账号密碼方式。"
 
 msgid "anonymous"
 msgstr "匿名"
 
 msgid "User Password"
-msgstr "账号密码"
+msgstr "账号密碼"
 
 msgid "Username and Password must be used together!"
-msgstr "账号和密码必须同時使用！"
+msgstr "账号和密碼必須同時使用！"
 
 msgid "Firewall tools"
 msgstr "防火墙工具"
@@ -1319,34 +1328,34 @@ msgid "IPv6 TProxy"
 msgstr "IPv6透明代理(TProxy)"
 
 msgid "Experimental feature. Make sure that your node supports IPv6."
-msgstr "實验特性，请确保你的节点支持IPv6"
+msgstr "實驗特性，請確保你的節點支持IPv6"
 
 msgid "Status info"
 msgstr "状態信息"
 
 msgid "Big icon"
-msgstr "大图标"
+msgstr "大图標"
 
 msgid "Show node check"
-msgstr "顯示节点检測"
+msgstr "顯示節點檢測"
 
 msgid "Show Show IP111"
 msgstr "顯示IP111"
 
 msgid "Destination protocol"
-msgstr "目标协议"
+msgstr "目標協議"
 
 msgid "Destination address"
-msgstr "目标地址"
+msgstr "目標地址"
 
 msgid "Destination port"
-msgstr "目标端口"
+msgstr "目標端口"
 
 msgid "Whether to receive PROXY protocol, when this node want to be fallback or forwarded by proxy, it must be enable, otherwise it cannot be used."
-msgstr "是否接收 PROXY protocol，當该节点要被回落或被代理转發時，必须啟用，否則不能使用。"
+msgstr "是否接收 PROXY protocol，當该節點要被回落或被代理转發時，必須啟用，否則不能使用。"
 
 msgid "outbound node"
-msgstr "出站节点"
+msgstr "出站節點"
 
 msgid "Custom Socks"
 msgstr "自定义 Socks"
@@ -1361,16 +1370,16 @@ msgid "Interface"
 msgstr "接口"
 
 msgid "Bind Local"
-msgstr "本機监听"
+msgstr "本機監聽"
 
 msgid "When selected, it can only be accessed localhost."
-msgstr "當勾選時，只能本機访问。"
+msgstr "當勾選時，只能本機訪問。"
 
 msgid "Accept LAN Access"
-msgstr "接受局域網访问"
+msgstr "接受局域網訪問"
 
 msgid "When selected, it can accessed lan , this will not be safe!"
-msgstr "當勾選時，可以直接访问局域網，这将不安全！（非特殊情况不建议開啟）"
+msgstr "當勾選時，可以直接訪問局域網，這將不安全！（非特殊情況不建議開啟）"
 
 msgid "Enable Remote"
 msgstr "啟用转發"
@@ -1379,25 +1388,25 @@ msgid "You can forward to Nginx/Caddy/V2ray/Xray WebSocket and more."
 msgstr "您可以转發到Nginx/Caddy/V2ray/Xray WebSocket等。"
 
 msgid "Remote Address"
-msgstr "远程地址"
+msgstr "遠程地址"
 
 msgid "Remote Port"
-msgstr "远程端口"
+msgstr "遠程端口"
 
 msgid "as:"
 msgstr "如："
 
 msgid "Public key absolute path"
-msgstr "公钥文件绝对路径"
+msgstr "公鑰文件绝對路径"
 
 msgid "Private key absolute path"
-msgstr "私钥文件绝对路径"
+msgstr "私鑰文件绝對路径"
 
 msgid "Can't find this file!"
-msgstr "找不到这个文件！"
+msgstr "找不到這個文件！"
 
 msgid "Public key and Private key path can not be empty!"
-msgstr "公钥和私钥文件路径不能为空！"
+msgstr "公鑰和私鑰文件路径不能為空！"
 
 msgid "Server-Side"
 msgstr "服務器端"
@@ -1409,19 +1418,19 @@ msgid "Users Manager"
 msgstr "用戶管理"
 
 msgid "Logs"
-msgstr "日志"
+msgstr "日誌"
 
 msgid "Log"
-msgstr "日志"
+msgstr "日誌"
 
 msgid "Enable Node Log"
-msgstr "啟用节点日志"
+msgstr "啟用節點日誌"
 
 msgid "Log Level"
-msgstr "日志等級"
+msgstr "日誌等級"
 
 msgid "Not enabled log"
-msgstr "未啟用日志"
+msgstr "未啟用日誌"
 
 msgid "UDP Forward"
 msgstr "UDP转發"
@@ -1430,58 +1439,58 @@ msgid "DNS Settings"
 msgstr "DNS設置"
 
 msgid "Null"
-msgstr "无"
+msgstr "無"
 
 msgid "You did not fill in the %s path. Please save and apply then update manually."
-msgstr "您没有填写 %s 路径。请保存應用後再手動更新。"
+msgstr "您沒有填寫 %s 路径。請保存應用後再手動更新。"
 
 msgid "Not installed %s, Can't unzip!"
-msgstr "未安装 %s，无法解压。"
+msgstr "未安装 %s，無法解压。"
 
 msgid "Can't determine ARCH, or ARCH not supported."
-msgstr "无法确認ARCH架构，或是不支持。"
+msgstr "無法確認ARCH架構，或是不支持。"
 
 msgid "Get remote version info failed."
-msgstr "获取远程版本信息失败。"
+msgstr "獲取遠程版本信息失敗。"
 
 msgid "New version found, but failed to get new version download url."
-msgstr "發现新版本，但未能获得新版本的下载地址。"
+msgstr "發现新版本，但未能獲得新版本的下載地址。"
 
 msgid "Download url is required."
-msgstr "请指定下载地址。"
+msgstr "請指定下載地址。"
 
 msgid "File download failed or timed out: %s"
-msgstr "文件下载失败或超時：%s"
+msgstr "文件下載失敗或超時：%s"
 
 msgid "File path required."
-msgstr "请指定文件路径。"
+msgstr "請指定文件路径。"
 
 msgid "%s not enough space."
 msgstr "%s 空間不足。"
 
 msgid "Can't find client in file: %s"
-msgstr "无法在文件中找到客戶端：%s"
+msgstr "無法在文件中找到客戶端：%s"
 
 msgid "Client file is required."
-msgstr "请指定客戶端文件。"
+msgstr "請指定客戶端文件。"
 
 msgid "The client file is not suitable for current device."
-msgstr "客戶端文件不适合當前設備。"
+msgstr "客戶端文件不適合當前設備。"
 
 msgid "Can't move new file to path: %s"
-msgstr "无法移動新文件到：%s"
+msgstr "無法移動新文件到：%s"
 
 msgid "An XHttpObject in JSON format, used for sharing."
-msgstr "JSON 格式的 XHttpObject，用来實现分享。"
+msgstr "JSON 格式的 XHttpObject，用來實现分享。"
 
 msgid "Enable Mux.Cool"
 msgstr "啟用 Mux.Cool"
 
 msgid "Mux concurrency"
-msgstr "最大并發連接數"
+msgstr "最大並發連接數"
 
 msgid "XUDP Mux concurrency"
-msgstr "XUDP 最大并發連接數"
+msgstr "XUDP 最大並發連接數"
 
 msgid "Padding"
 msgstr "填充"
@@ -1499,13 +1508,13 @@ msgid "Recommended value: Sec-WebSocket-Protocol"
 msgstr "推荐值：Sec-WebSocket-Protocol"
 
 msgid "Health check"
-msgstr "健康检查"
+msgstr "健康檢查"
 
 msgid "Health check timeout"
-msgstr "检查超時時間"
+msgstr "檢查超時時間"
 
 msgid "Permit without stream"
-msgstr "无子連接時的健康检查"
+msgstr "無子連接時的健康檢查"
 
 msgid "Initial Windows Size"
 msgstr "初始窗口大小"
@@ -1514,25 +1523,25 @@ msgid "Excluded Domains"
 msgstr "排除域名"
 
 msgid "If the traffic sniffing result is in this list, the destination address will not be overridden."
-msgstr "如果流量嗅探结果在此列表中，則不会覆盖目标地址。"
+msgstr "如果流量嗅探結果在此列表中，則不会覆盖目標地址。"
 
 msgid "Buffer Size"
-msgstr "缓冲区大小"
+msgstr "缓衝区大小"
 
 msgid "Buffer size for every connection (kB)"
-msgstr "每一个連接的缓冲区大小（kB）"
+msgstr "每一個連接的缓衝区大小（kB）"
 
 msgid "Custom geoip Path"
 msgstr "自定义geoip文件路径"
 
 msgid "Custom geoip URL"
-msgstr "自定义geoip文件更新链接"
+msgstr "自定义geoip文件更新鏈接"
 
 msgid "Custom geosite Path"
 msgstr "自定义geosite文件路径"
 
 msgid "Custom geosite URL"
-msgstr "自定义geosite文件更新链接"
+msgstr "自定义geosite文件更新鏈接"
 
 msgid "Handshake Timeout"
 msgstr "握手超時 "
@@ -1544,22 +1553,22 @@ msgid "Hop Interval"
 msgstr "端口跳跃時間 "
 
 msgid "HeartbeatPeriod(second)"
-msgstr "心跳周期（单位：秒）"
+msgstr "心跳周期（單位：秒）"
 
 msgid "Remove resource files"
-msgstr "删除资源文件"
+msgstr "刪除资源文件"
 
 msgid "Sing-Box will automatically download resource files when starting, you can use this feature achieve upgrade resource files."
-msgstr "Sing-Box 会在啟動時自動下载资源文件，您可以使用此功能實现升級资源文件。"
+msgstr "Sing-Box 会在啟動時自動下載资源文件，您可以使用此功能實现升級资源文件。"
 
 msgid "Override the connection destination address"
-msgstr "覆盖連接目标地址"
+msgstr "覆盖連接目標地址"
 
 msgid "Override the connection destination address with the sniffed domain.<br />Otherwise use sniffed domain for routing only.<br />If using shunt nodes, configure the domain shunt rules correctly."
-msgstr "用探測出的域名覆盖連接目标地址。<br />否則仅将探測得到的域名用于路由。<br />如使用分流节点，请正确設置域名分流規則。"
+msgstr "用探測出的域名覆盖連接目標地址。<br />否則仅將探測得到的域名用於路由。<br />如使用分流節點，請正確設置域名分流規則。"
 
 msgid "Override the connection destination address with the sniffed domain.<br />When enabled, traffic will match only by domain, ignoring IP rules.<br />If using shunt nodes, configure the domain shunt rules correctly."
-msgstr "用探測出的域名覆盖連接目标地址。<br />啟用後仅使用域名进行流量匹配，将忽略IP規則。<br />如使用分流节点，请正确設置域名分流規則。"
+msgstr "用探測出的域名覆盖連接目標地址。<br />啟用後仅使用域名进行流量匹配，將忽略IP規則。<br />如使用分流節點，請正確設置域名分流規則。"
 
 msgid "Handshake Server"
 msgstr "握手服務器"
@@ -1568,28 +1577,34 @@ msgid "Handshake Server Port"
 msgstr "握手服務器端口"
 
 msgid "Protocol parameter. Will waste traffic randomly if enabled."
-msgstr "协议参數。 如果啟用会随機浪费流量。"
+msgstr "協議參數。 如果啟用会随機浪费流量。"
 
 msgid "Protocol parameter. Enable length block encryption."
-msgstr "协议参數。啟用长度块加密。"
+msgstr "協議參數。啟用长度块加密。"
+
+msgid "TLS Chain Fingerprint (SHA256)"
+msgstr "TLS 憑證鏈指紋（SHA256）"
+
+msgid "Once set, connects only when the server’s chain fingerprint matches."
+msgstr "設定後，僅在伺服器憑證鏈指紋匹配時連接。"
 
 msgid "ECH Config"
 msgstr "ECH 配置"
 
 msgid "ECH Key"
-msgstr "ECH 密钥"
+msgstr "ECH 密鑰"
 
 msgid "PQ signature schemes"
-msgstr "後量子对等证书签名方案"
+msgstr "後量子對等證書签名方案"
 
 msgid "Disable adaptive sizing of TLS records"
-msgstr "禁用 TLS 記錄的自适應大小调整"
+msgstr "禁用 TLS 記錄的自適應大小调整"
 
 msgid "ECH Query Policy"
-msgstr "ECH 查询策略"
+msgstr "ECH 查詢策略"
 
 msgid "Controls the policy used when performing DNS queries for ECH configuration."
-msgstr "控制使用 DNS 查询 ECH 配置時的策略。"
+msgstr "控制使用 DNS 查詢 ECH 配置時的策略。"
 
 msgid "Enable Multipath TCP, need to be enabled in both server and client configuration."
 msgstr "啟用 Multipath TCP，需在服務端和客戶端配置中同時啟用。"
@@ -1598,13 +1613,13 @@ msgid "Fragment"
 msgstr "分片"
 
 msgid "TCP fragments, which can deceive the censorship system in some cases, such as bypassing SNI blacklists."
-msgstr "TCP 分片，在某些情况下可以欺骗审查系统，比如绕过 SNI 黑名单。"
+msgstr "TCP 分片，在某些情況下可以欺骗审查系統，比如绕過 SNI 黑名單。"
 
 msgid "Fragment Packets"
 msgstr "分片方式"
 
 msgid " \"1-3\" is for segmentation at TCP layer, applying to the beginning 1 to 3 data writes by the client. \"tlshello\" is for TLS client hello packet fragmentation."
-msgstr " \"1-3\" 是 TCP 的流切片，應用于客戶端第 1 至第 3 次写數据。\"tlshello\" 是 TLS 握手包切片。"
+msgstr " \"1-3\" 是 TCP 的流切片，應用於客戶端第 1 至第 3 次寫數据。\"tlshello\" 是 TLS 握手包切片。"
 
 msgid "Fragment Length"
 msgstr "分片包长"
@@ -1625,22 +1640,22 @@ msgid "Limit the maximum number of splits."
 msgstr "限制分片的最大數量。"
 
 msgid "Split handshake data into multiple TLS records for better censorship evasion. Low overhead. Recommended to enable first."
-msgstr "将握手數据拆分为多个 TLS 記錄，提升抗封锁能力，几乎不增加延迟，建议優先啟用。"
+msgstr "將握手數据拆分為多個 TLS 記錄，提升抗封锁能力，几乎不增加延迟，建議優先啟用。"
 
 msgid "Split handshake into multiple TCP segments. Enhances obfuscation. May increase delay. Use only if needed."
-msgstr "将 TLS 握手數据分为多个 TCP 包發送，提高伪装性，可能增加延迟，仅在封锁严重時使用。"
+msgstr "將 TLS 握手數据分為多個 TCP 包發送，提高伪装性，可能增加延迟，仅在封锁严重時使用。"
 
 msgid "Noise"
-msgstr "噪声"
+msgstr "噪聲"
 
 msgid "UDP noise, Under some circumstances it can bypass some UDP based protocol restrictions."
-msgstr "UDP 噪声，在某些情况下可以绕过一些针对 UDP 协议的限制。"
+msgstr "UDP 噪聲，在某些情況下可以绕過一些针對 UDP 協議的限制。"
 
 msgid "To send noise packets, select \"Noise\" in Xray Settings."
-msgstr "在 Xray 設置中勾選 “噪声” 以發送噪声包。"
+msgstr "在 Xray 設置中勾選 “噪聲” 以發送噪聲包。"
 
 msgid "Xray Noise Packets"
-msgstr "Xray 噪声數据包"
+msgstr "Xray 噪聲數据包"
 
 msgid "Packet"
 msgstr "數据包"
@@ -1649,31 +1664,31 @@ msgid "Delay (ms)"
 msgstr "延迟（ms）"
 
 msgid "IP Type"
-msgstr "IP 类型"
+msgstr "IP 類型"
 
 msgid "If is domain name, The requested domain name will be resolved to IP before connect."
-msgstr "如果是域名，域名将在请求發出之前解析为 IP。"
+msgstr "如果是域名，域名將在請求發出之前解析為 IP。"
 
 msgid "Chain Proxy"
-msgstr "链式代理"
+msgstr "鏈式代理"
 
 msgid "Landing Node"
-msgstr "落地节点"
+msgstr "落地節點"
 
 msgid "Only support a layer of proxy."
-msgstr "仅支持一层代理。"
+msgstr "仅支持一層代理。"
 
 msgid ""
 "Chained proxy works only with Xray or Sing-box nodes.<br>"
 "The chained node must be the same type as your subscription node (Xray with Xray, Sing-box with Sing-box).<br>"
 "You can only use manual or imported nodes as chained nodes."
 msgstr ""
-"链式代理仅支持 Xray 与 Sing-box 节点。<br>"
-"链式节点需与订阅节点类型一致（Xray 对應 Xray，Sing-box 对應 Sing-box）。<br>"
-"仅支持手動添加或導入的节点用作链式节点。"
+"鏈式代理仅支持 Xray 与 Sing-box 節點。<br>"
+"鏈式節點需与訂閱節點類型一致（Xray 對應 Xray，Sing-box 對應 Sing-box）。<br>"
+"仅支持手動添加或導入的節點用作鏈式節點。"
 
 msgid "Set the default domain resolution strategy for the sing-box node."
-msgstr "为 sing-box 节点設置默認的域名解析策略。"
+msgstr "為 sing-box 節點設置默認的域名解析策略。"
 
 msgid "Prefer IPv4"
 msgstr "IPv4 優先"
@@ -1688,7 +1703,7 @@ msgid "IPv6 Only"
 msgstr "仅 IPv6"
 
 msgid "Maintain"
-msgstr "维护"
+msgstr "维護"
 
 msgid "Backup and Restore"
 msgstr "備份还原"
@@ -1697,7 +1712,7 @@ msgid "Backup or Restore Client and Server Configurations."
 msgstr "備份或还原客戶端及服務端配置。"
 
 msgid "Note: Restoring configurations across different versions may cause compatibility issues."
-msgstr "注意：不同版本間的配置恢復可能会導致兼容性问题。"
+msgstr "注意：不同版本間的配置恢復可能会導致兼容性問題。"
 
 msgid "Create Backup File"
 msgstr "创建備份文件"
@@ -1706,19 +1721,19 @@ msgid "Restore Backup File"
 msgstr "恢復備份文件"
 
 msgid "DL Backup"
-msgstr "下载備份"
+msgstr "下載備份"
 
 msgid "RST Backup"
 msgstr "恢復備份"
 
 msgid "Backup failed!"
-msgstr "備份失败！"
+msgstr "備份失敗！"
 
 msgid "UL Restore"
-msgstr "上传恢復"
+msgstr "上傳恢復"
 
 msgid "CLOSE WIN"
-msgstr "關闭窗口"
+msgstr "關閉窗口"
 
 msgid "Restore to default configuration"
 msgstr "恢復默認配置"
@@ -1727,13 +1742,13 @@ msgid "Do Reset"
 msgstr "执行重置"
 
 msgid "Please select a file first."
-msgstr "请先選择一个文件。"
+msgstr "請先選择一個文件。"
 
 msgid "Invalid file type. Please upload a .tar.gz file."
-msgstr "文件类型无效，请上传一个 .tar.gz 文件。"
+msgstr "文件類型無效，請上傳一個 .tar.gz 文件。"
 
 msgid "File size exceeds 10MB limit."
-msgstr "文件大小超过 10MB 限制。"
+msgstr "文件大小超過 10MB 限制。"
 
 msgid "Do you want to restore the client to default settings?"
 msgstr "是否要恢復客戶端默認配置？"
@@ -1742,7 +1757,7 @@ msgid "Are you sure you want to restore the client to default settings?"
 msgstr "是否真的要恢復客戶端默認配置？"
 
 msgid "Configuration file uploaded successfully…"
-msgstr "配置文件上传成功…"
+msgstr "配置文件上傳成功…"
 
 msgid "Configuration restored successfully…"
 msgstr "配置还原成功…"
@@ -1751,28 +1766,28 @@ msgid "Service restarting…"
 msgstr "重啟服務中…"
 
 msgid "Configuration file decompression failed, please try again!"
-msgstr "配置文件解压失败，请重試！"
+msgstr "配置文件解压失敗，請重試！"
 
 msgid "_urltest"
 msgstr "URLTest"
 
 msgid "URLTest node list"
-msgstr "URLTest 节点列表"
+msgstr "URLTest 節點列表"
 
 msgid "List of nodes to test, <a target='_blank' href='https://sing-box.sagernet.org/configuration/outbound/urltest'>document</a>"
-msgstr "要測試的节点列表，<a target='_blank' href='https://sing-box.sagernet.org/zh/configuration/outbound/urltest'>文档原理</a>"
+msgstr "要測試的節點列表，<a target='_blank' href='https://sing-box.sagernet.org/zh/configuration/outbound/urltest'>文檔原理</a>"
 
 msgid "Test interval"
 msgstr "測試間隔"
 
 msgid "Test interval must be less or equal than idle timeout."
-msgstr "測試間隔時間必须小于或等于空闲超時時間。"
+msgstr "測試間隔時間必須小於或等於空闲超時時間。"
 
 msgid "Test tolerance"
 msgstr "測試容差"
 
 msgid "The test tolerance in milliseconds."
-msgstr "測試容差時間（单位：毫秒）。"
+msgstr "測試容差時間（單位：毫秒）。"
 
 msgid "Idle timeout"
 msgstr "空闲超時"
@@ -1781,16 +1796,16 @@ msgid "The idle timeout."
 msgstr "空闲超時時間。"
 
 msgid "Interrupt existing connections"
-msgstr "中断现有連接"
+msgstr "中斷现有連接"
 
 msgid "Interrupt existing connections when the selected outbound has changed."
-msgstr "當選择的出站發生变化時中断现有連接。"
+msgstr "當選择的出站發生變化時中斷现有連接。"
 
 msgid "Port hopping range"
-msgstr "端口跳跃范围"
+msgstr "端口跳跃範圍"
 
 msgid "Format as 1000:2000 or 1000-2000 Multiple groups are separated by commas (,)."
-msgstr "格式为：1000:2000 或 1000-2000 多组時用逗号(,)隔開。"
+msgstr "格式為：1000:2000 或 1000-2000 多组時用逗号(,)隔開。"
 
 msgid "Use Custom Config"
 msgstr "使用自定义配置"
@@ -1799,58 +1814,58 @@ msgid "Custom Config"
 msgstr "自定义配置"
 
 msgid "Must be JSON text!"
-msgstr "必须是 JSON 文本内容！"
+msgstr "必須是 JSON 文本內容！"
 
 msgid "Geo View"
-msgstr "Geo 查询"
+msgstr "Geo 查詢"
 
 msgid "Query"
-msgstr "查询"
+msgstr "查詢"
 
 msgid "Querying"
-msgstr "查询中"
+msgstr "查詢中"
 
 msgid "Please enter query content!"
-msgstr "请输入查询内容！"
+msgstr "請輸入查詢內容！"
 
 msgid "No results were found!"
-msgstr "未找到任何结果！"
+msgstr "未找到任何結果！"
 
 msgid "Domain/IP Query"
-msgstr "域名/IP 查询"
+msgstr "域名/IP 查詢"
 
 msgid "GeoIP/Geosite Query"
-msgstr "GeoIP/Geosite 查询"
+msgstr "GeoIP/Geosite 查詢"
 
 msgid "Enter a domain or IP to query the Geo rule list they belong to."
-msgstr "输入域名/IP，查询它们所在的 Geo 規則列表。"
+msgstr "輸入域名/IP，查詢它们所在的 Geo 規則列表。"
 
 msgid "Enter a GeoIP or Geosite to extract the domains/IPs they contain. Format: geoip:cn or geosite:gfw"
-msgstr "输入 GeoIP/Geosite，提取它们所包含的域名/IP。格式：geoip:cn 或 geosite:gfw"
+msgstr "輸入 GeoIP/Geosite，提取它们所包含的域名/IP。格式：geoip:cn 或 geosite:gfw"
 
 msgid "Tips:"
 msgstr "小贴士："
 
 msgid "By entering a domain or IP, you can query the Geo rule list they belong to."
-msgstr "可以通过输入域名/IP，查询它们所在的 Geo 規則列表。"
+msgstr "可以通過輸入域名/IP，查詢它们所在的 Geo 規則列表。"
 
 msgid "By entering a GeoIP or Geosite, you can extract the domains/IPs they contain."
-msgstr "可以通过输入 GeoIP/Geosite，提取它们所包含的域名/IP。"
+msgstr "可以通過輸入 GeoIP/Geosite，提取它们所包含的域名/IP。"
 
 msgid "Use the GeoIP/Geosite query function to verify if the entered Geo rules are correct."
-msgstr "利用 GeoIP/Geosite 查询功能，可以验证输入的 Geo 規則是否正确。"
+msgstr "利用 GeoIP/Geosite 查詢功能，可以驗證輸入的 Geo 規則是否正確。"
 
 msgid "Private Key Passphrase"
-msgstr "私钥指纹"
+msgstr "私鑰指紋"
 
 msgid "Host Key"
-msgstr "主機密钥"
+msgstr "主機密鑰"
 
 msgid "Accept any if empty."
-msgstr "留空則不校验。"
+msgstr "留空則不校驗。"
 
 msgid "Host Key Algorithms"
-msgstr "主機密钥算法"
+msgstr "主機密鑰算法"
 
 msgid "Client Version"
 msgstr "客戶端版本"
@@ -1859,7 +1874,7 @@ msgid "Random version will be used if empty."
 msgstr "如留空，則使用随機版本。"
 
 msgid "The configured type also applies to the core specified when manually importing nodes."
-msgstr "配置的类型同样适用于手動導入节点時所指定的核心程序。"
+msgstr "配置的類型同樣適用於手動導入節點時所指定的核心程序。"
 
 msgid "Group Name"
 msgstr "分组名"
@@ -1868,7 +1883,7 @@ msgid "Using..."
 msgstr "使用中。"
 
 msgid "Generate configuration file and run"
-msgstr "生成配置文件并運行"
+msgstr "生成配置文件並運行"
 
 msgid "Start after a delay of %s seconds!"
 msgstr "延時 %s 秒後再啟動!"
@@ -1883,37 +1898,37 @@ msgid "%s Transparent proxy base dependencies %s Not installed..."
 msgstr "%s 透明代理基础依赖 %s 未安装..."
 
 msgid "%s does not have execute permissions and cannot be started: %s %s"
-msgstr "%s 没有执行权限，无法啟動：%s %s"
+msgstr "%s 沒有执行權限，無法啟動：%s %s"
 
 msgid "%s not found, unable to start..."
-msgstr "找不到 %s，无法啟動..."
+msgstr "找不到 %s，無法啟動..."
 
 msgid "Socks node: [%s]%s is an invalid server address and cannot be started!"
-msgstr "Socks节点：[%s]%s 是非法的服務器地址，无法啟動！"
+msgstr "Socks節點：[%s]%s 是非法的服務器地址，無法啟動！"
 
 msgid "For some reason, the configuration for this Socks service has been lost, and its startup has been aborted!"
 msgstr "某种原因，此 Socks 服務的相關配置已失联，啟動中止！"
 
 msgid "Socks node: [%s]%s, start failed %s:%s %s"
-msgstr "Socks节点：[%s]%s，啟動失败 %s:%s %s"
+msgstr "Socks節點：[%s]%s，啟動失敗 %s:%s %s"
 
 msgid "Socks node: [%s]%s, starting %s:%s"
-msgstr "Socks节点：[%s]%s，啟動 %s:%s"
+msgstr "Socks節點：[%s]%s，啟動 %s:%s"
 
 msgid "To enable experimental IPv6 transparent proxy (TProxy), please ensure your node and type support IPv6!"
-msgstr "開啟實验性IPv6透明代理(TProxy)，请确認您的节点及类型支持IPv6！"
+msgstr "開啟實驗性IPv6透明代理(TProxy)，請確認您的節點及類型支持IPv6！"
 
 msgid "Analyzing the node configuration of the Socks service..."
-msgstr "分析 Socks 服務的节点配置..."
+msgstr "分析 Socks 服務的節點配置..."
 
 msgid "Log file is too long, clear it!"
-msgstr "日志文件过长，清空处理！"
+msgstr "日誌文件過长，清空处理！"
 
 msgid "The task is currently running automatically as a scheduled task; no reconfiguration of the scheduled task is required."
-msgstr "當前为計划任務自動運行，不重新配置定時任務。"
+msgstr "當前為計划任務自動運行，不重新配置定時任務。"
 
 msgid "Scheduled tasks: Auto stop service."
-msgstr "配置定時任務：自動關闭服務。"
+msgstr "配置定時任務：自動關閉服務。"
 
 msgid "Scheduled tasks: Auto start service."
 msgstr "配置定時任務：自動開啟服務。"
@@ -1925,19 +1940,19 @@ msgid "Scheduled tasks: Auto update rules."
 msgstr "配置定時任務：自動更新規則。"
 
 msgid "Scheduled tasks: Auto update [%s] subscription."
-msgstr "配置定時任務：自動更新 【%s】 订阅。"
+msgstr "配置定時任務：自動更新 【%s】 訂閱。"
 
 msgid "Auto updates: Starts a cyclical update process."
-msgstr "自動更新：啟動循环更新进程。"
+msgstr "自動更新：啟動循环更新進程。"
 
 msgid "Running in no proxy mode, it only allows scheduled tasks for starting and stopping services."
-msgstr "運行于非代理模式，仅允许服務啟停的定時任務。"
+msgstr "運行於非代理模式，仅允許服務啟停的定時任務。"
 
 msgid "Clear scheduled commands."
 msgstr "清除定時执行命令。"
 
 msgid "Unable to resolve [%s], route table addition failed!"
-msgstr "无法解析[%s]，路由表添加失败！"
+msgstr "無法解析[%s]，路由表添加失敗！"
 
 msgid "[%s] was successfully added to the routing table of interface [%s]!"
 msgstr "[%s]添加到接口[%s]路由表成功！"
@@ -1946,49 +1961,49 @@ msgid "Adding [%s] to the [%s] routing table failed! The reason is that the [%s]
 msgstr "[%s]添加到接口[%s]路由表失功！原因是找不到[%s]網關。"
 
 msgid "Global nodes are not enabled, skip [%s]."
-msgstr "全局节点未啟用，跳过【%s】"
+msgstr "全局節點未啟用，跳過【%s】"
 
 msgid "Direct DNS: %s"
 msgstr "直連 DNS：%s"
 
 msgid "Remote DNS: %s"
-msgstr "远程 DNS：%s"
+msgstr "遠程 DNS：%s"
 
 msgid "The program has started. Please stop it and then restart it!"
 msgstr "程序已啟動，先停止再重新啟動!"
 
 msgid "The system does not have iptables or ipset installed, or Dnsmasq does not have ipset support enabled, so iptables+ipset transparent proxy cannot be used!"
-msgstr "系统未安装iptables或ipset或Dnsmasq没有開啟ipset支持，无法使用iptables+ipset透明代理！"
+msgstr "系統未安装iptables或ipset或Dnsmasq沒有開啟ipset支持，無法使用iptables+ipset透明代理！"
 
 msgid "fw4 detected, use nftables to transparent proxy."
-msgstr "检測到fw4，使用nftables进行透明代理。"
+msgstr "檢測到fw4，使用nftables进行透明代理。"
 
 msgid "The Dnsmasq package does not meet the requirements for transparent proxy in nftables. If you need to use it, please ensure that the dnsmasq version is 2.87 or higher and that nftset support is enabled."
-msgstr "Dnsmasq軟件包不满足nftables透明代理要求，如需使用请确保dnsmasq版本在2.87以上并開啟nftset支持。"
+msgstr "Dnsmasq軟件包不满足nftables透明代理要求，如需使用請確保dnsmasq版本在2.87以上並開啟nftset支持。"
 
 msgid "If your Dnsmasq version is lower than 2.90, it is recommended to upgrade to version 2.90 or higher to avoid Dnsmasq crashing in some cases!"
-msgstr "Dnsmasq版本低于2.90，建议升級至2.90及以上版本以避免部分情况下Dnsmasq崩溃问题！"
+msgstr "Dnsmasq版本低於2.90，建議升級至2.90及以上版本以避免部分情況下Dnsmasq崩溃問題！"
 
 msgid "Running complete!"
 msgstr "運行完成！"
 
 msgid "Clearing and closing related programs and cache complete."
-msgstr "清空并關闭相關程序和缓存完成。"
+msgstr "清空並關閉相關程序和缓存完成。"
 
 msgid "Incorrect index listing method (%s), execution terminated!"
-msgstr "索引列举方式不正确（%s），终止执行！"
+msgstr "索引列举方式不正確（%s），终止执行！"
 
 msgid "parse the traffic splitting rules[%s]-[geoip:%s] add to %s to complete."
 msgstr "解析分流規則[%s]-[geoip:%s]加入到 %s 完成"
 
 msgid "Access Control:"
-msgstr "访问控制："
+msgstr "訪問控制："
 
 msgid "Add node to the load balancer is directly connected to %s[%s]."
-msgstr "加入负载均衡的节点到%s[%s]直連完成。"
+msgstr "加入負載均衡的節點到%s[%s]直連完成。"
 
 msgid "Add all %s nodes to %s[%s] direct connection complete."
-msgstr "加入所有%s节点到%s[%s]直連完成。"
+msgstr "加入所有%s節點到%s[%s]直連完成。"
 
 msgid "Starting to load %s firewall rules..."
 msgstr "開始加载 %s 防火墙規則..."
@@ -1997,7 +2012,7 @@ msgid "local network segments (%s) direct connection: %s"
 msgstr "本機 %s 網段直連：%s"
 
 msgid "Add ISP %s DNS to the whitelist: %s"
-msgstr "追加ISP %s DNS 到白名单：%s"
+msgstr "追加ISP %s DNS 到白名單：%s"
 
 msgid "[%s]"
 msgstr "【%s】"
@@ -2009,7 +2024,7 @@ msgid "Source iface [%s],"
 msgstr "源接口【%s】，"
 
 msgid "IP range [%s],"
-msgstr "IP 范围【%s】，"
+msgstr "IP 範圍【%s】，"
 
 msgid "All device,"
 msgstr "所有設備，"
@@ -2024,10 +2039,10 @@ msgid "not proxy all %s"
 msgstr "不代理所有 %s"
 
 msgid "Use the %s node [%s]"
-msgstr "使用 %s 节点[%s]"
+msgstr "使用 %s 節點[%s]"
 
 msgid "Using a node that is different from the global configuration, DNS has been forcibly redirected to a dedicated DNS server."
-msgstr "使用与全局配置不相同节点，已将DNS强制重定向到专用 DNS 服務器。"
+msgstr "使用与全局配置不相同節點，已將DNS強制重定向到專用 DNS 服務器。"
 
 msgid "Add direct DNS to %s: %s"
 msgstr "追加直連 DNS 到 %s： %s"
@@ -2042,46 +2057,46 @@ msgid "Clear %s."
 msgstr "清除 %s。"
 
 msgid "Delete %s rules is complete."
-msgstr "删除 %s 規則完成。"
+msgstr "刪除 %s 規則完成。"
 
 msgid "%s firewall rules load complete!"
 msgstr "%s 防火墙規則加载完成！"
 
 msgid "Socks switch detection: Unknown error."
-msgstr "Socks切换检測：未知错误。"
+msgstr "Socks切換檢測：未知錯誤。"
 
 msgid "Socks switch detection: Unable to connect to the network. Please check if the network is working properly!"
-msgstr "Socks切换检測：无法連接到網絡，请检查網絡是否正常！"
+msgstr "Socks切換檢測：無法連接到網絡，請檢查網絡是否正常！"
 
 msgid "Socks switch detection: Primary node 【%s: [%s]】 is normal. Switch to the primary node!"
-msgstr "Socks切换检測：%s 主节点【%s：[%s]】正常，切换到主节点！"
+msgstr "Socks切換檢測：%s 主節點【%s：[%s]】正常，切換到主節點！"
 
 msgid "Socks switch detection: %s node switch complete!"
-msgstr "Socks切换检測：%s 节点切换完毕！"
+msgstr "Socks切換檢測：%s 節點切換完毕！"
 
 msgid "Socks switch detection: %s 【%s:[%s]】 normal."
-msgstr "Socks切换检測：%s 【%s:[%s]】 正常。"
+msgstr "Socks切換檢測：%s 【%s:[%s]】 正常。"
 
 msgid "switch to %s test detect!"
-msgstr "切换到 %s 检測！"
+msgstr "切換到 %s 檢測！"
 
 msgid "backup node"
-msgstr "備用节点"
+msgstr "備用節點"
 
 msgid "next backup node"
-msgstr "下一个備用节点"
+msgstr "下一個備用節點"
 
 msgid "main node"
-msgstr "主节点"
+msgstr "主節點"
 
 msgid "Socks switch detection: Unknown error."
-msgstr "Socks切换检測：未知错误。"
+msgstr "Socks切換檢測：未知錯誤。"
 
 msgid "Socks switch detection: %s 【%s:[%s]】 abnormal, %s"
-msgstr "Socks切换检測：%s 【%s:[%s]】 异常，%s"
+msgstr "Socks切換檢測：%s 【%s:[%s]】 异常，%s"
 
 msgid "Socks switch detection: %s 【%s:[%s]】 normal, switch to this node!"
-msgstr "Socks切换检測：%s 【%s:[%s]】 正常，切换到此节点！"
+msgstr "Socks切換檢測：%s 【%s:[%s]】 正常，切換到此節點！"
 
 msgid "Restart dnsmasq service."
 msgstr "重啟 dnsmasq 服務。"
@@ -2090,13 +2105,13 @@ msgid "Console Port: %s"
 msgstr "控制臺端口：%s"
 
 msgid "Discard one obviously invalid node."
-msgstr "丢弃 1 个明顯无效的节点"
+msgstr "丟棄 1 個明顯無效的節點"
 
 msgid "Entrance %s:%s"
 msgstr "入口 %s:%s"
 
 msgid "Node: %s:%s, Weight: %s"
-msgstr "节点：%s:%s，权重：%s"
+msgstr "節點：%s:%s，權重：%s"
 
 msgid "Start updating the rules..."
 msgstr "開始更新規則..."
@@ -2105,13 +2120,13 @@ msgid "%s Start updating..."
 msgstr "%s 開始更新..."
 
 msgid "%s version is the same and does not need to be updated."
-msgstr "%s 版本一致，无需更新。"
+msgstr "%s 版本一致，無需更新。"
 
 msgid "%s update success."
 msgstr "%s 更新成功。"
 
 msgid "%s update failed, please try again later."
-msgstr "%s 更新失败，请稍後再試。"
+msgstr "%s 更新失敗，請稍後再試。"
 
 msgid "Restart the service and apply the new rules."
 msgstr "重啟服務，應用新的規則。"
@@ -2120,40 +2135,40 @@ msgid "The rules have been updated..."
 msgstr "規則更新完毕..."
 
 msgid "Socks node list [%s]"
-msgstr "Socks 节点列表 [%s]"
+msgstr "Socks 節點列表 [%s]"
 
 msgid "Backup node list"
-msgstr "備用节点的列表"
+msgstr "備用節點的列表"
 
 msgid "HAProxy node list [%s]"
-msgstr "HAProxy 节点列表 [%s]"
+msgstr "HAProxy 節點列表 [%s]"
 
 msgid "ACL list [%s]"
-msgstr "访问控制列表 [%s]"
+msgstr "訪問控制列表 [%s]"
 
 msgid "Shunt [%s] node"
-msgstr "分流 [%s] 节点"
+msgstr "分流 [%s] 節點"
 
 msgid "Xray Load Balancing node [%s] list"
-msgstr "Xray 负载均衡节点 [%s] 列表"
+msgstr "Xray 負載均衡節點 [%s] 列表"
 
 msgid "Xray Load Balancing node [%s] backup node"
-msgstr "Xray 负载均衡节点 [%s] 後備节点"
+msgstr "Xray 負載均衡節點 [%s] 後備節點"
 
 msgid "Sing-Box URLTest node [%s] list"
-msgstr "Sing-Box URLTest 节点 [%s] 列表"
+msgstr "Sing-Box URLTest 節點 [%s] 列表"
 
 msgid "Node [%s] preproxy node"
-msgstr "节点 [%s] 前置代理节点"
+msgstr "節點 [%s] 前置代理節點"
 
 msgid "Node [%s] landing node"
-msgstr "节点 [%s] 落地节点"
+msgstr "節點 [%s] 落地節點"
 
 msgid "Skipping the %s node is due to incompatibility with the %s core program or incorrect node usage type settings."
-msgstr "跳过 %s 节点，因未适配到 %s 核心程序，或未正确設置节点使用类型。"
+msgstr "跳過 %s 節點，因未適配到 %s 核心程序，或未正確設置節點使用類型。"
 
 msgid "Skip node: %s. Because Sing-Box does not support the %s protocol's %s transmission method, Xray needs to be used instead."
-msgstr "跳过节点：%s，因 Sing-Box 不支持 %s 协议的 %s 传输方式，需更换 Xray。"
+msgstr "跳過節點：%s，因 Sing-Box 不支持 %s 協議的 %s 傳輸方式，需更換 Xray。"
 
 msgid "Xray unsupport %s plugin."
 msgstr "Xray 不支持 %s 插件。"
@@ -2165,85 +2180,88 @@ msgid "shadowsocks-libev unsupport 2022 encryption."
 msgstr "shadowsocks-libev 不支持2022加密。"
 
 msgid "Please replace Xray or Sing-Box to support more transmission methods in Shadowsocks."
-msgstr "请更换 Xray 或 Sing-Box 来支持 Shadowsocks 更多的传输方式。"
+msgstr "請更換 Xray 或 Sing-Box 來支持 Shadowsocks 更多的傳輸方式。"
 
 msgid "unsupport %s plugin."
 msgstr "不支持 %s 插件。"
 
 msgid "Skip the %s node because the %s core program is not installed."
-msgstr "跳过 %s 节点，因未安装 %s 核心程序 %s。"
+msgstr "跳過 %s 節點，因未安装 %s 核心程序 %s。"
 
 msgid "Skip the %s node, as %s type nodes require Sing-Box version 1.12 or higher."
-msgstr "跳过 %s 节点，因 %s 类型的节点需要 Sing-Box 1.12 以上版本支持。"
+msgstr "跳過 %s 節點，因 %s 類型的節點需要 Sing-Box 1.12 以上版本支持。"
 
 msgid "%s type node subscriptions are not currently supported, skip this node."
-msgstr "暂時不支持 %s 类型的节点订阅，跳过此节点。"
+msgstr "暫時不支持 %s 類型的節點訂閱，跳過此節點。"
 
 msgid "Update [%s]"
-msgstr "'更新【%s】"
+msgstr "更新【%s】"
 
 msgid "Matching node:"
-msgstr "匹配节点："
+msgstr "匹配節點："
 
 msgid "First Matching node:"
-msgstr "第一匹配节点："
+msgstr "第一匹配節點："
 
 msgid "Second Matching node:"
-msgstr "第二匹配节点："
+msgstr "第二匹配節點："
 
 msgid "Third Matching node:"
-msgstr "第三匹配节点："
+msgstr "第三匹配節點："
 
 msgid "Fourth Matching node:"
-msgstr "第四匹配节点："
+msgstr "第四匹配節點："
 
 msgid "Fifth Matching node:"
-msgstr "第五匹配节点："
+msgstr "第五匹配節點："
 
 msgid "Unable to find the best matching node, now replaced with:"
-msgstr "无法找到最匹配的节点，當前已更换为："
+msgstr "無法找到最匹配的節點，當前已更換為："
+
+msgid "Unable to find a new node. Please confirm and process manually."
+msgstr "無法匹配到新的節點，請手動確認處理。"
 
 msgid "No node information updates are available."
-msgstr "没有可用的节点信息更新。"
+msgstr "沒有可用的節點信息更新。"
 
 msgid "Skip unknown types:"
-msgstr "跳过未知类型："
+msgstr "跳過未知類型："
 
 msgid "Discard node: %s, Reason:"
-msgstr "丢弃节点: %s ，原因："
+msgstr "丟棄節點: %s ，原因："
 
 msgid "No usable binary was found."
-msgstr "找不到可使用二进制。"
+msgstr "找不到可使用二進制。"
 
 msgid "Discard filter nodes: %s type node %s"
-msgstr "丢弃过滤节点: %s 类型节点 %s"
+msgstr "丟棄過濾節點: %s 類型節點 %s"
 
 msgid "Parsing error, skip this node."
-msgstr "解析错误，跳过此节点。"
+msgstr "解析錯誤，跳過此節點。"
 
 msgid "Successfully resolved the [%s] node, number: %s"
-msgstr "成功解析【%s】节点，數量：%s"
+msgstr "成功解析【%s】節點，數量：%s"
 
 msgid "Get subscription content for [%s] is empty. This may be due to an invalid subscription address or a network problem. Please diagnose the issue!"
-msgstr "获取到的【%s】订阅内容为空，可能是订阅地址无效，或是網絡问题，请诊断！"
+msgstr "獲取到的【%s】訂閱內容為空，可能是訂閱地址無效，或是網絡問題，請診斷！"
 
 msgid "Proxy"
 msgstr "代理"
 
 msgid "Start subscribing..."
-msgstr "開始订阅..."
+msgstr "開始訂閱..."
 
 msgid "Start subscribing: %s"
-msgstr "開始订阅：%s"
+msgstr "開始訂閱：%s"
 
 msgid "Subscription: [%s] No changes, no update required."
-msgstr "订阅:【%s】没有变化，无需更新。"
+msgstr "訂閱:【%s】沒有變化，無需更新。"
 
 msgid "[%s] Subscription failed. This could be due to an invalid subscription address or a network issue. Please diagnose the problem! [%s]"
-msgstr "【%s】订阅失败，可能是订阅地址无效，或是網絡问题，请诊断！[%s]"
+msgstr "【%s】訂閱失敗，可能是訂閱地址無效，或是網絡問題，請診斷！[%s]"
 
 msgid "Error, restoring service."
-msgstr "發生错误, 正在恢復服務。"
+msgstr "發生錯誤, 正在恢復服務。"
 
 msgid "Subscription complete..."
-msgstr "订阅完毕..."
+msgstr "訂閱完毕..."
diff --git a/luci-app-passwall2/root/usr/share/passwall2/haproxy.lua b/luci-app-passwall2/root/usr/share/passwall2/haproxy.lua
index 11c8bcc0f..a800c3433 100644
--- a/luci-app-passwall2/root/usr/share/passwall2/haproxy.lua
+++ b/luci-app-passwall2/root/usr/share/passwall2/haproxy.lua
@@ -7,9 +7,7 @@ local jsonc = api.jsonc
 local uci = api.uci
 local sys = api.sys
 
-local log = function(...)
-	api.log(...)
-end
+local log = api.log
 
 function get_ip_port_from(str)
 	local result_port = sys.exec("echo -n " .. str .. " | sed -n 's/^.*[:#]\\([0-9]*\\)$/\\1/p'")
@@ -40,8 +38,8 @@ local bind_local = uci:get(appname, "@global_haproxy[0]", "bind_local") or "0"
 local bind_address = "0.0.0.0"
 if bind_local == "1" then bind_address = "127.0.0.1" end
 
-log("HAProxy: ")
-log("  * " .. api.i18n.translatef("Console Port: %s", console_port))
+log(0, "HAProxy: ")
+log(1, api.i18n.translatef("Console Port: %s", console_port))
 fs.mkdir(haproxy_path)
 local haproxy_file = haproxy_path .. "/" .. haproxy_conf
 
@@ -150,7 +148,7 @@ uci:foreach(appname, "haproxy_config", function(t)
 			t.server_port = server_port
 			table.insert(listens[listen_port], t)
 		else
-			log("  - " .. api.i18n.translate("Discard one obviously invalid node."))
+			log(1, api.i18n.translate("Discard one obviously invalid node."))
 		end
 	end
 end)
@@ -164,7 +162,7 @@ end
 table.sort(sortTable, function(a,b) return (a < b) end)
 
 for i, port in pairs(sortTable) do
-	log("  +  " .. api.i18n.translatef("Entrance %s:%s", bind_address, port))
+	log(1, api.i18n.translatef("Entrance %s:%s", bind_address, port))
 
 	f_out:write("\n" .. string.format([[
 listen %s
@@ -210,7 +208,7 @@ listen %s
 			sys.call(string.format("/usr/share/passwall2/app.sh add_ip2route %s %s", o.origin_address, o.export))
 		end
 
-		log(string.format("  | - " .. api.i18n.translatef("Node: %s:%s, Weight: %s", o.origin_address, o.origin_port, o.lbweight)))
+		log(2, string.format(api.i18n.translatef("Node: %s:%s, Weight: %s", o.origin_address, o.origin_port, o.lbweight)))
 	end
 end
 
diff --git a/luci-app-passwall2/root/usr/share/passwall2/helper_dnsmasq.lua b/luci-app-passwall2/root/usr/share/passwall2/helper_dnsmasq.lua
index 8b35c6d3c..a8247e9de 100644
--- a/luci-app-passwall2/root/usr/share/passwall2/helper_dnsmasq.lua
+++ b/luci-app-passwall2/root/usr/share/passwall2/helper_dnsmasq.lua
@@ -84,7 +84,7 @@ function restart(var)
 	local LOG = var["-LOG"]
 	sys.call("/etc/init.d/dnsmasq restart >/dev/null 2>&1")
 	if LOG == "1" then
-		api.log(api.i18n.translate("Restart dnsmasq service."))
+		api.log(0, api.i18n.translate("Restart dnsmasq service."))
 	end
 end
 
@@ -111,7 +111,7 @@ function logic_restart(var)
 		sys.call("/etc/init.d/dnsmasq restart >/dev/null 2>&1")
 	end
 	if LOG == "1" then
-		api.log(api.i18n.translate("Restart dnsmasq service."))
+		api.log(0, api.i18n.translate("Restart dnsmasq service."))
 	end
 end
 
diff --git a/luci-app-passwall2/root/usr/share/passwall2/rule_update.lua b/luci-app-passwall2/root/usr/share/passwall2/rule_update.lua
index ac8beccab..f817bd6f2 100755
--- a/luci-app-passwall2/root/usr/share/passwall2/rule_update.lua
+++ b/luci-app-passwall2/root/usr/share/passwall2/rule_update.lua
@@ -3,6 +3,7 @@
 local api = require "luci.passwall2.api"
 local name = api.appname
 local fs = api.fs
+local log = api.log
 local sys = api.sys
 local uci = api.uci
 local jsonc = api.jsonc
@@ -19,24 +20,11 @@ local asset_location = uci:get_first(name, 'global_rules', "v2ray_location_asset
 -- Custom geo file
 local geoip_api = uci:get_first(name, 'global_rules', "geoip_url", "https://api.github.com/repos/Loyalsoldier/v2ray-rules-dat/releases/latest")
 local geosite_api = uci:get_first(name, 'global_rules', "geosite_url", "https://api.github.com/repos/Loyalsoldier/v2ray-rules-dat/releases/latest")
---
-local use_nft = uci:get(name, "@global_forwarding[0]", "use_nft") or "0"
 
 if arg3 == "cron" then
 	arg2 = nil
 end
 
-local log = function(...)
-	if arg1 then
-		if arg1 == "log" then
-			api.log(...)
-		elseif arg1 == "print" then
-			local result = os.date("%Y-%m-%d %H:%M:%S: ") .. table.concat({...}, " ")
-			print(result)
-		end
-	end
-end
-
 -- curl
 local function curl(url, file)
 	local args = {
@@ -68,7 +56,7 @@ local function fetch_geoip()
 						if fs.access(asset_location .. "geoip.dat") then
 							sys.call(string.format("cp -f %s %s", asset_location .. "geoip.dat", "/tmp/geoip.dat"))
 							if sys.call('sha256sum -c /tmp/geoip.dat.sha256sum > /dev/null 2>&1') == 0 then
-								log(api.i18n.translatef("%s version is the same and does not need to be updated.", "geoip"))
+								log(1, api.i18n.translatef("%s version is the same and does not need to be updated.", "geoip"))
 								return 1
 							end
 						end
@@ -78,10 +66,10 @@ local function fetch_geoip()
 								if sys.call('sha256sum -c /tmp/geoip.dat.sha256sum > /dev/null 2>&1') == 0 then
 									sys.call(string.format("mkdir -p %s && cp -f %s %s", asset_location, "/tmp/geoip.dat", asset_location .. "geoip.dat"))
 									reboot = 1
-									log(api.i18n.translatef("%s update success.", "geoip"))
+									log(1, api.i18n.translatef("%s update success.", "geoip"))
 									return 1
 								else
-									log(api.i18n.translatef("%s update failed, please try again later.", "geoip"))
+									log(1, api.i18n.translatef("%s update failed, please try again later.", "geoip"))
 								end
 								break
 							end
@@ -92,7 +80,7 @@ local function fetch_geoip()
 			end
 		end
 		if json.message then
-			log(json.message)
+			log(2, json.message)
 		end
 	end,
 	function(e)
@@ -120,7 +108,7 @@ local function fetch_geosite()
 						if fs.access(asset_location .. "geosite.dat") then
 							sys.call(string.format("cp -f %s %s", asset_location .. "geosite.dat", "/tmp/geosite.dat"))
 							if sys.call('sha256sum -c /tmp/geosite.dat.sha256sum > /dev/null 2>&1') == 0 then
-								log(api.i18n.translatef("%s version is the same and does not need to be updated.", "geosite"))
+								log(1, api.i18n.translatef("%s version is the same and does not need to be updated.", "geosite"))
 								return 1
 							end
 						end
@@ -130,10 +118,10 @@ local function fetch_geosite()
 								if sys.call('sha256sum -c /tmp/geosite.dat.sha256sum > /dev/null 2>&1') == 0 then
 									sys.call(string.format("mkdir -p %s && cp -f %s %s", asset_location, "/tmp/geosite.dat", asset_location .. "geosite.dat"))
 									reboot = 1
-									log(api.i18n.translatef("%s update success.", "geosite"))
+									log(1, api.i18n.translatef("%s update success.", "geosite"))
 									return 1
 								else
-									log(api.i18n.translatef("%s update failed, please try again later.", "geosite"))
+									log(1, api.i18n.translatef("%s update failed, please try again later.", "geosite"))
 								end
 								break
 							end
@@ -144,7 +132,7 @@ local function fetch_geosite()
 			end
 		end
 		if json.message then
-			log(json.message)
+			log(2, json.message)
 		end
 	end,
 	function(e)
@@ -170,17 +158,17 @@ if geoip_update == 0 and geosite_update == 0 then
 	os.exit(0)
 end
 
-log(api.i18n.translate("Start updating the rules..."))
+log(0, api.i18n.translate("Start updating the rules..."))
 
 if tonumber(geoip_update) == 1 then
-	log(api.i18n.translatef("%s Start updating...", "geoip"))
+	log(1, api.i18n.translatef("%s Start updating...", "geoip"))
 	local status = fetch_geoip()
 	os.remove("/tmp/geoip.dat")
 	os.remove("/tmp/geoip.dat.sha256sum")
 end
 
 if tonumber(geosite_update) == 1 then
-	log(api.i18n.translatef("%s Start updating...", "geosite"))
+	log(1, api.i18n.translatef("%s Start updating...", "geosite"))
 	local status = fetch_geosite()
 	os.remove("/tmp/geosite.dat")
 	os.remove("/tmp/geosite.dat.sha256sum")
@@ -197,8 +185,8 @@ if reboot == 1 then
 		end
 	end
 
-	log(api.i18n.translate("Restart the service and apply the new rules."))
+	log(1, api.i18n.translate("Restart the service and apply the new rules."))
 	uci:set(name, "@global[0]", "flush_set", "1")
 	api.uci_save(uci, name, true, true)
 end
-log(api.i18n.translate("The rules have been updated..."))
+log(0, api.i18n.translate("The rules have been updated..."))
diff --git a/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua b/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
index 46ab0cd6c..984f008ee 100755
--- a/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
+++ b/luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
@@ -19,6 +19,7 @@ local jsonParse, jsonStringify = luci.jsonc.parse, luci.jsonc.stringify
 local base64Decode = api.base64Decode
 local uci = api.uci
 local fs = api.fs
+local log = api.log
 local i18n = api.i18n
 uci:revert(appname)
 
@@ -98,17 +99,6 @@ local function is_filter_keyword(value)
 end
 
 local nodeResult = {} -- update result
-local debug = false
-
-local log = function(...)
-	if debug == true then
-		local result = os.date("%Y-%m-%d %H:%M:%S: ") .. table.concat({...}, " ")
-		print(result)
-	else
-		api.log(...)
-	end
-end
-
 local nodes_table = {}
 for k, e in ipairs(api.get_valid_nodes()) do
 	if e.node_type == "normal" then
@@ -458,7 +448,7 @@ local function set_ss_implementation(result)
 		result.type = 'sing-box'
 		result.protocol = 'shadowsocks'
 	else
-		log(i18n.translatef("Skipping the %s node is due to incompatibility with the %s core program or incorrect node usage type settings.", "SS", "SS"))
+		log(2, i18n.translatef("Skipping the %s node is due to incompatibility with the %s core program or incorrect node usage type settings.", "SS", "SS"))
 		return nil
 	end
 	return result
@@ -466,7 +456,7 @@ end
 
 -- Processing data
 local function processData(szType, content, add_mode, group)
-	--log(content, add_mode, group)
+	--log(2, content, add_mode, group)
 	local result = {
 		timeout = 60,
 		add_mode = add_mode, -- `0` for manual configuration, `1` for import, `2` for subscription
@@ -475,7 +465,7 @@ local function processData(szType, content, add_mode, group)
 	--ssr://base64(host:port:protocol:method:obfs:base64pass/?obfsparam=base64param&protoparam=base64param&remarks=base64remarks&group=base64group&udpport=0&uot=0)
 	if szType == 'ssr' then
 		if not has_ssr then
-			log(i18n.translatef("Skipping the %s node is due to incompatibility with the %s core program or incorrect node usage type settings.", "SSR", "shadowsocksr-libev"))
+			log(2, i18n.translatef("Skipping the %s node is due to incompatibility with the %s core program or incorrect node usage type settings.", "SSR", "shadowsocksr-libev"))
 			return nil
 		end
 		result.type = "SSR"
@@ -499,8 +489,8 @@ local function processData(szType, content, add_mode, group)
 		end
 		result.obfs_param = base64Decode(params.obfsparam)
 		result.protocol_param = base64Decode(params.protoparam)
-		local group = base64Decode(params.group)
-		if group then result.group = group end
+		-- local ssr_group = base64Decode(params.group)
+		-- if ssr_group then result.ssr_group = ssr_group end
 		result.remarks = base64Decode(params.remarks)
 	elseif szType == 'vmess' then
 		local info = jsonParse(content)
@@ -509,7 +499,7 @@ local function processData(szType, content, add_mode, group)
 		elseif vmess_type_default == "xray" and has_xray then
 			result.type = "Xray"
 		else
-			log(i18n.translatef("Skipping the %s node is due to incompatibility with the %s core program or incorrect node usage type settings.", "VMess", "VMess"))
+			log(2, i18n.translatef("Skipping the %s node is due to incompatibility with the %s core program or incorrect node usage type settings.", "VMess", "VMess"))
 			return nil
 		end
 		result.alter_id = info.aid
@@ -623,7 +613,7 @@ local function processData(szType, content, add_mode, group)
 		end
 
 		if result.type == "sing-box" and (result.transport == "mkcp" or result.transport == "xhttp") then
-			log(i18n.translatef("Skip node: %s. Because Sing-Box does not support the %s protocol's %s transmission method, Xray needs to be used instead.", result.remarks, szType, result.transport))
+			log(2, i18n.translatef("Skip node: %s. Because Sing-Box does not support the %s protocol's %s transmission method, Xray needs to be used instead.", result.remarks, szType, result.transport))
 			return nil
 		end
 	elseif szType == "ss" then
@@ -931,7 +921,7 @@ local function processData(szType, content, add_mode, group)
 			result.type = 'Xray'
 			result.protocol = 'trojan'
 		else
-			log(i18n.translatef("Skipping the %s node is due to incompatibility with the %s core program or incorrect node usage type settings.", "Trojan", "Trojan"))
+			log(2, i18n.translatef("Skipping the %s node is due to incompatibility with the %s core program or incorrect node usage type settings.", "Trojan", "Trojan"))
 			return nil
 		end
 		
@@ -1077,7 +1067,7 @@ local function processData(szType, content, add_mode, group)
 			result.alpn = params.alpn
 
 			if result.type == "sing-box" and (result.transport == "mkcp" or result.transport == "xhttp") then
-				log(i18n.translatef("Skip node: %s. Because Sing-Box does not support the %s protocol's %s transmission method, Xray needs to be used instead.", result.remarks, szType, result.transport))
+				log(2, i18n.translatef("Skip node: %s. Because Sing-Box does not support the %s protocol's %s transmission method, Xray needs to be used instead.", result.remarks, szType, result.transport))
 				return nil
 			end
 		end
@@ -1098,7 +1088,7 @@ local function processData(szType, content, add_mode, group)
 		elseif vless_type_default == "xray" and has_xray then
 			result.type = "Xray"
 		else
-			log(i18n.translatef("Skipping the %s node is due to incompatibility with the %s core program or incorrect node usage type settings.", "VLESS", "VLESS"))
+			log(2, i18n.translatef("Skipping the %s node is due to incompatibility with the %s core program or incorrect node usage type settings.", "VLESS", "VLESS"))
 			return nil
 		end
 		result.protocol = "vless"
@@ -1212,7 +1202,7 @@ local function processData(szType, content, add_mode, group)
 				result.xhttp_path = params.path
 				result.xhttp_mode = params.mode or "auto"
 				result.use_xhttp_extra = (params.extra and params.extra ~= "") and "1" or nil
-				result.xhttp_extra = (params.extra and params.extra ~= "") and params.extra or nil
+				result.xhttp_extra = (params.extra and params.extra ~= "") and api.base64Encode(params.extra) or nil
 				local success, Data = pcall(jsonParse, params.extra)
 				if success and Data then
 					local address = (Data.extra and Data.extra.downloadSettings and Data.extra.downloadSettings.address)
@@ -1264,7 +1254,7 @@ local function processData(szType, content, add_mode, group)
 			end
 
 			if result.type == "sing-box" and (result.transport == "mkcp" or result.transport == "xhttp") then
-				log(i18n.translatef("Skip node: %s. Because Sing-Box does not support the %s protocol's %s transmission method, Xray needs to be used instead.", result.remarks, szType, result.transport))
+				log(2, i18n.translatef("Skip node: %s. Because Sing-Box does not support the %s protocol's %s transmission method, Xray needs to be used instead.", result.remarks, szType, result.transport))
 				return nil
 			end
 		end
@@ -1273,7 +1263,7 @@ local function processData(szType, content, add_mode, group)
 			result.type = 'sing-box'
 			result.protocol = "hysteria"
 		else
-			log(i18n.translatef("Skip the %s node because the %s core program is not installed.", "Hysteria", "Hysteria", "Sing-Box"))
+			log(2, i18n.translatef("Skip the %s node because the %s core program is not installed.", "Hysteria", "Hysteria", "Sing-Box"))
 			return nil
 		end
 
@@ -1381,7 +1371,7 @@ local function processData(szType, content, add_mode, group)
 				result.hysteria2_obfs = params["obfs-password"] or params["obfs_password"]
 			end
 		else
-			log(i18n.translatef("Skipping the %s node is due to incompatibility with the %s core program or incorrect node usage type settings.", "Hysteria2", "Hysteria2"))
+			log(2, i18n.translatef("Skipping the %s node is due to incompatibility with the %s core program or incorrect node usage type settings.", "Hysteria2", "Hysteria2"))
 			return nil
 		end
 	elseif szType == 'tuic' then
@@ -1389,7 +1379,7 @@ local function processData(szType, content, add_mode, group)
 			result.type = 'sing-box'
 			result.protocol = "tuic"
 		else
-			log(i18n.translatef("Skip the %s node because the %s core program is not installed.", "Tuic", "Tuic", "Sing-Box"))
+			log(2, i18n.translatef("Skip the %s node because the %s core program is not installed.", "Tuic", "Tuic", "Sing-Box"))
 			return nil
 		end
 
@@ -1449,7 +1439,7 @@ local function processData(szType, content, add_mode, group)
 			result.type = 'sing-box'
 			result.protocol = "anytls"
 		else
-			log(i18n.translatef("Skip the %s node because the %s core program is not installed.", "AnyTLS", "AnyTLS", "Sing-Box 1.12"))
+			log(2, i18n.translatef("Skip the %s node because the %s core program is not installed.", "AnyTLS", "AnyTLS", "Sing-Box 1.12"))
 			return nil
 		end
 
@@ -1513,12 +1503,12 @@ local function processData(szType, content, add_mode, group)
 			local singbox_version = api.get_app_version("sing-box")
 			local version_ge_1_12 = api.compare_versions(singbox_version:match("[^v]+"), ">=", "1.12.0")
 			if not has_singbox or not version_ge_1_12 then
-				log(i18n.translatef("Skip the %s node, as %s type nodes require Sing-Box version 1.12 or higher.", result.remarks, szType))
+				log(2, i18n.translatef("Skip the %s node, as %s type nodes require Sing-Box version 1.12 or higher.", result.remarks, szType))
 				return nil
 			end
 		end
 	else
-		log(i18n.translatef("%s type node subscriptions are not currently supported, skip this node.", szType))
+		log(2, i18n.translatef("%s type node subscriptions are not currently supported, skip this node.", szType))
 		return nil
 	end
 	if not result.remarks or result.remarks == "" then
@@ -1597,6 +1587,10 @@ local function truncate_nodes(group)
 end
 
 local function select_node(nodes, config, parentConfig)
+	local log_level = 1
+	if parentConfig then
+		log_level = log_level + 1
+	end
 	if config.currentNode then
 		local server
 		-- Special priority: cfgid
@@ -1604,7 +1598,7 @@ local function select_node(nodes, config, parentConfig)
 			for index, node in pairs(nodes) do
 				if node[".name"] == config.currentNode[".name"] then
 					if config.log == nil or config.log == true then
-						log(i18n.translatef("Update [%s]", config.remarks) .. " " .. i18n.translatef("Matching node:") .. " " .. node.remarks)
+						log(log_level, i18n.translatef("Update [%s]", config.remarks) .. " " .. i18n.translatef("Matching node:") .. " " .. node.remarks)
 					end
 					server = node[".name"]
 					break
@@ -1618,7 +1612,7 @@ local function select_node(nodes, config, parentConfig)
 					if node.type and node.remarks and node.address and node.port then
 						if node.type == config.currentNode.type and node.remarks == config.currentNode.remarks and (node.address .. ':' .. node.port == config.currentNode.address .. ':' .. config.currentNode.port) then
 							if config.log == nil or config.log == true then
-								log(i18n.translatef("Update [%s]", config.remarks) .. " " .. i18n.translatef("First Matching node:") .. " " .. node.remarks)
+								log(log_level, i18n.translatef("Update [%s]", config.remarks) .. " " .. i18n.translatef("First Matching node:") .. " " .. node.remarks)
 							end
 							server = node[".name"]
 							break
@@ -1634,7 +1628,7 @@ local function select_node(nodes, config, parentConfig)
 					if node.type and node.address and node.port then
 						if node.type == config.currentNode.type and (node.address .. ':' .. node.port == config.currentNode.address .. ':' .. config.currentNode.port) then
 							if config.log == nil or config.log == true then
-								log(i18n.translatef("Update [%s]", config.remarks) .. " " .. i18n.translatef("Second Matching node:") .. " " .. node.remarks)
+								log(log_level, i18n.translatef("Update [%s]", config.remarks) .. " " .. i18n.translatef("Second Matching node:") .. " " .. node.remarks)
 							end
 							server = node[".name"]
 							break
@@ -1650,7 +1644,7 @@ local function select_node(nodes, config, parentConfig)
 					if node.address and node.port then
 						if node.address .. ':' .. node.port == config.currentNode.address .. ':' .. config.currentNode.port then
 							if config.log == nil or config.log == true then
-								log(i18n.translatef("Update [%s]", config.remarks) .. " " .. i18n.translatef("Third Matching node:") .. " " .. node.remarks)
+								log(log_level, i18n.translatef("Update [%s]", config.remarks) .. " " .. i18n.translatef("Third Matching node:") .. " " .. node.remarks)
 							end
 							server = node[".name"]
 							break
@@ -1666,7 +1660,7 @@ local function select_node(nodes, config, parentConfig)
 					if node.address then
 						if node.address == config.currentNode.address then
 							if config.log == nil or config.log == true then
-								log(i18n.translatef("Update [%s]", config.remarks) .. " " .. i18n.translatef("Fourth Matching node:") .. " " .. node.remarks)
+								log(log_level, i18n.translatef("Update [%s]", config.remarks) .. " " .. i18n.translatef("Fourth Matching node:") .. " " .. node.remarks)
 							end
 							server = node[".name"]
 							break
@@ -1682,7 +1676,7 @@ local function select_node(nodes, config, parentConfig)
 					if node.remarks then
 						if node.remarks == config.currentNode.remarks then
 							if config.log == nil or config.log == true then
-								log(i18n.translatef("Update [%s]", config.remarks) .. " " .. i18n.translatef("Fifth Matching node:") .. " " .. node.remarks)
+								log(log_level, i18n.translatef("Update [%s]", config.remarks) .. " " .. i18n.translatef("Fifth Matching node:") .. " " .. node.remarks)
 							end
 							server = node[".name"]
 							break
@@ -1696,7 +1690,7 @@ local function select_node(nodes, config, parentConfig)
 			if not server then
 				if #nodes_table > 0 then
 					if config.log == nil or config.log == true then
-						log(i18n.translatef("Update [%s]", config.remarks) .. " " .. i18n.translatef("Unable to find the best matching node, now replaced with:") .. " " .. nodes_table[1].remarks)
+						log(log_level, i18n.translatef("Update [%s]", config.remarks) .. " " .. i18n.translatef("Unable to find the best matching node, now replaced with:") .. " " .. nodes_table[1].remarks)
 					end
 					server = nodes_table[1][".name"]
 				end
@@ -1718,7 +1712,7 @@ end
 
 local function update_node(manual)
 	if next(nodeResult) == nil then
-		log(i18n.translatef("No node information updates are available."))
+		log(1, i18n.translatef("No node information updates are available."))
 		return
 	end
 
@@ -1786,12 +1780,15 @@ local function update_node(manual)
 		for _, config in pairs(CONFIG) do
 			if config.currentNodes and #config.currentNodes > 0 then
 				if config.remarks and config.currentNodes[1].log ~= false then
-					log('----【' .. config.remarks .. '】----')
+					log(1, i18n.translatef("Update [%s]", config.remarks))
 				end
 				for kk, vv in pairs(config.currentNodes) do
 					select_node(nodes, vv, config)
 				end
 				config.set(config)
+				if not config.newNodes or #config.newNodes == 0 then
+					log(1, i18n.translatef("[%s]", config.remarks) .. " " .. i18n.translate("Unable to find a new node. Please confirm and process manually."))
+				end
 			else
 				select_node(nodes, config)
 			end
@@ -1806,7 +1803,9 @@ local function update_node(manual)
 		end
 	end
 
-	luci.sys.call("/etc/init.d/" .. appname .. " restart > /dev/null 2>&1 &")
+	if manual ~= 1 then
+		luci.sys.call("/etc/init.d/" .. appname .. " restart > /dev/null 2>&1 &")
+	end
 end
 
 local function parse_link(raw, add_mode, group, cfgid)
@@ -1859,17 +1858,17 @@ local function parse_link(raw, add_mode, group, cfgid)
 							end
 						end
 					else
-						log(i18n.translatef("Skip unknown types:") .. " " .. szType)
+						log(2, i18n.translatef("Skip unknown types:") .. " " .. szType)
 					end
-					-- log(result)
+					-- log(2, result)
 					if result then
 						if result.error_msg then
-							log(i18n.translatef("Discard node: %s, Reason:", result.remarks) .. " " .. result.error_msg)
+							log(2, i18n.translatef("Discard node: %s, Reason:", result.remarks) .. " " .. result.error_msg)
 						elseif not result.type then
-							log(i18n.translatef("Discard node: %s, Reason:", result.remarks) .. " " .. i18n.translatef("No usable binary was found."))
+							log(2, i18n.translatef("Discard node: %s, Reason:", result.remarks) .. " " .. i18n.translatef("No usable binary was found."))
 						elseif (add_mode == "2" and is_filter_keyword(result.remarks)) or not result.address or result.remarks == "NULL" or result.address == "127.0.0.1" or
 								(not datatypes.hostname(result.address) and not (api.is_ip(result.address))) then
-							log(i18n.translatef("Discard filter nodes: %s type node %s", result.type, result.remarks))
+							log(2, i18n.translatef("Discard filter nodes: %s type node %s", result.type, result.remarks))
 						else
 							tinsert(node_list, result)
 						end
@@ -1878,8 +1877,8 @@ local function parse_link(raw, add_mode, group, cfgid)
 						end
 					end
 				end, function (err)
-					--log(err)
-					log(v, i18n.translatef("Parsing error, skip this node."))
+					--log(2, err)
+					log(2, v, i18n.translatef("Parsing error, skip this node."))
 				end
 			)
 			end
@@ -1890,10 +1889,10 @@ local function parse_link(raw, add_mode, group, cfgid)
 				list = node_list
 			}
 		end
-		log(i18n.translatef("Successfully resolved the [%s] node, number: %s", group, #node_list))
+		log(2, i18n.translatef("Successfully resolved the [%s] node, number: %s", group, #node_list))
 	else
 		if add_mode == "2" then
-			log(i18n.translatef("Get subscription content for [%s] is empty. This may be due to an invalid subscription address or a network problem. Please diagnose the issue!", group))
+			log(2, i18n.translatef("Get subscription content for [%s] is empty. This may be due to an invalid subscription address or a network problem. Please diagnose the issue!", group))
 		end
 	end
 end
@@ -1984,7 +1983,7 @@ local execute = function()
 			local ua = value.user_agent
 			local access_mode = value.access_mode
 			local result = (not access_mode) and i18n.translatef("Auto") or (access_mode == "direct" and i18n.translatef("Direct") or (access_mode == "proxy" and i18n.translatef("Proxy") or i18n.translatef("Auto")))
-			log(i18n.translatef("Start subscribing: %s", '【' .. remark .. '】' .. url .. ' [' .. result .. ']'))
+			log(1, i18n.translatef("Start subscribing: %s", '【' .. remark .. '】' .. url .. ' [' .. result .. ']'))
 			local tmp_file = "/tmp/" .. cfgid
 			value.http_code = curl(url, tmp_file, ua, access_mode)
 			if value.http_code ~= 200 then
@@ -1998,7 +1997,7 @@ local execute = function()
 					local old_md5 = value.md5 or ""
 					local new_md5 = luci.sys.exec("md5sum " .. tmp_file .. " 2>/dev/null | awk '{print $1}'"):gsub("\n", "")
 					if not manual_sub and old_md5 == new_md5 then
-						log(i18n.translatef("Subscription: [%s] No changes, no update required.", remark))
+						log(1, i18n.translatef("Subscription: [%s] No changes, no update required.", remark))
 					else
 						parse_link(raw_data, "2", remark, cfgid)
 						uci:set(appname, cfgid, "md5", new_md5)
@@ -2021,7 +2020,7 @@ local execute = function()
 
 		if #fail_list > 0 then
 			for index, value in ipairs(fail_list) do
-				log(i18n.translatef("[%s] Subscription failed. This could be due to an invalid subscription address or a network issue. Please diagnose the problem! [%s]", value.remark, tostring(value.http_code)))
+				log(1, i18n.translatef("[%s] Subscription failed. This could be due to an invalid subscription address or a network issue. Please diagnose the problem! [%s]", value.remark, tostring(value.http_code)))
 			end
 		end
 		update_node(0)
@@ -2030,13 +2029,13 @@ end
 
 if arg[1] then
 	if arg[1] == "start" then
-		log(i18n.translatef("Start subscribing..."))
+		log(0, i18n.translatef("Start subscribing..."))
 		xpcall(execute, function(e)
-			log(e)
-			log(debug.traceback())
-			log(i18n.translatef("Error, restoring service."))
+			log(1, e)
+			log(1, debug.traceback())
+			log(1, i18n.translatef("Error, restoring service."))
 		end)
-		log(i18n.translatef("Subscription complete...") .. "\n")
+		log(0, i18n.translatef("Subscription complete...") .. "\n")
 	elseif arg[1] == "add" then
 		local f = assert(io.open("/tmp/links.conf", 'r'))
 		local raw = f:read('*all')
diff --git a/xray-core/Makefile b/xray-core/Makefile
index 33d4fb48d..f7dc4c694 100644
--- a/xray-core/Makefile
+++ b/xray-core/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xray-core
-PKG_VERSION:=25.10.15
+PKG_VERSION:=25.12.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=5df030f456db58b682110545e19da9b971303387955562ec408f484580450736
+PKG_HASH:=f1ab22b87e9e446d5e96cb00a8593b85826cc8a1bbc960e0eb0081293d6a32ab
 
 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 PKG_LICENSE:=MPL-2.0