fix(monitoring): uncaught excetions hotfix

aidenybai · Dec 9, 2024 · c3b1b85 · c3b1b85
1 parent 237f624
commit c3b1b85
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 283 deletions.
diff --git a/packages/scan/package.json b/packages/scan/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scan",
-  "version": "0.0.41",
+  "version": "0.0.42",
   "description": "Scan your React app for renders",
   "keywords": [
     "react",

diff --git a/packages/scan/src/core/index.ts b/packages/scan/src/core/index.ts
@@ -314,29 +314,33 @@ let flushInterval: any | undefined;
 
 export const start = () => {
   if (typeof window === 'undefined') return;
-
-  const existingOverlay = document.querySelector('react-scan-overlay');
-  if (existingOverlay) {
-    return;
-  }
-  initReactScanOverlay();
-  const overlayElement = document.createElement('react-scan-overlay') as any;
-
-  document.documentElement.appendChild(overlayElement);
-
   const options = ReactScanInternals.options.value;
 
-  const ctx = overlayElement.getContext();
-  createInspectElementStateMachine();
-  const audioContext =
-    typeof window !== 'undefined'
-      ? new (window.AudioContext ||
-          // @ts-expect-error -- This is a fallback for Safari
-          window.webkitAudioContext)()
-      : null;
-  createPerfObserver();
+  let ctx: CanvasRenderingContext2D;
+  let audioContext: any;
 
-  logIntro();
+  if (!Store.monitor.value) {
+    const existingOverlay = document.querySelector('react-scan-overlay');
+    if (existingOverlay) {
+      return;
+    }
+    initReactScanOverlay();
+    const overlayElement = document.createElement('react-scan-overlay') as any;
+
+    document.documentElement.appendChild(overlayElement);
+
+    ctx = overlayElement.getContext();
+    createInspectElementStateMachine();
+    audioContext =
+      typeof window !== 'undefined'
+        ? new (window.AudioContext ||
+            // @ts-expect-error -- This is a fallback for Safari
+            window.webkitAudioContext)()
+        : null;
+    createPerfObserver();
+
+    logIntro();
+  }
 
   globalThis.__REACT_SCAN__ = {
     ReactScanInternals,
@@ -432,7 +436,7 @@ export const start = () => {
 
   ReactScanInternals.instrumentation = instrumentation;
 
-  if (options.showToolbar) {
+  if (options.showToolbar && !Store.monitor.value) {
     createToolbar();
   }
 };

diff --git a/packages/scan/src/core/monitor/benchmark.ts b/packages/scan/src/core/monitor/benchmark.ts
diff --git a/packages/scan/src/core/monitor/index.ts b/packages/scan/src/core/monitor/index.ts
@@ -24,7 +24,7 @@ export const BaseMonitor = ({
     url,
     apiKey,
     interactions: [],
-    session: getSession(),
+    session: getSession().catch(() => null),
     route,
     path,
   };
@@ -61,7 +61,7 @@ export const Monitoring = ({
     url,
     apiKey,
     interactions: [],
-    session: getSession(),
+    session: getSession().catch(() => null),
     route,
     path,
   };

diff --git a/packages/scan/src/core/monitor/network.ts b/packages/scan/src/core/monitor/network.ts
@@ -100,7 +100,7 @@ export const flush = async (): Promise<void> => {
     return;
   }
   // idempotent
-  const session = await getSession();
+  const session = await getSession().catch(() => null);
 
   if (!session) return;
   // nisarg do not add this back fix it on your side

diff --git a/packages/scan/src/core/monitor/types.ts b/packages/scan/src/core/monitor/types.ts
@@ -1,5 +1,4 @@
 import { type Fiber } from 'react-reconciler';
-import { type getDevicePerformance } from './benchmark';
 
 export enum Device {
   DESKTOP = 0,
@@ -16,7 +15,6 @@ export interface Session {
   cpu: number;
   gpu: string | null;
   mem: number;
-  performance: Awaited<ReturnType<typeof getDevicePerformance>>;
 }
 
 export interface Interaction {