b6f68628c0
* First pass at chat user registration and validation * Disable chat if the user is disabled/blocked or the server hits max connections * Handle dropping sockets if chat is disabled * Fix origin in automated chat test * Work for updated chat moderation * Chat message markdown rendering and fix tests * Put /api/chat behind a chat user access token. Closes #1085 * Reject blocked username changes * More WIP moderation * Defer configuring chat until we know if it is enabled. Closes #1135 * chat user blocking. Closes #1096 * Add tests around user access for #1096 * Add external integration chat message API + update integration auth middleware to pass along integration name. Closes #1092 * Delete old chat messages from db as to not hold on to excessive data. Closes #1152 * Add schema migration for messages. Closes #1155 * Commit updated API documentation * Add chat load test * Shared db mutex and db optimizations * Simplify past display name handling * Use a new test db for each test run * Wire up the external messages actions + add tests for them * Move access tokens to be actual users * Run message pruning at launch + fix comparison * Do not return API users in disabled users response * Fix incorrect highlighting. Closes #1160 * Consolidate user table statements * Set the max process connection limit to 70% of maximum * Fix wrong old display name being returned in name change event * Delete the old chat server files * Wire back up the webhooks * Remove unused * Invalidate user cache on changes * Do not send rendered body as RawBody * Some cleanup * Standardize names for external API users to ExternalAPIUser * Do not log token * Checkout branch when building admin for testing * Bundle in dev admin for testing * Some cleanup * Cleanup js logs * Cleanup and standardize event names * Clean up some logging * Update API spec. Closes #1133 * Commit updated API documentation * Change paths to be better named * Commit updated API documentation * Update admin bundle * Fix duplicate event name * Rename scope var * Update admin bundle * Move connected clients controller into admin package * Fix collecting usernames for autocomplete purposes * No longer generate username when it is empty * Sort clients and users by timestamp * Move file to admin controller package * Swap, so the comments stay correct Co-authored-by: Jannik <jannik@outlook.com> * Use explicit type alias Co-authored-by: Jannik <jannik@outlook.com> * Remove commented code. Co-authored-by: Jannik <jannik@outlook.com> * Cleanup test * Remove some extra logging * Add some clarity * Update dev instance of admin for testing * Consolidate lines Co-authored-by: Jannik <jannik@outlook.com> * Remove commented unused vars Co-authored-by: Jannik <jannik@outlook.com> * Until needed do not return IP address with client list * Fix typo of wrong var * Typo led to a bad test. Fix typo and fix test. * Guard against the socket reconnecting on error if previously set to shutdown * Do not log access tokens * Return success message on enable/disable user * Clean up some inactionable error messages. Sent ban message. Sort banned users. * fix styling for when chat is completely disabled * Unused * guard against nil clients * Update dev admin bundle * Do not unhide messages when unblocking user just to be safe. Send removal action from the controller * Add convinience function for getting active connections for a single user * Lock db on these mutations * Cleanup force disconnect using GetClientsForUser and capture client reference explicitly * No longer re-showing banned user messages for safety. Removing this test. * Remove no longer needed comment * Tweaks to forbidden username handling. - Standardize naming to not use "block" but "forbidden" instead. - Pass array over the wire instead of string. - Add API test - Fix default list incorrectly being appended to custom list. * Logging cleanup * Update dev admin bundle * Add an artificial delay in order to visually see message being hidden when testing * Remove the user cache as it is a premature optimization * When connected to chat let the user know their current user details to sync the username in the UI * On connected send current display name back to client. - Move name change out of chat component. - Add additional event type constants. * Fix broken workflow due to typo * Troubleshoot workflow * Bump htm from 3.0.4 to 3.1.0 in /build/javascript (#1181) * Bump htm from 3.0.4 to 3.1.0 in /build/javascript Bumps [htm](https://github.com/developit/htm) from 3.0.4 to 3.1.0. - [Release notes](https://github.com/developit/htm/releases) - [Commits](https://github.com/developit/htm/compare/3.0.4...3.1.0) --- updated-dependencies: - dependency-name: htm dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Run npm run build and update libraries Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gabe Kangas <gabek@real-ity.com> * Commit updated Javascript packages * Re-send current user info when a rejected name change takes place * All socket writes should be through the send chan and not directly * Seed the random generator * Add keys and indexes to users table * a util to generate consistent emoji markup * console clean up * mod tidy * Commit updated API documentation * Handle the max payload size of a socket message. - Only close socket if x2 greater than the max size. - Send the user a message if a message is too large. - Surface the max size in bytes in the config. * Update admin bundle * Force all events to be sent in their own socket message and do not concatinate in a single message * Update chat embed to register for access token * Use a different access token for embed chat * Update the chat message bubble background color to be bolder * add base tag to open links in new window, closes #1220 * Support text input of :emoji: in chat (#1190) * Initial implementation of emoji injection * fix bookkeeping with multiple emoji * make the emoji lookup case-insensitive * try another solution for Caretposition * add title to emojis minor refactoring * bind moji injection to InputKeyUp * simplify the code replace all found emojis * inject emoji if the modifer is released earlier * more efficient emoji tag search * use json emoji.emoji as url * use createEmojiMarkup() * move emojify() to chat.js * emojify on paste * cleanup emoji titles in paste * update inputText in InputKeyup * mark emoji titles with 2*zwnj this way paste cleanup will not interfere with text which include zwnj * emoji should not change the inputText * Do not show join messages when chat is offline. Closes #1224 - Show stream starting/ending messages in chat. - When stream starts show everyone the welcome message. * Force scrolling chat to bottom after history is populated regardless of scroll position. Closes https://github.com/owncast/owncast/issues/1222 * use maxSocketPayloadSize to calculate total bytes of message payload (#1221) * utilize maxSocketPayloadSize from config; update chatInput to calculate based on that value instead of text value; remove usage of inputText for counting * add a buffer to account for entire websocket payload for message char counting; trim nbsp;'s from ends of messages when calculating count Co-authored-by: Gabe Kangas <gabek@real-ity.com> Co-authored-by: Owncast <owncast@owncast.online> Co-authored-by: Jannik <jannik@outlook.com> Co-authored-by: Ginger Wong <omqmail@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Meisam <39205857+MFTabriz@users.noreply.github.com>
150 lines
4.0 KiB
Go
150 lines
4.0 KiB
Go
package core
|
|
|
|
import (
|
|
"math"
|
|
"sync"
|
|
"time"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
|
|
"github.com/owncast/owncast/core/data"
|
|
"github.com/owncast/owncast/geoip"
|
|
"github.com/owncast/owncast/models"
|
|
)
|
|
|
|
var l = &sync.RWMutex{}
|
|
var _activeViewerPurgeTimeout = time.Second * 10
|
|
|
|
func setupStats() error {
|
|
s := getSavedStats()
|
|
_stats = &s
|
|
|
|
statsSaveTimer := time.NewTicker(1 * time.Minute)
|
|
go func() {
|
|
for range statsSaveTimer.C {
|
|
if err := saveStats(); err != nil {
|
|
panic(err)
|
|
}
|
|
}
|
|
}()
|
|
|
|
viewerCountPruneTimer := time.NewTicker(5 * time.Second)
|
|
go func() {
|
|
for range viewerCountPruneTimer.C {
|
|
pruneViewerCount()
|
|
}
|
|
}()
|
|
|
|
return nil
|
|
}
|
|
|
|
// IsStreamConnected checks if the stream is connected or not.
|
|
func IsStreamConnected() bool {
|
|
if !_stats.StreamConnected {
|
|
return false
|
|
}
|
|
|
|
// Kind of a hack. It takes a handful of seconds between a RTMP connection and when HLS data is available.
|
|
// So account for that with an artificial buffer of four segments.
|
|
timeSinceLastConnected := time.Since(_stats.LastConnectTime.Time).Seconds()
|
|
waitTime := math.Max(float64(data.GetStreamLatencyLevel().SecondsPerSegment)*3.0, 7)
|
|
if timeSinceLastConnected < waitTime {
|
|
return false
|
|
}
|
|
|
|
return _stats.StreamConnected
|
|
}
|
|
|
|
// SetChatClientActive sets a client as active and connected.
|
|
func SetChatClientActive(client models.Client) {
|
|
l.Lock()
|
|
defer l.Unlock()
|
|
|
|
// If this clientID already exists then update it.
|
|
// Otherwise set a new one.
|
|
if existingClient, ok := _stats.ChatClients[client.ClientID]; ok {
|
|
existingClient.LastSeen = time.Now()
|
|
existingClient.Username = client.Username
|
|
existingClient.MessageCount = client.MessageCount
|
|
existingClient.Geo = geoip.GetGeoFromIP(existingClient.IPAddress)
|
|
_stats.ChatClients[client.ClientID] = existingClient
|
|
} else {
|
|
if client.Geo == nil {
|
|
geoip.FetchGeoForIP(client.IPAddress)
|
|
}
|
|
_stats.ChatClients[client.ClientID] = client
|
|
}
|
|
}
|
|
|
|
// RemoveChatClient removes a client from the active clients record.
|
|
func RemoveChatClient(clientID string) {
|
|
log.Trace("Removing the client:", clientID)
|
|
|
|
l.Lock()
|
|
delete(_stats.ChatClients, clientID)
|
|
l.Unlock()
|
|
}
|
|
|
|
// SetViewerIdActive sets a client as active and connected.
|
|
func SetViewerIdActive(id string) {
|
|
l.Lock()
|
|
defer l.Unlock()
|
|
|
|
_stats.Viewers[id] = time.Now()
|
|
|
|
// Don't update viewer counts if a live stream session is not active.
|
|
if _stats.StreamConnected {
|
|
_stats.SessionMaxViewerCount = int(math.Max(float64(len(_stats.Viewers)), float64(_stats.SessionMaxViewerCount)))
|
|
_stats.OverallMaxViewerCount = int(math.Max(float64(_stats.SessionMaxViewerCount), float64(_stats.OverallMaxViewerCount)))
|
|
}
|
|
}
|
|
|
|
func pruneViewerCount() {
|
|
viewers := make(map[string]time.Time)
|
|
|
|
for viewerId := range _stats.Viewers {
|
|
viewerLastSeenTime := _stats.Viewers[viewerId]
|
|
if time.Since(viewerLastSeenTime) < _activeViewerPurgeTimeout {
|
|
viewers[viewerId] = viewerLastSeenTime
|
|
}
|
|
}
|
|
|
|
_stats.Viewers = viewers
|
|
}
|
|
|
|
func saveStats() error {
|
|
if err := data.SetPeakOverallViewerCount(_stats.OverallMaxViewerCount); err != nil {
|
|
log.Errorln("error saving viewer count", err)
|
|
}
|
|
if err := data.SetPeakSessionViewerCount(_stats.SessionMaxViewerCount); err != nil {
|
|
log.Errorln("error saving viewer count", err)
|
|
}
|
|
if _stats.LastDisconnectTime.Valid {
|
|
if err := data.SetLastDisconnectTime(_stats.LastConnectTime.Time); err != nil {
|
|
log.Errorln("error saving disconnect time", err)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func getSavedStats() models.Stats {
|
|
savedLastDisconnectTime, _ := data.GetLastDisconnectTime()
|
|
|
|
result := models.Stats{
|
|
ChatClients: make(map[string]models.Client),
|
|
Viewers: make(map[string]time.Time),
|
|
SessionMaxViewerCount: data.GetPeakSessionViewerCount(),
|
|
OverallMaxViewerCount: data.GetPeakOverallViewerCount(),
|
|
LastDisconnectTime: savedLastDisconnectTime,
|
|
}
|
|
|
|
// If the stats were saved > 5min ago then ignore the
|
|
// peak session count value, since the session is over.
|
|
if !result.LastDisconnectTime.Valid || time.Since(result.LastDisconnectTime.Time).Minutes() > 5 {
|
|
result.SessionMaxViewerCount = 0
|
|
}
|
|
|
|
return result
|
|
}
|