yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-05 19:42:24 +02:00
Code Issues Releases Wiki Activity

Use sessionId instead of IP to identify viewer

Browse source 
Breaking: YAML config `ip_view_expiration` is renamed `view_expiration`
Breaking: Views are taken into account after 10 seconds instead of 30
seconds (can be changed in YAML config)

Purpose of this commit is to get closer to other video platforms where
some platforms count views on play (mux, vimeo) or others use a very low
delay (instagram, tiktok)

We also want to improve the viewer identification, where we no longer
use the IP but the `sessionId` generated by the web browser. Multiple
viewers behind a NAT can now be able to be identified as independent
viewers (this method is also used by vimeo or mux)
This commit is contained in:
Chocobozzz 2024-04-04 11:30:30 +02:00
parent 6f6abcabfb
commit 5cb3e6a0b8
No known key found for this signature in database
GPG key ID: 583A612D890159BE
25 changed files with 913 additions and 660 deletions
Download patch file Download diff file Expand all files Collapse all files

30
server/core/lib/views/shared/video-views.ts
View file

@ -1,12 +1,13 @@
import { buildUUID } from '@peertube/peertube-node-utils'
import { logger, loggerTagsFactory } from '@server/helpers/logger.js'
import { VIEW_LIFETIME } from '@server/initializers/constants.js'
import { sendView } from '@server/lib/activitypub/send/send-view.js'
import { getCachedVideoDuration } from '@server/lib/video.js'
import { getServerActor } from '@server/models/application/application.js'
import { MVideo, MVideoImmutable } from '@server/types/models/index.js'
import { buildUUID } from '@peertube/peertube-node-utils'
import { Redis } from '../../redis.js'
import { LRUCache } from 'lru-cache'
import { VIEW_LIFETIME } from '@server/initializers/constants.js'
import { Redis } from '../../redis.js'
import { CONFIG } from '@server/initializers/config.js'
const lTags = loggerTagsFactory('views')
@ -19,19 +20,19 @@ export class VideoViews {
async addLocalView (options: {
video: MVideoImmutable
ip: string
sessionId: string
watchTime: number
}) {
const { video, ip, watchTime } = options
const { video, sessionId, watchTime } = options
logger.debug('Adding local view to video %s.', video.uuid, { watchTime, ...lTags(video.uuid) })
if (!await this.hasEnoughWatchTime(video, watchTime)) return false
const viewExists = await this.doesVideoIPViewExist(ip, video.uuid)
const viewExists = await this.doesVideoSessionIdViewExist(sessionId, video.uuid)
if (viewExists) return false
await this.setIPVideoView(ip, video.uuid)
await this.setSessionIdVideoView(sessionId, video.uuid)
await this.addView(video)
@ -69,24 +70,25 @@ export class VideoViews {
private async hasEnoughWatchTime (video: MVideoImmutable, watchTime: number) {
const { duration, isLive } = await getCachedVideoDuration(video.id)
if (isLive || duration >= 30) return watchTime >= 30
const countViewAfterSeconds = CONFIG.VIEWS.VIDEOS.COUNT_VIEW_AFTER / 1000 // Config is in ms
if (isLive || duration >= countViewAfterSeconds) return watchTime >= countViewAfterSeconds
// Check more than 50% of the video is watched
return duration / watchTime < 2
}
private doesVideoIPViewExist (ip: string, videoUUID: string) {
const key = Redis.Instance.generateIPViewKey(ip, videoUUID)
private doesVideoSessionIdViewExist (sessionId: string, videoUUID: string) {
const key = Redis.Instance.generateSessionIdViewKey(sessionId, videoUUID)
const value = this.viewsCache.has(key)
if (value === true) return Promise.resolve(true)
return Redis.Instance.doesVideoIPViewExist(ip, videoUUID)
return Redis.Instance.doesVideoSessionIdViewExist(sessionId, videoUUID)
}
private setIPVideoView (ip: string, videoUUID: string) {
const key = Redis.Instance.generateIPViewKey(ip, videoUUID)
private setSessionIdVideoView (sessionId: string, videoUUID: string) {
const key = Redis.Instance.generateSessionIdViewKey(sessionId, videoUUID)
this.viewsCache.set(key, true)
return Redis.Instance.setIPVideoView(ip, videoUUID)
return Redis.Instance.setSessionIdVideoView(sessionId, videoUUID)
}
}