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/models | |
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/models')
-rw-r--r-- | shared/models/activitypub/activity.ts | 8 | ||||
-rw-r--r-- | shared/models/activitypub/context.ts | 3 | ||||
-rw-r--r-- | shared/models/activitypub/objects/index.ts | 1 | ||||
-rw-r--r-- | shared/models/activitypub/objects/watch-action-object.ts | 22 | ||||
-rw-r--r-- | shared/models/server/debug.model.ts | 2 | ||||
-rw-r--r-- | shared/models/users/index.ts | 1 | ||||
-rw-r--r-- | shared/models/users/user-watching-video.model.ts | 3 | ||||
-rw-r--r-- | shared/models/videos/index.ts | 2 | ||||
-rw-r--r-- | shared/models/videos/stats/index.ts | 4 | ||||
-rw-r--r-- | shared/models/videos/stats/video-stats-overall.model.ts | 17 | ||||
-rw-r--r-- | shared/models/videos/stats/video-stats-retention.model.ts | 6 | ||||
-rw-r--r-- | shared/models/videos/stats/video-stats-timeserie-metric.type.ts | 1 | ||||
-rw-r--r-- | shared/models/videos/stats/video-stats-timeserie.model.ts | 6 | ||||
-rw-r--r-- | shared/models/videos/video-view.model.ts | 6 | ||||
-rw-r--r-- | shared/models/videos/video.model.ts | 3 |
15 files changed, 74 insertions, 11 deletions
diff --git a/shared/models/activitypub/activity.ts b/shared/models/activitypub/activity.ts index d6284e283..fd5d38316 100644 --- a/shared/models/activitypub/activity.ts +++ b/shared/models/activitypub/activity.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import { ActivityPubActor } from './activitypub-actor' | 1 | import { ActivityPubActor } from './activitypub-actor' |
2 | import { ActivityPubSignature } from './activitypub-signature' | 2 | import { ActivityPubSignature } from './activitypub-signature' |
3 | import { ActivityFlagReasonObject, CacheFileObject, VideoObject } from './objects' | 3 | import { ActivityFlagReasonObject, CacheFileObject, VideoObject, WatchActionObject } from './objects' |
4 | import { AbuseObject } from './objects/abuse-object' | 4 | import { AbuseObject } from './objects/abuse-object' |
5 | import { DislikeObject } from './objects/dislike-object' | 5 | import { DislikeObject } from './objects/dislike-object' |
6 | import { APObject } from './objects/object.model' | 6 | import { APObject } from './objects/object.model' |
@@ -52,7 +52,7 @@ export interface BaseActivity { | |||
52 | 52 | ||
53 | export interface ActivityCreate extends BaseActivity { | 53 | export interface ActivityCreate extends BaseActivity { |
54 | type: 'Create' | 54 | type: 'Create' |
55 | object: VideoObject | AbuseObject | DislikeObject | VideoCommentObject | CacheFileObject | PlaylistObject | 55 | object: VideoObject | AbuseObject | DislikeObject | VideoCommentObject | CacheFileObject | PlaylistObject | WatchActionObject |
56 | } | 56 | } |
57 | 57 | ||
58 | export interface ActivityUpdate extends BaseActivity { | 58 | export interface ActivityUpdate extends BaseActivity { |
@@ -99,7 +99,9 @@ export interface ActivityView extends BaseActivity { | |||
99 | type: 'View' | 99 | type: 'View' |
100 | actor: string | 100 | actor: string |
101 | object: APObject | 101 | object: APObject |
102 | expires: string | 102 | |
103 | // If sending a "viewer" event | ||
104 | expires?: string | ||
103 | } | 105 | } |
104 | 106 | ||
105 | export interface ActivityDislike extends BaseActivity { | 107 | export interface ActivityDislike extends BaseActivity { |
diff --git a/shared/models/activitypub/context.ts b/shared/models/activitypub/context.ts index 4ada3b083..e9df38207 100644 --- a/shared/models/activitypub/context.ts +++ b/shared/models/activitypub/context.ts | |||
@@ -12,4 +12,5 @@ export type ContextType = | |||
12 | 'Rate' | | 12 | 'Rate' | |
13 | 'Flag' | | 13 | 'Flag' | |
14 | 'Actor' | | 14 | 'Actor' | |
15 | 'Collection' | 15 | 'Collection' | |
16 | 'WatchAction' | ||
diff --git a/shared/models/activitypub/objects/index.ts b/shared/models/activitypub/objects/index.ts index 9e2c6b728..47a8e847a 100644 --- a/shared/models/activitypub/objects/index.ts +++ b/shared/models/activitypub/objects/index.ts | |||
@@ -8,3 +8,4 @@ export * from './playlist-object' | |||
8 | export * from './video-comment-object' | 8 | export * from './video-comment-object' |
9 | export * from './video-torrent-object' | 9 | export * from './video-torrent-object' |
10 | export * from './view-object' | 10 | export * from './view-object' |
11 | export * from './watch-action-object' | ||
diff --git a/shared/models/activitypub/objects/watch-action-object.ts b/shared/models/activitypub/objects/watch-action-object.ts new file mode 100644 index 000000000..ed336602f --- /dev/null +++ b/shared/models/activitypub/objects/watch-action-object.ts | |||
@@ -0,0 +1,22 @@ | |||
1 | export interface WatchActionObject { | ||
2 | id: string | ||
3 | type: 'WatchAction' | ||
4 | |||
5 | startTime: string | ||
6 | endTime: string | ||
7 | |||
8 | location?: { | ||
9 | addressCountry: string | ||
10 | } | ||
11 | |||
12 | uuid: string | ||
13 | object: string | ||
14 | actionStatus: 'CompletedActionStatus' | ||
15 | |||
16 | duration: string | ||
17 | |||
18 | watchSections: { | ||
19 | startTimestamp: number | ||
20 | endTimestamp: number | ||
21 | }[] | ||
22 | } | ||
diff --git a/shared/models/server/debug.model.ts b/shared/models/server/debug.model.ts index 2ecabdeca..223d23362 100644 --- a/shared/models/server/debug.model.ts +++ b/shared/models/server/debug.model.ts | |||
@@ -4,5 +4,5 @@ export interface Debug { | |||
4 | } | 4 | } |
5 | 5 | ||
6 | export interface SendDebugCommand { | 6 | export interface SendDebugCommand { |
7 | command: 'remove-dandling-resumable-uploads' | 7 | command: 'remove-dandling-resumable-uploads' | 'process-video-views-buffer' | 'process-video-viewers' |
8 | } | 8 | } |
diff --git a/shared/models/users/index.ts b/shared/models/users/index.ts index a24ffee96..b25978587 100644 --- a/shared/models/users/index.ts +++ b/shared/models/users/index.ts | |||
@@ -12,5 +12,4 @@ export * from './user-scoped-token' | |||
12 | export * from './user-update-me.model' | 12 | export * from './user-update-me.model' |
13 | export * from './user-update.model' | 13 | export * from './user-update.model' |
14 | export * from './user-video-quota.model' | 14 | export * from './user-video-quota.model' |
15 | export * from './user-watching-video.model' | ||
16 | export * from './user.model' | 15 | export * from './user.model' |
diff --git a/shared/models/users/user-watching-video.model.ts b/shared/models/users/user-watching-video.model.ts deleted file mode 100644 index c22480595..000000000 --- a/shared/models/users/user-watching-video.model.ts +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | export interface UserWatchingVideo { | ||
2 | currentTime: number | ||
3 | } | ||
diff --git a/shared/models/videos/index.ts b/shared/models/videos/index.ts index 705e8d0ff..05497bda1 100644 --- a/shared/models/videos/index.ts +++ b/shared/models/videos/index.ts | |||
@@ -9,6 +9,7 @@ export * from './file' | |||
9 | export * from './import' | 9 | export * from './import' |
10 | export * from './playlist' | 10 | export * from './playlist' |
11 | export * from './rate' | 11 | export * from './rate' |
12 | export * from './stats' | ||
12 | export * from './transcoding' | 13 | export * from './transcoding' |
13 | 14 | ||
14 | export * from './nsfw-policy.type' | 15 | export * from './nsfw-policy.type' |
@@ -32,5 +33,6 @@ export * from './video-streaming-playlist.model' | |||
32 | export * from './video-streaming-playlist.type' | 33 | export * from './video-streaming-playlist.type' |
33 | 34 | ||
34 | export * from './video-update.model' | 35 | export * from './video-update.model' |
36 | export * from './video-view.model' | ||
35 | export * from './video.model' | 37 | export * from './video.model' |
36 | export * from './video-create-result.model' | 38 | export * from './video-create-result.model' |
diff --git a/shared/models/videos/stats/index.ts b/shared/models/videos/stats/index.ts new file mode 100644 index 000000000..d1e9c167c --- /dev/null +++ b/shared/models/videos/stats/index.ts | |||
@@ -0,0 +1,4 @@ | |||
1 | export * from './video-stats-overall.model' | ||
2 | export * from './video-stats-retention.model' | ||
3 | export * from './video-stats-timeserie.model' | ||
4 | export * from './video-stats-timeserie-metric.type' | ||
diff --git a/shared/models/videos/stats/video-stats-overall.model.ts b/shared/models/videos/stats/video-stats-overall.model.ts new file mode 100644 index 000000000..f2a0470ef --- /dev/null +++ b/shared/models/videos/stats/video-stats-overall.model.ts | |||
@@ -0,0 +1,17 @@ | |||
1 | export interface VideoStatsOverall { | ||
2 | averageWatchTime: number | ||
3 | totalWatchTime: number | ||
4 | |||
5 | viewersPeak: number | ||
6 | viewersPeakDate: string | ||
7 | |||
8 | views: number | ||
9 | likes: number | ||
10 | dislikes: number | ||
11 | comments: number | ||
12 | |||
13 | countries: { | ||
14 | isoCode: string | ||
15 | viewers: number | ||
16 | }[] | ||
17 | } | ||
diff --git a/shared/models/videos/stats/video-stats-retention.model.ts b/shared/models/videos/stats/video-stats-retention.model.ts new file mode 100644 index 000000000..e494888ed --- /dev/null +++ b/shared/models/videos/stats/video-stats-retention.model.ts | |||
@@ -0,0 +1,6 @@ | |||
1 | export interface VideoStatsRetention { | ||
2 | data: { | ||
3 | second: number | ||
4 | retentionPercent: number | ||
5 | }[] | ||
6 | } | ||
diff --git a/shared/models/videos/stats/video-stats-timeserie-metric.type.ts b/shared/models/videos/stats/video-stats-timeserie-metric.type.ts new file mode 100644 index 000000000..fc268d083 --- /dev/null +++ b/shared/models/videos/stats/video-stats-timeserie-metric.type.ts | |||
@@ -0,0 +1 @@ | |||
export type VideoStatsTimeserieMetric = 'viewers' | 'aggregateWatchTime' | |||
diff --git a/shared/models/videos/stats/video-stats-timeserie.model.ts b/shared/models/videos/stats/video-stats-timeserie.model.ts new file mode 100644 index 000000000..d95e34f1d --- /dev/null +++ b/shared/models/videos/stats/video-stats-timeserie.model.ts | |||
@@ -0,0 +1,6 @@ | |||
1 | export interface VideoStatsTimeserie { | ||
2 | data: { | ||
3 | date: string | ||
4 | value: number | ||
5 | }[] | ||
6 | } | ||
diff --git a/shared/models/videos/video-view.model.ts b/shared/models/videos/video-view.model.ts new file mode 100644 index 000000000..f61211104 --- /dev/null +++ b/shared/models/videos/video-view.model.ts | |||
@@ -0,0 +1,6 @@ | |||
1 | export type VideoViewEvent = 'seek' | ||
2 | |||
3 | export interface VideoView { | ||
4 | currentTime: number | ||
5 | viewEvent?: VideoViewEvent | ||
6 | } | ||
diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts index f98eed012..d9765dbd6 100644 --- a/shared/models/videos/video.model.ts +++ b/shared/models/videos/video.model.ts | |||
@@ -39,8 +39,7 @@ export interface Video { | |||
39 | url: string | 39 | url: string |
40 | 40 | ||
41 | views: number | 41 | views: number |
42 | // If live | 42 | viewers: number |
43 | viewers?: number | ||
44 | 43 | ||
45 | likes: number | 44 | likes: number |
46 | dislikes: number | 45 | dislikes: number |