From c026754a687ac09c62ff354714b0d4308c3068b7 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Sat, 8 Oct 2022 11:04:34 +0800 Subject: [PATCH] singal --- pkg/proto/rtc/rtc.proto | 25 +++++++++++++++++++------ pkg/proto/sdk_ws/ws.proto | 29 +++++++++++++++++++++-------- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/pkg/proto/rtc/rtc.proto b/pkg/proto/rtc/rtc.proto index 87672de97..68d5733b4 100644 --- a/pkg/proto/rtc/rtc.proto +++ b/pkg/proto/rtc/rtc.proto @@ -102,8 +102,9 @@ message SignalReq { SignalRejectReq reject = 6; SignalGetRoomByGroupIDReq getRoomByGroupID = 7; - SignalOnRoomParticipantConnectedReq signalOnRoomParticipantConnectedReq = 8; - SignalOnRoomParticipantDisconnectedReq signalOnRoomParticipantDisconnectedReq = 9; + SignalOnRoomParticipantConnectedReq onRoomParticipantConnectedReq = 8; + SignalOnRoomParticipantDisconnectedReq onRoomParticipantDisconnectedReq = 9; + SignalGetTokenByRoomIDReq getTokenByRoomID = 10; } } @@ -115,7 +116,8 @@ message SignalResp { SignalAcceptReply accept = 4; SignalHungUpReply hungUp = 5; SignalRejectReply reject = 6; - SignalGetRoomByGroupIDReply GetRoomByGroupID = 7; + SignalGetRoomByGroupIDReply getRoomByGroupID = 7; + SignalGetTokenByRoomIDReply getTokenByRoomID = 8; } } @@ -220,9 +222,7 @@ message SignalGetRoomByGroupIDReq { message SignalGetRoomByGroupIDReply { InvitationInfo invitation = 1; repeated ParticipantMetaData metaData = 2; - string token = 3; - string roomID = 4; - string liveURL = 5; + string roomID = 3; } message SignalOnRoomParticipantConnectedReq { @@ -237,6 +237,19 @@ message SignalOnRoomParticipantDisconnectedReq { string groupID = 3; } +message SignalGetTokenByRoomIDReq { + string roomID = 1; + string opUserID = 2; + ParticipantMetaData participant = 3; + string operationID = 4; +} + +message SignalGetTokenByRoomIDReply { + string token = 1; + string liveURL = 2; +} + + message SignalMessageAssembleReq { SignalReq signalReq = 1; string operationID = 2; diff --git a/pkg/proto/sdk_ws/ws.proto b/pkg/proto/sdk_ws/ws.proto index 2474067c8..a1678cbb2 100644 --- a/pkg/proto/sdk_ws/ws.proto +++ b/pkg/proto/sdk_ws/ws.proto @@ -526,10 +526,11 @@ message SignalReq { SignalAcceptReq accept = 4; SignalHungUpReq hungUp = 5; SignalRejectReq reject = 6; - SignalGetRoomByGroupIDReq GetRoomByGroupID = 7; + SignalGetRoomByGroupIDReq getRoomByGroupID = 7; - SignalOnRoomParticipantConnectedReq signalOnRoomParticipantConnectedReq = 8; - SignalOnRoomParticipantDisconnectedReq signalOnRoomParticipantDisconnectedReq = 9; + SignalOnRoomParticipantConnectedReq onRoomParticipantConnectedReq = 8; + SignalOnRoomParticipantDisconnectedReq onRoomParticipantDisconnectedReq = 9; + SignalGetTokenByRoomIDReq getTokenByRoomID = 10; } } @@ -541,10 +542,12 @@ message SignalResp { SignalAcceptReply accept = 4; SignalHungUpReply hungUp = 5; SignalRejectReply reject = 6; - SignalGetRoomByGroupIDReply GetRoomByGroupID = 7; + SignalGetRoomByGroupIDReply getRoomByGroupID = 7; + SignalGetTokenByRoomIDReply getTokenByRoomID = 8; } } + message InvitationInfo { string inviterUserID = 1; repeated string inviteeUserIDList = 2; @@ -650,10 +653,8 @@ message SignalGetRoomByGroupIDReq { message SignalGetRoomByGroupIDReply { InvitationInfo invitation = 1; - repeated ParticipantMetaData participant = 2; - string token = 3; - string roomID = 4; - string liveURL = 5; + repeated ParticipantMetaData metaData = 2; + string roomID = 3; } message SignalOnRoomParticipantConnectedReq { @@ -668,6 +669,18 @@ message SignalOnRoomParticipantDisconnectedReq { string groupID = 3; } +message SignalGetTokenByRoomIDReq { + string roomID = 1; + string opUserID = 2; + ParticipantMetaData participant = 3; + string operationID = 4; +} + +message SignalGetTokenByRoomIDReply { + string token = 1; + string liveURL = 2; +} + message DelMsgListReq{ string opUserID = 1;