From f78b8346c596e04d56e0dba59aa004e854f03181 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 5 Jan 2024 16:22:54 +0800
Subject: [PATCH] update 2024-01-05 16:22:54

---
 luci-app-heimdall/Makefile                          |  2 +-
 luci-app-heimdall/luasrc/view/heimdall/status.htm   | 13 ++++++++++++-
 .../root/usr/libexec/istorec/heimdall.sh            |  8 ++++++--
 v2ray-geodata/Makefile                              |  4 ++--
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/luci-app-heimdall/Makefile b/luci-app-heimdall/Makefile
index b6a71bedd..ca5ddb3b5 100644
--- a/luci-app-heimdall/Makefile
+++ b/luci-app-heimdall/Makefile
@@ -2,7 +2,7 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=1.1.1-20231208
+PKG_VERSION:=1.1.2-20240105
 PKG_RELEASE:=
 
 LUCI_TITLE:=LuCI support for heimdall
diff --git a/luci-app-heimdall/luasrc/view/heimdall/status.htm b/luci-app-heimdall/luasrc/view/heimdall/status.htm
index 78c0af4d7..fe5f20a48 100644
--- a/luci-app-heimdall/luasrc/view/heimdall/status.htm
+++ b/luci-app-heimdall/luasrc/view/heimdall/status.htm
@@ -17,15 +17,26 @@ local container_running = container_status == "running"
 <%
 if container_running then
     local port=util.trim(util.exec("/usr/libexec/istorec/heimdall.sh port"))
+    local https_port=util.trim(util.exec("/usr/libexec/istorec/heimdall.sh https_port"))
     if port == "" then
         port="8088"
     end
+    if https_port == "" then
+        https_port="8089"
+    end
 -%>
-<div class="cbi-value cbi-value-last">
+<div class="cbi-value">
     <label class="cbi-value-title">&nbsp;</label>
     <div class="cbi-value-field">
 
     <input type="button" class="btn cbi-button cbi-button-apply" name="start" value="<%:Open Heimdall%>" onclick="window.open('http://'+location.hostname+':<%=port%>/', '_blank')">
     </div>
 </div>
+<div class="cbi-value cbi-value-last">
+    <label class="cbi-value-title">&nbsp;</label>
+    <div class="cbi-value-field">
+
+    <input type="button" class="btn cbi-button cbi-button-apply" name="start" value="<%:Open Heimdall%> (HTTPS)" onclick="window.open('https://'+location.hostname+':<%=https_port%>/', '_blank')">
+    </div>
+</div>
 <% end %>
\ No newline at end of file
diff --git a/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh b/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh
index b0fb63719..dda3f614c 100755
--- a/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh
+++ b/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh
@@ -55,7 +55,8 @@ usage() {
   echo "      upgrade                Upgrade the heimdall"
   echo "      rm/start/stop/restart  Remove/Start/Stop/Restart the heimdall"
   echo "      status                 Heimdall status"
-  echo "      port                   Heimdall port"
+  echo "      port                   Heimdall http port"
+  echo "      https_port             Heimdall https port"
 }
 
 case ${ACTION} in
@@ -75,7 +76,10 @@ case ${ACTION} in
     docker ps --all -f 'name=heimdall' --format '{{.State}}'
   ;;
   "port")
-    docker ps --all -f 'name=heimdall' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
+    docker ps --all -f 'name=heimdall' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->80/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/'
+  ;;
+  "https_port")
+    docker ps --all -f 'name=heimdall' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->443/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/'
   ;;
   *)
     usage
diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile
index fd1e24529..81b62e120 100644
--- a/v2ray-geodata/Makefile
+++ b/v2ray-geodata/Makefile
@@ -21,13 +21,13 @@ define Download/geoip
   HASH:=be6b14abf56d9819119db951f711051382b247006da03425363826288825a9dd
 endef
 
-GEOSITE_VER:=20240104053246
+GEOSITE_VER:=20240105034708
 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:=370eee6e8658252826073a878ae2611c46ae264778488b7140c9eedbd23f6720
+  HASH:=9f833c47b103fb475a68d3b0f5db99d7b7c31dd9deab9171781420db10751641
 endef
 
 GEOSITE_IRAN_VER:=202401010029