chore: refine

Author: vernesong

luci-app-openclash/luasrc/controller/openclash.lua

@@ -74,6 +74,8 @@ function index()
 	entry({"admin", "services", "openclash", "manual_stream_unlock_test"}, call("manual_stream_unlock_test"))
 	entry({"admin", "services", "openclash", "all_proxies_stream_test"}, call("all_proxies_stream_test"))
 	entry({"admin", "services", "openclash", "set_subinfo_url"}, call("set_subinfo_url"))
+	entry({"admin", "services", "openclash", "check_core"}, call("action_check_core"))
+	entry({"admin", "services", "openclash", "core_download"}, call("core_download"))
 	entry({"admin", "services", "openclash", "settings"},cbi("openclash/settings"),_("Plugin Settings"), 30).leaf = true
 	entry({"admin", "services", "openclash", "config-overwrite"},cbi("openclash/config-overwrite"),_("Overwrite Settings"), 40).leaf = true
 	entry({"admin", "services", "openclash", "servers"},cbi("openclash/servers"),_("Onekey Create"), 50).leaf = true
@@ -229,6 +231,14 @@ local function coremodel()
 	end
 end
 
+local function check_core()
+	if not nixio.fs.access(dev_core_path) and not nixio.fs.access(tun_core_path) and not nixio.fs.access(meta_core_path) then
+		return "0"
+	else
+		return "1"
+	end
+end
+
 local function corecv()
 	if not nixio.fs.access(dev_core_path) then
 		return "0"
@@ -334,6 +344,24 @@ local function historychecktime()
 	end
 end
 
+function core_download()
+	if uci:get("openclash", "config", "github_address_mod") == "0" or not uci:get("openclash", "config", "github_address_mod") then
+		uci:set("openclash", "config", "github_address_mod", "https://testingcf.jsdelivr.net/")
+		uci:commit("openclash")
+		luci.sys.call("rm -rf /tmp/clash_last_version 2>/dev/null && bash /usr/share/openclash/clash_version.sh >/dev/null 2>&1")
+		luci.sys.call("bash /usr/share/openclash/openclash_core.sh 'Dev' >/dev/null 2>&1 &")
+		luci.sys.call("bash /usr/share/openclash/openclash_core.sh 'TUN' >/dev/null 2>&1 &")
+		luci.sys.call("bash /usr/share/openclash/openclash_core.sh 'Meta' >/dev/null 2>&1 &")
+		uci:set("openclash", "config", "github_address_mod", "0")
+		uci:commit("openclash")
+	else
+		luci.sys.call("rm -rf /tmp/clash_last_version 2>/dev/null && bash /usr/share/openclash/clash_version.sh >/dev/null 2>&1")
+		luci.sys.call("bash /usr/share/openclash/openclash_core.sh 'Dev' >/dev/null 2>&1 &")
+		luci.sys.call("bash /usr/share/openclash/openclash_core.sh 'TUN' >/dev/null 2>&1 &")
+		luci.sys.call("bash /usr/share/openclash/openclash_core.sh 'Meta' >/dev/null 2>&1 &")
+	end
+end
+
 function download_rule()
 	local filename = luci.http.formvalue("filename")
 	local state = luci.sys.call(string.format('/usr/share/openclash/openclash_download_rule_list.sh "%s" >/dev/null 2>&1',filename))
@@ -375,7 +403,6 @@ function action_restore_config()
 	luci.sys.call("cp /usr/share/openclash/backup/openclash_sniffing* /etc/openclash/custom/ >/dev/null 2>&1 &")
 	luci.sys.call("cp /usr/share/openclash/backup/yml_change.sh /usr/share/openclash/yml_change.sh >/dev/null 2>&1 &")
 	luci.sys.call("rm -rf /etc/openclash/history/* >/dev/null 2>&1 &")
-	luci.http.redirect(luci.dispatcher.build_url('admin/services/openclash/settings'))
 end
 
 function action_remove_all_core()
@@ -1114,6 +1141,13 @@ function action_opupdate()
 	})
 end
 
