luzifer/twitch-manager
1
0
Fork 0
mirror of https://github.com/Luzifer/twitch-manager.git synced 2024-09-18 18:32:57 +00:00
Code Issues Projects Releases Wiki Activity

Add storing / replaying events

Browse Source 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2021-05-09 18:39:30 +02:00
parent 0d0e1ca3e5
commit e0117c7cd1
Signed by: luzifer
GPG Key ID: 0066F03ED215AD7D
7 changed files with 82 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
api.go
View File

@ -28,12 +28,16 @@ const (
msgTypeStore string = "store"
msgTypeSub string = "sub"
msgTypeSubGift string = "subgift"
msgTypeReplay string = "replay"
)
var subscriptions = newSubscriptionStore()
type socketMessage struct {
Payload interface{} `json:"payload"`
Replay bool `json:"replay"`
Time *time.Time `json:"time,omitempty"`
Type string `json:"type"`
Version string `json:"version"`
}
@ -50,17 +54,38 @@ func newSubscriptionStore() *subcriptionStore {
}
}
func (s subcriptionStore) SendAllSockets(msgType string, msg interface{}) error {
func (s subcriptionStore) SendAllSockets(msgType string, msg interface{}, replay, storeEvent bool) error {
s.socketSubscriptionsLock.RLock()
defer s.socketSubscriptionsLock.RUnlock()
for _, hdl := range s.socketSubscriptions {
if err := hdl(compileSocketMessage(msgType, msg)); err != nil {
if err := hdl(compileSocketMessage(msgType, msg, replay, nil)); err != nil {
return errors.Wrap(err, "submit message")
}
}
return nil
if replay || !storeEvent {
return nil
}
if err := store.WithModLock(func() error {
data, err := json.Marshal(msg)
if err != nil {
return errors.Wrap(err, "marshalling message")
}
store.Events = append(store.Events, storedEvent{
Time: time.Now(),
Type: msgType,
Message: data,
})
return nil
}); err != nil {
return errors.Wrap(err, "storing event")
}
return errors.Wrap(store.Save(cfg.StoreFile), "saving store")
}
func (s *subcriptionStore) SubscribeSocket(id string, hdl func(socketMessage) error) {
@ -77,7 +102,7 @@ func (s *subcriptionStore) UnsubscribeSocket(id string) {
delete(s.socketSubscriptions, id)
}
func compileSocketMessage(msgType string, msg interface{}) socketMessage {
func compileSocketMessage(msgType string, msg interface{}, replay bool, overrideTime *time.Time) socketMessage {
versionParts := []string{version}
for _, asset := range assetVersions.Keys() {
versionParts = append(versionParts, assetVersions.Get(asset))
@ -88,11 +113,18 @@ func compileSocketMessage(msgType string, msg interface{}) socketMessage {
ver := fmt.Sprintf("%x", hash.Sum(nil))
return socketMessage{
out := socketMessage{
Payload: msg,
Replay: replay,
Type: msgType,
Version: ver,
}
if overrideTime != nil {
out.Time = overrideTime
}
return out
}
var upgrader = websocket.Upgrader{
@ -128,7 +160,7 @@ func handleCustomAlert(w http.ResponseWriter, r *http.Request) {
return
}
if err := subscriptions.SendAllSockets(msgTypeAlert, alert); err != nil {
if err := subscriptions.SendAllSockets(msgTypeAlert, alert, false, true); err != nil {
http.Error(w, errors.Wrap(err, "send to sockets").Error(), http.StatusInternalServerError)
return
}
@ -146,7 +178,7 @@ func handleCustomEvent(w http.ResponseWriter, r *http.Request) {
return
}
if err := subscriptions.SendAllSockets(msgTypeCustom, event); err != nil {
if err := subscriptions.SendAllSockets(msgTypeCustom, event, false, true); err != nil {
http.Error(w, errors.Wrap(err, "send to sockets").Error(), http.StatusInternalServerError)
return
}
@ -167,7 +199,7 @@ func handleSetLastFollower(w http.ResponseWriter, r *http.Request) {
log.WithError(err).Error("Unable to update persistent store")
}
if err := subscriptions.SendAllSockets(msgTypeStore, store); err != nil {
if err := subscriptions.SendAllSockets(msgTypeStore, store, false, false); err != nil {
log.WithError(err).Error("Unable to send update to all sockets")
}
@ -214,7 +246,7 @@ func handleUpdateSocket(w http.ResponseWriter, r *http.Request) {
}()
connLock.Lock()
if err := conn.WriteJSON(compileSocketMessage(msgTypeStore, store)); err != nil {
if err := conn.WriteJSON(compileSocketMessage(msgTypeStore, store, false, nil)); err != nil {
log.WithError(err).Error("Unable to send initial state")
return
}
@ -246,7 +278,31 @@ func handleUpdateSocket(w http.ResponseWriter, r *http.Request) {
continue
}
// FIXME: Do we need this?
_ = p
var recvMsg socketMessage
if err = json.Unmarshal(p, &recvMsg); err != nil {
log.Warn("Got unreadable message from socket, disconnecting...")
return
}
switch recvMsg.Type {
case msgTypeReplay:
if err = store.WithModRLock(func() error {
connLock.Lock()
defer connLock.Unlock()
for _, evt := range store.Events {
if err := conn.WriteJSON(compileSocketMessage(evt.Type, evt.Message, true, &evt.Time)); err != nil {
return errors.Wrap(err, "sending replay message")
}
}
return nil
}); err != nil {
log.WithError(err).Error("Unable to replay messages")
}
default:
log.WithField("type", recvMsg.Type).Warn("Got unexpected message type from frontend")
}
}
}

2
demo.go
View File

@ -87,7 +87,7 @@ func handleDemoAlert(w http.ResponseWriter, r *http.Request) {
return
}
if err := subscriptions.SendAllSockets(event, data); err != nil {
if err := subscriptions.SendAllSockets(event, data, false, false); err != nil {
http.Error(w, errors.Wrap(err, "send to sockets").Error(), http.StatusInternalServerError)
return
}

16
irc.go
View File

@ -176,7 +176,7 @@ func (ircHandler) handleTwitchPrivmsg(m *irc.Message) {
subscriptions.SendAllSockets(msgTypeHost, map[string]interface{}{
"from": matches[1],
"viewerCount": matches[2],
})
}, false, true)
}
// Handle bit-messages
@ -213,14 +213,14 @@ func (ircHandler) handleTwitchPrivmsg(m *irc.Message) {
// Send update to sockets
log.WithFields(log.Fields(fields)).Info("Bit donation")
subscriptions.SendAllSockets(msgTypeBits, fields)
subscriptions.SendAllSockets(msgTypeBits, fields, false, true)
// Execute store save
if err := store.Save(cfg.StoreFile); err != nil {
log.WithError(err).Error("Unable to update persistent store")
}
if err := store.WithModRLock(func() error { return subscriptions.SendAllSockets(msgTypeStore, store) }); err != nil {
if err := store.WithModRLock(func() error { return subscriptions.SendAllSockets(msgTypeStore, store, false, false) }); err != nil {
log.WithError(err).Error("Unable to send update to all sockets")
}
}
@ -249,7 +249,7 @@ func (ircHandler) handleTwitchUsernotice(m *irc.Message) {
}
log.WithFields(log.Fields(fields)).Info("Incoming raid")
subscriptions.SendAllSockets(msgTypeRaid, fields)
subscriptions.SendAllSockets(msgTypeRaid, fields, false, true)
case "sub", "resub":
fields := map[string]interface{}{
@ -281,14 +281,14 @@ func (ircHandler) handleTwitchUsernotice(m *irc.Message) {
// Send update to sockets
log.WithFields(log.Fields(fields)).Info("New subscriber")
subscriptions.SendAllSockets(msgTypeSub, fields)
subscriptions.SendAllSockets(msgTypeSub, fields, false, true)
// Execute store save
if err := store.Save(cfg.StoreFile); err != nil {
log.WithError(err).Error("Unable to update persistent store")
}
if err := store.WithModRLock(func() error { return subscriptions.SendAllSockets(msgTypeStore, store) }); err != nil {
if err := store.WithModRLock(func() error { return subscriptions.SendAllSockets(msgTypeStore, store, false, false) }); err != nil {
log.WithError(err).Error("Unable to send update to all sockets")
}
@ -328,14 +328,14 @@ func (ircHandler) handleTwitchUsernotice(m *irc.Message) {
// Send update to sockets
log.WithFields(log.Fields(fields)).Info("New sub-gift")
subscriptions.SendAllSockets(msgTypeSubGift, fields)
subscriptions.SendAllSockets(msgTypeSubGift, fields, false, true)
// Execute store save
if err := store.Save(cfg.StoreFile); err != nil {
log.WithError(err).Error("Unable to update persistent store")
}
if err := store.WithModRLock(func() error { return subscriptions.SendAllSockets(msgTypeStore, store) }); err != nil {
if err := store.WithModRLock(func() error { return subscriptions.SendAllSockets(msgTypeStore, store, false, false) }); err != nil {
log.WithError(err).Error("Unable to send update to all sockets")
}

2
main.go
View File

@ -135,7 +135,7 @@ func main() {
}
case <-timerForceSync.C:
if err := subscriptions.SendAllSockets(msgTypeStore, store); err != nil {
if err := subscriptions.SendAllSockets(msgTypeStore, store, false, false); err != nil {
log.WithError(err).Error("Unable to send store to all sockets")
}

2
stats.go
View File

@ -18,7 +18,7 @@ func updateStats() error {
for _, fn := range []func() error{
updateFollowers,
updateSubscriberCount,
func() error { return subscriptions.SendAllSockets(msgTypeStore, store) },
func() error { return subscriptions.SendAllSockets(msgTypeStore, store, false, false) },
} {
if err := fn(); err != nil {
return errors.Wrap(err, "update statistics module")

2
storage.go
View File

@ -21,7 +21,7 @@ type subscriber struct {
type storedEvent struct {
Time time.Time
Type string
Message map[string]interface{}
Message json.RawMessage
}
type storage struct {

6
webhook.go
View File

@ -81,7 +81,7 @@ func handleWebHookPush(w http.ResponseWriter, r *http.Request) {
"message": payload.Message,
}
if err := subscriptions.SendAllSockets(msgTypeDonation, fields); err != nil {
if err := subscriptions.SendAllSockets(msgTypeDonation, fields, false, true); err != nil {
log.WithError(err).Error("Unable to send update to all sockets")
}
@ -124,7 +124,7 @@ func handleWebHookPush(w http.ResponseWriter, r *http.Request) {
"followed_at": f.FollowedAt,
}
if err := subscriptions.SendAllSockets(msgTypeFollow, fields); err != nil {
if err := subscriptions.SendAllSockets(msgTypeFollow, fields, false, true); err != nil {
log.WithError(err).Error("Unable to send update to all sockets")
}
@ -147,7 +147,7 @@ func handleWebHookPush(w http.ResponseWriter, r *http.Request) {
logger.WithError(err).Error("Unable to update persistent store")
}
if err := store.WithModRLock(func() error { return subscriptions.SendAllSockets(msgTypeStore, store) }); err != nil {
if err := store.WithModRLock(func() error { return subscriptions.SendAllSockets(msgTypeStore, store, false, false) }); err != nil {
logger.WithError(err).Error("Unable to send update to all sockets")
}
}