fix tests and add lastReceivedMessageAt

example/subscription/subscription_test.go

@@ -530,8 +530,8 @@ func testSubscription_LifeCycleEvents(t *testing.T, syncMode bool) {
 		t.Fatalf("failed to listen OnSubscriptionComplete event. got %+v, want: %+v", len(subscriptionResults), len(fixtures))
 	}
 	for i, s := range subscriptionResults {
-		if s.GetID() != fixtures[i].ExpectedID {
-			t.Fatalf("%d: subscription id not matched, got: %s, want: %s", i, s.GetPayload().Query, fixtures[i].ExpectedPayload.Query)
+		if s.GetKey() != fixtures[i].ExpectedID {
+			t.Fatalf("%d: subscription id not matched, got: %s, want: %s", i, s.GetKey(), fixtures[i].ExpectedID)
 		}
 		if s.GetPayload().Query != fixtures[i].ExpectedPayload.Query {
 			t.Fatalf("%d: query output not matched, got: %s, want: %s", i, s.GetPayload().Query, fixtures[i].ExpectedPayload.Query)

subscription.go

@@ -138,11 +138,12 @@ type SubscriptionContext struct {
 	client        *SubscriptionClient
 	websocketConn WebsocketConn
 
-	connectionInitAt time.Time
-	acknowledged     int32
-	cancel           context.CancelFunc
-	subscriptions    map[string]Subscription
-	mutex            sync.Mutex
+	connectionInitAt      time.Time
+	lastReceivedMessageAt time.Time
+	acknowledged          int32
+	cancel                context.CancelFunc
+	subscriptions         map[string]Subscription
+	mutex                 sync.Mutex
 }
 
 // Log prints condition logging with message type filters
@@ -230,6 +231,13 @@ func (sc *SubscriptionContext) SetWebsocketConn(conn WebsocketConn) {
 	sc.websocketConn = conn
 }
 
+func (sc *SubscriptionContext) setLastReceivedMessageAt(t time.Time) {
+	sc.mutex.Lock()
+	defer sc.mutex.Unlock()
+
+	sc.lastReceivedMessageAt = t
+}
+
 // GetSubscription get the subscription state by id
 func (sc *SubscriptionContext) GetSubscription(id string) *Subscription {
 	sc.mutex.Lock()
@@ -384,6 +392,7 @@ func (sc *SubscriptionContext) init(parentContext context.Context) error {
 	}
 }
 
+// run the subscription client goroutine session to receive WebSocket messages.
 func (sc *SubscriptionContext) run() {
 	for {
 		select {
@@ -446,6 +455,7 @@ func (sc *SubscriptionContext) run() {
 				continue
 			}
 
+			sc.setLastReceivedMessageAt(time.Now())
 			sub := sc.GetSubscription(message.ID)
 			if sub == nil {
 				sub = &Subscription{}