diff options
author | Chocobozzz <me@florianbigard.com> | 2022-03-24 13:36:47 +0100 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2022-04-15 09:49:35 +0200 |
commit | b211106695bb82f6c32e53306081b5262c3d109d (patch) | |
tree | fa187de1c33b0956665f5362e29af6b0f6d8bb57 /shared/server-commands/videos | |
parent | 69d48ee30c9d47cddf0c3c047dc99a99dcb6e894 (diff) | |
download | PeerTube-b211106695bb82f6c32e53306081b5262c3d109d.tar.gz PeerTube-b211106695bb82f6c32e53306081b5262c3d109d.tar.zst PeerTube-b211106695bb82f6c32e53306081b5262c3d109d.zip |
Support video views/viewers stats in server
* Add "currentTime" and "event" body params to view endpoint
* Merge watching and view endpoints
* Introduce WatchAction AP activity
* Add tables to store viewer information of local videos
* Add endpoints to fetch video views/viewers stats of local videos
* Refactor views/viewers handlers
* Support "views" and "viewers" counters for both VOD and live videos
Diffstat (limited to 'shared/server-commands/videos')
-rw-r--r-- | shared/server-commands/videos/history-command.ts | 19 | ||||
-rw-r--r-- | shared/server-commands/videos/index.ts | 1 | ||||
-rw-r--r-- | shared/server-commands/videos/video-stats-command.ts | 48 | ||||
-rw-r--r-- | shared/server-commands/videos/videos-command.ts | 17 | ||||
-rw-r--r-- | shared/server-commands/videos/views-command.ts | 51 |
5 files changed, 100 insertions, 36 deletions
diff --git a/shared/server-commands/videos/history-command.ts b/shared/server-commands/videos/history-command.ts index e9dc63462..d27afcff2 100644 --- a/shared/server-commands/videos/history-command.ts +++ b/shared/server-commands/videos/history-command.ts | |||
@@ -3,25 +3,6 @@ import { AbstractCommand, OverrideCommandOptions } from '../shared' | |||
3 | 3 | ||
4 | export class HistoryCommand extends AbstractCommand { | 4 | export class HistoryCommand extends AbstractCommand { |
5 | 5 | ||
6 | watchVideo (options: OverrideCommandOptions & { | ||
7 | videoId: number | string | ||
8 | currentTime: number | ||
9 | }) { | ||
10 | const { videoId, currentTime } = options | ||
11 | |||
12 | const path = '/api/v1/videos/' + videoId + '/watching' | ||
13 | const fields = { currentTime } | ||
14 | |||
15 | return this.putBodyRequest({ | ||
16 | ...options, | ||
17 | |||
18 | path, | ||
19 | fields, | ||
20 | implicitToken: true, | ||
21 | defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204 | ||
22 | }) | ||
23 | } | ||
24 | |||
25 | list (options: OverrideCommandOptions & { | 6 | list (options: OverrideCommandOptions & { |
26 | search?: string | 7 | search?: string |
27 | } = {}) { | 8 | } = {}) { |
diff --git a/shared/server-commands/videos/index.ts b/shared/server-commands/videos/index.ts index c9ef6134d..b861731fb 100644 --- a/shared/server-commands/videos/index.ts +++ b/shared/server-commands/videos/index.ts | |||
@@ -13,4 +13,5 @@ export * from './services-command' | |||
13 | export * from './streaming-playlists-command' | 13 | export * from './streaming-playlists-command' |
14 | export * from './comments-command' | 14 | export * from './comments-command' |
15 | export * from './video-studio-command' | 15 | export * from './video-studio-command' |
16 | export * from './views-command' | ||
16 | export * from './videos-command' | 17 | export * from './videos-command' |
diff --git a/shared/server-commands/videos/video-stats-command.ts b/shared/server-commands/videos/video-stats-command.ts new file mode 100644 index 000000000..90f7ffeaf --- /dev/null +++ b/shared/server-commands/videos/video-stats-command.ts | |||
@@ -0,0 +1,48 @@ | |||
1 | import { HttpStatusCode, VideoStatsOverall, VideoStatsRetention, VideoStatsTimeserie, VideoStatsTimeserieMetric } from '@shared/models' | ||
2 | import { AbstractCommand, OverrideCommandOptions } from '../shared' | ||
3 | |||
4 | export class VideoStatsCommand extends AbstractCommand { | ||
5 | |||
6 | getOverallStats (options: OverrideCommandOptions & { | ||
7 | videoId: number | string | ||
8 | }) { | ||
9 | const path = '/api/v1/videos/' + options.videoId + '/stats/overall' | ||
10 | |||
11 | return this.getRequestBody<VideoStatsOverall>({ | ||
12 | ...options, | ||
13 | path, | ||
14 | |||
15 | implicitToken: true, | ||
16 | defaultExpectedStatus: HttpStatusCode.OK_200 | ||
17 | }) | ||
18 | } | ||
19 | |||
20 | getTimeserieStats (options: OverrideCommandOptions & { | ||
21 | videoId: number | string | ||
22 | metric: VideoStatsTimeserieMetric | ||
23 | }) { | ||
24 | const path = '/api/v1/videos/' + options.videoId + '/stats/timeseries/' + options.metric | ||
25 | |||
26 | return this.getRequestBody<VideoStatsTimeserie>({ | ||
27 | ...options, | ||
28 | path, | ||
29 | |||
30 | implicitToken: true, | ||
31 | defaultExpectedStatus: HttpStatusCode.OK_200 | ||
32 | }) | ||
33 | } | ||
34 | |||
35 | getRetentionStats (options: OverrideCommandOptions & { | ||
36 | videoId: number | string | ||
37 | }) { | ||
38 | const path = '/api/v1/videos/' + options.videoId + '/stats/retention' | ||
39 | |||
40 | return this.getRequestBody<VideoStatsRetention>({ | ||
41 | ...options, | ||
42 | path, | ||
43 | |||
44 | implicitToken: true, | ||
45 | defaultExpectedStatus: HttpStatusCode.OK_200 | ||
46 | }) | ||
47 | } | ||
48 | } | ||
diff --git a/shared/server-commands/videos/videos-command.ts b/shared/server-commands/videos/videos-command.ts index 21753ddc4..2ac426f76 100644 --- a/shared/server-commands/videos/videos-command.ts +++ b/shared/server-commands/videos/videos-command.ts | |||
@@ -107,23 +107,6 @@ export class VideosCommand extends AbstractCommand { | |||
107 | 107 | ||
108 | // --------------------------------------------------------------------------- | 108 | // --------------------------------------------------------------------------- |
109 | 109 | ||
110 | view (options: OverrideCommandOptions & { | ||
111 | id: number | string | ||
112 | xForwardedFor?: string | ||
113 | }) { | ||
114 | const { id, xForwardedFor } = options | ||
115 | const path = '/api/v1/videos/' + id + '/views' | ||
116 | |||
117 | return this.postBodyRequest({ | ||
118 | ...options, | ||
119 | |||
120 | path, | ||
121 | xForwardedFor, | ||
122 | implicitToken: false, | ||
123 | defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204 | ||
124 | }) | ||
125 | } | ||
126 | |||
127 | rate (options: OverrideCommandOptions & { | 110 | rate (options: OverrideCommandOptions & { |
128 | id: number | string | 111 | id: number | string |
129 | rating: UserVideoRateType | 112 | rating: UserVideoRateType |
diff --git a/shared/server-commands/videos/views-command.ts b/shared/server-commands/videos/views-command.ts new file mode 100644 index 000000000..01113f798 --- /dev/null +++ b/shared/server-commands/videos/views-command.ts | |||
@@ -0,0 +1,51 @@ | |||
1 | /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/no-floating-promises */ | ||
2 | import { HttpStatusCode, VideoViewEvent } from '@shared/models' | ||
3 | import { AbstractCommand, OverrideCommandOptions } from '../shared' | ||
4 | |||
5 | export class ViewsCommand extends AbstractCommand { | ||
6 | |||
7 | view (options: OverrideCommandOptions & { | ||
8 | id: number | string | ||
9 | currentTime?: number | ||
10 | viewEvent?: VideoViewEvent | ||
11 | xForwardedFor?: string | ||
12 | }) { | ||
13 | const { id, xForwardedFor, viewEvent, currentTime } = options | ||
14 | const path = '/api/v1/videos/' + id + '/views' | ||
15 | |||
16 | return this.postBodyRequest({ | ||
17 | ...options, | ||
18 | |||
19 | path, | ||
20 | xForwardedFor, | ||
21 | fields: { | ||
22 | currentTime: currentTime ?? 1, | ||
23 | viewEvent | ||
24 | }, | ||
25 | implicitToken: false, | ||
26 | defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204 | ||
27 | }) | ||
28 | } | ||
29 | |||
30 | async simulateView (options: OverrideCommandOptions & { | ||
31 | id: number | string | ||
32 | xForwardedFor?: string | ||
33 | }) { | ||
34 | await this.view({ ...options, currentTime: 0 }) | ||
35 | await this.view({ ...options, currentTime: 5 }) | ||
36 | } | ||
37 | |||
38 | async simulateViewer (options: OverrideCommandOptions & { | ||
39 | id: number | string | ||
40 | currentTimes: number[] | ||
41 | xForwardedFor?: string | ||
42 | }) { | ||
43 | let viewEvent: VideoViewEvent = 'seek' | ||
44 | |||
45 | for (const currentTime of options.currentTimes) { | ||
46 | await this.view({ ...options, currentTime, viewEvent }) | ||
47 | |||
48 | viewEvent = undefined | ||
49 | } | ||
50 | } | ||
51 | } | ||