ActivityPub-federated video streaming platform using P2P directly in your web browser
More robust quota exceeded handler
Chocobozzz6b7537b2129d
diff --git a/server/core/lib/live/live-manager.ts b/server/core/lib/live/live-manager.tsindex 785d893f1b..6a5feb7ad7 100644--- a/server/core/lib/live/live-manager.ts+++ b/server/core/lib/live/live-manager.ts@@ -183,10 +183,6 @@ class LiveManager {})}- isRunning () {- return !!this.rtmpServer- }-hasSession (sessionId: string) {return this.getContext().sessions.has(sessionId)}diff --git a/server/core/lib/live/shared/muxing-session.ts b/server/core/lib/live/shared/muxing-session.tsindex 8a5be65c67..838f1726bf 100644--- a/server/core/lib/live/shared/muxing-session.ts+++ b/server/core/lib/live/shared/muxing-session.ts@@ -259,7 +259,7 @@ class MuxingSession extends EventEmitter implements MuxingSession {private watchTSFiles () {const startStreamDateTime = new Date().getTime()- const addHandler = async (segmentPath: string) => {+ const addHandler = (segmentPath: string) => {if (segmentPath.endsWith('.ts') !== true) returnlogger.debug('Live add handler of TS file %s.', segmentPath, this.lTags())@@ -273,18 +273,9 @@ class MuxingSession extends EventEmitter implements MuxingSession {if (this.hasClientSocketInBadHealthWithCache(this.sessionId)) {this.emit('bad-socket-health', { videoUUID: this.videoUUID })- return- }-- // Duration constraint check- if (this.isDurationConstraintValid(startStreamDateTime) !== true) {+ } // Duration constraint check+ else if (this.isDurationConstraintValid(startStreamDateTime) !== true) {this.emit('duration-exceeded', { videoUUID: this.videoUUID })- return- }-- // Check user quota if the user enabled replay saving- if (await this.isQuotaExceeded(segmentPath) === true) {- this.emit('quota-exceeded', { videoUUID: this.videoUUID })}}@@ -379,6 +370,12 @@ class MuxingSession extends EventEmitter implements MuxingSession {}private async processSegment (segmentPath: string) {+ // Check user quota if the user enabled replay saving+ if (await this.isQuotaExceeded(segmentPath) === true) {+ this.emit('quota-exceeded', { videoUUID: this.videoUUID })+ return+ }+// Add sha hash of previous segments, because ffmpeg should have finished generating themawait this.liveSegmentShaStore.addSegmentSha(segmentPath)