luci-app-homeproxy: sync upstream

last commit: c4cbedc8b7

luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/status.js

@@ -210,6 +210,23 @@ return view.extend({
 		o.cfgvalue = function() { return getResVersion(this, 'gfw_list') };
 		o.rawhtml = true;
 
+		o = s.option(form.Value, 'github_token', _('GitHub token'));
+		o.password = true;
+		o.renderWidget = function() {
+			let node = form.Value.prototype.renderWidget.apply(this, arguments);
+
+			(node.querySelector('.control-group') || node).appendChild(E('button', {
+				'class': 'cbi-button cbi-button-apply',
+				'title': _('Save'),
+				'click': ui.createHandlerFn(this, function() {
+					ui.changes.apply(true);
+					return this.map.save(null, true);
+				}, this.option)
+			}, [ _('Save') ]));
+
+			return node;
+		}
+
 		s = m.section(form.NamedSection, 'config', 'homeproxy');
 		s.anonymous = true;
 

luci-app-homeproxy/po/templates/homeproxy.pot

@@ -817,6 +817,10 @@ msgstr ""
 msgid "Generic segmentation offload"
 msgstr ""
 
+#: htdocs/luci-static/resources/view/homeproxy/status.js:213
+msgid "GitHub token"
+msgstr ""
+
 #: htdocs/luci-static/resources/view/homeproxy/client.js:256
 msgid "Global"
 msgstr ""
@@ -889,7 +893,7 @@ msgstr ""
 #: htdocs/luci-static/resources/view/homeproxy/client.js:55
 #: htdocs/luci-static/resources/view/homeproxy/client.js:57
 #: htdocs/luci-static/resources/view/homeproxy/client.js:101
-#: htdocs/luci-static/resources/view/homeproxy/status.js:217
+#: htdocs/luci-static/resources/view/homeproxy/status.js:234
 #: root/usr/share/luci/menu.d/luci-app-homeproxy.json:3
 msgid "HomeProxy"
 msgstr ""
@@ -1881,6 +1885,11 @@ msgstr ""
 msgid "Same as main node"
 msgstr ""
 
+#: htdocs/luci-static/resources/view/homeproxy/status.js:220
+#: htdocs/luci-static/resources/view/homeproxy/status.js:225
+msgid "Save"
+msgstr ""
+
 #: htdocs/luci-static/resources/view/homeproxy/node.js:1366
 msgid "Save current settings"
 msgstr ""
@@ -2660,11 +2669,11 @@ msgstr ""
 msgid "quic-go / uquic chrome"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:220
+#: htdocs/luci-static/resources/view/homeproxy/status.js:237
 msgid "sing-box client"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:223
+#: htdocs/luci-static/resources/view/homeproxy/status.js:240
 msgid "sing-box server"
 msgstr ""
 

luci-app-homeproxy/po/zh_Hans/homeproxy.po

@@ -838,6 +838,10 @@ msgstr "生成"
 msgid "Generic segmentation offload"
 msgstr "通用分段卸载（GSO）"
 
+#: htdocs/luci-static/resources/view/homeproxy/status.js:213
+msgid "GitHub token"
+msgstr ""
+
 #: htdocs/luci-static/resources/view/homeproxy/client.js:256
 msgid "Global"
 msgstr "全局"
@@ -910,7 +914,7 @@ msgstr "心跳间隔"
 #: htdocs/luci-static/resources/view/homeproxy/client.js:55
 #: htdocs/luci-static/resources/view/homeproxy/client.js:57
 #: htdocs/luci-static/resources/view/homeproxy/client.js:101
-#: htdocs/luci-static/resources/view/homeproxy/status.js:217
+#: htdocs/luci-static/resources/view/homeproxy/status.js:234
 #: root/usr/share/luci/menu.d/luci-app-homeproxy.json:3
 msgid "HomeProxy"
 msgstr "HomeProxy"
@@ -1908,6 +1912,11 @@ msgstr "Salamander"
 msgid "Same as main node"
 msgstr "保持与主节点一致"
 
+#: htdocs/luci-static/resources/view/homeproxy/status.js:220
+#: htdocs/luci-static/resources/view/homeproxy/status.js:225
+msgid "Save"
+msgstr "保存"
+
 #: htdocs/luci-static/resources/view/homeproxy/node.js:1366
 msgid "Save current settings"
 msgstr "保存当前设置"
@@ -2725,11 +2734,11 @@ msgstr "私钥"
 msgid "quic-go / uquic chrome"
 msgstr "quic-go / uquic chrome"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:220
+#: htdocs/luci-static/resources/view/homeproxy/status.js:237
 msgid "sing-box client"
 msgstr "sing-box 客户端"
 
-#: htdocs/luci-static/resources/view/homeproxy/status.js:223
+#: htdocs/luci-static/resources/view/homeproxy/status.js:240
 msgid "sing-box server"
 msgstr "sing-box 服务端"
 

luci-app-homeproxy/root/etc/config/homeproxy

@@ -17,7 +17,6 @@ config homeproxy 'infra'
 	option self_mark '100'
 	option tproxy_mark '101'
 	option tun_mark '102'
-	option github_token ''
 
 config homeproxy 'config'
 	option main_node 'nil'
@@ -27,6 +26,7 @@ config homeproxy 'config'
 	option routing_port 'common'
 	option proxy_mode 'redirect_tproxy'
 	option ipv6_support '1'
+	option github_token ''
 
 config homeproxy 'control'
 	option lan_proxy_mode 'disabled'

luci-app-homeproxy/root/etc/homeproxy/resources/china_ip4.ver

@@ -1 +1 @@
-20250311032050
+20250403032551

luci-app-homeproxy/root/etc/homeproxy/resources/china_ip6.txt

@@ -29,6 +29,7 @@
 2400:5f60::/32
 2400:6000::/32
 2400:6460::/39
+2400:6460:300::/40
 2400:6600::/32
 2400:6e60:1301::/48
 2400:7100::/32
@@ -129,7 +130,8 @@
 2401:2e00::/32
 2401:33c0::/32
 2401:3480::/36
-2401:3480:2000::/35
+2401:3480:2000::/48
+2401:3480:3000::/36
 2401:34a0::/31
 2401:3800::/32
 2401:3880::/32
@@ -303,6 +305,7 @@
 2404:2280:130::/48
 2404:2280:134::/48
 2404:2280:136::/47
+2404:2280:138::/48
 2404:2280:13b::/48
 2404:2280:13c::/47
 2404:2280:142::/48
@@ -316,8 +319,7 @@
 2404:2280:170::/48
 2404:2280:177::/48
 2404:2280:17a::/47
-2404:2280:17c::/48
+2404:2280:17c::/46
-2404:2280:17e::/47
 2404:2280:180::/47
 2404:2280:183::/48
 2404:2280:187::/48
@@ -325,8 +327,7 @@
 2404:2280:193::/48
 2404:2280:196::/48
 2404:2280:198::/45
-2404:2280:1a4::/47
+2404:2280:1a4::/46
-2404:2280:1a7::/48
 2404:2280:1a8::/47
 2404:2280:1b0::/48
 2404:2280:1b2::/48
@@ -348,7 +349,7 @@
 2404:2280:1d8::/45
 2404:2280:1e0::/45
 2404:2280:1e8::/46
-2404:2280:1ec::/48
+2404:2280:1ec::/47
 2404:2280:1ee::/48
 2404:2280:1f0::/45
 2404:2280:1f8::/46
@@ -427,19 +428,19 @@
 2406:280::/32
 2406:840:9000::/44
 2406:840:9961::/48
-2406:840:9962::/48
+2406:840:9962::/47
 2406:840:996c::/48
 2406:840:e031::/48
 2406:840:e033::/48
 2406:840:e03f::/48
 2406:840:e080::/44
 2406:840:e0cf::/48
-2406:840:e0e1::/48
 2406:840:e0e2::/48
 2406:840:e0e5::/48
 2406:840:e0e8::/48
 2406:840:e10f::/48
 2406:840:e14f::/48
+2406:840:e201::/48
 2406:840:e230::/44
 2406:840:e500::/47
 2406:840:e621::/48
@@ -474,6 +475,7 @@
 2406:840:fe94::/48
 2406:840:fe96::/47
 2406:840:fe98::/46
+2406:840:fea9::/48
 2406:840:feab::/48
 2406:840:feac::/48
 2406:840:feae::/47
@@ -503,7 +505,6 @@
 2406:5340:8888::/48
 2406:5ac0::/32
 2406:8880::/48
-2406:94c0::/48
 2406:b640:100::/48
 2406:b640:4100::/48
 2406:cac0::/40
@@ -553,7 +554,6 @@
 2408:8026::/32
 2408:802a:8000::/33
 2408:802c::/32
-2408:8034::/32
 2408:803e::/32
 2408:8056::/32
 2408:805c::/30
@@ -567,7 +567,6 @@
 2408:80e0:4000::/34
 2408:80e0:8000::/33
 2408:80e2::/33
-2408:80e3:8000::/33
 2408:80e9:4000::/34
 2408:80ea:4000::/34
 2408:80ea:8000::/33
@@ -940,7 +939,6 @@
 2408:864c::/32
 2408:864e::/31
 2408:8650::/30
-2408:8654::/32
 2408:8656::/31
 2408:8658::/30
 2408:865c::/31
@@ -1029,7 +1027,8 @@
 2408:8962::/31
 2408:8964::/31
 2408:8966::/32
-2408:896c::/30
+2408:896c::/32
+2408:896e::/31
 2408:8972::/32
 2408:8978::/30
 2408:897e::/32
@@ -1057,6 +1056,7 @@
 2408:8a26:c000::/34
 2408:8a27:4000::/35
 2409:2000::/31
+2409:2002::/32
 2409:27fa::/48
 2409:27fa:f000::/48
 2409:27fb::/48
@@ -1065,6 +1065,7 @@
 2409:6100::/44
 2409:8000::/20
 240a:2000::/29
+240a:4002:1b00::/40
 240a:4010:8000::/33
 240a:4020:83a::/48
 240a:4020:883a::/48
@@ -1163,7 +1164,6 @@
 2602:f7ee:ee::/48
 2602:f9ba:a8::/48
 2602:f9ba:10c::/48
-2602:fab0:11::/48
 2602:fd92:801::/48
 2602:fd92:cc0::/44
 2602:fed2:731d::/48
@@ -1188,7 +1188,7 @@
 2605:9d80:9042::/48
 2605:9d80:9071::/48
 2605:9d80:9092::/48
-2620:57:4004::/47
+2620:57:4004::/48
 2804:1e48::/32
 2a03:5840:11b::/48
 2a04:3e00:1002::/48
@@ -1216,11 +1216,6 @@
 2a04:f580:9270::/48
 2a04:f580:9280::/48
 2a04:f580:9290::/48
-2a05:b900::/29
-2a06:1281:b100::/40
-2a06:1281:b200::/39
-2a06:1281:b400::/38
-2a06:1281:b800::/39
 2a06:3601::/32
 2a06:3603::/32
 2a06:3607::/32
@@ -1243,18 +1238,18 @@
 2a06:a005:a13::/48
 2a06:a005:e80::/43
 2a06:a005:1c40::/44
-2a09:54c6:4000::/36
+2a09:54c6:c000::/36
-2a09:54c6:c100::/40
-2a09:54c6:c200::/40
-2a09:54c6:c400::/40
 2a09:b280:ff83::/48
 2a09:b280:ff84::/47
-2a0a:2840:20::/43
+2a0a:2840::/30
 2a0a:2845:aab8::/46
+2a0a:2845:d647::/48
+2a0a:2846::/48
 2a0a:6040:ec00::/40
 2a0a:6044:6600::/40
 2a0b:b87:ffb5::/48
 2a0b:2542::/48
+2a0b:4340:a6::/48
 2a0b:4e07:b8::/47
 2a0c:9a40:84e0::/48
 2a0c:9a46:800::/43
@@ -1269,9 +1264,10 @@
 2a0e:aa06:490::/44
 2a0e:aa06:500::/44
 2a0e:aa06:520::/48
+2a0e:aa06:525::/48
 2a0e:aa06:541::/48
 2a0e:aa07:e01b::/48
-2a0e:aa07:e024::/47
+2a0e:aa07:e025::/48
 2a0e:aa07:e030::/48
 2a0e:aa07:e035::/48
 2a0e:aa07:e039::/48
@@ -1280,10 +1276,11 @@
 2a0e:aa07:e16a::/48
 2a0e:aa07:e1a0::/43
 2a0e:aa07:e1e2::/48
-2a0e:aa07:e1e4::/47
+2a0e:aa07:e1e4::/48
-2a0e:aa07:e200::/43
+2a0e:aa07:e200::/44
+2a0e:aa07:e210::/48
+2a0e:aa07:e21c::/47
 2a0e:aa07:e220::/44
-2a0e:aa07:f0d1::/48
 2a0e:aa07:f0d2::/48
 2a0e:aa07:f0d5::/48
 2a0e:aa07:f0d8::/48
@@ -1295,7 +1292,6 @@
 2a0e:b107:dce::/48
 2a0e:b107:16b0::/44
 2a0e:b107:178c::/47
-2a0f:1f80::/29
 2a0f:5707:ac00::/47
 2a0f:7803:dd00::/42
 2a0f:7803:f5d0::/44
@@ -1319,12 +1315,12 @@
 2a0f:7d07::/32
 2a0f:85c1:816::/48
 2a0f:85c1:b3a::/48
+2a0f:85c1:bba::/48
 2a0f:9400:6110::/48
 2a0f:9400:7700::/48
 2a0f:ac00::/29
 2a10:2f00:15a::/48
 2a10:cc40:190::/48
-2a12:4ac0::/29
 2a12:f8c0:1000::/40
 2a12:f8c3::/36
 2a13:1800::/48
@@ -1338,29 +1334,35 @@
 2a13:a5c7:2100::/48
 2a13:a5c7:2102::/48
 2a13:a5c7:2110::/48
+2a13:a5c7:2117::/48
+2a13:a5c7:2118::/48
 2a13:a5c7:2121::/48
 2a13:a5c7:2801::/48
 2a13:a5c7:2803::/48
 2a13:aac4:f000::/44
 2a14:7c0:4a01::/48
 2a14:4c41::/32
+2a14:67c1:20::/44
 2a14:67c1:70::/46
+2a14:67c1:701::/48
 2a14:67c1:703::/48
 2a14:67c1:704::/48
 2a14:67c1:800::/48
 2a14:67c1:a010::/44
-2a14:67c1:a020::/47
+2a14:67c1:a020::/48
 2a14:67c1:a024::/48
 2a14:67c1:a02a::/48
 2a14:67c1:a02f::/48
-2a14:67c1:b066::/48
+2a14:67c1:b066::/47
-2a14:67c1:b100::/47
+2a14:67c1:b100::/46
 2a14:67c5:1000::/36
 2a14:7580:9202::/47
 2a14:7580:9204::/46
 2a14:7580:9400::/39
-2a14:7580:d000::/36
+2a14:7580:d000::/37
+2a14:7580:d800::/39
 2a14:7580:e200::/40
+2a14:7580:fe00::/40
 2a14:7581:9010::/44
 2a14:7584:9000::/36
 2c0f:f7a8:8011::/48

luci-app-homeproxy/root/etc/homeproxy/resources/china_ip6.ver

@@ -1 +1 @@
-20250311032050
+20250403032551

luci-app-homeproxy/root/etc/homeproxy/resources/china_list.ver

@@ -1 +1 @@
-202503102212
+202504022212

luci-app-homeproxy/root/etc/homeproxy/resources/gfw_list.txt

@@ -47,6 +47,7 @@
 2017.hk
 2021hkcharter.com
 2047.name
+2047.one
 2049bbs.xyz
 21andy.com
 21sextury.com
@@ -323,6 +324,7 @@ aofriend.com
 aofriend.com.au
 aojiao.org
 aolchannels.aol.com
+aomedia.org
 aomiwang.com
 apartmentratings.com
 apartments.com
@@ -535,6 +537,7 @@ bcex.ca
 bcmorning.com
 bdsmvideos.net
 beaconevents.com
+bearteach.com
 bebo.com
 beeg.com
 beepool.com
@@ -868,6 +871,8 @@ c2cx.com
 c3pool.com
 cableav.tv
 cablegatesearch.net
+cachefly.com
+cachefly.net
 cachinese.com
 cacnw.com
 cactusvpn.com
@@ -1207,6 +1212,7 @@ cofacts.tw
 coin2co.in
 coinbase.com
 coinbene.com
+coincarp.com
 coinegg.com
 coinex.com
 coingecko.com
@@ -1298,6 +1304,7 @@ cumlouder.com
 curvefish.com
 cusp.hk
 cusu.hk
+cutout.pro
 cutscenes.net
 cw.com.tw
 cyberghost.natado.com
@@ -1643,7 +1650,6 @@ empfil.com
 emule-ed2k.com
 emulefans.com
 emuparadise.me
-en.favotter.net
 en.hao123.com
 enanyang.my
 encrypt.me
@@ -1761,6 +1767,7 @@ facebookquotes4u.com
 faceless.me
 facesofnyfw.com
 facesoftibetanselfimmolators.info
+factchecklab.org
 factpedia.org
 fail.hk
 faith100.org
@@ -1798,6 +1805,7 @@ fan-qiang.com
 fanbox.cc
 fangbinxing.com
 fangeming.com
+fangeming.comffvpn.com
 fangeqiang.com
 fanglizhi.info
 fangmincn.org
@@ -1820,14 +1828,11 @@ faproxy.com
 faqserv.com
 fartit.com
 farwestchina.com
-fast.wistia.com
 fastestvpn.com
-fastgpt.run
 fastpic.ru
 fastssh.com
 faststone.org
 fatbtc.com
-favstar.fm
 fawanghuihui.org
 faydao.com
 faz.net
@@ -1838,17 +1843,12 @@ fbaddins.com
 fbcdn.net
 fbsbx.com
 fbworkmail.com
-fc2.com
-fc2blog.net
-fc2china.com
 fc2cn.com
 fda.gov.tw
 fdc64.de
 fdc64.org
-fdc89.jp
 feedburner.com
 feeder.co
-feedly.comfastgpt.run
 feeds.fileforum.com
 feedx.net
 feelssh.com
@@ -1862,8 +1862,6 @@ fengzhenghu.com
 fengzhenghu.net
 fevernet.com
 ff.im
-fffff.at
-fflick.com
 ffvpn.com
 fgmtv.net
 fgmtv.org
@@ -2037,6 +2035,7 @@ frootvpn.com
 froth.zone
 fscked.org
 fsurf.com
+ft.com
 ftchinese.com
 ftp1.biz
 ftpserver.biz
@@ -2122,6 +2121,7 @@ gclubs.com
 gcmasia.com
 gcpnews.com
 gcr.io
+gdaily.org
 gdbt.net
 gdzf.org
 geek-art.net
@@ -2129,6 +2129,7 @@ geekerhome.com
 geekheart.info
 gekikame.com
 gelbooru.com
+gemini.com
 generated.photos
 genius.com
 geocities.co.jp
@@ -2153,6 +2154,7 @@ getlantern.org
 getmalus.com
 getmdl.io
 getoutline.org
+getsession.org
 getsocialscope.com
 getsync.com
 gettr.com
@@ -3825,6 +3827,7 @@ netcolony.com
 netflav.com
 netflix.com
 netflix.net
+netlify.app
 netme.cc
 netsarang.com
 netsneak.com
@@ -4056,6 +4059,7 @@ omny.fm
 on.cc
 on2.com
 onapp.com
+one.one.one.one
 onedrive.com
 onedrive.live.com
 onedumb.com
@@ -4343,7 +4347,7 @@ powercx.com
 powerphoto.org
 ppy.sh
 prayforchina.net
-premeforwindows7.com
+prcleader.org
 premproxy.com
 presentation.new
 presentationzen.com
@@ -4910,6 +4914,7 @@ soumo.info
 soundcloud.com
 soundofhope.kr
 soundofhope.org
+soundon.fm
 soup.io
 soupofmedia.com
 sourceforge.net
@@ -5202,6 +5207,7 @@ textnow.me
 tfc-taiwan.org.tw
 tfhub.dev
 tfiflve.com
+tg-me.com
 th.hao123.com
 thaicn.com
 thb.gov.tw
@@ -5230,7 +5236,6 @@ theguardian.com
 thehindu.com
 thehun.net
 theinitium.com
-themoviedb.org
 thenewslens.com
 thepiratebay.org
 theporndude.com
@@ -5798,7 +5803,6 @@ video.aol.ca
 video.aol.co.uk
 video.aol.com
 video.ap.org
-video.fdbox.com
 video.foxbusiness.com
 videobam.com
 videodetective.com
@@ -6184,6 +6188,7 @@ wzyboy.im
 x-art.com
 x-berry.com
 x-wall.org
+x.ai
 x.co
 x.com
 x.company

luci-app-homeproxy/root/etc/homeproxy/resources/gfw_list.ver

@@ -1 +1 @@
-202503102212
+202504022212

luci-app-homeproxy/root/etc/homeproxy/scripts/migrate_config.uc

@@ -38,6 +38,13 @@ else if (match(china_dns_server, /,/))
 else if (match(china_dns_server, / /))
 	uci.set(uciconfig, ucimain, 'china_dns_server', split(china_dns_server, ' ')[0]);
 
+/* github_token option has been moved to config section */
+const github_token = uci.get(uciconfig, uciinfra, 'github_token');
+if (github_token) {
+	uci.set(uciconfig, uciconfig, 'github_token', github_token);
+	uci.delete(uciconfig, uciinfra, 'github_token')
+}
+
 /* empty value defaults to all ports now */
 if (uci.get(uciconfig, ucimain, 'routing_port') === 'all')
 	uci.delete(uciconfig, ucimain, 'routing_port');

luci-app-homeproxy/root/etc/homeproxy/scripts/update_resources.sh

@@ -42,14 +42,15 @@ check_list_update() {
 	local listrepo="$2"
 	local listref="$3"
 	local listname="$4"
-	local github_token="$(uci -q get homeproxy.infra.github_token)"
+	local github_token="$(uci -q get homeproxy.config.github_token)"
 	local wget="wget --timeout=10 -q"
 
 	set_lock "set" "$listtype"
 
-	local list_info="$($wget --header "Authorization: ${github_token:-null}" -O- "https://api.github.com/repos/$listrepo/commits?sha=$listref&path=$listname")"
+	[ -z "$github_token" ] || github_token="--header=Authorization: Bearer $github_token"
-	local list_sha="$(echo -e "$list_info" | jsonfilter -e "@[0].sha")"
+	local list_info="$($wget "${github_token:--q}" -O- "https://api.github.com/repos/$listrepo/commits?sha=$listref&path=$listname&per_page=1")"
-	local list_ver="$(echo -e "$list_info" | jsonfilter -e "@[0].commit.message" | grep -Eo "[0-9-]+" | tr -d '-')"
+	local list_sha="$(echo -e "$list_info" | jsonfilter -qe "@[0].sha")"
+	local list_ver="$(echo -e "$list_info" | jsonfilter -qe "@[0].commit.message" | grep -Eo "[0-9-]+" | tr -d '-')"
 	if [ -z "$list_sha" ] || [ -z "$list_ver" ]; then
 		log "[$(to_upper "$listtype")] Failed to get the latest version, please retry later."