singal

pkg/common/db/newRedisModel.go

@@ -123,6 +123,8 @@ func (d *DataBases) HandleSignalInfo(msg *pbCommon.MsgData) error {
 	case *pbRtc.SignalReq_InviteInGroup:
 		inviteeUserIDList = signalInfo.InviteInGroup.Invitation.InviteeUserIDList
 		isInviteSignal = true
+	case *pbRtc.SignalReq_HungUp, *pbRtc.SignalReq_Cancel, *pbRtc.SignalReq_Reject, *pbRtc.SignalReq_Accept:
+		return errors.New("signalInfo do not need offlinePush")
 	default:
 		log2.NewDebug("", utils.GetSelfFuncName(), "req invalid type", string(msg.Content))
 		return nil
@@ -175,7 +177,7 @@ func (d *DataBases) GetSignalInfoFromCacheByClientMsgID(clientMsgID string) (inv
 
 func (d *DataBases) GetAvailableSignalInvitationInfo(userID string) (invitationInfo *pbRtc.SignalInviteReq, err error) {
 	keyList := SignalListCache + userID
-	result := d.rdb.RPop(context.Background(), keyList)
+	result := d.rdb.LPop(context.Background(), keyList)
 	if err = result.Err(); err != nil {
 		return nil, utils.Wrap(err, "GetAvailableSignalInvitationInfo failed")
 	}

pkg/proto/rtc/rtc.proto

@@ -120,10 +120,11 @@ message InvitationInfo  {
     string customData = 3;
     string  groupID = 4;
     string roomID = 5;
-    int32 timeout = 6;
+    int32 initiateTime = 6;
-    string mediaType = 7;
+    int32 timeout = 7;
-     int32 platformID = 8;
+    string mediaType = 8;
-    int32   sessionType = 9;
+    int32 platformID = 9;
+    int32 sessionType = 10;
 }
 
 

pkg/proto/sdk_ws/ws.proto

@@ -492,10 +492,11 @@ message InvitationInfo  {
     string customData = 3;
     string  groupID = 4;
     string roomID = 5;
-    int32 timeout = 6;
+    int32 initiateTime = 6;
-    string mediaType = 7;
+    int32 timeout = 7;
-     int32 platformID = 8;
+    string mediaType = 8;
-    int32   sessionType = 9;
+     int32 platformID = 9;
+    int32   sessionType = 10;
 }
 
 message ParticipantMetaData{