Corrected missing connected_at and disconnected_at timestamps on /eve…

…ntsub/subscriptions
twitchdev · Apr 11, 2023 · 403aa18 · 403aa18
1 parent 4a59142
commit 403aa18
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/internal/events/websocket/mock_server/manager.go b/internal/events/websocket/mock_server/manager.go
@@ -272,8 +272,10 @@ func subscriptionPageHandlerGet(w http.ResponseWriter, r *http.Request) {
 					Condition: subscription.Conditions,
 					CreatedAt: subscription.CreatedAt,
 					Transport: SubscriptionTransport{
-						Method:    "websocket",
-						SessionID: fmt.Sprintf("%v_%v", server.ServerId, clientName),
+						Method:         "websocket",
+						SessionID:      fmt.Sprintf("%v_%v", server.ServerId, clientName),
+						ConnectedAt:    subscription.ClientConnectedAt,
+						DisconnectedAt: subscription.ClientDisconnectedAt,
 					},
 					Cost: 0,
 				})
@@ -379,6 +381,7 @@ func subscriptionPageHandlerPost(w http.ResponseWriter, r *http.Request) {
 		Status:            STATUS_ENABLED, // https://dev.twitch.tv/docs/api/reference/#get-eventsub-subscriptions
 		SessionClientName: clientName,
 		Conditions:        body.Condition,
+		ClientConnectedAt: client.ConnectedAtTimestamp,
 	}
 
 	var subs []Subscription

diff --git a/internal/events/websocket/mock_server/server.go b/internal/events/websocket/mock_server/server.go
@@ -491,6 +491,8 @@ func (ws *WebSocketServer) handleClientConnectionClose(client *Client, closeReas
 		for i := range subscriptions {
 			if subscriptions[i].Status == STATUS_ENABLED {
 				subscriptions[i].Status = getStatusFromCloseMessage(closeReason)
+				subscriptions[i].ClientConnectedAt = ""
+				subscriptions[i].ClientDisconnectedAt = time.Now().UTC().Format(time.RFC3339Nano)
 			}
 		}
 		ws.Subscriptions[client.clientName] = subscriptions

diff --git a/internal/events/websocket/mock_server/subscription.go b/internal/events/websocket/mock_server/subscription.go
@@ -11,6 +11,9 @@ type Subscription struct {
 	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
+
 	Conditions models.EventsubCondition // Values of the subscription's condition object
 }
 
@@ -71,9 +74,10 @@ type SubscriptionGetSuccessResponse struct {
 
 // Cross-usage
 type SubscriptionTransport struct {
-	Method      string `json:"method"`
-	SessionID   string `json:"session_id"`
-	ConnectedAt string `json:"connected_at,omitempty"`
+	Method         string `json:"method"`
+	SessionID      string `json:"session_id"`
+	ConnectedAt    string `json:"connected_at,omitempty"`
+	DisconnectedAt string `json:"disconnected_at,omitempty"`
 }
 
 // Cross-usage