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

Merge remote-tracking branch 'origin/main' into devin/1777752962-file-collector-bucket

Browse Source
This commit is contained in:
igor04091968
2026-05-03 22:28:37 +03:00
parent 3971c459ef 36e4255ad9
commit df497839f6
2 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
aw-server/aw-ru-patch.js
+21 -7
View File
@@ -1541,14 +1541,28 @@
function rewriteUnknownCategoryBuilderQueryBody(body) { function rewriteUnknownCategoryBuilderQueryBody(body) {
if (typeof body !== "string") return body; if (typeof body !== "string") return body;
if (body.indexOf("aw-watcher-window_unknown") === -1 && body.indexOf("aw-watcher-afk_unknown") === -1) { if (body.indexOf("undefined") !== -1) {
return body; body = body
.replace(/flood\(query_bucket\(find_bucket\(\\"undefined\\"\)\)\)/g, '[]')
.replace(/query_bucket\(find_bucket\(\\"undefined\\"\)\)/g, '[]')
.replace(/flood\(query_bucket\(\\"undefined\\"\)\)/g, '[]')
.replace(/query_bucket\(\\"undefined\\"\)/g, '[]');
const ph = getPreferredWindowHostFromBuckets();
if (ph) {
body = body
.replace(/aw-watcher-window_undefined/g, "aw-watcher-window_" + ph)
.replace(/aw-watcher-afk_undefined/g, "aw-watcher-afk_" + ph);
}
} }
const preferredHost = getPreferredWindowHostFromBuckets(); if (body.indexOf("aw-watcher-window_unknown") !== -1 || body.indexOf("aw-watcher-afk_unknown") !== -1) {
if (!preferredHost) return body; const preferredHost = getPreferredWindowHostFromBuckets();
return body if (preferredHost) {
.replace(/aw-watcher-window_unknown/g, "aw-watcher-window_" + preferredHost) body = body
.replace(/aw-watcher-afk_unknown/g, "aw-watcher-afk_" + preferredHost); .replace(/aw-watcher-window_unknown/g, "aw-watcher-window_" + preferredHost)
.replace(/aw-watcher-afk_unknown/g, "aw-watcher-afk_" + preferredHost);
}
}
return body;
} }
function installCategoryBuilderNetworkPatch() { function installCategoryBuilderNetworkPatch() {
install-kit-awindows-20260427-211240/aw-server/aw-ru-patch.js
+21 -7
View File
@@ -1500,14 +1500,28 @@
function rewriteUnknownCategoryBuilderQueryBody(body) { function rewriteUnknownCategoryBuilderQueryBody(body) {
if (typeof body !== "string") return body; if (typeof body !== "string") return body;
if (body.indexOf("aw-watcher-window_unknown") === -1 && body.indexOf("aw-watcher-afk_unknown") === -1) { if (body.indexOf("undefined") !== -1) {
return body; body = body
.replace(/flood\(query_bucket\(find_bucket\(\\"undefined\\"\)\)\)/g, '[]')
.replace(/query_bucket\(find_bucket\(\\"undefined\\"\)\)/g, '[]')
.replace(/flood\(query_bucket\(\\"undefined\\"\)\)/g, '[]')
.replace(/query_bucket\(\\"undefined\\"\)/g, '[]');
const ph = getPreferredWindowHostFromBuckets();
if (ph) {
body = body
.replace(/aw-watcher-window_undefined/g, "aw-watcher-window_" + ph)
.replace(/aw-watcher-afk_undefined/g, "aw-watcher-afk_" + ph);
}
} }
const preferredHost = getPreferredWindowHostFromBuckets(); if (body.indexOf("aw-watcher-window_unknown") !== -1 || body.indexOf("aw-watcher-afk_unknown") !== -1) {
if (!preferredHost) return body; const preferredHost = getPreferredWindowHostFromBuckets();
return body if (preferredHost) {
.replace(/aw-watcher-window_unknown/g, "aw-watcher-window_" + preferredHost) body = body
.replace(/aw-watcher-afk_unknown/g, "aw-watcher-afk_" + preferredHost); .replace(/aw-watcher-window_unknown/g, "aw-watcher-window_" + preferredHost)
.replace(/aw-watcher-afk_unknown/g, "aw-watcher-afk_" + preferredHost);
}
}
return body;
} }
function installCategoryBuilderNetworkPatch() { function installCategoryBuilderNetworkPatch() {