+function action_check_core()
+	luci.http.prepare_content("application/json")
+	luci.http.write_json({
+			core_status = check_core();
+	})
+end
+
 function action_coreupdate()
 	luci.http.prepare_content("application/json")
 	luci.http.write_json({

luci-app-openclash/luasrc/model/cbi/openclash/settings.lua

@@ -164,6 +164,7 @@ end
 
 ---- Access Control
 o = s:taboption("lan_ac", ListValue, "lan_ac_mode", translate("LAN Access Control Mode"))
+o.description = font_red..bold_on..translate("To Use in Fake-IP Mode, Please Switch The Dns Redirect Mode To Firewall Forwarding")..bold_off..font_off
 o:value("0", translate("Black List Mode"))
 o:value("1", translate("White List Mode"))
 o.default = "0"

luci-app-openclash/luasrc/view/openclash/status.htm

@@ -451,6 +451,7 @@
 	get_run_mode();
 	state_get();
 	clashversion_check();
+	check_core();
 
 	function get_rule_mode() {
 		XHR.get('<%=luci.dispatcher.build_url("admin", "services", "openclash", "rule_mode")%>', null, function(x, status) {
@@ -693,28 +694,26 @@
     {
         btn.value    = '<%:Check All Components Update%>';
         btn.disabled = true;
-        var r = confirm("<%:Check and update all Cores and plug-ins?%>")
+        var r = confirm("<%:Check and Update all Cores and OpenClash?%>")
         if (r == true) {
-        XHR.get('<%=luci.dispatcher.build_url("admin", "services", "openclash", "one_key_update_check")%>', null, function(x, status) {
-        	if ( x && x.status == 200 ) {
-        		if ( status.corever != "0" ) {
-        			XHR.get('<%=luci.dispatcher.build_url("admin", "services", "openclash", "one_key_update")%>', null, function(x, status) {
-              	if ( x && x.status != 200 ) {
-            			alert('<%:Check failed, Please try again later!%>')
-           			}
-              });
-						}
-						else {
-							alert('<%:No compiled version is selected. Please configure it in the General Settings tab!%>')
-           	}
-        	}
-          else {
-            alert('<%:Check failed, Please try again later!%>')
-          }
-        });
+			XHR.get('<%=luci.dispatcher.build_url("admin", "services", "openclash", "one_key_update_check")%>', null, function(x, status) {
+				if ( x && x.status == 200 ) {
+					if ( status.corever != "0" ) {
+						XHR.get('<%=luci.dispatcher.build_url("admin", "services", "openclash", "one_key_update")%>', null, function(x, status) {
+							if ( x && x.status != 200 ) {
+								alert('<%:Check failed, Please try again later!%>')
+							}
+						});
+					}
+					else {
+						alert('<%:No compiled version is selected. Please configure it in the General Settings tab!%>')
+					}
 				}
 				else {
-        }
+					alert('<%:Check failed, Please try again later!%>')
+				}
+			});
+		}
         btn.disabled = false;
         return false; 
     };
@@ -730,7 +729,7 @@
         }
         else {
         	btn.disabled = false;
-          btn.value    = '<%:Check Third Party Rules Update%>';
+        	btn.value    = '<%:Check Third Party Rules Update%>';
         }
         return false;
         });
@@ -989,5 +988,24 @@
        url4='https://github.com/vernesong/OpenClash/releases';
        winOpen(url4);
     };
+
+	function check_core()
+	{
+		XHR.get('<%=luci.dispatcher.build_url("admin", "services", "openclash", "check_core")%>', null, function(x, status) {
+			if ( x && x.status == 200 ) {
+        		if ( status.core_status != "1" )
+        		{
+            		var r = confirm("<%:You have not installed the core yet, do you want to download and install it now?%>")
+					if (r == true) {
+						XHR.get('<%=luci.dispatcher.build_url("admin", "services", "openclash", "core_download")%>', null, function(x, status) {
+							if ( x && x.status == 200 ) {
+								window.location.href='<%="'+window.location.protocol+'//'+window.location.hostname+'/cgi-bin/luci/admin/services/openclash/log"%>';
+							}
+						});
+					}
+        		}
+    		}
+        });
+	};
 //]]></script>
 

luci-app-openclash/luasrc/view/openclash/update.htm

@@ -513,7 +513,7 @@
 			if (x && x.status == 200) {
 				btn.value    = '<%:One Click Check Update%>';
 				btn.disabled = true;
-				var r = confirm("<%:Check and update all Cores and plug-ins?%>")
+				var r = confirm("<%:Check and Update all Cores and OpenClash?%>")
 				if (r == true) {
 					XHR.get('<%=luci.dispatcher.build_url("admin", "services", "openclash", "one_key_update_check")%>', null, function(x, status) {
 						if ( x && x.status == 200 ) {

luci-app-openclash/po/zh-cn/openclash.zh-cn.po

@@ -1260,9 +1260,12 @@ msgstr "GEOIP 数据库检查更新"
 msgid "Check GeoSite Data Update"
 msgstr "GeoSite 数据库检查更新"
 
-msgid "Check and update all Cores and plug-ins?"
+msgid "Check and Update all Cores and OpenClash?"
 msgstr "确定要一键检查并更新所有内核及插件吗？"
 
+msgid "You have not installed the core yet, do you want to download and install it now?"
+msgstr "您还未安装内核，是否立即下载安装？"
+
 msgid "Check failed, Please try again later!"
 msgstr "一键检查更新失败,请稍后再试！"
 
@@ -3481,4 +3484,7 @@ msgid "Group Use For Proxy The Fallback DNS, Preventing DNS Lookup Failures"
 msgstr "为所有 Fallback DNS 设置代理策略组，防止 DNS 查询失败"
 
 msgid "Error: Set Fallback DNS Proxy Group Failed,"
-msgstr "错误：Fallback DNS 代理策略组设置失败，"
+msgstr "错误：Fallback DNS 代理策略组设置失败，"
+
+msgid "To Use in Fake-IP Mode, Please Switch The Dns Redirect Mode To Firewall Forwarding"
+msgstr "要在 Fake-IP 模式下使用，请将 Dns 重定向模式切换为防火墙转发模式"

luci-app-openclash/root/usr/share/openclash/ui/metacubexd/CNAME

@@ -0,0 +1 @@
+d.metacubex.one