@luciq/react-native 19.4.0-44237-SNAPSHOT → 19.4.0-47504-SNAPSHOT
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +0 -118
- package/RNLuciq.podspec +2 -6
- package/android/build.gradle +0 -25
- package/android/proguard-rules.txt +1 -1
- package/android/src/main/java/ai/luciq/reactlibrary/RNLuciqAPMModule.java +12 -3
- package/android/src/main/java/ai/luciq/reactlibrary/RNLuciqBugReportingModule.java +24 -28
- package/android/src/main/java/ai/luciq/reactlibrary/RNLuciqCrashReportingModule.java +7 -18
- package/android/src/main/java/ai/luciq/reactlibrary/RNLuciqFeatureRequestsModule.java +2 -1
- package/android/src/main/java/ai/luciq/reactlibrary/RNLuciqNetworkLoggerModule.java +56 -29
- package/android/src/main/java/ai/luciq/reactlibrary/RNLuciqReactnativeModule.java +47 -78
- package/android/src/main/java/ai/luciq/reactlibrary/RNLuciqRepliesModule.java +16 -4
- package/android/src/main/java/ai/luciq/reactlibrary/RNLuciqSessionReplayModule.java +16 -5
- package/android/src/main/java/ai/luciq/reactlibrary/RNLuciqSurveysModule.java +15 -7
- package/android/src/main/java/ai/luciq/reactlibrary/utils/EventEmitterModule.java +7 -0
- package/dist/modules/BugReporting.js +3 -3
- package/dist/modules/Luciq.js +3 -2
- package/dist/modules/NetworkLogger.d.ts +0 -5
- package/dist/modules/NetworkLogger.js +9 -1
- package/dist/modules/Replies.js +1 -1
- package/dist/modules/Surveys.js +2 -2
- package/dist/native/NativeBugReporting.d.ts +4 -4
- package/dist/native/NativeCrashReporting.d.ts +2 -2
- package/dist/native/NativeLuciq.d.ts +3 -2
- package/dist/native/NativePackage.js +2 -25
- package/dist/native/NativeReplies.d.ts +1 -1
- package/dist/native/NativeSurveys.d.ts +2 -2
- package/dist/utils/Enums.js +1 -3
- package/dist/utils/FeatureFlags.d.ts +6 -0
- package/dist/utils/FeatureFlags.js +35 -0
- package/dist/utils/LuciqUtils.d.ts +1 -1
- package/dist/utils/LuciqUtils.js +9 -0
- package/dist/utils/XhrNetworkInterceptor.js +85 -53
- package/ios/RNLuciq/LuciqAPMBridge.h +5 -5
- package/ios/RNLuciq/{LuciqAPMBridge.mm → LuciqAPMBridge.m} +39 -48
- package/ios/RNLuciq/LuciqBugReportingBridge.h +6 -6
- package/ios/RNLuciq/LuciqBugReportingBridge.m +249 -0
- package/ios/RNLuciq/LuciqCrashReportingBridge.h +5 -16
- package/ios/RNLuciq/LuciqCrashReportingBridge.m +68 -0
- package/ios/RNLuciq/LuciqFeatureRequestsBridge.h +1 -1
- package/ios/RNLuciq/{LuciqFeatureRequestsBridge.mm → LuciqFeatureRequestsBridge.m} +16 -21
- package/ios/RNLuciq/LuciqNetworkLoggerBridge.h +30 -1
- package/ios/RNLuciq/{LuciqNetworkLoggerBridge.mm → LuciqNetworkLoggerBridge.m} +77 -46
- package/ios/RNLuciq/LuciqReactBridge.h +13 -13
- package/ios/RNLuciq/{LuciqReactBridge.mm → LuciqReactBridge.m} +34 -83
- package/ios/RNLuciq/LuciqRepliesBridge.h +3 -3
- package/ios/RNLuciq/LuciqRepliesBridge.m +80 -0
- package/ios/RNLuciq/LuciqSessionReplayBridge.h +5 -5
- package/ios/RNLuciq/{LuciqSessionReplayBridge.mm → LuciqSessionReplayBridge.m} +25 -35
- package/ios/RNLuciq/LuciqSurveysBridge.h +5 -5
- package/ios/RNLuciq/{LuciqSurveysBridge.mm → LuciqSurveysBridge.m} +35 -34
- package/package.json +1 -9
- package/scripts/get-github-app-token.sh +70 -0
- package/scripts/notify-github.sh +17 -8
- package/src/modules/BugReporting.ts +3 -3
- package/src/modules/Luciq.ts +4 -2
- package/src/modules/NetworkLogger.ts +26 -1
- package/src/modules/Replies.ts +1 -1
- package/src/modules/Surveys.ts +2 -2
- package/src/native/NativeBugReporting.ts +6 -3
- package/src/native/NativeCrashReporting.ts +2 -2
- package/src/native/NativeLuciq.ts +3 -2
- package/src/native/NativePackage.ts +2 -52
- package/src/native/NativeReplies.ts +1 -1
- package/src/native/NativeSurveys.ts +2 -2
- package/src/utils/Enums.ts +1 -4
- package/src/utils/FeatureFlags.ts +44 -0
- package/src/utils/LuciqUtils.ts +21 -1
- package/src/utils/XhrNetworkInterceptor.ts +128 -55
- package/android/src/newarch/java/ai/luciq/reactlibrary/RNLuciqAPMBaseSpec.java +0 -9
- package/android/src/newarch/java/ai/luciq/reactlibrary/RNLuciqBaseSpec.java +0 -33
- package/android/src/newarch/java/ai/luciq/reactlibrary/RNLuciqBugReportingBaseSpec.java +0 -33
- package/android/src/newarch/java/ai/luciq/reactlibrary/RNLuciqCrashReportingBaseSpec.java +0 -9
- package/android/src/newarch/java/ai/luciq/reactlibrary/RNLuciqFeatureRequestsBaseSpec.java +0 -9
- package/android/src/newarch/java/ai/luciq/reactlibrary/RNLuciqNetworkLoggerBaseSpec.java +0 -33
- package/android/src/newarch/java/ai/luciq/reactlibrary/RNLuciqRepliesBaseSpec.java +0 -33
- package/android/src/newarch/java/ai/luciq/reactlibrary/RNLuciqSessionReplayBaseSpec.java +0 -33
- package/android/src/newarch/java/ai/luciq/reactlibrary/RNLuciqSurveysBaseSpec.java +0 -33
- package/android/src/oldarch/java/ai/luciq/reactlibrary/RNLuciqAPMBaseSpec.java +0 -11
- package/android/src/oldarch/java/ai/luciq/reactlibrary/RNLuciqBaseSpec.java +0 -22
- package/android/src/oldarch/java/ai/luciq/reactlibrary/RNLuciqBugReportingBaseSpec.java +0 -22
- package/android/src/oldarch/java/ai/luciq/reactlibrary/RNLuciqCrashReportingBaseSpec.java +0 -10
- package/android/src/oldarch/java/ai/luciq/reactlibrary/RNLuciqFeatureRequestsBaseSpec.java +0 -10
- package/android/src/oldarch/java/ai/luciq/reactlibrary/RNLuciqNetworkLoggerBaseSpec.java +0 -22
- package/android/src/oldarch/java/ai/luciq/reactlibrary/RNLuciqRepliesBaseSpec.java +0 -22
- package/android/src/oldarch/java/ai/luciq/reactlibrary/RNLuciqSessionReplayBaseSpec.java +0 -22
- package/android/src/oldarch/java/ai/luciq/reactlibrary/RNLuciqSurveysBaseSpec.java +0 -22
- package/dist/native/specs/NativeAPM.d.ts +0 -21
- package/dist/native/specs/NativeAPM.js +0 -2
- package/dist/native/specs/NativeBugReporting.d.ts +0 -29
- package/dist/native/specs/NativeBugReporting.js +0 -2
- package/dist/native/specs/NativeCrashReporting.d.ts +0 -12
- package/dist/native/specs/NativeCrashReporting.js +0 -2
- package/dist/native/specs/NativeFeatureRequests.d.ts +0 -8
- package/dist/native/specs/NativeFeatureRequests.js +0 -2
- package/dist/native/specs/NativeLuciq.d.ts +0 -80
- package/dist/native/specs/NativeLuciq.js +0 -2
- package/dist/native/specs/NativeNetworkLogger.d.ts +0 -16
- package/dist/native/specs/NativeNetworkLogger.js +0 -2
- package/dist/native/specs/NativeReplies.d.ts +0 -21
- package/dist/native/specs/NativeReplies.js +0 -2
- package/dist/native/specs/NativeSessionReplay.d.ts +0 -17
- package/dist/native/specs/NativeSessionReplay.js +0 -2
- package/dist/native/specs/NativeSurveys.d.ts +0 -18
- package/dist/native/specs/NativeSurveys.js +0 -2
- package/ios/RNLuciq/LuciqBugReportingBridge.mm +0 -234
- package/ios/RNLuciq/LuciqCrashReportingBridge.mm +0 -91
- package/ios/RNLuciq/LuciqRepliesBridge.mm +0 -86
- package/src/native/specs/NativeAPM.ts +0 -47
- package/src/native/specs/NativeBugReporting.ts +0 -53
- package/src/native/specs/NativeCrashReporting.ts +0 -23
- package/src/native/specs/NativeFeatureRequests.ts +0 -10
- package/src/native/specs/NativeLuciq.ts +0 -137
- package/src/native/specs/NativeNetworkLogger.ts +0 -31
- package/src/native/specs/NativeReplies.ts +0 -27
- package/src/native/specs/NativeSessionReplay.ts +0 -20
- package/src/native/specs/NativeSurveys.ts +0 -23
|
@@ -19,8 +19,8 @@ export interface CauseCrashData {
|
|
|
19
19
|
}
|
|
20
20
|
export interface CrashReportingNativeModule extends NativeModule {
|
|
21
21
|
setEnabled(isEnabled: boolean): void;
|
|
22
|
-
sendJSCrash(data: CrashData): Promise<void>;
|
|
23
|
-
sendHandledJSCrash(data: CrashData, userAttributes?: Record<string, string> | null, fingerprint?: string | null, nonFatalExceptionLevel?: NonFatalErrorLevel | null): Promise<void>;
|
|
22
|
+
sendJSCrash(data: CrashData | string): Promise<void>;
|
|
23
|
+
sendHandledJSCrash(data: CrashData | string, userAttributes?: Record<string, string> | null, fingerprint?: string | null, nonFatalExceptionLevel?: NonFatalErrorLevel | null): Promise<void>;
|
|
24
24
|
setNDKCrashesEnabled(isEnabled: boolean): Promise<void>;
|
|
25
25
|
}
|
|
26
26
|
export declare const NativeCrashReporting: CrashReportingNativeModule;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { NativeEventEmitter, NativeModule, ProcessedColorValue } from 'react-native';
|
|
2
|
+
import type Report from '../models/Report';
|
|
2
3
|
import type { AutoMaskingType, ColorTheme, InvocationEvent, Locale, LogLevel, ReproStepsMode, StringKey, WelcomeMessageMode } from '../utils/Enums';
|
|
3
4
|
import type { NativeConstants } from './NativeConstants';
|
|
4
5
|
import type { W3cExternalTraceAttributes } from '../models/W3cExternalTraceAttributes';
|
|
@@ -55,7 +56,7 @@ export interface LuciqNativeModule extends NativeModule {
|
|
|
55
56
|
removeFeatureFlags(featureFlags: string[]): void;
|
|
56
57
|
removeAllFeatureFlags(): void;
|
|
57
58
|
setFileAttachment(filePath: string, fileName?: string): void;
|
|
58
|
-
setPreSendingHandler(): void;
|
|
59
|
+
setPreSendingHandler(handler?: (report: Report) => void): void;
|
|
59
60
|
appendTagToReport(tag: string): void;
|
|
60
61
|
appendConsoleLogToReport(consoleLog: string): void;
|
|
61
62
|
setUserAttributeToReport(key: string, value: string): void;
|
|
@@ -71,7 +72,7 @@ export interface LuciqNativeModule extends NativeModule {
|
|
|
71
72
|
isW3ExternalGeneratedHeaderEnabled(): Promise<boolean>;
|
|
72
73
|
isW3CaughtHeaderEnabled(): Promise<boolean>;
|
|
73
74
|
registerFeatureFlagsChangeListener(): void;
|
|
74
|
-
setOnFeaturesUpdatedListener(): void;
|
|
75
|
+
setOnFeaturesUpdatedListener(handler?: (params: any) => void): void;
|
|
75
76
|
enableAutoMasking(autoMaskingTypes: AutoMaskingType[]): void;
|
|
76
77
|
getNetworkBodyMaxSize(): Promise<number>;
|
|
77
78
|
setTheme(theme: ThemeConfig): void;
|
|
@@ -1,25 +1,2 @@
|
|
|
1
|
-
import { NativeModules as ReactNativeModules
|
|
2
|
-
const
|
|
3
|
-
function resolve(name, fallback) {
|
|
4
|
-
return TurboModuleRegistry.get(name) ?? fallback;
|
|
5
|
-
}
|
|
6
|
-
const LCQAPM = resolve('LCQAPM', legacy.LCQAPM);
|
|
7
|
-
const LCQBugReporting = resolve('LCQBugReporting', legacy.LCQBugReporting);
|
|
8
|
-
const LCQCrashReporting = resolve('LCQCrashReporting', legacy.LCQCrashReporting);
|
|
9
|
-
const LCQFeatureRequests = resolve('LCQFeatureRequests', legacy.LCQFeatureRequests);
|
|
10
|
-
const Luciq = resolve('Luciq', legacy.Luciq);
|
|
11
|
-
const LCQReplies = resolve('LCQReplies', legacy.LCQReplies);
|
|
12
|
-
const LCQSurveys = resolve('LCQSurveys', legacy.LCQSurveys);
|
|
13
|
-
const LCQSessionReplay = resolve('LCQSessionReplay', legacy.LCQSessionReplay);
|
|
14
|
-
const LCQNetworkLogger = resolve('LCQNetworkLogger', legacy.LCQNetworkLogger);
|
|
15
|
-
export const NativeModules = {
|
|
16
|
-
LCQAPM,
|
|
17
|
-
LCQBugReporting,
|
|
18
|
-
LCQCrashReporting,
|
|
19
|
-
LCQFeatureRequests,
|
|
20
|
-
Luciq,
|
|
21
|
-
LCQReplies,
|
|
22
|
-
LCQSurveys,
|
|
23
|
-
LCQSessionReplay,
|
|
24
|
-
LCQNetworkLogger,
|
|
25
|
-
};
|
|
1
|
+
import { NativeModules as ReactNativeModules } from 'react-native';
|
|
2
|
+
export const NativeModules = ReactNativeModules;
|
|
@@ -4,7 +4,7 @@ export interface RepliesNativeModule extends NativeModule {
|
|
|
4
4
|
show(): void;
|
|
5
5
|
hasChats(): Promise<boolean>;
|
|
6
6
|
getUnreadRepliesCount(): Promise<number>;
|
|
7
|
-
setOnNewReplyReceivedHandler(): void;
|
|
7
|
+
setOnNewReplyReceivedHandler(handler: () => void): void;
|
|
8
8
|
setPushNotificationsEnabled(isEnabled: boolean): void;
|
|
9
9
|
setInAppNotificationEnabled(isEnabled: boolean): void;
|
|
10
10
|
setInAppNotificationSound(isEnabled: boolean): void;
|
|
@@ -11,8 +11,8 @@ export interface SurveysNativeModule extends NativeModule {
|
|
|
11
11
|
hasRespondedToSurvey(surveyToken: string): Promise<boolean>;
|
|
12
12
|
setShouldShowWelcomeScreen(shouldShowWelcomeScreen: boolean): void;
|
|
13
13
|
setAppStoreURL(appStoreURL: string): void;
|
|
14
|
-
setOnShowHandler(): void;
|
|
15
|
-
setOnDismissHandler(): void;
|
|
14
|
+
setOnShowHandler(onShowHandler: () => void): void;
|
|
15
|
+
setOnDismissHandler(onDismissHandler: () => void): void;
|
|
16
16
|
}
|
|
17
17
|
export declare const NativeSurveys: SurveysNativeModule;
|
|
18
18
|
export declare enum NativeEvents {
|
package/dist/utils/Enums.js
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import { NativeLuciq } from '../native/NativeLuciq';
|
|
2
|
-
const constants =
|
|
3
|
-
? NativeLuciq.getConstants()
|
|
4
|
-
: NativeLuciq.getAllConstants();
|
|
2
|
+
const constants = NativeLuciq.getConstants();
|
|
5
3
|
/**
|
|
6
4
|
* Verbosity level of the SDK debug logs. This has nothing to do with `Luciq.log`,
|
|
7
5
|
* and only affect the logs used to debug the SDK itself.
|
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
export declare function initFeatureFlagsCache(): Promise<void>;
|
|
2
|
+
export declare function getCachedW3cFlags(): {
|
|
3
|
+
isW3cExternalTraceIDEnabled: boolean;
|
|
4
|
+
isW3cExternalGeneratedHeaderEnabled: boolean;
|
|
5
|
+
isW3cCaughtHeaderEnabled: boolean;
|
|
6
|
+
};
|
|
1
7
|
export declare const FeatureFlags: {
|
|
2
8
|
isW3ExternalTraceID: () => Promise<boolean>;
|
|
3
9
|
isW3ExternalGeneratedHeader: () => Promise<boolean>;
|
|
@@ -1,5 +1,34 @@
|
|
|
1
1
|
import { NativeLuciq } from '../native/NativeLuciq';
|
|
2
2
|
import { _registerFeatureFlagsChangeListener } from '../modules/Luciq';
|
|
3
|
+
import { Logger } from './logger';
|
|
4
|
+
const TAG = 'LCQ-RN-NET:';
|
|
5
|
+
let cachedW3cFlags = {
|
|
6
|
+
isW3cExternalTraceIDEnabled: false,
|
|
7
|
+
isW3cExternalGeneratedHeaderEnabled: false,
|
|
8
|
+
isW3cCaughtHeaderEnabled: false,
|
|
9
|
+
};
|
|
10
|
+
export async function initFeatureFlagsCache() {
|
|
11
|
+
Logger.debug(TAG, '[FeatureFlags] Initializing W3C feature flags cache from native bridge...');
|
|
12
|
+
try {
|
|
13
|
+
const [traceID, generatedHeader, caughtHeader] = await Promise.all([
|
|
14
|
+
NativeLuciq.isW3ExternalTraceIDEnabled(),
|
|
15
|
+
NativeLuciq.isW3ExternalGeneratedHeaderEnabled(),
|
|
16
|
+
NativeLuciq.isW3CaughtHeaderEnabled(),
|
|
17
|
+
]);
|
|
18
|
+
cachedW3cFlags = {
|
|
19
|
+
isW3cExternalTraceIDEnabled: traceID,
|
|
20
|
+
isW3cExternalGeneratedHeaderEnabled: generatedHeader,
|
|
21
|
+
isW3cCaughtHeaderEnabled: caughtHeader,
|
|
22
|
+
};
|
|
23
|
+
Logger.debug(TAG, `[FeatureFlags] Cache initialized: traceID=${traceID}, generatedHeader=${generatedHeader}, caughtHeader=${caughtHeader}`);
|
|
24
|
+
}
|
|
25
|
+
catch (e) {
|
|
26
|
+
Logger.debug(TAG, '[FeatureFlags] Failed to initialize cache, using defaults (all false):', e);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
export function getCachedW3cFlags() {
|
|
30
|
+
return cachedW3cFlags;
|
|
31
|
+
}
|
|
3
32
|
export const FeatureFlags = {
|
|
4
33
|
isW3ExternalTraceID: () => NativeLuciq.isW3ExternalTraceIDEnabled(),
|
|
5
34
|
isW3ExternalGeneratedHeader: () => NativeLuciq.isW3ExternalGeneratedHeaderEnabled(),
|
|
@@ -8,6 +37,12 @@ export const FeatureFlags = {
|
|
|
8
37
|
};
|
|
9
38
|
export const registerFeatureFlagsListener = () => {
|
|
10
39
|
_registerFeatureFlagsChangeListener((res) => {
|
|
40
|
+
Logger.debug(TAG, `[FeatureFlags] Flags updated from native listener: traceID=${res.isW3ExternalTraceIDEnabled}, generatedHeader=${res.isW3ExternalGeneratedHeaderEnabled}, caughtHeader=${res.isW3CaughtHeaderEnabled}, bodyLimit=${res.networkBodyLimit}`);
|
|
41
|
+
cachedW3cFlags = {
|
|
42
|
+
isW3cExternalTraceIDEnabled: res.isW3ExternalTraceIDEnabled,
|
|
43
|
+
isW3cExternalGeneratedHeaderEnabled: res.isW3ExternalGeneratedHeaderEnabled,
|
|
44
|
+
isW3cCaughtHeaderEnabled: res.isW3CaughtHeaderEnabled,
|
|
45
|
+
};
|
|
11
46
|
FeatureFlags.isW3ExternalTraceID = async () => {
|
|
12
47
|
return res.isW3ExternalTraceIDEnabled;
|
|
13
48
|
};
|
|
@@ -28,7 +28,7 @@ export declare const stringifyIfNotString: (input: unknown) => string;
|
|
|
28
28
|
* `sendCrashReport(error, NativeCrashReporting.sendJSCrash);`
|
|
29
29
|
*
|
|
30
30
|
*/
|
|
31
|
-
export declare function sendCrashReport(error: ExtendedError, remoteSenderCallback: (json: CrashData) => Promise<void>): Promise<void>;
|
|
31
|
+
export declare function sendCrashReport(error: ExtendedError, remoteSenderCallback: (json: CrashData | string) => Promise<void>): Promise<void>;
|
|
32
32
|
/**
|
|
33
33
|
* Generate random 32 bit unsigned integer Hexadecimal (8 chars) lower case letters
|
|
34
34
|
* Should not return all zeros
|
package/dist/utils/LuciqUtils.js
CHANGED
|
@@ -3,6 +3,7 @@ import parseErrorStackLib from 'react-native/Libraries/Core/Devtools/parseErrorS
|
|
|
3
3
|
import { NativeCrashReporting } from '../native/NativeCrashReporting';
|
|
4
4
|
import { NativeLuciq } from '../native/NativeLuciq';
|
|
5
5
|
import { NativeAPM } from '../native/NativeAPM';
|
|
6
|
+
import { Logger } from './logger';
|
|
6
7
|
import * as NetworkLogger from '../modules/NetworkLogger';
|
|
7
8
|
import { NativeNetworkLogger, NativeNetworkLoggerEvent, NetworkListenerType, NetworkLoggerEmitter, } from '../native/NativeNetworkLogger';
|
|
8
9
|
let apmFlags = {
|
|
@@ -128,6 +129,9 @@ export const stringifyIfNotString = (input) => {
|
|
|
128
129
|
*/
|
|
129
130
|
export async function sendCrashReport(error, remoteSenderCallback) {
|
|
130
131
|
const jsonObject = getCrashDataFromError(error);
|
|
132
|
+
if (Platform.OS === 'android') {
|
|
133
|
+
return remoteSenderCallback(JSON.stringify(jsonObject));
|
|
134
|
+
}
|
|
131
135
|
return remoteSenderCallback(jsonObject);
|
|
132
136
|
}
|
|
133
137
|
/**
|
|
@@ -178,10 +182,12 @@ export const reportNetworkLog = (network) => {
|
|
|
178
182
|
if (Platform.OS === 'android') {
|
|
179
183
|
const requestHeaders = JSON.stringify(network.requestHeaders);
|
|
180
184
|
const responseHeaders = JSON.stringify(network.responseHeaders);
|
|
185
|
+
Logger.debug('LCQ-RN-NET:', `[reportNetworkLog] Sending to NativeLuciq.networkLogAndroid: ${network.method} ${network.url}, status=${network.responseCode}, duration=${network.duration}ms, error=${network.errorDomain || 'none'}`);
|
|
181
186
|
NativeLuciq.networkLogAndroid(network.url, network.requestBody, network.responseBody, network.method, network.responseCode, requestHeaders, responseHeaders, network.duration);
|
|
182
187
|
if (!apmFlags.isNativeInterceptionFeatureEnabled ||
|
|
183
188
|
!apmFlags.hasAPMNetworkPlugin ||
|
|
184
189
|
!apmFlags.shouldEnableNativeInterception) {
|
|
190
|
+
Logger.debug('LCQ-RN-NET:', `[reportNetworkLog] Also sending to NativeAPM.networkLogAndroid (native interception disabled): ${network.method} ${network.url}`);
|
|
185
191
|
NativeAPM.networkLogAndroid(network.startTime, network.duration, requestHeaders, network.requestBody, network.requestBodySize, network.method, network.url, network.requestContentType, responseHeaders, network.responseBody, network.responseBodySize, network.responseCode, network.contentType, network.errorDomain, {
|
|
186
192
|
isW3cHeaderFound: network.isW3cHeaderFound,
|
|
187
193
|
partialId: network.partialId,
|
|
@@ -190,6 +196,9 @@ export const reportNetworkLog = (network) => {
|
|
|
190
196
|
w3cCaughtHeader: network.w3cCaughtHeader,
|
|
191
197
|
}, network.gqlQueryName, network.serverErrorMessage);
|
|
192
198
|
}
|
|
199
|
+
else {
|
|
200
|
+
Logger.debug('LCQ-RN-NET:', `[reportNetworkLog] Skipping NativeAPM.networkLogAndroid (native interception enabled): nativeFeature=${apmFlags.isNativeInterceptionFeatureEnabled}, hasPlugin=${apmFlags.hasAPMNetworkPlugin}, shouldEnable=${apmFlags.shouldEnableNativeInterception}`);
|
|
201
|
+
}
|
|
193
202
|
}
|
|
194
203
|
else {
|
|
195
204
|
NativeLuciq.networkLogIOS(network.url, network.method, network.requestBody, network.requestBodySize, network.responseBody, network.responseBodySize, network.responseCode, network.requestHeaders, network.responseHeaders, network.contentType, network.errorDomain, network.errorCode, network.startTime, network.duration, network.gqlQueryName, network.serverErrorMessage, {
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import LuciqConstants from './LuciqConstants';
|
|
2
2
|
import { stringifyIfNotString, generateW3CHeader } from './LuciqUtils';
|
|
3
|
-
import {
|
|
3
|
+
import { getCachedW3cFlags } from './FeatureFlags';
|
|
4
|
+
import { Logger } from './logger';
|
|
5
|
+
const TAG = 'LCQ-RN-NET:';
|
|
4
6
|
const XMLHttpRequest = global.XMLHttpRequest;
|
|
5
7
|
let originalXHROpen = XMLHttpRequest.prototype.open;
|
|
6
8
|
let originalXHRSend = XMLHttpRequest.prototype.send;
|
|
@@ -8,40 +10,34 @@ let originalXHRSetRequestHeader = XMLHttpRequest.prototype.setRequestHeader;
|
|
|
8
10
|
let onProgressCallback;
|
|
9
11
|
let onDoneCallback;
|
|
10
12
|
let isInterceptorEnabled = false;
|
|
11
|
-
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
};
|
|
39
|
-
const getTraceparentHeader = async (networkData) => {
|
|
40
|
-
const [isW3cExternalTraceIDEnabled, isW3cExternalGeneratedHeaderEnabled, isW3cCaughtHeaderEnabled,] = await Promise.all([
|
|
41
|
-
FeatureFlags.isW3ExternalTraceID(),
|
|
42
|
-
FeatureFlags.isW3ExternalGeneratedHeader(),
|
|
43
|
-
FeatureFlags.isW3CaughtHeader(),
|
|
44
|
-
]);
|
|
13
|
+
const networkMap = new WeakMap();
|
|
14
|
+
const createNetworkData = () => ({
|
|
15
|
+
id: '',
|
|
16
|
+
url: '',
|
|
17
|
+
method: '',
|
|
18
|
+
requestBody: '',
|
|
19
|
+
requestBodySize: 0,
|
|
20
|
+
responseBody: '',
|
|
21
|
+
responseBodySize: 0,
|
|
22
|
+
responseCode: 0,
|
|
23
|
+
requestHeaders: {},
|
|
24
|
+
responseHeaders: {},
|
|
25
|
+
contentType: '',
|
|
26
|
+
errorDomain: '',
|
|
27
|
+
errorCode: 0,
|
|
28
|
+
startTime: 0,
|
|
29
|
+
duration: 0,
|
|
30
|
+
gqlQueryName: '',
|
|
31
|
+
serverErrorMessage: '',
|
|
32
|
+
requestContentType: '',
|
|
33
|
+
isW3cHeaderFound: null,
|
|
34
|
+
partialId: null,
|
|
35
|
+
networkStartTimeInSeconds: null,
|
|
36
|
+
w3cGeneratedHeader: null,
|
|
37
|
+
w3cCaughtHeader: null,
|
|
38
|
+
});
|
|
39
|
+
const getTraceparentHeader = (networkData) => {
|
|
40
|
+
const { isW3cExternalTraceIDEnabled, isW3cExternalGeneratedHeaderEnabled, isW3cCaughtHeaderEnabled, } = getCachedW3cFlags();
|
|
45
41
|
return injectHeaders(networkData, {
|
|
46
42
|
isW3cExternalTraceIDEnabled,
|
|
47
43
|
isW3cExternalGeneratedHeaderEnabled,
|
|
@@ -85,39 +81,57 @@ export default {
|
|
|
85
81
|
onProgressCallback = callback;
|
|
86
82
|
},
|
|
87
83
|
enableInterception() {
|
|
88
|
-
// Prevents infinite calls to XMLHttpRequest.open when enabling interception multiple times
|
|
89
84
|
if (isInterceptorEnabled) {
|
|
85
|
+
Logger.debug(TAG, 'enableInterception called but already enabled, skipping');
|
|
90
86
|
return;
|
|
91
87
|
}
|
|
88
|
+
Logger.debug(TAG, 'Enabling XHR network interception');
|
|
92
89
|
originalXHROpen = XMLHttpRequest.prototype.open;
|
|
93
90
|
originalXHRSend = XMLHttpRequest.prototype.send;
|
|
94
91
|
originalXHRSetRequestHeader = XMLHttpRequest.prototype.setRequestHeader;
|
|
95
92
|
// An error code that signifies an issue with the RN client.
|
|
96
93
|
const clientErrorCode = 9876;
|
|
97
94
|
XMLHttpRequest.prototype.open = function (method, url, ...args) {
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
95
|
+
const networkData = createNetworkData();
|
|
96
|
+
networkData.url = url;
|
|
97
|
+
networkData.method = method;
|
|
98
|
+
networkMap.set(this, networkData);
|
|
99
|
+
Logger.debug(TAG, `[open] ${method} ${url}`);
|
|
101
100
|
originalXHROpen.apply(this, [method, url, ...args]);
|
|
102
101
|
};
|
|
103
102
|
XMLHttpRequest.prototype.setRequestHeader = function (header, value) {
|
|
104
|
-
// According to the HTTP RFC, headers are case-insensitive, so we convert
|
|
105
|
-
// them to lower-case to make accessing headers predictable.
|
|
106
|
-
// This avoid issues like failing to get the Content-Type header for a request
|
|
107
|
-
// because the header is set as 'Content-Type' instead of 'content-type'.
|
|
108
103
|
const key = header.toLowerCase();
|
|
109
|
-
|
|
104
|
+
const networkData = networkMap.get(this);
|
|
105
|
+
if (networkData) {
|
|
106
|
+
networkData.requestHeaders[key] = stringifyIfNotString(value);
|
|
107
|
+
}
|
|
108
|
+
else {
|
|
109
|
+
Logger.debug(TAG, `[setRequestHeader] No networkData found in WeakMap for header "${key}" — request may have been GC'd or open() was not called`);
|
|
110
|
+
}
|
|
110
111
|
originalXHRSetRequestHeader.apply(this, [header, value]);
|
|
111
112
|
};
|
|
112
|
-
XMLHttpRequest.prototype.send =
|
|
113
|
-
const
|
|
113
|
+
XMLHttpRequest.prototype.send = function (data) {
|
|
114
|
+
const networkData = networkMap.get(this);
|
|
115
|
+
if (!networkData) {
|
|
116
|
+
Logger.debug(TAG, '[send] No networkData found in WeakMap — falling back to original send (open() was not intercepted)');
|
|
117
|
+
originalXHRSend.apply(this, [data]);
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
120
|
+
Logger.debug(TAG, `[send] ${networkData.method} ${networkData.url}`);
|
|
121
|
+
const cloneNetwork = JSON.parse(JSON.stringify(networkData));
|
|
114
122
|
cloneNetwork.requestBody = data ? data : '';
|
|
115
123
|
if (typeof cloneNetwork.requestBody !== 'string') {
|
|
116
124
|
cloneNetwork.requestBody = JSON.stringify(cloneNetwork.requestBody);
|
|
117
125
|
}
|
|
126
|
+
let isReported = false;
|
|
118
127
|
if (this.addEventListener) {
|
|
119
128
|
this.addEventListener('readystatechange', async () => {
|
|
120
129
|
if (!isInterceptorEnabled) {
|
|
130
|
+
Logger.debug(TAG, `[readystatechange] Interceptor disabled, ignoring state=${this.readyState} for ${cloneNetwork.url}`);
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
if (isReported) {
|
|
134
|
+
Logger.debug(TAG, `[readystatechange] Already reported, ignoring state=${this.readyState} for ${cloneNetwork.url}`);
|
|
121
135
|
return;
|
|
122
136
|
}
|
|
123
137
|
if (this.readyState === this.HEADERS_RECEIVED) {
|
|
@@ -146,6 +160,7 @@ export default {
|
|
|
146
160
|
cloneNetwork.requestContentType =
|
|
147
161
|
cloneNetwork.requestHeaders['content-type'].split(';')[0];
|
|
148
162
|
}
|
|
163
|
+
Logger.debug(TAG, `[readystatechange] HEADERS_RECEIVED for ${cloneNetwork.url}, contentType=${cloneNetwork.contentType}`);
|
|
149
164
|
}
|
|
150
165
|
if (this.readyState === this.DONE) {
|
|
151
166
|
cloneNetwork.duration = Date.now() - cloneNetwork.startTime;
|
|
@@ -166,11 +181,11 @@ export default {
|
|
|
166
181
|
cloneNetwork.requestBody =
|
|
167
182
|
typeof _response === 'string' ? _response : JSON.stringify(_response);
|
|
168
183
|
cloneNetwork.responseBody = '';
|
|
169
|
-
// Detect a more descriptive error message.
|
|
170
184
|
if (typeof _response === 'string' && _response.length > 0) {
|
|
171
185
|
cloneNetwork.errorDomain = _response;
|
|
172
186
|
}
|
|
173
187
|
cloneNetwork.responseBody = `ERROR: ${cloneNetwork.errorDomain}`;
|
|
188
|
+
Logger.debug(TAG, `[readystatechange] DONE with client error for ${cloneNetwork.url}, errorDomain=${cloneNetwork.errorDomain}`);
|
|
174
189
|
// @ts-ignore
|
|
175
190
|
}
|
|
176
191
|
else if (this._timedOut) {
|
|
@@ -179,6 +194,7 @@ export default {
|
|
|
179
194
|
cloneNetwork.responseCode = 0;
|
|
180
195
|
cloneNetwork.contentType = 'text/plain';
|
|
181
196
|
cloneNetwork.responseBody = `ERROR: ${cloneNetwork.errorDomain}`;
|
|
197
|
+
Logger.debug(TAG, `[readystatechange] DONE with timeout for ${cloneNetwork.url}`);
|
|
182
198
|
}
|
|
183
199
|
// Only set response body if not already set by error handlers
|
|
184
200
|
if (!cloneNetwork.errorDomain) {
|
|
@@ -225,16 +241,20 @@ export default {
|
|
|
225
241
|
else {
|
|
226
242
|
delete cloneNetwork.gqlQueryName;
|
|
227
243
|
}
|
|
244
|
+
isReported = true;
|
|
245
|
+
Logger.debug(TAG, `[readystatechange] DONE for ${cloneNetwork.method} ${cloneNetwork.url} — status=${cloneNetwork.responseCode}, duration=${cloneNetwork.duration}ms, hasCallback=${!!onDoneCallback}`);
|
|
228
246
|
if (onDoneCallback) {
|
|
229
247
|
onDoneCallback(cloneNetwork);
|
|
230
248
|
}
|
|
249
|
+
else {
|
|
250
|
+
Logger.debug(TAG, `[readystatechange] WARNING: onDoneCallback is null, network log for ${cloneNetwork.url} will be LOST`);
|
|
251
|
+
}
|
|
231
252
|
}
|
|
232
253
|
});
|
|
233
254
|
const downloadUploadProgressCallback = (event) => {
|
|
234
255
|
if (!isInterceptorEnabled) {
|
|
235
256
|
return;
|
|
236
257
|
}
|
|
237
|
-
// check if will be able to compute progress
|
|
238
258
|
if (event.lengthComputable && onProgressCallback) {
|
|
239
259
|
const totalBytesSent = event.loaded;
|
|
240
260
|
const totalBytesExpectedToSend = event.total - event.loaded;
|
|
@@ -243,31 +263,43 @@ export default {
|
|
|
243
263
|
};
|
|
244
264
|
this.addEventListener('progress', downloadUploadProgressCallback);
|
|
245
265
|
this.upload.addEventListener('progress', downloadUploadProgressCallback);
|
|
246
|
-
// Handler for abort events (works with fetch, Axios, and any XHR-based requests)
|
|
247
266
|
this.addEventListener('abort', () => {
|
|
248
267
|
if (!isInterceptorEnabled) {
|
|
268
|
+
Logger.debug(TAG, `[abort] Interceptor disabled, ignoring abort for ${cloneNetwork.url}`);
|
|
269
|
+
return;
|
|
270
|
+
}
|
|
271
|
+
if (isReported) {
|
|
272
|
+
Logger.debug(TAG, `[abort] Already reported via readystatechange DONE, ignoring duplicate abort for ${cloneNetwork.url}`);
|
|
249
273
|
return;
|
|
250
274
|
}
|
|
275
|
+
isReported = true;
|
|
251
276
|
cloneNetwork.duration = Date.now() - cloneNetwork.startTime;
|
|
252
277
|
cloneNetwork.responseCode = 0;
|
|
253
278
|
cloneNetwork.errorCode = clientErrorCode;
|
|
254
279
|
cloneNetwork.errorDomain = 'cancelled';
|
|
255
280
|
cloneNetwork.responseBody = `ERROR: ${cloneNetwork.errorDomain}`;
|
|
281
|
+
Logger.debug(TAG, `[abort] Request cancelled: ${cloneNetwork.method} ${cloneNetwork.url}, duration=${cloneNetwork.duration}ms, hasCallback=${!!onDoneCallback}`);
|
|
282
|
+
if (onDoneCallback) {
|
|
283
|
+
onDoneCallback(cloneNetwork);
|
|
284
|
+
}
|
|
285
|
+
else {
|
|
286
|
+
Logger.debug(TAG, `[abort] WARNING: onDoneCallback is null, cancelled log for ${cloneNetwork.url} will be LOST`);
|
|
287
|
+
}
|
|
256
288
|
});
|
|
257
289
|
}
|
|
258
290
|
cloneNetwork.startTime = Date.now();
|
|
259
|
-
const traceparent =
|
|
291
|
+
const traceparent = getTraceparentHeader(cloneNetwork);
|
|
260
292
|
if (traceparent) {
|
|
261
293
|
this.setRequestHeader('Traceparent', traceparent);
|
|
262
|
-
|
|
263
|
-
if (this.readyState === this.UNSENT) {
|
|
264
|
-
return; // Prevent sending the request if not opened
|
|
294
|
+
Logger.debug(TAG, `[send] Injected traceparent header for ${cloneNetwork.url}`);
|
|
265
295
|
}
|
|
266
296
|
originalXHRSend.apply(this, [data]);
|
|
267
297
|
};
|
|
268
298
|
isInterceptorEnabled = true;
|
|
299
|
+
Logger.debug(TAG, 'XHR network interception enabled');
|
|
269
300
|
},
|
|
270
301
|
disableInterception() {
|
|
302
|
+
Logger.debug(TAG, 'Disabling XHR network interception');
|
|
271
303
|
isInterceptorEnabled = false;
|
|
272
304
|
XMLHttpRequest.prototype.send = originalXHRSend;
|
|
273
305
|
XMLHttpRequest.prototype.open = originalXHROpen;
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
- (void)setAutoUITraceEnabled:(BOOL)isEnabled;
|
|
18
18
|
- (void)startFlow:(NSString *)name;
|
|
19
19
|
- (void)endFlow:(NSString *)name;
|
|
20
|
-
- (void)setFlowAttribute:(NSString *)name
|
|
20
|
+
- (void)setFlowAttribute:(NSString *)name :(NSString *)key :(NSString *_Nullable)value;
|
|
21
21
|
- (void)startUITrace:(NSString *)name;
|
|
22
22
|
- (void)endUITrace;
|
|
23
23
|
|
|
@@ -27,13 +27,13 @@
|
|
|
27
27
|
- (void)syncCustomSpan:(NSString *)name
|
|
28
28
|
startTimestamp:(double)startTimestamp
|
|
29
29
|
endTimestamp:(double)endTimestamp
|
|
30
|
-
|
|
31
|
-
|
|
30
|
+
resolver:(RCTPromiseResolveBlock)resolve
|
|
31
|
+
rejecter:(RCTPromiseRejectBlock)reject;
|
|
32
32
|
|
|
33
33
|
- (void)isCustomSpanEnabled:(RCTPromiseResolveBlock)resolve
|
|
34
|
-
|
|
34
|
+
rejecter:(RCTPromiseRejectBlock)reject;
|
|
35
35
|
|
|
36
36
|
- (void)isAPMEnabled:(RCTPromiseResolveBlock)resolve
|
|
37
|
-
|
|
37
|
+
rejecter:(RCTPromiseRejectBlock)reject;
|
|
38
38
|
|
|
39
39
|
@end
|