update 2025-02-27 16:26:55

luci-app-openvpn-client/Makefile

@@ -1,10 +1,10 @@
-# Copyright (C) 2021-2022 Lienol <lawlienol@gmail.com>
+# Copyright (C) 2021-2025 Lienol <lawlienol@gmail.com>
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-openvpn-client
-PKG_VERSION:=20240721
-PKG_RELEASE:=3
+PKG_VERSION:=20250227
+PKG_RELEASE:=1
 
 LUCI_TITLE:=LuCI support for OpenVPN Client
 LUCI_DEPENDS:=+openvpn-openssl +kmod-tun

luci-app-openvpn-client/luasrc/controller/openvpn-client.lua

@@ -1,4 +1,4 @@
--- Copyright 2021-2022 Lienol <lawlienol@gmail.com>
+-- Copyright 2021-2025 Lienol <lawlienol@gmail.com>
 module("luci.controller.openvpn-client", package.seeall)
 
 function index()
@@ -7,4 +7,20 @@ function index()
     entry({"admin", "vpn"}, firstchild(), "VPN", 45).dependent = false
     entry({"admin", "vpn", "openvpn-client"}, cbi("openvpn-client/settings"), _("OpenVPN Client"), 50).acl_depends = { "luci-app-openvpn-client" }
     entry({"admin", "vpn", "openvpn-client", "client"}, cbi("openvpn-client/client")).leaf = true
+
+    entry({"admin", "vpn", "openvpn-client", "log"}, call("get_log")).leaf = true
 end
+
+function get_log()
+	local fs = require "nixio.fs"
+	local i18n = require "luci.i18n"
+	local id = luci.http.formvalue("id")
+	local log_file = "/tmp/etc/openvpn-client/" .. id .. "/openvpn.log"
+	if fs.access(log_file) then
+		local content = luci.sys.exec("cat ".. log_file)
+		content = content:gsub("\n", "<br />")
+		luci.http.write(content)
+	else
+		luci.http.write(string.format("<script>alert('%s');window.close();</script>", i18n.translate("Not log")))
+	end
+end

luci-app-openvpn-client/luasrc/model/cbi/openvpn-client/settings.lua

@@ -27,18 +27,20 @@ function s.getPID(section) -- Universal function which returns valid pid # or ni
 	end
 end
 
-local active = s:option( DummyValue, "_active", translate("Status") )
+local active = s:option(DummyValue, "_active", translate("Status"))
 function active.cfgvalue(self, section)
 	local pid = s.getPID(section)
 	if pid ~= nil then
-		return (sys.process.signal(pid, 0))
-			and translate("RUNNING") .. " (" .. pid .. ")"
-			or  translate("NOT RUNNING")
+		if sys.process.signal(pid, 0) then
+			active.rawhtml = true
+			local onclick = string.format("window.open('%s', '_blank')", d.build_url("admin", "vpn", "openvpn-client", "log") .. "?id=" .. section)
+			return translate("RUNNING") .. " (" .. pid .. ")" .. '&nbsp&nbsp<a href="#" onclick="' .. onclick .. '">' .. translate("Log") .. '</a>'
+		end
 	end
 	return translate("NOT RUNNING")
 end
 
-local updown = s:option( Button, "_updown", translate("Start/Stop") )
+local updown = s:option(Button, "_updown", translate("Start/Stop"))
 updown._state = false
 updown.redirect = d.build_url(
 	"admin", "vpn", "openvpn-client"
@@ -55,8 +57,10 @@ function updown.cfgvalue(self, section)
 end
 function updown.write(self, section, value)
 	if self.option == "stop" then
+		-- RUNNING
 		sys.call("/etc/init.d/luci-app-openvpn-client stop %s" % section)
 	else
+		-- NOT RUNNING
 		sys.call("/etc/init.d/luci-app-openvpn-client start %s" % section)
 	end
 	luci.http.redirect( self.redirect )
@@ -68,4 +72,9 @@ o = s:option(DummyValue, "port", translate("Port"))
 
 o = s:option(DummyValue, "proto", translate("Protocol"))
 
+function s.remove(self, section)
+	sys.call("/etc/init.d/luci-app-openvpn-client stop %s" % section)
+	return TypedSection.remove(self, section)
+end
+
 return m

luci-app-openvpn-client/po/zh-cn/openvpn-client.po

@@ -22,6 +22,12 @@ msgstr "启动"
 msgid "stop"
 msgstr "关闭"
 
+msgid "Log"
+msgstr "日志"
+
+msgid "Not log"
+msgstr "没有日志"
+
 msgid "Enabled"
 msgstr "启用"
 

luci-app-openvpn-client/root/etc/init.d/luci-app-openvpn-client

@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2021-2022 Lienol <lawlienol@gmail.com>
+# Copyright (C) 2021-2025 Lienol <lawlienol@gmail.com>
 
 START=99
 STOP=10

v2ray-geodata/Makefile

@@ -21,13 +21,13 @@ define Download/geoip
   HASH:=f2f5f03da44d007fa91fb6a37c077c9efae8ad0269ef0e4130cf90b0822873e3
 endef
 
-GEOSITE_VER:=20250226161858
+GEOSITE_VER:=20250227080747
 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
 define Download/geosite
   URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
   URL_FILE:=dlc.dat
   FILE:=$(GEOSITE_FILE)
-  HASH:=ed5519714829ecddee9691360f000a708312ed75855dbe384c1b6b42bfac25f6
+  HASH:=5709a678dd16164711d7988cd6f1117d79b7d65cd63c563e6edd198e468791e3
 endef
 
 GEOSITE_IRAN_VER:=202502240036