@multiplayer-app/session-recorder-react-native 1.0.0 → 1.0.1-beta.10

package/src/components/SessionRecorderWidget/SessionRecorderWidget.tsx

@@ -0,0 +1,150 @@
+import React, { useState, useCallback, memo } from 'react';
+import { View, StyleSheet } from 'react-native';
+import { SessionState } from '../../types';
+import { SessionType } from '@multiplayer-app/session-recorder-common';
+import { useSessionRecorder } from '../../context/SessionRecorderContext';
+
+import FinalPopover from './FinalPopover';
+import ModalContainer from './ModalContainer';
+import InitialPopover from './InitialPopover';
+import FloatingButton from './FloatingButton';
+import ErrorBanner from './ErrorBanner';
+import { logger } from '../../utils';
+import { useSessionRecorderStore } from '../../context/useSessionRecorderStore';
+import { sessionRecorderStore } from '../../context/SessionRecorderStore';
+
+interface SessionRecorderWidgetProps {}
+
+const SessionRecorderWidget: React.FC<SessionRecorderWidgetProps> = memo(() => {
+  const { instance, openWidgetModal, closeWidgetModal } = useSessionRecorder();
+  const isOnline = useSessionRecorderStore<boolean>((s) => s.isOnline);
+  const sessionType = useSessionRecorderStore<SessionType | null>(
+    (s) => s.sessionType
+  );
+  const isModalVisible = useSessionRecorderStore<boolean>(
+    (s) => s.isWidgetModalVisible
+  );
+  const sessionState = useSessionRecorderStore<SessionState | null>(
+    (s) => s.sessionState
+  );
+  const error = useSessionRecorderStore<string | null>((s) => s.error);
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  // Get configuration from instance
+  const { widget, showContinuousRecording } = instance.config;
+
+  const dismissError = useCallback(() => {
+    sessionRecorderStore.setState({ error: null });
+  }, []);
+
+  const handleError = useCallback((error: any, message: string) => {
+    const errorMessage = error instanceof Error ? error.message : message;
+    logger.error('SessionRecorderWidget', message, error);
+    sessionRecorderStore.setState({ error: errorMessage });
+  }, []);
+
+  const onStartRecording = useCallback(
+    async (sessionType: SessionType) => {
+      if (!isOnline) {
+        handleError(
+          new Error('Cannot start recording while offline'),
+          'Cannot start recording while offline'
+        );
+        return;
+      }
+      try {
+        await instance.start(sessionType);
+        closeWidgetModal();
+      } catch (error) {
+        handleError(error, 'Failed to start recording');
+      }
+    },
+    [isOnline, handleError]
+  );
+
+  const onStopRecording = useCallback(
+    async (comment?: string) => {
+      try {
+        setIsSubmitting(true);
+        await instance.stop(comment);
+        closeWidgetModal();
+      } catch (error) {
+        handleError(error, 'Failed to stop recording');
+      } finally {
+        setIsSubmitting(false);
+      }
+    },
+    [handleError]
+  );
+
+  const onCancelSession = useCallback(async () => {
+    try {
+      await instance.cancel();
+      closeWidgetModal();
+    } catch (error) {
+      handleError(error, 'Failed to cancel session');
+    }
+  }, [handleError]);
+
+  const onSaveContinuousSession = useCallback(async () => {
+    try {
+      await instance.save();
+    } catch (error) {
+      handleError(error, 'Failed to save continuous session');
+    }
+  }, [handleError]);
+
+  const isStarted =
+    sessionState === SessionState.started ||
+    sessionState === SessionState.paused;
+  const isContinuous = sessionType === SessionType.CONTINUOUS;
+
+  return (
+    <>
+      {widget.button?.visible && (
+        <View pointerEvents="box-none" style={styles.overlayContainer}>
+          <FloatingButton
+            sessionState={sessionState}
+            onPress={openWidgetModal}
+          />
+        </View>
+      )}
+      <ModalContainer isVisible={isModalVisible} onClose={closeWidgetModal}>
+        {isStarted && !isContinuous ? (
+          <FinalPopover
+            isOnline={isOnline}
+            isSubmitting={isSubmitting}
+            textOverrides={widget.textOverrides}
+            onClose={closeWidgetModal}
+            onStopRecording={onStopRecording}
+            onCancelSession={onCancelSession}
+          >
+            {error && <ErrorBanner error={error} onDismiss={dismissError} />}
+          </FinalPopover>
+        ) : (
+          <InitialPopover
+            isOnline={isOnline}
+            isSubmitting={isSubmitting}
+            textOverrides={widget.textOverrides}
+            isContinuous={isStarted && isContinuous}
+            showContinuousRecording={showContinuousRecording}
+            onClose={closeWidgetModal}
+            onStopRecording={onStopRecording}
+            onStartRecording={onStartRecording}
+            onSaveContinuousSession={onSaveContinuousSession}
+          >
+            {error && <ErrorBanner error={error} onDismiss={dismissError} />}
+          </InitialPopover>
+        )}
+      </ModalContainer>
+    </>
+  );
+});
+
+export default SessionRecorderWidget;
+
+const styles = StyleSheet.create({
+  overlayContainer: {
+    ...StyleSheet.absoluteFillObject,
+  },
+});

