perf: improve blocked and masking logic checks

rrweb-io · Jul 18, 2024 · d0d211a · d0d211a
1 parent 93e65f3
commit d0d211a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 23 deletions.
diff --git a/packages/rrdom/src/index.ts b/packages/rrdom/src/index.ts
@@ -345,11 +345,7 @@ export class Mirror implements IMirror<RRNode> {
 
   getId(n: RRNode | undefined | null): number {
     if (!n) return -1;
-
-    const id = this.getMeta(n)?.id;
-
-    // if n is not a serialized Node, use -1 as its id.
-    return id ?? -1;
+    return this.getMeta(n)?.id ?? -1;
   }
 
   getNode(id: number): RRNode | null {
@@ -367,11 +363,14 @@ export class Mirror implements IMirror<RRNode> {
   // removes the node from idNodeMap
   // doesn't remove the node from nodeMetaMap
   removeNodeFromMap(n: RRNode) {
-    const id = this.getId(n);
-    this.idNodeMap.delete(id);
+    const queue = [n];
+    while (queue.length > 0) {
+      const n = queue.pop()!;
+      this.idNodeMap.delete(this.getId(n));
 
-    if (n.childNodes) {
-      n.childNodes.forEach((childNode) => this.removeNodeFromMap(childNode));
+      for(let i = 0; i < n.childNodes.length; i++) {
+        queue.push(n.childNodes[i]);
+      }
     }
   }
   has(id: number): boolean {

diff --git a/packages/rrweb-snapshot/src/snapshot.ts b/packages/rrweb-snapshot/src/snapshot.ts
@@ -340,26 +340,16 @@ export function needMaskingText(
   } else {
     el = node.parentElement;
   }
-  try {
     if (typeof maskTextClass === 'string') {
-      if (checkAncestors) {
-        if (el.closest(`.${maskTextClass}`)) return true;
-      } else {
-        if (el.classList.contains(maskTextClass)) return true;
-      }
+      if (el.classList.contains(maskTextClass)) return true;
+      if (checkAncestors && el.matches(`.${maskTextClass} *`)) return true;
     } else {
       if (classMatchesRegex(el, maskTextClass, checkAncestors)) return true;
     }
     if (maskTextSelector) {
-      if (checkAncestors) {
-        if (el.closest(maskTextSelector)) return true;
-      } else {
-        if (el.matches(maskTextSelector)) return true;
-      }
+      if (el.matches(maskTextSelector)) return true;
+      if (checkAncestors && el.matches(`${maskTextSelector} *`)) return true;
     }
-  } catch (e) {
-    //
-  }
   return false;
 }