Fixed #265, added time checks for subscriptions disabled over 1 hour ago. Time check disabled when using Client-Id header with value 'debug'

Author: Xemdo

internal/events/websocket/mock_server/manager.go

@@ -263,7 +263,12 @@ func subscriptionPageHandlerGet(w http.ResponseWriter, r *http.Request) {
 
 	for clientName, clientSubscriptions := range server.Subscriptions {
 		for _, subscription := range clientSubscriptions {
-			if clientID == "debug" || subscription.ClientID == clientID {
+			disabledAndExpired := false // Production EventSub only shows disabled WebSocket subscriptions that were disabled under 1 hour ago
+			if subscription.DisabledAt != nil && subscription.DisabledAt.Add(time.Minute*2).Before(util.GetTimestamp()) {
+				disabledAndExpired = true
+			}
+
+			if clientID == "debug" || (subscription.ClientID == clientID && !disabledAndExpired) {
 				allSubscriptions = append(allSubscriptions, SubscriptionPostSuccessResponseBody{
 					ID:        subscription.ClientID,
 					Status:    subscription.Status,

internal/events/websocket/mock_server/rpc_handler.go

@@ -253,6 +253,12 @@ func RPCSubscriptionHandler(args rpc.RPCArgs) rpc.RPCResponse {
 				found = true
 
 				server.Subscriptions[client][i].Status = args.Variables["SubscriptionStatus"]
+				if args.Variables["SubscriptionStatus"] == STATUS_ENABLED {
+					server.Subscriptions[client][i].DisabledAt = nil
+				} else {
+					tNow := util.GetTimestamp()
+					server.Subscriptions[client][i].DisabledAt = &tNow
+				}
 				break
 			}
 		}

internal/events/websocket/mock_server/server.go

@@ -410,6 +410,8 @@ func (ws *WebSocketServer) HandleRPCEventSubForwarding(eventsubBody string, clie
 						foundClientId = sub.ClientID
 
 						ws.Subscriptions[client][i].Status = STATUS_AUTHORIZATION_REVOKED
+						tNow := util.GetTimestamp()
+						ws.Subscriptions[client][i].DisabledAt = &tNow
 						break
 					}
 				}
@@ -503,9 +505,12 @@ func (ws *WebSocketServer) handleClientConnectionClose(client *Client, closeReas
 		subscriptions := ws.Subscriptions[client.clientName]
 		for i := range subscriptions {
 			if subscriptions[i].Status == STATUS_ENABLED {
+				tNow := util.GetTimestamp()
+
 				subscriptions[i].Status = getStatusFromCloseMessage(closeReason)
 				subscriptions[i].ClientConnectedAt = ""
-				subscriptions[i].ClientDisconnectedAt = time.Now().UTC().Format(time.RFC3339Nano)
+				subscriptions[i].ClientDisconnectedAt = tNow.Format(time.RFC3339Nano)
+				subscriptions[i].DisabledAt = &tNow
 			}
 		}
 		ws.Subscriptions[client.clientName] = subscriptions

internal/events/websocket/mock_server/subscription.go

@@ -1,15 +1,20 @@
 package mock_server
 
-import "github.com/twitchdev/twitch-cli/internal/models"
+import (
+	"time"
+
+	"github.com/twitchdev/twitch-cli/internal/models"
+)
 
 type Subscription struct {
-	SubscriptionID    string // Random GUID for the subscription
-	ClientID          string // Client ID included in headers
-	Type              string // EventSub topic
-	Version           string // EventSub topic version
-	CreatedAt         string // Timestamp of when the subscription was created
-	Status            string // Status of the subscription
-	SessionClientName string // Client name of the session this is associated with.
+	SubscriptionID    string     // Random GUID for the subscription
+	ClientID          string     // Client ID included in headers
+	Type              string     // EventSub topic
+	Version           string     // EventSub topic version
+	CreatedAt         string     // Timestamp of when the subscription was created
+	DisabledAt        *time.Time // Not public; Timestamp of when the subscription was disabled
+	Status            string     // Status of the subscription
+	SessionClientName string     // Client name of the session this is associated with.
 
 	ClientConnectedAt    string // Time client connected
 	ClientDisconnectedAt string // Time client disconnected