package/src/components/SessionRecorderWidget/icons.tsx

@@ -0,0 +1,80 @@
+import React from 'react';
+import Svg, { Path, Circle } from 'react-native-svg';
+
+interface IconProps {
+  size?: number;
+  color?: string;
+}
+
+export const RecordIcon: React.FC<IconProps> = ({
+  size = 19,
+  color = 'white',
+}) => (
+  <Svg width={size} height={size} viewBox="0 0 19 19" fill="none">
+    <Path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M6.68926 5.30356C6.56568 5.38721 6.39976 5.37561 6.29459 5.26937L3.58782 2.53477C3.46424 2.40992 3.47196 2.20492 3.60862 2.09483C5.2319 0.786982 7.28494 0 9.51866 0C11.7535 0 13.8066 0.787042 15.4308 2.09586C15.5674 2.20596 15.5752 2.41091 15.4516 2.53577L12.7468 5.26931C12.6416 5.37558 12.4757 5.38719 12.3521 5.30353C11.5393 4.75345 10.571 4.42281 9.52066 4.42281C8.47036 4.42281 7.50203 4.75346 6.68926 5.30356ZM16.4926 3.4303C16.6163 3.30527 16.8197 3.31303 16.9288 3.45121C18.2224 5.08933 19.0001 7.15932 19.0001 9.4116C19.0001 11.6671 18.2204 13.7392 16.9238 15.3785C16.8147 15.5165 16.6114 15.5242 16.4877 15.3992L13.7872 12.6701C13.682 12.5638 13.6708 12.3962 13.7538 12.2716C14.3006 11.451 14.6291 10.4727 14.6291 9.4116C14.6291 8.35454 14.3016 7.37925 13.756 6.56083C13.6728 6.43616 13.6841 6.26857 13.7893 6.16224L16.4926 3.4303ZM5.21676 12.6712C5.322 12.5649 5.3333 12.3974 5.2502 12.2727C4.70331 11.4522 4.374 10.4737 4.374 9.41184C4.374 8.35469 4.70232 7.37949 5.24808 6.56106C5.33123 6.43637 5.31996 6.26872 5.2147 6.16241L2.50855 3.4293C2.38482 3.30434 2.18146 3.31213 2.07236 3.45028C0.77864 5.08841 0 7.15845 0 9.41184C0 11.6684 0.78066 13.7406 2.07831 15.3799C2.18749 15.5178 2.39066 15.5255 2.51429 15.4006L5.21676 12.6712ZM12.3323 13.707C12.4559 13.6231 12.6221 13.6346 12.7273 13.741L15.4277 16.4691C15.5513 16.594 15.5435 16.7991 15.4068 16.9091C13.7837 18.215 11.7327 19 9.49998 19C7.2693 19 5.21837 18.2159 3.59619 16.9102C3.45943 16.8001 3.45169 16.595 3.57533 16.4702L6.27769 13.7409C6.38296 13.6346 6.54906 13.6231 6.67267 13.707C7.48459 14.2577 8.45278 14.5883 9.50198 14.5883C10.5522 14.5883 11.5204 14.2578 12.3323 13.707Z"
+      fill={color}
+    />
+  </Svg>
+);
+
+export const CapturingIcon: React.FC<IconProps> = ({
+  size = 24,
+  color = 'white',
+}) => (
+  <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
+    <Circle cx="12" cy="12" r="4" fill={color} />
+    <Circle cx="12" cy="12" r="7.5" stroke={color} strokeWidth="1" />
+    <Circle
+      cx="12"
+      cy="12"
+      r="11.5"
+      stroke={color}
+      strokeWidth="1"
+      opacity="0.2"
+    />
+  </Svg>
+);
+
+export const PausedIcon: React.FC<IconProps> = ({
+  size = 24,
+  color = 'white',
+}) => (
+  <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
+    <Path
+      d="M8 5V19M16 5V19"
+      stroke={color}
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    />
+  </Svg>
+);
+
+export const CheckmarkIcon: React.FC<IconProps> = ({
+  size = 24,
+  color = 'white',
+}) => (
+  <Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
+    <Path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M20.0481 6.35147C20.5168 6.8201 20.5168 7.5799 20.0481 8.04853L10.4481 17.6485C9.97951 18.1172 9.21971 18.1172 8.75108 17.6485L3.95108 12.8485C3.48245 12.3799 3.48245 11.6201 3.95108 11.1515C4.41971 10.6828 5.17951 10.6828 5.64814 11.1515L9.59961 15.1029L18.3511 6.35147C18.8197 5.88284 19.5795 5.88284 20.0481 6.35147Z"
+      fill={color}
+    />
+  </Svg>
+);
+
+export const LogoIcon: React.FC<IconProps> = ({
+  size = 30,
+  color = '#473CFB',
+}) => (
+  <Svg width={size} height={size * 0.8} viewBox="0 0 30 24" fill="none">
+    <Path
+      d="M28.8324 8.83643L23.5495 6.85854L21.4856 6.08553L23.6001 0.4375L15 3.65769L6.39963 0.4375L8.51441 6.08585L6.45046 6.85885L1.16757 8.83674L0.625 9.03974L9.10095 12.0981C10.0891 12.4548 10.9201 13.1265 11.4758 13.9952C11.6632 14.2883 11.8194 14.6036 11.9398 14.9369L15 23.4076L18.0602 14.9369C18.1806 14.6036 18.3368 14.288 18.5242 13.9952C19.0802 13.1265 19.9112 12.4545 20.8991 12.0981L29.375 9.03974L28.8324 8.83674V8.83643ZM19.779 10.6434C18.2872 11.1816 17.1126 12.3563 16.5744 13.848L15.014 18.173L11.5182 8.83643L10.7776 6.85854L10.2456 5.43757L9.57367 3.64272L12.3068 4.66612L18.1631 6.85885L20.8233 7.85481L23.4457 8.83674L24.104 9.08308L19.779 10.6438V10.6434Z"
+      fill={color}
+    />
+  </Svg>
+);

