fix(activity): restore real window watchers and isolate rdp bridge

2026-05-14 20:02:46 +03:00
parent 59e93c1c69
commit 76d1377736
6 changed files with 69 additions and 36 deletions
@@ -1581,6 +1581,9 @@
  let applyPatchScheduled = false;
  let networkPatchesInstalled = false;
  let dlpOverlayFailureCount = 0;
+  let applyPatchInFlight = false;
+  let observerAttached = false;
+  let staticPatchRouteKey = "";

  function getTrendsHostFromSettings(settings) {
    if (!settings || typeof settings !== "object") return "";
@@ -1818,38 +1821,63 @@
    });
  }

+  function detachObserver() {
+    if (!observerAttached) return;
+    observer.disconnect();
+    observerAttached = false;
+  }
+
+  function attachObserver() {
+    if (observerAttached || !document.body) return;
+    observer.observe(document.body, { childList: true, subtree: true });
+    observerAttached = true;
+  }
+
  function applyPatch() {
-    enforceSafeActivityViewForPveHost();
-    ensureSettingsHost();
-    ensureHostGroupsData().catch(function () {});
-    normalizeCategoryBuilderUnknownHostRefs();
-    installCategoryBuilderNetworkPatch();
-    injectStyles();
-    walk(document.body);
-    translateAttributes(document.body);
-    hideNoiseNavigation(document.body);
-    patchActivityHeading(document.body);
-    patchCategoryBuilderHostLabel(document.body);
-    injectPveAuditCenter(document.body);
-    injectDlpNavigation(document.body);
-    if (isDlpSignalBucketRoute() && dlpOverlayFailureCount === 0) {
-      try {
-        injectDlpReviewCenter(document.body);
-      } catch (error) {
-        dlpOverlayFailureCount += 1;
-        const existing = document.body.querySelector("[data-aw-ru-dlp-center='1']");
-        if (existing && existing.parentElement) existing.parentElement.removeChild(existing);
+    if (applyPatchInFlight || !document.body) return;
+    applyPatchInFlight = true;
+    detachObserver();
+    try {
+      const routeKey = window.location.hash || "#";
+      const routeChanged = routeKey !== staticPatchRouteKey;
+      enforceSafeActivityViewForPveHost();
+      ensureSettingsHost();
+      ensureHostGroupsData().catch(function () {});
+      normalizeCategoryBuilderUnknownHostRefs();
+      installCategoryBuilderNetworkPatch();
+      injectStyles();
+      if (routeChanged) {
+        walk(document.body);
+        translateAttributes(document.body);
+        hideNoiseNavigation(document.body);
+        patchActivityHeading(document.body);
+        patchCategoryBuilderHostLabel(document.body);
+        staticPatchRouteKey = routeKey;
      }
-    } else if (!isDlpSignalBucketRoute()) {
-      injectDlpReviewCenter(document.body);
+      injectPveAuditCenter(document.body);
+      injectDlpNavigation(document.body);
+      if (isDlpSignalBucketRoute() && dlpOverlayFailureCount === 0) {
+        try {
+          injectDlpReviewCenter(document.body);
+        } catch (error) {
+          dlpOverlayFailureCount += 1;
+          const existing = document.body.querySelector("[data-aw-ru-dlp-center='1']");
+          if (existing && existing.parentElement) existing.parentElement.removeChild(existing);
+        }
+      } else if (!isDlpSignalBucketRoute()) {
+        injectDlpReviewCenter(document.body);
+      }
+      injectDlpAlertsCenter(document.body);
+      injectHostGroupsCenter(document.body).catch(function () {});
+      redirectBareTrendsRoute();
+    } finally {
+      applyPatchInFlight = false;
+      attachObserver();
    }
-    injectDlpAlertsCenter(document.body);
-    injectHostGroupsCenter(document.body).catch(function () {});
-    redirectBareTrendsRoute();
  }

  function scheduleApplyPatch() {
-    if (applyPatchScheduled) return;
+    if (applyPatchScheduled || applyPatchInFlight) return;
    applyPatchScheduled = true;
    window.setTimeout(function () {
      applyPatchScheduled = false;
@@ -1858,15 +1886,17 @@
  }

  const observer = new MutationObserver(function () {
+    if (applyPatchInFlight) return;
    scheduleApplyPatch();
  });

  window.addEventListener("load", function () {
    applyPatch();
-    observer.observe(document.body, { childList: true, subtree: true });
+    attachObserver();
  });
  window.addEventListener("hashchange", function () {
    redirectBareTrendsRoute();
+    staticPatchRouteKey = "";
    scheduleApplyPatch();
  });
 })();
@@ -27,7 +27,7 @@ need_heal="$("$PYTHON_BIN" - <<'PY'
 import json, urllib.request, datetime, os, sys
 AW=os.environ.get("AW_URL","http://127.0.0.1:5600")
 host=os.environ.get("HOST","SHARKON2025")
-bucket=f"aw-watcher-window_{host}"
+bucket=f"aw-rdp-window_{host}"
 msk=datetime.timezone(datetime.timedelta(hours=3))
 start=datetime.datetime.now(msk).replace(hour=0,minute=0,second=0,microsecond=0).astimezone(datetime.timezone.utc)

@@ -75,8 +75,8 @@ import json, urllib.request, datetime, os
 AW=os.environ.get("AW_URL","http://127.0.0.1:5600")
 host=os.environ.get("HOST","SHARKON2025")
 sb=f"aw-worktime-sessions_{host}"
-afk=f"aw-watcher-afk_{host}"
-win=f"aw-watcher-window_{host}"
+afk=f"aw-rdp-afk_{host}"
+win=f"aw-rdp-window_{host}"
 msk=datetime.timezone(datetime.timedelta(hours=3))
 start=datetime.datetime.now(msk).replace(hour=0,minute=0,second=0,microsecond=0).astimezone(datetime.timezone.utc)

@@ -16,8 +16,8 @@ TIMEOUT = float(os.environ.get("AW_WORKTIME_UI_BRIDGE_TIMEOUT", "20"))


 SESSIONS_BUCKET = f"aw-worktime-sessions_{HOST}"
-AFK_BUCKET = f"aw-watcher-afk_{HOST}"
-WINDOW_BUCKET = f"aw-watcher-window_{HOST}"
+AFK_BUCKET = f"aw-rdp-afk_{HOST}"
+WINDOW_BUCKET = f"aw-rdp-window_{HOST}"


 def _req(method: str, path: str, payload=None):