make internall wrapper api methods private

zendive · zendive · commit 624954b505f5 · 2025-02-01T23:40:14.000+02:00
diff --git a/src/wrapper/AnimationWrapper.ts b/src/wrapper/AnimationWrapper.ts
@@ -51,16 +51,7 @@ export class AnimationWrapper {
     this.traceUtil = traceUtil;
   }
 
-  updateAnimationsFramerate() {
-    for (let [, rafRecord] of this.rafHistory) {
-      const prevCalls = this.animationCallsMap.get(rafRecord.traceId) || 0;
-      rafRecord.cps = rafRecord.calls - prevCalls;
-
-      this.animationCallsMap.set(rafRecord.traceId, rafRecord.calls);
-    }
-  }
-
-  updateRafHistory(handler: number, callstack: TCallstack) {
+  #updateRafHistory(handler: number, callstack: TCallstack) {
     const existing = this.rafHistory.get(callstack.traceId);
 
     if (existing) {
@@ -85,7 +76,7 @@ export class AnimationWrapper {
     this.onlineAnimationFrameLookup.set(handler, callstack.traceId);
   }
 
-  rafFired(handler: number, traceId: string, selfTime: number | null) {
+  #rafFired(handler: number, traceId: string, selfTime: number | null) {
     const rafRecord = this.rafHistory.get(traceId);
     if (!rafRecord) {
       return;
@@ -99,7 +90,7 @@ export class AnimationWrapper {
     }
   }
 
-  updateCafHistory(handler: number | string, callstack: TCallstack) {
+  #updateCafHistory(handler: number | string, callstack: TCallstack) {
     const existing = this.cafHistory.get(callstack.traceId);
     const hasError = !validHandler(handler);
 
@@ -136,6 +127,15 @@ export class AnimationWrapper {
     }
   }
 
+  updateAnimationsFramerate() {
+    for (let [, rafRecord] of this.rafHistory) {
+      const prevCalls = this.animationCallsMap.get(rafRecord.traceId) || 0;
+      rafRecord.cps = rafRecord.calls - prevCalls;
+
+      this.animationCallsMap.set(rafRecord.traceId, rafRecord.calls);
+    }
+  }
+
   wrapRequestAnimationFrame() {
     window.requestAnimationFrame = function requestAnimationFrame(
       this: AnimationWrapper,
@@ -157,9 +157,9 @@ export class AnimationWrapper {
           selfTime = performance.now() - start;
         }
 
-        this.rafFired(handler, callstack.traceId, selfTime);
+        this.#rafFired(handler, callstack.traceId, selfTime);
       });
-      this.updateRafHistory(handler, callstack);
+      this.#updateRafHistory(handler, callstack);
 
       return handler;
     }.bind(this);
@@ -173,7 +173,7 @@ export class AnimationWrapper {
       const err = new Error(TraceUtil.SIGNATURE);
       const callstack = this.traceUtil.getCallstack(err);
 
-      this.updateCafHistory(handler, callstack);
+      this.#updateCafHistory(handler, callstack);
       this.callCounter.cancelAnimationFrame++;
 
       if (this.traceUtil.shouldPass(callstack.traceId)) {
diff --git a/src/wrapper/IdleWrapper.ts b/src/wrapper/IdleWrapper.ts
@@ -52,7 +52,7 @@ export class IdleWrapper {
     this.traceUtil = traceUtil;
   }
 
-  ricFired(
+  #ricFired(
     handler: number,
     traceId: string,
     deadline: IdleDeadline,
@@ -72,7 +72,7 @@ export class IdleWrapper {
     }
   }
 
-  updateRicHistory(
+  #updateRicHistory(
     handler: number,
     delay: number | undefined | string,
     callstack: TCallstack
@@ -106,7 +106,7 @@ export class IdleWrapper {
     this.onlineIdleCallbackLookup.set(handler, callstack.traceId);
   }
 
-  updateCicHistory(handler: number | string, callstack: TCallstack) {
+  #updateCicHistory(handler: number | string, callstack: TCallstack) {
     const existing = this.cicHistory.get(callstack.traceId);
     const hasError = !validHandler(handler);
 
@@ -167,9 +167,9 @@ export class IdleWrapper {
           selfTime = performance.now() - start;
         }
 
-        this.ricFired(handler, callstack.traceId, deadline, selfTime);
+        this.#ricFired(handler, callstack.traceId, deadline, selfTime);
       }, options);
-      this.updateRicHistory(handler, delay, callstack);
+      this.#updateRicHistory(handler, delay, callstack);
 
       return handler;
     }.bind(this);
@@ -183,7 +183,7 @@ export class IdleWrapper {
       const err = new Error(TraceUtil.SIGNATURE);
       const callstack = this.traceUtil.getCallstack(err);
 
-      this.updateCicHistory(handler, callstack);
+      this.#updateCicHistory(handler, callstack);
       this.callCounter.cancelIdleCallback++;
 
       if (this.traceUtil.shouldPass(callstack.traceId)) {
diff --git a/src/wrapper/MediaWrapper.ts b/src/wrapper/MediaWrapper.ts
@@ -43,6 +43,66 @@ export type TMediaCommand =
 export class MediaWrapper {
   mediaCollection: TMediaModel[] = [];
 
+  #formatPropValue(prop: string, value: unknown): any {
+    let rv: any = value;
+
+    if ('networkState' === prop) {
+      rv = `${value} - ${NETWORK_STATE[value as number]}`;
+    } else if ('readyState' === prop) {
+      rv = `${value} - ${READY_STATE[value as number]}`;
+    } else if ('srcObject' === prop) {
+      rv = value ? `${value}` : value;
+    } else if ('mediaKeys' === prop) {
+      // https://web.dev/articles/eme-basics
+      rv = cloneObjectSafely(value);
+    } else if (value instanceof TimeRanges) {
+      rv = [];
+
+      for (let n = 0, N = value.length; n < N; n++) {
+        rv.push(`<${value.start(n).toFixed(3)} - ${value.end(n).toFixed(3)}>`);
+      }
+
+      rv = rv.join('');
+    } else if (value instanceof TextTrackList) {
+      rv = value.length;
+    } else if (value instanceof MediaError) {
+      rv = `${value.code}/${value.message}`;
+    }
+
+    return rv;
+  }
+
+  #stopMonitorMedia(entry: TMediaModel) {
+    for (const eventType of MEDIA_ELEMENT_EVENTS) {
+      entry.el.removeEventListener(eventType, entry.eventListener);
+    }
+  }
+
+  #startMonitorMedia(mediaId: string, el: HTMLMediaElement): TMediaModel {
+    const events: TMediaMetrics['events'] = {};
+    const props: TMediaMetrics['props'] = {};
+    const rv = {
+      el,
+      metrics: {
+        mediaId,
+        type:
+          el instanceof HTMLVideoElement ? EMediaType.VIDEO : EMediaType.AUDIO,
+        events,
+        props,
+      },
+      eventListener: function (this: typeof events, e: Event) {
+        this[e.type]++;
+      }.bind(events),
+    };
+
+    for (const event of MEDIA_ELEMENT_EVENTS) {
+      events[event] = 0;
+      el.addEventListener(event, rv.eventListener);
+    }
+
+    return rv;
+  }
+
   meetMedia() {
     const els: NodeListOf<HTMLMediaElement> =
       document.querySelectorAll('video,audio');
@@ -141,64 +201,4 @@ export class MediaWrapper {
       mediaModel.el.playbackRate += 0.1;
     }
   }
-
-  #formatPropValue(prop: string, value: unknown): any {
-    let rv: any = value;
-
-    if ('networkState' === prop) {
-      rv = `${value} - ${NETWORK_STATE[value as number]}`;
-    } else if ('readyState' === prop) {
-      rv = `${value} - ${READY_STATE[value as number]}`;
-    } else if ('srcObject' === prop) {
-      rv = value ? `${value}` : value;
-    } else if ('mediaKeys' === prop) {
-      // https://web.dev/articles/eme-basics
-      rv = cloneObjectSafely(value);
-    } else if (value instanceof TimeRanges) {
-      rv = [];
-
-      for (let n = 0, N = value.length; n < N; n++) {
-        rv.push(`<${value.start(n).toFixed(3)} - ${value.end(n).toFixed(3)}>`);
-      }
-
-      rv = rv.join('');
-    } else if (value instanceof TextTrackList) {
-      rv = value.length;
-    } else if (value instanceof MediaError) {
-      rv = `${value.code}/${value.message}`;
-    }
-
-    return rv;
-  }
-
-  #stopMonitorMedia(entry: TMediaModel) {
-    for (const eventType of MEDIA_ELEMENT_EVENTS) {
-      entry.el.removeEventListener(eventType, entry.eventListener);
-    }
-  }
-
-  #startMonitorMedia(mediaId: string, el: HTMLMediaElement): TMediaModel {
-    const events: TMediaMetrics['events'] = {};
-    const props: TMediaMetrics['props'] = {};
-    const rv = {
-      el,
-      metrics: {
-        mediaId,
-        type:
-          el instanceof HTMLVideoElement ? EMediaType.VIDEO : EMediaType.AUDIO,
-        events,
-        props,
-      },
-      eventListener: function (this: typeof events, e: Event) {
-        this[e.type]++;
-      }.bind(events),
-    };
-
-    for (const event of MEDIA_ELEMENT_EVENTS) {
-      events[event] = 0;
-      el.addEventListener(event, rv.eventListener);
-    }
-
-    return rv;
-  }
 }
