Merge branch 'master' of https://github.com/rrweb-io/rrweb

guide.md

@@ -142,10 +142,13 @@ The parameter of `rrweb.record` accepts the following options.
 | checkoutEveryNms | -           | take a full snapshot after every N ms<br />refer to the [checkout](#checkout) chapter                                                                            |
 | blockClass       | 'rr-block'  | Use a string or RegExp to configure which elements should be blocked, refer to the [privacy](#privacy) chapter                                                   |
 | ignoreClass      | 'rr-ignore' | Use a string or RegExp to configure which elements should be ignored, refer to the [privacy](#privacy) chapter                                                   |
-| blockSelector    | null        | Use a string or RegExp to configure which selector should be blocked, refer to the [privacy](#privacy) chapter                                                                                          |
+| maskTextClass    | 'rr-mask'   | Use a string or RegExp to configure which elements should be masked, refer to the [privacy](#privacy) chapter                                                    |
+| blockSelector    | null        | Use a string to configure which selector should be blocked, refer to the [privacy](#privacy) chapter                                                             |
+| maskTextSelector | null        | Use a string to configure which selector should be masked, refer to the [privacy](#privacy) chapter                                                              |
 | maskAllInputs    | false       | mask all input content as \*                                                                                                                                     |
-| maskInputOptions | {}          | mask some kinds of input \*<br />refer to the [list](https://github.com/rrweb-io/rrweb-snapshot/blob/6728d12b3cddd96951c86d948578f99ada5749ff/src/types.ts#L72) |
-| maskInputFn      | -           | customize mask input content recording logic                                                                                                                                |
+| maskInputOptions | {}          | mask some kinds of input \*<br />refer to the [list](https://github.com/rrweb-io/rrweb-snapshot/blob/6728d12b3cddd96951c86d948578f99ada5749ff/src/types.ts#L72)  |
+| maskInputFn      | -           | customize mask input content recording logic                                                                                                                     |
+| maskTextFn       | -           | customize mask text content recording logic                                                                                                                      |
 | slimDOMOptions   | {}          | remove unnecessary parts of the DOM <br />refer to the [list](https://github.com/rrweb-io/rrweb-snapshot/blob/6728d12b3cddd96951c86d948578f99ada5749ff/src/types.ts#L91)            |
 | inlineStylesheet | true        | whether to inline the stylesheet in the events                                                                                                                   |
 | hooks            | {}          | hooks for events<br />refer to the [list](https://github.com/rrweb-io/rrweb/blob/9488deb6d54a5f04350c063d942da5e96ab74075/src/types.ts#L207)                     |
@@ -163,6 +166,7 @@ You may find some contents on the webpage which are not willing to be recorded,
 - An element with the class name `.rr-ignore` will not record its input events.
 - You’ll probably want to mask `input[type="password"]` by adding `maskInputOptions: {password: true}`
 - Mask options to mask the content in input elements.
+- A text of elements with the class name `.rr-mask` and its children will be masked.
 
 #### Checkout
 

package.json

@@ -66,6 +66,6 @@
     "@xstate/fsm": "^1.4.0",
     "fflate": "^0.4.4",
     "mitt": "^1.1.3",
-    "rrweb-snapshot": "^1.1.1"
+    "rrweb-snapshot": "^1.1.2"
   }
 }

src/record/index.ts

@@ -43,11 +43,14 @@ function record<T = eventWithTime>(
     blockClass = 'rr-block',
     blockSelector = null,
     ignoreClass = 'rr-ignore',
+    maskTextClass = 'rr-mask',
+    maskTextSelector = null,
     inlineStylesheet = true,
     maskAllInputs,
     maskInputOptions: _maskInputOptions,
     slimDOMOptions: _slimDOMOptions,
     maskInputFn,
+    maskTextFn,
     hooks,
     packFn,
     sampling = {},
@@ -204,8 +207,11 @@ function record<T = eventWithTime>(
     bypassOptions: {
       blockClass,
       blockSelector,
+      maskTextClass,
+      maskTextSelector,
       inlineStylesheet,
       maskInputOptions,
+      maskTextFn,
       recordCanvas,
       slimDOMOptions,
       iframeManager,
@@ -229,8 +235,11 @@ function record<T = eventWithTime>(
     const [node, idNodeMap] = snapshot(document, {
       blockClass,
       blockSelector,
+      maskTextClass,
+      maskTextSelector,
       inlineStylesheet,
       maskAllInputs: maskInputOptions,
+      maskTextFn,
       slimDOM: slimDOMOptions,
       recordCanvas,
       onSerialize: (n) => {
@@ -397,13 +406,16 @@ function record<T = eventWithTime>(
             ),
           blockClass,
           ignoreClass,
+          maskTextClass,
+          maskTextSelector,
           maskInputOptions,
           inlineStylesheet,
           sampling,
           recordCanvas,
           collectFonts,
           doc,
           maskInputFn,
+          maskTextFn,
           logOptions,
           blockSelector,
           slimDOMOptions,

src/record/mutation.ts

@@ -6,15 +6,18 @@ import {
   SlimDOMOptions,
   IGNORED_NODE,
   isShadowRoot,
+  needMaskingText,
 } from 'rrweb-snapshot';
 import {
   mutationRecord,
   blockClass,
+  maskTextClass,
   mutationCallBack,
   textCursor,
   attributeCursor,
   removedNodeMutation,
   addedNodeMutation,
+  MaskTextFn,
 } from '../types';
 import {
   mirror,
@@ -159,8 +162,11 @@ export default class MutationBuffer {
   private emissionCallback: mutationCallBack;
   private blockClass: blockClass;
   private blockSelector: string | null;
+  private maskTextClass: maskTextClass;
+  private maskTextSelector: string | null;
   private inlineStylesheet: boolean;
   private maskInputOptions: MaskInputOptions;
+  private maskTextFn: MaskTextFn | undefined;
   private recordCanvas: boolean;
   private slimDOMOptions: SlimDOMOptions;
   private doc: Document;
@@ -172,8 +178,11 @@ export default class MutationBuffer {
     cb: mutationCallBack,
     blockClass: blockClass,
     blockSelector: string | null,
+    maskTextClass: maskTextClass,
+    maskTextSelector: string | null,
     inlineStylesheet: boolean,
     maskInputOptions: MaskInputOptions,
+    maskTextFn: MaskTextFn | undefined,
     recordCanvas: boolean,
     slimDOMOptions: SlimDOMOptions,
     doc: Document,
@@ -182,8 +191,11 @@ export default class MutationBuffer {
   ) {
     this.blockClass = blockClass;
     this.blockSelector = blockSelector;
+    this.maskTextClass = maskTextClass;
+    this.maskTextSelector = maskTextSelector;
     this.inlineStylesheet = inlineStylesheet;
     this.maskInputOptions = maskInputOptions;
+    this.maskTextFn = maskTextFn;
     this.recordCanvas = recordCanvas;
     this.slimDOMOptions = slimDOMOptions;
     this.emissionCallback = cb;
@@ -266,9 +278,12 @@ export default class MutationBuffer {
         map: mirror.map,
         blockClass: this.blockClass,
         blockSelector: this.blockSelector,
+        maskTextClass: this.maskTextClass,
+        maskTextSelector: this.maskTextSelector,
         skipChild: true,
         inlineStylesheet: this.inlineStylesheet,
         maskInputOptions: this.maskInputOptions,
+        maskTextFn: this.maskTextFn,
         slimDOMOptions: this.slimDOMOptions,
         recordCanvas: this.recordCanvas,
         onSerialize: (currentN) => {
@@ -409,7 +424,16 @@ export default class MutationBuffer {
         const value = m.target.textContent;
         if (!isBlocked(m.target, this.blockClass) && value !== m.oldValue) {
           this.texts.push({
-            value,
+            value:
+              needMaskingText(
+                m.target,
+                this.maskTextClass,
+                this.maskTextSelector,
+              ) && value
+                ? this.maskTextFn
+                  ? this.maskTextFn(value)
+                  : value.replace(/[\S]/g, '*')
+                : value,
             node: m.target,
           });
         }

src/record/observer.ts

@@ -26,6 +26,7 @@ import {
   inputCallback,
   hookResetter,
   blockClass,
+  maskTextClass,
   IncrementalSource,
   hooksParam,
   Arguments,
@@ -36,6 +37,7 @@ import {
   fontCallback,
   fontParam,
   MaskInputFn,
+  MaskTextFn,
   logCallback,
   LogRecordOptions,
   Logger,
@@ -62,8 +64,11 @@ export function initMutationObserver(
   doc: Document,
   blockClass: blockClass,
   blockSelector: string | null,
+  maskTextClass: maskTextClass,
+  maskTextSelector: string | null,
   inlineStylesheet: boolean,
   maskInputOptions: MaskInputOptions,
+  maskTextFn: MaskTextFn | undefined,
   recordCanvas: boolean,
   slimDOMOptions: SlimDOMOptions,
   iframeManager: IframeManager,
@@ -77,8 +82,11 @@ export function initMutationObserver(
     cb,
     blockClass,
     blockSelector,
+    maskTextClass,
+    maskTextSelector,
     inlineStylesheet,
     maskInputOptions,
+    maskTextFn,
     recordCanvas,
     slimDOMOptions,
     doc,
@@ -785,8 +793,11 @@ export function initObservers(
     o.doc,
     o.blockClass,
     o.blockSelector,
+    o.maskTextClass,
+    o.maskTextSelector,
     o.inlineStylesheet,
     o.maskInputOptions,
+    o.maskTextFn,
     o.recordCanvas,
     o.slimDOMOptions,
     o.iframeManager,

src/record/shadow-dom-manager.ts

@@ -1,13 +1,16 @@
-import { mutationCallBack, blockClass } from '../types';
+import { mutationCallBack, blockClass, maskTextClass, MaskTextFn } from '../types';
 import { MaskInputOptions, SlimDOMOptions } from 'rrweb-snapshot';
 import { IframeManager } from './iframe-manager';
 import { initMutationObserver } from './observer';
 
 type BypassOptions = {
   blockClass: blockClass;
   blockSelector: string | null;
+  maskTextClass: maskTextClass;
+  maskTextSelector: string | null;
   inlineStylesheet: boolean;
   maskInputOptions: MaskInputOptions;
+  maskTextFn: MaskTextFn | undefined;
   recordCanvas: boolean;
   slimDOMOptions: SlimDOMOptions;
   iframeManager: IframeManager;
@@ -31,8 +34,11 @@ export class ShadowDomManager {
       doc,
       this.bypassOptions.blockClass,
       this.bypassOptions.blockSelector,
+      this.bypassOptions.maskTextClass,
+      this.bypassOptions.maskTextSelector,
       this.bypassOptions.inlineStylesheet,
       this.bypassOptions.maskInputOptions,
+      this.bypassOptions.maskTextFn,
       this.bypassOptions.recordCanvas,
       this.bypassOptions.slimDOMOptions,
       this.bypassOptions.iframeManager,

src/replay/machine.ts

@@ -243,7 +243,7 @@ export function createPlayerService(
             addDelay(event, baselineTime);
 
             let end = events.length - 1;
-            if (events[end].timestamp <= event.timestamp) {
+            if (!events[end] || events[end].timestamp <= event.timestamp) {
               // fast track
               events.push(event);
             } else {

src/types.ts

@@ -163,6 +163,8 @@ export type eventWithTime = event & {
 
 export type blockClass = string | RegExp;
 
+export type maskTextClass = string | RegExp;
+
 export type SamplingStrategy = Partial<{
   /**
    * false means not to record mouse/touch move events
@@ -196,9 +198,12 @@ export type recordOptions<T> = {
   blockClass?: blockClass;
   blockSelector?: string;
   ignoreClass?: string;
+  maskTextClass?: maskTextClass;
+  maskTextSelector?: string;
   maskAllInputs?: boolean;
   maskInputOptions?: MaskInputOptions;
   maskInputFn?: MaskInputFn;
+  maskTextFn?: MaskTextFn;
   slimDOMOptions?: SlimDOMOptions | 'all' | true;
   inlineStylesheet?: boolean;
   hooks?: hooksParam;
@@ -222,8 +227,11 @@ export type observerParam = {
   blockClass: blockClass;
   blockSelector: string | null;
   ignoreClass: string;
+  maskTextClass: maskTextClass;
+  maskTextSelector: string | null;
   maskInputOptions: MaskInputOptions;
   maskInputFn?: MaskInputFn;
+  maskTextFn?: MaskTextFn;
   inlineStylesheet: boolean;
   styleSheetRuleCb: styleSheetRuleCallback;
   canvasMutationCb: canvasMutationCallback;
@@ -585,6 +593,8 @@ export enum ReplayerEvents {
 
 export type MaskInputFn = (text: string) => string;
 
+export type MaskTextFn = (text: string) => string;
+
 // store the state that would be changed during the process(unmount from dom and mount again)
 export type ElementState = {
   // [scrollLeft,scrollTop]