blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/tuoyun' into tuoyun

Browse Source
This commit is contained in:
wenxu12345 2022-03-16 15:31:27 +08:00
commit e9699ed8cc
5 changed files with 193 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/msg_gateway/gate/open_im_media/room.go
View File

@ -2,6 +2,7 @@ package open_im_media
import ( import (
pbRtc "Open_IM/pkg/proto/rtc" pbRtc "Open_IM/pkg/proto/rtc"
open_im_sdk "Open_IM/pkg/proto/sdk_ws"
"context" "context"
"errors" "errors"
"google.golang.org/grpc" "google.golang.org/grpc"
@ -32,14 +33,14 @@ func (m *Media) GetUrl() string {
return m.MediaAddress 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()) conn, err := grpc.Dial(Address, grpc.WithInsecure())
if err != nil { if err != nil {
return "", err return "", err
} }
defer conn.Close() defer conn.Close()
c := pbRtc.NewRtcServiceClient(conn) 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) resp, err := c.GetJoinToken(context.Background(), req)
if err != nil { if err != nil {
return "", err return "", err

6
internal/msg_gateway/gate/validate.go
View File

@ -145,7 +145,7 @@ 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 { if err2 != nil {
return false, 201, err2.Error(), nil, nil return false, 201, err2.Error(), nil, nil
} }
@ -172,7 +172,7 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID s
// return false, 201, err.Error(), nil, nil // 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 { if err2 != nil {
return false, 201, err2.Error(), nil, nil return false, 201, err2.Error(), nil, nil
} }
@ -214,7 +214,7 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID s
msg.ClientMsgID = utils.GetMsgID(payload.Cancel.OpUserID) msg.ClientMsgID = utils.GetMsgID(payload.Cancel.OpUserID)
return true, 0, "", &resp, &msg return true, 0, "", &resp, &msg
case *open_im_sdk.SignalReq_Accept: 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 { if err2 != nil {
return false, 201, err2.Error(), nil, nil return false, 201, err2.Error(), nil, nil
} }

13
internal/rpc/rtc/rtc.go
View File

@ -1,10 +1,12 @@
package rtc package rtc
import ( import (
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/log" "Open_IM/pkg/common/log"
pbRtc "Open_IM/pkg/proto/rtc" pbRtc "Open_IM/pkg/proto/rtc"
"Open_IM/pkg/utils" "Open_IM/pkg/utils"
"context" "context"
"encoding/json"
"time" "time"
"github.com/livekit/protocol/auth" "github.com/livekit/protocol/auth"
@ -12,7 +14,6 @@ import (
) )
type RtcService struct { type RtcService struct {
} }
func (r *RtcService) GetJoinToken(_ context.Context, req *pbRtc.GetJoinTokenReq) (resp *pbRtc.GetJoinTokenResp, err error) { func (r *RtcService) GetJoinToken(_ context.Context, req *pbRtc.GetJoinTokenReq) (resp *pbRtc.GetJoinTokenResp, err error) {
@ -27,11 +28,17 @@ func (r *RtcService) GetJoinToken(_ context.Context, req *pbRtc.GetJoinTokenReq)
CanPublish: &canPublish, CanPublish: &canPublish,
CanSubscribe: &canSubscribe, CanSubscribe: &canSubscribe,
} }
byte, err := json.Marshal(req.MetaData)
if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "json marshal failed", err.Error())
resp.CommonResp = &pbRtc.CommonResp{ErrCode: constant.ErrArgs.ErrCode, ErrMsg: constant.ErrArgs.ErrMsg}
return
}
at.AddGrant(grant). at.AddGrant(grant).
SetIdentity(req.Identity). SetIdentity(req.Identity).
// optional // optional
SetName("participant-name"). SetName("participant-name").
SetValidFor(time.Hour) SetValidFor(time.Hour).SetMetadata(string(byte))
jwt, err := at.ToJWT() jwt, err := at.ToJWT()
if err != nil { if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "toJwt failed", err.Error(), "jwt: ", jwt) log.NewError(req.OperationID, utils.GetSelfFuncName(), "toJwt failed", err.Error(), "jwt: ", jwt)
@ -40,4 +47,4 @@ func (r *RtcService) GetJoinToken(_ context.Context, req *pbRtc.GetJoinTokenReq)
resp.CommonResp = &pbRtc.CommonResp{} resp.CommonResp = &pbRtc.CommonResp{}
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String()) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
return resp, err return resp, err
} }

