Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun

internal/msg_gateway/gate/open_im_media/room.go

@@ -2,6 +2,7 @@ package open_im_media
 
 import (
 	pbRtc "Open_IM/pkg/proto/rtc"
+	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
 	"context"
 	"errors"
 	"google.golang.org/grpc"
@@ -32,14 +33,14 @@ func (m *Media) GetUrl() string {
 	return m.MediaAddress
 }
 
-func (m *Media) GetJoinToken(room, identity string, operationID string) (string, error) {
+func (m *Media) GetJoinToken(room, identity string, operationID string, data *open_im_sdk.ParticipantMetaData) (string, error) {
 	conn, err := grpc.Dial(Address, grpc.WithInsecure())
 	if err != nil {
 		return "", err
 	}
 	defer conn.Close()
 	c := pbRtc.NewRtcServiceClient(conn)
-	req := &pbRtc.GetJoinTokenReq{ApiKey: m.ApiKey, ApiSecret: m.ApiSecret, Room: room, OperationID: operationID, Identity: identity}
+	req := &pbRtc.GetJoinTokenReq{ApiKey: m.ApiKey, ApiSecret: m.ApiSecret, Room: room, OperationID: operationID, Identity: identity, MetaData: data}
 	resp, err := c.GetJoinToken(context.Background(), req)
 	if err != nil {
 		return "", err

internal/msg_gateway/gate/validate.go

@@ -145,9 +145,9 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID s
 		//
 		//}
 
-		token, err2 := media.GetJoinToken(payload.Invite.Invitation.RoomID, payload.Invite.Invitation.InviterUserID, operationID)
+		token, err2 := media.GetJoinToken(payload.Invite.Invitation.RoomID, payload.Invite.Invitation.InviterUserID, operationID, payload.Invite.Participant)
 		if err2 != nil {
-			return false, 201, err2.Error(), nil, nil
+			return false, 202, err2.Error(), nil, nil
 		}
 		invite := open_im_sdk.SignalResp_Invite{&open_im_sdk.SignalInviteReply{
 			Token:   token,
@@ -162,7 +162,7 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID s
 		if len(payload.Invite.Invitation.InviteeUserIDList) > 0 {
 			msg.RecvID = payload.Invite.Invitation.InviteeUserIDList[0]
 		} else {
-			return false, 201, errors.New("InviteeUserIDList is null").Error(), nil, nil
+			return false, 203, errors.New("InviteeUserIDList is null").Error(), nil, nil
 		}
 		msg.ClientMsgID = utils.GetMsgID(payload.Invite.Invitation.InviterUserID)
 		return true, 0, "", &resp, &msg
@@ -172,9 +172,9 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID s
 		//	return false, 201, err.Error(), nil, nil
 		//
 		//}
-		token, err2 := media.GetJoinToken(payload.InviteInGroup.Invitation.RoomID, payload.InviteInGroup.Invitation.InviterUserID, operationID)
+		token, err2 := media.GetJoinToken(payload.InviteInGroup.Invitation.RoomID, payload.InviteInGroup.Invitation.InviterUserID, operationID, payload.InviteInGroup.Participant)
 		if err2 != nil {
-			return false, 201, err2.Error(), nil, nil
+			return false, 204, err2.Error(), nil, nil
 		}
 		inviteGroup := open_im_sdk.SignalResp_InviteInGroup{&open_im_sdk.SignalInviteInGroupReply{
 			RoomID:  payload.InviteInGroup.Invitation.RoomID,
@@ -189,7 +189,7 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID s
 		if len(payload.InviteInGroup.Invitation.InviteeUserIDList) > 0 {
 			msg.GroupID = payload.InviteInGroup.Invitation.GroupID
 		} else {
-			return false, 201, errors.New("InviteeUserIDList is null").Error(), nil, nil
+			return false, 205, errors.New("InviteeUserIDList is null").Error(), nil, nil
 		}
 		msg.ClientMsgID = utils.GetMsgID(payload.InviteInGroup.Invitation.InviterUserID)
 
@@ -209,14 +209,14 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID s
 				msg.GroupID = payload.Cancel.Invitation.GroupID
 			}
 		} else {
-			return false, 201, errors.New("InviteeUserIDList is null").Error(), nil, nil
+			return false, 206, errors.New("InviteeUserIDList is null").Error(), nil, nil
 		}
 		msg.ClientMsgID = utils.GetMsgID(payload.Cancel.OpUserID)
 		return true, 0, "", &resp, &msg
 	case *open_im_sdk.SignalReq_Accept:
-		token, err2 := media.GetJoinToken(payload.Accept.Invitation.RoomID, payload.Accept.OpUserID, operationID)
+		token, err2 := media.GetJoinToken(payload.Accept.Invitation.RoomID, payload.Accept.OpUserID, operationID, payload.Accept.Participant)
 		if err2 != nil {
-			return false, 201, err2.Error(), nil, nil
+			return false, 207, err2.Error(), nil, nil
 		}
 		accept := open_im_sdk.SignalResp_Accept{&open_im_sdk.SignalAcceptReply{
 			Token:   token,
@@ -236,7 +236,7 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID s
 				msg.GroupID = payload.Accept.Invitation.GroupID
 			}
 		} else {
-			return false, 201, errors.New("InviteeUserIDList is null").Error(), nil, nil
+			return false, 208, errors.New("InviteeUserIDList is null").Error(), nil, nil
 		}
 		msg.ClientMsgID = utils.GetMsgID(payload.Accept.OpUserID)
 		return true, 0, "", &resp, &msg
@@ -256,10 +256,10 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID s
 				msg.GroupID = payload.Reject.Invitation.GroupID
 			}
 		} else {
-			return false, 201, errors.New("InviteeUserIDList is null").Error(), nil, nil
+			return false, 209, errors.New("InviteeUserIDList is null").Error(), nil, nil
 		}
 		msg.ClientMsgID = utils.GetMsgID(payload.Reject.OpUserID)
 		return true, 0, "", &resp, &msg
 	}
-	return false, 201, errors.New("InviteeUserIDList is null").Error(), nil, nil
+	return false, 210, errors.New("InviteeUserIDList is null").Error(), nil, nil
 }

pkg/proto/sdk_ws/ws.pb.go

@@ -40,7 +40,7 @@ func (m *GroupInfo) Reset()         { *m = GroupInfo{} }
 func (m *GroupInfo) String() string { return proto.CompactTextString(m) }
 func (*GroupInfo) ProtoMessage()    {}
 func (*GroupInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{0}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{0}
 }
 func (m *GroupInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupInfo.Unmarshal(m, b)
@@ -164,7 +164,7 @@ func (m *GroupMemberFullInfo) Reset()         { *m = GroupMemberFullInfo{} }
 func (m *GroupMemberFullInfo) String() string { return proto.CompactTextString(m) }
 func (*GroupMemberFullInfo) ProtoMessage()    {}
 func (*GroupMemberFullInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{1}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{1}
 }
 func (m *GroupMemberFullInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupMemberFullInfo.Unmarshal(m, b)
@@ -269,7 +269,7 @@ func (m *PublicUserInfo) Reset()         { *m = PublicUserInfo{} }
 func (m *PublicUserInfo) String() string { return proto.CompactTextString(m) }
 func (*PublicUserInfo) ProtoMessage()    {}
 func (*PublicUserInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{2}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{2}
 }
 func (m *PublicUserInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PublicUserInfo.Unmarshal(m, b)
@@ -344,7 +344,7 @@ func (m *UserInfo) Reset()         { *m = UserInfo{} }
 func (m *UserInfo) String() string { return proto.CompactTextString(m) }
 func (*UserInfo) ProtoMessage()    {}
 func (*UserInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{3}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{3}
 }
 func (m *UserInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserInfo.Unmarshal(m, b)
@@ -451,7 +451,7 @@ func (m *FriendInfo) Reset()         { *m = FriendInfo{} }
 func (m *FriendInfo) String() string { return proto.CompactTextString(m) }
 func (*FriendInfo) ProtoMessage()    {}
 func (*FriendInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{4}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{4}
 }
 func (m *FriendInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FriendInfo.Unmarshal(m, b)
@@ -536,7 +536,7 @@ func (m *BlackInfo) Reset()         { *m = BlackInfo{} }
 func (m *BlackInfo) String() string { return proto.CompactTextString(m) }
 func (*BlackInfo) ProtoMessage()    {}
 func (*BlackInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{5}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{5}
 }
 func (m *BlackInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BlackInfo.Unmarshal(m, b)
@@ -617,7 +617,7 @@ func (m *GroupRequest) Reset()         { *m = GroupRequest{} }
 func (m *GroupRequest) String() string { return proto.CompactTextString(m) }
 func (*GroupRequest) ProtoMessage()    {}
 func (*GroupRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{6}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{6}
 }
 func (m *GroupRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupRequest.Unmarshal(m, b)
@@ -725,7 +725,7 @@ func (m *FriendRequest) Reset()         { *m = FriendRequest{} }
 func (m *FriendRequest) String() string { return proto.CompactTextString(m) }
 func (*FriendRequest) ProtoMessage()    {}
 func (*FriendRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{7}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{7}
 }
 func (m *FriendRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FriendRequest.Unmarshal(m, b)
@@ -863,7 +863,7 @@ func (m *PullMessageBySeqListResp) Reset()         { *m = PullMessageBySeqListRe
 func (m *PullMessageBySeqListResp) String() string { return proto.CompactTextString(m) }
 func (*PullMessageBySeqListResp) ProtoMessage()    {}
 func (*PullMessageBySeqListResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{8}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{8}
 }
 func (m *PullMessageBySeqListResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PullMessageBySeqListResp.Unmarshal(m, b)
@@ -917,7 +917,7 @@ func (m *PullMessageBySeqListReq) Reset()         { *m = PullMessageBySeqListReq
 func (m *PullMessageBySeqListReq) String() string { return proto.CompactTextString(m) }
 func (*PullMessageBySeqListReq) ProtoMessage()    {}
 func (*PullMessageBySeqListReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{9}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{9}
 }
 func (m *PullMessageBySeqListReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PullMessageBySeqListReq.Unmarshal(m, b)
@@ -968,7 +968,7 @@ func (m *GetMaxAndMinSeqReq) Reset()         { *m = GetMaxAndMinSeqReq{} }
 func (m *GetMaxAndMinSeqReq) String() string { return proto.CompactTextString(m) }
 func (*GetMaxAndMinSeqReq) ProtoMessage()    {}
 func (*GetMaxAndMinSeqReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{10}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{10}
 }
 func (m *GetMaxAndMinSeqReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetMaxAndMinSeqReq.Unmarshal(m, b)
@@ -1000,7 +1000,7 @@ func (m *GetMaxAndMinSeqResp) Reset()         { *m = GetMaxAndMinSeqResp{} }
 func (m *GetMaxAndMinSeqResp) String() string { return proto.CompactTextString(m) }
 func (*GetMaxAndMinSeqResp) ProtoMessage()    {}
 func (*GetMaxAndMinSeqResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{11}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{11}
 }
 func (m *GetMaxAndMinSeqResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetMaxAndMinSeqResp.Unmarshal(m, b)
@@ -1047,7 +1047,7 @@ func (m *UserSendMsgResp) Reset()         { *m = UserSendMsgResp{} }
 func (m *UserSendMsgResp) String() string { return proto.CompactTextString(m) }
 func (*UserSendMsgResp) ProtoMessage()    {}
 func (*UserSendMsgResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{12}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{12}
 }
 func (m *UserSendMsgResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserSendMsgResp.Unmarshal(m, b)
@@ -1116,7 +1116,7 @@ func (m *MsgData) Reset()         { *m = MsgData{} }
 func (m *MsgData) String() string { return proto.CompactTextString(m) }
 func (*MsgData) ProtoMessage()    {}
 func (*MsgData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{13}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{13}
 }
 func (m *MsgData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MsgData.Unmarshal(m, b)
@@ -1277,7 +1277,7 @@ func (m *OfflinePushInfo) Reset()         { *m = OfflinePushInfo{} }
 func (m *OfflinePushInfo) String() string { return proto.CompactTextString(m) }
 func (*OfflinePushInfo) ProtoMessage()    {}
 func (*OfflinePushInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{14}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{14}
 }
 func (m *OfflinePushInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OfflinePushInfo.Unmarshal(m, b)
@@ -1345,7 +1345,7 @@ func (m *TipsComm) Reset()         { *m = TipsComm{} }
 func (m *TipsComm) String() string { return proto.CompactTextString(m) }
 func (*TipsComm) ProtoMessage()    {}
 func (*TipsComm) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{15}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{15}
 }
 func (m *TipsComm) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_TipsComm.Unmarshal(m, b)
@@ -1402,7 +1402,7 @@ func (m *GroupCreatedTips) Reset()         { *m = GroupCreatedTips{} }
 func (m *GroupCreatedTips) String() string { return proto.CompactTextString(m) }
 func (*GroupCreatedTips) ProtoMessage()    {}
 func (*GroupCreatedTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{16}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{16}
 }
 func (m *GroupCreatedTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupCreatedTips.Unmarshal(m, b)
@@ -1471,7 +1471,7 @@ func (m *GroupInfoSetTips) Reset()         { *m = GroupInfoSetTips{} }
 func (m *GroupInfoSetTips) String() string { return proto.CompactTextString(m) }
 func (*GroupInfoSetTips) ProtoMessage()    {}
 func (*GroupInfoSetTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{17}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{17}
 }
 func (m *GroupInfoSetTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupInfoSetTips.Unmarshal(m, b)
@@ -1526,7 +1526,7 @@ func (m *JoinGroupApplicationTips) Reset()         { *m = JoinGroupApplicationTi
 func (m *JoinGroupApplicationTips) String() string { return proto.CompactTextString(m) }
 func (*JoinGroupApplicationTips) ProtoMessage()    {}
 func (*JoinGroupApplicationTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{18}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{18}
 }
 func (m *JoinGroupApplicationTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_JoinGroupApplicationTips.Unmarshal(m, b)
@@ -1582,7 +1582,7 @@ func (m *MemberQuitTips) Reset()         { *m = MemberQuitTips{} }
 func (m *MemberQuitTips) String() string { return proto.CompactTextString(m) }
 func (*MemberQuitTips) ProtoMessage()    {}
 func (*MemberQuitTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{19}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{19}
 }
 func (m *MemberQuitTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MemberQuitTips.Unmarshal(m, b)
@@ -1637,7 +1637,7 @@ func (m *GroupApplicationAcceptedTips) Reset()         { *m = GroupApplicationAc
 func (m *GroupApplicationAcceptedTips) String() string { return proto.CompactTextString(m) }
 func (*GroupApplicationAcceptedTips) ProtoMessage()    {}
 func (*GroupApplicationAcceptedTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{20}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{20}
 }
 func (m *GroupApplicationAcceptedTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupApplicationAcceptedTips.Unmarshal(m, b)
@@ -1692,7 +1692,7 @@ func (m *GroupApplicationRejectedTips) Reset()         { *m = GroupApplicationRe
 func (m *GroupApplicationRejectedTips) String() string { return proto.CompactTextString(m) }
 func (*GroupApplicationRejectedTips) ProtoMessage()    {}
 func (*GroupApplicationRejectedTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{21}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{21}
 }
 func (m *GroupApplicationRejectedTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupApplicationRejectedTips.Unmarshal(m, b)
@@ -1748,7 +1748,7 @@ func (m *GroupOwnerTransferredTips) Reset()         { *m = GroupOwnerTransferred
 func (m *GroupOwnerTransferredTips) String() string { return proto.CompactTextString(m) }
 func (*GroupOwnerTransferredTips) ProtoMessage()    {}
 func (*GroupOwnerTransferredTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{22}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{22}
 }
 func (m *GroupOwnerTransferredTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupOwnerTransferredTips.Unmarshal(m, b)
@@ -1811,7 +1811,7 @@ func (m *MemberKickedTips) Reset()         { *m = MemberKickedTips{} }
 func (m *MemberKickedTips) String() string { return proto.CompactTextString(m) }
 func (*MemberKickedTips) ProtoMessage()    {}
 func (*MemberKickedTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{23}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{23}
 }
 func (m *MemberKickedTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MemberKickedTips.Unmarshal(m, b)
@@ -1874,7 +1874,7 @@ func (m *MemberInvitedTips) Reset()         { *m = MemberInvitedTips{} }
 func (m *MemberInvitedTips) String() string { return proto.CompactTextString(m) }
 func (*MemberInvitedTips) ProtoMessage()    {}
 func (*MemberInvitedTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{24}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{24}
 }
 func (m *MemberInvitedTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MemberInvitedTips.Unmarshal(m, b)
@@ -1936,7 +1936,7 @@ func (m *MemberEnterTips) Reset()         { *m = MemberEnterTips{} }
 func (m *MemberEnterTips) String() string { return proto.CompactTextString(m) }
 func (*MemberEnterTips) ProtoMessage()    {}
 func (*MemberEnterTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{25}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{25}
 }
 func (m *MemberEnterTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MemberEnterTips.Unmarshal(m, b)
@@ -1990,7 +1990,7 @@ func (m *FriendApplication) Reset()         { *m = FriendApplication{} }
 func (m *FriendApplication) String() string { return proto.CompactTextString(m) }
 func (*FriendApplication) ProtoMessage()    {}
 func (*FriendApplication) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{26}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{26}
 }
 func (m *FriendApplication) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FriendApplication.Unmarshal(m, b)
@@ -2043,7 +2043,7 @@ func (m *FromToUserID) Reset()         { *m = FromToUserID{} }
 func (m *FromToUserID) String() string { return proto.CompactTextString(m) }
 func (*FromToUserID) ProtoMessage()    {}
 func (*FromToUserID) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{27}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{27}
 }
 func (m *FromToUserID) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FromToUserID.Unmarshal(m, b)
@@ -2089,7 +2089,7 @@ func (m *FriendApplicationTips) Reset()         { *m = FriendApplicationTips{} }
 func (m *FriendApplicationTips) String() string { return proto.CompactTextString(m) }
 func (*FriendApplicationTips) ProtoMessage()    {}
 func (*FriendApplicationTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{28}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{28}
 }
 func (m *FriendApplicationTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FriendApplicationTips.Unmarshal(m, b)
@@ -2129,7 +2129,7 @@ func (m *FriendApplicationApprovedTips) Reset()         { *m = FriendApplication
 func (m *FriendApplicationApprovedTips) String() string { return proto.CompactTextString(m) }
 func (*FriendApplicationApprovedTips) ProtoMessage()    {}
 func (*FriendApplicationApprovedTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{29}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{29}
 }
 func (m *FriendApplicationApprovedTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FriendApplicationApprovedTips.Unmarshal(m, b)
@@ -2176,7 +2176,7 @@ func (m *FriendApplicationRejectedTips) Reset()         { *m = FriendApplication
 func (m *FriendApplicationRejectedTips) String() string { return proto.CompactTextString(m) }
 func (*FriendApplicationRejectedTips) ProtoMessage()    {}
 func (*FriendApplicationRejectedTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{30}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{30}
 }
 func (m *FriendApplicationRejectedTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FriendApplicationRejectedTips.Unmarshal(m, b)
@@ -2224,7 +2224,7 @@ func (m *FriendAddedTips) Reset()         { *m = FriendAddedTips{} }
 func (m *FriendAddedTips) String() string { return proto.CompactTextString(m) }
 func (*FriendAddedTips) ProtoMessage()    {}
 func (*FriendAddedTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{31}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{31}
 }
 func (m *FriendAddedTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FriendAddedTips.Unmarshal(m, b)
@@ -2277,7 +2277,7 @@ func (m *FriendDeletedTips) Reset()         { *m = FriendDeletedTips{} }
 func (m *FriendDeletedTips) String() string { return proto.CompactTextString(m) }
 func (*FriendDeletedTips) ProtoMessage()    {}
 func (*FriendDeletedTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{32}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{32}
 }
 func (m *FriendDeletedTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FriendDeletedTips.Unmarshal(m, b)
@@ -2315,7 +2315,7 @@ func (m *BlackAddedTips) Reset()         { *m = BlackAddedTips{} }
 func (m *BlackAddedTips) String() string { return proto.CompactTextString(m) }
 func (*BlackAddedTips) ProtoMessage()    {}
 func (*BlackAddedTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{33}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{33}
 }
 func (m *BlackAddedTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BlackAddedTips.Unmarshal(m, b)
@@ -2353,7 +2353,7 @@ func (m *BlackDeletedTips) Reset()         { *m = BlackDeletedTips{} }
 func (m *BlackDeletedTips) String() string { return proto.CompactTextString(m) }
 func (*BlackDeletedTips) ProtoMessage()    {}
 func (*BlackDeletedTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{34}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{34}
 }
 func (m *BlackDeletedTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_BlackDeletedTips.Unmarshal(m, b)
@@ -2391,7 +2391,7 @@ func (m *FriendInfoChangedTips) Reset()         { *m = FriendInfoChangedTips{} }
 func (m *FriendInfoChangedTips) String() string { return proto.CompactTextString(m) }
 func (*FriendInfoChangedTips) ProtoMessage()    {}
 func (*FriendInfoChangedTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{35}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{35}
 }
 func (m *FriendInfoChangedTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FriendInfoChangedTips.Unmarshal(m, b)
@@ -2430,7 +2430,7 @@ func (m *UserInfoUpdatedTips) Reset()         { *m = UserInfoUpdatedTips{} }
 func (m *UserInfoUpdatedTips) String() string { return proto.CompactTextString(m) }
 func (*UserInfoUpdatedTips) ProtoMessage()    {}
 func (*UserInfoUpdatedTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{36}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{36}
 }
 func (m *UserInfoUpdatedTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserInfoUpdatedTips.Unmarshal(m, b)
@@ -2469,7 +2469,7 @@ func (m *ConversationUpdateTips) Reset()         { *m = ConversationUpdateTips{}
 func (m *ConversationUpdateTips) String() string { return proto.CompactTextString(m) }
 func (*ConversationUpdateTips) ProtoMessage()    {}
 func (*ConversationUpdateTips) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{37}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{37}
 }
 func (m *ConversationUpdateTips) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConversationUpdateTips.Unmarshal(m, b)
@@ -2509,7 +2509,7 @@ func (m *RequestPagination) Reset()         { *m = RequestPagination{} }
 func (m *RequestPagination) String() string { return proto.CompactTextString(m) }
 func (*RequestPagination) ProtoMessage()    {}
 func (*RequestPagination) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{38}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{38}
 }
 func (m *RequestPagination) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RequestPagination.Unmarshal(m, b)
@@ -2555,7 +2555,7 @@ func (m *ResponsePagination) Reset()         { *m = ResponsePagination{} }
 func (m *ResponsePagination) String() string { return proto.CompactTextString(m) }
 func (*ResponsePagination) ProtoMessage()    {}
 func (*ResponsePagination) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{39}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{39}
 }
 func (m *ResponsePagination) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ResponsePagination.Unmarshal(m, b)
@@ -2608,7 +2608,7 @@ func (m *SignalReq) Reset()         { *m = SignalReq{} }
 func (m *SignalReq) String() string { return proto.CompactTextString(m) }
 func (*SignalReq) ProtoMessage()    {}
 func (*SignalReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{40}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{40}
 }
 func (m *SignalReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalReq.Unmarshal(m, b)
@@ -2875,7 +2875,7 @@ func (m *SignalResp) Reset()         { *m = SignalResp{} }
 func (m *SignalResp) String() string { return proto.CompactTextString(m) }
 func (*SignalResp) ProtoMessage()    {}
 func (*SignalResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{41}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{41}
 }
 func (m *SignalResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalResp.Unmarshal(m, b)
@@ -3143,7 +3143,7 @@ func (m *InvitationInfo) Reset()         { *m = InvitationInfo{} }
 func (m *InvitationInfo) String() string { return proto.CompactTextString(m) }
 func (*InvitationInfo) ProtoMessage()    {}
 func (*InvitationInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{42}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{42}
 }
 func (m *InvitationInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InvitationInfo.Unmarshal(m, b)
@@ -3239,7 +3239,7 @@ func (m *ParticipantMetaData) Reset()         { *m = ParticipantMetaData{} }
 func (m *ParticipantMetaData) String() string { return proto.CompactTextString(m) }
 func (*ParticipantMetaData) ProtoMessage()    {}
 func (*ParticipantMetaData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{43}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{43}
 }
 func (m *ParticipantMetaData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ParticipantMetaData.Unmarshal(m, b)
@@ -3294,7 +3294,7 @@ func (m *SignalInviteReq) Reset()         { *m = SignalInviteReq{} }
 func (m *SignalInviteReq) String() string { return proto.CompactTextString(m) }
 func (*SignalInviteReq) ProtoMessage()    {}
 func (*SignalInviteReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{44}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{44}
 }
 func (m *SignalInviteReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalInviteReq.Unmarshal(m, b)
@@ -3355,7 +3355,7 @@ func (m *SignalInviteReply) Reset()         { *m = SignalInviteReply{} }
 func (m *SignalInviteReply) String() string { return proto.CompactTextString(m) }
 func (*SignalInviteReply) ProtoMessage()    {}
 func (*SignalInviteReply) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{45}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{45}
 }
 func (m *SignalInviteReply) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalInviteReply.Unmarshal(m, b)
@@ -3410,7 +3410,7 @@ func (m *SignalInviteInGroupReq) Reset()         { *m = SignalInviteInGroupReq{}
 func (m *SignalInviteInGroupReq) String() string { return proto.CompactTextString(m) }
 func (*SignalInviteInGroupReq) ProtoMessage()    {}
 func (*SignalInviteInGroupReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{46}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{46}
 }
 func (m *SignalInviteInGroupReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalInviteInGroupReq.Unmarshal(m, b)
@@ -3471,7 +3471,7 @@ func (m *SignalInviteInGroupReply) Reset()         { *m = SignalInviteInGroupRep
 func (m *SignalInviteInGroupReply) String() string { return proto.CompactTextString(m) }
 func (*SignalInviteInGroupReply) ProtoMessage()    {}
 func (*SignalInviteInGroupReply) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{47}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{47}
 }
 func (m *SignalInviteInGroupReply) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalInviteInGroupReply.Unmarshal(m, b)
@@ -3526,7 +3526,7 @@ func (m *SignalCancelReq) Reset()         { *m = SignalCancelReq{} }
 func (m *SignalCancelReq) String() string { return proto.CompactTextString(m) }
 func (*SignalCancelReq) ProtoMessage()    {}
 func (*SignalCancelReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{48}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{48}
 }
 func (m *SignalCancelReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalCancelReq.Unmarshal(m, b)
@@ -3584,7 +3584,7 @@ func (m *SignalCancelReply) Reset()         { *m = SignalCancelReply{} }
 func (m *SignalCancelReply) String() string { return proto.CompactTextString(m) }
 func (*SignalCancelReply) ProtoMessage()    {}
 func (*SignalCancelReply) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{49}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{49}
 }
 func (m *SignalCancelReply) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalCancelReply.Unmarshal(m, b)
@@ -3609,6 +3609,7 @@ type SignalAcceptReq struct {
 	Invitation           *InvitationInfo      `protobuf:"bytes,2,opt,name=invitation" json:"invitation,omitempty"`
 	OfflinePushInfo      *OfflinePushInfo     `protobuf:"bytes,3,opt,name=offlinePushInfo" json:"offlinePushInfo,omitempty"`
 	Participant          *ParticipantMetaData `protobuf:"bytes,4,opt,name=participant" json:"participant,omitempty"`
+	OpUserPlatformID     int32                `protobuf:"varint,5,opt,name=opUserPlatformID" json:"opUserPlatformID,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
 	XXX_unrecognized     []byte               `json:"-"`
 	XXX_sizecache        int32                `json:"-"`
@@ -3618,7 +3619,7 @@ func (m *SignalAcceptReq) Reset()         { *m = SignalAcceptReq{} }
 func (m *SignalAcceptReq) String() string { return proto.CompactTextString(m) }
 func (*SignalAcceptReq) ProtoMessage()    {}
 func (*SignalAcceptReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{50}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{50}
 }
 func (m *SignalAcceptReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalAcceptReq.Unmarshal(m, b)
@@ -3666,6 +3667,13 @@ func (m *SignalAcceptReq) GetParticipant() *ParticipantMetaData {
 	return nil
 }
 
+func (m *SignalAcceptReq) GetOpUserPlatformID() int32 {
+	if m != nil {
+		return m.OpUserPlatformID
+	}
+	return 0
+}
+
 type SignalAcceptReply struct {
 	Token                string   `protobuf:"bytes,1,opt,name=token" json:"token,omitempty"`
 	RoomID               string   `protobuf:"bytes,2,opt,name=roomID" json:"roomID,omitempty"`
@@ -3679,7 +3687,7 @@ func (m *SignalAcceptReply) Reset()         { *m = SignalAcceptReply{} }
 func (m *SignalAcceptReply) String() string { return proto.CompactTextString(m) }
 func (*SignalAcceptReply) ProtoMessage()    {}
 func (*SignalAcceptReply) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{51}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{51}
 }
 func (m *SignalAcceptReply) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalAcceptReply.Unmarshal(m, b)
@@ -3733,7 +3741,7 @@ func (m *SignalHungUpReq) Reset()         { *m = SignalHungUpReq{} }
 func (m *SignalHungUpReq) String() string { return proto.CompactTextString(m) }
 func (*SignalHungUpReq) ProtoMessage()    {}
 func (*SignalHungUpReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{52}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{52}
 }
 func (m *SignalHungUpReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalHungUpReq.Unmarshal(m, b)
@@ -3784,7 +3792,7 @@ func (m *SignalHungUpReply) Reset()         { *m = SignalHungUpReply{} }
 func (m *SignalHungUpReply) String() string { return proto.CompactTextString(m) }
 func (*SignalHungUpReply) ProtoMessage()    {}
 func (*SignalHungUpReply) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{53}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{53}
 }
 func (m *SignalHungUpReply) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalHungUpReply.Unmarshal(m, b)
@@ -3808,6 +3816,8 @@ type SignalRejectReq struct {
 	OpUserID             string               `protobuf:"bytes,1,opt,name=opUserID" json:"opUserID,omitempty"`
 	Invitation           *InvitationInfo      `protobuf:"bytes,2,opt,name=invitation" json:"invitation,omitempty"`
 	OfflinePushInfo      *OfflinePushInfo     `protobuf:"bytes,3,opt,name=offlinePushInfo" json:"offlinePushInfo,omitempty"`
+	Participant          *ParticipantMetaData `protobuf:"bytes,4,opt,name=participant" json:"participant,omitempty"`
+	OpUserPlatformID     int32                `protobuf:"varint,5,opt,name=opUserPlatformID" json:"opUserPlatformID,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
 	XXX_unrecognized     []byte               `json:"-"`
 	XXX_sizecache        int32                `json:"-"`
@@ -3817,7 +3827,7 @@ func (m *SignalRejectReq) Reset()         { *m = SignalRejectReq{} }
 func (m *SignalRejectReq) String() string { return proto.CompactTextString(m) }
 func (*SignalRejectReq) ProtoMessage()    {}
 func (*SignalRejectReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{54}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{54}
 }
 func (m *SignalRejectReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalRejectReq.Unmarshal(m, b)
@@ -3858,6 +3868,20 @@ func (m *SignalRejectReq) GetOfflinePushInfo() *OfflinePushInfo {
 	return nil
 }
 
+func (m *SignalRejectReq) GetParticipant() *ParticipantMetaData {
+	if m != nil {
+		return m.Participant
+	}
+	return nil
+}
+
+func (m *SignalRejectReq) GetOpUserPlatformID() int32 {
+	if m != nil {
+		return m.OpUserPlatformID
+	}
+	return 0
+}
+
 type SignalRejectReply struct {
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -3868,7 +3892,7 @@ func (m *SignalRejectReply) Reset()         { *m = SignalRejectReply{} }
 func (m *SignalRejectReply) String() string { return proto.CompactTextString(m) }
 func (*SignalRejectReply) ProtoMessage()    {}
 func (*SignalRejectReply) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{55}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{55}
 }
 func (m *SignalRejectReply) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalRejectReply.Unmarshal(m, b)
@@ -3902,7 +3926,7 @@ func (m *DelMsgListReq) Reset()         { *m = DelMsgListReq{} }
 func (m *DelMsgListReq) String() string { return proto.CompactTextString(m) }
 func (*DelMsgListReq) ProtoMessage()    {}
 func (*DelMsgListReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{56}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{56}
 }
 func (m *DelMsgListReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DelMsgListReq.Unmarshal(m, b)
@@ -3962,7 +3986,7 @@ func (m *DelMsgListResp) Reset()         { *m = DelMsgListResp{} }
 func (m *DelMsgListResp) String() string { return proto.CompactTextString(m) }
 func (*DelMsgListResp) ProtoMessage()    {}
 func (*DelMsgListResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ws_cdfe09251fc3838b, []int{57}
+	return fileDescriptor_ws_c5c79ae5b343c043, []int{57}
 }
 func (m *DelMsgListResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DelMsgListResp.Unmarshal(m, b)
@@ -4058,168 +4082,169 @@ func init() {
 	proto.RegisterType((*DelMsgListResp)(nil), "server_api_params.DelMsgListResp")
 }
 
-func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_cdfe09251fc3838b) }
+func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_c5c79ae5b343c043) }
 
-var fileDescriptor_ws_cdfe09251fc3838b = []byte{
+var fileDescriptor_ws_c5c79ae5b343c043 = []byte{
-	// 2546 bytes of a gzipped FileDescriptorProto
+	// 2572 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x1a, 0x4d, 0x6f, 0x1c, 0x49,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcb, 0x6f, 0x24, 0x49,
-	0x95, 0xee, 0xf1, 0x8c, 0x3d, 0xcf, 0x1e, 0x7f, 0xb4, 0x17, 0x33, 0x84, 0x6c, 0x30, 0x2d, 0x6b,
+	0xd1, 0xff, 0xaa, 0xda, 0xdd, 0x76, 0x87, 0xdd, 0x7e, 0x94, 0xf7, 0x33, 0xcd, 0x30, 0x3b, 0x98,
-	0x09, 0x5f, 0x5e, 0x14, 0x84, 0x04, 0x59, 0x08, 0xf2, 0x47, 0xbe, 0x16, 0x3b, 0xf1, 0xf6, 0x24,
+	0x92, 0xb5, 0x0c, 0x0b, 0x78, 0xd1, 0x20, 0x24, 0x98, 0x85, 0x41, 0x7e, 0xcc, 0x6b, 0xb1, 0x67,
-	0x2c, 0x02, 0xa4, 0xa8, 0x3c, 0x5d, 0x1e, 0xf7, 0xba, 0xa7, 0xaa, 0xa7, 0x3f, 0x9c, 0x58, 0x42,
+	0xbc, 0xd5, 0x33, 0x2c, 0x02, 0xa4, 0x51, 0xba, 0x2b, 0xdd, 0xae, 0x75, 0x75, 0x66, 0x75, 0x3d,
-	0x42, 0x02, 0x09, 0x71, 0xe3, 0x04, 0x57, 0x24, 0x2e, 0x08, 0x09, 0xa1, 0xbd, 0x20, 0x2e, 0x88,
+	0x3c, 0x63, 0x09, 0x09, 0x09, 0x24, 0xc4, 0x8d, 0x13, 0x5c, 0x91, 0xb8, 0x20, 0x24, 0x84, 0xf6,
-	0x13, 0x7f, 0x80, 0x33, 0x37, 0xce, 0x5c, 0x39, 0x20, 0x21, 0x81, 0xaa, 0x5e, 0x75, 0x77, 0x55,
+	0x00, 0xe2, 0x82, 0x38, 0xf1, 0x0f, 0x70, 0xe6, 0xc6, 0x99, 0x2b, 0x07, 0x24, 0x24, 0x50, 0x66,
-	0xf7, 0x8c, 0x3d, 0x6b, 0x59, 0x9b, 0x5d, 0xe5, 0x36, 0xef, 0x75, 0xbd, 0x57, 0xef, 0xbb, 0x5e,
+	0x64, 0x55, 0x65, 0x56, 0x75, 0xdb, 0xbd, 0x96, 0xb5, 0x03, 0x1a, 0x6e, 0x1d, 0x51, 0x19, 0x91,
-	0xbd, 0x1a, 0x58, 0x4a, 0xfc, 0x93, 0x67, 0xcf, 0x93, 0x37, 0x9f, 0x27, 0x9b, 0x51, 0xcc, 0x53,
+	0x91, 0xf1, 0x8b, 0x88, 0x8c, 0xcc, 0x6c, 0x58, 0x4a, 0xfc, 0x93, 0x67, 0xcf, 0x93, 0xb7, 0x9e,
-	0xee, 0xac, 0x24, 0x34, 0x3e, 0xa5, 0xf1, 0x33, 0x12, 0x05, 0xcf, 0x22, 0x12, 0x93, 0x61, 0xe2,
+	0x27, 0x9b, 0x51, 0xcc, 0x53, 0xee, 0xac, 0x24, 0x34, 0x3e, 0xa5, 0xf1, 0x33, 0x12, 0x05, 0xcf,
-	0xfe, 0xdb, 0x86, 0xf6, 0xfd, 0x98, 0x67, 0xd1, 0x43, 0x76, 0xc4, 0x9d, 0x2e, 0xcc, 0x0e, 0x24,
+	0x22, 0x12, 0x93, 0x61, 0xe2, 0xfe, 0xdd, 0x86, 0xf6, 0xfd, 0x98, 0x67, 0xd1, 0x43, 0x76, 0xc4,
-	0xb0, 0xdb, 0xb5, 0xd6, 0xad, 0x9b, 0x6d, 0x2f, 0x07, 0x9d, 0xeb, 0xd0, 0x96, 0x3f, 0x1f, 0x91,
+	0x9d, 0x2e, 0xcc, 0x0e, 0x24, 0xb1, 0xdb, 0xb5, 0xd6, 0xad, 0x9b, 0x6d, 0x2f, 0x27, 0x9d, 0xeb,
-	0x21, 0xed, 0xda, 0xf2, 0x5b, 0x89, 0x70, 0x5c, 0x58, 0x60, 0x3c, 0x0d, 0x8e, 0x82, 0x3e, 0x49,
+	0xd0, 0x96, 0x3f, 0x1f, 0x91, 0x21, 0xed, 0xda, 0xf2, 0x5b, 0xc9, 0x70, 0x5c, 0x58, 0x60, 0x3c,
-	0x03, 0xce, 0xba, 0x0d, 0xb9, 0xc0, 0xc0, 0x89, 0x35, 0x01, 0x4b, 0x63, 0xee, 0x67, 0x7d, 0xb9,
+	0x0d, 0x8e, 0x82, 0x3e, 0x49, 0x03, 0xce, 0xba, 0x0d, 0x39, 0xc0, 0xe0, 0x89, 0x31, 0x01, 0x4b,
-	0x66, 0x06, 0xd7, 0xe8, 0x38, 0xb1, 0xff, 0x11, 0xe9, 0xd3, 0xa7, 0xde, 0x5e, 0xb7, 0x89, 0xfb,
+	0x63, 0xee, 0x67, 0x7d, 0x39, 0x66, 0x06, 0xc7, 0xe8, 0x3c, 0x31, 0xff, 0x11, 0xe9, 0xd3, 0xa7,
-	0x2b, 0xd0, 0x59, 0x87, 0x79, 0xfe, 0x9c, 0xd1, 0xf8, 0x69, 0x42, 0xe3, 0x87, 0xbb, 0xdd, 0x96,
+	0xde, 0x5e, 0xb7, 0x89, 0xf3, 0x2b, 0xd2, 0x59, 0x87, 0x79, 0xfe, 0x9c, 0xd1, 0xf8, 0x69, 0x42,
-	0xfc, 0xaa, 0xa3, 0x9c, 0x1b, 0x00, 0xfd, 0x98, 0x92, 0x94, 0x3e, 0x09, 0x86, 0xb4, 0x3b, 0xbb,
+	0xe3, 0x87, 0xbb, 0xdd, 0x96, 0xfc, 0xaa, 0xb3, 0x9c, 0x1b, 0x00, 0xfd, 0x98, 0x92, 0x94, 0x3e,
-	0x6e, 0xdd, 0xec, 0x78, 0x1a, 0x46, 0x70, 0x18, 0xd2, 0xe1, 0x21, 0x8d, 0x77, 0x78, 0xc6, 0xd2,
+	0x09, 0x86, 0xb4, 0x3b, 0xbb, 0x6e, 0xdd, 0xec, 0x78, 0x1a, 0x47, 0x68, 0x18, 0xd2, 0xe1, 0x21,
-	0xee, 0x9c, 0x5c, 0xa0, 0xa3, 0x9c, 0x45, 0xb0, 0xe9, 0x8b, 0x6e, 0x5b, 0xb2, 0xb6, 0xe9, 0x0b,
+	0x8d, 0x77, 0x78, 0xc6, 0xd2, 0xee, 0x9c, 0x1c, 0xa0, 0xb3, 0x9c, 0x45, 0xb0, 0xe9, 0x8b, 0x6e,
-	0x67, 0x0d, 0x5a, 0x49, 0x4a, 0xd2, 0x2c, 0xe9, 0xc2, 0xba, 0x75, 0xb3, 0xe9, 0x29, 0xc8, 0xd9,
+	0x5b, 0xaa, 0xb6, 0xe9, 0x0b, 0x67, 0x0d, 0x5a, 0x49, 0x4a, 0xd2, 0x2c, 0xe9, 0xc2, 0xba, 0x75,
-	0x80, 0x8e, 0xe4, 0xcb, 0x73, 0x69, 0xe6, 0x25, 0x89, 0x89, 0x2c, 0x2c, 0xf6, 0xe4, 0x2c, 0xa2,
+	0xb3, 0xe9, 0x29, 0xca, 0xd9, 0x80, 0x8e, 0xd4, 0xcb, 0x73, 0x6b, 0xe6, 0xa5, 0x88, 0xc9, 0x2c,
-	0xdd, 0x05, 0xc9, 0xa0, 0x44, 0xb8, 0x7f, 0xb6, 0x61, 0x55, 0xda, 0x7d, 0x5f, 0x0a, 0x70, 0x2f,
+	0x3c, 0xf6, 0xe4, 0x2c, 0xa2, 0xdd, 0x05, 0xa9, 0xa0, 0x64, 0xb8, 0xbf, 0xb7, 0x61, 0x55, 0xfa,
-	0x0b, 0xc3, 0x0b, 0x3c, 0xb0, 0x06, 0xad, 0x0c, 0xb7, 0x43, 0xf3, 0x2b, 0x48, 0xec, 0x13, 0xf3,
+	0x7d, 0x5f, 0x1a, 0x70, 0x2f, 0x0b, 0xc3, 0x0b, 0x10, 0x58, 0x83, 0x56, 0x86, 0xd3, 0xa1, 0xfb,
-	0x90, 0xee, 0xd1, 0x53, 0x1a, 0x4a, 0xc3, 0x37, 0xbd, 0x12, 0xe1, 0x5c, 0x83, 0xb9, 0xf7, 0x78,
+	0x15, 0x25, 0xe6, 0x89, 0x79, 0x48, 0xf7, 0xe8, 0x29, 0x0d, 0xa5, 0xe3, 0x9b, 0x5e, 0xc9, 0x70,
-	0xc0, 0xa4, 0x4d, 0x66, 0xe4, 0xc7, 0x02, 0x16, 0xdf, 0x58, 0xd0, 0x3f, 0x61, 0xc2, 0xa5, 0x68,
+	0xae, 0xc1, 0xdc, 0xfb, 0x3c, 0x60, 0xd2, 0x27, 0x33, 0xf2, 0x63, 0x41, 0x8b, 0x6f, 0x2c, 0xe8,
-	0xee, 0x02, 0xd6, 0x3d, 0xd1, 0x32, 0x3d, 0xf1, 0x06, 0x2c, 0x92, 0x28, 0xda, 0x27, 0x6c, 0x40,
+	0x9f, 0x30, 0x01, 0x29, 0xba, 0xbb, 0xa0, 0x75, 0x24, 0x5a, 0x26, 0x12, 0x6f, 0xc0, 0x22, 0x89,
-	0x63, 0xdc, 0x74, 0x56, 0xf2, 0xad, 0x60, 0x85, 0x3f, 0xc4, 0x4e, 0x3d, 0x9e, 0xc5, 0x7d, 0x2a,
+	0xa2, 0x7d, 0xc2, 0x06, 0x34, 0xc6, 0x49, 0x67, 0xa5, 0xde, 0x0a, 0x57, 0xe0, 0x21, 0x66, 0xea,
-	0xcd, 0xdd, 0xf4, 0x34, 0x8c, 0xe0, 0xc3, 0x23, 0x1a, 0x6b, 0x66, 0x44, 0xcb, 0x57, 0xb0, 0xca,
+	0xf1, 0x2c, 0xee, 0x53, 0xe9, 0xee, 0xa6, 0xa7, 0x71, 0x84, 0x1e, 0x1e, 0xd1, 0x58, 0x73, 0x23,
-	0x2b, 0x90, 0x7b, 0xc5, 0xfd, 0xb9, 0x05, 0x8b, 0x07, 0xd9, 0x61, 0x18, 0xf4, 0xe5, 0x02, 0x61,
+	0x7a, 0xbe, 0xc2, 0x55, 0xa8, 0x40, 0x8e, 0x8a, 0xfb, 0x23, 0x0b, 0x16, 0x0f, 0xb2, 0xc3, 0x30,
-	0xb4, 0xd2, 0x34, 0x96, 0x61, 0x1a, 0x5d, 0x41, 0x7b, 0xb2, 0x82, 0x0d, 0x53, 0xc1, 0x35, 0x68,
+	0xe8, 0xcb, 0x01, 0xc2, 0x69, 0xa5, 0x6b, 0x2c, 0xc3, 0x35, 0xfa, 0x02, 0xed, 0xc9, 0x0b, 0x6c,
-	0x0d, 0x28, 0xf3, 0x69, 0xac, 0x0c, 0xa6, 0x20, 0x25, 0x48, 0xb3, 0x10, 0xe4, 0xd7, 0x36, 0xcc,
+	0x98, 0x0b, 0x5c, 0x83, 0xd6, 0x80, 0x32, 0x9f, 0xc6, 0xca, 0x61, 0x8a, 0x52, 0x86, 0x34, 0x0b,
-	0x7d, 0xc8, 0x22, 0xac, 0xc3, 0x7c, 0x74, 0xcc, 0x19, 0x7d, 0x94, 0x89, 0xa0, 0x51, 0xb2, 0xe8,
+	0x43, 0x7e, 0x66, 0xc3, 0xdc, 0x47, 0x6c, 0xc2, 0x3a, 0xcc, 0x47, 0xc7, 0x9c, 0xd1, 0x47, 0x99,
-	0x28, 0xe7, 0x35, 0x68, 0x1e, 0x06, 0x71, 0x7a, 0x2c, 0xbd, 0xd6, 0xf1, 0x10, 0x10, 0x58, 0x3a,
+	0x08, 0x1a, 0x65, 0x8b, 0xce, 0x72, 0x5e, 0x83, 0xe6, 0x61, 0x10, 0xa7, 0xc7, 0x12, 0xb5, 0x8e,
-	0x24, 0x01, 0xba, 0xaa, 0xed, 0x21, 0xa0, 0x14, 0x9a, 0x2b, 0xe2, 0xdd, 0xcc, 0xa0, 0x76, 0x2d,
+	0x87, 0x84, 0xe0, 0xd2, 0x21, 0x09, 0x10, 0xaa, 0xb6, 0x87, 0x84, 0x5a, 0xd0, 0x5c, 0x11, 0xef,
-	0x83, 0xea, 0x9e, 0x87, 0x71, 0x9e, 0x77, 0xff, 0x63, 0x01, 0xdc, 0x8b, 0x03, 0xca, 0x7c, 0x69,
+	0x66, 0x06, 0xb5, 0x6b, 0x19, 0x54, 0x47, 0x1e, 0xc6, 0x21, 0xef, 0xfe, 0xc3, 0x02, 0xb8, 0x17,
-	0x9a, 0x4a, 0xea, 0x5a, 0xf5, 0xd4, 0x5d, 0x83, 0x56, 0x4c, 0x87, 0x24, 0x3e, 0xc9, 0x43, 0x1b,
+	0x07, 0x94, 0xf9, 0xd2, 0x35, 0x95, 0xd4, 0xb5, 0xea, 0xa9, 0xbb, 0x06, 0xad, 0x98, 0x0e, 0x49,
-	0xa1, 0x8a, 0x40, 0x8d, 0x9a, 0x40, 0x6f, 0x01, 0x1c, 0xc9, 0x7d, 0x04, 0x1f, 0x69, 0xaa, 0xf9,
+	0x7c, 0x92, 0x87, 0x36, 0x52, 0x15, 0x83, 0x1a, 0x35, 0x83, 0xde, 0x06, 0x38, 0x92, 0xf3, 0x08,
-	0x5b, 0x9f, 0xd9, 0xac, 0x15, 0xb9, 0xcd, 0xdc, 0x4b, 0x9e, 0xb6, 0x5c, 0xe4, 0x0d, 0xf1, 0x7d,
+	0x3d, 0xd2, 0x55, 0xf3, 0xb7, 0x3e, 0xb1, 0x59, 0x2b, 0x72, 0x9b, 0x39, 0x4a, 0x9e, 0x36, 0x5c,
-	0x15, 0x9e, 0x4d, 0xcc, 0x9b, 0x02, 0x31, 0x26, 0x3a, 0x5b, 0xe7, 0x44, 0xe7, 0x6c, 0x11, 0x14,
+	0xe4, 0x0d, 0xf1, 0x7d, 0x15, 0x9e, 0x4d, 0xcc, 0x9b, 0x82, 0x31, 0x26, 0x3a, 0x5b, 0xe7, 0x44,
-	0xff, 0xb2, 0xa0, 0xbd, 0x1d, 0x92, 0xfe, 0xc9, 0x94, 0xaa, 0x9b, 0x2a, 0xda, 0x35, 0x15, 0xef,
+	0xe7, 0x6c, 0x11, 0x14, 0x7f, 0xb3, 0xa0, 0xbd, 0x1d, 0x92, 0xfe, 0xc9, 0x94, 0x4b, 0x37, 0x97,
-	0x43, 0xe7, 0x50, 0xb0, 0xcb, 0x55, 0x90, 0x56, 0x98, 0xbf, 0xf5, 0xb9, 0x31, 0x5a, 0x9a, 0x49,
+	0x68, 0xd7, 0x96, 0x78, 0x1f, 0x3a, 0x87, 0x42, 0x5d, 0xbe, 0x04, 0xe9, 0x85, 0xf9, 0x5b, 0x9f,
-	0xe1, 0x99, 0x74, 0xa6, 0xba, 0x33, 0x17, 0xab, 0xdb, 0x3c, 0x47, 0xdd, 0x56, 0xa1, 0xee, 0xdf,
+	0x1a, 0xb3, 0x4a, 0x33, 0x29, 0x3c, 0x53, 0xce, 0x5c, 0xee, 0xcc, 0xc5, 0xcb, 0x6d, 0x9e, 0xb3,
-	0x6d, 0x58, 0x90, 0x65, 0xcc, 0xa3, 0xa3, 0x8c, 0x26, 0xa9, 0xf3, 0x6d, 0x98, 0xcb, 0x72, 0x51,
+	0xdc, 0x56, 0xb1, 0xdc, 0x3f, 0xdb, 0xb0, 0x20, 0xcb, 0x98, 0x47, 0x47, 0x19, 0x4d, 0x52, 0xe7,
-	0xad, 0x69, 0x45, 0x2d, 0x48, 0x9c, 0xdb, 0xaa, 0x68, 0x4a, 0x7a, 0x5b, 0xd2, 0x5f, 0x1f, 0x43,
+	0x6b, 0x30, 0x97, 0xe5, 0xa6, 0x5a, 0xd3, 0x9a, 0x5a, 0x88, 0x38, 0xb7, 0x55, 0xd1, 0x94, 0xf2,
-	0x5f, 0x9c, 0x58, 0x5e, 0xb9, 0x5c, 0x1c, 0x30, 0xc7, 0x84, 0xf9, 0x21, 0xf5, 0x68, 0x92, 0x85,
+	0xb6, 0x94, 0xbf, 0x3e, 0x46, 0xbe, 0xd8, 0xb1, 0xbc, 0x72, 0xb8, 0xd8, 0x60, 0x8e, 0x09, 0xf3,
-	0xa9, 0xaa, 0x85, 0x06, 0x0e, 0x23, 0x6d, 0xb4, 0x9f, 0x0c, 0xd4, 0xf1, 0xa3, 0x20, 0x61, 0x1d,
+	0x43, 0xea, 0xd1, 0x24, 0x0b, 0x53, 0x55, 0x0b, 0x0d, 0x1e, 0x46, 0xda, 0x68, 0x3f, 0x19, 0xa8,
-	0x5c, 0x27, 0x3e, 0xa1, 0xea, 0x25, 0x42, 0x24, 0x6a, 0x4c, 0x47, 0xd2, 0x43, 0x98, 0x56, 0x39,
+	0xed, 0x47, 0x51, 0xc2, 0x3b, 0x38, 0x4e, 0x7c, 0xc2, 0xa5, 0x97, 0x0c, 0x91, 0xa8, 0x31, 0x1d,
-	0x58, 0xee, 0xa9, 0xac, 0x86, 0x81, 0x60, 0xe0, 0x84, 0x8b, 0x11, 0x96, 0x0c, 0xf0, 0xdc, 0xd1,
+	0x49, 0x84, 0x30, 0xad, 0x72, 0xb2, 0x9c, 0x53, 0x79, 0x0d, 0x03, 0xc1, 0xe0, 0x09, 0x88, 0x91,
-	0x30, 0xd5, 0x63, 0xc7, 0xfd, 0x47, 0x03, 0x3a, 0x98, 0x3e, 0xb9, 0x51, 0x6f, 0x88, 0x38, 0xe7,
+	0x96, 0x0a, 0x70, 0xdf, 0xd1, 0x38, 0xd5, 0x6d, 0xc7, 0xfd, 0x4b, 0x03, 0x3a, 0x98, 0x3e, 0xb9,
-	0x43, 0x23, 0x8a, 0x34, 0x8c, 0x90, 0x42, 0x40, 0x8f, 0xcc, 0x42, 0x63, 0xe0, 0x44, 0x28, 0x0a,
+	0x53, 0x6f, 0x88, 0x38, 0xe7, 0x43, 0x23, 0x8a, 0x34, 0x8e, 0xb0, 0x42, 0x50, 0x8f, 0xcc, 0x42,
-	0xf8, 0x9e, 0x51, 0x70, 0x74, 0x54, 0xbe, 0xcb, 0x7d, 0xbd, 0xf0, 0x68, 0x18, 0x51, 0xca, 0x52,
+	0x63, 0xf0, 0x44, 0x28, 0x0a, 0xfa, 0x9e, 0x51, 0x70, 0x74, 0x56, 0x3e, 0xcb, 0x7d, 0xbd, 0xf0,
-	0x6e, 0x44, 0x47, 0x01, 0x0b, 0xda, 0x94, 0x17, 0xfb, 0x63, 0x7c, 0x68, 0x18, 0x61, 0xdf, 0x94,
+	0x68, 0x1c, 0x51, 0xca, 0x52, 0x6e, 0x44, 0x47, 0x41, 0x0b, 0xd9, 0x94, 0x17, 0xf3, 0x63, 0x7c,
-	0xe7, 0x7b, 0xa3, 0x91, 0x4a, 0x04, 0x72, 0x56, 0xfb, 0xe2, 0x41, 0x51, 0xc0, 0x35, 0xaf, 0xb6,
+	0x68, 0x1c, 0xe1, 0xdf, 0x94, 0xe7, 0x73, 0xa3, 0x93, 0x4a, 0x06, 0x6a, 0x56, 0xf3, 0xe2, 0x46,
-	0xcf, 0xf5, 0x2a, 0x18, 0x5e, 0x35, 0x93, 0x6b, 0xbe, 0x96, 0x5c, 0x1b, 0xd0, 0x41, 0x3e, 0x79,
+	0x51, 0xd0, 0x35, 0x54, 0xdb, 0xe7, 0xa2, 0x0a, 0x06, 0xaa, 0x66, 0x72, 0xcd, 0xd7, 0x92, 0x6b,
-	0xd0, 0x2f, 0xe0, 0x41, 0x6e, 0x20, 0xcd, 0xd8, 0xe8, 0x54, 0x63, 0xc3, 0xf4, 0xee, 0xe2, 0x04,
+	0x03, 0x3a, 0xa8, 0x27, 0x0f, 0xfa, 0x05, 0xdc, 0xc8, 0x0d, 0xa6, 0x19, 0x1b, 0x9d, 0x6a, 0x6c,
-	0xef, 0x2e, 0x15, 0xde, 0xfd, 0x31, 0x74, 0x0f, 0xb2, 0x30, 0xdc, 0xa7, 0x49, 0x42, 0x06, 0x74,
+	0x98, 0xe8, 0x2e, 0x4e, 0x40, 0x77, 0xa9, 0x40, 0xf7, 0x7b, 0xd0, 0x3d, 0xc8, 0xc2, 0x70, 0x9f,
-	0xfb, 0xac, 0x47, 0x47, 0x7b, 0x41, 0x92, 0x7a, 0x34, 0x89, 0x44, 0x9c, 0xd1, 0x38, 0xde, 0xe1,
+	0x26, 0x09, 0x19, 0xd0, 0xed, 0xb3, 0x1e, 0x1d, 0xed, 0x05, 0x49, 0xea, 0xd1, 0x24, 0x12, 0x71,
-	0x3e, 0x95, 0x4e, 0x6e, 0x7a, 0x39, 0x28, 0x34, 0xa4, 0x71, 0x2c, 0x04, 0x50, 0x15, 0x12, 0x21,
+	0x46, 0xe3, 0x78, 0x87, 0xfb, 0x54, 0x82, 0xdc, 0xf4, 0x72, 0x52, 0xac, 0x90, 0xc6, 0xb1, 0x30,
-	0x67, 0x13, 0x66, 0xc2, 0x20, 0x11, 0xb1, 0xde, 0xb8, 0x39, 0x7f, 0xeb, 0xda, 0x98, 0x54, 0xd9,
+	0x40, 0x55, 0x48, 0xa4, 0x9c, 0x4d, 0x98, 0x09, 0x83, 0x44, 0xc4, 0x7a, 0xe3, 0xe6, 0xfc, 0xad,
-	0x4f, 0x06, 0xbb, 0x24, 0x25, 0x9e, 0x5c, 0xe7, 0x0e, 0xe1, 0x53, 0xe3, 0x77, 0x1f, 0x4d, 0x3c,
+	0x6b, 0x63, 0x52, 0x65, 0x3f, 0x19, 0xec, 0x92, 0x94, 0x78, 0x72, 0x9c, 0x3b, 0x84, 0x8f, 0x8d,
-	0xc1, 0x44, 0x0d, 0x93, 0x45, 0x20, 0xe0, 0xac, 0x68, 0x3e, 0x74, 0x94, 0x10, 0x3b, 0x41, 0x3e,
+	0x9f, 0x7d, 0x34, 0x71, 0x07, 0x13, 0x35, 0x4c, 0x16, 0x81, 0x80, 0xb3, 0xa2, 0xf9, 0xd0, 0x59,
-	0x52, 0x8e, 0x8e, 0x97, 0x83, 0xee, 0x6b, 0xe0, 0xdc, 0xa7, 0xe9, 0x3e, 0x79, 0xb1, 0xc5, 0xfc,
+	0xc2, 0xec, 0x04, 0xf5, 0x48, 0x3b, 0x3a, 0x5e, 0x4e, 0xba, 0xaf, 0x81, 0x73, 0x9f, 0xa6, 0xfb,
-	0xfd, 0x80, 0xf5, 0xe8, 0xc8, 0xa3, 0x23, 0xf7, 0x2e, 0xac, 0xd6, 0xb0, 0x49, 0x24, 0x04, 0x18,
+	0xe4, 0xc5, 0x16, 0xf3, 0xf7, 0x03, 0xd6, 0xa3, 0x23, 0x8f, 0x8e, 0xdc, 0xbb, 0xb0, 0x5a, 0xe3,
-	0x92, 0x17, 0x3d, 0x3a, 0x92, 0x02, 0x74, 0x3c, 0x05, 0x49, 0xbc, 0x5c, 0xa5, 0xca, 0xa3, 0x82,
+	0x26, 0x91, 0x30, 0x60, 0x48, 0x5e, 0xf4, 0xe8, 0x48, 0x1a, 0xd0, 0xf1, 0x14, 0x25, 0xf9, 0x72,
-	0xdc, 0x11, 0x2c, 0x09, 0x0f, 0xf5, 0x28, 0xf3, 0xf7, 0x93, 0x81, 0x64, 0xb1, 0x0e, 0xf3, 0x68,
+	0x94, 0x2a, 0x8f, 0x8a, 0x72, 0x47, 0xb0, 0x24, 0x10, 0xea, 0x51, 0xe6, 0xef, 0x27, 0x03, 0xa9,
-	0x81, 0xfd, 0x64, 0x50, 0xd6, 0x5b, 0x0d, 0x25, 0x56, 0xf4, 0xc3, 0x80, 0xb2, 0x14, 0x57, 0x28,
+	0x62, 0x1d, 0xe6, 0xd1, 0x03, 0xfb, 0xc9, 0xa0, 0xac, 0xb7, 0x1a, 0x4b, 0x8c, 0xe8, 0x87, 0x01,
-	0x6d, 0x34, 0x94, 0x08, 0xc6, 0x84, 0x32, 0xbf, 0x38, 0x72, 0x1a, 0x5e, 0x01, 0xbb, 0x7f, 0x69,
+	0x65, 0x29, 0x8e, 0x50, 0xab, 0xd1, 0x58, 0x22, 0x18, 0x13, 0xca, 0xfc, 0x62, 0xcb, 0x69, 0x78,
-	0xc2, 0xac, 0x32, 0xa8, 0xec, 0x0e, 0xc5, 0x11, 0x57, 0xd8, 0x0b, 0x21, 0x0c, 0xc6, 0xfe, 0x69,
+	0x05, 0xed, 0xfe, 0xa1, 0x09, 0xb3, 0xca, 0xa1, 0xb2, 0x3b, 0x14, 0x5b, 0x5c, 0xe1, 0x2f, 0xa4,
-	0xd9, 0xa7, 0x21, 0xa4, 0x77, 0x76, 0x0d, 0xb3, 0xb3, 0xab, 0xc8, 0x34, 0x53, 0x97, 0xa9, 0xa2,
+	0x30, 0x18, 0xfb, 0xa7, 0x65, 0x9f, 0x86, 0x94, 0xde, 0xd9, 0x35, 0xcc, 0xce, 0xae, 0x62, 0xd3,
-	0x57, 0xb3, 0xae, 0xd7, 0x17, 0x61, 0x39, 0x91, 0x09, 0x73, 0x10, 0x92, 0xf4, 0x88, 0xc7, 0x43,
+	0x4c, 0xdd, 0xa6, 0xca, 0xba, 0x9a, 0xf5, 0x75, 0xbd, 0x09, 0xcb, 0x89, 0x4c, 0x98, 0x83, 0x90,
-	0x75, 0x62, 0x35, 0xbd, 0x1a, 0x5e, 0x14, 0x7b, 0xc4, 0x15, 0x09, 0x8b, 0x19, 0x59, 0xc1, 0x8a,
+	0xa4, 0x47, 0x3c, 0x1e, 0xaa, 0x1d, 0xab, 0xe9, 0xd5, 0xf8, 0xa2, 0xd8, 0x23, 0xaf, 0x48, 0x58,
-	0xf4, 0x40, 0x4c, 0x9e, 0xb8, 0xd8, 0x2a, 0x98, 0x48, 0x94, 0x2d, 0x49, 0x02, 0xce, 0x64, 0xa7,
+	0xcc, 0xc8, 0x0a, 0x57, 0xa4, 0x07, 0x72, 0xf2, 0xc4, 0xc5, 0x56, 0xc1, 0x64, 0xa2, 0x6d, 0x49,
-	0x8b, 0xf9, 0xa9, 0xa3, 0x84, 0xe6, 0xc3, 0x64, 0x70, 0x2f, 0xe6, 0x43, 0xd5, 0x30, 0xe4, 0xa0,
+	0x12, 0x70, 0x26, 0x3b, 0x5d, 0xcc, 0x4f, 0x9d, 0x25, 0x56, 0x3e, 0x4c, 0x06, 0xf7, 0x62, 0x3e,
-	0xd4, 0x9c, 0xb3, 0x94, 0xb2, 0x54, 0xd2, 0xce, 0x23, 0xad, 0x86, 0x12, 0xb4, 0x0a, 0x94, 0xc9,
+	0x54, 0x0d, 0x43, 0x4e, 0xca, 0x95, 0x73, 0x96, 0x52, 0x96, 0x4a, 0xd9, 0x79, 0x94, 0xd5, 0x58,
-	0xb9, 0xe0, 0xe5, 0xa0, 0xb3, 0x0c, 0x8d, 0x84, 0x8e, 0x54, 0xc6, 0x89, 0x9f, 0x86, 0xe7, 0x96,
+	0x42, 0x56, 0x91, 0x32, 0x39, 0x17, 0xbc, 0x9c, 0x74, 0x96, 0xa1, 0x91, 0xd0, 0x91, 0xca, 0x38,
-	0x4c, 0xcf, 0x55, 0x4a, 0xc1, 0xb2, 0xfc, 0xaa, 0x97, 0x82, 0xb2, 0xd7, 0x5f, 0x31, 0x7a, 0xfd,
+	0xf1, 0xd3, 0x40, 0x6e, 0xc9, 0x44, 0xae, 0x52, 0x0a, 0x96, 0xe5, 0x57, 0xbd, 0x14, 0x94, 0xbd,
-	0x2d, 0x98, 0xe5, 0x91, 0x88, 0xf3, 0xa4, 0xeb, 0xc8, 0x1c, 0xfb, 0xfc, 0xe4, 0x1c, 0xdb, 0x7c,
+	0xfe, 0x8a, 0xd1, 0xeb, 0x6f, 0xc1, 0x2c, 0x8f, 0x44, 0x9c, 0x27, 0x5d, 0x47, 0xe6, 0xd8, 0xa7,
-	0x8c, 0x2b, 0xef, 0xb2, 0x34, 0x3e, 0xf3, 0x72, 0x3a, 0x67, 0x0f, 0x96, 0xf8, 0xd1, 0x51, 0x18,
+	0x27, 0xe7, 0xd8, 0xe6, 0x63, 0x1c, 0x79, 0x97, 0xa5, 0xf1, 0x99, 0x97, 0xcb, 0x39, 0x7b, 0xb0,
-	0x30, 0x7a, 0x90, 0x25, 0xc7, 0xf2, 0x64, 0x5b, 0x95, 0x27, 0x9b, 0x3b, 0x86, 0xd5, 0x63, 0x73,
+	0xc4, 0x8f, 0x8e, 0xc2, 0x80, 0xd1, 0x83, 0x2c, 0x39, 0x96, 0x3b, 0xdb, 0xaa, 0xdc, 0xd9, 0xdc,
-	0xa5, 0x57, 0x25, 0xbd, 0x76, 0x1b, 0x16, 0xf4, 0x6d, 0x84, 0x19, 0x4e, 0xe8, 0x99, 0x8a, 0x41,
+	0x31, 0xaa, 0x1e, 0x9b, 0x23, 0xbd, 0xaa, 0xe8, 0xb5, 0xdb, 0xb0, 0xa0, 0x4f, 0x23, 0xdc, 0x70,
-	0xf1, 0x53, 0x34, 0x7b, 0xa7, 0x24, 0xcc, 0xf0, 0x18, 0x98, 0xf3, 0x10, 0xb8, 0x6d, 0x7f, 0xc3,
+	0x42, 0xcf, 0x54, 0x0c, 0x8a, 0x9f, 0xa2, 0xd9, 0x3b, 0x25, 0x61, 0x86, 0xdb, 0xc0, 0x9c, 0x87,
-	0x72, 0x7f, 0x65, 0xc1, 0x52, 0x65, 0x03, 0xb1, 0x3a, 0x0d, 0xd2, 0x90, 0x2a, 0x0e, 0x08, 0x38,
+	0xc4, 0x6d, 0xfb, 0xcb, 0x96, 0xfb, 0x53, 0x0b, 0x96, 0x2a, 0x13, 0x88, 0xd1, 0x69, 0x90, 0x86,
-	0x0e, 0xcc, 0xf8, 0x34, 0xe9, 0xab, 0x10, 0x96, 0xbf, 0x55, 0x25, 0x6b, 0x14, 0xed, 0xa2, 0xb8,
+	0x54, 0x69, 0x40, 0xc2, 0x71, 0x60, 0xc6, 0xa7, 0x49, 0x5f, 0x85, 0xb0, 0xfc, 0xad, 0x2a, 0x59,
-	0xd0, 0x3d, 0xee, 0x09, 0x46, 0x3d, 0x9e, 0x31, 0xbf, 0xb8, 0xd0, 0x69, 0x38, 0x11, 0x42, 0xc1,
+	0xa3, 0x68, 0x17, 0xc5, 0x81, 0xee, 0x71, 0x4f, 0x28, 0xea, 0xf1, 0x8c, 0xf9, 0xc5, 0x81, 0x4e,
-	0xe3, 0xde, 0x36, 0xf1, 0x07, 0x14, 0xaf, 0x5d, 0x4d, 0x29, 0x93, 0x89, 0x74, 0x7d, 0x98, 0x7b,
+	0xe3, 0x89, 0x10, 0x0a, 0x1e, 0xf7, 0xb6, 0x89, 0x3f, 0xa0, 0x78, 0xec, 0x6a, 0x4a, 0x9b, 0x4c,
-	0x12, 0x44, 0xc9, 0x0e, 0x1f, 0x0e, 0x85, 0x23, 0x7c, 0x9a, 0x8a, 0x5e, 0xd5, 0x92, 0xfe, 0x56,
+	0xa6, 0xeb, 0xc3, 0xdc, 0x93, 0x20, 0x4a, 0x76, 0xf8, 0x70, 0x28, 0x80, 0xf0, 0x69, 0x2a, 0x7a,
-	0x90, 0x08, 0x15, 0x9f, 0x1e, 0x91, 0x2c, 0x4c, 0xc5, 0xd2, 0x3c, 0x71, 0x35, 0x94, 0xbc, 0x70,
+	0x55, 0x4b, 0xe2, 0xad, 0x28, 0x11, 0x2a, 0x3e, 0x3d, 0x22, 0x59, 0x98, 0x8a, 0xa1, 0x79, 0xe2,
-	0x24, 0x9c, 0xed, 0x22, 0x35, 0xca, 0xa9, 0x61, 0xdc, 0xbf, 0xd9, 0xb0, 0x2c, 0x1b, 0x87, 0x1d,
+	0x6a, 0x2c, 0x79, 0xe0, 0x48, 0x38, 0xdb, 0x45, 0x69, 0xb4, 0x53, 0xe3, 0xb8, 0x7f, 0xb2, 0x61,
-	0xe9, 0x76, 0x5f, 0x12, 0xdd, 0x82, 0xa6, 0x4c, 0x43, 0xd5, 0xac, 0x9c, 0xdf, 0x6c, 0xe0, 0x52,
+	0x59, 0x36, 0x0e, 0x3b, 0x12, 0x76, 0x5f, 0x0a, 0xdd, 0x82, 0xa6, 0x4c, 0x43, 0xd5, 0xac, 0x9c,
-	0xe7, 0x0e, 0xb4, 0x78, 0x24, 0x5b, 0x4e, 0xec, 0x50, 0xde, 0x98, 0x44, 0x64, 0xde, 0xed, 0x3c,
+	0xdf, 0x6c, 0xe0, 0x50, 0xe7, 0x0e, 0xb4, 0x78, 0x24, 0x5b, 0x4e, 0xec, 0x50, 0xde, 0x98, 0x24,
-	0x45, 0xe5, 0xdc, 0x03, 0xc0, 0x6b, 0xe7, 0x5e, 0x59, 0xba, 0xa7, 0xe5, 0xa1, 0x51, 0x0a, 0xe3,
+	0x64, 0x9e, 0xed, 0x3c, 0x25, 0xe5, 0xdc, 0x03, 0xc0, 0x63, 0xe7, 0x5e, 0x59, 0xba, 0xa7, 0xd5,
-	0x16, 0x65, 0xb8, 0xb8, 0xe0, 0x35, 0x3c, 0x13, 0xe9, 0x3c, 0x82, 0x45, 0x29, 0xf6, 0xe3, 0xbc,
+	0xa1, 0x49, 0x0a, 0xe7, 0x16, 0x65, 0xb8, 0x38, 0xe0, 0x35, 0x3c, 0x93, 0xe9, 0x3c, 0x82, 0x45,
-	0xeb, 0x94, 0x3e, 0x98, 0x7e, 0xc7, 0x0a, 0xb5, 0xfb, 0x5b, 0x4b, 0x99, 0x51, 0x7c, 0xed, 0x51,
+	0x69, 0xf6, 0xe3, 0xbc, 0xeb, 0x94, 0x18, 0x4c, 0x3f, 0x63, 0x45, 0xda, 0xfd, 0x85, 0xa5, 0xdc,
-	0xb4, 0x7d, 0x69, 0x12, 0xeb, 0x52, 0x26, 0xb9, 0x06, 0x73, 0xc3, 0x4c, 0x6b, 0x82, 0x1b, 0x5e,
+	0x28, 0xbe, 0xf6, 0x28, 0xfa, 0xbe, 0x74, 0x89, 0x75, 0x29, 0x97, 0x5c, 0x83, 0xb9, 0x61, 0xa6,
-	0x01, 0x97, 0x2e, 0x6a, 0x4c, 0xed, 0x22, 0xf7, 0x77, 0x16, 0x74, 0xdf, 0xe6, 0x01, 0x93, 0x1f,
+	0x35, 0xc1, 0x0d, 0xaf, 0xa0, 0x4b, 0x88, 0x1a, 0x53, 0x43, 0xe4, 0xfe, 0xd2, 0x82, 0xee, 0x3b,
-	0xb6, 0xa2, 0x28, 0x54, 0x53, 0x88, 0x4b, 0xfb, 0xfc, 0x3b, 0xd0, 0x26, 0xc8, 0x86, 0xa5, 0xca,
+	0x3c, 0x60, 0xf2, 0xc3, 0x56, 0x14, 0x85, 0xea, 0x16, 0xe2, 0xd2, 0x98, 0x7f, 0x1d, 0xda, 0x04,
-	0xed, 0x53, 0x34, 0xb6, 0x25, 0x8d, 0xd6, 0xa3, 0x34, 0xf4, 0x1e, 0xc5, 0xfd, 0xa3, 0x05, 0x8b,
+	0xd5, 0xb0, 0x54, 0xc1, 0x3e, 0x45, 0x63, 0x5b, 0xca, 0x68, 0x3d, 0x4a, 0x43, 0xef, 0x51, 0xdc,
-	0x68, 0x94, 0x77, 0xb2, 0x20, 0xbd, 0xb4, 0x7c, 0xdb, 0x30, 0x37, 0xca, 0x82, 0xf4, 0x12, 0x51,
+	0xdf, 0x58, 0xb0, 0x88, 0x4e, 0x79, 0x37, 0x0b, 0xd2, 0x4b, 0xdb, 0xb7, 0x0d, 0x73, 0xa3, 0x2c,
-	0x59, 0xd0, 0xd5, 0xe3, 0xa9, 0x31, 0x26, 0x9e, 0xdc, 0xf7, 0x2d, 0xb8, 0x5e, 0x35, 0xeb, 0x56,
+	0x48, 0x2f, 0x11, 0x95, 0x85, 0x5c, 0x3d, 0x9e, 0x1a, 0x63, 0xe2, 0xc9, 0xfd, 0xc0, 0x82, 0xeb,
-	0xbf, 0x4f, 0xa3, 0x97, 0x99, 0x52, 0x46, 0x8f, 0x36, 0x53, 0xe9, 0xd1, 0xc6, 0x8a, 0xec, 0xd1,
+	0x55, 0xb7, 0x6e, 0xf5, 0xfb, 0x34, 0x7a, 0x99, 0x29, 0x65, 0xf4, 0x68, 0x33, 0x95, 0x1e, 0x6d,
-	0xf7, 0x68, 0xff, 0xa3, 0x2b, 0xf2, 0xcf, 0x6c, 0xf8, 0xf4, 0xfd, 0x22, 0xf1, 0x9e, 0xc4, 0x84,
+	0xac, 0xc9, 0x1e, 0x7d, 0x9f, 0xf6, 0xff, 0x73, 0x4d, 0xfe, 0xa1, 0x0d, 0x1f, 0xbf, 0x5f, 0x24,
-	0x25, 0x47, 0x34, 0x8e, 0x5f, 0xa2, 0xbc, 0x7b, 0xd0, 0x61, 0xf4, 0x79, 0x29, 0x93, 0x4a, 0xc7,
+	0xde, 0x93, 0x98, 0xb0, 0xe4, 0x88, 0xc6, 0xf1, 0x4b, 0xb4, 0x77, 0x0f, 0x3a, 0x8c, 0x3e, 0x2f,
-	0x69, 0xd9, 0x98, 0xc4, 0xd3, 0xd5, 0x2e, 0xf7, 0xbf, 0x16, 0x2c, 0x23, 0x9f, 0xef, 0x06, 0xfd,
+	0x6d, 0x52, 0xe9, 0x38, 0xad, 0x1a, 0x53, 0x78, 0xba, 0xda, 0xe5, 0xfe, 0xd3, 0x82, 0x65, 0xd4,
-	0x93, 0x97, 0xa8, 0xfc, 0x23, 0x58, 0x3c, 0x91, 0x12, 0x08, 0xe8, 0x12, 0x65, 0xbb, 0x42, 0x3d,
+	0xf3, 0x8d, 0xa0, 0x7f, 0xf2, 0x12, 0x17, 0xff, 0x08, 0x16, 0x4f, 0xa4, 0x05, 0x82, 0xba, 0x44,
-	0xa5, 0xfa, 0xff, 0xb3, 0x60, 0x05, 0x19, 0x3d, 0x64, 0xa7, 0xc1, 0xcb, 0x0c, 0xd6, 0x03, 0x58,
+	0xd9, 0xae, 0x48, 0x4f, 0xb9, 0xfc, 0x7f, 0x59, 0xb0, 0x82, 0x8a, 0x1e, 0xb2, 0xd3, 0xe0, 0x65,
-	0x0a, 0x50, 0x84, 0x4b, 0x1a, 0xa0, 0x4a, 0x3e, 0xa5, 0x05, 0xfe, 0x64, 0xc1, 0x12, 0x72, 0xba,
+	0x06, 0xeb, 0x01, 0x2c, 0x05, 0x68, 0xc2, 0x25, 0x1d, 0x50, 0x15, 0x9f, 0xd2, 0x03, 0xbf, 0xb3,
-	0xcb, 0x52, 0x1a, 0x5f, 0x5a, 0xff, 0x07, 0x30, 0x4f, 0x59, 0x1a, 0x13, 0x76, 0x99, 0x0a, 0xa9,
+	0x60, 0x09, 0x35, 0xdd, 0x65, 0x29, 0x8d, 0x2f, 0xbd, 0xfe, 0x07, 0x30, 0x4f, 0x59, 0x1a, 0x13,
-	0x93, 0x4e, 0x59, 0x24, 0x4f, 0x60, 0x05, 0xaf, 0xf0, 0x5a, 0xc5, 0x11, 0xbd, 0x2c, 0xf1, 0xb1,
+	0x76, 0x99, 0x0a, 0xa9, 0x8b, 0x4e, 0x59, 0x24, 0x4f, 0x60, 0x05, 0x8f, 0xf0, 0x5a, 0xc5, 0x11,
-	0x3d, 0xb5, 0x24, 0x51, 0x0e, 0x9a, 0xc3, 0x19, 0x35, 0x5d, 0x2f, 0x87, 0x33, 0x37, 0x00, 0x88,
+	0xbd, 0x2c, 0xf1, 0xb1, 0x3d, 0xb5, 0xa4, 0x50, 0x4e, 0x9a, 0x97, 0x33, 0xea, 0x76, 0xbd, 0xbc,
-	0xef, 0xbf, 0xcb, 0x63, 0x3f, 0x60, 0xf9, 0xf1, 0xa1, 0x61, 0xdc, 0xb7, 0x61, 0x41, 0x74, 0xd3,
+	0x9c, 0xb9, 0x01, 0x40, 0x7c, 0xff, 0x3d, 0x1e, 0xfb, 0x01, 0xcb, 0xb7, 0x0f, 0x8d, 0xe3, 0xbe,
-	0x4f, 0xb4, 0xcb, 0xf8, 0xb9, 0xe3, 0x02, 0xfd, 0x22, 0x6f, 0x9b, 0x17, 0x79, 0xf7, 0x47, 0xf0,
+	0x03, 0x0b, 0xa2, 0x9b, 0x7e, 0xa2, 0x1d, 0xc6, 0xcf, 0xbd, 0x2e, 0xd0, 0x0f, 0xf2, 0xb6, 0x79,
-	0xc9, 0x9a, 0xe0, 0xd2, 0xea, 0x3b, 0x38, 0x63, 0xc8, 0x37, 0x51, 0xc6, 0xff, 0xec, 0x18, 0x13,
+	0x90, 0x77, 0xbf, 0x0b, 0xff, 0x5f, 0x33, 0x5c, 0x7a, 0x7d, 0x07, 0xef, 0x18, 0xf2, 0x49, 0x94,
-	0xea, 0xb2, 0x78, 0x06, 0x91, 0xfb, 0x53, 0x0b, 0x5e, 0xaf, 0xb1, 0xdf, 0x8a, 0xa2, 0x98, 0x9f,
+	0xf3, 0x3f, 0x39, 0xc6, 0x85, 0xba, 0x2d, 0x9e, 0x21, 0xe4, 0xfe, 0xc0, 0x82, 0xd7, 0x6b, 0xea,
-	0xaa, 0xe0, 0xbe, 0x8a, 0x6d, 0xcc, 0xd2, 0x6a, 0x57, 0x4b, 0xeb, 0x58, 0x21, 0x8c, 0xe3, 0xe0,
+	0xb7, 0xa2, 0x28, 0xe6, 0xa7, 0x2a, 0xb8, 0xaf, 0x62, 0x1a, 0xb3, 0xb4, 0xda, 0xd5, 0xd2, 0x3a,
-	0x43, 0x10, 0xe2, 0xf7, 0x16, 0x2c, 0x29, 0x21, 0x7c, 0x5f, 0x6d, 0xfb, 0x75, 0x68, 0xe1, 0x7c,
+	0xd6, 0x08, 0x63, 0x3b, 0xf8, 0x08, 0x8c, 0xf8, 0x95, 0x05, 0x4b, 0xca, 0x08, 0xdf, 0x57, 0xd3,
-	0x52, 0x6d, 0xf8, 0xfa, 0xd8, 0x0d, 0xf3, 0xb9, 0xaa, 0xa7, 0x16, 0xd7, 0x23, 0xd2, 0x1e, 0xd7,
+	0x7e, 0x09, 0x5a, 0x78, 0x3f, 0xa9, 0x26, 0x7c, 0x7d, 0xec, 0x84, 0xf9, 0xbd, 0xaa, 0xa7, 0x06,
-	0x06, 0x7e, 0xb3, 0xa8, 0x00, 0x53, 0x4f, 0x10, 0x15, 0x81, 0xfb, 0xfd, 0x3c, 0x98, 0x77, 0x69,
+	0xd7, 0x23, 0xd2, 0x1e, 0xd7, 0x06, 0x7e, 0xa5, 0xa8, 0x00, 0x53, 0xdf, 0x20, 0x2a, 0x01, 0xf7,
-	0x48, 0xaf, 0xd2, 0x46, 0xee, 0x53, 0x58, 0x94, 0xc3, 0xd2, 0xd2, 0x06, 0x57, 0xc2, 0xf6, 0x5d,
+	0x5b, 0x79, 0x30, 0xef, 0xd2, 0x90, 0x5e, 0xa5, 0x8f, 0xdc, 0xa7, 0xb0, 0x28, 0x2f, 0x4b, 0x4b,
-	0x58, 0x96, 0x6c, 0xaf, 0x5c, 0xde, 0x22, 0x3b, 0x84, 0x7d, 0x76, 0x8e, 0x09, 0x1b, 0x5c, 0x25,
+	0x1f, 0x5c, 0x89, 0xda, 0xf7, 0x60, 0x59, 0xaa, 0xbd, 0x72, 0x7b, 0x8b, 0xec, 0x10, 0xfe, 0xd9,
-	0xf7, 0xaf, 0xc0, 0x6a, 0x6e, 0xfb, 0xa7, 0x91, 0x5f, 0x5c, 0x51, 0x26, 0x0c, 0x66, 0xdc, 0xaf,
+	0x39, 0x26, 0x6c, 0x70, 0x95, 0xda, 0x3f, 0x0f, 0xab, 0xb9, 0xef, 0x9f, 0x46, 0x7e, 0x71, 0x44,
-	0xc2, 0xda, 0x0e, 0x67, 0xa7, 0x34, 0x4e, 0xa4, 0x97, 0x91, 0x24, 0xa7, 0x30, 0x92, 0x5f, 0x41,
+	0x99, 0x70, 0x31, 0xe3, 0x7e, 0x01, 0xd6, 0x76, 0x38, 0x3b, 0xa5, 0x71, 0x22, 0x51, 0x46, 0x91,
-	0x6e, 0x0f, 0x56, 0xd4, 0x48, 0xf1, 0x80, 0x0c, 0x02, 0x86, 0x55, 0xe9, 0x06, 0x40, 0x44, 0x06,
+	0x5c, 0xc2, 0x48, 0x7e, 0x45, 0xb9, 0x3d, 0x58, 0x51, 0x57, 0x8a, 0x07, 0x64, 0x10, 0x30, 0xac,
-	0xf9, 0x93, 0x02, 0xce, 0x9d, 0x34, 0x8c, 0xf8, 0x9e, 0x1c, 0xf3, 0xe7, 0xea, 0xbb, 0x8d, 0xdf,
+	0x4a, 0x37, 0x00, 0x22, 0x32, 0xc8, 0x9f, 0x14, 0xf0, 0xde, 0x49, 0xe3, 0x88, 0xef, 0xc9, 0x31,
-	0x4b, 0x8c, 0xfb, 0x3d, 0x70, 0x3c, 0x9a, 0x44, 0x9c, 0x25, 0x54, 0xe3, 0xba, 0x0e, 0xf3, 0x3b,
+	0x7f, 0xae, 0xbe, 0xdb, 0xf8, 0xbd, 0xe4, 0xb8, 0xdf, 0x04, 0xc7, 0xa3, 0x49, 0xc4, 0x59, 0x42,
-	0x59, 0x1c, 0x53, 0x26, 0xb6, 0xca, 0xe7, 0xeb, 0x3a, 0x4a, 0xf0, 0xed, 0x95, 0x7c, 0x71, 0x56,
+	0x35, 0xad, 0xeb, 0x30, 0xbf, 0x93, 0xc5, 0x31, 0x65, 0x62, 0xaa, 0xfc, 0x7e, 0x5d, 0x67, 0x09,
-	0xa1, 0x61, 0xdc, 0xdf, 0x34, 0xa0, 0xdd, 0x0b, 0x06, 0x8c, 0x84, 0x1e, 0x1d, 0x39, 0xdf, 0x82,
+	0xbd, 0xbd, 0x52, 0x2f, 0xde, 0x55, 0x68, 0x1c, 0xf7, 0xe7, 0x0d, 0x68, 0xf7, 0x82, 0x01, 0x23,
-	0x16, 0x9e, 0x20, 0xca, 0xb4, 0xe3, 0xee, 0xce, 0xb8, 0x1a, 0x8f, 0x4a, 0x8f, 0x8e, 0x1e, 0x7c,
+	0xa1, 0x47, 0x47, 0xce, 0x57, 0xa1, 0x85, 0x3b, 0x88, 0x72, 0xed, 0xb8, 0xb3, 0x33, 0x8e, 0xc6,
-	0xc2, 0x53, 0x34, 0xce, 0x3b, 0xd0, 0xc1, 0x5f, 0x0f, 0xf1, 0x46, 0xa0, 0x0e, 0x80, 0x2f, 0x5c,
+	0xad, 0xd2, 0xa3, 0xa3, 0x07, 0xff, 0xe7, 0x29, 0x19, 0xe7, 0x5d, 0xe8, 0xe0, 0xaf, 0x87, 0x78,
-	0xc0, 0x44, 0xad, 0x46, 0x5e, 0x26, 0x07, 0x21, 0x50, 0x9f, 0xb0, 0xbe, 0x7a, 0x73, 0x3b, 0x4f,
+	0x22, 0x50, 0x1b, 0xc0, 0x67, 0x2e, 0x50, 0xa2, 0x46, 0xa3, 0x2e, 0x53, 0x83, 0x30, 0xa8, 0x4f,
-	0xa0, 0x1d, 0xb9, 0x4c, 0x09, 0x84, 0x34, 0x82, 0x9a, 0xc8, 0x9e, 0x59, 0xbd, 0x5a, 0x4c, 0xa6,
+	0x58, 0x5f, 0xbd, 0xb9, 0x9d, 0x67, 0xd0, 0x8e, 0x1c, 0xa6, 0x0c, 0x42, 0x19, 0x21, 0x4d, 0x64,
-	0xc6, 0xd6, 0x5a, 0x51, 0x23, 0x8d, 0xa0, 0x3e, 0xce, 0xd8, 0xe0, 0x69, 0xa4, 0xae, 0x72, 0x93,
+	0xcf, 0xac, 0x5e, 0x2d, 0x26, 0x4b, 0x63, 0x6b, 0xad, 0xa4, 0x51, 0x46, 0x48, 0x1f, 0x67, 0x6c,
-	0xa9, 0x1f, 0xc8, 0x65, 0x8a, 0x1a, 0x69, 0x04, 0x75, 0x2c, 0xab, 0x9d, 0x34, 0xfa, 0x79, 0xd4,
+	0xf0, 0x34, 0x52, 0x47, 0xb9, 0xc9, 0xd2, 0x0f, 0xe4, 0x30, 0x25, 0x8d, 0x32, 0x42, 0x3a, 0x96,
-	0x58, 0x14, 0x15, 0x35, 0xd2, 0x6c, 0xb7, 0x61, 0x36, 0x22, 0x67, 0x21, 0x27, 0xbe, 0xfb, 0x87,
+	0xd5, 0x4e, 0x3a, 0xfd, 0x3c, 0x69, 0x2c, 0x8a, 0x4a, 0x1a, 0x65, 0xb6, 0xdb, 0x30, 0x1b, 0x91,
-	0x06, 0x40, 0xbe, 0x30, 0x91, 0x3d, 0x86, 0xe1, 0xa2, 0x8d, 0x0b, 0x5d, 0x14, 0x85, 0x67, 0x9a,
+	0xb3, 0x90, 0x13, 0xdf, 0xfd, 0x75, 0x03, 0x20, 0x1f, 0x98, 0xc8, 0x1e, 0xc3, 0x80, 0x68, 0xe3,
-	0x93, 0x7a, 0xe3, 0x9d, 0xf4, 0xa5, 0x69, 0x9d, 0x84, 0xdc, 0x2a, 0x6e, 0xba, 0x53, 0x71, 0xd3,
+	0x42, 0x88, 0xa2, 0xf0, 0x4c, 0x03, 0xa9, 0x37, 0x1e, 0xa4, 0xcf, 0x4e, 0x0b, 0x12, 0x6a, 0xab,
-	0xc6, 0x85, 0x6e, 0x52, 0x42, 0x29, 0x47, 0xdd, 0xa9, 0x38, 0x6a, 0xe3, 0x42, 0x47, 0x29, 0x7a,
+	0xc0, 0x74, 0xa7, 0x02, 0xd3, 0xc6, 0x85, 0x30, 0x29, 0xa3, 0x14, 0x50, 0x77, 0x2a, 0x40, 0x6d,
-	0xe5, 0xaa, 0x3b, 0x15, 0x57, 0x6d, 0x5c, 0xe8, 0x2a, 0x45, 0xaf, 0x9c, 0x75, 0xa7, 0xe2, 0xac,
+	0x5c, 0x08, 0x94, 0x92, 0x57, 0x50, 0xdd, 0xa9, 0x40, 0xb5, 0x71, 0x21, 0x54, 0x4a, 0x5e, 0x81,
-	0x8d, 0x0b, 0x9d, 0xa5, 0xe8, 0xeb, 0xee, 0x7a, 0xdf, 0x86, 0x45, 0x69, 0x32, 0x9c, 0xdb, 0xb2,
+	0x75, 0xa7, 0x02, 0xd6, 0xc6, 0x85, 0x60, 0x29, 0xf9, 0x3a, 0x5c, 0x1f, 0xd8, 0xb0, 0x28, 0x5d,
-	0x23, 0x2e, 0xc7, 0x33, 0xd2, 0x5c, 0xe6, 0x0b, 0x95, 0x89, 0x74, 0xbe, 0x0c, 0x2b, 0x88, 0x50,
+	0x86, 0xf7, 0xb6, 0xec, 0x88, 0xcb, 0xeb, 0x19, 0xe9, 0x2e, 0xf3, 0x85, 0xca, 0x64, 0x3a, 0x9f,
-	0x2f, 0x1a, 0xb2, 0xfd, 0xb3, 0xd7, 0x1b, 0x37, 0xdb, 0x5e, 0xfd, 0x83, 0x9c, 0xb4, 0x65, 0x49,
+	0x83, 0x15, 0x64, 0xa8, 0x17, 0x0d, 0xd9, 0xfe, 0xd9, 0xeb, 0x8d, 0x9b, 0x6d, 0xaf, 0xfe, 0x41,
-	0xca, 0x87, 0xbb, 0x24, 0x25, 0x79, 0xb7, 0x52, 0x62, 0xf4, 0x39, 0xe8, 0x4c, 0xed, 0x85, 0x3b,
+	0xde, 0xb4, 0x65, 0x49, 0xca, 0x87, 0xbb, 0x24, 0x25, 0x79, 0xb7, 0x52, 0x72, 0xf4, 0x7b, 0xd0,
-	0xe6, 0x7c, 0x58, 0x0c, 0x38, 0x15, 0x24, 0x28, 0xd2, 0x60, 0x48, 0x79, 0x96, 0xaa, 0x32, 0x91,
+	0x99, 0xda, 0x0b, 0x77, 0xcc, 0xf9, 0xb0, 0xb8, 0xe0, 0x54, 0x94, 0x90, 0x48, 0x83, 0x21, 0xe5,
-	0x83, 0xe2, 0x8c, 0x1d, 0x52, 0x3f, 0x20, 0x72, 0x7a, 0xa8, 0x9e, 0x15, 0x0a, 0x84, 0xac, 0x6c,
+	0x59, 0xaa, 0xca, 0x44, 0x4e, 0x8a, 0x3d, 0x76, 0x48, 0xfd, 0x80, 0xc8, 0xdb, 0x43, 0xf5, 0xac,
-	0xe5, 0x34, 0x54, 0xbd, 0x40, 0x97, 0x98, 0x8b, 0x27, 0x97, 0xee, 0x3f, 0x2d, 0x58, 0x3d, 0x20,
+	0x50, 0x30, 0x64, 0x65, 0x2b, 0x6f, 0x43, 0xd5, 0x0b, 0x74, 0xc9, 0xb9, 0xf8, 0xe6, 0xd2, 0xfd,
-	0x71, 0x1a, 0xf4, 0x83, 0x88, 0xb0, 0x74, 0x9f, 0xa6, 0x44, 0xea, 0x60, 0x3c, 0x53, 0x59, 0x1f,
+	0xab, 0x05, 0xab, 0x07, 0x24, 0x4e, 0x83, 0x7e, 0x10, 0x11, 0x96, 0xee, 0xd3, 0x94, 0xc8, 0x35,
-	0xec, 0x99, 0xea, 0x00, 0x96, 0x06, 0x65, 0x93, 0xa9, 0x3d, 0x74, 0x4d, 0xdd, 0x4a, 0x57, 0xc8,
+	0x18, 0xcf, 0x54, 0xd6, 0x87, 0x7b, 0xa6, 0x3a, 0x80, 0xa5, 0x41, 0xd9, 0x64, 0x6a, 0x0f, 0x5d,
-	0x8d, 0x37, 0xb7, 0xc6, 0x07, 0x7e, 0x73, 0x73, 0x7f, 0x61, 0xc3, 0x52, 0xa5, 0x74, 0x8a, 0x16,
+	0x53, 0xb7, 0xd2, 0x15, 0x71, 0xe3, 0xcd, 0xad, 0xf1, 0xa1, 0xdf, 0xdc, 0xdc, 0x1f, 0xdb, 0xb0,
-	0x11, 0x0f, 0xff, 0x22, 0x26, 0x0a, 0xd8, 0xd9, 0x02, 0x08, 0x8a, 0x30, 0x3a, 0x67, 0x16, 0x62,
+	0x54, 0x29, 0x9d, 0xa2, 0x45, 0xc4, 0xcd, 0xbf, 0x88, 0x89, 0x82, 0x76, 0xb6, 0x00, 0x82, 0x22,
-	0xc6, 0x9a, 0xa7, 0x11, 0x8d, 0x1b, 0x89, 0x36, 0x2e, 0x3d, 0x12, 0x15, 0xcd, 0x7d, 0x54, 0x3a,
+	0x8c, 0xce, 0xb9, 0x0b, 0x31, 0x63, 0xcd, 0xd3, 0x84, 0xc6, 0x5d, 0x89, 0x36, 0x2e, 0x7d, 0x25,
-	0x49, 0x25, 0xea, 0x38, 0x6b, 0x8e, 0x71, 0xa5, 0xa7, 0x93, 0xba, 0x3f, 0x84, 0x95, 0x5a, 0x85,
+	0x2a, 0x9a, 0xfb, 0xa8, 0x04, 0x49, 0x25, 0xea, 0x38, 0x6f, 0x8e, 0x81, 0xd2, 0xd3, 0x45, 0xdd,
-	0x92, 0x13, 0x52, 0x7e, 0x42, 0x59, 0x31, 0x21, 0x15, 0x80, 0x16, 0xac, 0x76, 0x35, 0x58, 0xc3,
+	0xef, 0xc0, 0x4a, 0xad, 0x42, 0xc9, 0x1b, 0x52, 0x7e, 0x42, 0x59, 0x71, 0x43, 0x2a, 0x08, 0x2d,
-	0xe0, 0x54, 0x7f, 0xd4, 0x57, 0xa0, 0xfb, 0x4b, 0x1b, 0xd6, 0xc6, 0x9f, 0x2e, 0xaf, 0xaa, 0xb9,
+	0x58, 0xed, 0x6a, 0xb0, 0x86, 0xc1, 0xa9, 0xfe, 0xa8, 0xaf, 0x48, 0xf7, 0x27, 0x36, 0xac, 0x8d,
-	0x0f, 0xa1, 0x3b, 0xa9, 0x92, 0x5f, 0x99, 0xd5, 0xcb, 0xe8, 0x2e, 0xce, 0xe1, 0x57, 0xd5, 0xdc,
+	0xdf, 0x5d, 0x5e, 0x55, 0x77, 0x1f, 0x42, 0x77, 0x52, 0x25, 0xbf, 0x32, 0xaf, 0x97, 0xd1, 0x5d,
-	0xab, 0x79, 0x74, 0x6b, 0x47, 0x9d, 0x66, 0x9f, 0xa2, 0xd3, 0x78, 0xe5, 0xb3, 0x5f, 0x3b, 0xca,
+	0xec, 0xc3, 0xaf, 0xaa, 0xbb, 0x57, 0xf3, 0xe8, 0xd6, 0xb6, 0x3a, 0xf7, 0xb7, 0x85, 0x7f, 0x8a,
-	0xaf, 0x2c, 0x0e, 0xff, 0x6a, 0xe5, 0x76, 0x2e, 0x7a, 0xb2, 0x8f, 0x95, 0x9d, 0xcb, 0xe8, 0xd1,
+	0x4e, 0xe3, 0x15, 0xf5, 0x8f, 0xf3, 0x26, 0x2c, 0xe3, 0x32, 0xb5, 0x37, 0x34, 0x6c, 0x5c, 0x6b,
-	0x1a, 0x15, 0x4d, 0xab, 0xa2, 0x57, 0xfc, 0x98, 0x6a, 0xa5, 0xb5, 0x4f, 0xee, 0x4f, 0xa0, 0xb3,
+	0xfc, 0xb2, 0x52, 0x68, 0xdb, 0xfe, 0x95, 0xc5, 0xec, 0x1f, 0xad, 0x1c, 0x93, 0xa2, 0x7f, 0xfb,
-	0x4b, 0xc3, 0xfd, 0x64, 0x90, 0xbf, 0x8d, 0x9f, 0xa7, 0xd2, 0xa4, 0xff, 0xe5, 0x4d, 0x7c, 0x15,
+	0xaf, 0xc2, 0xa4, 0x8c, 0x34, 0xad, 0xa9, 0xd1, 0x22, 0xad, 0xe8, 0x2b, 0xff, 0x17, 0x69, 0x17,
-	0xaf, 0xbe, 0xa8, 0xcf, 0xd4, 0x5e, 0xd4, 0xdd, 0x6d, 0x58, 0xd4, 0x05, 0xb8, 0xcc, 0x5f, 0x03,
+	0x47, 0x5a, 0xe1, 0x4b, 0xad, 0xc1, 0x73, 0xbf, 0x0f, 0x9d, 0x5d, 0x1a, 0xee, 0x27, 0x83, 0xfc,
-	0xb6, 0xaf, 0xff, 0xe0, 0xda, 0xe6, 0x9b, 0xf8, 0x0f, 0xd0, 0xb7, 0x6a, 0x86, 0x39, 0x6c, 0xc9,
+	0xf5, 0xfe, 0x3c, 0x47, 0x4e, 0xfa, 0xe7, 0xe0, 0xc4, 0x77, 0xfb, 0xea, 0x9b, 0xff, 0x4c, 0xed,
-	0x7f, 0x84, 0x7e, 0xed, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe4, 0x4f, 0x9d, 0xd0, 0x24, 0x2a,
+	0xcd, 0xdf, 0xdd, 0x86, 0x45, 0xdd, 0x80, 0xcb, 0xfc, 0x79, 0x61, 0xfb, 0xfa, 0xb7, 0xaf, 0x6d,
-	0x00, 0x00,
+	0xbe, 0x85, 0xff, 0x51, 0x7d, 0xbb, 0xe6, 0xc4, 0xc3, 0x96, 0xfc, 0xcf, 0xea, 0x17, 0xff, 0x1d,
+	0x00, 0x00, 0xff, 0xff, 0x62, 0x4e, 0xe4, 0x43, 0xc6, 0x2a, 0x00, 0x00,
 }

pkg/proto/sdk_ws/ws.proto

@@ -388,6 +388,7 @@ message SignalInviteReq {
     InvitationInfo invitation = 2;
     OfflinePushInfo offlinePushInfo  = 3;
     ParticipantMetaData participant = 4;
+
 }
 
 message SignalInviteReply {
@@ -425,6 +426,7 @@ message SignalAcceptReq {
   InvitationInfo invitation = 2;
   OfflinePushInfo offlinePushInfo  = 3;
   ParticipantMetaData participant = 4;
+  int32 opUserPlatformID = 5;
 }
 
 message SignalAcceptReply {
@@ -448,6 +450,8 @@ message SignalRejectReq {
   string opUserID = 1;
   InvitationInfo invitation = 2;
   OfflinePushInfo offlinePushInfo  = 3;
+  ParticipantMetaData participant = 4;
+  int32 opUserPlatformID = 5;
 }
 
 message SignalRejectReply {