package/src/components/SessionRecorderWidget/index.ts

@@ -0,0 +1,3 @@
+import SessionRecorderWidget from './SessionRecorderWidget';
+
+export default SessionRecorderWidget;

package/src/components/SessionRecorderWidget/styles.ts

@@ -0,0 +1,168 @@
+import { StyleSheet } from 'react-native';
+
+export const sharedStyles = StyleSheet.create({
+  // Popover styles
+  popoverContent: {
+    flex: 1,
+    paddingHorizontal: 0,
+  },
+  popoverHeader: {
+    flexDirection: 'column',
+    paddingBottom: 8,
+    paddingHorizontal: 16,
+    borderTopLeftRadius: 20,
+    borderTopRightRadius: 20,
+    backgroundColor: '#f4f9ff',
+    shadowColor: '#f4f9ff',
+    shadowOffset: { width: 0, height: 5 },
+    shadowOpacity: 1,
+    shadowRadius: 5,
+    elevation: 10,
+  },
+  modalHandle: {
+    marginTop: 8,
+    marginBottom: 16,
+    width: 40,
+    height: 4,
+    backgroundColor: '#D1D5DB',
+    borderRadius: 2,
+    alignSelf: 'center',
+  },
+  popoverHeaderContent: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'flex-start',
+  },
+
+  cancelButton: {
+    paddingHorizontal: 12,
+    paddingVertical: 6,
+    borderRadius: 6,
+    borderWidth: 1,
+    borderColor: '#e1e8f1',
+    backgroundColor: '#fff',
+    shadowColor: '#000',
+    shadowOffset: { width: 0, height: 2 },
+    shadowOpacity: 0.06,
+    shadowRadius: 3,
+    elevation: 3,
+  },
+  cancelButtonText: {
+    color: '#374151',
+    fontSize: 14,
+    fontWeight: '500',
+  },
+  popoverBody: {
+    flex: 1,
+    padding: 16,
+    paddingTop: 24,
+  },
+  title: {
+    fontSize: 18,
+    fontWeight: '600',
+    color: '#2d3748',
+    marginBottom: 12,
+  },
+  description: {
+    fontSize: 14,
+    color: '#718096',
+    marginBottom: 16,
+  },
+  popoverFooter: {
+    marginTop: 'auto',
+    paddingTop: 16,
+  },
+  actionButton: {
+    paddingVertical: 16,
+    paddingHorizontal: 24,
+    borderRadius: 12,
+    alignItems: 'center',
+  },
+  actionButtonText: {
+    color: 'white',
+    fontSize: 16,
+    fontWeight: '500',
+  },
+
+  // Continuous recording styles
+  continuousRecordingSection: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    marginBottom: 20,
+    paddingVertical: 12,
+    paddingHorizontal: 16,
+    borderWidth: 1,
+    borderColor: '#e1e8f1',
+    backgroundColor: '#fff',
+    borderRadius: 12,
+    shadowColor: '#000',
+    shadowOffset: { width: 0, height: 2 },
+    shadowOpacity: 0.06,
+    shadowRadius: 3,
+    elevation: 3,
+  },
+
+  continuousRecordingLabel: {
+    fontSize: 16,
+    fontWeight: '500',
+    color: '#374151',
+  },
+
+  continuousOverlay: {
+    borderRadius: 12,
+    borderWidth: 1,
+    borderColor: '#e1e8f1',
+    backgroundColor: '#fff',
+    padding: 12,
+    shadowColor: '#000',
+    shadowOffset: { width: 0, height: 2 },
+    shadowOpacity: 0.06,
+    shadowRadius: 3,
+    elevation: 3,
+    flexDirection: 'column',
+    gap: 8,
+  },
+
+  continuousOverlayHeader: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: 8,
+  },
+
+  continuousOverlayTitle: {
+    fontSize: 14,
+    fontWeight: '500',
+    color: '#2d3748',
+  },
+
+  continuousOverlayDescription: {
+    fontSize: 14,
+    color: '#718096',
+    lineHeight: 20,
+  },
+
+  // Comment input styles
+  commentInput: {
+    borderWidth: 1,
+    borderColor: '#D1D5DB',
+    borderRadius: 8,
+    padding: 12,
+    fontSize: 16,
+    color: '#374151',
+    backgroundColor: '#F9FAFB',
+    marginBottom: 24,
+    minHeight: 80,
+  },
+
+  // Button color variants
+  startButton: {
+    backgroundColor: '#473cfb',
+  },
+  stopButton: {
+    backgroundColor: '#473cfb',
+  },
+  saveButton: {
+    backgroundColor: '#473cfb',
+  },
+});

