bippy 0.6.1-dev.3a24abf → 0.6.1-dev.b88fcb4

package/src/errors.ts

@@ -0,0 +1,99 @@
+export class BippyError extends Error {
+  constructor(message: string, cause?: unknown) {
+    super(message, { cause });
+    this.name = "BippyError";
+  }
+}
+
+export class BippyInstrumentationError extends BippyError {
+  readonly callbackName: string;
+  readonly instrumentationName: string;
+
+  constructor(instrumentationName: string, callbackName: string, cause: unknown) {
+    super(
+      `Bippy instrumentation "${instrumentationName}" callback "${callbackName}" failed`,
+      cause,
+    );
+    this.name = "BippyInstrumentationError";
+    this.callbackName = callbackName;
+    this.instrumentationName = instrumentationName;
+  }
+}
+
+export class BippyReactDevToolsError extends BippyError {
+  readonly callbackName: string;
+
+  constructor(callbackName: string, cause: unknown) {
+    super(`React DevTools callback "${callbackName}" failed`, cause);
+    this.name = "BippyReactDevToolsError";
+    this.callbackName = callbackName;
+  }
+}
+
+export class BippyHookListenerError extends BippyError {
+  readonly listenerName: string;
+
+  constructor(listenerName: string, cause: unknown) {
+    super(`Bippy hook listener "${listenerName}" failed`, cause);
+    this.name = "BippyHookListenerError";
+    this.listenerName = listenerName;
+  }
+}
+
+export class BippyHookInstallationError extends BippyError {
+  constructor(cause: unknown) {
+    super("Bippy could not install the React DevTools hook", cause);
+    this.name = "BippyHookInstallationError";
+  }
+}
+
+export class BippyReactBuildError extends BippyError {
+  constructor(message: string, cause?: unknown) {
+    super(message, cause);
+    this.name = "BippyReactBuildError";
+  }
+}
+
+export class BippyHookInspectionError extends BippyError {
+  constructor(message: string, cause?: unknown) {
+    super(message, cause);
+    this.name = "BippyHookInspectionError";
+  }
+}
+
+export class BippyUnsupportedHookError extends BippyHookInspectionError {
+  constructor(message: string, cause?: unknown) {
+    super(message, cause);
+    this.name = "BippyUnsupportedHookError";
+  }
+}
+
+export class BippyHookRenderError extends BippyHookInspectionError {
+  constructor(message: string, cause?: unknown) {
+    super(message, cause);
+    this.name = "BippyHookRenderError";
+  }
+}
+
+export class BippySourceMapError extends BippyError {
+  constructor(message: string, cause?: unknown) {
+    super(message, cause);
+    this.name = "BippySourceMapError";
+  }
+}
+
+interface BippyErrorFactory {
+  (cause: unknown): BippyError;
+}
+
+export const runWithBippyError = <Result>(
+  callback: () => Result,
+  createError: BippyErrorFactory,
+): Result => {
+  try {
+    return callback();
+  } catch (cause) {
+    if (cause instanceof BippyError) throw cause;
+    throw createError(cause);
+  }
+};

package/src/rdt-hook.ts

@@ -1,23 +1,50 @@
 // This module must load before React so renderers can inject into the hook.
 
-import type { ReactDevToolsGlobalHook, ReactRenderer } from "./types.js";
-import { toUnsubscribe, type Unsubscribe } from "./unsubscribe.js";
+import {
+  BippyHookInstallationError,
+  BippyHookListenerError,
+  BippyReactBuildError,
+  runWithBippyError,
+} from "./errors.js";
+import type { ReactDevToolsGlobalHook, ReactRenderer } from "./react-internals/index.js";
+
+export interface Unsubscribe extends Disposable {
+  (): void;
+}
+
+interface ActiveListener {
+  (): unknown;
+}
+
+interface RendererInjectListener {
+  (renderer: ReactRenderer): void;
+}
+
+interface RDTHookReplaceListener {
+  (rdtHook: ReactDevToolsGlobalHook): void;
+}
 
 export const version = process.env.VERSION;
 export const BIPPY_INSTRUMENTATION_STRING = `bippy-${version}`;
 
 const objectDefineProperty = Object.defineProperty;
-// eslint-disable-next-line @typescript-eslint/unbound-method
-const objectHasOwnProperty = Object.prototype.hasOwnProperty;
 
