update 2026-09-26 00:21:07

luci-app-daede/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-daede
 PKG_VERSION:=1.15
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 PKG_MAINTAINER:=kenzok8
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 

luci-app-daede/htdocs/luci-static/resources/view/daede/log.js

@@ -295,7 +295,7 @@ return view.extend({
 		function applyFilter() {
 			const f = state.filter;
 			pane.querySelectorAll('.dd-line').forEach(function(el) {
-				if (matchesFilter(el.textContent, f))
+				if (matchesFilter(el._rawLine, f))
 					el.classList.remove('dd-hidden');
 				else
 					el.classList.add('dd-hidden');
@@ -309,6 +309,7 @@ return view.extend({
 				const ln = lines[i];
 				if (!ln) continue;
 				const el = buildLine(ln);
+				el._rawLine = ln;
 				if (!matchesFilter(ln, state.filter))
 					el.classList.add('dd-hidden');
 				frag.appendChild(el);

luci-app-daede/htdocs/luci-static/resources/view/daede/updates.js

@@ -446,17 +446,19 @@ return view.extend({
 					healthBody.appendChild(mkRow('✓', 'dd-up-ok', _('Hot reload'), _('/etc/init.d/dae hot_reload is available')));
 				}
 
-				if (ctx.backend.useNetns && ns && ns.exists) {
+				if (ctx.backend.useNetns && ns && ns.exists && running[ctx.name]) {
+					healthBody.appendChild(mkRow('✓', 'dd-up-ok', _('netns daens'), HEALTH_PATHS.netns + ' · ' + _('in use by daed')));
+				} else if (ctx.backend.useNetns && ns && ns.exists) {
 					const btn = E('button', { 'class': 'dd-up-btn' }, _('Clean'));
 					btn.addEventListener('click', function() {
-						const daedRunning = !!(running && running[ctx.name]);
-						const msg = daedRunning
-							? _('%s is running. Deleting the daens netns now will break its networking until you restart it. Continue?').format(ctx.name)
-							: _('Delete the daens netns?');
-						if (!confirm(msg))
-							return;
 						btn.disabled = true;
-						fs.exec('/sbin/ip', ['netns', 'del', 'daens']).finally(function() { btn.disabled = false; });
+						backend.detectRunning().then(function(now) {
+							const msg = now[ctx.name]
+								? _('%s is running. Deleting the daens netns now will break its networking until you restart it. Continue?').format(ctx.name)
+								: _('Delete the daens netns?');
+							if (confirm(msg))
+								return fs.exec('/sbin/ip', ['netns', 'del', 'daens']);
+						}).finally(function() { btn.disabled = false; });
 					});
 					healthBody.appendChild(mkRow('⚠', 'dd-up-warn', _('netns daens'), HEALTH_PATHS.netns + ' · ' + _('exists, may block daed start'), btn));
 				} else if (ctx.backend.useNetns) {

luci-app-daede/po/zh-cn/daede.po

@@ -372,6 +372,9 @@ msgstr "dae 热重载可用"
 msgid "netns daens removed."
 msgstr "netns daens 已清理。"
 
+msgid "in use by daed"
+msgstr "daed 运行中，正在使用"
+
 msgid "exists, may block daed start"
 msgstr "已存在，可能阻碍 daed 启动"