fix: more verification before getting from cache

Author: jibon57

pkg/models/room_create.go

@@ -112,31 +112,26 @@ func (m *RoomModel) CreateRoom(r *plugnmeet.CreateRoomReq) (*plugnmeet.ActiveRoo
 	}
 
 	// now create room bucket
-	err = m.natsService.AddRoom(roomDbInfo.ID, r.RoomId, sid, r.EmptyTimeout, r.MaxParticipants, r.Metadata)
+	mt, err := m.natsService.AddRoom(roomDbInfo.ID, r.RoomId, sid, r.EmptyTimeout, r.MaxParticipants, r.Metadata)
 	if err != nil {
 		log.WithError(err).Error("failed to add room to nats")
 		return nil, err
 	}
 	log.Info("room added to nats")
 
-	rInfo, err := m.natsService.GetRoomInfo(r.RoomId)
-	if err != nil || rInfo == nil {
-		return nil, fmt.Errorf("room not found in KV")
-	}
-
 	// preload whiteboard file if needed
 	if !r.Metadata.IsBreakoutRoom {
 		go m.prepareWhiteboardPreloadFile(r.Metadata, r.RoomId, sid, log)
 	}
 
 	ari := &plugnmeet.ActiveRoomInfo{
-		RoomId:       rInfo.RoomId,
-		Sid:          rInfo.RoomSid,
+		RoomId:       r.RoomId,
+		Sid:          sid,
 		RoomTitle:    roomDbInfo.RoomTitle,
 		IsRunning:    1,
 		CreationTime: roomDbInfo.CreationTime,
 		WebhookUrl:   roomDbInfo.WebhookUrl,
-		Metadata:     rInfo.Metadata,
+		Metadata:     mt,
 	}
 
 	// create and send room_created webhook

pkg/services/nats/nats_cache_room.go

@@ -49,7 +49,7 @@ func (ncs *NatsCacheService) getCachedRoomInfo(roomID string) *plugnmeet.NatsKvR
 	ncs.roomLock.RLock()
 	defer ncs.roomLock.RUnlock()
 	if cachedEntry, found := ncs.roomsInfoStore[roomID]; found && cachedEntry.RoomInfo != nil {
-		if cachedEntry.RoomInfo.Status == RoomStatusEnded {
+		if cachedEntry.RoomInfo.DbTableId == 0 || cachedEntry.RoomInfo.Status == RoomStatusEnded {
 			return nil
 		}
 		infoCopy := proto.Clone(cachedEntry.RoomInfo).(*plugnmeet.NatsKvRoomInfo)

pkg/services/nats/nats_cache_user.go

@@ -94,7 +94,7 @@ func (ncs *NatsCacheService) getUserInfo(roomId, userId string) *plugnmeet.NatsK
 	ncs.roomLock.RLock()
 	defer ncs.roomLock.RUnlock()
 	if rm, found := ncs.roomUsersInfoStore[roomId]; found {
-		if entry, ok := rm[userId]; ok && entry.UserInfo != nil {
+		if entry, ok := rm[userId]; ok && entry.UserInfo != nil && entry.UserInfo.UserId != "" {
 			infoCopy := proto.Clone(entry.UserInfo).(*plugnmeet.NatsKvUserInfo)
 			return infoCopy
 		}

pkg/services/nats/room_modify.go

@@ -27,7 +27,7 @@ const (
 )
 
 // AddRoom creates a new room entry in the NATS JetStream Key-Value store
-func (s *NatsService) AddRoom(tableId uint64, roomId, roomSid string, emptyTimeout, maxParticipants *uint32, metadata *plugnmeet.RoomMetadata) error {
+func (s *NatsService) AddRoom(tableId uint64, roomId, roomSid string, emptyTimeout, maxParticipants *uint32, metadata *plugnmeet.RoomMetadata) (string, error) {
 	// Create or update the key-value bucket for the room
 	bucket := s.formatConsolidatedRoomBucket(roomId)
 	kv, err := s.js.CreateOrUpdateKeyValue(s.ctx, jetstream.KeyValueConfig{
@@ -36,7 +36,7 @@ func (s *NatsService) AddRoom(tableId uint64, roomId, roomSid string, emptyTimeo
 		TTL:      DefaultTTL,
 	})
 	if err != nil {
-		return fmt.Errorf("failed to create or update KV bucket: %w", err)
+		return "", fmt.Errorf("failed to create or update KV bucket: %w", err)
 	}
 
 	// Set default values if not provided
@@ -52,7 +52,7 @@ func (s *NatsService) AddRoom(tableId uint64, roomId, roomSid string, emptyTimeo
 	// Marshal metadata to string
 	mt, err := s.MarshalRoomMetadata(metadata)
 	if err != nil {
-		return fmt.Errorf("failed to marshal metadata: %w", err)
+		return "", fmt.Errorf("failed to marshal metadata: %w", err)
 	}
 
 	// Prepare room data
@@ -70,12 +70,12 @@ func (s *NatsService) AddRoom(tableId uint64, roomId, roomSid string, emptyTimeo
 	// Store each key-value pair
 	for k, v := range data {
 		if _, err := kv.PutString(s.ctx, k, v); err != nil {
-			return fmt.Errorf("failed to store room data for key %s: %w", k, err)
+			return "", fmt.Errorf("failed to store room data for key %s: %w", k, err)
 		}
 	}
 	// add room to watcher
 	s.cs.addRoomWatcher(kv, bucket, roomId)
-	return nil
+	return mt, nil
 }
 
 // updateRoomMetadata updates the metadata of an existing room