awatch-rus/AWatch-rus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(webui): avoid category-builder crash on aw-watcher-window_unknown buckets

Browse Source
This commit is contained in:
igor04091968
2026-05-13 02:10:04 +03:00
parent 8619c14735
commit 067457198d
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
aw-server/aw-ru-patch.js
+13
View File
@@ -1551,6 +1551,17 @@
function rewriteUnknownCategoryBuilderQueryBody(body) { function rewriteUnknownCategoryBuilderQueryBody(body) {
if (typeof body !== "string") return body; if (typeof body !== "string") return body;
function stripUnknownBucketQueries(raw) {
return raw
.replace(/flood\(query_bucket\(find_bucket\(\\"aw-watcher-window_unknown\\"\)\)\)/g, '[]')
.replace(/flood\(query_bucket\(find_bucket\(\\"aw-watcher-afk_unknown\\"\)\)\)/g, '[]')
.replace(/query_bucket\(find_bucket\(\\"aw-watcher-window_unknown\\"\)\)/g, '[]')
.replace(/query_bucket\(find_bucket\(\\"aw-watcher-afk_unknown\\"\)\)/g, '[]')
.replace(/flood\(query_bucket\(\\"aw-watcher-window_unknown\\"\)\)/g, '[]')
.replace(/flood\(query_bucket\(\\"aw-watcher-afk_unknown\\"\)\)/g, '[]')
.replace(/query_bucket\(\\"aw-watcher-window_unknown\\"\)/g, '[]')
.replace(/query_bucket\(\\"aw-watcher-afk_unknown\\"\)/g, '[]');
}
if (body.indexOf("undefined") !== -1) { if (body.indexOf("undefined") !== -1) {
body = body body = body
.replace(/flood\(query_bucket\(find_bucket\(\\"undefined\\"\)\)\)/g, '[]') .replace(/flood\(query_bucket\(find_bucket\(\\"undefined\\"\)\)\)/g, '[]')
@@ -1570,6 +1581,8 @@
body = body body = body
.replace(/aw-watcher-window_unknown/g, "aw-watcher-window_" + preferredHost) .replace(/aw-watcher-window_unknown/g, "aw-watcher-window_" + preferredHost)
.replace(/aw-watcher-afk_unknown/g, "aw-watcher-afk_" + preferredHost); .replace(/aw-watcher-afk_unknown/g, "aw-watcher-afk_" + preferredHost);
} else {
body = stripUnknownBucketQueries(body);
} }
} }
return body; return body;
install-kit-awindows-20260427-211240/aw-server/aw-ru-patch.js
+13
View File
@@ -1500,6 +1500,17 @@
function rewriteUnknownCategoryBuilderQueryBody(body) { function rewriteUnknownCategoryBuilderQueryBody(body) {
if (typeof body !== "string") return body; if (typeof body !== "string") return body;
function stripUnknownBucketQueries(raw) {
return raw
.replace(/flood\(query_bucket\(find_bucket\(\\"aw-watcher-window_unknown\\"\)\)\)/g, '[]')
.replace(/flood\(query_bucket\(find_bucket\(\\"aw-watcher-afk_unknown\\"\)\)\)/g, '[]')
.replace(/query_bucket\(find_bucket\(\\"aw-watcher-window_unknown\\"\)\)/g, '[]')
.replace(/query_bucket\(find_bucket\(\\"aw-watcher-afk_unknown\\"\)\)/g, '[]')
.replace(/flood\(query_bucket\(\\"aw-watcher-window_unknown\\"\)\)/g, '[]')
.replace(/flood\(query_bucket\(\\"aw-watcher-afk_unknown\\"\)\)/g, '[]')
.replace(/query_bucket\(\\"aw-watcher-window_unknown\\"\)/g, '[]')
.replace(/query_bucket\(\\"aw-watcher-afk_unknown\\"\)/g, '[]');
}
if (body.indexOf("undefined") !== -1) { if (body.indexOf("undefined") !== -1) {
body = body body = body
.replace(/flood\(query_bucket\(find_bucket\(\\"undefined\\"\)\)\)/g, '[]') .replace(/flood\(query_bucket\(find_bucket\(\\"undefined\\"\)\)\)/g, '[]')
@@ -1519,6 +1530,8 @@
body = body body = body
.replace(/aw-watcher-window_unknown/g, "aw-watcher-window_" + preferredHost) .replace(/aw-watcher-window_unknown/g, "aw-watcher-window_" + preferredHost)
.replace(/aw-watcher-afk_unknown/g, "aw-watcher-afk_" + preferredHost); .replace(/aw-watcher-afk_unknown/g, "aw-watcher-afk_" + preferredHost);
} else {
body = stripUnknownBucketQueries(body);
} }
} }
return body; return body;