Skip to content

Commit 864abb1

Browse files
committed
adjust some part
1 parent f3b1c31 commit 864abb1

File tree

8 files changed

+11
-13
lines changed

8 files changed

+11
-13
lines changed

packages/core/src/browser/fetchObservable.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ function afterSend(
117117
reportFetch({
118118
status: 0,
119119
isAborted:
120-
(context.init && context.init.signal && context.init.signal.aborted) ||
120+
((context.init || {}).signal || {}).aborted ||
121121
(error instanceof DOMException && error.code === DOMException.ABORT_ERR),
122122
error,
123123
})

packages/core/src/domain/contexts/userContext.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export function startUserContext(
3232
const user = userContextManager.getContext()
3333
const session = sessionManager.findTrackedSession(startTime)
3434

35-
if (session && session.anonymousId && !user.anonymous_id && !!configuration.trackAnonymousUser) {
35+
if (session && session.anonymousId && !user.anonymous_id && configuration.trackAnonymousUser) {
3636
user.anonymous_id = session.anonymousId
3737
}
3838

packages/core/src/domain/session/sessionManager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,6 @@ async function reportUnexpectedSessionState() {
181181
domain: getCurrentSite(),
182182
...sessionCookies,
183183
},
184-
currentDomain: `${window.location.protocol}//${window.location.hostname}`,
184+
currentDomain: `${location.protocol}//${location.hostname}`,
185185
})
186186
}

packages/core/src/domain/session/storeStrategies/sessionInCookie.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ export function retrieveSessionCookie(): SessionState {
6565

6666
export function buildCookieOptions(initConfiguration: InitConfiguration) {
6767
const cookieOptions: CookieOptions = {}
68+
const partitioned = !!initConfiguration.usePartitionedCrossSiteSessionCookie
6869

69-
cookieOptions.secure =
70-
!!initConfiguration.useSecureSessionCookie || !!initConfiguration.usePartitionedCrossSiteSessionCookie
71-
cookieOptions.crossSite = !!initConfiguration.usePartitionedCrossSiteSessionCookie
72-
cookieOptions.partitioned = !!initConfiguration.usePartitionedCrossSiteSessionCookie
70+
cookieOptions.secure = !!initConfiguration.useSecureSessionCookie || partitioned
71+
cookieOptions.crossSite = partitioned
72+
cookieOptions.partitioned = partitioned
7373

7474
if (initConfiguration.trackSessionAcrossSubdomains) {
7575
cookieOptions.domain = getCurrentSite()

packages/core/src/transport/eventBridge.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ export function bridgeSupports(capability: BridgeCapability): boolean {
4747
return !!bridge && bridge.getCapabilities().includes(capability)
4848
}
4949

50-
export function canUseEventBridge(
51-
currentHost = getGlobalObject<Window>().location && getGlobalObject<Window>().location.hostname
52-
): boolean {
50+
export function canUseEventBridge(currentHost = (getGlobalObject<Window>().location || {}).hostname): boolean {
5351
const bridge = getEventBridge()
5452
return (
5553
!!bridge &&

packages/rum-core/src/domain/action/trackClickActions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ function startClickAction(
185185
const click = newClick(lifeCycle, history, getUserActivity, clickActionBase, startEvent)
186186
appendClickToClickChain(click)
187187

188-
const selector = clickActionBase && clickActionBase.target && clickActionBase.target.selector
188+
const selector = ((clickActionBase && clickActionBase.target) || {}).selector
189189
if (selector) {
190190
updateInteractionSelector(startEvent.timeStamp, selector)
191191
}

packages/rum-core/src/domain/tracing/getDocumentTraceId.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export function getDocumentTraceId(document: Document): string | undefined {
2222
export function getDocumentTraceDataFromMeta(document: Document): DocumentTraceData | undefined {
2323
const traceIdMeta = document.querySelector<HTMLMetaElement>('meta[name=dd-trace-id]')
2424
const traceTimeMeta = document.querySelector<HTMLMetaElement>('meta[name=dd-trace-time]')
25-
return createDocumentTraceData(traceIdMeta && traceIdMeta.content, traceTimeMeta && traceTimeMeta.content)
25+
return createDocumentTraceData((traceIdMeta || {}).content, (traceTimeMeta || {}).content)
2626
}
2727

2828
export function getDocumentTraceDataFromComment(document: Document): DocumentTraceData | undefined {

packages/rum-core/src/domain/tracing/tracer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export function startTracer(
8080
userContext,
8181
accountContext,
8282
(tracingHeaders: TracingHeaders) => {
83-
if (context.input instanceof Request && !(context.init && context.init.headers)) {
83+
if (context.input instanceof Request && !(context.init || {}).headers) {
8484
context.input = new Request(context.input)
8585
Object.keys(tracingHeaders).forEach((key) => {
8686
;(context.input as Request).headers.append(key, tracingHeaders[key])

0 commit comments

Comments
 (0)