package/src/config/constants.ts

@@ -0,0 +1,67 @@
+export const OTEL_MP_SAMPLE_TRACE_RATIO = 0.15;
+
+export const SESSION_ID_PROP_NAME = 'multiplayer-session-id';
+
+export const SESSION_SHORT_ID_PROP_NAME = 'multiplayer-session-short-id';
+
+export const SESSION_CONTINUOUS_DEBUGGING_PROP_NAME =
+  'multiplayer-session-continuous-debugging';
+
+export const SESSION_STATE_PROP_NAME = 'multiplayer-session-state';
+
+export const SESSION_TYPE_PROP_NAME = 'multiplayer-session-type';
+
+export const SESSION_PROP_NAME = 'multiplayer-session-data';
+
+export const SESSION_STARTED_EVENT = 'debug-session:started';
+
+export const SESSION_STOPPED_EVENT = 'debug-session:stopped';
+
+export const SESSION_SUBSCRIBE_EVENT = 'debug-session:subscribe';
+
+export const SESSION_UNSUBSCRIBE_EVENT = 'debug-session:unsubscribe';
+
+export const SESSION_AUTO_CREATED = 'debug-session:auto-created';
+
+export const SESSION_ADD_EVENT = 'debug-session:rrweb:add-event';
+
+export const DEFAULT_MAX_HTTP_CAPTURING_PAYLOAD_SIZE = 100000;
+
+export const SESSION_RESPONSE = 'multiplayer-debug-session-response';
+
+export const CONTINUOUS_DEBUGGING_TIMEOUT = 60000; // 1 minutes
+
+export const DEBUG_SESSION_MAX_DURATION_SECONDS = 10 * 60 + 30; // TODO: move to shared config otel core
+
+// // Package version - injected by webpack during build
+// declare const PACKAGE_VERSION: string
+// export const PACKAGE_VERSION_EXPORT = PACKAGE_VERSION || '1.0.0'
+
+// Regex patterns for OpenTelemetry ignore URLs
+export const OTEL_IGNORE_URLS = [
+  // Traces endpoint
+  /.*\/v1\/traces/,
+  // Debug sessions endpoints
+  /.*\/v0\/radar\/debug-sessions\/start\/?$/,
+  /.*\/v0\/radar\/debug-sessions\/[^/]+\/stop\/?$/,
+  /.*\/v0\/radar\/debug-sessions\/[^/]+\/cancel\/?$/,
+
+  // Continuous debug sessions endpoints
+  /.*\/v0\/radar\/continuous-debug-sessions\/start\/?$/,
+  /.*\/v0\/radar\/continuous-debug-sessions\/[^/]+\/save\/?$/,
+  /.*\/v0\/radar\/continuous-debug-sessions\/[^/]+\/cancel\/?$/,
+
+  // Remote debug session endpoint
+  /.*\/v0\/radar\/remote-debug-session\/check\/?$/,
+
+  // Connectivity probe endpoints (avoid noisy spans)
+  /https:\/\/clients3\.google\.com\/generate_204/,
+  /http:\/\/clients3\.google\.com\/generate_204/,
+  /http(s)?:\/\/www\.google\.com\/generate_204/,
+  /http(s)?:\/\/connectivitycheck\.android\.com\/generate_204/,
+  /http(s)?:\/\/connectivitycheck\.gstatic\.com\/generate_204/,
+  /http(s)?:\/\/captive\.apple\.com/,
+
+  // Or use a more general pattern to catch all radar API endpoints
+  // /.*\/v0\/radar\/.*/
+];

