diff --git a/linkease-common-bin/Makefile b/linkease-common-bin/Makefile index 341cbc8a7..ea0dde457 100644 --- a/linkease-common-bin/Makefile +++ b/linkease-common-bin/Makefile @@ -12,7 +12,7 @@ PKG_ARCH_LINKEASE:=$(ARCH) PKG_NAME:=linkease-common-bin # use PKG_SOURCE_DATE instead of PKG_VERSION for compitable PKG_SOURCE_DATE:=1.7.5 -PKG_RELEASE:=37 +PKG_RELEASE:=38 ARCH_HEXCODE:= ifeq ($(ARCH),x86_64) @@ -28,7 +28,7 @@ else ifeq ($(ARCH),mipsel) ARCH_HEXCODE=1b0c endif -PKG_SOURCE_VERSION:=886edf9278f080bd77b00668831cfb3e6a728873 +PKG_SOURCE_VERSION:=7862188a4a1fe17d7d275f5ecfa7c24acc5d2049 PKG_SOURCE:=linkease-common-bin-$(PKG_SOURCE_DATE)-linux-$(PKG_ARCH_LINKEASE).tar.gz PKG_SOURCE_URL:=https://github.com/istoreos/istoreos-app-hub/releases/download/linkease-runtime-v$(PKG_SOURCE_DATE)/ PKG_BUILD_DIR:=$(BUILD_DIR)/linkease-common-bin-$(PKG_SOURCE_DATE)-linux-$(PKG_ARCH_LINKEASE) diff --git a/linkease/Makefile b/linkease/Makefile index aafa90c91..c29bea6ae 100644 --- a/linkease/Makefile +++ b/linkease/Makefile @@ -12,7 +12,7 @@ PKG_ARCH_LINKEASE:=$(ARCH) PKG_NAME:=linkease # use PKG_SOURCE_DATE instead of PKG_VERSION for compitable PKG_SOURCE_DATE:=1.7.5 -PKG_RELEASE:=40 +PKG_RELEASE:=41 ARCH_HEXCODE:= ifeq ($(ARCH),x86_64) @@ -28,7 +28,7 @@ else ifeq ($(ARCH),mipsel) ARCH_HEXCODE=1b0c endif -PKG_SOURCE_VERSION:=886edf9278f080bd77b00668831cfb3e6a728873 +PKG_SOURCE_VERSION:=7862188a4a1fe17d7d275f5ecfa7c24acc5d2049 PKG_SOURCE:=linkease-bin-$(PKG_SOURCE_DATE)-linux-$(PKG_ARCH_LINKEASE).tar.gz PKG_SOURCE_URL:=https://github.com/istoreos/istoreos-app-hub/releases/download/linkease-runtime-v$(PKG_SOURCE_DATE)/ PKG_BUILD_DIR:=$(BUILD_DIR)/linkease-bin-$(PKG_SOURCE_DATE)-linux-$(PKG_ARCH_LINKEASE) diff --git a/linkeasefull/Makefile b/linkeasefull/Makefile index 9fab16dee..a6352ebd8 100644 --- a/linkeasefull/Makefile +++ b/linkeasefull/Makefile @@ -11,7 +11,7 @@ PKG_ARCH_LINKEASE:=$(ARCH) PKG_NAME:=linkeasefull # use PKG_SOURCE_DATE instead of PKG_VERSION for compitable PKG_SOURCE_DATE:=3.0.22 -PKG_RELEASE:=39 +PKG_RELEASE:=40 ARCH_HEXCODE:= ifeq ($(ARCH),x86_64) @@ -24,7 +24,7 @@ LINKEASE_RUNTIME_ARCH:=arm64 PKG_HASH:=skip endif -PKG_SOURCE_VERSION:=886edf9278f080bd77b00668831cfb3e6a728873 +PKG_SOURCE_VERSION:=7862188a4a1fe17d7d275f5ecfa7c24acc5d2049 PKG_SOURCE:=linkease-runtime-$(PKG_SOURCE_DATE)-linux-$(LINKEASE_RUNTIME_ARCH).tar.gz PKG_SOURCE_URL:=https://github.com/istoreos/istoreos-app-hub/releases/download/linkeasefull-runtime-v$(PKG_SOURCE_DATE)/ PKG_BUILD_DIR:=$(BUILD_DIR)/linkease-runtime-$(PKG_SOURCE_DATE)-linux-$(LINKEASE_RUNTIME_ARCH) diff --git a/luci-app-filebrowser-q/htdocs/luci-static/resources/view/filebrowser-q.js b/luci-app-filebrowser-q/htdocs/luci-static/resources/view/filebrowser-q.js index 710ff2b80..5fb856a4c 100644 --- a/luci-app-filebrowser-q/htdocs/luci-static/resources/view/filebrowser-q.js +++ b/luci-app-filebrowser-q/htdocs/luci-static/resources/view/filebrowser-q.js @@ -44,7 +44,7 @@ return view.extend({ render(data) { let m, s, o; - let webport = (uci.get(data.conf, 'config', 'listen_port') || '8989'); + let webport = (uci.get(data, 'config', 'listen_port') || '8787'); m = new form.Map('filebrowser-q', _('FileBrowser Quantum'), _('The best free self-hosted web-based file manager.') + '
'+ diff --git a/luci-app-istoreenhance/Makefile b/luci-app-istoreenhance/Makefile index 663431f68..842a628f4 100644 --- a/luci-app-istoreenhance/Makefile +++ b/luci-app-istoreenhance/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for KSpeeder LUCI_DEPENDS:=+istoreenhance +luci-lib-linkeaseauth +linkease-app-entry LUCI_PKGARCH:=all -PKG_VERSION:=0.8.0 -PKG_RELEASE:=3 +PKG_VERSION:=0.8.1 +PKG_RELEASE:=4 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-istoreenhance/luasrc/controller/istoreenhance.lua b/luci-app-istoreenhance/luasrc/controller/istoreenhance.lua index b3cb37af9..053a340f6 100644 --- a/luci-app-istoreenhance/luasrc/controller/istoreenhance.lua +++ b/luci-app-istoreenhance/luasrc/controller/istoreenhance.lua @@ -5,10 +5,6 @@ function index() entry({"admin", "services", "istoreenhance"}, cbi("istoreenhance"), _("KSpeeder"), 20).dependent = true entry({"admin", "services", "istoreenhance_status"}, call("istoreenhance_status")) - local open = entry({"admin", "services", "istoreenhance", "open"}, call("istoreenhance_open")) - open.leaf = true - open.dependent = false - open.sysauth = false end local function compat() @@ -28,7 +24,3 @@ function istoreenhance_status() port = uci:get_first("istoreenhance", "istoreenhance", "adminport") or "5003" }) end - -function istoreenhance_open() - compat():open("kspeeder") -end diff --git a/luci-app-istoreenhance/luasrc/view/istoreenhance_status.htm b/luci-app-istoreenhance/luasrc/view/istoreenhance_status.htm index f9e7cbe32..16d6a4a11 100644 --- a/luci-app-istoreenhance/luasrc/view/istoreenhance_status.htm +++ b/luci-app-istoreenhance/luasrc/view/istoreenhance_status.htm @@ -8,7 +8,7 @@ if (st.running) { tb.innerHTML = '
<%:The KSpeeder service is running.%>' - + "

