@amplitude/analytics-core 2.60.1 → 2.61.0-video-analytics-6.0
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 +1 -1
- package/lib/cjs/config/joined-config.d.ts.map +1 -1
- package/lib/cjs/config/joined-config.js +4 -0
- package/lib/cjs/config/joined-config.js.map +1 -1
- package/lib/cjs/config.d.ts +1 -0
- package/lib/cjs/config.d.ts.map +1 -1
- package/lib/cjs/config.js +1 -0
- package/lib/cjs/config.js.map +1 -1
- package/lib/cjs/heartbeat.d.ts +7 -3
- package/lib/cjs/heartbeat.d.ts.map +1 -1
- package/lib/cjs/heartbeat.js +81 -8
- package/lib/cjs/heartbeat.js.map +1 -1
- package/lib/cjs/index.d.ts +1 -1
- package/lib/cjs/index.d.ts.map +1 -1
- package/lib/cjs/index.js.map +1 -1
- package/lib/cjs/observers/video.d.ts +6 -3
- package/lib/cjs/observers/video.d.ts.map +1 -1
- package/lib/cjs/observers/video.js +41 -8
- package/lib/cjs/observers/video.js.map +1 -1
- package/lib/cjs/plugins/destination.d.ts +21 -1
- package/lib/cjs/plugins/destination.d.ts.map +1 -1
- package/lib/cjs/plugins/destination.js +176 -25
- package/lib/cjs/plugins/destination.js.map +1 -1
- package/lib/cjs/types/config/core-config.d.ts +5 -0
- package/lib/cjs/types/config/core-config.d.ts.map +1 -1
- package/lib/cjs/types/config/core-config.js.map +1 -1
- package/lib/cjs/types/event/base-event.d.ts +1 -0
- package/lib/cjs/types/event/base-event.d.ts.map +1 -1
- package/lib/cjs/types/event/base-event.js.map +1 -1
- package/lib/cjs/types/event/event.d.ts +4 -1
- package/lib/cjs/types/event/event.d.ts.map +1 -1
- package/lib/cjs/types/event/event.js.map +1 -1
- package/lib/cjs/types/payload.d.ts +5 -0
- package/lib/cjs/types/payload.d.ts.map +1 -1
- package/lib/cjs/types/payload.js.map +1 -1
- package/lib/cjs/video-analytics/track-video.d.ts +1 -1
- package/lib/cjs/video-analytics/track-video.d.ts.map +1 -1
- package/lib/cjs/video-analytics/track-video.js +107 -19
- package/lib/cjs/video-analytics/track-video.js.map +1 -1
- package/lib/cjs/video-analytics/types.d.ts +6 -5
- package/lib/cjs/video-analytics/types.d.ts.map +1 -1
- package/lib/cjs/video-analytics/types.js.map +1 -1
- package/lib/esm/config/joined-config.d.ts.map +1 -1
- package/lib/esm/config/joined-config.js +4 -0
- package/lib/esm/config/joined-config.js.map +1 -1
- package/lib/esm/config.d.ts +1 -0
- package/lib/esm/config.d.ts.map +1 -1
- package/lib/esm/config.js +1 -0
- package/lib/esm/config.js.map +1 -1
- package/lib/esm/heartbeat.d.ts +7 -3
- package/lib/esm/heartbeat.d.ts.map +1 -1
- package/lib/esm/heartbeat.js +81 -8
- package/lib/esm/heartbeat.js.map +1 -1
- package/lib/esm/index.d.ts +1 -1
- package/lib/esm/index.d.ts.map +1 -1
- package/lib/esm/index.js.map +1 -1
- package/lib/esm/observers/video.d.ts +6 -3
- package/lib/esm/observers/video.d.ts.map +1 -1
- package/lib/esm/observers/video.js +41 -8
- package/lib/esm/observers/video.js.map +1 -1
- package/lib/esm/plugins/destination.d.ts +21 -1
- package/lib/esm/plugins/destination.d.ts.map +1 -1
- package/lib/esm/plugins/destination.js +177 -26
- package/lib/esm/plugins/destination.js.map +1 -1
- package/lib/esm/types/config/core-config.d.ts +5 -0
- package/lib/esm/types/config/core-config.d.ts.map +1 -1
- package/lib/esm/types/config/core-config.js.map +1 -1
- package/lib/esm/types/event/base-event.d.ts +1 -0
- package/lib/esm/types/event/base-event.d.ts.map +1 -1
- package/lib/esm/types/event/base-event.js.map +1 -1
- package/lib/esm/types/event/event.d.ts +4 -1
- package/lib/esm/types/event/event.d.ts.map +1 -1
- package/lib/esm/types/event/event.js.map +1 -1
- package/lib/esm/types/payload.d.ts +5 -0
- package/lib/esm/types/payload.d.ts.map +1 -1
- package/lib/esm/types/payload.js.map +1 -1
- package/lib/esm/video-analytics/track-video.d.ts +1 -1
- package/lib/esm/video-analytics/track-video.d.ts.map +1 -1
- package/lib/esm/video-analytics/track-video.js +107 -19
- package/lib/esm/video-analytics/track-video.js.map +1 -1
- package/lib/esm/video-analytics/types.d.ts +6 -5
- package/lib/esm/video-analytics/types.d.ts.map +1 -1
- package/lib/esm/video-analytics/types.js.map +1 -1
- package/package.json +1 -1
|
@@ -10,6 +10,7 @@ var VideoObserver = /** @class */ (function () {
|
|
|
10
10
|
this.state = {
|
|
11
11
|
playbackState: 'paused',
|
|
12
12
|
};
|
|
13
|
+
this.waitingInterval = null;
|
|
13
14
|
this.handler = {
|
|
14
15
|
onPlay: function (evt) {
|
|
15
16
|
_this.updatePlaybackState('playing', evt);
|
|
@@ -17,15 +18,15 @@ var VideoObserver = /** @class */ (function () {
|
|
|
17
18
|
onPause: function (evt) {
|
|
18
19
|
_this.updatePlaybackState('paused', evt);
|
|
19
20
|
},
|
|
20
|
-
onEnded: function (evt) {
|
|
21
|
-
_this.updatePlaybackState('ended', evt);
|
|
21
|
+
onEnded: function (evt, cause) {
|
|
22
|
+
_this.updatePlaybackState('ended', evt, cause);
|
|
22
23
|
},
|
|
23
24
|
onSeeking: function () {
|
|
24
25
|
var nextState = tslib_1.__assign(tslib_1.__assign({}, _this.state), { isSeeking: true });
|
|
25
26
|
_this.updateState(nextState);
|
|
26
27
|
},
|
|
27
28
|
onSeeked: function (event) {
|
|
28
|
-
var nextState = tslib_1.__assign(tslib_1.__assign({}, _this.state), { isSeeking: false, position: event.
|
|
29
|
+
var nextState = tslib_1.__assign(tslib_1.__assign({}, _this.state), { isSeeking: false, position: event.position });
|
|
29
30
|
_this.updateState(nextState);
|
|
30
31
|
},
|
|
31
32
|
onError: function (errorMessage) {
|
|
@@ -52,18 +53,49 @@ var VideoObserver = /** @class */ (function () {
|
|
|
52
53
|
}
|
|
53
54
|
};
|
|
54
55
|
VideoObserver.prototype.updateStateWithError = function (error) {
|
|
56
|
+
this.clearWaitingInterval();
|
|
55
57
|
var previousState = this.state;
|
|
56
|
-
var nextState = tslib_1.__assign(tslib_1.__assign({}, previousState), { playbackState: 'error', errorMessage: error });
|
|
58
|
+
var nextState = tslib_1.__assign(tslib_1.__assign({}, previousState), { playbackState: 'error', errorMessage: error, cause: undefined });
|
|
57
59
|
this.updateState(nextState);
|
|
58
60
|
};
|
|
59
|
-
VideoObserver.prototype.updatePlaybackState = function (playbackState, event) {
|
|
60
|
-
var
|
|
61
|
+
VideoObserver.prototype.updatePlaybackState = function (playbackState, event, cause) {
|
|
62
|
+
var _this = this;
|
|
63
|
+
var previousPlayback = this.state.playbackState;
|
|
64
|
+
// Aborting a load does not emit `seeked`. A seek still open when this media
|
|
65
|
+
// ends, or when the replacement starts, must not stick to the next stream.
|
|
66
|
+
var clearSeeking = !!this.state.isSeeking &&
|
|
67
|
+
(playbackState === 'ended' || (playbackState === 'playing' && previousPlayback === 'ended'));
|
|
68
|
+
var nextState = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, this.state), { playbackState: playbackState, errorMessage: undefined, lastEvent: event, position: event.position, cause: cause }), (clearSeeking ? { isSeeking: false } : {}));
|
|
61
69
|
this.updateState(nextState);
|
|
70
|
+
this.clearWaitingInterval();
|
|
71
|
+
if (playbackState !== 'playing') {
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
// if it's in a playing state, but the playhead is not moving,
|
|
75
|
+
// then transition playback from 'playing' to 'waiting'
|
|
76
|
+
// (the "waiting" listener isn't reliable, so this is a fallback)
|
|
77
|
+
var prevPosition = this.state.position;
|
|
78
|
+
this.waitingInterval = setInterval(function () {
|
|
79
|
+
var position = _this.state.position;
|
|
80
|
+
if (_this.state.playbackState === 'playing' && typeof prevPosition === 'number' && prevPosition === position) {
|
|
81
|
+
// no new player event backs this transition, so carry the current position and metadata over
|
|
82
|
+
_this.updateState(tslib_1.__assign(tslib_1.__assign({}, _this.state), { playbackState: 'waiting' }));
|
|
83
|
+
}
|
|
84
|
+
prevPosition = position;
|
|
85
|
+
}, 1000);
|
|
86
|
+
};
|
|
87
|
+
VideoObserver.prototype.clearWaitingInterval = function () {
|
|
88
|
+
if (this.waitingInterval) {
|
|
89
|
+
clearInterval(this.waitingInterval);
|
|
90
|
+
this.waitingInterval = null;
|
|
91
|
+
}
|
|
62
92
|
};
|
|
63
93
|
VideoObserver.prototype.updateTime = function (event) {
|
|
64
94
|
var _a, _b;
|
|
65
95
|
var lastVideoEvent = this.state.lastEvent;
|
|
66
|
-
|
|
96
|
+
var isWaiting = this.state.playbackState === 'waiting';
|
|
97
|
+
var isPlaying = this.state.playbackState === 'playing';
|
|
98
|
+
if (!lastVideoEvent || (!isPlaying && !isWaiting)) {
|
|
67
99
|
return;
|
|
68
100
|
}
|
|
69
101
|
var isSeeking = event.isSeeking || this.state.isSeeking;
|
|
@@ -74,7 +106,7 @@ var VideoObserver = /** @class */ (function () {
|
|
|
74
106
|
return;
|
|
75
107
|
}
|
|
76
108
|
var timeDelta = nextPosition - lastPosition;
|
|
77
|
-
var nextState = tslib_1.__assign(tslib_1.__assign({}, this.state), { position: nextPosition, watchTime: ((_b = this.state.watchTime) !== null && _b !== void 0 ? _b : 0) + timeDelta });
|
|
109
|
+
var nextState = tslib_1.__assign(tslib_1.__assign({}, this.state), { playbackState: 'playing', position: nextPosition, watchTime: ((_b = this.state.watchTime) !== null && _b !== void 0 ? _b : 0) + timeDelta });
|
|
78
110
|
this.updateState(nextState);
|
|
79
111
|
};
|
|
80
112
|
VideoObserver.prototype.updateState = function (nextState) {
|
|
@@ -83,6 +115,7 @@ var VideoObserver = /** @class */ (function () {
|
|
|
83
115
|
this.stateChangeHandler(previousState, nextState);
|
|
84
116
|
};
|
|
85
117
|
VideoObserver.prototype.destroy = function () {
|
|
118
|
+
this.clearWaitingInterval();
|
|
86
119
|
this.untrack();
|
|
87
120
|
};
|
|
88
121
|
return VideoObserver;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"video.js","sourceRoot":"","sources":["../../../src/observers/video.ts"],"names":[],"mappings":";;;;AAAA,8DAAoF;
|
|
1
|
+
{"version":3,"file":"video.js","sourceRoot":"","sources":["../../../src/observers/video.ts"],"names":[],"mappings":"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","sourcesContent":["import { trackHtmlVideo, trackEmbeddedVideo } from '../video-analytics/track-video';\nimport type {\n VideoHandler,\n VideoEvent,\n EmbeddedVideoPlayer,\n MuxElement,\n Vendor,\n TimeUpdateEvent,\n VideoStopCause,\n} from '../video-analytics/types';\n\nexport type { Vendor };\n\ntype PlaybackState = 'playing' | 'paused' | 'ended' | 'error' | 'seeking' | 'waiting';\n\nexport type State = {\n playbackState: PlaybackState;\n errorMessage?: string;\n lastEvent?: VideoEvent;\n watchTime?: number;\n position?: number | null;\n isSeeking?: boolean;\n cause?: VideoStopCause; // the reason for the playback state change\n};\n\nexport type VideoObserverParams = {\n videoEl: HTMLMediaElement | EmbeddedVideoPlayer | MuxElement;\n onStateChange: (previousState: State, nextState: State) => void;\n vendor?: Vendor;\n isEmbedded?: boolean;\n};\n\nexport class VideoObserver {\n private state: State = {\n playbackState: 'paused',\n };\n\n private waitingInterval: ReturnType<typeof setTimeout> | null = null;\n private untrack: () => void;\n private onStateChange: (previousState: State, nextState: State) => void;\n private handler: VideoHandler = {\n onPlay: (evt: VideoEvent) => {\n this.updatePlaybackState('playing', evt);\n },\n onPause: (evt: VideoEvent) => {\n this.updatePlaybackState('paused', evt);\n },\n onEnded: (evt: VideoEvent, cause?: VideoStopCause) => {\n this.updatePlaybackState('ended', evt, cause);\n },\n onSeeking: () => {\n const nextState: State = {\n ...this.state,\n isSeeking: true,\n };\n this.updateState(nextState);\n },\n onSeeked: (event: VideoEvent) => {\n const nextState: State = {\n ...this.state,\n isSeeking: false,\n position: event.position,\n };\n this.updateState(nextState);\n },\n onError: (errorMessage: string) => {\n this.updateStateWithError(errorMessage);\n },\n onTimeUpdate: (evt: TimeUpdateEvent) => {\n this.updateTime(evt);\n },\n };\n\n constructor({ videoEl, onStateChange, vendor, isEmbedded }: VideoObserverParams) {\n this.onStateChange = onStateChange;\n if (isEmbedded) {\n this.untrack = trackEmbeddedVideo(videoEl as EmbeddedVideoPlayer, this.handler, vendor);\n } else {\n this.untrack = trackHtmlVideo(videoEl as HTMLMediaElement, this.handler, vendor);\n }\n }\n\n private stateChangeHandler(previousState: State, nextState: State) {\n try {\n this.onStateChange(previousState, nextState);\n } catch (_error) {\n // Swallow callback errors to keep observer state consistent.\n }\n }\n\n private updateStateWithError(error: string) {\n this.clearWaitingInterval();\n const previousState = this.state;\n const nextState: State = {\n ...previousState,\n playbackState: 'error',\n errorMessage: error,\n cause: undefined,\n };\n this.updateState(nextState);\n }\n\n private updatePlaybackState(playbackState: PlaybackState, event: VideoEvent, cause?: VideoStopCause) {\n const previousPlayback = this.state.playbackState;\n // Aborting a load does not emit `seeked`. A seek still open when this media\n // ends, or when the replacement starts, must not stick to the next stream.\n const clearSeeking =\n !!this.state.isSeeking &&\n (playbackState === 'ended' || (playbackState === 'playing' && previousPlayback === 'ended'));\n const nextState: State = {\n ...this.state,\n playbackState,\n errorMessage: undefined,\n lastEvent: event,\n position: event.position,\n cause,\n ...(clearSeeking ? { isSeeking: false } : {}),\n };\n this.updateState(nextState);\n\n this.clearWaitingInterval();\n if (playbackState !== 'playing') {\n return;\n }\n // if it's in a playing state, but the playhead is not moving,\n // then transition playback from 'playing' to 'waiting'\n // (the \"waiting\" listener isn't reliable, so this is a fallback)\n let prevPosition: number | null | undefined = this.state.position;\n this.waitingInterval = setInterval(() => {\n const position = this.state.position;\n if (this.state.playbackState === 'playing' && typeof prevPosition === 'number' && prevPosition === position) {\n // no new player event backs this transition, so carry the current position and metadata over\n this.updateState({ ...this.state, playbackState: 'waiting' });\n }\n prevPosition = position;\n }, 1_000);\n }\n\n private clearWaitingInterval() {\n if (this.waitingInterval) {\n clearInterval(this.waitingInterval);\n this.waitingInterval = null;\n }\n }\n\n private updateTime(event: TimeUpdateEvent) {\n const lastVideoEvent = this.state.lastEvent;\n const isWaiting = this.state.playbackState === 'waiting';\n const isPlaying = this.state.playbackState === 'playing';\n if (!lastVideoEvent || (!isPlaying && !isWaiting)) {\n return;\n }\n const isSeeking = event.isSeeking || this.state.isSeeking;\n const lastPosition = this.state.position ?? 0;\n const nextPosition = event.position;\n if (isSeeking) {\n this.state = {\n ...this.state,\n position: nextPosition,\n };\n return;\n }\n const timeDelta = nextPosition - lastPosition;\n const nextState: State = {\n ...this.state,\n playbackState: 'playing',\n position: nextPosition,\n watchTime: (this.state.watchTime ?? 0) + timeDelta,\n };\n this.updateState(nextState);\n }\n\n private updateState(nextState: State) {\n const previousState = this.state;\n this.state = nextState;\n this.stateChangeHandler(previousState, nextState);\n }\n\n destroy() {\n this.clearWaitingInterval();\n this.untrack();\n }\n}\n"]}
|
|
@@ -1,16 +1,20 @@
|
|
|
1
1
|
import { DestinationPlugin } from '../types/plugin';
|
|
2
2
|
import { Event } from '../types/event/event';
|
|
3
|
+
import { Delay } from '../types/event/base-event';
|
|
3
4
|
import { Result } from '../types/result';
|
|
4
5
|
import { Response, InvalidResponse, PayloadTooLargeResponse, RateLimitResponse, SuccessResponse } from '../types/response';
|
|
5
6
|
import { IConfig } from '../types/config/core-config';
|
|
6
7
|
import { EventCallback } from '../types/event-callback';
|
|
7
8
|
import { IDiagnosticsClient } from '../diagnostics/diagnostics-client';
|
|
9
|
+
import { DelayedPayload, Payload } from '../types/payload';
|
|
8
10
|
export interface Context {
|
|
9
11
|
event: Event;
|
|
10
12
|
attempts: number;
|
|
11
13
|
callback: EventCallback;
|
|
12
14
|
timeout: number;
|
|
15
|
+
delay?: Delay;
|
|
13
16
|
}
|
|
17
|
+
type DelayedEventsById = Record<string, Context[]>;
|
|
14
18
|
export declare function getResponseBodyString(res: Response): string;
|
|
15
19
|
export declare class Destination implements DestinationPlugin {
|
|
16
20
|
name: string;
|
|
@@ -24,17 +28,32 @@ export declare class Destination implements DestinationPlugin {
|
|
|
24
28
|
flushId: ReturnType<typeof setTimeout> | null;
|
|
25
29
|
queue: Context[];
|
|
26
30
|
diagnosticsClient: IDiagnosticsClient | undefined;
|
|
31
|
+
inFlightDelayedEvents: Record<string, boolean>;
|
|
27
32
|
constructor(context?: {
|
|
28
33
|
diagnosticsClient: IDiagnosticsClient;
|
|
29
34
|
});
|
|
30
35
|
setup(config: IConfig): Promise<undefined>;
|
|
31
36
|
execute(event: Event): Promise<Result>;
|
|
37
|
+
/**
|
|
38
|
+
* If a stale delayed event is sitting in the queue, and it is not in flight,
|
|
39
|
+
* remove it and resolve as "stale" with status code 0.
|
|
40
|
+
*
|
|
41
|
+
* If a matching delayed event is already in flight, clone `delay` onto the
|
|
42
|
+
* incoming event and set skipRemoval so the in-flight send does not drop the
|
|
43
|
+
* replacement. Earlier replacements waiting on the same send are discarded
|
|
44
|
+
* as stale so only the latest copy remains.
|
|
45
|
+
* @param incomingEvent { Event } the new event to check old events against
|
|
46
|
+
* @returns void
|
|
47
|
+
*/
|
|
48
|
+
private removeStaleDelayedEvents;
|
|
32
49
|
removeEventsExceedFlushMaxRetries(list: Context[]): Context[];
|
|
33
50
|
scheduleEvents(list: Context[]): void;
|
|
34
51
|
schedule(timeout: number): void;
|
|
35
52
|
resetSchedule(): void;
|
|
36
53
|
flush(useRetry?: boolean): Promise<void>;
|
|
37
|
-
|
|
54
|
+
sendDelayedEvents(delayed: DelayedEventsById, useRetry: boolean): Promise<void>;
|
|
55
|
+
translatePayloadToDelayedPayload(payload: Payload & Partial<DelayedPayload>, list: Context[]): void;
|
|
56
|
+
send(list: Context[], useRetry?: boolean, delay?: boolean): Promise<void>;
|
|
38
57
|
handleResponse(res: Response, list: Context[]): void;
|
|
39
58
|
handleSuccessResponse(res: SuccessResponse, list: Context[]): void;
|
|
40
59
|
handleInvalidResponse(res: InvalidResponse, list: Context[]): void;
|
|
@@ -55,4 +74,5 @@ export declare class Destination implements DestinationPlugin {
|
|
|
55
74
|
*/
|
|
56
75
|
removeEvents(eventsToRemove: Context[]): void;
|
|
57
76
|
}
|
|
77
|
+
export {};
|
|
58
78
|
//# sourceMappingURL=destination.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"destination.d.ts","sourceRoot":"","sources":["../../../src/plugins/destination.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,
|
|
1
|
+
{"version":3,"file":"destination.d.ts","sourceRoot":"","sources":["../../../src/plugins/destination.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,9 @@ function getErrorMessage(error) {
|
|
|
29
29
|
return error.message;
|
|
30
30
|
return String(error);
|
|
31
31
|
}
|
|
32
|
+
function isDelayedEvent(event) {
|
|
33
|
+
return event.delay !== undefined && event.delay !== null;
|
|
34
|
+
}
|
|
32
35
|
function getResponseBodyString(res) {
|
|
33
36
|
var responseBodyString = '';
|
|
34
37
|
try {
|
|
@@ -60,6 +63,7 @@ var Destination = /** @class */ (function () {
|
|
|
60
63
|
// When flush resolves, set `flushId` to null
|
|
61
64
|
this.flushId = null;
|
|
62
65
|
this.queue = [];
|
|
66
|
+
this.inFlightDelayedEvents = {};
|
|
63
67
|
this.diagnosticsClient = context === null || context === void 0 ? void 0 : context.diagnosticsClient;
|
|
64
68
|
}
|
|
65
69
|
Destination.prototype.setup = function (config) {
|
|
@@ -96,11 +100,63 @@ var Destination = /** @class */ (function () {
|
|
|
96
100
|
callback: function (result) { return resolve(result); },
|
|
97
101
|
timeout: 0,
|
|
98
102
|
};
|
|
103
|
+
if (isDelayedEvent(event)) {
|
|
104
|
+
_this.removeStaleDelayedEvents(event);
|
|
105
|
+
}
|
|
99
106
|
_this.queue.push(context);
|
|
100
107
|
_this.schedule(_this.config.flushIntervalMillis);
|
|
101
108
|
_this.saveEvents();
|
|
102
109
|
});
|
|
103
110
|
};
|
|
111
|
+
/**
|
|
112
|
+
* If a stale delayed event is sitting in the queue, and it is not in flight,
|
|
113
|
+
* remove it and resolve as "stale" with status code 0.
|
|
114
|
+
*
|
|
115
|
+
* If a matching delayed event is already in flight, clone `delay` onto the
|
|
116
|
+
* incoming event and set skipRemoval so the in-flight send does not drop the
|
|
117
|
+
* replacement. Earlier replacements waiting on the same send are discarded
|
|
118
|
+
* as stale so only the latest copy remains.
|
|
119
|
+
* @param incomingEvent { Event } the new event to check old events against
|
|
120
|
+
* @returns void
|
|
121
|
+
*/
|
|
122
|
+
Destination.prototype.removeStaleDelayedEvents = function (incomingEvent) {
|
|
123
|
+
var _this = this;
|
|
124
|
+
try {
|
|
125
|
+
/* istanbul ignore next */
|
|
126
|
+
this.queue = this.queue.filter(function (context) {
|
|
127
|
+
var _a;
|
|
128
|
+
var targetEvent = context.event;
|
|
129
|
+
if (!isDelayedEvent(targetEvent)) {
|
|
130
|
+
return true;
|
|
131
|
+
}
|
|
132
|
+
// target event matches the incoming event if it has the same insert_id and delay id
|
|
133
|
+
// as the incoming event (the incoming event takes precedence)
|
|
134
|
+
var isMatchingEvent = targetEvent.delay.id === incomingEvent.delay.id && targetEvent.insert_id === incomingEvent.insert_id;
|
|
135
|
+
// do not filter out non matching events
|
|
136
|
+
if (!isMatchingEvent) {
|
|
137
|
+
return true;
|
|
138
|
+
}
|
|
139
|
+
// are there delayed events for this delay id currently in flight?
|
|
140
|
+
var areDelayedEventsInFlight = _this.inFlightDelayedEvents[incomingEvent.delay.id];
|
|
141
|
+
// if they are, then protect the target event from being removed from the queue
|
|
142
|
+
// after the in-flight send completes by setting skipRemoval on the incoming event
|
|
143
|
+
if (areDelayedEventsInFlight) {
|
|
144
|
+
incomingEvent.delay = tslib_1.__assign(tslib_1.__assign({}, incomingEvent.delay), { skipRemoval: true });
|
|
145
|
+
}
|
|
146
|
+
// if events are not in flight, or if the target event is marked to skipRemoval,
|
|
147
|
+
// then the incoming event supersedes the target event, and target event should be dropped
|
|
148
|
+
if (!areDelayedEventsInFlight || ((_a = targetEvent.delay) === null || _a === void 0 ? void 0 : _a.skipRemoval)) {
|
|
149
|
+
context.callback((0, result_builder_1.buildResult)(targetEvent, 0, 'Stale event overwritten'));
|
|
150
|
+
return false;
|
|
151
|
+
}
|
|
152
|
+
return true;
|
|
153
|
+
});
|
|
154
|
+
/* istanbul ignore next */
|
|
155
|
+
}
|
|
156
|
+
catch (e) {
|
|
157
|
+
// swallow error
|
|
158
|
+
}
|
|
159
|
+
};
|
|
104
160
|
Destination.prototype.removeEventsExceedFlushMaxRetries = function (list) {
|
|
105
161
|
var _this = this;
|
|
106
162
|
return list.filter(function (context) {
|
|
@@ -151,7 +207,7 @@ var Destination = /** @class */ (function () {
|
|
|
151
207
|
Destination.prototype.flush = function (useRetry) {
|
|
152
208
|
if (useRetry === void 0) { useRetry = false; }
|
|
153
209
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
154
|
-
var list, later, batches;
|
|
210
|
+
var list, delayed, later, batches, regularEventBatch, eventPromises;
|
|
155
211
|
var _this = this;
|
|
156
212
|
return tslib_1.__generator(this, function (_a) {
|
|
157
213
|
switch (_a.label) {
|
|
@@ -170,25 +226,40 @@ var Destination = /** @class */ (function () {
|
|
|
170
226
|
this.flushId = this.scheduleId;
|
|
171
227
|
this.resetSchedule();
|
|
172
228
|
list = [];
|
|
229
|
+
delayed = {};
|
|
173
230
|
later = [];
|
|
174
|
-
this.queue.forEach(function (context) {
|
|
231
|
+
this.queue.forEach(function (context) {
|
|
232
|
+
var _a;
|
|
233
|
+
if (context.timeout !== 0) {
|
|
234
|
+
later.push(context);
|
|
235
|
+
}
|
|
236
|
+
else if ((_a = context.event.delay) === null || _a === void 0 ? void 0 : _a.id) {
|
|
237
|
+
var delay = context.event.delay;
|
|
238
|
+
delayed[delay.id] = delayed[delay.id] || [];
|
|
239
|
+
delayed[delay.id].push(context);
|
|
240
|
+
}
|
|
241
|
+
else {
|
|
242
|
+
list.push(context);
|
|
243
|
+
}
|
|
244
|
+
});
|
|
175
245
|
batches = (0, chunk_1.chunk)(list, this.config.flushQueueSize);
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
246
|
+
regularEventBatch = batches.reduce(function (promise, batch) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
247
|
+
return tslib_1.__generator(this, function (_a) {
|
|
248
|
+
switch (_a.label) {
|
|
249
|
+
case 0: return [4 /*yield*/, promise];
|
|
250
|
+
case 1:
|
|
251
|
+
_a.sent();
|
|
252
|
+
return [4 /*yield*/, this.send(batch, useRetry)];
|
|
253
|
+
case 2: return [2 /*return*/, _a.sent()];
|
|
254
|
+
}
|
|
255
|
+
});
|
|
256
|
+
}); }, Promise.resolve());
|
|
257
|
+
eventPromises = [regularEventBatch];
|
|
258
|
+
if (Object.keys(delayed).length > 0) {
|
|
259
|
+
eventPromises.push(this.sendDelayedEvents(delayed, useRetry));
|
|
260
|
+
}
|
|
261
|
+
return [4 /*yield*/, Promise.all(eventPromises)];
|
|
189
262
|
case 1:
|
|
190
|
-
// Promise.all() doesn't guarantee resolve order.
|
|
191
|
-
// Sequentially resolve to make sure backend receives events in order
|
|
192
263
|
_a.sent();
|
|
193
264
|
// Mark current flush is done
|
|
194
265
|
this.flushId = null;
|
|
@@ -198,11 +269,77 @@ var Destination = /** @class */ (function () {
|
|
|
198
269
|
});
|
|
199
270
|
});
|
|
200
271
|
};
|
|
201
|
-
Destination.prototype.
|
|
272
|
+
Destination.prototype.sendDelayedEvents = function (delayed, useRetry) {
|
|
273
|
+
var e_1, _a;
|
|
274
|
+
var _this = this;
|
|
275
|
+
var eventPromises = [];
|
|
276
|
+
try {
|
|
277
|
+
var _loop_1 = function (delayId, contexts) {
|
|
278
|
+
this_1.inFlightDelayedEvents[delayId] = true;
|
|
279
|
+
var delayedEventsSend = this_1.send(contexts, useRetry, true);
|
|
280
|
+
eventPromises.push(delayedEventsSend);
|
|
281
|
+
delayedEventsSend.finally(function () {
|
|
282
|
+
delete _this.inFlightDelayedEvents[delayId];
|
|
283
|
+
});
|
|
284
|
+
};
|
|
285
|
+
var this_1 = this;
|
|
286
|
+
try {
|
|
287
|
+
for (var _b = tslib_1.__values(Object.entries(delayed)), _c = _b.next(); !_c.done; _c = _b.next()) {
|
|
288
|
+
var _d = tslib_1.__read(_c.value, 2), delayId = _d[0], contexts = _d[1];
|
|
289
|
+
_loop_1(delayId, contexts);
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
293
|
+
finally {
|
|
294
|
+
try {
|
|
295
|
+
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
|
|
296
|
+
}
|
|
297
|
+
finally { if (e_1) throw e_1.error; }
|
|
298
|
+
}
|
|
299
|
+
}
|
|
300
|
+
catch (e) {
|
|
301
|
+
// swallow error
|
|
302
|
+
}
|
|
303
|
+
return eventPromises.reduce(function (promise, batch) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
304
|
+
return tslib_1.__generator(this, function (_a) {
|
|
305
|
+
switch (_a.label) {
|
|
306
|
+
case 0: return [4 /*yield*/, promise];
|
|
307
|
+
case 1:
|
|
308
|
+
_a.sent();
|
|
309
|
+
return [4 /*yield*/, batch];
|
|
310
|
+
case 2: return [2 /*return*/, _a.sent()];
|
|
311
|
+
}
|
|
312
|
+
});
|
|
313
|
+
}); }, Promise.resolve());
|
|
314
|
+
};
|
|
315
|
+
Destination.prototype.translatePayloadToDelayedPayload = function (payload, list) {
|
|
316
|
+
var _a, _b;
|
|
317
|
+
var delayedEvents = [];
|
|
318
|
+
var instantEvents = [];
|
|
319
|
+
var delayedContexts = [];
|
|
320
|
+
var instantContexts = [];
|
|
321
|
+
list.forEach(function (context, index) {
|
|
322
|
+
if (context.event.delay.timeout) {
|
|
323
|
+
delayedEvents.push(payload.events[index]);
|
|
324
|
+
delayedContexts.push(context);
|
|
325
|
+
}
|
|
326
|
+
else {
|
|
327
|
+
instantEvents.push(payload.events[index]);
|
|
328
|
+
instantContexts.push(context);
|
|
329
|
+
}
|
|
330
|
+
});
|
|
331
|
+
list.splice.apply(list, tslib_1.__spreadArray(tslib_1.__spreadArray([0, list.length], tslib_1.__read(delayedContexts), false), tslib_1.__read(instantContexts), false));
|
|
332
|
+
/* istanbul ignore next */
|
|
333
|
+
payload.timeout = (_b = (_a = delayedContexts[0]) === null || _a === void 0 ? void 0 : _a.event.delay.timeout) !== null && _b !== void 0 ? _b : 0;
|
|
334
|
+
payload.id = list[0].event.delay.id;
|
|
335
|
+
payload.events = delayedEvents;
|
|
336
|
+
payload.instant_events = instantEvents;
|
|
337
|
+
};
|
|
338
|
+
Destination.prototype.send = function (list, useRetry, delay) {
|
|
202
339
|
var _a;
|
|
203
340
|
if (useRetry === void 0) { useRetry = true; }
|
|
204
341
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
205
|
-
var payload, serverUrl, shouldCompressUploadBody, res,
|
|
342
|
+
var payload, serverUrl, shouldCompressUploadBody, res, e_2, errorMessage;
|
|
206
343
|
return tslib_1.__generator(this, function (_b) {
|
|
207
344
|
switch (_b.label) {
|
|
208
345
|
case 0:
|
|
@@ -213,21 +350,28 @@ var Destination = /** @class */ (function () {
|
|
|
213
350
|
api_key: this.config.apiKey,
|
|
214
351
|
events: list.map(function (context) {
|
|
215
352
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
216
|
-
var _a = context.event, extra = _a.extra, eventWithoutExtra = tslib_1.__rest(_a, ["extra"]);
|
|
353
|
+
var _a = context.event, extra = _a.extra, delay = _a.delay, eventWithoutExtra = tslib_1.__rest(_a, ["extra", "delay"]);
|
|
217
354
|
return eventWithoutExtra;
|
|
218
355
|
}),
|
|
219
356
|
options: {
|
|
220
357
|
min_id_length: this.config.minIdLength,
|
|
221
358
|
},
|
|
222
359
|
client_upload_time: new Date().toISOString(),
|
|
223
|
-
request_metadata: this.config.requestMetadata,
|
|
360
|
+
request_metadata: delay ? undefined : this.config.requestMetadata,
|
|
224
361
|
};
|
|
225
|
-
|
|
362
|
+
if (!delay) {
|
|
363
|
+
this.config.requestMetadata = new config_1.RequestMetadata();
|
|
364
|
+
}
|
|
226
365
|
_b.label = 1;
|
|
227
366
|
case 1:
|
|
228
367
|
_b.trys.push([1, 3, , 4]);
|
|
229
368
|
serverUrl = (0, config_1.createServerConfig)(this.config.serverUrl, this.config.serverZone, this.config.useBatch).serverUrl;
|
|
230
369
|
shouldCompressUploadBody = shouldCompressUploadBodyForRequest(serverUrl, this.config.enableRequestBodyCompression);
|
|
370
|
+
if (delay) {
|
|
371
|
+
serverUrl = this.config.delayedEventsServerUrl || "".concat(serverUrl, "/delayed");
|
|
372
|
+
this.translatePayloadToDelayedPayload(payload, list);
|
|
373
|
+
shouldCompressUploadBody = false; // delayed events doesn't support compression
|
|
374
|
+
}
|
|
231
375
|
return [4 /*yield*/, this.config.transportProvider.send(serverUrl, payload, shouldCompressUploadBody)];
|
|
232
376
|
case 2:
|
|
233
377
|
res = _b.sent();
|
|
@@ -247,8 +391,8 @@ var Destination = /** @class */ (function () {
|
|
|
247
391
|
this.handleResponse(res, list);
|
|
248
392
|
return [3 /*break*/, 4];
|
|
249
393
|
case 3:
|
|
250
|
-
|
|
251
|
-
errorMessage = getErrorMessage(
|
|
394
|
+
e_2 = _b.sent();
|
|
395
|
+
errorMessage = getErrorMessage(e_2);
|
|
252
396
|
this.config.loggerProvider.error(errorMessage);
|
|
253
397
|
(_a = this.diagnosticsClient) === null || _a === void 0 ? void 0 : _a.recordEvent('analytics.events.unsuccessful.from.catch.error', {
|
|
254
398
|
events: list.map(function (context) { return context.event.event_type; }),
|
|
@@ -406,9 +550,16 @@ var Destination = /** @class */ (function () {
|
|
|
406
550
|
* This is called on response comes back for a request
|
|
407
551
|
*/
|
|
408
552
|
Destination.prototype.removeEvents = function (eventsToRemove) {
|
|
553
|
+
var insertIdsBeingRemoved = new Set(eventsToRemove.map(function (context) { return context.event.insert_id; }));
|
|
409
554
|
// Remove only the exact fulfilled Context instances so duplicate insert_id events remain queued.
|
|
410
555
|
var toRemove = new Set(eventsToRemove);
|
|
411
|
-
this.queue = this.queue.filter(function (queuedContext) { return !toRemove.has(queuedContext); });
|
|
556
|
+
this.queue = this.queue.filter(function (queuedContext) { var _a; return !toRemove.has(queuedContext) || ((_a = queuedContext.event.delay) === null || _a === void 0 ? void 0 : _a.skipRemoval); });
|
|
557
|
+
this.queue.forEach(function (context) {
|
|
558
|
+
var _a;
|
|
559
|
+
if (((_a = context.event.delay) === null || _a === void 0 ? void 0 : _a.skipRemoval) && insertIdsBeingRemoved.has(context.event.insert_id)) {
|
|
560
|
+
delete context.event.delay.skipRemoval;
|
|
561
|
+
}
|
|
562
|
+
});
|
|
412
563
|
this.saveEvents();
|
|
413
564
|
};
|
|
414
565
|
return Destination;
|