Merge pull request #66 from izhdahawrt/izhdahawrt-wrtfocus

RFC: proposing new openwrt package

wrt/Makefile

@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hiddify-core
-PKG_VERSION:=1.2.0
+PKG_VERSION:=2.3.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/hiddify/hiddify-core/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=481098a29b0b08d225598e5e74eddfe4cbdd4560b7ac74d210dcc923792a3e24
+PKG_HASH:=45500fcc59f7f8601eb8d5922692a24991b1c494ac753ce54f8216595f8101d4
 
 PKG_LICENSE:=https://github.com/hiddify/hiddify-next/edit/main/LICENSE.md
 PKG_LICENSE_FILES:=LICENSE
@@ -30,7 +30,7 @@ define Package/hiddify-core
   CATEGORY:=Network
   URL:=https://hiddify.com/
   DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle +kmod-inet-diag +kmod-tun
-  USERID:=hiddify-core=5566:hiddify-core=5566
+  USERID:=hiddify=15566:hiddify=15566
 endef
 
 define Package/hiddify-core/description
@@ -41,23 +41,25 @@ endef
 GO_PKG_TAGS:=with_gvisor,with_quic,with_wireguard,with_ech,with_utls,with_clash_api,with_grpc,with_low_memory,with_conntrack
 
 define Package/hiddify-core/conffiles
-/etc/config/hiddify-core
-/etc/hiddify-core/
+/etc/config/hiddify
+/etc/hiddify/
 endef
 
 define Package/hiddify-core/install
 
 	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/HiddifyCli $(1)/usr/bin/hiddify-cli
-	$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/HiddifyCli $(1)/usr/bin/HiddifyCli
+	$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/cli $(1)/usr/bin/hiddify-cli
 
-	$(INSTALL_DIR) $(1)/etc/hiddify-core
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/release/config/config.json $(1)/etc/hiddify-core
+	$(INSTALL_DIR) $(1)/etc/hiddify
+	$(INSTALL_DATA) ./files/hiddify.json $(1)/etc/hiddify/appconfig.json
 
 	$(INSTALL_DIR) $(1)/etc/config/
-	$(INSTALL_CONF) ./files/hiddify.conf $(1)/etc/config/hiddify-core
+	$(INSTALL_CONF) ./files/hiddify.conf $(1)/etc/config/hiddify
+
 	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) ./files/hiddify.init $(1)/etc/init.d/hiddify-core
+	$(INSTALL_BIN) ./files/hiddify.init $(1)/etc/init.d/hiddify
+
+	$(CP) ./files/webui $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,hiddify-core))

wrt/files/hiddify.conf

@@ -0,0 +1,4 @@
+config hiddify 'main'
+	option enabled '0'
+	option config '/config/file/or/sublink'
+	option appconfig '/etc/hiddify/appconfig.json'

wrt/files/hiddify.init

@@ -0,0 +1,27 @@
+#!/bin/sh /etc/rc.common
+
+USE_PROCD=1
+START=99
+
+NAME="hiddify"
+PROG="/usr/bin/hiddify-cli"
+
+
+start_service() {
+	config_load "$NAME"
+
+	local enabled config appconfig
+	config_get_bool enabled "main" "enabled" "0"
+	[ "$enabled" -eq "1" ] || return 0
+
+	config_get config "main" "config"
+	config_get appconfig "main" "appconfig" 
+	args=""
+	args="$args run -c $config -d $appconfig"
+	procd_open_instance
+	procd_set_param command $PROG $args
+#	procd_set_param stdout 1
+#	procd_set_param stderr 1
+	procd_set_param respawn
+	procd_close_instance
+}

wrt/files/hiddify.json

@@ -1,9 +1,10 @@
 {
+	"region": "ir",
 	"web-secret": "your-hidden-secret",
 	"enable-tun": true,
 	"mixed-port": 2334,
 	"tproxy-port": 2335,
-	"allow-connection-from-lan": false,
+	"allow-connection-from-lan": true,
 	"tls-tricks": {
 		"enable-fragment": false,
 		"fragment-size": "1-500",
@@ -25,7 +26,7 @@
 	"local-dns-port": 6450,
 	"tun-implementation": "gvisor",
 	"mtu": 9000,
-	"strict-route": true,
+	"strict-route": false,
 	"connection-test-url": "http://cp.cloudflare.com/",
 	"url-test-interval": 600,
 	"enable-clash-api": true,
@@ -36,8 +37,6 @@
 	"enable-fake-dns": false,
 	"enable-dns-routing": true,
 	"independent-dns-cache": true,
-	"geoip-path": "geo-assets\\sagernet-sing-geoip-geoip.db",
-	"geosite-path": "geo-assets\\sagernet-sing-geosite-geosite.db",
 	"rules": [],
 	"mux": {
 	  "enable": false,
@@ -54,4 +53,4 @@
 	  "noise": "5-10",
 	  "noise-delay": "20-200"
 	}
-  }
+  }

wrt/files/webui/CNAME

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

wrt/files/webui/_headers

@@ -0,0 +1,12 @@
+# for netlify hosting
+# https://docs.netlify.com/routing/headers/#syntax-for-the-headers-file
+
+/*
+  X-Frame-Options: DENY
+  X-XSS-Protection: 1; mode=block
+  X-Content-Type-Options: nosniff
+  Referrer-Policy: same-origin
+/*.css
+  Cache-Control: public, max-age=31536000, immutable
+/*.js
+  Cache-Control: public, max-age=31536000, immutable