\" onclick=\"window.open('<%=url("admin/services/istoreenhance/open")%>')\"/>"; + + "

\" onclick=\"window.open('<%=url("admin/services/linkease_apps/open")%>?id=kspeeder')\"/>"; } else { diff --git a/luci-app-linkeasefull-embed/Makefile b/luci-app-linkeasefull-embed/Makefile index e6c60882a..a67e16cd1 100644 --- a/luci-app-linkeasefull-embed/Makefile +++ b/luci-app-linkeasefull-embed/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-linkeasefull-embed -PKG_VERSION:=1.1.0 -PKG_RELEASE:=1 +PKG_VERSION:=1.2.0 +PKG_RELEASE:=2 PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 @@ -28,21 +28,10 @@ define Package/$(PKG_NAME)/description Register OpenWrt LuCI as a LinkEaseFull desktop module and provide embedded-mode assets. endef -define Package/$(PKG_NAME)/postinst -#!/bin/sh -set -e -root="$${IPKG_INSTROOT:-}" -maintainer="$${root}/usr/libexec/linkeasefull/openwrt-luci-maintain" -[ ! -x "$${maintainer}" ] || "$${maintainer}" install "$${root}" -exit 0 -endef - define Package/$(PKG_NAME)/prerm #!/bin/sh set -e root="$${IPKG_INSTROOT:-}" -maintainer="$${root}/usr/libexec/linkeasefull/openwrt-luci-maintain" -[ ! -x "$${maintainer}" ] || "$${maintainer}" remove "$${root}" registration="$${root}/usr/share/linkeasefull/desktop-apps.d/15-openwrt-luci.json" if [ "$$(readlink "$${registration}" 2>/dev/null)" = "/usr/share/linkeasefull/openwrt-luci/openwrt-luci.json" ]; then rm -f "$${registration}" @@ -57,17 +46,12 @@ define Build/Compile endef define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/share/linkeasefull/openwrt-luci/protocol-fallbacks $(1)/usr/share/linkeasefull/desktop-apps.d - $(INSTALL_DIR) $(1)/usr/libexec/linkeasefull + $(INSTALL_DIR) $(1)/usr/share/linkeasefull/openwrt-luci $(1)/usr/share/linkeasefull/desktop-apps.d $(INSTALL_DIR) $(1)/www/luci-static/linkeasefull-embed $(INSTALL_DATA) ./files/openwrt-luci/openwrt-luci.json $(1)/usr/share/linkeasefull/openwrt-luci/openwrt-luci.json $(INSTALL_DATA) ./files/openwrt-luci/openwrt.svg $(1)/usr/share/linkeasefull/openwrt-luci/openwrt.svg $(INSTALL_DATA) ./files/www/embed.css $(1)/www/luci-static/linkeasefull-embed/embed.css $(INSTALL_DATA) ./files/www/embed-prelude.js $(1)/www/luci-static/linkeasefull-embed/embed-prelude.js - $(INSTALL_DATA) ./files/protocol/directip.js $(1)/usr/share/linkeasefull/openwrt-luci/protocol-fallbacks/directip.js - $(INSTALL_DATA) ./files/protocol/bonding.js $(1)/usr/share/linkeasefull/openwrt-luci/protocol-fallbacks/bonding.js - $(INSTALL_DATA) ./files/protocol/wwan.js $(1)/usr/share/linkeasefull/openwrt-luci/protocol-fallbacks/wwan.js - $(INSTALL_BIN) ./files/openwrt-luci-maintain.sh $(1)/usr/libexec/linkeasefull/openwrt-luci-maintain ln -sf /usr/share/linkeasefull/openwrt-luci/openwrt-luci.json $(1)/usr/share/linkeasefull/desktop-apps.d/15-openwrt-luci.json endef diff --git a/luci-app-linkeasefull-embed/README.md b/luci-app-linkeasefull-embed/README.md index 6e2954544..6a062220c 100644 --- a/luci-app-linkeasefull-embed/README.md +++ b/luci-app-linkeasefull-embed/README.md @@ -10,14 +10,11 @@ This package installs: - `/usr/share/linkeasefull/desktop-apps.d/15-openwrt-luci.json` - `/www/luci-static/linkeasefull-embed/embed-prelude.js` - `/www/luci-static/linkeasefull-embed/embed.css` -- privately owned protocol fallback shims under - `/usr/share/linkeasefull/openwrt-luci/protocol-fallbacks/` -The package post-install maintainer exposes a fallback at the corresponding -`/www/luci-static/resources/protocol/` path only when no real LuCI protocol -module exists. Existing modules are never replaced, and package removal only -removes symlinks that still point to this package's private fallback directory. -This avoids file ownership conflicts with protocol packages installed later. +The package deliberately does not install LuCI network protocol handlers or +modify `/www/luci-static/resources/protocol/`. Protocol support belongs to the +firmware and its LuCI protocol packages; this package is limited to embedding +the firmware-provided LuCI UI in LinkEaseFull. The desktop manifest uses the builtin `LuciContainer` component with `isolation=scoped-dom-css`. That default scopes common Vue/React mount points,