package/src/config/defaults.ts

@@ -0,0 +1,105 @@
+import {
+  SessionRecorderSdk,
+  MULTIPLAYER_BASE_API_URL,
+  MULTIPLAYER_OTEL_DEFAULT_TRACES_EXPORTER_HTTP_URL,
+} from '@multiplayer-app/session-recorder-common';
+import {
+  LogLevel,
+  WidgetButtonPlacement,
+  type SessionRecorderConfigs,
+} from '../types';
+import {
+  OTEL_MP_SAMPLE_TRACE_RATIO,
+  DEFAULT_MAX_HTTP_CAPTURING_PAYLOAD_SIZE,
+} from './constants';
+
+const { mask, sensitiveFields, sensitiveHeaders } = SessionRecorderSdk;
+
+export const DEFAULT_MASKING_CONFIG: SessionRecorderConfigs['masking'] = {
+  isContentMaskingEnabled: true,
+  maskBody: mask(sensitiveFields),
+  maskHeaders: mask(sensitiveHeaders),
+  maskBodyFieldsList: sensitiveFields,
+  maskHeadersList: sensitiveHeaders,
+  headersToInclude: [],
+  headersToExclude: [],
+  // Screen masking options
+  maskImages: false,
+  maskLabels: false,
+  maskButtons: false,
+  maskWebViews: false,
+  maskTextInputs: true,
+  maskSandboxedViews: false,
+};
+
+export const DEFAULT_WIDGET_TEXT_CONFIG: SessionRecorderConfigs['widget']['textOverrides'] =
+  {
+    initialTitleWithContinuous: 'Encountered an issue?',
+    initialTitleWithoutContinuous: 'Encountered an issue?',
+    initialDescriptionWithContinuous:
+      'Record your session so we can see the problem and fix it faster.',
+    initialDescriptionWithoutContinuous:
+      'Record your session so we can see the problem and fix it faster.',
+    continuousRecordingLabel: 'Continuous recording',
+    startRecordingButtonText: 'Start recording',
+    finalTitle: 'Done recording?',
+    finalDescription:
+      'You can also add a quick note with extra context, expectations, or questions. Thank you!',
+    commentPlaceholder: 'Add a message...',
+    saveButtonText: 'Submit recording',
+    cancelButtonText: 'Cancel recording',
+    continuousOverlayTitle: 'Save time, skip the reproductions',
+    continuousOverlayDescription:
+      'We keep a rolling record of your recent activity. If something doesn’t work as expected, just save the recording and continue working. No need to worry about exceptions and errors - we automatically save recordings for those!',
+    saveLastSnapshotButtonText: 'Save recording',
+    submitDialogTitle: 'Save recording',
+    submitDialogSubtitle:
+      'This full-stack session recording will be saved directly to your selected Multiplayer project. All data is automatically correlated end-to-end.',
+    submitDialogCommentLabel: 'You can also add context, comments, or notes.',
+    submitDialogCommentPlaceholder: 'Add a message...',
+    submitDialogSubmitText: 'Save',
+    submitDialogCancelText: 'Cancel',
+  };
+
+export const BASE_CONFIG: SessionRecorderConfigs = {
+  apiKey: '',
+
+  version: '',
+  application: '',
+  environment: '',
+
+  showContinuousRecording: true,
+
+  widget: {
+    enabled: true,
+    button: {
+      visible: true,
+      placement: WidgetButtonPlacement.bottomRight,
+    },
+    textOverrides: DEFAULT_WIDGET_TEXT_CONFIG,
+  },
+
+  apiBaseUrl: MULTIPLAYER_BASE_API_URL,
+  exporterEndpoint: MULTIPLAYER_OTEL_DEFAULT_TRACES_EXPORTER_HTTP_URL,
+
+  schemifyDocSpanPayload: true,
+
+  ignoreUrls: [],
+  propagateTraceHeaderCorsUrls: [],
+
+  sampleTraceRatio: OTEL_MP_SAMPLE_TRACE_RATIO,
+  maxCapturingHttpPayloadSize: DEFAULT_MAX_HTTP_CAPTURING_PAYLOAD_SIZE,
+
+  captureBody: true,
+  captureHeaders: true,
+  masking: DEFAULT_MASKING_CONFIG,
+
+  recordScreen: true,
+  recordGestures: true,
+  recordNavigation: true,
+
+  logger: {
+    enabled: false,
+    level: LogLevel.INFO,
+  },
+};