diff --git a/src/wrapper/TimerWrapper.ts b/src/wrapper/TimerWrapper.ts
@@ -80,7 +80,7 @@ export class TimerWrapper {
     this.apiEval = apiEval;
   }
 
-  timerOnline(
+  #timerOnline(
     type: ETimerType,
     handler: number,
     delay: number | undefined | string,
@@ -102,7 +102,7 @@ export class TimerWrapper {
     });
   }
 
-  timerOffline(
+  #timerOffline(
     handler: number,
     canceledByTraceId: string | null,
     selfTime: number | null
@@ -139,7 +139,7 @@ export class TimerWrapper {
     setTimerRecord.canceledCounter++;
   }
 
-  updateSetTimersHistory(
+  #updateSetTimersHistory(
     history: Map<string, TSetTimerHistory>,
     handler: number,
     delay: number | string | undefined,
@@ -173,7 +173,7 @@ export class TimerWrapper {
     }
   }
 
-  updateClearTimersHistory(
+  #updateClearTimersHistory(
     history: Map<string, TClearTimerHistory>,
     handler: unknown,
     callstack: TCallstack
@@ -207,7 +207,7 @@ export class TimerWrapper {
     }
   }
 
-  updateTimersSelfTime(
+  #updateTimersSelfTime(
     map: Map<string, TSetTimerHistory>,
     traceId: string,
     selfTime: number | null
@@ -257,8 +257,8 @@ export class TimerWrapper {
             }
           }
 
-          this.timerOffline(handler, null, selfTime);
-          this.updateTimersSelfTime(
+          this.#timerOffline(handler, null, selfTime);
+          this.#updateTimersSelfTime(
             this.setTimeoutHistory,
             callstack.traceId,
             selfTime
@@ -268,8 +268,8 @@ export class TimerWrapper {
         ...args
       );
 
-      this.timerOnline(ETimerType.TIMEOUT, handler, delay, callstack, isEval);
-      this.updateSetTimersHistory(
+      this.#timerOnline(ETimerType.TIMEOUT, handler, delay, callstack, isEval);
+      this.#updateSetTimersHistory(
         this.setTimeoutHistory,
         handler,
         delay,
@@ -299,14 +299,14 @@ export class TimerWrapper {
       const err = new Error(TraceUtil.SIGNATURE);
       const callstack = this.traceUtil.getCallstack(err);
 
-      this.updateClearTimersHistory(
+      this.#updateClearTimersHistory(
         this.clearTimeoutHistory,
         handler,
         callstack
       );
 
       if (handler !== undefined) {
-        this.timerOffline(handler, callstack.traceId, null);
+        this.#timerOffline(handler, callstack.traceId, null);
       }
 
       this.callCounter.clearTimeout++;
@@ -359,7 +359,7 @@ export class TimerWrapper {
             }
           }
 
-          this.updateTimersSelfTime(
+          this.#updateTimersSelfTime(
             this.setIntervalHistory,
             callstack.traceId,
             selfTime
@@ -369,8 +369,8 @@ export class TimerWrapper {
         ...args
       );
 
-      this.timerOnline(ETimerType.INTERVAL, handler, delay, callstack, isEval);
-      this.updateSetTimersHistory(
+      this.#timerOnline(ETimerType.INTERVAL, handler, delay, callstack, isEval);
+      this.#updateSetTimersHistory(
         this.setIntervalHistory,
         handler,
         delay,
@@ -400,14 +400,14 @@ export class TimerWrapper {
       const err = new Error(TraceUtil.SIGNATURE);
       const callstack = this.traceUtil.getCallstack(err);
 
-      this.updateClearTimersHistory(
+      this.#updateClearTimersHistory(
         this.clearIntervalHistory,
         handler,
         callstack
       );
 
       if (handler !== undefined) {
-        this.timerOffline(handler, callstack.traceId, null);
+        this.#timerOffline(handler, callstack.traceId, null);
       }
 
       this.callCounter.clearInterval++;
