@buoy-gg/impersonate 7.0.26 → 7.0.28

package/lib/commonjs/impersonate/components/UserSearchView.js

@@ -47,7 +47,7 @@ function UserSearchView({
         style: styles.warningCard,
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_sharedUi.AlertTriangle, {
           size: 18,
-          color: _sharedUi.buoyColors.warning
+          color: _sharedUi.night.color.warning
         }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
           style: styles.warningContent,
           children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
@@ -63,7 +63,7 @@ function UserSearchView({
       style: styles.loadingContainer,
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.ActivityIndicator, {
         size: "small",
-        color: _sharedUi.buoyColors.primary
+        color: _sharedUi.night.color.accent
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
         style: styles.loadingText,
         children: "Searching users..."
@@ -74,7 +74,7 @@ function UserSearchView({
         style: styles.errorCard,
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_sharedUi.AlertTriangle, {
           size: 16,
-          color: _sharedUi.buoyColors.error
+          color: _sharedUi.night.color.danger
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
           style: styles.errorText,
           children: searchError
@@ -104,7 +104,7 @@ function UserSearchView({
         style: styles.emptyStateIcon,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_sharedUi.Users, {
           size: 28,
-          color: _sharedUi.buoyColors.textMuted
+          color: _sharedUi.night.color.textTertiary
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
         style: styles.emptyStateTitle,
@@ -141,7 +141,7 @@ const styles = _reactNative.StyleSheet.create({
   },
   loadingText: {
     fontSize: 13,
-    color: _sharedUi.buoyColors.textSecondary
+    color: _sharedUi.night.color.textSecondary
   },
   resultsSection: {
     flex: 1,
@@ -157,10 +157,10 @@ const styles = _reactNative.StyleSheet.create({
     flexDirection: "row",
     alignItems: "flex-start",
     gap: 12,
-    backgroundColor: _sharedUi.buoyColors.warning + "12",
+    backgroundColor: _sharedUi.night.color.warningSoft,
     borderRadius: 10,
     borderWidth: 1,
-    borderColor: _sharedUi.buoyColors.warning + "25",
+    borderColor: _sharedUi.night.color.warning + "25",
     padding: 14
   },
   warningContent: {
@@ -169,28 +169,28 @@ const styles = _reactNative.StyleSheet.create({
   warningTitle: {
     fontSize: 14,
     fontWeight: "600",
-    color: _sharedUi.buoyColors.warning,
+    color: _sharedUi.night.color.warning,
     marginBottom: 4
   },
   warningText: {
     fontSize: 13,
-    color: _sharedUi.buoyColors.textSecondary,
+    color: _sharedUi.night.color.textSecondary,
     lineHeight: 18
   },
   errorCard: {
     flexDirection: "row",
     alignItems: "center",
     gap: 10,
-    backgroundColor: _sharedUi.buoyColors.error + "12",
+    backgroundColor: _sharedUi.night.color.dangerSoft,
     borderRadius: 10,
     borderWidth: 1,
-    borderColor: _sharedUi.buoyColors.error + "25",
+    borderColor: _sharedUi.night.color.danger + "25",
     padding: 12
   },
   errorText: {
     flex: 1,
     fontSize: 13,
-    color: _sharedUi.buoyColors.error
+    color: _sharedUi.night.color.danger
   },
   emptyStateContainer: {
     flex: 1,
@@ -203,7 +203,7 @@ const styles = _reactNative.StyleSheet.create({
     width: 56,
     height: 56,
     borderRadius: 28,
-    backgroundColor: _sharedUi.buoyColors.hover,
+    backgroundColor: _sharedUi.night.color.surfaceElevated,
     alignItems: "center",
     justifyContent: "center",
     marginBottom: 16
@@ -211,17 +211,17 @@ const styles = _reactNative.StyleSheet.create({
   emptyStateTitle: {
     fontSize: 16,
     fontWeight: "600",
-    color: _sharedUi.buoyColors.text,
+    color: _sharedUi.night.color.text,
     marginBottom: 6
   },
   emptyStateDescription: {
     fontSize: 14,
-    color: _sharedUi.buoyColors.textSecondary,
+    color: _sharedUi.night.color.textSecondary,
     textAlign: "center",
     marginBottom: 8
   },
   emptyStateHint: {
     fontSize: 12,
-    color: _sharedUi.buoyColors.textMuted
+    color: _sharedUi.night.color.textTertiary
   }
 });

package/lib/commonjs/impersonate/utils/impersonateListener.js

@@ -56,11 +56,33 @@ const DEFAULT_IGNORE_PATTERNS = [/\/symbolicate$/, /\/logs$/, /\/debugger-proxy/
  * listener.stopListening();
  * ```
  */
+/**
+ * Cooperating-interceptor protocol with @buoy-gg/network: its interceptors
+ * carry `__buoy*` marker properties, and it re-installs itself whenever the
+ * marker disappears from the live global (that's how it survives being
+ * clobbered by Expo/DevTools re-assigning fetch). We wrap its functions, so
+ * the markers must ride along on our wrappers — otherwise the network tool
+ * would conclude it lost interception and stack a fresh patch on every check.
+ */
+function carryBuoyMarkers(wrapper, wrapped) {
+  for (const key of Object.keys(wrapped)) {
+    if (key.startsWith("__buoy")) {
+      wrapper[key] = wrapped[key];
+    }
+  }
+}
 class ImpersonateListener {
   isListeningFlag = false;
 
   // Store original methods - MUST be captured before other tools patch
 
+  /**
+   * The wrappers this instance installed, for identity checks — stopListening
+   * only restores globals that are still literally ours (see there).
+   */
+  patchedFetch = null;
+  patchedXHROpen = null;
+  patchedXHRSend = null;
   constructor() {
     // Initialize with current fetch - will be re-captured in startListening
     this.originalFetch = globalThis.fetch.bind(globalThis);
@@ -145,15 +167,24 @@ class ImpersonateListener {
     // CRITICAL: Re-capture fetch/XHR NOW, not at construction time
     // This ensures we patch OVER any existing interceptors (like @buoy-gg/network)
     // so our modifications are visible to them
-    this.originalFetch = globalThis.fetch.bind(globalThis);
-    this.originalXHROpen = XMLHttpRequest.prototype.open;
-    this.originalXHRSend = XMLHttpRequest.prototype.send;
+    //
+    // Keep the UNBOUND functions too: @buoy-gg/network stamps `__buoy*` marker
+    // properties on its interceptors and re-installs when the marker vanishes
+    // from the live global — and `.bind()` drops own properties, so the
+    // markers must be read off the unbound originals and carried forward onto
+    // our wrappers (see below).
+    const wrappedFetch = globalThis.fetch;
+    const wrappedXHROpen = XMLHttpRequest.prototype.open;
+    const wrappedXHRSend = XMLHttpRequest.prototype.send;
+    this.originalFetch = wrappedFetch.bind(globalThis);
+    this.originalXHROpen = wrappedXHROpen;
+    this.originalXHRSend = wrappedXHRSend;
     const self = this;
 
     // =======================================================================
     // PATCH FETCH
     // =======================================================================
-    globalThis.fetch = async function (input, init) {
+    const patchedFetch = async function (input, init) {
       const url = self.extractUrl(input);
       if (self.shouldInjectHeader(url)) {
         // Create new headers with impersonation header added
@@ -171,13 +202,16 @@ class ImpersonateListener {
       // Not injecting - call original fetch as-is
       return self.originalFetch(input, init);
     };
+    carryBuoyMarkers(patchedFetch, wrappedFetch);
+    this.patchedFetch = patchedFetch;
+    globalThis.fetch = this.patchedFetch;
 
     // =======================================================================
     // PATCH XMLHttpRequest
     // =======================================================================
 
     // Patch open() to store the URL for later use in send()
-    XMLHttpRequest.prototype.open = function (method, url, async = true, username, password) {
+    const patchedOpen = function (method, url, async = true, username, password) {
       const xhr = this;
       xhr._impersonateUrl = typeof url === "string" ? url : url.href;
       const urlStr = typeof url === "string" ? url : url.toString();
@@ -185,7 +219,7 @@ class ImpersonateListener {
     };
 
     // Patch send() to inject header before sending
-    XMLHttpRequest.prototype.send = function (body) {
+    const patchedSend = function (body) {
       const xhr = this;
       if (xhr._impersonateUrl && self.shouldInjectHeader(xhr._impersonateUrl)) {
         // Inject the impersonation header
@@ -193,6 +227,12 @@ class ImpersonateListener {
       }
       return self.originalXHRSend.call(this, body);
     };
+    carryBuoyMarkers(patchedOpen, wrappedXHROpen);
+    carryBuoyMarkers(patchedSend, wrappedXHRSend);
+    this.patchedXHROpen = patchedOpen;
+    this.patchedXHRSend = patchedSend;
+    XMLHttpRequest.prototype.open = this.patchedXHROpen;
+    XMLHttpRequest.prototype.send = this.patchedXHRSend;
     this.isListeningFlag = true;
   }
 
@@ -207,9 +247,24 @@ class ImpersonateListener {
     if (!this.isListeningFlag) {
       return;
     }
-    globalThis.fetch = this.originalFetch;
-    XMLHttpRequest.prototype.open = this.originalXHROpen;
-    XMLHttpRequest.prototype.send = this.originalXHRSend;
+
+    // Restore ONLY what is still literally ours: if another interceptor
+    // patched after us (the network tool re-asserting itself, a debugger),
+    // assigning our saved originals would silently wipe its patch. Leaving our
+    // wrapper in a foreign chain is safe — with no userId configured it is a
+    // pure pass-through.
+    if (this.patchedFetch && globalThis.fetch === this.patchedFetch) {
+      globalThis.fetch = this.originalFetch;
+    }
+    if (this.patchedXHROpen && XMLHttpRequest.prototype.open === this.patchedXHROpen) {
+      XMLHttpRequest.prototype.open = this.originalXHROpen;
+    }
+    if (this.patchedXHRSend && XMLHttpRequest.prototype.send === this.patchedXHRSend) {
+      XMLHttpRequest.prototype.send = this.originalXHRSend;
+    }
+    this.patchedFetch = null;
+    this.patchedXHROpen = null;
+    this.patchedXHRSend = null;
     this.isListeningFlag = false;
   }
 

package/lib/module/impersonate/components/DataNukeSettings.js

@@ -9,7 +9,7 @@
 
 import React, { useState, useEffect, useMemo } from "react";
 import { View, Text, TextInput, StyleSheet, Switch, ScrollView, TouchableOpacity } from "react-native";
-import { CollapsibleSection, buoyColors, Settings, AlertTriangle, Info, Zap, RefreshCw, Check, X, Copy, Eye, copyToClipboard } from "@buoy-gg/shared-ui";
+import { CollapsibleSection, buoyColors, night, Settings, AlertTriangle, Info, Zap, RefreshCw, Check, X, Copy, Eye, copyToClipboard } from "@buoy-gg/shared-ui";
 import { DataViewer } from "@buoy-gg/shared-ui/dataViewer";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const DEFAULT_HEADER_KEY = "x-impersonate-user-id";
@@ -50,7 +50,7 @@ function ToggleRow({
             color: buoyColors.success
           }) : /*#__PURE__*/_jsx(X, {
             size: 10,
-            color: buoyColors.textMuted
+            color: night.color.textTertiary
           }), /*#__PURE__*/_jsx(Text, {
             style: [styles.detectedText, detected ? styles.detectedTextActive : styles.detectedTextInactive],
             children: detected ? "Detected" : "Not Detected"
@@ -59,7 +59,7 @@ function ToggleRow({
           style: styles.recommendedBadge,
           children: [/*#__PURE__*/_jsx(Zap, {
             size: 10,
-            color: buoyColors.primary
+            color: night.color.accent
           }), /*#__PURE__*/_jsx(Text, {
             style: styles.recommendedText,
             children: "Recommended"
@@ -73,10 +73,10 @@ function ToggleRow({
       value: value,
       onValueChange: onChange,
       trackColor: {
-        false: buoyColors.border,
-        true: dangerous ? buoyColors.warning + "50" : buoyColors.primary + "50"
+        false: night.color.border,
+        true: dangerous ? night.color.warning + "50" : night.color.accent + "50"
       },
-      thumbColor: value ? dangerous ? buoyColors.warning : buoyColors.primary : buoyColors.textMuted
+      thumbColor: value ? dangerous ? night.color.warning : night.color.accent : night.color.knob
     })]
   });
 }
@@ -186,7 +186,7 @@ export function DataNukeSettings({
             onPress: handleDiscard,
             children: [/*#__PURE__*/_jsx(X, {
               size: 14,
-              color: buoyColors.textSecondary
+              color: night.color.textSecondary
             }), /*#__PURE__*/_jsx(Text, {
               style: styles.discardButtonText,
               children: "Discard"
@@ -196,7 +196,7 @@ export function DataNukeSettings({
             onPress: handleSave,
             children: [/*#__PURE__*/_jsx(Check, {
               size: 14,
-              color: "#fff"
+              color: night.color.onAccent
             }), /*#__PURE__*/_jsx(Text, {
               style: styles.saveButtonText,
               children: "Save"
@@ -219,7 +219,7 @@ export function DataNukeSettings({
           value: localHeaderKey,
           onChangeText: setLocalHeaderKey,
           placeholder: "x-impersonate-user-id",
-          placeholderTextColor: buoyColors.textMuted,
+          placeholderTextColor: night.color.placeholder,
           autoCapitalize: "none",
           autoCorrect: false
         }), /*#__PURE__*/_jsxs(View, {
@@ -316,7 +316,7 @@ export function DataNukeSettings({
           style: styles.warningCard,
           children: [/*#__PURE__*/_jsx(AlertTriangle, {
             size: 16,
-            color: buoyColors.warning
+            color: night.color.warning
           }), /*#__PURE__*/_jsxs(View, {
             style: styles.warningContent,
             children: [/*#__PURE__*/_jsx(Text, {
@@ -334,7 +334,7 @@ export function DataNukeSettings({
       onPress: handleRestoreDefaults,
       children: [/*#__PURE__*/_jsx(RefreshCw, {
         size: 14,
-        color: buoyColors.textSecondary
+        color: night.color.textSecondary
       }), /*#__PURE__*/_jsx(Text, {
         style: styles.restoreButtonText,
         children: "Restore Defaults"
@@ -399,7 +399,7 @@ export function DataNukeSettings({
           }) : /*#__PURE__*/_jsxs(_Fragment, {
             children: [/*#__PURE__*/_jsx(Copy, {
               size: 14,
-              color: buoyColors.primary
+              color: night.color.accent
             }), /*#__PURE__*/_jsx(Text, {
               style: styles.copyButtonText,
               children: "Copy Config"
@@ -420,10 +420,10 @@ const styles = StyleSheet.create({
     paddingBottom: 32
   },
   actionBar: {
-    backgroundColor: buoyColors.primary + "15",
+    backgroundColor: night.color.accentSoft,
     borderRadius: 10,
     borderWidth: 1,
-    borderColor: buoyColors.primary + "30",
+    borderColor: night.color.accentBorder,
     padding: 12
   },
   actionBarContent: {
@@ -434,7 +434,7 @@ const styles = StyleSheet.create({
   unsavedText: {
     fontSize: 13,
     fontWeight: "500",
-    color: buoyColors.primary
+    color: night.color.accent
   },
   actionButtons: {
     flexDirection: "row",
@@ -444,7 +444,7 @@ const styles = StyleSheet.create({
     flexDirection: "row",
     alignItems: "center",
     gap: 6,
-    backgroundColor: buoyColors.primary,
+    backgroundColor: night.color.accent,
     paddingHorizontal: 14,
     paddingVertical: 8,
     borderRadius: 6
@@ -452,23 +452,24 @@ const styles = StyleSheet.create({
   saveButtonText: {
     fontSize: 13,
     fontWeight: "600",
-    color: "#fff"
+    // Ink on a filled accent surface — the night accent takes dark ink.
+    color: night.color.onAccent
   },
   discardButton: {
     flexDirection: "row",
     alignItems: "center",
     gap: 6,
-    backgroundColor: buoyColors.hover,
+    backgroundColor: night.color.surfaceElevated,
     paddingHorizontal: 14,
     paddingVertical: 8,
     borderRadius: 6,
     borderWidth: 1,
-    borderColor: buoyColors.border
+    borderColor: night.color.border
   },
   discardButtonText: {
     fontSize: 13,
     fontWeight: "500",
-    color: buoyColors.textSecondary
+    color: night.color.textSecondary
   },
   restoreButton: {
     flexDirection: "row",
@@ -478,31 +479,31 @@ const styles = StyleSheet.create({
     paddingVertical: 12,
     borderRadius: 8,
     borderWidth: 1,
-    borderColor: buoyColors.border,
+    borderColor: night.color.border,
     borderStyle: "dashed"
   },
   restoreButtonText: {
     fontSize: 13,
-    color: buoyColors.textSecondary
+    color: night.color.textSecondary
   },
   sectionContent: {
     paddingTop: 8
   },
   sectionDescription: {
     fontSize: 13,
-    color: buoyColors.textSecondary,
+    color: night.color.textSecondary,
     lineHeight: 18,
     marginBottom: 14
   },
   togglesCard: {
-    backgroundColor: buoyColors.card,
+    backgroundColor: night.color.surface,
     borderRadius: 10,
     borderWidth: 1,
-    borderColor: buoyColors.border,
+    borderColor: night.color.border,
     padding: 4
   },
   dangerousCard: {
-    borderColor: buoyColors.warning + "30"
+    borderColor: night.color.warning + "30"
   },
   advancedSection: {
     marginTop: 16
@@ -510,7 +511,7 @@ const styles = StyleSheet.create({
   advancedLabel: {
     fontSize: 11,
     fontWeight: "600",
-    color: buoyColors.textMuted,
+    color: night.color.textTertiary,
     textTransform: "uppercase",
     letterSpacing: 0.5,
     marginBottom: 8,
@@ -519,18 +520,18 @@ const styles = StyleSheet.create({
   inputLabel: {
     fontSize: 12,
     fontWeight: "600",
-    color: buoyColors.textSecondary,
+    color: night.color.textSecondary,
     marginBottom: 8
   },
   input: {
     height: 42,
-    backgroundColor: buoyColors.hover,
+    backgroundColor: night.color.surfaceElevated,
     borderRadius: 8,
     borderWidth: 1,
-    borderColor: buoyColors.border,
+    borderColor: night.color.border,
     paddingHorizontal: 14,
     fontSize: 14,
-    color: buoyColors.text,
+    color: night.color.text,
     fontFamily: "monospace"
   },
   inputFooter: {
@@ -543,7 +544,7 @@ const styles = StyleSheet.create({
   helperText: {
     flex: 1,
     fontSize: 12,
-    color: buoyColors.textMuted,
+    color: night.color.textTertiary,
     lineHeight: 16
   },
   resetLink: {
@@ -551,7 +552,7 @@ const styles = StyleSheet.create({
   },
   resetLinkText: {
     fontSize: 12,
-    color: buoyColors.primary,
+    color: night.color.accent,
     fontWeight: "500"
   },
   toggleRow: {
@@ -574,16 +575,16 @@ const styles = StyleSheet.create({
   toggleLabel: {
     fontSize: 14,
     fontWeight: "500",
-    color: buoyColors.text
+    color: night.color.text
   },
   dangerousLabel: {
-    color: buoyColors.warning
+    color: night.color.warning
   },
   recommendedBadge: {
     flexDirection: "row",
     alignItems: "center",
     gap: 4,
-    backgroundColor: buoyColors.primary + "15",
+    backgroundColor: night.color.accentSoft,
     paddingHorizontal: 8,
     paddingVertical: 3,
     borderRadius: 4
@@ -591,7 +592,7 @@ const styles = StyleSheet.create({
   recommendedText: {
     fontSize: 10,
     fontWeight: "600",
-    color: buoyColors.primary
+    color: night.color.accent
   },
   detectedBadge: {
     flexDirection: "row",
@@ -605,7 +606,7 @@ const styles = StyleSheet.create({
     backgroundColor: buoyColors.success + "15"
   },
   detectedBadgeInactive: {
-    backgroundColor: buoyColors.textMuted + "15"
+    backgroundColor: night.color.textTertiary + "15"
   },
   detectedText: {
     fontSize: 10,
@@ -615,16 +616,16 @@ const styles = StyleSheet.create({
     color: buoyColors.success
   },
   detectedTextInactive: {
-    color: buoyColors.textMuted
+    color: night.color.textTertiary
   },
   toggleDescription: {
     fontSize: 12,
-    color: buoyColors.textMuted,
+    color: night.color.textTertiary,
     lineHeight: 16
   },
   divider: {
     height: 1,
-    backgroundColor: buoyColors.border,
+    backgroundColor: night.color.separator,
     marginHorizontal: 12
   },
   warningCard: {
@@ -632,10 +633,10 @@ const styles = StyleSheet.create({
     flexDirection: "row",
     alignItems: "flex-start",
     gap: 12,
-    backgroundColor: buoyColors.warning + "10",
+    backgroundColor: night.color.warningSoft,
     borderRadius: 10,
     borderWidth: 1,
-    borderColor: buoyColors.warning + "25",
+    borderColor: night.color.warning + "25",
     padding: 14
   },
   warningContent: {
@@ -644,17 +645,17 @@ const styles = StyleSheet.create({
   warningTitle: {
     fontSize: 13,
     fontWeight: "600",
-    color: buoyColors.warning,
+    color: night.color.warning,
     marginBottom: 4
   },
   warningText: {
     fontSize: 12,
-    color: buoyColors.textSecondary,
+    color: night.color.textSecondary,
     lineHeight: 17
   },
   infoText: {
     fontSize: 13,
-    color: buoyColors.textSecondary,
+    color: night.color.textSecondary,
     lineHeight: 19
   },
   infoTextSpaced: {
@@ -662,30 +663,31 @@ const styles = StyleSheet.create({
   },
   codeBlock: {
     marginTop: 14,
-    backgroundColor: buoyColors.base,
+    // Inset code box — darker than the card, the night track color.
+    backgroundColor: night.color.bg,
     borderRadius: 8,
     padding: 14
   },
   codeComment: {
     fontSize: 12,
-    color: buoyColors.textMuted,
+    color: night.color.textTertiary,
     fontFamily: "monospace",
     marginBottom: 6
   },
   codeText: {
     fontSize: 13,
-    color: buoyColors.text,
+    color: night.color.text,
     fontFamily: "monospace"
   },
   codeValue: {
-    color: buoyColors.primary
+    color: night.color.accent
   },
   dataViewerContainer: {
     marginTop: 12,
     borderRadius: 8,
     overflow: "hidden",
     borderWidth: 1,
-    borderColor: buoyColors.border
+    borderColor: night.color.border
   },
   copyButton: {
     flexDirection: "row",
@@ -693,17 +695,17 @@ const styles = StyleSheet.create({
     justifyContent: "center",
     gap: 8,
     marginTop: 14,
-    backgroundColor: buoyColors.primary + "15",
+    backgroundColor: night.color.accentSoft,
     paddingVertical: 10,
     paddingHorizontal: 16,
     borderRadius: 8,
     borderWidth: 1,
-    borderColor: buoyColors.primary + "30"
+    borderColor: night.color.accentBorder
   },
   copyButtonText: {
     fontSize: 13,
     fontWeight: "600",
-    color: buoyColors.primary
+    color: night.color.accent
   },
   copySuccessText: {
     color: buoyColors.success