package/src/config/index.ts

@@ -0,0 +1,6 @@
+// Export all config-related functions and constants
+export * from './constants';
+export * from './defaults';
+export * from './validators';
+export * from './masking';
+export * from './session-recorder';

package/src/config/masking.ts

@@ -0,0 +1,60 @@
+import { type MaskingOptions, type SessionRecorderConfigs } from '../types';
+import { DEFAULT_MASKING_CONFIG } from './defaults';
+import { isValidArray, isValidBoolean, isValidFunction } from './validators';
+import { SessionRecorderSdk } from '@multiplayer-app/session-recorder-common';
+
+const { mask, sensitiveFields, sensitiveHeaders } = SessionRecorderSdk;
+
+export const getMaskingConfig = (
+  masking?: MaskingOptions
+): SessionRecorderConfigs['masking'] => {
+  const baseMasking = DEFAULT_MASKING_CONFIG;
+
+  if (typeof masking !== 'object') {
+    return baseMasking;
+  }
+
+  const maskHeadersList = isValidArray(
+    masking.maskHeadersList,
+    sensitiveHeaders
+  );
+  const maskBodyFieldsList = isValidArray(
+    masking.maskBodyFieldsList,
+    sensitiveFields
+  );
+
+  return {
+    maskHeadersList,
+    maskBodyFieldsList,
+    headersToInclude: isValidArray(
+      masking.headersToInclude,
+      baseMasking.headersToInclude
+    ),
+    headersToExclude: isValidArray(
+      masking.headersToExclude,
+      baseMasking.headersToExclude
+    ),
+    isContentMaskingEnabled: isValidBoolean(
+      masking.isContentMaskingEnabled,
+      baseMasking.isContentMaskingEnabled
+    ),
+    maskBody: isValidFunction(masking.maskBody, mask(maskBodyFieldsList)),
+    maskHeaders: isValidFunction(masking.maskHeaders, mask(maskHeadersList)),
+    // Screen masking options
+    maskTextInputs: isValidBoolean(
+      masking.maskTextInputs,
+      baseMasking.maskTextInputs
+    ),
+    maskImages: isValidBoolean(masking.maskImages, baseMasking.maskImages),
+    maskButtons: isValidBoolean(masking.maskButtons, baseMasking.maskButtons),
+    maskLabels: isValidBoolean(masking.maskLabels, baseMasking.maskLabels),
+    maskWebViews: isValidBoolean(
+      masking.maskWebViews,
+      baseMasking.maskWebViews
+    ),
+    maskSandboxedViews: isValidBoolean(
+      masking.maskSandboxedViews,
+      baseMasking.maskSandboxedViews
+    ),
+  };
+};