From 86ad64b0d4b14d297eb5ecc1c171229eeaa6cde3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 15 Nov 2026 21:18:12 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9B=85=20Sync=202026-11-15=2021:18:12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- airconnect/Makefile | 57 +- clashoo/Makefile | 4 +- hysteria/Makefile | 4 +- luci-app-cloudflared-next/Makefile | 3 +- luci-app-easytier-next/Makefile | 4 + luci-app-frpc-next/Makefile | 16 +- luci-app-ghfu/LICENSE | 674 ++++++ luci-app-ghfu/Makefile | 20 + luci-app-ghfu/luasrc/controller/ghfu.lua | 1734 +++++++++++++ .../view/admin_status/index/sysupgrade.htm | 31 + luci-app-ghfu/luasrc/view/ghfu/main.htm | 2143 +++++++++++++++++ luci-app-ghfu/po/en/ghfu.po | 283 +++ luci-app-ghfu/po/templates/ghfu.pot | 317 +++ luci-app-ghfu/po/zh-cn | 1 + luci-app-ghfu/po/zh_Hans/ghfu.po | 317 +++ luci-app-ghfu/root/etc/config/ghfu | 4 + .../root/etc/hotplug.d/iface/90-online | 18 + .../root/etc/hotplug.d/online/3-sleep | 1 + .../root/etc/hotplug.d/online/50-opkg-restore | 39 + .../root/etc/hotplug.d/online/51-opkg-upgrade | 5 + luci-app-ghfu/root/etc/profile.d/opkg.sh | 207 ++ .../root/etc/uci-defaults/99-ghfu-defaults | 31 + .../usr/share/rpcd/acl.d/luci-app-ghfu.json | 11 + luci-app-modem-manager-next/Makefile | 24 +- luci-app-open-box/Makefile | 4 +- luci-app-passwall/Makefile | 2 +- .../luasrc/controller/passwall.lua | 1 + .../passwall/cbi/nodes_dynamiclist_com.htm | 66 +- .../view/passwall/cbi/nodes_listvalue_com.htm | 126 +- .../passwall/cbi/nodes_multivalue_com.htm | 66 +- .../view/passwall/cbi/nodes_value_com.htm | 121 +- .../luasrc/view/passwall/global/footer.htm | 62 +- .../luasrc/view/passwall/haproxy/js.htm | 55 +- .../view/passwall/include/shunt_options.htm | 55 +- luci-app-passwall2/Makefile | 2 +- .../model/cbi/passwall2/client/global.lua | 37 +- .../passwall2/cbi/nodes_dynamiclist_com.htm | 66 +- .../passwall2/cbi/nodes_listvalue_com.htm | 126 +- .../passwall2/cbi/nodes_multivalue_com.htm | 66 +- .../view/passwall2/cbi/nodes_value_com.htm | 121 +- .../luasrc/view/passwall2/global/footer.htm | 86 +- .../luasrc/view/passwall2/haproxy/js.htm | 55 +- .../view/passwall2/include/shunt_options.htm | 55 +- luci-app-passwall2/po/fa/passwall2.po | 3 + luci-app-passwall2/po/ru/passwall2.po | 3 + luci-app-passwall2/po/zh-cn/passwall2.po | 3 + luci-app-passwall2/po/zh-tw/passwall2.po | 3 + luci-app-ssserver-next/Makefile | 9 +- luci-app-tailscale-next/Makefile | 4 + lucky/Makefile | 15 +- shadowsocks-rust-next/Makefile | 7 +- v2raya-geosite/Makefile | 6 +- wwand-ims/Makefile | 111 + wwand/Makefile | 6 +- 54 files changed, 6993 insertions(+), 297 deletions(-) create mode 100644 luci-app-ghfu/LICENSE create mode 100644 luci-app-ghfu/Makefile create mode 100644 luci-app-ghfu/luasrc/controller/ghfu.lua create mode 100644 luci-app-ghfu/luasrc/view/admin_status/index/sysupgrade.htm create mode 100644 luci-app-ghfu/luasrc/view/ghfu/main.htm create mode 100644 luci-app-ghfu/po/en/ghfu.po create mode 100644 luci-app-ghfu/po/templates/ghfu.pot create mode 120000 luci-app-ghfu/po/zh-cn create mode 100644 luci-app-ghfu/po/zh_Hans/ghfu.po create mode 100644 luci-app-ghfu/root/etc/config/ghfu create mode 100644 luci-app-ghfu/root/etc/hotplug.d/iface/90-online create mode 100644 luci-app-ghfu/root/etc/hotplug.d/online/3-sleep create mode 100644 luci-app-ghfu/root/etc/hotplug.d/online/50-opkg-restore create mode 100644 luci-app-ghfu/root/etc/hotplug.d/online/51-opkg-upgrade create mode 100644 luci-app-ghfu/root/etc/profile.d/opkg.sh create mode 100644 luci-app-ghfu/root/etc/uci-defaults/99-ghfu-defaults create mode 100644 luci-app-ghfu/root/usr/share/rpcd/acl.d/luci-app-ghfu.json create mode 100644 wwand-ims/Makefile diff --git a/airconnect/Makefile b/airconnect/Makefile index d554bf1be..6c0b70a5f 100644 --- a/airconnect/Makefile +++ b/airconnect/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2015-2016 OpenWrt.org +# Copyright (C) 2015-2026 OpenWrt.org # # This is free software, licensed under the GNU General Public License v3. # @@ -8,55 +8,64 @@ include $(TOPDIR)/rules.mk PKG_NAME:=airconnect PKG_VERSION:=1.12.4 -PKG_RELEASE=1 +PKG_RELEASE:=11 -PKG_SOURCE:=AirConnect-$(PKG_VERSION).zip -PKG_SOURCE_URL:=https://github.com/philippe44/AirConnect/releases/download/$(PKG_VERSION)/ +PKG_SOURCE:=AirConnect-$(PKG_VERSION)-src.tar.xz +PKG_SOURCE_URL:=https://github.com/sbwml/airconnect-src/releases/download/$(PKG_VERSION)/ PKG_HASH:=skip -PKG_BUILD_DIR:=$(BUILD_DIR)/airconnect-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/AirConnect-$(PKG_VERSION) PKG_LICENSE:=MIT PKG_LICENSE_FILE:=LICENSE PKG_MAINTAINER:=sbwml -ifeq ($(ARCH),arm) - ARM_CPU_FEATURES:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE)))) - ifeq ($(ARM_CPU_FEATURES),) - ARCH:=armv6 - endif -endif +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk -define Package/$(PKG_NAME) +define Package/airconnect SECTION:=multimedia CATEGORY:=Multimedia TITLE:=AirConnect + DEPENDS:=+libpthread +libopenssl +libupnp +libflac +shine +jansson URL:=https://github.com/philippe44/AirConnect endef -define Package/$(PKG_NAME)/description - Use AirPlay to stream to UPnP/Sonos & Chromecast devices +define Package/airconnect/description + AirConnect enables AirPlay streaming to UPnP/Sonos and Chromecast devices. endef -define Package/$(PKG_NAME)/conffiles +define Package/airconnect/conffiles /etc/config/airconnect endef -define Build/Prepare - unzip -q -d $(PKG_BUILD_DIR) $(DL_DIR)/AirConnect-$(PKG_VERSION).zip -endef +TARGET_CFLAGS += \ + -I$(STAGING_DIR)/usr/include/upnp \ + -I$(STAGING_DIR)/usr/include/shine \ + -I$(STAGING_DIR)/usr/include + +TARGET_LDFLAGS += \ + -L$(STAGING_DIR)/usr/lib define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) \ + CC="$(TARGET_CC)" \ + CFLAGS="$(TARGET_CFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ + all endef -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/bin $(1)/etc/config $(1)/etc/init.d - $(INSTALL_BIN) ./files/airconnect.init $(1)/etc/init.d/airconnect +define Package/airconnect/install + $(INSTALL_DIR) $(1)/etc/config $(INSTALL_CONF) ./files/airconnect.config $(1)/etc/config/airconnect - $(INSTALL_BIN) $(PKG_BUILD_DIR)/aircast-linux-$(ARCH)-static $(1)/usr/bin/aircast - $(INSTALL_BIN) $(PKG_BUILD_DIR)/airupnp-linux-$(ARCH)-static $(1)/usr/bin/airupnp + + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/airconnect.init $(1)/etc/init.d/airconnect + + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/aircast $(1)/usr/bin/aircast + $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/airupnp $(1)/usr/bin/airupnp endef -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call BuildPackage,airconnect)) diff --git a/clashoo/Makefile b/clashoo/Makefile index b9352ff02..1c6f1a3a7 100644 --- a/clashoo/Makefile +++ b/clashoo/Makefile @@ -5,8 +5,8 @@ PKG_UPSTREAM_VERSION:=1.19.34 PKG_UPSTREAM_TAG:=v$(PKG_UPSTREAM_VERSION) PKG_SHORT_SHA:=0455d0d -PKG_VERSION:=2026.11.12.$(PKG_UPSTREAM_VERSION) -PKG_RELEASE:=32 +PKG_VERSION:=2026.11.15 +PKG_RELEASE:=33 PKG_SOURCE:=$(PKG_NAME)-stable-$(PKG_UPSTREAM_TAG)-$(PKG_SHORT_SHA).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-stable-$(PKG_UPSTREAM_TAG)-$(PKG_SHORT_SHA) diff --git a/hysteria/Makefile b/hysteria/Makefile index 7891f3284..097568ef4 100644 --- a/hysteria/Makefile +++ b/hysteria/Makefile @@ -5,8 +5,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hysteria -PKG_VERSION:=2.13.0 -PKG_RELEASE:=18 +PKG_VERSION:=2.14.0 +PKG_RELEASE:=19 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/apernet/hysteria/tar.gz/app/v$(PKG_VERSION)? diff --git a/luci-app-cloudflared-next/Makefile b/luci-app-cloudflared-next/Makefile index 73a1412a5..04ef189c8 100644 --- a/luci-app-cloudflared-next/Makefile +++ b/luci-app-cloudflared-next/Makefile @@ -8,11 +8,12 @@ PKG_NAME:=luci-app-cloudflared-next LUCI_TITLE:=LuCI for Cloudflared LUCI_DEPENDS:=+cloudflared-next +LUCI_PKGARCH:=all LUCI_DESCRIPTION:=LuCI support for Cloudflare Zero Trust Tunnels PKG_MAINTAINER:=Hilman Maulana , Sergey Ponomarev PKG_VERSION:=1.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=Apache-2.0 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-easytier-next/Makefile b/luci-app-easytier-next/Makefile index e146206ec..8f9568180 100644 --- a/luci-app-easytier-next/Makefile +++ b/luci-app-easytier-next/Makefile @@ -1,5 +1,9 @@ include $(TOPDIR)/rules.mk +PKG_NAME:=luci-app-easytier-next +PKG_VERSION:=1.0.0 +PKG_RELEASE:=5 + LUCI_TITLE:=LuCI support for EasyTier Next LUCI_URL:=https://github.com/EasyTier/EasyTier PKG_DESCRIPTION:=Provides a modern LuCI Web management interface for EasyTier decentralized mesh VPN. diff --git a/luci-app-frpc-next/Makefile b/luci-app-frpc-next/Makefile index 6a9723254..e27f6dc7d 100644 --- a/luci-app-frpc-next/Makefile +++ b/luci-app-frpc-next/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-frpc-next PKG_VERSION:=1.0.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=MIT PKG_MAINTAINER:=Dante @@ -10,23 +10,17 @@ PKG_MAINTAINER:=Dante LUCI_TITLE:=LuCI support for frp client (v0.68.x/v0.69.x+) LUCI_DEPENDS:=+frpc-next +curl LUCI_PKGARCH:=all - -include $(TOPDIR)/feeds/luci/luci.mk - -define Package/$(PKG_NAME) - $(call Package/luci/webtemplate) - TITLE:=$(LUCI_TITLE) - DEPENDS:=$(LUCI_DEPENDS) - PROVIDES:=luci-app-frpc - CONFLICTS:=luci-app-frpc -endef +PKG_PROVIDES:=luci-app-frpc define Package/$(PKG_NAME)/postinst #!/bin/sh [ -n "$${IPKG_INSTROOT}" ] || { chmod 0755 /etc/init.d/frpc /etc/hotplug.d/iface/99-frpc 2>/dev/null || true + /etc/init.d/rpcd restart >/dev/null 2>&1 || true } exit 0 endef +include $(TOPDIR)/feeds/luci/luci.mk + # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-ghfu/LICENSE b/luci-app-ghfu/LICENSE new file mode 100644 index 000000000..f288702d2 --- /dev/null +++ b/luci-app-ghfu/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/luci-app-ghfu/Makefile b/luci-app-ghfu/Makefile new file mode 100644 index 000000000..a8c57a9c1 --- /dev/null +++ b/luci-app-ghfu/Makefile @@ -0,0 +1,20 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=luci-app-ghfu +PKG_VERSION:=1.6.1 +PKG_RELEASE:=1 +PKG_LICENSE:=GPL-3.0-only +PKG_LICENSE_FILES:=LICENSE +PKG_MAINTAINER:=Kiddin' + +LUCI_TITLE:=LuCI for System Online Upgrade +LUCI_DEPENDS:=+luci-base +curl +wget-ssl +ca-bundle +LUCI_PKGARCH:=all + +ifneq ($(wildcard $(TOPDIR)/feeds/luci/luci.mk),) + include $(TOPDIR)/feeds/luci/luci.mk +else + include $(TOPDIR)/feeds/luci/luci.mk +endif + +# call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-ghfu/luasrc/controller/ghfu.lua b/luci-app-ghfu/luasrc/controller/ghfu.lua new file mode 100644 index 000000000..40a582270 --- /dev/null +++ b/luci-app-ghfu/luasrc/controller/ghfu.lua @@ -0,0 +1,1734 @@ +-- SPDX-License-Identifier: GPL-3.0-only +-- Copyright (C) 2026 smallprogram & Kiddin' +-- Adapted exclusively for https://dl.openwrt.ai/firmware with built-in firmware filtering, auto-selection & flash.js validation + +module("luci.controller.ghfu", package.seeall) + +local http = require "luci.http" +local jsonc = require "luci.jsonc" +local i18n = require "luci.i18n" +local uci = require("luci.model.uci").cursor() +local fs = require "nixio.fs" +local sys = require "luci.sys" +local util = require "luci.util" + +local CFG = "ghfu" +local SEC = "main" +local tr = i18n.translate + +local FIRMWARE_BASE_URL = "https://dl.openwrt.ai/firmware" +local DEFAULT_FETCH_TIMEOUT = 15 +local BUILTIN_VALID_EXTS = { + ".img.gz", ".img", ".bin", ".tar.gz", ".tar", ".itb", ".trx", ".chk", ".dlf", ".ari" +} + +local function json_resp(tbl) + http.prepare_content("application/json") + http.write_json(tbl) +end + +local function to_bool(v) + return v == "1" or v == "true" or v == "on" or v == "yes" +end + +local function trim(s) + if not s then + return "" + end + return (s:gsub("^%s+", ""):gsub("%s+$", "")) +end + +local function read_lines(path) + local f = io.open(path, "r") + if not f then + return {} + end + local lines = {} + for line in f:lines() do + lines[#lines + 1] = line + end + f:close() + return lines +end + +local function read_all(path) + local f = io.open(path, "r") + if not f then + return "" + end + local content = f:read("*a") or "" + f:close() + return content +end + +local function read_first_line(path) + local f = io.open(path, "r") + if not f then + return "" + end + local line = f:read("*l") or "" + f:close() + return trim(line) +end + +local function human_bytes(n) + n = tonumber(n) or 0 + if n < 0 then + n = 0 + end + local units = { "B", "KB", "MB", "GB", "TB" } + local idx = 1 + while n >= 1024 and idx < #units do + n = n / 1024 + idx = idx + 1 + end + if idx == 1 then + return string.format("%d %s", math.floor(n + 0.5), units[idx]) + end + return string.format("%.2f %s", n, units[idx]) +end + +local function parse_size_str(s) + s = trim(s or "") + if s == "" or s == "-" then + return 0 + end + local num_only = tonumber(s) + if num_only then + return math.floor(num_only) + end + local val, unit = s:match("([%d%.]+)%s*([%a]+)") + if not val then + return 0 + end + local n = tonumber(val) or 0 + unit = (unit or ""):upper() + if unit == "K" or unit == "KB" or unit == "KIB" then + n = n * 1024 + elseif unit == "M" or unit == "MB" or unit == "MIB" then + n = n * 1024 * 1024 + elseif unit == "G" or unit == "GB" or unit == "GIB" then + n = n * 1024 * 1024 * 1024 + elseif unit == "T" or unit == "TB" or unit == "TIB" then + n = n * 1024 * 1024 * 1024 * 1024 + end + return math.floor(n + 0.5) +end + +local MONTHS = { + jan = 1, feb = 2, mar = 3, apr = 4, may = 5, jun = 6, + jul = 7, aug = 8, sep = 9, oct = 10, nov = 11, dec = 12 +} + +local function parse_version_token(ver_str) + ver_str = trim(ver_str or "") + if ver_str == "" then + return "", 0, "", "" + end + local mm, dd, yyyy = ver_str:match("(%d%d)%.(%d%d)%.(%d%d%d%d)") + if mm and dd and yyyy then + local m, d, y = tonumber(mm), tonumber(dd), tonumber(yyyy) + local num_str = string.format("%04d%02d%02d", y, m, d) + local iso = string.format("%04d-%02d-%02dT00:00:00Z", y, m, d) + local epoch = os.time({ year = y, month = m, day = d, hour = 0, min = 0, sec = 0 }) or 0 + return string.format("%02d.%02d.%04d", m, d, y), epoch, num_str, iso + end + local yyyy2, mm2, dd2 = ver_str:match("(%d%d%d%d)[%.%-](%d%d)[%.%-](%d%d)") + if yyyy2 and mm2 and dd2 then + local y, m, d = tonumber(yyyy2), tonumber(mm2), tonumber(dd2) + local num_str = string.format("%04d%02d%02d", y, m, d) + local iso = string.format("%04d-%02d-%02dT00:00:00Z", y, m, d) + local epoch = os.time({ year = y, month = m, day = d, hour = 0, min = 0, sec = 0 }) or 0 + return string.format("%02d.%02d.%04d", m, d, y), epoch, num_str, iso + end + return ver_str, 0, ver_str, "" +end + +local function normalize_date_str(date_str, filename) + date_str = trim(date_str or "") + + local y, m, d, hh, mm, ss = date_str:match("^(%d%d%d%d)%-(%d%d)%-(%d%d)[T%s]+(%d%d):(%d%d):?(%d*)") + if y and m and d then + ss = (ss and ss ~= "") and ss or "00" + return string.format("%04d-%02d-%02dT%02d:%02d:%02dZ", tonumber(y), tonumber(m), tonumber(d), tonumber(hh), tonumber(mm), tonumber(ss)) + end + + local y2, mon2, d2, hh2, mm2 = date_str:match("^(%d%d%d%d)%-(%a+)%-(%d%d)%s+(%d%d):(%d%d)") + if y2 and mon2 and d2 then + local m_num = MONTHS[mon2:lower():sub(1, 3)] + if m_num then + return string.format("%04d-%02d-%02dT%02d:%02d:00Z", tonumber(y2), m_num, tonumber(d2), tonumber(hh2), tonumber(mm2)) + end + end + + local d3, mon3, y3, hh3, mm3 = date_str:match("^(%d%d)%-(%a+)%-(%d%d%d%d)%s+(%d%d):(%d%d)") + if d3 and mon3 and y3 then + local m_num = MONTHS[mon3:lower():sub(1, 3)] + if m_num then + return string.format("%04d-%02d-%02dT%02d:%02d:00Z", tonumber(y3), m_num, tonumber(d3), tonumber(hh3), tonumber(mm3)) + end + end + + local d4, mon4, y4, hh4, mm4, ss4 = date_str:match("(%d+)%s+(%a+)%s+(%d%d%d%d)%s+(%d%d):(%d%d):?(%d*)") + if d4 and mon4 and y4 then + local m_num = MONTHS[mon4:lower():sub(1, 3)] + if m_num then + ss4 = (ss4 and ss4 ~= "") and ss4 or "00" + return string.format("%04d-%02d-%02dT%02d:%02d:%02dZ", tonumber(y4), m_num, tonumber(d4), tonumber(hh4), tonumber(mm4), tonumber(ss4)) + end + end + + local _, _, _, iso_from_fn = parse_version_token(filename or "") + return iso_from_fn or "" +end + +local function get_system_version() + local ver = read_first_line("/etc/openwrt_version") + if ver ~= "" then + return ver + end + local rel_lines = read_lines("/etc/openwrt_release") + for _, line in ipairs(rel_lines) do + local k, v = line:match("^([%w_]+)=['\"]?(.-)['\"]?$") + if k == "DISTRIB_REVISION" and trim(v) ~= "" then + return trim(v) + end + end + return "" +end + +local function get_install_epoch() + local f = io.open("/etc/ghfu_flash_epoch", "r") + if f then + local v = f:read("*l") + f:close() + local epoch = tonumber(v) + if epoch and epoch > 0 then + return epoch + end + end + local st = fs.stat("/etc/openwrt_version") or fs.stat("/etc/openwrt_release") + if st and st.mtime then + return tonumber(st.mtime) or 0 + end + return 0 +end + +local function epoch_to_iso_utc(epoch) + if not epoch or epoch <= 0 then + return "" + end + return os.date("!%Y-%m-%dT%H:%M:%SZ", epoch) +end + +local function epoch_to_local_string(epoch) + if not epoch or epoch <= 0 then + return "" + end + return os.date("%Y-%m-%d %H:%M:%S", epoch) +end + +local function get_tz_offset_minutes() + local z = os.date("%z") or "+0000" + local sign, hh, mm = z:match("([%+%-])(%d%d)(%d%d)") + if not sign then + return 0 + end + local v = (tonumber(hh) or 0) * 60 + (tonumber(mm) or 0) + if sign == "-" then + v = -v + end + return v +end + +-- Comprehensive partition table ("gpt" vs "dos") and UEFI boot detection (via blkid + /sys/firmware/efi) +local function detect_boot_and_part_type() + local is_efi = fs.access("/sys/firmware/efi") and true or false + local part_type = "" + local pttype = trim(sys.exec("blkid -s PTTYPE -o value /dev/sda /dev/vda /dev/nvme0n1 /dev/mmcblk0 2>/dev/null | head -n1"):lower()) + if pttype == "gpt" then + part_type = "gpt" + is_efi = true + elseif pttype == "dos" then + part_type = "dos" + else + part_type = is_efi and "gpt" or "dos" + end + return is_efi, part_type +end + +local function detect_device_info() + local target = "" + local distrib_id = "" + local distrib_rev = "" + local distrib_desc = "" + + local rel_lines = read_lines("/etc/openwrt_release") + for _, line in ipairs(rel_lines) do + local k, v = line:match("^([%w_]+)=['\"]?(.-)['\"]?$") + if k == "DISTRIB_TARGET" then + target = trim(v) + elseif k == "DISTRIB_ID" then + distrib_id = trim(v) + elseif k == "DISTRIB_REVISION" then + distrib_rev = trim(v) + elseif k == "DISTRIB_DESCRIPTION" then + distrib_desc = trim(v) + end + end + + local board_name = read_first_line("/tmp/sysinfo/board_name") + local model = read_first_line("/tmp/sysinfo/model") + local arch = nixio.uname and nixio.uname().machine or "" + + local board_json_raw = read_all("/etc/board.json") + if board_json_raw ~= "" then + local bj = jsonc.parse(board_json_raw) + if bj and type(bj.model) == "table" then + if board_name == "" and bj.model.id then + board_name = trim(tostring(bj.model.id)) + end + if model == "" and bj.model.name then + model = trim(tostring(bj.model.name)) + end + end + end + + local ubus_board = util.ubus and util.ubus("system", "board") or nil + if not ubus_board then + local ubus_out = sys.exec("ubus call system board 2>/dev/null") + if ubus_out and ubus_out ~= "" then + ubus_board = jsonc.parse(ubus_out) + end + end + + if ubus_board then + if ubus_board.release then + if target == "" and ubus_board.release.target then + target = trim(tostring(ubus_board.release.target)) + end + if distrib_id == "" and ubus_board.release.distribution then + distrib_id = trim(tostring(ubus_board.release.distribution)) + end + end + if board_name == "" and ubus_board.board_name then + board_name = trim(tostring(ubus_board.board_name)) + end + if model == "" and ubus_board.model then + model = trim(tostring(ubus_board.model)) + end + end + + if arch == "x86_64" and (board_name == "" or target == "x86/64") then + board_name = board_name ~= "" and board_name or "x86_64" + end + + local target_dash = target:gsub("/", "-") + local target_under = target:gsub("/", "_") + if target == "x86/64" or target_dash == "x86-64" or arch == "x86_64" then + target_under = "x86_64" + target_dash = "x86-64" + end + + local board_norm = board_name:gsub(",", "_"):gsub("/", "_") + local board_short = board_name:match(",(.+)$") or board_norm + + local candidates = {} + local seen = {} + local function add_candidate(p) + p = trim(p or ""):gsub("^/+", ""):gsub("/+$", "") + if p ~= "" and not seen[p] then + seen[p] = true + candidates[#candidates + 1] = p + end + end + + if arch == "x86_64" or target == "x86/64" or board_norm == "x86_64" then + add_candidate("x86_64") + elseif board_norm == "x86_generic" or target == "x86/generic" then + add_candidate("x86_32") + add_candidate("x86-generic") + end + + if target_dash ~= "" and board_norm ~= "" and board_norm ~= "x86_64" then + add_candidate(target_dash .. "/" .. board_norm) + if board_short ~= board_norm then + add_candidate(target_dash .. "/" .. board_short) + end + end + + if target_under ~= "" and target_under ~= target_dash and board_norm ~= "" then + add_candidate(target_under .. "/" .. board_norm) + end + + if target_dash ~= "" then + add_candidate(target_dash .. "/generic") + add_candidate(target_dash .. "/box") + add_candidate(target_dash) + end + + if target_under ~= "" then + add_candidate(target_under) + end + + local is_efi, part_type = detect_boot_and_part_type() + local sys_ver = get_system_version() + + return { + target = target, + target_dir = (arch == "x86_64" or target == "x86/64") and "x86_64" or target_dash, + board_name = board_name, + board_dir = board_norm, + model = model, + arch = arch, + is_efi = is_efi, + part_type = part_type, + system_version = sys_ver, + distrib_id = distrib_id, + distrib_rev = distrib_rev, + distrib_desc = distrib_desc, + is_kwrt = (distrib_id == "Kwrt" or distrib_id == "1004" or sys_ver:match("^%d%d%.%d%d%.%d%d%d%d$") ~= nil), + candidates = candidates + } +end + +local function is_valid_firmware_file(name) + if not name or name == "" then + return false + end + local lower = name:lower() + + if lower == "parent directory" or lower == "parent directory/" or lower == "../" or lower == "./" or lower:match("/$") then + return false + end + + if lower:find("preloader", 1, true) + or lower:find("uboot", 1, true) + or lower:find("u-boot", 1, true) + or lower:find("gpt.bin", 1, true) + or lower:find("bl2.bin", 1, true) + or lower:find("bl31", 1, true) + or lower:find("fip.bin", 1, true) + or lower:find("-kernel.bin", 1, true) + or lower:find("_kernel.bin", 1, true) + or lower:find("initramfs", 1, true) + or lower:find("-rootfs", 1, true) + or lower:find("-factory", 1, true) + or lower:find("-recovery", 1, true) + then + return false + end + + for _, ext in ipairs(BUILTIN_VALID_EXTS) do + if #lower > #ext and lower:sub(-#ext) == ext then + return true + end + end + + return false +end + +local function score_firmware_preference(name, dev_info) + local lower = tostring(name or ""):lower() + local score = 0 + local is_efi = dev_info and dev_info.is_efi + local is_x86 = dev_info and (dev_info.target_dir == "x86_64" or dev_info.target == "x86/64" or dev_info.arch == "x86_64" or dev_info.board_dir == "x86_generic") + local target_str = tostring(dev_info and dev_info.target or ""):lower() + local board_str = tostring(dev_info and dev_info.board_dir or ""):lower() + + if lower:find("squashfs", 1, true) then + score = score + 20 + end + + if is_x86 then + if is_efi then + if lower:find("combined-efi", 1, true) then + score = score + 100 + elseif lower:find("combined", 1, true) then + score = score + 30 + end + else + if lower:find("combined", 1, true) and not lower:find("-efi", 1, true) then + score = score + 100 + elseif lower:find("combined-efi", 1, true) then + score = score + 30 + end + end + elseif board_str:find("phicomm_k3", 1, true) or board_str:find("rt-ac88u", 1, true) then + if lower:find("squashfs.trx", 1, true) then + score = score + 100 + end + elseif target_str:find("sunxi", 1, true) then + if lower:find("squashfs-sdcard", 1, true) or lower:find("sysupgrade", 1, true) then + score = score + 100 + end + else + if lower:find("squashfs-sysupgrade", 1, true) then + score = score + 100 + elseif lower:find("sysupgrade", 1, true) then + score = score + 80 + end + end + + return score +end + +local function ensure_cfg_defaults() + if not uci:get(CFG, SEC) then + uci:section(CFG, "ghfu", SEC, {}) + end + + local changed = false + if uci:get(CFG, SEC, "keep_config") == nil then + uci:set(CFG, SEC, "keep_config", "1") + changed = true + end + if uci:get(CFG, SEC, "retain_packages") == nil then + uci:set(CFG, SEC, "retain_packages", "0") + changed = true + end + + for _, old_key in ipairs({ + "github_repo", "firmware_url", "device_path", "fetch_timeout", + "filter_ext_enabled", "valid_extensions", + "filter_prefix_enabled", "filter_prefix", + "filter_min_size_enabled", "filter_min_size" + }) do + if uci:get(CFG, SEC, old_key) ~= nil then + uci:delete(CFG, SEC, old_key) + changed = true + end + end + + if changed then + uci:commit(CFG) + end +end + +local function get_cfg() + ensure_cfg_defaults() + return { + selected_release = uci:get(CFG, SEC, "selected_release") or "", + keep_config = uci:get(CFG, SEC, "keep_config") or "1", + retain_packages = uci:get(CFG, SEC, "retain_packages") or "0" + } +end + +local function set_cfg(opts) + if not opts then return end + ensure_cfg_defaults() + + if opts.selected_release ~= nil then + uci:set(CFG, SEC, "selected_release", opts.selected_release) + end + if opts.keep_config ~= nil then + uci:set(CFG, SEC, "keep_config", to_bool(opts.keep_config) and "1" or "0") + end + if opts.retain_packages ~= nil then + uci:set(CFG, SEC, "retain_packages", to_bool(opts.retain_packages) and "1" or "0") + end + + uci:commit(CFG) +end + +local function normalize_version(v) + v = trim(v or "") + if v == "" then + return "" + end + v = v:gsub("^luci%-app%-ghfu[-%s]+", "") + local token = v:match("([0-9][%w%.%+%-%_~]*)") + return token or "" +end + +local function read_apk_db_version(path) + local f = io.open(path, "r") + if not f then + return "" + end + local found = false + for line in f:lines() do + if line == "P:luci-app-ghfu" then + found = true + elseif found and line:match("^V:") then + f:close() + return normalize_version(line:sub(3)) + elseif found and line == "" then + found = false + end + end + f:close() + return "" +end + +local function get_app_version() + local apk_db_ver = read_apk_db_version("/lib/apk/db/installed") + if apk_db_ver ~= "" then return apk_db_ver end + apk_db_ver = read_apk_db_version("/usr/lib/apk/db/installed") + if apk_db_ver ~= "" then return apk_db_ver end + + local opkg_ctrl_ver = normalize_version(sys.exec("sh -c \"awk -F': ' '/^Version:/{print $2; exit}' /usr/lib/opkg/info/luci-app-ghfu.control 2>/dev/null\"")) + if opkg_ctrl_ver ~= "" then return opkg_ctrl_ver end + + local opkg_status_ver = normalize_version(sys.exec("sh -c \"awk 'BEGIN{f=0} /^Package: luci-app-ghfu$/{f=1;next} f&&/^Version:/{sub(/^Version: /,\"\"); print; exit} f&&/^$/{f=0}' /usr/lib/opkg/status 2>/dev/null\"")) + if opkg_status_ver ~= "" then return opkg_status_ver end + + local verfile = normalize_version(read_first_line("/usr/share/ghfu/version")) + if verfile ~= "" then return verfile end + + return "" +end + +local function http_get(url, timeout, custom_header) + local t = math.floor(tonumber(timeout) or DEFAULT_FETCH_TIMEOUT) + if t < 3 then t = 3 end + if t > 300 then t = 300 end + + local raw = "" + if custom_header and custom_header ~= "" then + raw = sys.exec("curl -skfL --connect-timeout 4 -m " .. tostring(t) .. " -H " .. util.shellquote(custom_header) .. " " .. util.shellquote(url) .. " 2>/dev/null") + else + raw = sys.exec("curl -skfL --connect-timeout 4 -m " .. tostring(t) .. " " .. util.shellquote(url) .. " 2>/dev/null") + end + + if not raw or raw == "" then + if custom_header and custom_header ~= "" then + raw = sys.exec("wget -T " .. tostring(t) .. " --header=" .. util.shellquote(custom_header) .. " -qO- " .. util.shellquote(url) .. " 2>/dev/null") + end + if not raw or raw == "" then + raw = sys.exec("wget -T " .. tostring(t) .. " -qO- " .. util.shellquote(url) .. " 2>/dev/null") + end + end + + return raw or "" +end + +local function parse_sha256sums(raw) + local map = {} + if not raw or raw == "" then + return map + end + for line in raw:gmatch("[^\r\n]+") do + local hash, fname = line:match("^([a-fA-F0-9]+)%s+%*?(.+)$") + if hash and fname and #hash == 64 then + fname = trim(fname):gsub("^%./", "") + local base = fname:match("([^/]+)$") or fname + map[fname] = hash:lower() + map[base] = hash:lower() + end + end + return map +end + +local function url_decode(s) + return (s:gsub("%%(%x%x)", function(h) + return string.char(tonumber(h, 16)) + end)) +end + +local function parse_version_txt(raw) + raw = trim(raw or "") + if raw == "" or raw:match("^= 2) and parts[#parts] or "0" + local now_ts = os.time() or 0 + local is_formal = (fnotice == "1") or (ver_epoch > 0 and (now_ts - 172800) > ver_epoch) + return { + version = ver_str, + epoch = ver_epoch, + ver_num = ver_num, + date_iso = ver_iso, + fnotice = fnotice, + notice = is_formal + } +end + +local function parse_directory_json(raw, dir_url, sha256_map) + local obj = jsonc.parse(raw) + if not obj or type(obj) ~= "table" then + return nil + end + + local items = {} + if #obj > 0 or next(obj) == nil then + for _, entry in ipairs(obj) do + if type(entry) == "table" and entry.type ~= "directory" and entry.name then + local fname = tostring(entry.name) + if is_valid_firmware_file(fname) then + local fsize = tonumber(entry.size) or parse_size_str(tostring(entry.size or "0")) + local fdate = normalize_date_str(tostring(entry.mtime or entry.date or entry.published_at or ""), fname) + local fsha = tostring(entry.sha256 or ""):lower() + if fsha == "" and sha256_map then + fsha = sha256_map[fname] or "" + end + local furl = entry.url or (dir_url:gsub("/+$", "") .. "/" .. fname) + items[#items + 1] = { + name = fname, + url = furl, + size = fsize, + sha256 = fsha, + date_iso = fdate + } + end + end + end + if #items > 0 then + return items + end + end + + local asset_list = obj.files or obj.assets or obj.images + if type(asset_list) == "table" then + for _, entry in pairs(asset_list) do + if type(entry) == "table" and entry.name then + local fname = tostring(entry.name) + if is_valid_firmware_file(fname) then + local fsize = tonumber(entry.size) or parse_size_str(tostring(entry.size or "0")) + local fdate = normalize_date_str(tostring(entry.mtime or entry.date or entry.published_at or obj.build_at or ""), fname) + local fsha = tostring(entry.sha256 or ""):lower() + if fsha == "" and sha256_map then + fsha = sha256_map[fname] or "" + end + local furl = entry.url or (dir_url:gsub("/+$", "") .. "/" .. fname) + items[#items + 1] = { + name = fname, + url = furl, + size = fsize, + sha256 = fsha, + date_iso = fdate + } + end + end + end + if #items > 0 then + return items + end + end + + return nil +end + +local function parse_directory_html(html, dir_url, sha256_map) + if not html or html == "" then + return nil + end + + local base_url = dir_url:gsub("/+$", "") + local items = {} + local seen = {} + + local function add_item(href, size_str, date_str) + href = trim(href or "") + if href == "" or href:match("^%?") or href:match("^#") or href:match("^javascript:") then + return + end + local clean_href = href:gsub("%?.*$", "") + if clean_href == "../" or clean_href == "./" or clean_href == "/" or clean_href:match("/$") then + return + end + + local fname = clean_href:match("([^/]+)$") + if not fname then + return + end + fname = url_decode(fname) + if not is_valid_firmware_file(fname) or seen[fname] then + return + end + + local full_url + if href:match("^https?://") then + full_url = href + elseif href:match("^/") then + local origin = base_url:match("^(https?://[^/]+)") or "" + full_url = origin .. clean_href + else + full_url = base_url .. "/" .. clean_href + end + + local fsize = parse_size_str(size_str) + local fdate = normalize_date_str(date_str, fname) + local fsha = (sha256_map and sha256_map[fname]) or "" + + seen[fname] = true + items[#items + 1] = { + name = fname, + url = full_url, + size = fsize, + sha256 = fsha, + date_iso = fdate + } + end + + for tr_block in html:gmatch("]*>(.-)") do + local href = tr_block:match(']+href=["\']([^"\']+)["\']') + if href then + local cells = {} + for td in tr_block:gmatch("]*>(.-)") do + local text = td:gsub("<[^>]+>", " ") + text = text:gsub(" ", " "):gsub(" ", " ") + text = trim(text:gsub("%s+", " ")) + cells[#cells + 1] = text + end + local size_str = "" + local date_str = "" + for _, c in ipairs(cells) do + if size_str == "" and (c:match("^%d+%.?%d*%s*[KMGTkmgt][iI]?[bB]?$") or c:match("^%d+%s*[bB]$")) then + size_str = c + elseif date_str == "" and (c:match("%d%d%d%d%-%a+%-%d%d") or c:match("%d%d%-%a+%-%d%d%d%d") or c:match("%d%d%d%d%-%d%d%-%d%d")) then + date_str = c + end + end + add_item(href, size_str, date_str) + end + end + + if #items == 0 then + for line in html:gmatch("[^\r\n]+") do + local href, rest = line:match(']+href=["\']([^"\']+)["\'][^>]*>.-%s*(.*)$') + if href then + rest = (rest or ""):gsub("<[^>]+>", " "):gsub(" ", " ") + local date_str = rest:match("(%d%d%-%a+%-%d%d%d%d%s+%d%d:%d%d)") + or rest:match("(%d%d%d%d%-%a+%-%d%d%s+%d%d:%d%d)") + or rest:match("(%d%d%d%d%-%d%d%-%d%d%s+%d%d:%d%d)") + or "" + local size_str = rest:match("%s+(%d+%.?%d*%s*[KMGTkmgt]?[iI]?[bB]?)%s*$") + or rest:match("%s+(%d+)%s*$") + or "" + add_item(href, size_str, date_str) + end + end + end + + if #items == 0 then + return nil + end + + return items +end + +local function build_gpsysupgrade_fallback_items(dir_url, subpath, ver_info, dev_info) + if not ver_info or not ver_info.version or ver_info.version == "" then + return nil + end + local v = ver_info.version + local t_dash = (dev_info and dev_info.target or ""):gsub("/", "-") + local b_norm = (dev_info and dev_info.board_dir) or subpath:match("([^/]+)$") or "" + local items = {} + + if subpath == "x86_64" or b_norm == "x86_64" then + local efi_name = "kwrt-" .. v .. "-x86-64-generic-squashfs-combined-efi.img.gz" + local bios_name = "kwrt-" .. v .. "-x86-64-generic-squashfs-combined.img.gz" + items[#items + 1] = { name = efi_name, url = dir_url .. "/" .. efi_name, size = 0, sha256 = "", date_iso = ver_info.date_iso } + items[#items + 1] = { name = bios_name, url = dir_url .. "/" .. bios_name, size = 0, sha256 = "", date_iso = ver_info.date_iso } + elseif subpath == "x86_32" or b_norm == "x86_generic" then + local efi_name = "kwrt-" .. v .. "-x86-generic-squashfs-combined-efi.img.gz" + local bios_name = "kwrt-" .. v .. "-x86-generic-squashfs-combined.img.gz" + items[#items + 1] = { name = efi_name, url = dir_url .. "/" .. efi_name, size = 0, sha256 = "", date_iso = ver_info.date_iso } + items[#items + 1] = { name = bios_name, url = dir_url .. "/" .. bios_name, size = 0, sha256 = "", date_iso = ver_info.date_iso } + elseif b_norm:match("phicomm_k3$") or b_norm:match("rt%-ac88u$") then + local fn = "kwrt-" .. v .. "-" .. t_dash .. "-" .. b_norm .. "-squashfs.trx" + items[#items + 1] = { name = fn, url = dir_url .. "/" .. fn, size = 0, sha256 = "", date_iso = ver_info.date_iso } + elseif t_dash:match("sunxi") then + local fn = "kwrt-" .. v .. "-" .. t_dash .. "-" .. b_norm .. "-squashfs-sdcard.img.gz" + items[#items + 1] = { name = fn, url = dir_url .. "/" .. fn, size = 0, sha256 = "", date_iso = ver_info.date_iso } + elseif t_dash:match("rockchip") or b_norm:match("rpi%-") then + local fn = "kwrt-" .. v .. "-" .. t_dash .. "-" .. b_norm .. "-squashfs-sysupgrade.img.gz" + items[#items + 1] = { name = fn, url = dir_url .. "/" .. fn, size = 0, sha256 = "", date_iso = ver_info.date_iso } + elseif t_dash ~= "" and b_norm ~= "" then + local fn = "kwrt-" .. v .. "-" .. t_dash .. "-" .. b_norm .. "-squashfs-sysupgrade.bin" + items[#items + 1] = { name = fn, url = dir_url .. "/" .. fn, size = 0, sha256 = "", date_iso = ver_info.date_iso } + end + + return (#items > 0) and items or nil +end + +local function build_release_from_items(items, dir_url, resolved_subpath, ver_info, dev_info) + local sys_ver = (dev_info and dev_info.system_version) or get_system_version() + local _, _, sys_ver_num = parse_version_token(sys_ver) + + for _, item in ipairs(items) do + local vtag, vepoch, vnum, viso = parse_version_token(item.name) + if (not item.date_iso or item.date_iso == "") and viso ~= "" then + item.date_iso = viso + end + item.version_tag = vtag + item.version_num = vnum + item.version_epoch = vepoch + item.pref_score = score_firmware_preference(item.name, dev_info) + end + + table.sort(items, function(a, b) + if a.version_num ~= "" and b.version_num ~= "" and a.version_num ~= b.version_num then + return a.version_num > b.version_num + end + if a.pref_score ~= b.pref_score then + return a.pref_score > b.pref_score + end + if a.date_iso ~= "" and b.date_iso ~= "" and a.date_iso ~= b.date_iso then + return a.date_iso > b.date_iso + end + return a.name < b.name + end) + + local newest = items[1] + local latest_ver = (ver_info and ver_info.version ~= "") and ver_info.version + or ((newest and newest.version_tag ~= "") and newest.version_tag or "") + local latest_ver_num = (ver_info and ver_info.ver_num ~= "") and ver_info.ver_num + or ((newest and newest.version_num ~= "") and newest.version_num or "") + local latest_epoch = (ver_info and ver_info.epoch and ver_info.epoch > 0) and ver_info.epoch + or ((newest and newest.version_epoch) or 0) + + local latest_date = "" + for _, item in ipairs(items) do + if item.date_iso and item.date_iso ~= "" then + if latest_date == "" or item.date_iso > latest_date then + latest_date = item.date_iso + end + end + end + if latest_date == "" and ver_info and ver_info.date_iso then + latest_date = ver_info.date_iso + end + + local is_formal = true + if ver_info and ver_info.notice ~= nil then + is_formal = ver_info.notice + elseif latest_epoch > 0 then + is_formal = ((os.time() or 0) - 172800) > latest_epoch + end + + local assets = {} + for _, item in ipairs(items) do + local is_latest_item = false + if latest_ver_num ~= "" and item.version_num ~= "" then + is_latest_item = (item.version_num == latest_ver_num) + elseif latest_ver ~= "" and item.version_tag ~= "" then + is_latest_item = (item.version_tag == latest_ver) + elseif latest_date ~= "" and item.date_iso ~= "" then + is_latest_item = (item.date_iso:sub(1, 10) == latest_date:sub(1, 10)) + else + is_latest_item = (item == newest) + end + + -- Compare each firmware's version against current running system version: "newer", "same", or "older" + local relation = "older" + if item.version_num ~= "" and sys_ver_num ~= "" and item.version_num:match("^%d+$") and sys_ver_num:match("^%d+$") then + if item.version_num > sys_ver_num then + relation = "newer" + elseif item.version_num == sys_ver_num then + relation = "same" + else + relation = "older" + end + elseif is_latest_item then + relation = "latest" + end + + assets[#assets + 1] = { + name = item.name, + url = item.url, + size = item.size or 0, + sha256 = item.sha256 or "", + published_at = item.date_iso or "", + version_tag = item.version_tag or "", + version_num = item.version_num or "", + is_latest = is_latest_item, + relation = relation, + recommended = (item == newest) + } + end + + return { + tag_name = latest_ver ~= "" and latest_ver or "latest", + release_name = latest_ver ~= "" and latest_ver or (resolved_subpath ~= "" and resolved_subpath or "Latest"), + version_num = latest_ver_num, + version_epoch = latest_epoch, + notice = is_formal, + published_at = latest_date, + html_url = dir_url:gsub("/+$", "") .. "/", + resolved_path = resolved_subpath or "", + assets = assets + } +end + +local function try_fetch_firmware_dir(dir_url, timeout, subpath_label, dev_info) + dir_url = dir_url:gsub("/+$", "") + + local ver_raw = http_get(dir_url .. "/version.txt", math.min(timeout, 6)) + local ver_info = parse_version_txt(ver_raw) + + local raw = http_get(dir_url .. "/", timeout, "Accept: application/json, text/html;q=0.9") + local items = nil + + if raw and trim(raw) ~= "" then + local sha256_map = {} + if raw:lower():find("sha256sums", 1, true) then + local sha_raw = http_get(dir_url .. "/sha256sums", math.min(timeout, 5)) + sha256_map = parse_sha256sums(sha_raw) + end + + local trimmed = trim(raw) + if trimmed:sub(1, 1) == "{" or trimmed:sub(1, 1) == "[" then + items = parse_directory_json(trimmed, dir_url, sha256_map) + else + items = parse_directory_html(raw, dir_url, sha256_map) + end + end + + if (not items or #items == 0) and ver_info then + items = build_gpsysupgrade_fallback_items(dir_url, subpath_label, ver_info, dev_info) + end + + if not items or #items == 0 then + return nil + end + + return build_release_from_items(items, dir_url, subpath_label, ver_info, dev_info) +end + +local function fetch_dl_openwrt_firmware(dev_info, timeout) + local base_url = FIRMWARE_BASE_URL + local tried = {} + local candidate_paths = {} + + local function add_path(p) + p = trim(p or ""):gsub("^/+", ""):gsub("/+$", "") + if p ~= "" and not tried[p] then + tried[p] = true + candidate_paths[#candidate_paths + 1] = p + end + end + + if dev_info and dev_info.candidates then + for _, c in ipairs(dev_info.candidates) do + add_path(c) + end + end + + for _, subpath in ipairs(candidate_paths) do + local target_url = base_url .. "/" .. subpath + local rel = try_fetch_firmware_dir(target_url, timeout, subpath, dev_info) + if rel and #rel.assets > 0 then + return rel, nil, { resolved_path = subpath } + end + end + + if dev_info and dev_info.target_dir and dev_info.target_dir ~= "" and dev_info.board_dir ~= "" then + local target_index_url = base_url .. "/" .. dev_info.target_dir .. "/" + local target_html = http_get(target_index_url, timeout) + if target_html and target_html ~= "" then + local subdirs = {} + for href in target_html:gmatch(']+href=["\']([^"\']+/)["\']') do + local dname = href:gsub("/+$", ""):match("([^/]+)$") + if dname and dname ~= ".." and dname ~= "." and not dname:match("^%?") then + subdirs[#subdirs + 1] = url_decode(dname) + end + end + + local b_full = dev_info.board_dir:lower() + local b_short = (dev_info.board_name:match(",(.+)$") or dev_info.board_dir):lower() + local best_dir = nil + + for _, d in ipairs(subdirs) do + local dl = d:lower() + if dl == b_full or dl == b_short then + best_dir = d + break + end + end + if not best_dir then + for _, d in ipairs(subdirs) do + local dl = d:lower() + if dl:find(b_full, 1, true) or b_full:find(dl, 1, true) or (b_short ~= "" and dl:find(b_short, 1, true)) then + best_dir = d + break + end + end + end + + if best_dir then + local matched_subpath = dev_info.target_dir .. "/" .. best_dir + local rel = try_fetch_firmware_dir(base_url .. "/" .. matched_subpath, timeout, matched_subpath, dev_info) + if rel and #rel.assets > 0 then + return rel, nil, { resolved_path = matched_subpath } + end + end + end + end + + local hint_path = (dev_info and dev_info.candidates and dev_info.candidates[1]) or "" + return nil, tr("Failed to fetch firmware list from server") .. (hint_path ~= "" and (" (" .. base_url .. "/" .. hint_path .. ")") or "") +end + +local function evaluate_update_status(latest, dev_info, install_epoch) + local sys_ver = (dev_info and dev_info.system_version) or get_system_version() + local _, sys_ver_epoch, sys_ver_num = parse_version_token(sys_ver) + local _, rem_ver_epoch, rem_ver_num = parse_version_token(latest.release_name or latest.tag_name or "") + + local has_new = false + if rem_ver_num ~= "" and sys_ver_num ~= "" and rem_ver_num:match("^%d+$") and sys_ver_num:match("^%d+$") then + has_new = (rem_ver_num > sys_ver_num) + elseif rem_ver_epoch > 0 and sys_ver_epoch > 0 then + has_new = (rem_ver_epoch > sys_ver_epoch) + else + local install_iso = epoch_to_iso_utc(install_epoch) + if latest.published_at ~= "" and install_iso ~= "" then + has_new = (latest.published_at > install_iso) + end + end + + return has_new +end + +-- Validate downloaded firmware image via OpenWrt ubus system.validate_firmware_image / /usr/libexec/validate_firmware_image / sysupgrade -T +-- Caches result in /tmp/ghfu-validate.json so polling or upgrade requests do not repeatedly unpack/check the image +local function validate_downloaded_firmware(fw_path) + local cache_file = "/tmp/ghfu-validate.json" + local cached_raw = read_all(cache_file) + if cached_raw ~= "" then + local cached = jsonc.parse(cached_raw) + if type(cached) == "table" and cached.fw_path == fw_path then + return cached + end + end + + local res = nil + if util.ubus then + res = util.ubus("system", "validate_firmware_image", { path = fw_path }) + end + + if type(res) ~= "table" and fs.access("/usr/libexec/validate_firmware_image") then + local raw = sys.exec("/usr/libexec/validate_firmware_image " .. util.shellquote(fw_path) .. " 2>/dev/null") + if raw and raw ~= "" then + res = jsonc.parse(raw) + end + end + + local test_out = trim(sys.exec("/sbin/sysupgrade -T " .. util.shellquote(fw_path) .. " 2>&1")) + local test_rc = sys.call("/sbin/sysupgrade -T " .. util.shellquote(fw_path) .. " >/dev/null 2>&1") + + local valid = true + local forceable = true + local allow_backup = true + local detail_msg = "" + + if type(res) == "table" then + valid = (res.valid == true) + forceable = (res.forceable ~= false) + allow_backup = (res.allow_backup ~= false) + if not valid then + detail_msg = test_out + if detail_msg == "" and type(res.tests) == "table" then + local failed = {} + for k, v in pairs(res.tests) do + if v == false then + failed[#failed + 1] = tostring(k) .. ": false" + end + end + detail_msg = table.concat(failed, "\n") + end + end + else + valid = (test_rc == 0) + forceable = true + allow_backup = true + if not valid then + detail_msg = test_out + end + end + + local st = fs.stat(fw_path) + local fsize = (st and st.size) or 0 + local sha256 = trim(sys.exec("sha256sum " .. util.shellquote(fw_path) .. " 2>/dev/null | awk '{print $1}'")) + + local result = { + fw_path = fw_path, + valid = valid, + forceable = forceable, + allow_backup = allow_backup, + message = detail_msg, + size = fsize, + sha256 = sha256 + } + + local wf = io.open(cache_file, "w") + if wf then + wf:write(jsonc.stringify(result)) + wf:close() + end + + return result +end + +function index() + if not fs.access("/etc/config/ghfu") then + return + end + + entry({"admin", "system", "ghfu"}, call("action_index"), _("System Online Upgrade"), 65) + entry({"admin", "system", "ghfu", "status"}, call("action_status")).leaf = true + entry({"admin", "system", "ghfu", "local_status"}, call("action_local_status")).leaf = true + entry({"admin", "system", "ghfu", "sysversion_check"}, call("action_sysversion_check")).leaf = true + entry({"admin", "system", "ghfu", "config"}, call("action_config")).leaf = true + entry({"admin", "system", "ghfu", "download"}, call("action_download")).leaf = true + entry({"admin", "system", "ghfu", "download_status"}, call("action_download_status")).leaf = true + entry({"admin", "system", "ghfu", "upgrade"}, call("action_upgrade")).leaf = true + entry({"admin", "system", "ghfu", "cancel_upgrade"}, call("action_cancel_upgrade")).leaf = true + entry({"admin", "system", "ghfu", "backup"}, call("action_backup")).leaf = true +end + +function action_index() + luci.template.render("ghfu/main", { + app_version = get_app_version() + }) +end + +function action_local_status() + local cfg = get_cfg() + local app_version = get_app_version() + local install_epoch = get_install_epoch() + local install_local = epoch_to_local_string(install_epoch) + local dev_info = detect_device_info() + local uci_changes = uci:changes() + local has_unsaved_uci = (uci_changes and next(uci_changes) ~= nil) and true or false + + json_resp({ + ok = true, + app_version = app_version, + config = cfg, + device_info = dev_info, + has_unsaved_uci = has_unsaved_uci, + install_epoch = install_epoch, + install_time = install_local, + tz_offset_min = get_tz_offset_minutes() + }) +end + +function action_sysversion_check() + local dev_info = detect_device_info() + local install_epoch = get_install_epoch() + local subpath = (dev_info.candidates and dev_info.candidates[1]) or "" + if subpath == "" then + json_resp({ code = 1 }) + return + end + + local ver_raw = http_get(FIRMWARE_BASE_URL .. "/" .. subpath .. "/version.txt", 5) + local ver_info = parse_version_txt(ver_raw) + if ver_info then + local fake_latest = { + release_name = ver_info.version, + tag_name = ver_info.version, + published_at = ver_info.date_iso + } + local has_new = evaluate_update_status(fake_latest, dev_info, install_epoch) + json_resp({ + code = 0, + update = has_new, + notice = has_new and ver_info.notice or false, + now_version = dev_info.system_version, + version = ver_info.version + }) + return + end + + local latest = try_fetch_firmware_dir(FIRMWARE_BASE_URL .. "/" .. subpath, 6, subpath, dev_info) + if not latest then + json_resp({ code = 1 }) + return + end + local has_new = evaluate_update_status(latest, dev_info, install_epoch) + json_resp({ + code = 0, + update = has_new, + notice = has_new and latest.notice or false, + now_version = dev_info.system_version, + version = latest.release_name + }) +end + +function action_status() + local cfg = get_cfg() + local app_version = get_app_version() + local dev_info = detect_device_info() + local uci_changes = uci:changes() + local has_unsaved_uci = (uci_changes and next(uci_changes) ~= nil) and true or false + + local install_epoch = get_install_epoch() + local install_local = epoch_to_local_string(install_epoch) + + local latest, err, rel_info = fetch_dl_openwrt_firmware(dev_info, DEFAULT_FETCH_TIMEOUT) + if not latest then + json_resp({ + ok = false, + msg = err or tr("Unable to fetch firmware list, please check your network connection"), + app_version = app_version, + device_info = dev_info, + has_unsaved_uci = has_unsaved_uci, + config = cfg, + install_epoch = install_epoch, + install_time = install_local, + tz_offset_min = get_tz_offset_minutes() + }) + return + end + + local updatelogs = trim(http_get(FIRMWARE_BASE_URL .. "/updatelogs.txt", 8)) + if updatelogs:match("^/dev/null") + end + sys.call("rm -f /tmp/ghfu_* /tmp/ghfu-validate.json /tmp/ghfu-download.pid 2>/dev/null") + + local fw_path = "/tmp/ghfu_" .. clean_name + local progress_log = "/tmp/ghfu-download-progress.log" + local raw_log = "/tmp/ghfu-download-raw.log" + local pid_file = "/tmp/ghfu-download.pid" + local download_timeout = 180 + fs.unlink(progress_log) + fs.unlink(raw_log) + + local shell_script = table.concat({ + "progress_log=", util.shellquote(progress_log), "\n", + "raw_log=", util.shellquote(raw_log), "\n", + "pid_file=", util.shellquote(pid_file), "\n", + "target=", util.shellquote(fw_path), "\n", + "total=", tostring(math.max(0, math.floor(asset_size))), "\n", + "timeout=", tostring(download_timeout), "\n", + "url=", util.shellquote(asset_url), "\n", + ": > \"$progress_log\"\n", + ": > \"$raw_log\"\n", + "(\n", + "if command -v wget >/dev/null 2>&1; then\n", + " wget -T \"$timeout\" -O \"$target\" \"$url\" >\"$raw_log\" 2>&1\n", + " rc=$?\n", + "elif command -v curl >/dev/null 2>&1; then\n", + " curl -skfL --connect-timeout 15 -m \"$timeout\" -o \"$target\" \"$url\" >\"$raw_log\" 2>&1\n", + " rc=$?\n", + "else\n", + " echo \"wget/curl is not installed\" >\"$raw_log\"\n", + " rc=127\n", + "fi\n", + "exit \"$rc\"\n", + ") &\n", + "dlpid=$!\n", + "echo \"$dlpid\" > \"$pid_file\"\n", + "prev_size=0\n", + "prev_ts=$(date +%s)\n", + "last_pct=-1\n", + "while kill -0 \"$dlpid\" 2>/dev/null; do\n", + " sleep 1\n", + " size=$(wc -c < \"$target\" 2>/dev/null)\n", + " [ -z \"$size\" ] && size=0\n", + " now=$(date +%s)\n", + " elapsed=$((now - prev_ts))\n", + " [ \"$elapsed\" -le 0 ] && elapsed=1\n", + " delta=$((size - prev_size))\n", + " rate=$((delta / elapsed))\n", + " if [ \"$total\" -gt 0 ]; then\n", + " pct=$((size * 100 / total))\n", + " [ \"$pct\" -gt 100 ] && pct=100\n", + " if [ \"$pct\" -ne \"$last_pct\" ]; then\n", + " echo \"PROGRESS|$pct|$size|$total|$rate\" >> \"$progress_log\"\n", + " last_pct=$pct\n", + " fi\n", + " else\n", + " echo \"PROGRESS|0|$size|0|$rate\" >> \"$progress_log\"\n", + " fi\n", + " prev_size=$size\n", + " prev_ts=$now\n", + "done\n", + "wait \"$dlpid\"\n", + "rc=$?\n", + "rm -f \"$pid_file\"\n", + "size=$(wc -c < \"$target\" 2>/dev/null)\n", + "[ -z \"$size\" ] && size=0\n", + "if [ \"$rc\" -eq 0 ] && [ -s \"$target\" ]; then\n", + " sha256=$(sha256sum \"$target\" 2>/dev/null | awk '{print $1}')\n", + " expected=", util.shellquote(asset_digest), "\n", + " if [ -n \"$expected\" ] && [ -n \"$sha256\" ]; then\n", + " if [ \"$sha256\" = \"$expected\" ]; then\n", + " echo \"SHA256OK|$sha256\" >> \"$progress_log\"\n", + " echo \"DONE|OK|$size|$total|$target\" >> \"$progress_log\"\n", + " else\n", + " echo \"SHA256FAIL|$sha256|$expected\" >> \"$progress_log\"\n", + " echo \"DONE|FAIL|$size|$total|$target\" >> \"$progress_log\"\n", + " rm -f \"$target\"\n", + " fi\n", + " else\n", + " echo \"DONE|OK|$size|$total|$target\" >> \"$progress_log\"\n", + " fi\n", + "else\n", + " echo \"DONE|FAIL|$size|$total|$target\" >> \"$progress_log\"\n", + " if [ -s \"$raw_log\" ]; then\n", + " sed 's/^/ERR|/' \"$raw_log\" >> \"$progress_log\"\n", + " fi\n", + "fi\n", + }) + + logs[#logs + 1] = tr("Downloading firmware: ") .. clean_name + local start_cmd = "sh -c " .. util.shellquote("(" .. shell_script .. ") >/dev/null 2>&1 &") + local rc = sys.call(start_cmd) + if rc ~= 0 then + logs[#logs + 1] = tr("Firmware download failed, please check network connection") + json_resp({ ok = false, logs = logs }) + return + end + + json_resp({ + ok = true, + started = true, + logs = logs + }) +end + +function action_download_status() + local offset = tonumber(trim(http.formvalue("offset") or "0")) or 0 + if offset < 0 then + offset = 0 + end + + local progress_log = "/tmp/ghfu-download-progress.log" + local lines = read_lines(progress_log) + local total_lines = #lines + + local done = false + local download_ok = false + local sha256_fail = false + local fw_name = "" + local fw_target_path = "" + + for _, line in ipairs(lines) do + local status, _, _, target = line:match("^DONE|([A-Z]+)|(%d+)|(%d+)|(.+)$") + if status then + done = true + download_ok = (status == "OK") + fw_target_path = trim(target or "") + local n = tostring(target or ""):match("/tmp/ghfu_(.+)$") + if n and n ~= "" then + fw_name = n + end + end + if line:match("^SHA256FAIL|") then + sha256_fail = true + end + end + + if sha256_fail then + download_ok = false + end + + local logs = {} + local start_idx = offset + 1 + if start_idx < 1 then start_idx = 1 end + + for i = start_idx, total_lines do + local line = lines[i] + local pct, size, total, rate = line:match("^PROGRESS|(%d+)|(%d+)|(%d+)|(%-?%d+)$") + if pct then + local speed_text = human_bytes(rate) .. "/s" + if tonumber(total) and tonumber(total) > 0 then + logs[#logs + 1] = tr("Download progress: ") .. pct .. "% (" .. human_bytes(size) .. "/" .. human_bytes(total) .. "), " .. tr("Speed: ") .. speed_text + else + logs[#logs + 1] = tr("Download progress: ") .. human_bytes(size) .. ", " .. tr("Speed: ") .. speed_text + end + else + local status2, done_size, done_total, target2 = line:match("^DONE|([A-Z]+)|(%d+)|(%d+)|(.+)$") + if status2 then + if status2 == "OK" then + if tonumber(done_total) and tonumber(done_total) > 0 then + logs[#logs + 1] = tr("Download finished: ") .. human_bytes(done_size) .. "/" .. human_bytes(done_total) + else + logs[#logs + 1] = tr("Download finished: ") .. human_bytes(done_size) + end + + local name2 = tostring(target2 or ""):match("/tmp/ghfu_(.+)$") + if name2 and name2 ~= "" then + logs[#logs + 1] = name2 .. tr(" downloaded successfully") + end + else + logs[#logs + 1] = tr("Firmware download failed, please check network connection") + end + else + local sha256ok_hash = line:match("^SHA256OK|([a-f0-9]+)$") + if sha256ok_hash then + logs[#logs + 1] = tr("SHA256 verification passed: ") .. sha256ok_hash + else + local comp, exp = line:match("^SHA256FAIL|([a-f0-9]+)|([a-f0-9]+)$") + if comp then + logs[#logs + 1] = tr("SHA256 verification failed, upgrade cancelled") + logs[#logs + 1] = tr(" Expected: ") .. exp + logs[#logs + 1] = tr(" Got: ") .. comp + else + local err_line = line:match("^ERR|(.+)$") + if err_line and trim(err_line) ~= "" then + logs[#logs + 1] = err_line + end + end + end + end + end + end + + local validation = nil + if done and download_ok and fw_target_path ~= "" and fs.access(fw_target_path) then + logs[#logs + 1] = tr("Verifying firmware image format...") + validation = validate_downloaded_firmware(fw_target_path) + if validation.valid then + logs[#logs + 1] = tr("Firmware image validation passed") + else + logs[#logs + 1] = tr("Image check failed: ") .. (validation.message ~= "" and validation.message or tr("The uploaded image file does not contain a supported format.")) + end + end + + json_resp({ + ok = true, + done = done, + download_ok = download_ok, + fw_name = fw_name, + validation = validation, + logs = logs, + next_offset = total_lines + }) +end + +function action_cancel_upgrade() + local old_pid = read_first_line("/tmp/ghfu-download.pid") + if old_pid ~= "" and old_pid:match("^%d+$") then + sys.call("kill -9 " .. old_pid .. " 2>/dev/null") + end + local fw_name = trim(http.formvalue("fw_name") or "") + if fw_name ~= "" and fw_name:match("^[%w%._%-]+$") then + fs.unlink("/tmp/ghfu_" .. fw_name) + else + sys.call("rm -f /tmp/ghfu_* 2>/dev/null") + end + fs.unlink("/tmp/ghfu-validate.json") + fs.unlink("/tmp/ghfu-download.pid") + json_resp({ + ok = true, + msg = tr("Upgrade cancelled, temporary firmware file removed") + }) +end + +function action_upgrade() + local keep_config = to_bool(http.formvalue("keep_config")) and "1" or "0" + local retain_packages = to_bool(http.formvalue("retain_packages")) and "1" or "0" + local force_upgrade = to_bool(http.formvalue("force")) + local selected_release = trim(http.formvalue("selected_release") or "") + local fw_name = trim(http.formvalue("fw_name") or "") + + local logs = {} + + if fw_name == "" or not fw_name:match("^[%w%._%-]+$") then + logs[#logs + 1] = tr("Invalid firmware file name") + json_resp({ ok = false, logs = logs }) + return + end + + local fw_path = "/tmp/ghfu_" .. fw_name + if not fs.access(fw_path) then + logs[#logs + 1] = tr("Firmware file not found, please download again") + json_resp({ ok = false, logs = logs }) + return + end + + local val = validate_downloaded_firmware(fw_path) + if not val.valid then + if not force_upgrade then + logs[#logs + 1] = tr("Image check failed, confirmation of force upgrade is required") + json_resp({ ok = false, logs = logs, need_force = true, validation = val }) + return + end + if not val.forceable then + logs[#logs + 1] = tr("Firmware image validation failed and force upgrade is disallowed by system") + json_resp({ ok = false, logs = logs }) + return + end + end + + if not val.allow_backup and keep_config == "1" then + keep_config = "0" + logs[#logs + 1] = tr("Firmware metadata does not allow keeping configuration, switched to -n") + end + + set_cfg({ + selected_release = (selected_release ~= "" and selected_release or fw_name), + keep_config = keep_config, + retain_packages = retain_packages + }) + + local flags = {} + if force_upgrade then + flags[#flags + 1] = "--force" + end + if keep_config ~= "1" then + flags[#flags + 1] = "-n" + end + if retain_packages == "1" then + flags[#flags + 1] = "-k" + if fs.access("/etc/profile.d/opkg.sh") then + sys.call("sh -c '. /etc/profile.d/opkg.sh && opkg save' >/dev/null 2>&1") + fs.unlink("/etc/opkg-restore-auto") + end + end + + local flag_str = table.concat(flags, " ") + local up_cmd = "/sbin/sysupgrade " .. (flag_str ~= "" and (flag_str .. " ") or "") .. util.shellquote(fw_path) + + logs[#logs + 1] = tr("Starting system upgrade") + if force_upgrade then + logs[#logs + 1] = tr("Force upgrade enabled (--force)") + end + logs[#logs + 1] = (keep_config == "1") and tr("Upgrade mode: keep configuration") or tr("Upgrade mode: do not keep configuration") + if retain_packages == "1" then + logs[#logs + 1] = tr("Package mode: retain installed packages (-k)") + end + + local bg = string.format("(sleep 2; %s >/tmp/ghfu-upgrade.log 2>&1) &", up_cmd) + sys.call(bg) + + json_resp({ + ok = true, + logs = logs, + rebooting = true + }) +end + +function action_backup() + local tmp = "/tmp/ghfu-backup.tar.gz" + fs.unlink(tmp) + local rc = sys.call("sysupgrade --create-backup " .. util.shellquote(tmp) .. " >/dev/null 2>&1") + if rc ~= 0 or not fs.access(tmp) then + http.status(500, "Internal Server Error") + http.prepare_content("text/plain; charset=utf-8") + http.write(tr("Backup failed")) + return + end + local st = fs.stat(tmp) + local hostname = trim(sys.exec("cat /proc/sys/kernel/hostname 2>/dev/null")) + if hostname == "" then + hostname = "OpenWrt" + end + hostname = hostname:gsub("[^%w%._%-]", "_") + local fname = "backup-" .. hostname .. "-" .. os.date("%Y-%m-%d") .. ".tar.gz" + http.header("Content-Disposition", 'attachment; filename="' .. fname .. '"') + if st then + http.header("Content-Length", tostring(st.size)) + end + http.prepare_content("application/octet-stream") + local f = io.open(tmp, "rb") + if f then + repeat + local chunk = f:read(65536) + if chunk then http.write(chunk) end + until not chunk + f:close() + fs.unlink(tmp) + end +end diff --git a/luci-app-ghfu/luasrc/view/admin_status/index/sysupgrade.htm b/luci-app-ghfu/luasrc/view/admin_status/index/sysupgrade.htm new file mode 100644 index 000000000..391957a9e --- /dev/null +++ b/luci-app-ghfu/luasrc/view/admin_status/index/sysupgrade.htm @@ -0,0 +1,31 @@ +<% +local fs = require "nixio.fs" +local uci = require "luci.model.uci".cursor() +local autoupgrade_fm = "1" + +if fs.access("/etc/config/luci") then + autoupgrade_fm = uci:get("luci", "main", "autoupgrade_fm") or autoupgrade_fm +end +if autoupgrade_fm == "1" then +-%> + +<% end -%> diff --git a/luci-app-ghfu/luasrc/view/ghfu/main.htm b/luci-app-ghfu/luasrc/view/ghfu/main.htm new file mode 100644 index 000000000..2d8341a09 --- /dev/null +++ b/luci-app-ghfu/luasrc/view/ghfu/main.htm @@ -0,0 +1,2143 @@ + + +<%+header%> + + + +
+