-const NO_OP = (): void => {};
+const noOp = (): void => {};
+
+export const createUnsubscribe = (unsubscribe: () => void): Unsubscribe =>
+  Object.assign(unsubscribe, { [Symbol.dispose]: unsubscribe });
+
+const runHookListener = (listenerName: string, callback: () => unknown): void => {
+  runWithBippyError(callback, (cause) => new BippyHookListenerError(listenerName, cause));
+};
 
 const checkDCE = (functionToCheck: unknown): void => {
   try {
     const code = Function.prototype.toString.call(functionToCheck);
     if (code.includes("^_^")) {
+      // HACK: React DevTools reports failed dead-code elimination asynchronously.
       setTimeout(() => {
-        throw new Error(
+        throw new BippyReactBuildError(
           "React is running in production mode, but dead code " +
             "elimination has not been applied. Read how to correctly " +
             "configure React for production: " +
@@ -34,49 +61,75 @@ export const isRealReactDevtools = (
   return Boolean(rdtHook && "getFiberRoots" in rdtHook);
 };
 
-export const _onActiveListeners = new Set<() => unknown>();
+export const _onActiveListeners = new Set<ActiveListener>();
 
 export const _renderers = new Set<ReactRenderer>();
 
-const rendererInjectListeners = new Set<(renderer: ReactRenderer) => void>();
+const rendererInjectListeners = new Set<RendererInjectListener>();
+const rdtHookReplaceListeners = new Set<RDTHookReplaceListener>();
 // HACK: Hook replacement can leave an old inject wrapper in the call chain, so notifications must be deduplicated.
 const notifiedRenderers = new WeakSet<ReactRenderer>();
-let notifyingInject: ReactDevToolsGlobalHook["inject"] | null = null;
+const notifyingInjectByHook = new WeakMap<
+  ReactDevToolsGlobalHook,
+  ReactDevToolsGlobalHook["inject"]
+>();
+
+const notifyActiveListeners = (): void => {
+  for (const listener of _onActiveListeners) {
+    runHookListener("onActive", listener);
+  }
+};
 
-const ensureInjectNotifiesListeners = (rdtHook: ReactDevToolsGlobalHook): void => {
-  if (rdtHook.inject === notifyingInject) return;
-  const prevInject = rdtHook.inject;
+const notifyRendererInjectListeners = (renderer: ReactRenderer): void => {
+  for (const listener of rendererInjectListeners) {
+    runHookListener("onRendererInject", () => listener(renderer));
+  }
+};
+
+const notifyRDTHookReplaceListeners = (rdtHook: ReactDevToolsGlobalHook): void => {
+  for (const listener of rdtHookReplaceListeners) {
+    runHookListener("onRDTHookReplace", () => listener(rdtHook));
+  }
+};
+
+const setRendererInjectDispatcher = (rdtHook: ReactDevToolsGlobalHook): void => {
+  if (rdtHook.inject === notifyingInjectByHook.get(rdtHook)) return;
+  const previousInject = rdtHook.inject;
   const nextInject = (renderer: ReactRenderer) => {
-    const rendererId = prevInject.call(rdtHook, renderer);
+    const rendererId = previousInject.call(rdtHook, renderer);
     if (!notifiedRenderers.has(renderer)) {
       notifiedRenderers.add(renderer);
-      for (const listener of rendererInjectListeners) {
-        listener(renderer);
-      }
+      notifyRendererInjectListeners(renderer);
     }
     return rendererId;
   };
   rdtHook.inject = nextInject;
-  notifyingInject = nextInject;
+  notifyingInjectByHook.set(rdtHook, nextInject);
 };
 
-/** Subscribes to renderer injections without stacking competing hook patches. */
-export const onRendererInject = (listener: (renderer: ReactRenderer) => void): Unsubscribe => {
-  ensureInjectNotifiesListeners(getRDTHook());
+export const onRendererInject = (listener: RendererInjectListener): Unsubscribe => {
+  setRendererInjectDispatcher(getRDTHook());
   rendererInjectListeners.add(listener);
-  return toUnsubscribe(() => {
+  return createUnsubscribe(() => {
     rendererInjectListeners.delete(listener);
   });
 };
 
-const ensureRendererMap = (rdtHook: ReactDevToolsGlobalHook): Map<number, ReactRenderer> => {
+export const onRDTHookReplace = (listener: RDTHookReplaceListener): Unsubscribe => {
+  rdtHookReplaceListeners.add(listener);
+  return createUnsubscribe(() => {
+    rdtHookReplaceListeners.delete(listener);
+  });
+};
+
+const getRendererMap = (rdtHook: ReactDevToolsGlobalHook): Map<number, ReactRenderer> => {
   if (!(rdtHook.renderers instanceof Map)) {
     rdtHook.renderers = new Map();
   }
   return rdtHook.renderers;
 };
 
-export const installRDTHook = (onActive?: () => unknown): ReactDevToolsGlobalHook => {
+export const installRDTHook = (onActive?: ActiveListener): ReactDevToolsGlobalHook => {
   if (onActive) {
     _onActiveListeners.add(onActive);
   }
@@ -87,20 +140,20 @@ export const installRDTHook = (onActive?: () => unknown): ReactDevToolsGlobalHoo
     _instrumentationSource: BIPPY_INSTRUMENTATION_STRING,
     checkDCE,
     hasUnsupportedRendererAttached: false,
-    inject(renderer) {
+    inject: (renderer) => {
       const nextRendererId = ++rendererIdCounter;
       renderers.set(nextRendererId, renderer);
       _renderers.add(renderer);
       if (!rdtHook._instrumentationIsActive) {
         rdtHook._instrumentationIsActive = true;
-        _onActiveListeners.forEach((listener) => listener());
+        notifyActiveListeners();
       }
       return nextRendererId;
     },
-    on: NO_OP,
-    onCommitFiberRoot: NO_OP,
-    onCommitFiberUnmount: NO_OP,
-    onPostCommitFiberRoot: NO_OP,
+    on: noOp,
+    onCommitFiberRoot: noOp,
+    onCommitFiberUnmount: noOp,
+    onPostCommitFiberRoot: noOp,
     renderers,
     supportsFiber: true,
     supportsFlight: true,
@@ -116,92 +169,106 @@ export const installRDTHook = (onActive?: () => unknown): ReactDevToolsGlobalHoo
         if (newHook && typeof newHook === "object") {
           const ourRenderers = rdtHook.renderers;
           rdtHook = newHook;
-          const nextRenderers = ensureRendererMap(rdtHook);
+          const nextRenderers = getRendererMap(rdtHook);
           if (ourRenderers.size > 0) {
-            ourRenderers.forEach((renderer, id) => {
+            ourRenderers.forEach((renderer, rendererId) => {
               _renderers.add(renderer);
-              nextRenderers.set(id, renderer);
+              nextRenderers.set(rendererId, renderer);
             });
+          }
+          if (ourRenderers.size > 0 || rdtHookReplaceListeners.size > 0) {
             patchRDTHook(onActive);
           }
+          notifyRDTHookReplaceListeners(rdtHook);
         }
       },
     });
-    // HACK: The DevTools extension uses hasOwnProperty to decide whether it may replace an earlier hook.
-    // eslint-disable-next-line @typescript-eslint/unbound-method
-    const originalWindowHasOwnProperty = window.hasOwnProperty;
-    let hasRanHack = false;
-    objectDefineProperty(window, "hasOwnProperty", {
-      configurable: true,
-      value: function (this: unknown, ...args: [PropertyKey]) {
-        try {
-          if (!hasRanHack && args[0] === "__REACT_DEVTOOLS_GLOBAL_HOOK__") {
+    if (typeof window !== "undefined") {
+      // HACK: The DevTools extension uses hasOwnProperty to decide whether it may replace an earlier hook.
+      const originalWindowHasOwnProperty = window.hasOwnProperty.bind(window);
+      const originalHasOwnPropertyDescriptor = Object.getOwnPropertyDescriptor(
+        window,
+        "hasOwnProperty",
+      );
+      let didRunHasOwnPropertyHack = false;
+      const restoreWindowHasOwnProperty = (): void => {
+        if (originalHasOwnPropertyDescriptor) {
+          objectDefineProperty(window, "hasOwnProperty", originalHasOwnPropertyDescriptor);
+        } else {
+          Reflect.deleteProperty(window, "hasOwnProperty");
+        }
+      };
+      objectDefineProperty(window, "hasOwnProperty", {
+        configurable: true,
+        value: (...propertyKeys: [PropertyKey]) => {
+          if (!didRunHasOwnPropertyHack && propertyKeys[0] === "__REACT_DEVTOOLS_GLOBAL_HOOK__") {
+            didRunHasOwnPropertyHack = true;
+            restoreWindowHasOwnProperty();
             globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__ = undefined;
-            hasRanHack = true;
-            return -0;
+            return false;
           }
-        } catch {}
-        return originalWindowHasOwnProperty.apply(this, args);
-      },
-      writable: true,
-    });
+          return originalWindowHasOwnProperty(...propertyKeys);
+        },
+        writable: true,
+      });
+    }
   } catch {
     patchRDTHook(onActive);
   }
   return rdtHook;
 };
 
-export const patchRDTHook = (onActive?: () => unknown): void => {
+export const patchRDTHook = (onActive?: ActiveListener): void => {
   if (onActive) {
     _onActiveListeners.add(onActive);
   }
   let didNotifyActiveListeners = false;
-  try {
-    const rdtHook = globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__;
-    if (!rdtHook) return;
-    const renderers = ensureRendererMap(rdtHook);
-    if (!rdtHook._instrumentationSource) {
-      rdtHook.checkDCE = checkDCE;
-      rdtHook.supportsFiber = true;
-      rdtHook.supportsFlight = true;
-      rdtHook.hasUnsupportedRendererAttached = false;
-      rdtHook._instrumentationSource = BIPPY_INSTRUMENTATION_STRING;
-      rdtHook._instrumentationIsActive = false;
-      // HACK: DevTools detection must happen after setting the source to avoid recursive patching.
-      const isReactDevtools = isRealReactDevtools(rdtHook);
-      if (!isReactDevtools) {
-        rdtHook.on = NO_OP;
-      }
-      if (renderers.size) {
-        renderers.forEach((renderer) => _renderers.add(renderer));
-        rdtHook._instrumentationIsActive = true;
-        _onActiveListeners.forEach((listener) => listener());
-        didNotifyActiveListeners = true;
-      }
-      const prevInject = rdtHook.inject;
-      rdtHook.inject = (renderer) => {
-        const rendererId = prevInject(renderer);
-        _renderers.add(renderer);
-        renderers.set(rendererId, renderer);
-        rdtHook._instrumentationIsActive = true;
-        _onActiveListeners.forEach((listener) => listener());
-        return rendererId;
-      };
+  const rdtHook = globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__;
+  if (!rdtHook) return;
+  const renderers = getRendererMap(rdtHook);
+  if (!rdtHook._instrumentationSource) {
+    rdtHook.checkDCE = checkDCE;
+    rdtHook.supportsFiber = true;
+    rdtHook.supportsFlight = true;
+    rdtHook.hasUnsupportedRendererAttached = false;
+    rdtHook._instrumentationSource = BIPPY_INSTRUMENTATION_STRING;
+    rdtHook._instrumentationIsActive = false;
+    // HACK: DevTools detection must happen after setting the source to avoid recursive patching.
+    const isReactDevtools = isRealReactDevtools(rdtHook);
+    if (!isReactDevtools) {
+      rdtHook.on = noOp;
     }
-    if (!didNotifyActiveListeners && (renderers.size || rdtHook._instrumentationIsActive)) {
-      onActive?.();
+    if (renderers.size) {
+      renderers.forEach((renderer) => _renderers.add(renderer));
+      rdtHook._instrumentationIsActive = true;
+      notifyActiveListeners();
+      didNotifyActiveListeners = true;
     }
-  } catch {}
+    const previousInject = rdtHook.inject;
+    rdtHook.inject = (renderer) => {
+      const rendererId = previousInject.call(rdtHook, renderer);
+      _renderers.add(renderer);
+      renderers.set(rendererId, renderer);
+      if (!rdtHook._instrumentationIsActive) {
+        rdtHook._instrumentationIsActive = true;
+        notifyActiveListeners();
+      }
+      return rendererId;
+    };
+  }
+  if (!didNotifyActiveListeners && (renderers.size || rdtHook._instrumentationIsActive)) {
+    if (onActive) runHookListener("onActive", onActive);
+  }
 };
 
 export const hasRDTHook = (): boolean => {
-  return objectHasOwnProperty.call(globalThis, "__REACT_DEVTOOLS_GLOBAL_HOOK__");
+  return Object.hasOwn(globalThis, "__REACT_DEVTOOLS_GLOBAL_HOOK__");
 };
 
 /**
  * Returns the current React DevTools global hook.
  */
-export const getRDTHook = (onActive?: () => unknown): ReactDevToolsGlobalHook => {
+export const getRDTHook = (onActive?: ActiveListener): ReactDevToolsGlobalHook => {
   if (!hasRDTHook()) {
     return installRDTHook(onActive);
   }
@@ -210,18 +277,6 @@ export const getRDTHook = (onActive?: () => unknown): ReactDevToolsGlobalHook =>
   return globalThis.__REACT_DEVTOOLS_GLOBAL_HOOK__ ?? installRDTHook(onActive);
 };
 
-export const isClientEnvironment = (): boolean => {
-  return Boolean(
-    typeof window !== "undefined" &&
-    // eslint-disable-next-line @typescript-eslint/unbound-method
-    (window.document?.createElement || window.navigator?.product === "ReactNative"),
-  );
-};
-
-export const safelyInstallRDTHook = () => {
-  try {
-    if (isClientEnvironment()) {
-      getRDTHook();
-    }
-  } catch {}
+export const safelyInstallRDTHook = (): void => {
+  runWithBippyError(getRDTHook, (cause) => new BippyHookInstallationError(cause));
 };