465
pkg/proto/rtc/rtc.pb.go
View File

@ -1,387 +1,242 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.27.1
// protoc v3.15.5
// source: rtc/rtc.proto // source: rtc/rtc.proto
package rtc package rtc // import "./rtc"
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
import math "math"
import sdk_ws "Open_IM/pkg/proto/sdk_ws"
import ( import (
context "context" context "golang.org/x/net/context"
grpc "google.golang.org/grpc" grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
status "google.golang.org/grpc/status"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
sync "sync"
) )
const ( // Reference imports to suppress errors if they are not otherwise used.
// Verify that this generated code is sufficiently up-to-date. var _ = proto.Marshal
_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) var _ = fmt.Errorf
// Verify that runtime/protoimpl is sufficiently up-to-date. var _ = math.Inf
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
) // This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
type CommonResp struct { type CommonResp struct {
state protoimpl.MessageState ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"`
sizeCache protoimpl.SizeCache ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"`
unknownFields protoimpl.UnknownFields XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
ErrCode int32 `protobuf:"varint,1,opt,name=errCode,proto3" json:"errCode,omitempty"` XXX_sizecache int32 `json:"-"`
ErrMsg string `protobuf:"bytes,2,opt,name=errMsg,proto3" json:"errMsg,omitempty"`
} }
func (x *CommonResp) Reset() { func (m *CommonResp) Reset() { *m = CommonResp{} }
*x = CommonResp{} func (m *CommonResp) String() string { return proto.CompactTextString(m) }
if protoimpl.UnsafeEnabled { func (*CommonResp) ProtoMessage() {}
mi := &file_rtc_rtc_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *CommonResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*CommonResp) ProtoMessage() {}
func (x *CommonResp) ProtoReflect() protoreflect.Message {
mi := &file_rtc_rtc_proto_msgTypes[0]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use CommonResp.ProtoReflect.Descriptor instead.
func (*CommonResp) Descriptor() ([]byte, []int) { func (*CommonResp) Descriptor() ([]byte, []int) {
return file_rtc_rtc_proto_rawDescGZIP(), []int{0} return fileDescriptor_rtc_058fd4200139f42f, []int{0}
}
func (m *CommonResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_CommonResp.Unmarshal(m, b)
}
func (m *CommonResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_CommonResp.Marshal(b, m, deterministic)
}
func (dst *CommonResp) XXX_Merge(src proto.Message) {
xxx_messageInfo_CommonResp.Merge(dst, src)
}
func (m *CommonResp) XXX_Size() int {
return xxx_messageInfo_CommonResp.Size(m)
}
func (m *CommonResp) XXX_DiscardUnknown() {
xxx_messageInfo_CommonResp.DiscardUnknown(m)
} }
func (x *CommonResp) GetErrCode() int32 { var xxx_messageInfo_CommonResp proto.InternalMessageInfo
if x != nil {
return x.ErrCode func (m *CommonResp) GetErrCode() int32 {
if m != nil {
return m.ErrCode
} }
return 0 return 0
} }
func (x *CommonResp) GetErrMsg() string { func (m *CommonResp) GetErrMsg() string {
if x != nil { if m != nil {
return x.ErrMsg return m.ErrMsg
} }
return "" return ""
} }
type GetJoinTokenReq struct { type GetJoinTokenReq struct {
state protoimpl.MessageState ApiKey string `protobuf:"bytes,1,opt,name=apiKey" json:"apiKey,omitempty"`
sizeCache protoimpl.SizeCache ApiSecret string `protobuf:"bytes,2,opt,name=apiSecret" json:"apiSecret,omitempty"`
unknownFields protoimpl.UnknownFields Room string `protobuf:"bytes,3,opt,name=room" json:"room,omitempty"`
Identity string `protobuf:"bytes,4,opt,name=identity" json:"identity,omitempty"`
ApiKey string `protobuf:"bytes,1,opt,name=apiKey,proto3" json:"apiKey,omitempty"` MetaData *sdk_ws.ParticipantMetaData `protobuf:"bytes,5,opt,name=metaData" json:"metaData,omitempty"`
ApiSecret string `protobuf:"bytes,2,opt,name=apiSecret,proto3" json:"apiSecret,omitempty"` OperationID string `protobuf:"bytes,6,opt,name=operationID" json:"operationID,omitempty"`
Room string `protobuf:"bytes,3,opt,name=room,proto3" json:"room,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
Identity string `protobuf:"bytes,4,opt,name=identity,proto3" json:"identity,omitempty"` XXX_unrecognized []byte `json:"-"`
OperationID string `protobuf:"bytes,5,opt,name=operationID,proto3" json:"operationID,omitempty"` XXX_sizecache int32 `json:"-"`
} }
func (x *GetJoinTokenReq) Reset() { func (m *GetJoinTokenReq) Reset() { *m = GetJoinTokenReq{} }
*x = GetJoinTokenReq{} func (m *GetJoinTokenReq) String() string { return proto.CompactTextString(m) }
if protoimpl.UnsafeEnabled { func (*GetJoinTokenReq) ProtoMessage() {}
mi := &file_rtc_rtc_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *GetJoinTokenReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*GetJoinTokenReq) ProtoMessage() {}
func (x *GetJoinTokenReq) ProtoReflect() protoreflect.Message {
mi := &file_rtc_rtc_proto_msgTypes[1]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use GetJoinTokenReq.ProtoReflect.Descriptor instead.
func (*GetJoinTokenReq) Descriptor() ([]byte, []int) { func (*GetJoinTokenReq) Descriptor() ([]byte, []int) {
return file_rtc_rtc_proto_rawDescGZIP(), []int{1} return fileDescriptor_rtc_058fd4200139f42f, []int{1}
}
func (m *GetJoinTokenReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GetJoinTokenReq.Unmarshal(m, b)
}
func (m *GetJoinTokenReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GetJoinTokenReq.Marshal(b, m, deterministic)
}
func (dst *GetJoinTokenReq) XXX_Merge(src proto.Message) {
xxx_messageInfo_GetJoinTokenReq.Merge(dst, src)
}
func (m *GetJoinTokenReq) XXX_Size() int {
return xxx_messageInfo_GetJoinTokenReq.Size(m)
}
func (m *GetJoinTokenReq) XXX_DiscardUnknown() {
xxx_messageInfo_GetJoinTokenReq.DiscardUnknown(m)
} }
func (x *GetJoinTokenReq) GetApiKey() string { var xxx_messageInfo_GetJoinTokenReq proto.InternalMessageInfo
if x != nil {
return x.ApiKey func (m *GetJoinTokenReq) GetApiKey() string {
if m != nil {
return m.ApiKey
} }
return "" return ""
} }
func (x *GetJoinTokenReq) GetApiSecret() string { func (m *GetJoinTokenReq) GetApiSecret() string {
if x != nil { if m != nil {
return x.ApiSecret return m.ApiSecret
} }
return "" return ""
} }
func (x *GetJoinTokenReq) GetRoom() string { func (m *GetJoinTokenReq) GetRoom() string {
if x != nil { if m != nil {
return x.Room return m.Room
} }
return "" return ""
} }
func (x *GetJoinTokenReq) GetIdentity() string { func (m *GetJoinTokenReq) GetIdentity() string {
if x != nil { if m != nil {
return x.Identity return m.Identity
} }
return "" return ""
} }
func (x *GetJoinTokenReq) GetOperationID() string { func (m *GetJoinTokenReq) GetMetaData() *sdk_ws.ParticipantMetaData {
if x != nil { if m != nil {
return x.OperationID return m.MetaData
}
return nil
}
func (m *GetJoinTokenReq) GetOperationID() string {
if m != nil {
return m.OperationID
} }
return "" return ""
} }
type GetJoinTokenResp struct { type GetJoinTokenResp struct {
state protoimpl.MessageState CommonResp *CommonResp `protobuf:"bytes,1,opt,name=CommonResp" json:"CommonResp,omitempty"`
sizeCache protoimpl.SizeCache Jwt string `protobuf:"bytes,2,opt,name=jwt" json:"jwt,omitempty"`
unknownFields protoimpl.UnknownFields XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
CommonResp *CommonResp `protobuf:"bytes,1,opt,name=CommonResp,proto3" json:"CommonResp,omitempty"` XXX_sizecache int32 `json:"-"`
Jwt string `protobuf:"bytes,2,opt,name=jwt,proto3" json:"jwt,omitempty"`
} }
func (x *GetJoinTokenResp) Reset() { func (m *GetJoinTokenResp) Reset() { *m = GetJoinTokenResp{} }
*x = GetJoinTokenResp{} func (m *GetJoinTokenResp) String() string { return proto.CompactTextString(m) }
if protoimpl.UnsafeEnabled { func (*GetJoinTokenResp) ProtoMessage() {}
mi := &file_rtc_rtc_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *GetJoinTokenResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*GetJoinTokenResp) ProtoMessage() {}
func (x *GetJoinTokenResp) ProtoReflect() protoreflect.Message {
mi := &file_rtc_rtc_proto_msgTypes[2]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use GetJoinTokenResp.ProtoReflect.Descriptor instead.
func (*GetJoinTokenResp) Descriptor() ([]byte, []int) { func (*GetJoinTokenResp) Descriptor() ([]byte, []int) {
return file_rtc_rtc_proto_rawDescGZIP(), []int{2} return fileDescriptor_rtc_058fd4200139f42f, []int{2}
}
func (m *GetJoinTokenResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GetJoinTokenResp.Unmarshal(m, b)
}
func (m *GetJoinTokenResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_GetJoinTokenResp.Marshal(b, m, deterministic)
}
func (dst *GetJoinTokenResp) XXX_Merge(src proto.Message) {
xxx_messageInfo_GetJoinTokenResp.Merge(dst, src)
}
func (m *GetJoinTokenResp) XXX_Size() int {
return xxx_messageInfo_GetJoinTokenResp.Size(m)
}
func (m *GetJoinTokenResp) XXX_DiscardUnknown() {
xxx_messageInfo_GetJoinTokenResp.DiscardUnknown(m)
} }
func (x *GetJoinTokenResp) GetCommonResp() *CommonResp { var xxx_messageInfo_GetJoinTokenResp proto.InternalMessageInfo
if x != nil {
return x.CommonResp func (m *GetJoinTokenResp) GetCommonResp() *CommonResp {
if m != nil {
return m.CommonResp
} }
return nil return nil
} }
func (x *GetJoinTokenResp) GetJwt() string { func (m *GetJoinTokenResp) GetJwt() string {
if x != nil { if m != nil {
return x.Jwt return m.Jwt
} }
return "" return ""
} }
var File_rtc_rtc_proto protoreflect.FileDescriptor func init() {
proto.RegisterType((*CommonResp)(nil), "rtc.CommonResp")
var file_rtc_rtc_proto_rawDesc = []byte{ proto.RegisterType((*GetJoinTokenReq)(nil), "rtc.GetJoinTokenReq")
0x0a, 0x0d, 0x72, 0x74, 0x63, 0x2f, 0x72, 0x74, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, proto.RegisterType((*GetJoinTokenResp)(nil), "rtc.GetJoinTokenResp")
0x03, 0x72, 0x74, 0x63, 0x22, 0x3e, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65,
0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20,
0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06,
0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72,
0x72, 0x4d, 0x73, 0x67, 0x22, 0x99, 0x01, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x4a, 0x6f, 0x69, 0x6e,
0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x70, 0x69, 0x4b,
0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x70, 0x69, 0x4b, 0x65, 0x79,
0x12, 0x1c, 0x0a, 0x09, 0x61, 0x70, 0x69, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x02, 0x20,
0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x70, 0x69, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x12,
0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x72, 0x6f,
0x6f, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x04,
0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x20,
0x0a, 0x0b, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x18, 0x05, 0x20,
0x01, 0x28, 0x09, 0x52, 0x0b, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44,
0x22, 0x55, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
0x52, 0x65, 0x73, 0x70, 0x12, 0x2f, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65,
0x73, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x72, 0x74, 0x63, 0x2e, 0x43,
0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x52, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f,
0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6a, 0x77, 0x74, 0x18, 0x02, 0x20, 0x01,
0x28, 0x09, 0x52, 0x03, 0x6a, 0x77, 0x74, 0x32, 0x49, 0x0a, 0x0a, 0x52, 0x74, 0x63, 0x53, 0x65,
0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x3b, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x4a, 0x6f, 0x69, 0x6e,
0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x14, 0x2e, 0x72, 0x74, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x4a,
0x6f, 0x69, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x72, 0x74,
0x63, 0x2e, 0x47, 0x65, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65,
0x73, 0x70, 0x42, 0x0b, 0x5a, 0x09, 0x2e, 0x2f, 0x72, 0x74, 0x63, 0x3b, 0x72, 0x74, 0x63, 0x62,
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
file_rtc_rtc_proto_rawDescOnce sync.Once
file_rtc_rtc_proto_rawDescData = file_rtc_rtc_proto_rawDesc
)
func file_rtc_rtc_proto_rawDescGZIP() []byte {
file_rtc_rtc_proto_rawDescOnce.Do(func() {
file_rtc_rtc_proto_rawDescData = protoimpl.X.CompressGZIP(file_rtc_rtc_proto_rawDescData)
})
return file_rtc_rtc_proto_rawDescData
}
var file_rtc_rtc_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
var file_rtc_rtc_proto_goTypes = []interface{}{
(*CommonResp)(nil), // 0: rtc.CommonResp
(*GetJoinTokenReq)(nil), // 1: rtc.GetJoinTokenReq
(*GetJoinTokenResp)(nil), // 2: rtc.GetJoinTokenResp
}
var file_rtc_rtc_proto_depIdxs = []int32{
0, // 0: rtc.GetJoinTokenResp.CommonResp:type_name -> rtc.CommonResp
1, // 1: rtc.RtcService.GetJoinToken:input_type -> rtc.GetJoinTokenReq
2, // 2: rtc.RtcService.GetJoinToken:output_type -> rtc.GetJoinTokenResp
2, // [2:3] is the sub-list for method output_type
1, // [1:2] is the sub-list for method input_type
1, // [1:1] is the sub-list for extension type_name
1, // [1:1] is the sub-list for extension extendee
0, // [0:1] is the sub-list for field type_name
}
func init() { file_rtc_rtc_proto_init() }
func file_rtc_rtc_proto_init() {
if File_rtc_rtc_proto != nil {
return
}
if !protoimpl.UnsafeEnabled {
file_rtc_rtc_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*CommonResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_rtc_rtc_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*GetJoinTokenReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_rtc_rtc_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*GetJoinTokenResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
}
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_rtc_rtc_proto_rawDesc,
NumEnums: 0,
NumMessages: 3,
NumExtensions: 0,
NumServices: 1,
},
GoTypes: file_rtc_rtc_proto_goTypes,
DependencyIndexes: file_rtc_rtc_proto_depIdxs,
MessageInfos: file_rtc_rtc_proto_msgTypes,
}.Build()
File_rtc_rtc_proto = out.File
file_rtc_rtc_proto_rawDesc = nil
file_rtc_rtc_proto_goTypes = nil
file_rtc_rtc_proto_depIdxs = nil
} }
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.
var _ context.Context var _ context.Context
var _ grpc.ClientConnInterface var _ grpc.ClientConn
// This is a compile-time assertion to ensure that this generated file // This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against. // is compatible with the grpc package it is being compiled against.
const _ = grpc.SupportPackageIsVersion6 const _ = grpc.SupportPackageIsVersion4
// Client API for RtcService service
// RtcServiceClient is the client API for RtcService service.
//
// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
type RtcServiceClient interface { type RtcServiceClient interface {
GetJoinToken(ctx context.Context, in *GetJoinTokenReq, opts ...grpc.CallOption) (*GetJoinTokenResp, error) GetJoinToken(ctx context.Context, in *GetJoinTokenReq, opts ...grpc.CallOption) (*GetJoinTokenResp, error)
} }
type rtcServiceClient struct { type rtcServiceClient struct {
cc grpc.ClientConnInterface cc *grpc.ClientConn
} }
func NewRtcServiceClient(cc grpc.ClientConnInterface) RtcServiceClient { func NewRtcServiceClient(cc *grpc.ClientConn) RtcServiceClient {
return &rtcServiceClient{cc} return &rtcServiceClient{cc}
} }
func (c *rtcServiceClient) GetJoinToken(ctx context.Context, in *GetJoinTokenReq, opts ...grpc.CallOption) (*GetJoinTokenResp, error) { func (c *rtcServiceClient) GetJoinToken(ctx context.Context, in *GetJoinTokenReq, opts ...grpc.CallOption) (*GetJoinTokenResp, error) {
out := new(GetJoinTokenResp) out := new(GetJoinTokenResp)
err := c.cc.Invoke(ctx, "/rtc.RtcService/GetJoinToken", in, out, opts...) err := grpc.Invoke(ctx, "/rtc.RtcService/GetJoinToken", in, out, c.cc, opts...)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return out, nil return out, nil
} }
// RtcServiceServer is the server API for RtcService service. // Server API for RtcService service
type RtcServiceServer interface { type RtcServiceServer interface {
GetJoinToken(context.Context, *GetJoinTokenReq) (*GetJoinTokenResp, error) GetJoinToken(context.Context, *GetJoinTokenReq) (*GetJoinTokenResp, error)
} }
// UnimplementedRtcServiceServer can be embedded to have forward compatible implementations.
type UnimplementedRtcServiceServer struct {
}
func (*UnimplementedRtcServiceServer) GetJoinToken(context.Context, *GetJoinTokenReq) (*GetJoinTokenResp, error) {
return nil, status.Errorf(codes.Unimplemented, "method GetJoinToken not implemented")
}
func RegisterRtcServiceServer(s *grpc.Server, srv RtcServiceServer) { func RegisterRtcServiceServer(s *grpc.Server, srv RtcServiceServer) {
s.RegisterService(&_RtcService_serviceDesc, srv) s.RegisterService(&_RtcService_serviceDesc, srv)
} }
@ -416,3 +271,31 @@ var _RtcService_serviceDesc = grpc.ServiceDesc{
Streams: []grpc.StreamDesc{}, Streams: []grpc.StreamDesc{},
Metadata: "rtc/rtc.proto", Metadata: "rtc/rtc.proto",
} }
func init() { proto.RegisterFile("rtc/rtc.proto", fileDescriptor_rtc_058fd4200139f42f) }
var fileDescriptor_rtc_058fd4200139f42f = []byte{
// 343 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0x4f, 0x6b, 0xdb, 0x40,
0x10, 0xc5, 0x51, 0xfd, 0xa7, 0xd6, 0xa8, 0xc5, 0x66, 0x69, 0x8b, 0x30, 0x3d, 0xa8, 0x3e, 0x14,
0x9f, 0x24, 0x70, 0x8f, 0x86, 0x1e, 0x6c, 0x43, 0x71, 0x83, 0x49, 0x58, 0x27, 0x97, 0x5c, 0xc4,
0x66, 0x3d, 0x98, 0x8d, 0x91, 0x76, 0x33, 0xbb, 0xd8, 0xf8, 0xc3, 0xe6, 0xbb, 0x04, 0x6d, 0x64,
0x5b, 0x09, 0xb9, 0xcd, 0xfb, 0xed, 0xec, 0x0c, 0xef, 0x0d, 0x7c, 0x25, 0x27, 0x33, 0x72, 0x32,
0x35, 0xa4, 0x9d, 0x66, 0x2d, 0x72, 0x72, 0xf8, 0xeb, 0xda, 0x60, 0x99, 0x2f, 0x57, 0x99, 0xd9,
0x6d, 0x33, 0xcf, 0x33, 0xbb, 0xd9, 0xe5, 0x07, 0x9b, 0x1d, 0xec, 0x6b, 0xdf, 0xe8, 0x2f, 0xc0,
0x5c, 0x17, 0x85, 0x2e, 0x39, 0x5a, 0xc3, 0x62, 0xf8, 0x8c, 0x44, 0x73, 0xbd, 0xc1, 0x38, 0x48,
0x82, 0x71, 0x87, 0x9f, 0x24, 0xfb, 0x01, 0x5d, 0x24, 0x5a, 0xd9, 0x6d, 0xfc, 0x29, 0x09, 0xc6,
0x21, 0xaf, 0xd5, 0xe8, 0x39, 0x80, 0xfe, 0x3f, 0x74, 0xff, 0xb5, 0x2a, 0x6f, 0xf5, 0x0e, 0x4b,
0x8e, 0x4f, 0x55, 0xaf, 0x30, 0xea, 0x0a, 0x8f, 0x7e, 0x48, 0xc8, 0x6b, 0xc5, 0x7e, 0x42, 0x28,
0x8c, 0x5a, 0xa3, 0x24, 0x74, 0xf5, 0x98, 0x0b, 0x60, 0x0c, 0xda, 0xa4, 0x75, 0x11, 0xb7, 0xfc,
0x83, 0xaf, 0xd9, 0x10, 0x7a, 0x6a, 0x83, 0xa5, 0x53, 0xee, 0x18, 0xb7, 0x3d, 0x3f, 0x6b, 0x36,
0x83, 0x5e, 0x81, 0x4e, 0x2c, 0x84, 0x13, 0x71, 0x27, 0x09, 0xc6, 0xd1, 0xe4, 0x77, 0x6a, 0x91,
0xf6, 0x48, 0xb9, 0x30, 0x2a, 0x37, 0x82, 0x44, 0x61, 0xd3, 0x1b, 0x41, 0x4e, 0x49, 0x65, 0x44,
0xe9, 0x56, 0x75, 0x37, 0x3f, 0xff, 0x63, 0x09, 0x44, 0xda, 0x20, 0x09, 0xa7, 0x74, 0xb9, 0x5c,
0xc4, 0x5d, 0xbf, 0xa2, 0x89, 0x46, 0x77, 0x30, 0x78, 0x6b, 0xcf, 0x1a, 0x96, 0x35, 0x33, 0xf3,
0x1e, 0xa3, 0x49, 0x3f, 0xad, 0xb2, 0xbf, 0x60, 0xde, 0x8c, 0x75, 0x00, 0xad, 0xc7, 0xc3, 0xc9,
0x72, 0x55, 0x4e, 0x96, 0x00, 0xdc, 0xc9, 0x35, 0xd2, 0x5e, 0x49, 0x64, 0x53, 0xf8, 0xd2, 0x5c,
0xc2, 0xbe, 0xf9, 0x61, 0xef, 0x62, 0x1d, 0x7e, 0xff, 0x80, 0x5a, 0x33, 0x8b, 0xee, 0xc3, 0xb4,
0x3a, 0xfc, 0x94, 0x9c, 0x7c, 0xe8, 0xfa, 0xab, 0xfe, 0x79, 0x09, 0x00, 0x00, 0xff, 0xff, 0x1a,
0x27, 0x45, 0x90, 0x0e, 0x02, 0x00, 0x00,
}

5
pkg/proto/rtc/rtc.proto
View File

@ -1,4 +1,5 @@
syntax = "proto3"; syntax = "proto3";
import "Open_IM/pkg/proto/sdk_ws/ws.proto";
option go_package = "./rtc;rtc"; option go_package = "./rtc;rtc";
package rtc; package rtc;
@ -12,7 +13,8 @@ message GetJoinTokenReq{
string apiSecret = 2; string apiSecret = 2;
string room = 3; string room = 3;
string identity = 4; string identity = 4;
string operationID = 5; server_api_params.ParticipantMetaData metaData = 5;
string operationID = 6;
} }
message GetJoinTokenResp{ message GetJoinTokenResp{
@ -23,4 +25,3 @@ message GetJoinTokenResp{
service RtcService { service RtcService {
rpc GetJoinToken(GetJoinTokenReq) returns(GetJoinTokenResp); rpc GetJoinToken(GetJoinTokenReq) returns(GetJoinTokenResp);
} }