+

+ + + + +
+ +
+
+
+ +
+ + + +
+
+ + +
+
+ +
+ +
+ +
+
+ +
+
+
+ +
+
+ + +
+ +
+
+ + +
+
+
+ +
+
+ + +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+ +
+ + +
+ +
+
+
+ + +
+
+
+ + + +<%+footer%> diff --git a/luci-app-ghfu/po/en/ghfu.po b/luci-app-ghfu/po/en/ghfu.po new file mode 100644 index 000000000..8214252be --- /dev/null +++ b/luci-app-ghfu/po/en/ghfu.po @@ -0,0 +1,283 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8\n" + +msgid "GitHub Firmware Upgrade" +msgstr "GitHub Firmware Upgrade" + +msgid "Firmware upgrade assistant based on GitHub Release." +msgstr "Firmware upgrade assistant based on GitHub Release." + +msgid "Basic Configuration" +msgstr "Basic Configuration" + +msgid "GitHub Repository" +msgstr "GitHub Repository" + +msgid "Firmware Fuzzy Search" +msgstr "Firmware Fuzzy Search" + +msgid "Enter keyword to filter firmware names" +msgstr "Enter keyword to filter firmware names" + +msgid "Last Updated Firmware" +msgstr "Last Updated Firmware" + +msgid "Keep Configuration" +msgstr "Keep Configuration" + +msgid "System and Release Status" +msgstr "System and Release Status" + +msgid "Available Firmware (Filtered: %d)" +msgstr "Available Firmware (Filtered: %d)" + +msgid "Filter Valid Extensions" +msgstr "Filter Valid Extensions" + +msgid "Valid Extensions" +msgstr "Valid Extensions" + +msgid "Valid Firmware Extensions" +msgstr "Valid Firmware Extensions" + +msgid "One extension per line (e.g. .img .img.gz)" +msgstr "One extension per line (e.g. .img .img.gz)" + +msgid "Cancel" +msgstr "Cancel" + +msgid "Save" +msgstr "Save" + +msgid "Saving extensions..." +msgstr "Saving extensions..." + +msgid "Extensions saved" +msgstr "Extensions saved" + +msgid "Logs" +msgstr "Logs" + +msgid "Fetch Latest Release" +msgstr "Fetch Latest Release" + +msgid "Download and Upgrade System" +msgstr "Download and Upgrade System" + +msgid "Waiting to fetch latest release" +msgstr "Waiting to fetch latest release" + +msgid "No matching firmware" +msgstr "No matching firmware" + +msgid "Fetching latest release" +msgstr "Fetching latest release" + +msgid "Fetch failed" +msgstr "Fetch failed" + +msgid "Request failed: " +msgstr "Request failed: " + +msgid "Latest release: " +msgstr "Latest release: " + +msgid "Status updated" +msgstr "Status updated" + +msgid "No new firmware currently, firmware selection is disabled" +msgstr "No new firmware currently, firmware selection is disabled" + +msgid "System install time" +msgstr "System install time" + +msgid "Latest release" +msgstr "Latest release" + +msgid "Published time" +msgstr "Published time" + +msgid "Assets total" +msgstr "Assets total" + +msgid "Conclusion" +msgstr "Conclusion" + +msgid "Fetching in progress" +msgstr "Fetching in progress" + +msgid "Failed to fetch GitHub release" +msgstr "Failed to fetch GitHub release" + +msgid "Please select firmware to upgrade" +msgstr "Please select firmware to upgrade" + +msgid "Please select a firmware asset" +msgstr "Please select a firmware asset" + +msgid "Preparing upgrade: " +msgstr "Preparing upgrade: " + +msgid "Upgrade command started, device may reboot soon" +msgstr "Upgrade command started, device may reboot soon" + +msgid "Upgrade request failed: " +msgstr "Upgrade request failed: " + +msgid "Selected firmware: " +msgstr "Selected firmware: " + +msgid "unknown" +msgstr "unknown" + +msgid "Failed to fetch GitHub release data" +msgstr "Failed to fetch GitHub release data" + +msgid "Failed to parse GitHub API response" +msgstr "Failed to parse GitHub API response" + +msgid "GitHub API error: " +msgstr "GitHub API error: " + +msgid "GitHub repository cannot be empty" +msgstr "GitHub repository cannot be empty" + +msgid "New firmware is available" +msgstr "New firmware is available" + +msgid "No firmware newer than current system was found" +msgstr "No firmware newer than current system was found" + +msgid "Invalid firmware URL, only https is supported" +msgstr "Invalid firmware URL, only https is supported" + +msgid "Downloading firmware: " +msgstr "Downloading firmware: " + +msgid "Download progress: " +msgstr "Download progress: " + +msgid "Speed: " +msgstr "Speed: " + +msgid "Download finished: " +msgstr "Download finished: " + +msgid " downloaded successfully" +msgstr " downloaded successfully" + +msgid "Invalid firmware file name" +msgstr "Invalid firmware file name" +msgid "Firmware file not found, please download again" +msgstr "Firmware file not found, please download again" + +msgid "Starting system upgrade" +msgstr "Starting system upgrade" + +msgid "Backup failed" +msgstr "Backup failed" + +msgid "Download Backup" +msgstr "Download Backup" + +msgid "Upgrading System" +msgstr "Upgrading System" + +msgid "System is upgrading, please wait. The page will reload automatically when the system comes back online." +msgstr "System is upgrading, please wait. The page will reload automatically when the system comes back online." + +msgid "Firmware Download Completed" +msgstr "Firmware Download Completed" + +msgid "Firmware is ready. System upgrade will start in %d seconds. Please do not leave this page." +msgstr "Firmware is ready. System upgrade will start in %d seconds. Please do not leave this page." + +msgid "Starting download: " +msgstr "Starting download: " + +msgid "System upgrade will start in " +msgstr "System upgrade will start in " + +msgid " seconds" +msgstr " seconds" + +msgid "Starting system upgrade..." +msgstr "Starting system upgrade..." + +msgid "Firmware download failed, please check network or GitHub repository" +msgstr "Firmware download failed, please check network or GitHub repository" + +msgid "SHA256 verification passed: " +msgstr "SHA256 verification passed: " + +msgid "SHA256 verification failed, upgrade cancelled" +msgstr "SHA256 verification failed, upgrade cancelled" + +msgid " Expected: " +msgstr " Expected: " + +msgid " Got: " +msgstr " Got: " + +msgid "Upgrade mode: keep configuration" +msgstr "Upgrade mode: keep configuration" + +msgid "Upgrade mode: do not keep configuration" +msgstr "Upgrade mode: do not keep configuration" + +msgid "Fetch Timeout (seconds)" +msgstr "Fetch Timeout (seconds)" + +msgid "5 ~ 300 seconds. Limits GitHub API fetch time." +msgstr "5 ~ 300 seconds. Limits GitHub API fetch time." + +msgid "Unable to fetch GitHub Release, please check your network connection" +msgstr "Unable to fetch GitHub Release, please check your network connection" + +msgid "Read Latest Release Notes" +msgstr "Read Latest Release Notes" + +msgid "Latest Release Notes" +msgstr "Latest Release Notes" + +msgid "Close" +msgstr "Close" + +msgid "No release notes content available" +msgstr "No release notes content available" + +msgid "Latest release assets are not ready yet, using previous release with available firmware." +msgstr "Latest release assets are not ready yet, using previous release with available firmware." + +msgid "Latest release partial firmware may still be compiling, waiting to upload, or failed to compile. If your platform is missing, please wait for the next build result." +msgstr "Latest release partial firmware may still be compiling, waiting to upload, or failed to compile. If your platform is missing, please wait for the next build result." + +msgid "Save Basic Configuration" +msgstr "Save Basic Configuration" + +msgid "Saving basic configuration..." +msgstr "Saving basic configuration..." + +msgid "Basic configuration saved" +msgstr "Basic configuration saved" + +msgid "已自动筛选为上次更新的固件名%s,如果需要更改请删除模糊检索内容" +msgstr "Automatically filtered to previously updated firmware name %s. If you need to change it, clear the fuzzy search text." + +msgid "最新release中没有固件名称%s,请手动筛选或等待下次仓库编译。" +msgstr "No firmware named %s was found in the latest release. Please filter manually or wait for the next repository build." + +msgid "Upgrade workflow is running, please wait until current operation finishes" +msgstr "Upgrade workflow is running, please wait until current operation finishes" + +msgid "SHA256 verification passed: " +msgstr "SHA256 verification passed: " + +msgid "SHA256 verification failed, upgrade cancelled" +msgstr "SHA256 verification failed, upgrade cancelled" + +msgid " Expected: " +msgstr " Expected: " + +msgid " Got: " +msgstr " Got: " diff --git a/luci-app-ghfu/po/templates/ghfu.pot b/luci-app-ghfu/po/templates/ghfu.pot new file mode 100644 index 000000000..56053e6f1 --- /dev/null +++ b/luci-app-ghfu/po/templates/ghfu.pot @@ -0,0 +1,317 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8\n" + +msgid "System Online Upgrade" +msgstr "系统在线更新" + +msgid "One-click firmware upgrade assistant powered by dl.openwrt.ai/firmware with automatic device adaptation." +msgstr "基于 dl.openwrt.ai/firmware 的智能设备识别一键系统升级助手。" + +msgid "Warning: Custom firmware with modified root partition size should use" +msgstr "注意:修改过根目录大小的定制固件请使用" + +msgid "or luci-app-attendedsysupgrade to rebuild, otherwise direct online upgrade will reset partitions and lose configuration." +msgstr "或安装 luci-app-attendedsysupgrade 重新生成定制固件,直接用此在线更新会重置分区、丢失配置。" + +msgid "Warning: There are unsaved changes that will get lost on reboot!" +msgstr "警告:有未保存的 UCI 配置更改,重启后将会丢失!" + +msgid "Firmware Fuzzy Search" +msgstr "模糊检索固件" + +msgid "Enter keyword to filter firmware names" +msgstr "输入关键字筛选固件名" + +msgid "Last Flashed Firmware" +msgstr "当前使用固件" + +msgid "Selected Firmware" +msgstr "当前选定固件" + +msgid "Keep Configuration" +msgstr "保留配置升级" + +msgid "Retain Installed Packages" +msgstr "保留已安装软件包" + +msgid "System and Firmware Status" +msgstr "系统与固件状态" + +msgid "Available Firmware" +msgstr "可选固件" + +msgid "Available Firmware (%d)" +msgstr "可选固件 (%d个)" + +msgid "Logs" +msgstr "执行日志" + +msgid "Firmware Changelog" +msgstr "固件更新日志" + +msgid "No firmware changelog available" +msgstr "暂无固件更新日志内容" + +msgid "Check Update" +msgstr "检查更新" + +msgid "Flash this latest firmware" +msgstr "刷入此最新固件" + +msgid "Already latest version, sure to reflash this version?" +msgstr "已是最新版,确定要重刷此版本?" + +msgid "Sure to flash this older version?" +msgstr "确定要刷入此老版本?" + +msgid "Waiting to check firmware" +msgstr "等待检查更新" + +msgid "No matching firmware" +msgstr "没有匹配的固件" + +msgid "Checking latest firmware" +msgstr "正在检查最新固件" + +msgid "Check failed" +msgstr "检查失败" + +msgid "Request failed: " +msgstr "请求失败: " + +msgid "Latest version: " +msgstr "最新版本: " + +msgid "Status updated" +msgstr "状态已更新" + +msgid "Current system version" +msgstr "当前固件版本" + +msgid "Current device" +msgstr "当前设备" + +msgid "Latest version" +msgstr "最新版本号" + +msgid "Published time" +msgstr "发布时间" + +msgid "Firmware count" +msgstr "固件总数" + +msgid "Checking..." +msgstr "正在检查更新..." + +msgid "Failed to fetch firmware list" +msgstr "获取固件列表失败" + +msgid "Failed to fetch firmware list from server" +msgstr "无法从固件服务器获取当前设备的固件信息" + +msgid "Fetch failed" +msgstr "获取失败" + +msgid "Please select firmware to upgrade" +msgstr "请选择要升级的固件" + +msgid "Please select a firmware asset" +msgstr "请选择固件下载项" + +msgid "Upgrade request failed: " +msgstr "升级请求失败: " + +msgid "Selected firmware: " +msgstr "已选择固件: " + +msgid "unknown" +msgstr "未知" + +msgid "New firmware is available" +msgstr "检测到新固件,可升级" + +msgid "No firmware newer than current system was found" +msgstr "当前系统已是最新版本" + +msgid "New version available" +msgstr "新版本可用" + +msgid "Formal Release" +msgstr "正式版" + +msgid "Preview Release" +msgstr "尝鲜版" + +msgid "Recommended" +msgstr "推荐" + +msgid "Latest" +msgstr "最新" + +msgid "Size" +msgstr "文件大小" + +msgid "SHA256" +msgstr "SHA256" + +msgid "Invalid firmware URL, only https://dl.openwrt.ai/firmware is supported" +msgstr "固件下载地址非法,仅支持 https://dl.openwrt.ai/firmware 官方源" + +msgid "Downloading firmware: " +msgstr "正在下载固件: " + +msgid "Download progress: " +msgstr "下载进度: " + +msgid "Speed: " +msgstr "速率: " + +msgid "Download finished: " +msgstr "下载完成: " + +msgid " downloaded successfully" +msgstr " 下载成功" + +msgid "Verifying firmware image format..." +msgstr "正在校验固件镜像格式与设备兼容性..." + +msgid "Firmware image validation passed" +msgstr "固件镜像格式与设备兼容性校验通过" + +msgid "Image check failed: " +msgstr "固件镜像校验未通过:" + +msgid "The uploaded image file does not contain a supported format." +msgstr "所选固件文件不包含受支持的格式。" + +msgid "Firmware Image Check Failed" +msgstr "固件镜像校验未通过" + +msgid "The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform." +msgstr "下载的固件文件未通过系统格式或设备兼容性校验。请确认您选择了适合当前硬件平台的固件镜像。" + +msgid "Force upgrade" +msgstr "强制升级 (Force upgrade)" + +msgid "Select 'Force upgrade' to flash the image even if the image format check fails. Use only if you are sure that the firmware is correct and meant for your device!" +msgstr "勾选“强制升级”可在镜像格式校验失败时强行刷入固件。请仅在您完全确认该固件正确且适用于当前设备时使用!" + +msgid "Force upgrade is disallowed for this image by the system validator." +msgstr "系统校验器禁止对该固件镜像执行强制升级。" + +msgid "The image does not support keeping current configuration; configuration retention will be disabled (-n)." +msgstr "该固件镜像不支持保留当前配置,刷入时将自动禁用保留配置 (-n)。" + +msgid "Cancel" +msgstr "取消" + +msgid "Cancel Upgrade" +msgstr "取消升级" + +msgid "Force Flash" +msgstr "强制刷入固件" + +msgid "Upgrade cancelled by user after firmware check warning" +msgstr "用户已在固件校验警告弹窗中取消升级,临时固件已清理" + +msgid "Upgrade countdown cancelled by user, temporary firmware removed" +msgstr "用户已中止升级倒计时,临时固件已清理" + +msgid "Upgrade cancelled, temporary firmware file removed" +msgstr "已取消升级并清理临时固件文件" + +msgid "Image check failed, confirmation of force upgrade is required" +msgstr "固件校验未通过,需要确认强制升级才能继续" + +msgid "Firmware image validation failed and force upgrade is disallowed by system" +msgstr "固件校验失败且系统禁止强制刷入该镜像" + +msgid "Firmware metadata does not allow keeping configuration, switched to -n" +msgstr "固件元数据不支持保留配置,已自动切换为不保留配置模式 (-n)" + +msgid "Force upgrade enabled (--force)" +msgstr "已启用强制升级模式 (--force)" + +msgid "Invalid firmware file name" +msgstr "固件文件名非法" + +msgid "Firmware file not found, please download again" +msgstr "固件文件未找到,请重新下载" + +msgid "Starting system upgrade" +msgstr "开始升级系统" + +msgid "Backup failed" +msgstr "备份失败" + +msgid "Download Backup" +msgstr "下载备份" + +msgid "Upgrading System" +msgstr "正在升级系统" + +msgid "Upgrade successful, Waiting for device..." +msgstr "更新成功,等待设备重启后响应..." + +msgid "Device unreachable! Still waiting for device..." +msgstr "无法连接设备!继续等待设备重启..." + +msgid "Firmware Download Completed" +msgstr "固件下载完成" + +msgid "Firmware is ready. System upgrade will start in %d seconds. Please do not leave this page." +msgstr "固件已就绪,系统将在 %d 秒后开始刷入。请勿离开当前页面。" + +msgid "Starting download: " +msgstr "开始下载: " + +msgid "System upgrade will start in " +msgstr "系统将在 " + +msgid " seconds" +msgstr " 秒后开始刷入" + +msgid "Flashing..." +msgstr "正在刷入固件..." + +msgid "Upgrade mode: keep configuration" +msgstr "本次升级: 保留配置" + +msgid "Upgrade mode: do not keep configuration" +msgstr "本次升级: 不保留配置 (-n)" + +msgid "Package mode: retain installed packages (-k)" +msgstr "软件包策略: 保留已安装软件包列表 (-k)" + +msgid "Unable to fetch firmware list, please check your network connection" +msgstr "无法获取远程版本信息,请检查网络连接" + +msgid "Open Firmware Directory" +msgstr "打开固件目录" + +msgid "Firmware directory URL is unavailable, please check update again" +msgstr "固件目录链接不可用,请重新检查更新" + +msgid "Unable to open a new window. Please allow pop-ups in your browser." +msgstr "无法打开新窗口,请允许浏览器弹窗。" + +msgid "Firmware download failed, please check network connection" +msgstr "固件下载失败或超时,请检查网络连接后重试" + +msgid "Automatically selected recommended firmware: %s" +msgstr "已自动匹配并选中最新固件:%s" + +msgid "Upgrade workflow is running, please wait until current operation finishes" +msgstr "升级流程正在执行,请等待当前操作完成" + +msgid "SHA256 verification passed: " +msgstr "SHA256 校验通过:" + +msgid "SHA256 verification failed, upgrade cancelled" +msgstr "SHA256 校验失败,已取消升级" + +msgid " Expected: " +msgstr " 期望值:" + +msgid " Got: " +msgstr " 实际值:" diff --git a/luci-app-ghfu/po/zh-cn b/luci-app-ghfu/po/zh-cn new file mode 120000 index 000000000..8d69574dd --- /dev/null +++ b/luci-app-ghfu/po/zh-cn @@ -0,0 +1 @@ +zh_Hans \ No newline at end of file diff --git a/luci-app-ghfu/po/zh_Hans/ghfu.po b/luci-app-ghfu/po/zh_Hans/ghfu.po new file mode 100644 index 000000000..56053e6f1 --- /dev/null +++ b/luci-app-ghfu/po/zh_Hans/ghfu.po @@ -0,0 +1,317 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8\n" + +msgid "System Online Upgrade" +msgstr "系统在线更新" + +msgid "One-click firmware upgrade assistant powered by dl.openwrt.ai/firmware with automatic device adaptation." +msgstr "基于 dl.openwrt.ai/firmware 的智能设备识别一键系统升级助手。" + +msgid "Warning: Custom firmware with modified root partition size should use" +msgstr "注意:修改过根目录大小的定制固件请使用" + +msgid "or luci-app-attendedsysupgrade to rebuild, otherwise direct online upgrade will reset partitions and lose configuration." +msgstr "或安装 luci-app-attendedsysupgrade 重新生成定制固件,直接用此在线更新会重置分区、丢失配置。" + +msgid "Warning: There are unsaved changes that will get lost on reboot!" +msgstr "警告:有未保存的 UCI 配置更改,重启后将会丢失!" + +msgid "Firmware Fuzzy Search" +msgstr "模糊检索固件" + +msgid "Enter keyword to filter firmware names" +msgstr "输入关键字筛选固件名" + +msgid "Last Flashed Firmware" +msgstr "当前使用固件" + +msgid "Selected Firmware" +msgstr "当前选定固件" + +msgid "Keep Configuration" +msgstr "保留配置升级" + +msgid "Retain Installed Packages" +msgstr "保留已安装软件包" + +msgid "System and Firmware Status" +msgstr "系统与固件状态" + +msgid "Available Firmware" +msgstr "可选固件" + +msgid "Available Firmware (%d)" +msgstr "可选固件 (%d个)" + +msgid "Logs" +msgstr "执行日志" + +msgid "Firmware Changelog" +msgstr "固件更新日志" + +msgid "No firmware changelog available" +msgstr "暂无固件更新日志内容" + +msgid "Check Update" +msgstr "检查更新" + +msgid "Flash this latest firmware" +msgstr "刷入此最新固件" + +msgid "Already latest version, sure to reflash this version?" +msgstr "已是最新版,确定要重刷此版本?" + +msgid "Sure to flash this older version?" +msgstr "确定要刷入此老版本?" + +msgid "Waiting to check firmware" +msgstr "等待检查更新" + +msgid "No matching firmware" +msgstr "没有匹配的固件" + +msgid "Checking latest firmware" +msgstr "正在检查最新固件" + +msgid "Check failed" +msgstr "检查失败" + +msgid "Request failed: " +msgstr "请求失败: " + +msgid "Latest version: " +msgstr "最新版本: " + +msgid "Status updated" +msgstr "状态已更新" + +msgid "Current system version" +msgstr "当前固件版本" + +msgid "Current device" +msgstr "当前设备" + +msgid "Latest version" +msgstr "最新版本号" + +msgid "Published time" +msgstr "发布时间" + +msgid "Firmware count" +msgstr "固件总数" + +msgid "Checking..." +msgstr "正在检查更新..." + +msgid "Failed to fetch firmware list" +msgstr "获取固件列表失败" + +msgid "Failed to fetch firmware list from server" +msgstr "无法从固件服务器获取当前设备的固件信息" + +msgid "Fetch failed" +msgstr "获取失败" + +msgid "Please select firmware to upgrade" +msgstr "请选择要升级的固件" + +msgid "Please select a firmware asset" +msgstr "请选择固件下载项" + +msgid "Upgrade request failed: " +msgstr "升级请求失败: " + +msgid "Selected firmware: " +msgstr "已选择固件: " + +msgid "unknown" +msgstr "未知" + +msgid "New firmware is available" +msgstr "检测到新固件,可升级" + +msgid "No firmware newer than current system was found" +msgstr "当前系统已是最新版本" + +msgid "New version available" +msgstr "新版本可用" + +msgid "Formal Release" +msgstr "正式版" + +msgid "Preview Release" +msgstr "尝鲜版" + +msgid "Recommended" +msgstr "推荐" + +msgid "Latest" +msgstr "最新" + +msgid "Size" +msgstr "文件大小" + +msgid "SHA256" +msgstr "SHA256" + +msgid "Invalid firmware URL, only https://dl.openwrt.ai/firmware is supported" +msgstr "固件下载地址非法,仅支持 https://dl.openwrt.ai/firmware 官方源" + +msgid "Downloading firmware: " +msgstr "正在下载固件: " + +msgid "Download progress: " +msgstr "下载进度: " + +msgid "Speed: " +msgstr "速率: " + +msgid "Download finished: " +msgstr "下载完成: " + +msgid " downloaded successfully" +msgstr " 下载成功" + +msgid "Verifying firmware image format..." +msgstr "正在校验固件镜像格式与设备兼容性..." + +msgid "Firmware image validation passed" +msgstr "固件镜像格式与设备兼容性校验通过" + +msgid "Image check failed: " +msgstr "固件镜像校验未通过:" + +msgid "The uploaded image file does not contain a supported format." +msgstr "所选固件文件不包含受支持的格式。" + +msgid "Firmware Image Check Failed" +msgstr "固件镜像校验未通过" + +msgid "The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform." +msgstr "下载的固件文件未通过系统格式或设备兼容性校验。请确认您选择了适合当前硬件平台的固件镜像。" + +msgid "Force upgrade" +msgstr "强制升级 (Force upgrade)" + +msgid "Select 'Force upgrade' to flash the image even if the image format check fails. Use only if you are sure that the firmware is correct and meant for your device!" +msgstr "勾选“强制升级”可在镜像格式校验失败时强行刷入固件。请仅在您完全确认该固件正确且适用于当前设备时使用!" + +msgid "Force upgrade is disallowed for this image by the system validator." +msgstr "系统校验器禁止对该固件镜像执行强制升级。" + +msgid "The image does not support keeping current configuration; configuration retention will be disabled (-n)." +msgstr "该固件镜像不支持保留当前配置,刷入时将自动禁用保留配置 (-n)。" + +msgid "Cancel" +msgstr "取消" + +msgid "Cancel Upgrade" +msgstr "取消升级" + +msgid "Force Flash" +msgstr "强制刷入固件" + +msgid "Upgrade cancelled by user after firmware check warning" +msgstr "用户已在固件校验警告弹窗中取消升级,临时固件已清理" + +msgid "Upgrade countdown cancelled by user, temporary firmware removed" +msgstr "用户已中止升级倒计时,临时固件已清理" + +msgid "Upgrade cancelled, temporary firmware file removed" +msgstr "已取消升级并清理临时固件文件" + +msgid "Image check failed, confirmation of force upgrade is required" +msgstr "固件校验未通过,需要确认强制升级才能继续" + +msgid "Firmware image validation failed and force upgrade is disallowed by system" +msgstr "固件校验失败且系统禁止强制刷入该镜像" + +msgid "Firmware metadata does not allow keeping configuration, switched to -n" +msgstr "固件元数据不支持保留配置,已自动切换为不保留配置模式 (-n)" + +msgid "Force upgrade enabled (--force)" +msgstr "已启用强制升级模式 (--force)" + +msgid "Invalid firmware file name" +msgstr "固件文件名非法" + +msgid "Firmware file not found, please download again" +msgstr "固件文件未找到,请重新下载" + +msgid "Starting system upgrade" +msgstr "开始升级系统" + +msgid "Backup failed" +msgstr "备份失败" + +msgid "Download Backup" +msgstr "下载备份" + +msgid "Upgrading System" +msgstr "正在升级系统" + +msgid "Upgrade successful, Waiting for device..." +msgstr "更新成功,等待设备重启后响应..." + +msgid "Device unreachable! Still waiting for device..." +msgstr "无法连接设备!继续等待设备重启..." + +msgid "Firmware Download Completed" +msgstr "固件下载完成" + +msgid "Firmware is ready. System upgrade will start in %d seconds. Please do not leave this page." +msgstr "固件已就绪,系统将在 %d 秒后开始刷入。请勿离开当前页面。" + +msgid "Starting download: " +msgstr "开始下载: " + +msgid "System upgrade will start in " +msgstr "系统将在 " + +msgid " seconds" +msgstr " 秒后开始刷入" + +msgid "Flashing..." +msgstr "正在刷入固件..." + +msgid "Upgrade mode: keep configuration" +msgstr "本次升级: 保留配置" + +msgid "Upgrade mode: do not keep configuration" +msgstr "本次升级: 不保留配置 (-n)" + +msgid "Package mode: retain installed packages (-k)" +msgstr "软件包策略: 保留已安装软件包列表 (-k)" + +msgid "Unable to fetch firmware list, please check your network connection" +msgstr "无法获取远程版本信息,请检查网络连接" + +msgid "Open Firmware Directory" +msgstr "打开固件目录" + +msgid "Firmware directory URL is unavailable, please check update again" +msgstr "固件目录链接不可用,请重新检查更新" + +msgid "Unable to open a new window. Please allow pop-ups in your browser." +msgstr "无法打开新窗口,请允许浏览器弹窗。" + +msgid "Firmware download failed, please check network connection" +msgstr "固件下载失败或超时,请检查网络连接后重试" + +msgid "Automatically selected recommended firmware: %s" +msgstr "已自动匹配并选中最新固件:%s" + +msgid "Upgrade workflow is running, please wait until current operation finishes" +msgstr "升级流程正在执行,请等待当前操作完成" + +msgid "SHA256 verification passed: " +msgstr "SHA256 校验通过:" + +msgid "SHA256 verification failed, upgrade cancelled" +msgstr "SHA256 校验失败,已取消升级" + +msgid " Expected: " +msgstr " 期望值:" + +msgid " Got: " +msgstr " 实际值:" diff --git a/luci-app-ghfu/root/etc/config/ghfu b/luci-app-ghfu/root/etc/config/ghfu new file mode 100644 index 000000000..1380ff4eb --- /dev/null +++ b/luci-app-ghfu/root/etc/config/ghfu @@ -0,0 +1,4 @@ +config ghfu 'main' + option selected_release '' + option keep_config '1' + option retain_packages '0' diff --git a/luci-app-ghfu/root/etc/hotplug.d/iface/90-online b/luci-app-ghfu/root/etc/hotplug.d/iface/90-online new file mode 100644 index 000000000..96f39de2c --- /dev/null +++ b/luci-app-ghfu/root/etc/hotplug.d/iface/90-online @@ -0,0 +1,18 @@ +. /lib/functions/network.sh +network_flush_cache +network_find_wan NET_IF +network_find_wan6 NET_IF6 +if [ "${INTERFACE}" != "${NET_IF}" ] \ +&& [ "${INTERFACE}" != "${NET_IF6}" ] +then exit 0 +fi +if [ "${ACTION}" != "ifup" ] \ +&& [ "${ACTION}" != "ifupdate" ] +then exit 0 +fi +if [ "${ACTION}" = "ifupdate" ] \ +&& [ -z "${IFUPDATE_ADDRESSES}" ] \ +&& [ -z "${IFUPDATE_DATA}" ] +then exit 0 +fi +hotplug-call online diff --git a/luci-app-ghfu/root/etc/hotplug.d/online/3-sleep b/luci-app-ghfu/root/etc/hotplug.d/online/3-sleep new file mode 100644 index 000000000..b4f239fbc --- /dev/null +++ b/luci-app-ghfu/root/etc/hotplug.d/online/3-sleep @@ -0,0 +1 @@ +sleep 3 diff --git a/luci-app-ghfu/root/etc/hotplug.d/online/50-opkg-restore b/luci-app-ghfu/root/etc/hotplug.d/online/50-opkg-restore new file mode 100644 index 000000000..3ae6241a8 --- /dev/null +++ b/luci-app-ghfu/root/etc/hotplug.d/online/50-opkg-restore @@ -0,0 +1,39 @@ +. /etc/profile.d/opkg.sh +OPKG_PI="$(opkg export pi)" +if [ ! -e /etc/opkg-restore-auto ] \ +&& lock -n /var/lock/opkg-restore && [ -s "${OPKG_PI}" ]; then +c=0 +while ! curl https://dl.openwrt.ai >/dev/null || ! opkg update >/dev/null; do +echo "Network error." | logger -t opkg +[[ "$(uci -q get dhcp.@dnsmasq[0].noresolv)" == 1 && $c == 3 ]] && { + uci -q del dhcp.@dnsmasq[0].noresolv + uci commit dhcp + uci -q get network.lan.dns || { + uci -q set network.lan.dns='223.5.5.5' + uci commit network + /etc/init.d/network reload + } + /etc/init.d/dnsmasq reload +} +[ $c -eq 300 ] && { + lock -u /var/lock/opkg-restore + exit 0 +} || let c++ +sleep 3 +done + +c1=0 +logs="1" +while [ "$logs" != "" ]; do +logs="$(opkg restore)" +echo "${logs}" | logger -t opkg +[ $c1 -eq 5 ] && { + lock -u /var/lock/opkg-restore + exit 0 + } || let c1++ +sleep 2 +done +touch /etc/opkg-restore-auto + +fi +lock -u /var/lock/opkg-restore diff --git a/luci-app-ghfu/root/etc/hotplug.d/online/51-opkg-upgrade b/luci-app-ghfu/root/etc/hotplug.d/online/51-opkg-upgrade new file mode 100644 index 000000000..369bf6ff7 --- /dev/null +++ b/luci-app-ghfu/root/etc/hotplug.d/online/51-opkg-upgrade @@ -0,0 +1,5 @@ +if [ "$(uci -q get wizard.default.autoupgrade_pkg)" == '1' ] && lock -n /var/lock/opkg-upgrade && opkg update; then +. /etc/profile.d/opkg.sh +opkg upgr 2>&1 | logger -t opkg +fi +lock -u /var/lock/opkg-upgrade diff --git a/luci-app-ghfu/root/etc/profile.d/opkg.sh b/luci-app-ghfu/root/etc/profile.d/opkg.sh new file mode 100644 index 000000000..0cbcdea8d --- /dev/null +++ b/luci-app-ghfu/root/etc/profile.d/opkg.sh @@ -0,0 +1,207 @@ +opkg() { +local OPKG_CMD="${1}" +local OPKG_UCI="$(uci -q get opkg.defaults."${OPKG_CMD}")" +case "${OPKG_CMD}" in +(init|uci|import|save|restore|rollback\ +|upgr|export|newconf|proc|reinstall) opkg_"${@}" ;; +(*) command opkg "${@}" ;; +esac +} + +opkg_init() { +uci import opkg < /dev/null +uci -q batch << EOI +set opkg.defaults='opkg' +set opkg.defaults.save='auto' +set opkg.defaults.restore='auto' +set opkg.defaults.rollback='auto' +set opkg.defaults.upgr='ai' +set opkg.defaults.export='ai' +set opkg.defaults.proc='--force-overwrite --force-checksum --force-depends' +set opkg.defaults.reinstall='--force-reinstall --force-overwrite --force-checksum --force-depends' +set opkg.defaults.newconf='/etc' +EOI +echo "kmod busybox base-files " \ +| sed -e "s/\s/ ipkg\n/g" | opkg uci ignore +} + +opkg_uci() { +local OPKG_OPT="${1:-${OPKG_UCI}}" +local OPKG_OPT="${OPKG_OPT:-auto}" +if ! uci -q get opkg.defaults > /dev/null +then opkg init +fi +uci -q batch << EOI +delete opkg.'${OPKG_OPT}' +set opkg.'${OPKG_OPT}'='opkg' +$(sed -r -e "s/^(.*)\s(.*)$/\ +del_list opkg.'${OPKG_OPT}'.'\2'='\1'\n\ +add_list opkg.'${OPKG_OPT}'.'\2'='\1'/") +commit opkg +EOI +} + +opkg_import() { +local OPKG_OPT="${1:-${OPKG_UCI}}" +if [ -e "${OPKG_OPT}" ] +then sed -n -r -e "s/\s(overlay|unknown)$/\ +\tipkg/p" "${OPKG_OPT}" \ +| opkg uci auto +fi +} + +opkg_save() { +local OPKG_OPT="${1:-${OPKG_UCI}}" +local OPKG_WR="$(opkg export wr)" +local OPKG_WI="$(opkg export wi)" +local OPKG_UR="$(opkg export ur)" +local OPKG_CM="$(opkg export cm)" +local OPKG_UI="$(opkg export ui)" +if uci -q get fstab.rwm > /dev/null \ +&& grep -q -e "\s/rwm\s" /etc/mtab +then { +sed -e "s/$/\trpkg/" "${OPKG_WR}" +sed -e "s/$/\tipkg/" "${OPKG_WI}" +} | opkg uci init +fi +{ +sed -e "s/$/\trpkg/" "${OPKG_UR}" +sed -e "s/$/\trpkg/" "${OPKG_CM}" | grep "^-" | sed "s/^-//" +sed -e "s/$/\tipkg/" "${OPKG_UI}" +sed -e "s/$/\tipkg/" "${OPKG_CM}" | grep "^[^-]" +} | opkg uci "${OPKG_OPT}" +rm -f "${OPKG_WR}" "${OPKG_WI}" "${OPKG_UR}" "${OPKG_UI}" +} + +opkg_restore() { +local OPKG_OPT="${1:-${OPKG_UCI}}" +local OPKG_CONF="${OPKG_OPT}" +local OPKG_AI="$(opkg export ai)" +local OPKG_PR="$(opkg export pr)" +local OPKG_PI="$(opkg export pi)" +if ! uci -q get opkg > /dev/null +then opkg init +fi +grep -x -f "${OPKG_AI}" "${OPKG_PR}" \ +| opkg proc remove +grep -v -x -f "${OPKG_AI}" "${OPKG_PI}" \ +| opkg proc install +rm -f "${OPKG_AI}" "${OPKG_PR}" "${OPKG_PI}" +} + +opkg_rollback() { +local OPKG_OPT="${1:-${OPKG_UCI}}" +local OPKG_CONF="${OPKG_OPT}" +local OPKG_UR="$(opkg export ur)" +local OPKG_UI="$(opkg export ui)" +local OPKG_PR="$(opkg export pr)" +local OPKG_PI="$(opkg export pi)" +if uci -q get opkg."${OPKG_CONF}" > /dev/null +then opkg restore "${OPKG_CONF}" +grep -v -x -f "${OPKG_PI}" "${OPKG_UI}" \ +| opkg proc remove +grep -v -x -f "${OPKG_PR}" "${OPKG_UR}" \ +| opkg proc install +fi +rm -f "${OPKG_UR}" "${OPKG_UI}" "${OPKG_PR}" "${OPKG_PI}" +} + +opkg_upgr() { +local OPKG_OPT="${1:-${OPKG_UCI}}" +if ! uci -q get opkg > /dev/null +then opkg init +fi +case "${OPKG_OPT}" in +(ai|oi) opkg_"${OPKG_CMD}"_type ;; +esac | opkg proc upgrade +} + +opkg_upgr_type() { +local OPKG_AI="$(opkg export ai)" +local OPKG_OI="$(opkg export oi)" +local OPKG_AU="$(opkg export au)" +case "${OPKG_OPT::1}" in +(a) grep -x -f "${OPKG_AI}" "${OPKG_AU}" ;; +(o) grep -x -f "${OPKG_OI}" "${OPKG_AU}" ;; +esac +rm -f "${OPKG_AI}" "${OPKG_OI}" "${OPKG_AU}" +} + +opkg_export() { +local OPKG_OPT="${1:-${OPKG_UCI}}" +local OPKG_TEMP="$(mktemp -t opkg.XXXXXX)" +case "${OPKG_OPT}" in +(ai|au) opkg_"${OPKG_CMD}"_cmd ;; +(ri|wr|wi|or|oi) opkg_"${OPKG_CMD}"_type ;; +(ur|ui) opkg_"${OPKG_CMD}"_run ;; +(pr|pi|ig|cm) opkg_"${OPKG_CMD}"_uci ;; +esac > "${OPKG_TEMP}" +echo "${OPKG_TEMP}" +} + +opkg_export_cmd() { +local OPKG_TYPE +local OPKG_IG="$(opkg export ig)" +case "${OPKG_OPT:1}" in +(i) OPKG_TYPE="installed";opkg list-"${OPKG_TYPE}" | sed -e "s/\s.*$//" ;; +(u) OPKG_TYPE="upgradable";opkg list-"${OPKG_TYPE}" | sed -e "s/\s.*$//" | grep -v -f "${OPKG_IG}" ;; +esac +} + +opkg_export_type() { +local OPKG_INFO="/usr/lib/opkg/info" +local OPKG_TYPE +case "${OPKG_OPT::1}" in +(r) OPKG_INFO="/rom${OPKG_INFO}" ;; +(w) OPKG_INFO="/rwm/upper${OPKG_INFO}" ;; +(o) OPKG_INFO="/overlay/upper${OPKG_INFO}" ;; +esac +case "${OPKG_OPT:1}" in +(r) OPKG_TYPE="c" ;; +(i) OPKG_TYPE="f" ;; +esac +find "${OPKG_INFO}" -name "*.control" \ +-type "${OPKG_TYPE}" 2> /dev/null \ +| sed -e "s/^.*\///;s/\.control$//" +} + +opkg_export_run() { +local OPKG_AI="$(opkg export ai)" +local OPKG_RI="$(opkg export ri)" +case "${OPKG_OPT:1}" in +(r) grep -v -x -f "${OPKG_AI}" "${OPKG_RI}" ;; +(i) grep -v -x -f "${OPKG_RI}" "${OPKG_AI}" ;; +esac +rm -f "${OPKG_AI}" "${OPKG_RI}" +} + +opkg_export_uci() { +local OPKG_TYPE +case "${OPKG_OPT:1}" in +(r) OPKG_TYPE="rpkg"; OPKG_CONF="auto" ;; +(i) OPKG_TYPE="ipkg"; OPKG_CONF="auto" ;; +(g) OPKG_TYPE="ipkg"; OPKG_CONF="ignore" ;; +(m) OPKG_TYPE="ipkg"; OPKG_CONF="custom" ;; +esac +uci -q get opkg."${OPKG_CONF}"."${OPKG_TYPE}" \ +| sed -e "s/\s/\n/g" +} + +opkg_proc() { +local OPKG_OPT="${OPKG_UCI}" +local OPKG_CMD="${1:?}" +local OPKG_PKG +while read -r OPKG_PKG +do opkg "${OPKG_CMD}" "${OPKG_PKG}" ${OPKG_OPT} +done +} + +opkg_reinstall() { +local OPKG_OPT="${OPKG_UCI}" +opkg install "${@}" ${OPKG_OPT} +} + +opkg_newconf() { +local OPKG_OPT="${1:-${OPKG_UCI}}" +find "${OPKG_OPT}" -name "*-opkg" +} diff --git a/luci-app-ghfu/root/etc/uci-defaults/99-ghfu-defaults b/luci-app-ghfu/root/etc/uci-defaults/99-ghfu-defaults new file mode 100644 index 000000000..bdbb8a3cb --- /dev/null +++ b/luci-app-ghfu/root/etc/uci-defaults/99-ghfu-defaults @@ -0,0 +1,31 @@ +#!/bin/sh + +uci -q get ghfu.main >/dev/null || { + uci -q batch </dev/null || { + uci -q set luci.main.autoupgrade_fm='1' + uci commit luci + } +fi + +grep -q "opkg-upgrade" /etc/crontabs/root 2>/dev/null || { + hour="$(grep -m1 -ao '[4-6]' /dev/urandom 2>/dev/null | head -n1)" + [ -z "$hour" ] && hour=5 + min="$(grep -m1 -ao '[0-5][0-9]' /dev/urandom 2>/dev/null | head -n1)" + [ -z "$min" ] && min=30 + echo "$min $hour * * * . /etc/hotplug.d/online/51-opkg-upgrade" >> /etc/crontabs/root +} + +date +%s > /etc/ghfu_flash_epoch +rm -rf /tmp/luci-modulecache /tmp/luci-indexcache* + +exit 0 diff --git a/luci-app-ghfu/root/usr/share/rpcd/acl.d/luci-app-ghfu.json b/luci-app-ghfu/root/usr/share/rpcd/acl.d/luci-app-ghfu.json new file mode 100644 index 000000000..3ec0cbeb4 --- /dev/null +++ b/luci-app-ghfu/root/usr/share/rpcd/acl.d/luci-app-ghfu.json @@ -0,0 +1,11 @@ +{ + "luci-app-ghfu": { + "description": "Grant UCI access for luci-app-ghfu", + "read": { + "uci": [ "ghfu" ] + }, + "write": { + "uci": [ "ghfu" ] + } + } +} diff --git a/luci-app-modem-manager-next/Makefile b/luci-app-modem-manager-next/Makefile index b37b3353e..597d8dcc4 100644 --- a/luci-app-modem-manager-next/Makefile +++ b/luci-app-modem-manager-next/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-modem-manager-next PKG_VERSION:=1.0.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_LICENSE:=MIT PKG_MAINTAINER:=Dante @@ -14,19 +14,7 @@ LUCI_DEPENDS:=+ucode +ucode-mod-fs +ucode-mod-ubus +ucode-mod-uci \ +kmod-usb-net +kmod-usb-serial +kmod-usb-serial-option \ +kmod-usb-net-cdc-ncm +kmod-usb-net-cdc-ether +sms-tool LUCI_PKGARCH:=all - -include $(TOPDIR)/feeds/luci/luci.mk - -define Package/$(PKG_NAME) - $(call Package/luci/webtemplate) - TITLE:=$(LUCI_TITLE) - DEPENDS:=$(LUCI_DEPENDS) - PROVIDES:=luci-app-modem-manager -endef - -define Package/$(PKG_NAME)/description - Provides a modern LuCI Web management interface for 4G/5G cellular modems. -endef +PKG_PROVIDES:=luci-app-modem-manager define Package/$(PKG_NAME)/conffiles /etc/config/modem-manager @@ -38,11 +26,13 @@ define Package/$(PKG_NAME)/postinst chmod 0755 /etc/init.d/modem-manager 2>/dev/null || true chmod 0755 /etc/hotplug.d/usb/20-modem-hotplug 2>/dev/null || true chmod 0755 /usr/libexec/modem-at-executor /usr/libexec/modem-detect /usr/libexec/modem-collector 2>/dev/null || true - /etc/init.d/rpcd restart - /etc/init.d/modem-manager enable - /etc/init.d/modem-manager restart + /etc/init.d/rpcd restart >/dev/null 2>&1 || true + /etc/init.d/modem-manager enable >/dev/null 2>&1 || true + /etc/init.d/modem-manager restart >/dev/null 2>&1 || true } exit 0 endef +include $(TOPDIR)/feeds/luci/luci.mk + # call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-open-box/Makefile b/luci-app-open-box/Makefile index 22742ff04..52743ff4d 100644 --- a/luci-app-open-box/Makefile +++ b/luci-app-open-box/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-open-box -PKG_VERSION:=0.1.437 -PKG_RELEASE:=78 +PKG_VERSION:=0.1.442 +PKG_RELEASE:=79 PKG_MAINTAINER:=liandu2024 PKG_LICENSE:=GPL-3.0-or-later diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index e976a315a..2cfcd2b84 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=26.11.11 -PKG_RELEASE:=378 +PKG_RELEASE:=379 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall/luasrc/controller/passwall.lua b/luci-app-passwall/luasrc/controller/passwall.lua index a58f6879e..3c02d7859 100644 --- a/luci-app-passwall/luasrc/controller/passwall.lua +++ b/luci-app-passwall/luasrc/controller/passwall.lua @@ -463,6 +463,7 @@ function socks_status() e.socks_status = luci.sys.call(string.format("/bin/busybox top -bn1 | grep -v -E 'grep|acl/|acl_' | grep '%s/bin/' | grep '/%s' > /dev/null", appname, id)) == 0 local use_http = uci_get(id, "http_port") or 0 e.use_http = 0 + e.http_status = false if tonumber(use_http) > 0 then e.use_http = 1 e.http_status = luci.sys.call(string.format("/bin/busybox top -bn1 | grep -v -E 'grep|acl/|acl_' | grep '%s/bin/' | grep '/%s' | grep -E '\\+http|_http' > /dev/null", appname, id)) == 0 diff --git a/luci-app-passwall/luasrc/view/passwall/cbi/nodes_dynamiclist_com.htm b/luci-app-passwall/luasrc/view/passwall/cbi/nodes_dynamiclist_com.htm index 2e0a2980a..40620be14 100644 --- a/luci-app-passwall/luasrc/view/passwall/cbi/nodes_dynamiclist_com.htm +++ b/luci-app-passwall/luasrc/view/passwall/cbi/nodes_dynamiclist_com.htm @@ -210,12 +210,6 @@ return `#${toHex(r)}${toHex(g)}${toHex(b)}` } - function dl_isTransparent(color) { - const cleanColor = dl_parseColorToRgba(color); - // check #RRGGBBAA for transparency - return !cleanColor || (cleanColor.a !== undefined && !cleanColor.a); - } - function dl_getColorSchema(color) { const rgb = dl_parseColorToRgba(color); if (!rgb) return 'unknown'; // Handle invalid colors @@ -247,6 +241,57 @@ return dl_rgbToHex(r, g, b); } + function dl_getNodeSelectorColors(select) { + const selectedIndex = select.selectedIndex; + const probe = document.createElement('option'); + let backgroundColor, color; + // A selected option may use the theme's translucent accent, not its menu surface. + select.appendChild(probe); + try { + const style = getComputedStyle(probe); + backgroundColor = style.backgroundColor; + color = style.color; + } finally { + probe.remove(); + if (select.selectedIndex !== selectedIndex) select.selectedIndex = selectedIndex; + } + + let ctx = dl_getNodeSelectorColors._context; + if (!ctx) { + const canvas = document.createElement('canvas'); + canvas.width = canvas.height = 1; + ctx = dl_getNodeSelectorColors._context = canvas.getContext('2d', { willReadFrequently: true }); + } + const rgb = [0, 0, 0]; + let remaining = 1; + function composite(value) { + ctx.clearRect(0, 0, 1, 1); + ctx.fillStyle = value; + ctx.fillRect(0, 0, 1, 1); + const pixel = ctx.getImageData(0, 0, 1, 1).data; + const alpha = pixel[3] / 255; + for (let i = 0; i < 3; i++) rgb[i] += pixel[i] * alpha * remaining; + remaining *= 1 - alpha; + } + + // Flatten transparent surfaces before the popup is moved outside the form. + composite(backgroundColor); + for (let element = select; element && remaining > 0; element = element.parentElement) { + composite(getComputedStyle(element).backgroundColor); + } + if (remaining > 0) { + const canvasColor = document.createElement('span'); + canvasColor.style.cssText = 'display:none; background-color:Canvas;'; + select.parentElement.appendChild(canvasColor); + try { + composite(getComputedStyle(canvasColor).backgroundColor); + } finally { + canvasColor.remove(); + } + } + return { backgroundColor: `rgb(${rgb.map(Math.round).join(', ')})`, color }; + } + // copy select styles function dl_adaptiveStyle(cbid) { const display = document.getElementById(cbid + ".display"); @@ -256,7 +301,6 @@ const elOption = hiddenRef.getElementsByTagName("option")[0] const styleSelect = window.getComputedStyle(hiddenRef) const styleOption = window.getComputedStyle(elOption) - const styleBody = window.getComputedStyle(document.body) const styleNode = document.createElement('style') const styleNames = ["width", "color", "height", "padding", "margin", "lineHeight", "border", "borderRadius", "minWidth", "minHeight"] @@ -264,14 +308,14 @@ styleNames.push("borderBottomWidth", "borderBottomStyle", "borderBottomColor"); } document.head.appendChild(styleNode) - // trace back from option -> select -> body for background color + const colors = dl_getNodeSelectorColors(hiddenRef); const panelRadius = styleSelect.borderRadius; - const optionColor = !dl_isTransparent(styleOption.backgroundColor) ? styleOption.backgroundColor : !dl_isTransparent(styleSelect.backgroundColor) ? styleSelect.backgroundColor : styleBody.backgroundColor + const optionColor = colors.backgroundColor; const titleColor = dl_getColorSchema(optionColor) === "light" ? dl_darker(optionColor, 30) : dl_lighter(optionColor, 30) // 自带箭头已占据布局空间,右内边距使用主题的左内边距 const selectStyleCSS = [`#${CSS.escape(cbid + ".display")}, .dl-selected-item {`, dl_style2Css(styleSelect, styleNames), dl_style2Css(styleSelect, ["backgroundColor"]), `padding-right: ${styleSelect.paddingLeft} !important;`, "}"] - const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, dl_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `border-radius: ${panelRadius};`, "}"] - const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .dl-group-title {`, `background-color: ${titleColor} !important;`, "}"] + const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, dl_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `color: ${colors.color};`, `border-radius: ${panelRadius};`, "}"] + const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .dl-group-title {`, `background-color: ${titleColor} !important;`, `color: ${colors.color};`, "}"] styleNode.textContent = [].concat(selectStyleCSS, optionStyleCSS, titleStyleCSS).join("\n") } } diff --git a/luci-app-passwall/luasrc/view/passwall/cbi/nodes_listvalue_com.htm b/luci-app-passwall/luasrc/view/passwall/cbi/nodes_listvalue_com.htm index ad8ce3908..2c7a0c6ad 100644 --- a/luci-app-passwall/luasrc/view/passwall/cbi/nodes_listvalue_com.htm +++ b/luci-app-passwall/luasrc/view/passwall/cbi/nodes_listvalue_com.htm @@ -48,20 +48,15 @@ text-overflow: ellipsis; transition: background-color 0.15s ease; } -/* 鼠标悬停效果 - 使用透明度避免覆盖问题 */ -.cbi-listvalue-panel li[data-key]:hover { - background-color: rgba(0, 123, 255, 0.1); +/* 悬停和选中颜色由当前控件的主题样式提供 */ +.lv-dropdown-panel li[data-key]:hover { + background-color: var(--lv-hover-background, rgba(127, 127, 127, 0.1)); } -/* 选中项样式 - 使用更高优先级 */ -.cbi-listvalue-panel li[data-key].is-selected { - background-color: #007bff !important; - color: white !important; +.lv-dropdown-panel li[data-key].is-selected { + background: var(--lv-selected-background, Highlight) !important; + color: var(--lv-selected-color, HighlightText) !important; font-weight: 600 !important; } -/* 选中项悬停时保持主色调 */ -.cbi-listvalue-panel li[data-key].is-selected:hover { - background-color: #0056b3 !important; -} .lv-dropdown-container { display: inline-block; @@ -69,11 +64,6 @@ min-width: 220px; white-space: nowrap; } -@media (max-width: 1152px) { - .lv-dropdown-container { - white-space: normal; - } -} @media (max-width: 600px) { .lv-dropdown-container { display: block; @@ -143,6 +133,32 @@ text-overflow: ellipsis; text-align: left !important; } +@media screen and (max-width: 1152px) { + .lv-dropdown-container { + width: 100%; + min-width: 0; + max-width: 100%; + white-space: normal; + } + + /* Override widths copied from the theme by adaptiveStyle(). */ + .lv-dropdown-display.cbi-input-select { + width: 100% !important; + min-width: 0 !important; + max-width: 100% !important; + } + + .lv-dropdown-label { + flex: 1; + width: 0; + min-width: 0; + text-overflow: ellipsis; + } + + .lv-arrow-down { + flex-shrink: 0; + } +} \ No newline at end of file + diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile index 6b46b9fa0..c0e43403b 100644 --- a/luci-app-passwall2/Makefile +++ b/luci-app-passwall2/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall2 PKG_VERSION:=26.11.11 -PKG_RELEASE:=179 +PKG_RELEASE:=180 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/global.lua b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/global.lua index 2f39c4004..b33fd936c 100644 --- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/global.lua +++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/global.lua @@ -349,12 +349,6 @@ function s2.create(e, t) luci.http.redirect(e.extedit:format(uid)) end -o = s2:option(DummyValue, "status", translate("Status")) -o.rawhtml = true -o.cfgvalue = function(t, n) - return string.format('
', n) -end - ---- Enable o = s2:option(Flag, "enabled", translate("Enable")) o.default = 1 @@ -376,26 +370,19 @@ o.cfgvalue = function(_, n) end end -local n = 1 -m:foreach("socks", function(s) - if s[".name"] == section then - return false - end - n = n + 1 -end) - -o = s2:option(Value, "port", "Socks " .. translate("Listen Port")) -o.default = n + 1080 -o.datatype = "port" -o.rmempty = false - ---[[ -if has_singbox or has_xray then - o = s2:option(Value, "http_port", "HTTP " .. translate("Listen Port") .. " " .. translate("0 is not use")) - o.default = 0 - o.datatype = "port" +o = s2:option(DummyValue, "port_status", translate("Port Status")) +o.rawhtml = true +o.cfgvalue = function(t, n) + local socks = m:get(n, "port") or "0" + local http = m:get(n, "http_port") or "0" + return string.format([[ +
+ SOCKS: %s +
+ HTTP: %s +
+ ]], n, socks, http) end -]]-- local o_node = s.fields["node"] local o_socks = s2.fields["node"] diff --git a/luci-app-passwall2/luasrc/view/passwall2/cbi/nodes_dynamiclist_com.htm b/luci-app-passwall2/luasrc/view/passwall2/cbi/nodes_dynamiclist_com.htm index f32f6b795..e5346ff25 100644 --- a/luci-app-passwall2/luasrc/view/passwall2/cbi/nodes_dynamiclist_com.htm +++ b/luci-app-passwall2/luasrc/view/passwall2/cbi/nodes_dynamiclist_com.htm @@ -210,12 +210,6 @@ return `#${toHex(r)}${toHex(g)}${toHex(b)}` } - function dl_isTransparent(color) { - const cleanColor = dl_parseColorToRgba(color); - // check #RRGGBBAA for transparency - return !cleanColor || (cleanColor.a !== undefined && !cleanColor.a); - } - function dl_getColorSchema(color) { const rgb = dl_parseColorToRgba(color); if (!rgb) return 'unknown'; // Handle invalid colors @@ -247,6 +241,57 @@ return dl_rgbToHex(r, g, b); } + function dl_getNodeSelectorColors(select) { + const selectedIndex = select.selectedIndex; + const probe = document.createElement('option'); + let backgroundColor, color; + // A selected option may use the theme's translucent accent, not its menu surface. + select.appendChild(probe); + try { + const style = getComputedStyle(probe); + backgroundColor = style.backgroundColor; + color = style.color; + } finally { + probe.remove(); + if (select.selectedIndex !== selectedIndex) select.selectedIndex = selectedIndex; + } + + let ctx = dl_getNodeSelectorColors._context; + if (!ctx) { + const canvas = document.createElement('canvas'); + canvas.width = canvas.height = 1; + ctx = dl_getNodeSelectorColors._context = canvas.getContext('2d', { willReadFrequently: true }); + } + const rgb = [0, 0, 0]; + let remaining = 1; + function composite(value) { + ctx.clearRect(0, 0, 1, 1); + ctx.fillStyle = value; + ctx.fillRect(0, 0, 1, 1); + const pixel = ctx.getImageData(0, 0, 1, 1).data; + const alpha = pixel[3] / 255; + for (let i = 0; i < 3; i++) rgb[i] += pixel[i] * alpha * remaining; + remaining *= 1 - alpha; + } + + // Flatten transparent surfaces before the popup is moved outside the form. + composite(backgroundColor); + for (let element = select; element && remaining > 0; element = element.parentElement) { + composite(getComputedStyle(element).backgroundColor); + } + if (remaining > 0) { + const canvasColor = document.createElement('span'); + canvasColor.style.cssText = 'display:none; background-color:Canvas;'; + select.parentElement.appendChild(canvasColor); + try { + composite(getComputedStyle(canvasColor).backgroundColor); + } finally { + canvasColor.remove(); + } + } + return { backgroundColor: `rgb(${rgb.map(Math.round).join(', ')})`, color }; + } + // copy select styles function dl_adaptiveStyle(cbid) { const display = document.getElementById(cbid + ".display"); @@ -256,7 +301,6 @@ const elOption = hiddenRef.getElementsByTagName("option")[0] const styleSelect = window.getComputedStyle(hiddenRef) const styleOption = window.getComputedStyle(elOption) - const styleBody = window.getComputedStyle(document.body) const styleNode = document.createElement('style') const styleNames = ["width", "color", "height", "padding", "margin", "lineHeight", "border", "borderRadius", "minWidth", "minHeight"] @@ -264,14 +308,14 @@ styleNames.push("borderBottomWidth", "borderBottomStyle", "borderBottomColor"); } document.head.appendChild(styleNode) - // trace back from option -> select -> body for background color + const colors = dl_getNodeSelectorColors(hiddenRef); const panelRadius = styleSelect.borderRadius; - const optionColor = !dl_isTransparent(styleOption.backgroundColor) ? styleOption.backgroundColor : !dl_isTransparent(styleSelect.backgroundColor) ? styleSelect.backgroundColor : styleBody.backgroundColor + const optionColor = colors.backgroundColor; const titleColor = dl_getColorSchema(optionColor) === "light" ? dl_darker(optionColor, 30) : dl_lighter(optionColor, 30) // 自带箭头已占据布局空间,右内边距使用主题的左内边距 const selectStyleCSS = [`#${CSS.escape(cbid + ".display")}, .dl-selected-item {`, dl_style2Css(styleSelect, styleNames), dl_style2Css(styleSelect, ["backgroundColor"]), `padding-right: ${styleSelect.paddingLeft} !important;`, "}"] - const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, dl_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `border-radius: ${panelRadius};`, "}"] - const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .dl-group-title {`, `background-color: ${titleColor} !important;`, "}"] + const optionStyleCSS = [`#${CSS.escape(cbid + ".panel")} {`, dl_style2Css(styleOption, styleNames), `background-color: ${optionColor};`, `color: ${colors.color};`, `border-radius: ${panelRadius};`, "}"] + const titleStyleCSS = [`#${CSS.escape(cbid + ".panel")} .dl-group-title {`, `background-color: ${titleColor} !important;`, `color: ${colors.color};`, "}"] styleNode.textContent = [].concat(selectStyleCSS, optionStyleCSS, titleStyleCSS).join("\n") } } diff --git a/luci-app-passwall2/luasrc/view/passwall2/cbi/nodes_listvalue_com.htm b/luci-app-passwall2/luasrc/view/passwall2/cbi/nodes_listvalue_com.htm index ad8ce3908..3eb061cb0 100644 --- a/luci-app-passwall2/luasrc/view/passwall2/cbi/nodes_listvalue_com.htm +++ b/luci-app-passwall2/luasrc/view/passwall2/cbi/nodes_listvalue_com.htm @@ -48,20 +48,15 @@ text-overflow: ellipsis; transition: background-color 0.15s ease; } -/* 鼠标悬停效果 - 使用透明度避免覆盖问题 */ -.cbi-listvalue-panel li[data-key]:hover { - background-color: rgba(0, 123, 255, 0.1); +/* Use the current control theme for hover and selection colors. */ +.lv-dropdown-panel li[data-key]:hover { + background-color: var(--lv-hover-background, rgba(127, 127, 127, 0.1)); } -/* 选中项样式 - 使用更高优先级 */ -.cbi-listvalue-panel li[data-key].is-selected { - background-color: #007bff !important; - color: white !important; +.lv-dropdown-panel li[data-key].is-selected { + background: var(--lv-selected-background, Highlight) !important; + color: var(--lv-selected-color, HighlightText) !important; font-weight: 600 !important; } -/* 选中项悬停时保持主色调 */ -.cbi-listvalue-panel li[data-key].is-selected:hover { - background-color: #0056b3 !important; -} .lv-dropdown-container { display: inline-block; @@ -69,11 +64,6 @@ min-width: 220px; white-space: nowrap; } -@media (max-width: 1152px) { - .lv-dropdown-container { - white-space: normal; - } -} @media (max-width: 600px) { .lv-dropdown-container { display: block; @@ -143,6 +133,32 @@ text-overflow: ellipsis; text-align: left !important; } +@media screen and (max-width: 1152px) { + .lv-dropdown-container { + width: 100%; + min-width: 0; + max-width: 100%; + white-space: normal; + } + + /* Override widths copied from the theme by adaptiveStyle(). */ + .lv-dropdown-display.cbi-input-select { + width: 100% !important; + min-width: 0 !important; + max-width: 100% !important; + } + + .lv-dropdown-label { + flex: 1; + width: 0; + min-width: 0; + text-overflow: ellipsis; + } + + .lv-arrow-down { + flex-shrink: 0; + } +} \ No newline at end of file + diff --git a/luci-app-passwall2/po/fa/passwall2.po b/luci-app-passwall2/po/fa/passwall2.po index 2b9994f1c..7d6b4eebd 100644 --- a/luci-app-passwall2/po/fa/passwall2.po +++ b/luci-app-passwall2/po/fa/passwall2.po @@ -112,6 +112,9 @@ msgstr "گره Socks" msgid "Current Node" msgstr "گره فعلی" +msgid "Port Status" +msgstr "وضعیت پورت‌ها" + msgid "Listen Port" msgstr "پورت شنود" diff --git a/luci-app-passwall2/po/ru/passwall2.po b/luci-app-passwall2/po/ru/passwall2.po index 97b3487f7..26f163295 100644 --- a/luci-app-passwall2/po/ru/passwall2.po +++ b/luci-app-passwall2/po/ru/passwall2.po @@ -109,6 +109,9 @@ msgstr "SOCKS-сервер" msgid "Current Node" msgstr "Активный сервер" +msgid "Port Status" +msgstr "Состояние портов" + msgid "Listen Port" msgstr "Порт прослушивания" diff --git a/luci-app-passwall2/po/zh-cn/passwall2.po b/luci-app-passwall2/po/zh-cn/passwall2.po index 9dff3ec0d..96f870d4a 100644 --- a/luci-app-passwall2/po/zh-cn/passwall2.po +++ b/luci-app-passwall2/po/zh-cn/passwall2.po @@ -109,6 +109,9 @@ msgstr "Socks 节点" msgid "Current Node" msgstr "当前节点" +msgid "Port Status" +msgstr "端口状态" + msgid "Listen Port" msgstr "监听端口" diff --git a/luci-app-passwall2/po/zh-tw/passwall2.po b/luci-app-passwall2/po/zh-tw/passwall2.po index a0c9488b4..a3b448dfd 100644 --- a/luci-app-passwall2/po/zh-tw/passwall2.po +++ b/luci-app-passwall2/po/zh-tw/passwall2.po @@ -109,6 +109,9 @@ msgstr "Socks 節點" msgid "Current Node" msgstr "當前節點" +msgid "Port Status" +msgstr "連接埠狀態" + msgid "Listen Port" msgstr "監聽端口" diff --git a/luci-app-ssserver-next/Makefile b/luci-app-ssserver-next/Makefile index 6edabbf5b..79259e16f 100644 --- a/luci-app-ssserver-next/Makefile +++ b/luci-app-ssserver-next/Makefile @@ -2,19 +2,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssserver-next PKG_VERSION:=1.0.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=Dante PKG_LICENSE:=Apache-2.0 LUCI_TITLE:=LuCI support for Shadowsocks-rust Server (Next) LUCI_DEPENDS:=+shadowsocks-rust-ssserver-next +luci-base +ucode +ucode-mod-fs +ucode-mod-ubus +LUCI_PKGARCH:=all -define Package/luci-app-ssserver/postinst +define Package/luci-app-ssserver-next/postinst #!/bin/sh [ -n "$${IPKG_INSTROOT}" ] || { - chmod +x /etc/init.d/ssserver - /etc/init.d/rpcd restart + chmod +x /etc/init.d/ssserver 2>/dev/null || true + /etc/init.d/rpcd restart >/dev/null 2>&1 || true } exit 0 endef diff --git a/luci-app-tailscale-next/Makefile b/luci-app-tailscale-next/Makefile index dab84c68f..613c86f45 100644 --- a/luci-app-tailscale-next/Makefile +++ b/luci-app-tailscale-next/Makefile @@ -1,5 +1,9 @@ include $(TOPDIR)/rules.mk +PKG_NAME:=luci-app-tailscale-next +PKG_VERSION:=1.0.0 +PKG_RELEASE:=2 + LUCI_TITLE:=LuCI support for Tailscale Next LUCI_URL:=https://github.com/tokisaki-galaxy/luci-app-tailscale-community PKG_DESCRIPTION:=Provides a LuCI Web management interface for Tailscale, allowing viewing status, configuring nodes and daemons. diff --git a/lucky/Makefile b/lucky/Makefile index 391c5bd59..7b0d120ed 100644 --- a/lucky/Makefile +++ b/lucky/Makefile @@ -5,8 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lucky PKG_VERSION:=3.5.0 -PKG_RELEASE:=5 -PKGARCH:=all +PKG_RELEASE:=6 LUCKY_CONF_DIR := /etc/config/lucky.daji LUCKY_TMP_BACKUP := /tmp/luckyconfdir @@ -42,12 +41,15 @@ ifeq ($(ARCH),aarch64) LUCKY_ARCH:=arm64 endif +PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_Linux_$(LUCKY_ARCH).tar.gz +PKG_SOURCE_URL:=https://github.com/gdy666/lucky/releases/download/v$(PKG_VERSION)/ +PKG_HASH:=skip + PKG_LICENSE:=GPL-3.0-only PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=GDY666 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_HASH:=skip include $(INCLUDE_DIR)/package.mk @@ -63,12 +65,9 @@ define Package/$(PKG_NAME)/description Main functions of Lucky: ipv4/ipv6 portforward,ddns,IOT wake on lan ,reverse proxy and more... endef - - - define Build/Prepare - [ ! -f $(PKG_BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)_Linux_$(LUCKY_ARCH).tar.gz ] && wget https://github.com/gdy666/lucky/releases/download/v$(PKG_VERSION)/$(PKG_NAME)_$(PKG_VERSION)_Linux_$(LUCKY_ARCH).tar.gz -O $(PKG_BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)_Linux_$(LUCKY_ARCH).tar.gz - tar -xzvf $(PKG_BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)_Linux_$(LUCKY_ARCH).tar.gz -C $(PKG_BUILD_DIR) + mkdir -p $(PKG_BUILD_DIR) + tar -xzf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) endef diff --git a/shadowsocks-rust-next/Makefile b/shadowsocks-rust-next/Makefile index 6599ceb4e..acf0800d0 100644 --- a/shadowsocks-rust-next/Makefile +++ b/shadowsocks-rust-next/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shadowsocks-rust-next PKG_VERSION:=1.25.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 # Architecture mapping to match shadowsocks-rust release naming ifeq ($(ARCH),x86_64) @@ -17,9 +17,6 @@ endif ifeq ($(ARCH),i386) SS_ARCH:=i686-unknown-linux-musl endif -ifeq ($(ARCH),mipsel) - SS_ARCH:=mips-unknown-linux-musl -endif PKG_SOURCE:=shadowsocks-v$(PKG_VERSION).$(SS_ARCH).tar.xz PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-rust/releases/download/v$(PKG_VERSION)/ @@ -39,7 +36,7 @@ define Package/shadowsocks-rust-next/Default SUBMENU:=Web Servers/Proxies TITLE:=shadowsocks-rust (Next) URL:=https://github.com/shadowsocks/shadowsocks-rust - DEPENDS:=@(i386||x86_64||arm||aarch64||mipsel||mips) + DEPENDS:=@(i386||x86_64||arm||aarch64) endef define Package/shadowsocks-rust-ssserver-next diff --git a/v2raya-geosite/Makefile b/v2raya-geosite/Makefile index bbb768ba4..86ec8c207 100644 --- a/v2raya-geosite/Makefile +++ b/v2raya-geosite/Makefile @@ -10,8 +10,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2raya-geosite -PKG_VERSION:=20261112220449 -PKG_RELEASE:=2 +PKG_VERSION:=20261115005626 +PKG_RELEASE:=3 PKG_LICENSE:=MIT PKG_MAINTAINER:=Amr Fateem @@ -19,7 +19,7 @@ PKG_MAINTAINER:=Amr Fateem include $(INCLUDE_DIR)/package.mk GEOSITE_FILE:=dlc.dat.$(PKG_VERSION) -GEOSITE_HASH:=02ad51927d05608b672bbcdf37f37b94ce1fdb7dcd10852f367ed457ad56280b +GEOSITE_HASH:=26e5f04c498ea651f62fa864f8e83ac5198ca311724e634d79f0ac02cdfe74fc define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(PKG_VERSION)/ diff --git a/wwand-ims/Makefile b/wwand-ims/Makefile new file mode 100644 index 000000000..84c7bfab1 --- /dev/null +++ b/wwand-ims/Makefile @@ -0,0 +1,111 @@ +# +# VoLTE for a LAN SIP phone over a cellular modem: the router as its own IMS +# UE (ue/, sipd) and a modem-IMS plugin for the wwand daemon. A wwand PLUGIN +# (wwand plugins.uc) plus a SIP daemon, kept out of the wwand sources on +# purpose: it is NOT meant for upstream. +# +# Sources live in https://github.com/ddimension/wwand-ims (branch main, no +# vX.Y.Z-dev marker scheme yet — it is pinned by commit like wwand-ipa, not via +# bump-source.sh). After a PKG_SOURCE_VERSION bump run +# `scripts/update-hashes.sh wwand-ims` to fill PKG_MIRROR_HASH from the SDK. +# +# GPL-2.0-only, and pure ucode + scripts (no compiled code): the NETLINK_XFRM +# binding sec-agree needs lives in wwand's own native module (wwand_io.so, +# sub-namespace xfrm), so wwand-ims just DEPENDS on wwand. A future mcfg C tool +# (mcfg_tools) is GPL-3.0 and ships as a SEPARATE package wwand-ims-mcfg with +# its own binaries (docs/design.md §7) — nothing GPL-3.0 or compiled is built +# here. The ucode tree ships as source (the wwand daemon loads the plugin; the +# sipd init loads the UE modules with `ucode -L`), like wwand-ipa. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=wwand-ims +PKG_VERSION:=0.1.0 +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/ddimension/wwand-ims.git +PKG_SOURCE_VERSION:=1ec70fa685404c54e060c53f3d13db0dad5ebaeb +PKG_MIRROR_HASH:=skip + +PKG_LICENSE:=GPL-2.0-only +PKG_MAINTAINER:= + +include $(INCLUDE_DIR)/package.mk + +UCDIR:=/usr/share/ucode/wwand +IMSLIB:=/usr/share/wwand-ims + +# +wwand: the daemon this plugs into, and the provider of the xfrm binding +# (wwand_io.so). ESP for sec-agree (TS 33.203) over NETLINK_XFRM: kmod-ipsec +# (xfrm core, and it already pulls crypto-authenc/cbc/hmac/sha1) + ipsec4/ +# ipsec6 (ESP for v4/v6); AES is built into the kernel (CONFIG_CRYPTO_AES=y), +# so no crypto-aes kmod. The IMS VRF: kmod-vrf (netifd creates the `type vrf` +# device itself) plus ip-full — the l3mdev hotplug re-adds the `ip rule ... +# l3mdev` FIB rules netifd flushes, and the l3mdev selector is iproute2-only +# (busybox ip cannot). ucode stock modules the plugin/UE/sipd import. +define Package/wwand-ims + SECTION:=net + CATEGORY:=Network + SUBMENU:=WWAN + TITLE:=VoLTE for a LAN SIP phone over wwand (IMS UE + plugin) + DEPENDS:=+wwand \ + +kmod-ipsec +kmod-ipsec4 +kmod-ipsec6 +kmod-vrf +ip-full \ + +ucode-mod-fs +ucode-mod-uloop +ucode-mod-ubus +ucode-mod-socket \ + +ucode-mod-uci +ucode-mod-digest +ucode-mod-struct + PKGARCH:=all +endef + +define Package/wwand-ims/description + VoLTE for a LAN SIP phone or a PBX trunk through a cellular modem. The + router is its own IMS UE: it registers over the modem's IMS PDN, borrows the + USIM over wwand's APDU channel, runs sec-agree ESP in an IMS VRF, and bridges + RTP to the LAN (sipd, a SIP registrar/B2BUA). A wwand plugin also drives the + modem's own IMS over QMI, and "wwandctl ims" sets the router up from the + carrier MBN. Not for upstream. +endef + +# user-edited operator/profile config; keep it across sysupgrade +define Package/wwand-ims/conffiles +/etc/config/wwand_ims +endef + +# pure ucode + scripts: nothing to compile +define Build/Compile +endef + +define Package/wwand-ims/install + # the modem-IMS plugin, loaded by the wwand daemon + $(INSTALL_DIR) $(1)$(UCDIR)/plugins $(1)$(UCDIR)/ctl + $(INSTALL_DATA) $(PKG_BUILD_DIR)/plugins/ims.uc $(1)$(UCDIR)/plugins/ + # `wwandctl ims` and the MBN helper (installed under the module name) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/ctl/ims.uc $(1)$(UCDIR)/ctl/ims.uc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/ctl/mcfg.uc $(1)$(UCDIR)/ims_mcfg.uc + # the router's own IMS UE + sipd, under their `ucode -L` module names + $(INSTALL_DIR) $(1)$(IMSLIB) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/sipd/sipd.uc $(1)$(IMSLIB)/sipd.uc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/sipd/core.uc $(1)$(IMSLIB)/sipd_core.uc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/sipd/sip.uc $(1)$(IMSLIB)/sipd_sip.uc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/sipd/line_ue.uc $(1)$(IMSLIB)/sipd_line_ue.uc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/sipd/relay.uc $(1)$(IMSLIB)/sipd_relay.uc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/ue/aka.uc $(1)$(IMSLIB)/ue_aka.uc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/ue/secagree.uc $(1)$(IMSLIB)/ue_secagree.uc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/ue/reg.uc $(1)$(IMSLIB)/ue_reg.uc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/ue/call.uc $(1)$(IMSLIB)/ue_call.uc + # the proven UE driver, run by `wwandctl ims [modem] call ` + $(INSTALL_DATA) $(PKG_BUILD_DIR)/tools/ims-register.uc $(1)$(IMSLIB)/ims-register.uc + # init, setup helper, example config, l3mdev hotplug + $(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/sbin $(1)/etc/config $(1)/etc/hotplug.d/iface + $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/wwand-ims-sipd.init $(1)/etc/init.d/wwand-ims-sipd + $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/wwand-ims-setup $(1)/usr/sbin/wwand-ims-setup + $(INSTALL_CONF) $(PKG_BUILD_DIR)/files/wwand_ims.config $(1)/etc/config/wwand_ims + $(INSTALL_DATA) $(PKG_BUILD_DIR)/files/wwand-ims-l3mdev.hotplug \ + $(1)/etc/hotplug.d/iface/25-wwand-ims-l3mdev + # examples (IMS PDN network + firewall, Asterisk trunk) + $(INSTALL_DIR) $(1)$(IMSLIB)/examples + $(INSTALL_DATA) $(PKG_BUILD_DIR)/files/ims-network.example $(1)$(IMSLIB)/examples/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/files/asterisk-pjsip.example $(1)$(IMSLIB)/examples/ +endef + +$(eval $(call BuildPackage,wwand-ims)) diff --git a/wwand/Makefile b/wwand/Makefile index 937569f6c..b441c2bc0 100644 --- a/wwand/Makefile +++ b/wwand/Makefile @@ -50,12 +50,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wwand -PKG_VERSION:=1.9.0_pre27 -PKG_RELEASE:=94 +PKG_VERSION:=1.9.0_pre49 +PKG_RELEASE:=95 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/ddimension/wwand.git -PKG_SOURCE_VERSION:=069546e1c817cac4c3936a1b98057b27cad7fd80 +PKG_SOURCE_VERSION:=25e69856de205e6be33acbaba5a7657e89089de5 PKG_MIRROR_HASH:=skip PKG_LICENSE:=GPL-2.0-only