diff --git a/plugnmeet/plugnmeet_recorder.pb.go b/plugnmeet/plugnmeet_recorder.pb.go index cbd0547..0258e54 100644 --- a/plugnmeet/plugnmeet_recorder.pb.go +++ b/plugnmeet/plugnmeet_recorder.pb.go @@ -130,6 +130,55 @@ func (RecorderServiceType) EnumDescriptor() ([]byte, []int) { return file_plugnmeet_recorder_proto_rawDescGZIP(), []int{1} } +type RecorderInfoKeys int32 + +const ( + RecorderInfoKeys_RECORDER_INFO_MAX_LIMIT RecorderInfoKeys = 0 + RecorderInfoKeys_RECORDER_INFO_LAST_PING RecorderInfoKeys = 1 + RecorderInfoKeys_RECORDER_INFO_CURRENT_PROGRESS RecorderInfoKeys = 3 +) + +// Enum value maps for RecorderInfoKeys. +var ( + RecorderInfoKeys_name = map[int32]string{ + 0: "RECORDER_INFO_MAX_LIMIT", + 1: "RECORDER_INFO_LAST_PING", + 3: "RECORDER_INFO_CURRENT_PROGRESS", + } + RecorderInfoKeys_value = map[string]int32{ + "RECORDER_INFO_MAX_LIMIT": 0, + "RECORDER_INFO_LAST_PING": 1, + "RECORDER_INFO_CURRENT_PROGRESS": 3, + } +) + +func (x RecorderInfoKeys) Enum() *RecorderInfoKeys { + p := new(RecorderInfoKeys) + *p = x + return p +} + +func (x RecorderInfoKeys) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (RecorderInfoKeys) Descriptor() protoreflect.EnumDescriptor { + return file_plugnmeet_recorder_proto_enumTypes[2].Descriptor() +} + +func (RecorderInfoKeys) Type() protoreflect.EnumType { + return &file_plugnmeet_recorder_proto_enumTypes[2] +} + +func (x RecorderInfoKeys) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use RecorderInfoKeys.Descriptor instead. +func (RecorderInfoKeys) EnumDescriptor() ([]byte, []int) { + return file_plugnmeet_recorder_proto_rawDescGZIP(), []int{2} +} + type PlugNmeetToRecorder struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -515,20 +564,17 @@ type StartRecorderChildArgs struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RoomTableId int64 `protobuf:"varint,1,opt,name=room_table_id,json=roomTableId,proto3" json:"room_table_id,omitempty"` - RecordingId string `protobuf:"bytes,2,opt,name=recording_id,json=recordingId,proto3" json:"recording_id,omitempty"` + ServiceType RecorderServiceType `protobuf:"varint,1,opt,name=serviceType,proto3,enum=plugnmeet.RecorderServiceType" json:"serviceType,omitempty"` + RoomTableId int64 `protobuf:"varint,2,opt,name=room_table_id,json=roomTableId,proto3" json:"room_table_id,omitempty"` + RecordingId string `protobuf:"bytes,3,opt,name=recording_id,json=recordingId,proto3" json:"recording_id,omitempty"` AccessToken string `protobuf:"bytes,4,opt,name=access_token,json=accessToken,proto3" json:"access_token,omitempty"` - PlugNMeetInfo *PlugNmeetInfo `protobuf:"bytes,5,opt,name=plug_n_meet_info,json=plugNMeetInfo,proto3" json:"plug_n_meet_info,omitempty"` - PostMp4Convert bool `protobuf:"varint,6,opt,name=post_mp4_convert,json=postMp4Convert,proto3" json:"post_mp4_convert,omitempty"` - CopyToPath *CopyToPath `protobuf:"bytes,7,opt,name=copy_to_path,json=copyToPath,proto3" json:"copy_to_path,omitempty"` - ServiceType RecorderServiceType `protobuf:"varint,8,opt,name=serviceType,proto3,enum=plugnmeet.RecorderServiceType" json:"serviceType,omitempty"` - RecorderId *string `protobuf:"bytes,9,opt,name=recorder_id,json=recorderId,proto3,oneof" json:"recorder_id,omitempty"` - RtmpUrl *string `protobuf:"bytes,10,opt,name=rtmp_url,json=rtmpUrl,proto3,oneof" json:"rtmp_url,omitempty"` - WebsocketUrl string `protobuf:"bytes,11,opt,name=websocket_url,json=websocketUrl,proto3" json:"websocket_url,omitempty"` - CustomChromePath *string `protobuf:"bytes,12,opt,name=custom_chrome_path,json=customChromePath,proto3,oneof" json:"custom_chrome_path,omitempty"` - Width *uint32 `protobuf:"varint,13,opt,name=width,proto3,oneof" json:"width,omitempty"` - Height *uint32 `protobuf:"varint,14,opt,name=height,proto3,oneof" json:"height,omitempty"` - XvfbDpi *uint32 `protobuf:"varint,15,opt,name=xvfb_dpi,json=xvfbDpi,proto3,oneof" json:"xvfb_dpi,omitempty"` + PnmHost string `protobuf:"bytes,5,opt,name=pnm_host,json=pnmHost,proto3" json:"pnm_host,omitempty"` + PnmJoinHost *string `protobuf:"bytes,6,opt,name=pnm_join_host,json=pnmJoinHost,proto3,oneof" json:"pnm_join_host,omitempty"` + WebsocketUrl string `protobuf:"bytes,7,opt,name=websocket_url,json=websocketUrl,proto3" json:"websocket_url,omitempty"` + CustomChromePath *string `protobuf:"bytes,8,opt,name=custom_chrome_path,json=customChromePath,proto3,oneof" json:"custom_chrome_path,omitempty"` + Width *uint32 `protobuf:"varint,9,opt,name=width,proto3,oneof" json:"width,omitempty"` + Height *uint32 `protobuf:"varint,10,opt,name=height,proto3,oneof" json:"height,omitempty"` + XvfbDpi *uint32 `protobuf:"varint,11,opt,name=xvfb_dpi,json=xvfbDpi,proto3,oneof" json:"xvfb_dpi,omitempty"` } func (x *StartRecorderChildArgs) Reset() { @@ -563,6 +609,13 @@ func (*StartRecorderChildArgs) Descriptor() ([]byte, []int) { return file_plugnmeet_recorder_proto_rawDescGZIP(), []int{4} } +func (x *StartRecorderChildArgs) GetServiceType() RecorderServiceType { + if x != nil { + return x.ServiceType + } + return RecorderServiceType_RECORDING +} + func (x *StartRecorderChildArgs) GetRoomTableId() int64 { if x != nil { return x.RoomTableId @@ -584,44 +637,16 @@ func (x *StartRecorderChildArgs) GetAccessToken() string { return "" } -func (x *StartRecorderChildArgs) GetPlugNMeetInfo() *PlugNmeetInfo { - if x != nil { - return x.PlugNMeetInfo - } - return nil -} - -func (x *StartRecorderChildArgs) GetPostMp4Convert() bool { +func (x *StartRecorderChildArgs) GetPnmHost() string { if x != nil { - return x.PostMp4Convert - } - return false -} - -func (x *StartRecorderChildArgs) GetCopyToPath() *CopyToPath { - if x != nil { - return x.CopyToPath - } - return nil -} - -func (x *StartRecorderChildArgs) GetServiceType() RecorderServiceType { - if x != nil { - return x.ServiceType - } - return RecorderServiceType_RECORDING -} - -func (x *StartRecorderChildArgs) GetRecorderId() string { - if x != nil && x.RecorderId != nil { - return *x.RecorderId + return x.PnmHost } return "" } -func (x *StartRecorderChildArgs) GetRtmpUrl() string { - if x != nil && x.RtmpUrl != nil { - return *x.RtmpUrl +func (x *StartRecorderChildArgs) GetPnmJoinHost() string { + if x != nil && x.PnmJoinHost != nil { + return *x.PnmJoinHost } return "" } @@ -854,89 +879,84 @@ var file_plugnmeet_recorder_proto_rawDesc = []byte{ 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0d, 0x72, 0x6f, 0x6f, 0x6d, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x72, 0x6f, - 0x6f, 0x6d, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x22, 0xb6, 0x05, 0x0a, 0x16, 0x53, 0x74, + 0x6f, 0x6d, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x22, 0x83, 0x04, 0x0a, 0x16, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x68, 0x69, 0x6c, 0x64, - 0x41, 0x72, 0x67, 0x73, 0x12, 0x22, 0x0a, 0x0d, 0x72, 0x6f, 0x6f, 0x6d, 0x5f, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x72, 0x6f, 0x6f, - 0x6d, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x72, 0x65, 0x63, 0x6f, - 0x72, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, - 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x61, - 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x41, - 0x0a, 0x10, 0x70, 0x6c, 0x75, 0x67, 0x5f, 0x6e, 0x5f, 0x6d, 0x65, 0x65, 0x74, 0x5f, 0x69, 0x6e, - 0x66, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x70, 0x6c, 0x75, 0x67, 0x6e, - 0x6d, 0x65, 0x65, 0x74, 0x2e, 0x50, 0x6c, 0x75, 0x67, 0x4e, 0x6d, 0x65, 0x65, 0x74, 0x49, 0x6e, - 0x66, 0x6f, 0x52, 0x0d, 0x70, 0x6c, 0x75, 0x67, 0x4e, 0x4d, 0x65, 0x65, 0x74, 0x49, 0x6e, 0x66, - 0x6f, 0x12, 0x28, 0x0a, 0x10, 0x70, 0x6f, 0x73, 0x74, 0x5f, 0x6d, 0x70, 0x34, 0x5f, 0x63, 0x6f, - 0x6e, 0x76, 0x65, 0x72, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x70, 0x6f, 0x73, - 0x74, 0x4d, 0x70, 0x34, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x12, 0x37, 0x0a, 0x0c, 0x63, - 0x6f, 0x70, 0x79, 0x5f, 0x74, 0x6f, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x15, 0x2e, 0x70, 0x6c, 0x75, 0x67, 0x6e, 0x6d, 0x65, 0x65, 0x74, 0x2e, 0x43, 0x6f, - 0x70, 0x79, 0x54, 0x6f, 0x50, 0x61, 0x74, 0x68, 0x52, 0x0a, 0x63, 0x6f, 0x70, 0x79, 0x54, 0x6f, - 0x50, 0x61, 0x74, 0x68, 0x12, 0x40, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, - 0x79, 0x70, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x70, 0x6c, 0x75, 0x67, + 0x41, 0x72, 0x67, 0x73, 0x12, 0x40, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, + 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x70, 0x6c, 0x75, 0x67, 0x6e, 0x6d, 0x65, 0x65, 0x74, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x24, 0x0a, 0x0b, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0a, 0x72, - 0x65, 0x63, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x1e, 0x0a, 0x08, - 0x72, 0x74, 0x6d, 0x70, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, - 0x52, 0x07, 0x72, 0x74, 0x6d, 0x70, 0x55, 0x72, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0d, - 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x0b, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0c, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x55, 0x72, - 0x6c, 0x12, 0x31, 0x0a, 0x12, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x63, 0x68, 0x72, 0x6f, - 0x6d, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, - 0x10, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x68, 0x72, 0x6f, 0x6d, 0x65, 0x50, 0x61, 0x74, - 0x68, 0x88, 0x01, 0x01, 0x12, 0x19, 0x0a, 0x05, 0x77, 0x69, 0x64, 0x74, 0x68, 0x18, 0x0d, 0x20, - 0x01, 0x28, 0x0d, 0x48, 0x03, 0x52, 0x05, 0x77, 0x69, 0x64, 0x74, 0x68, 0x88, 0x01, 0x01, 0x12, - 0x1b, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0d, 0x48, - 0x04, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x88, 0x01, 0x01, 0x12, 0x1e, 0x0a, 0x08, - 0x78, 0x76, 0x66, 0x62, 0x5f, 0x64, 0x70, 0x69, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x05, - 0x52, 0x07, 0x78, 0x76, 0x66, 0x62, 0x44, 0x70, 0x69, 0x88, 0x01, 0x01, 0x42, 0x0e, 0x0a, 0x0c, - 0x5f, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x42, 0x0b, 0x0a, 0x09, - 0x5f, 0x72, 0x74, 0x6d, 0x70, 0x5f, 0x75, 0x72, 0x6c, 0x42, 0x15, 0x0a, 0x13, 0x5f, 0x63, 0x75, - 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x63, 0x68, 0x72, 0x6f, 0x6d, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, - 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x78, 0x76, 0x66, 0x62, 0x5f, 0x64, - 0x70, 0x69, 0x22, 0x8b, 0x01, 0x0a, 0x0d, 0x50, 0x6c, 0x75, 0x67, 0x4e, 0x6d, 0x65, 0x65, 0x74, - 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x61, 0x70, 0x69, 0x5f, - 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x70, 0x69, 0x4b, 0x65, - 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x70, 0x69, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x70, 0x69, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, - 0x12, 0x20, 0x0a, 0x09, 0x6a, 0x6f, 0x69, 0x6e, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x08, 0x6a, 0x6f, 0x69, 0x6e, 0x48, 0x6f, 0x73, 0x74, 0x88, - 0x01, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x6a, 0x6f, 0x69, 0x6e, 0x5f, 0x68, 0x6f, 0x73, 0x74, - 0x22, 0x56, 0x0a, 0x0a, 0x43, 0x6f, 0x70, 0x79, 0x54, 0x6f, 0x50, 0x61, 0x74, 0x68, 0x12, 0x1b, - 0x0a, 0x09, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x50, 0x61, 0x74, 0x68, 0x12, 0x1e, 0x0a, 0x08, 0x73, - 0x75, 0x62, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, - 0x07, 0x73, 0x75, 0x62, 0x50, 0x61, 0x74, 0x68, 0x88, 0x01, 0x01, 0x42, 0x0b, 0x0a, 0x09, 0x5f, - 0x73, 0x75, 0x62, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x2a, 0x9c, 0x01, 0x0a, 0x0e, 0x52, 0x65, 0x63, - 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x13, 0x0a, 0x0f, 0x53, - 0x54, 0x41, 0x52, 0x54, 0x5f, 0x52, 0x45, 0x43, 0x4f, 0x52, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x00, - 0x12, 0x12, 0x0a, 0x0e, 0x53, 0x54, 0x4f, 0x50, 0x5f, 0x52, 0x45, 0x43, 0x4f, 0x52, 0x44, 0x49, - 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x53, 0x54, 0x41, 0x52, 0x54, 0x5f, 0x52, 0x54, - 0x4d, 0x50, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x54, 0x4f, 0x50, 0x5f, 0x52, 0x54, 0x4d, - 0x50, 0x10, 0x03, 0x12, 0x11, 0x0a, 0x0d, 0x45, 0x4e, 0x44, 0x5f, 0x52, 0x45, 0x43, 0x4f, 0x52, - 0x44, 0x49, 0x4e, 0x47, 0x10, 0x04, 0x12, 0x0c, 0x0a, 0x08, 0x45, 0x4e, 0x44, 0x5f, 0x52, 0x54, - 0x4d, 0x50, 0x10, 0x05, 0x12, 0x17, 0x0a, 0x13, 0x52, 0x45, 0x43, 0x4f, 0x52, 0x44, 0x49, 0x4e, - 0x47, 0x5f, 0x50, 0x52, 0x4f, 0x43, 0x45, 0x45, 0x44, 0x45, 0x44, 0x10, 0x06, 0x12, 0x08, 0x0a, - 0x04, 0x53, 0x54, 0x4f, 0x50, 0x10, 0x07, 0x2a, 0x2e, 0x0a, 0x13, 0x52, 0x65, 0x63, 0x6f, 0x72, - 0x64, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0d, - 0x0a, 0x09, 0x52, 0x45, 0x43, 0x4f, 0x52, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x00, 0x12, 0x08, 0x0a, - 0x04, 0x52, 0x54, 0x4d, 0x50, 0x10, 0x01, 0x42, 0x9f, 0x01, 0x0a, 0x0d, 0x63, 0x6f, 0x6d, 0x2e, - 0x70, 0x6c, 0x75, 0x67, 0x6e, 0x6d, 0x65, 0x65, 0x74, 0x42, 0x16, 0x50, 0x6c, 0x75, 0x67, 0x6e, - 0x6d, 0x65, 0x65, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, - 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x6d, 0x79, 0x6e, 0x61, 0x70, 0x61, 0x72, 0x72, 0x6f, 0x74, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x6e, - 0x6d, 0x65, 0x65, 0x74, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x70, 0x6c, - 0x75, 0x67, 0x6e, 0x6d, 0x65, 0x65, 0x74, 0xa2, 0x02, 0x03, 0x50, 0x58, 0x58, 0xaa, 0x02, 0x09, - 0x50, 0x6c, 0x75, 0x67, 0x6e, 0x6d, 0x65, 0x65, 0x74, 0xca, 0x02, 0x09, 0x50, 0x6c, 0x75, 0x67, - 0x6e, 0x6d, 0x65, 0x65, 0x74, 0xe2, 0x02, 0x15, 0x50, 0x6c, 0x75, 0x67, 0x6e, 0x6d, 0x65, 0x65, - 0x74, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x09, - 0x50, 0x6c, 0x75, 0x67, 0x6e, 0x6d, 0x65, 0x65, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x22, 0x0a, 0x0d, 0x72, 0x6f, 0x6f, 0x6d, 0x5f, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x72, + 0x6f, 0x6f, 0x6d, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x72, 0x65, + 0x63, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0b, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x49, 0x64, 0x12, 0x21, 0x0a, + 0x0c, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x54, 0x6f, 0x6b, 0x65, 0x6e, + 0x12, 0x19, 0x0a, 0x08, 0x70, 0x6e, 0x6d, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x70, 0x6e, 0x6d, 0x48, 0x6f, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0d, 0x70, + 0x6e, 0x6d, 0x5f, 0x6a, 0x6f, 0x69, 0x6e, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x06, 0x20, 0x01, + 0x28, 0x09, 0x48, 0x00, 0x52, 0x0b, 0x70, 0x6e, 0x6d, 0x4a, 0x6f, 0x69, 0x6e, 0x48, 0x6f, 0x73, + 0x74, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0d, 0x77, 0x65, 0x62, 0x73, 0x6f, 0x63, 0x6b, 0x65, + 0x74, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x77, 0x65, 0x62, + 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x55, 0x72, 0x6c, 0x12, 0x31, 0x0a, 0x12, 0x63, 0x75, 0x73, + 0x74, 0x6f, 0x6d, 0x5f, 0x63, 0x68, 0x72, 0x6f, 0x6d, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, + 0x08, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x10, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, + 0x68, 0x72, 0x6f, 0x6d, 0x65, 0x50, 0x61, 0x74, 0x68, 0x88, 0x01, 0x01, 0x12, 0x19, 0x0a, 0x05, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x02, 0x52, 0x05, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x03, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x88, 0x01, 0x01, 0x12, 0x1e, 0x0a, 0x08, 0x78, 0x76, 0x66, 0x62, 0x5f, 0x64, 0x70, 0x69, + 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x04, 0x52, 0x07, 0x78, 0x76, 0x66, 0x62, 0x44, 0x70, + 0x69, 0x88, 0x01, 0x01, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x70, 0x6e, 0x6d, 0x5f, 0x6a, 0x6f, 0x69, + 0x6e, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x42, 0x15, 0x0a, 0x13, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, + 0x6d, 0x5f, 0x63, 0x68, 0x72, 0x6f, 0x6d, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x42, 0x08, 0x0a, + 0x06, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x68, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x78, 0x76, 0x66, 0x62, 0x5f, 0x64, 0x70, 0x69, 0x22, + 0x8b, 0x01, 0x0a, 0x0d, 0x50, 0x6c, 0x75, 0x67, 0x4e, 0x6d, 0x65, 0x65, 0x74, 0x49, 0x6e, 0x66, + 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x04, 0x68, 0x6f, 0x73, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x61, 0x70, 0x69, 0x5f, 0x6b, 0x65, 0x79, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x12, 0x1d, + 0x0a, 0x0a, 0x61, 0x70, 0x69, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x09, 0x61, 0x70, 0x69, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x12, 0x20, 0x0a, + 0x09, 0x6a, 0x6f, 0x69, 0x6e, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, + 0x48, 0x00, 0x52, 0x08, 0x6a, 0x6f, 0x69, 0x6e, 0x48, 0x6f, 0x73, 0x74, 0x88, 0x01, 0x01, 0x42, + 0x0c, 0x0a, 0x0a, 0x5f, 0x6a, 0x6f, 0x69, 0x6e, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x22, 0x56, 0x0a, + 0x0a, 0x43, 0x6f, 0x70, 0x79, 0x54, 0x6f, 0x50, 0x61, 0x74, 0x68, 0x12, 0x1b, 0x0a, 0x09, 0x6d, + 0x61, 0x69, 0x6e, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x6d, 0x61, 0x69, 0x6e, 0x50, 0x61, 0x74, 0x68, 0x12, 0x1e, 0x0a, 0x08, 0x73, 0x75, 0x62, 0x5f, + 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x07, 0x73, 0x75, + 0x62, 0x50, 0x61, 0x74, 0x68, 0x88, 0x01, 0x01, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x73, 0x75, 0x62, + 0x5f, 0x70, 0x61, 0x74, 0x68, 0x2a, 0x9c, 0x01, 0x0a, 0x0e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, + 0x69, 0x6e, 0x67, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x54, 0x41, 0x52, + 0x54, 0x5f, 0x52, 0x45, 0x43, 0x4f, 0x52, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x00, 0x12, 0x12, 0x0a, + 0x0e, 0x53, 0x54, 0x4f, 0x50, 0x5f, 0x52, 0x45, 0x43, 0x4f, 0x52, 0x44, 0x49, 0x4e, 0x47, 0x10, + 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x53, 0x54, 0x41, 0x52, 0x54, 0x5f, 0x52, 0x54, 0x4d, 0x50, 0x10, + 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x54, 0x4f, 0x50, 0x5f, 0x52, 0x54, 0x4d, 0x50, 0x10, 0x03, + 0x12, 0x11, 0x0a, 0x0d, 0x45, 0x4e, 0x44, 0x5f, 0x52, 0x45, 0x43, 0x4f, 0x52, 0x44, 0x49, 0x4e, + 0x47, 0x10, 0x04, 0x12, 0x0c, 0x0a, 0x08, 0x45, 0x4e, 0x44, 0x5f, 0x52, 0x54, 0x4d, 0x50, 0x10, + 0x05, 0x12, 0x17, 0x0a, 0x13, 0x52, 0x45, 0x43, 0x4f, 0x52, 0x44, 0x49, 0x4e, 0x47, 0x5f, 0x50, + 0x52, 0x4f, 0x43, 0x45, 0x45, 0x44, 0x45, 0x44, 0x10, 0x06, 0x12, 0x08, 0x0a, 0x04, 0x53, 0x54, + 0x4f, 0x50, 0x10, 0x07, 0x2a, 0x2e, 0x0a, 0x13, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x65, 0x72, + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0d, 0x0a, 0x09, 0x52, + 0x45, 0x43, 0x4f, 0x52, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x52, 0x54, + 0x4d, 0x50, 0x10, 0x01, 0x2a, 0x70, 0x0a, 0x10, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x65, 0x72, + 0x49, 0x6e, 0x66, 0x6f, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x1b, 0x0a, 0x17, 0x52, 0x45, 0x43, 0x4f, + 0x52, 0x44, 0x45, 0x52, 0x5f, 0x49, 0x4e, 0x46, 0x4f, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x4c, 0x49, + 0x4d, 0x49, 0x54, 0x10, 0x00, 0x12, 0x1b, 0x0a, 0x17, 0x52, 0x45, 0x43, 0x4f, 0x52, 0x44, 0x45, + 0x52, 0x5f, 0x49, 0x4e, 0x46, 0x4f, 0x5f, 0x4c, 0x41, 0x53, 0x54, 0x5f, 0x50, 0x49, 0x4e, 0x47, + 0x10, 0x01, 0x12, 0x22, 0x0a, 0x1e, 0x52, 0x45, 0x43, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x5f, 0x49, + 0x4e, 0x46, 0x4f, 0x5f, 0x43, 0x55, 0x52, 0x52, 0x45, 0x4e, 0x54, 0x5f, 0x50, 0x52, 0x4f, 0x47, + 0x52, 0x45, 0x53, 0x53, 0x10, 0x03, 0x42, 0x9f, 0x01, 0x0a, 0x0d, 0x63, 0x6f, 0x6d, 0x2e, 0x70, + 0x6c, 0x75, 0x67, 0x6e, 0x6d, 0x65, 0x65, 0x74, 0x42, 0x16, 0x50, 0x6c, 0x75, 0x67, 0x6e, 0x6d, + 0x65, 0x65, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x50, 0x01, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6d, + 0x79, 0x6e, 0x61, 0x70, 0x61, 0x72, 0x72, 0x6f, 0x74, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x6e, 0x6d, + 0x65, 0x65, 0x74, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x70, 0x6c, 0x75, + 0x67, 0x6e, 0x6d, 0x65, 0x65, 0x74, 0xa2, 0x02, 0x03, 0x50, 0x58, 0x58, 0xaa, 0x02, 0x09, 0x50, + 0x6c, 0x75, 0x67, 0x6e, 0x6d, 0x65, 0x65, 0x74, 0xca, 0x02, 0x09, 0x50, 0x6c, 0x75, 0x67, 0x6e, + 0x6d, 0x65, 0x65, 0x74, 0xe2, 0x02, 0x15, 0x50, 0x6c, 0x75, 0x67, 0x6e, 0x6d, 0x65, 0x65, 0x74, + 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x09, 0x50, + 0x6c, 0x75, 0x67, 0x6e, 0x6d, 0x65, 0x65, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -951,32 +971,31 @@ func file_plugnmeet_recorder_proto_rawDescGZIP() []byte { return file_plugnmeet_recorder_proto_rawDescData } -var file_plugnmeet_recorder_proto_enumTypes = make([]protoimpl.EnumInfo, 2) +var file_plugnmeet_recorder_proto_enumTypes = make([]protoimpl.EnumInfo, 3) var file_plugnmeet_recorder_proto_msgTypes = make([]protoimpl.MessageInfo, 7) var file_plugnmeet_recorder_proto_goTypes = []any{ (RecordingTasks)(0), // 0: plugnmeet.RecordingTasks (RecorderServiceType)(0), // 1: plugnmeet.RecorderServiceType - (*PlugNmeetToRecorder)(nil), // 2: plugnmeet.PlugNmeetToRecorder - (*RecorderToPlugNmeet)(nil), // 3: plugnmeet.RecorderToPlugNmeet - (*FromParentToChild)(nil), // 4: plugnmeet.FromParentToChild - (*FromChildToParent)(nil), // 5: plugnmeet.FromChildToParent - (*StartRecorderChildArgs)(nil), // 6: plugnmeet.StartRecorderChildArgs - (*PlugNmeetInfo)(nil), // 7: plugnmeet.PlugNmeetInfo - (*CopyToPath)(nil), // 8: plugnmeet.CopyToPath + (RecorderInfoKeys)(0), // 2: plugnmeet.RecorderInfoKeys + (*PlugNmeetToRecorder)(nil), // 3: plugnmeet.PlugNmeetToRecorder + (*RecorderToPlugNmeet)(nil), // 4: plugnmeet.RecorderToPlugNmeet + (*FromParentToChild)(nil), // 5: plugnmeet.FromParentToChild + (*FromChildToParent)(nil), // 6: plugnmeet.FromChildToParent + (*StartRecorderChildArgs)(nil), // 7: plugnmeet.StartRecorderChildArgs + (*PlugNmeetInfo)(nil), // 8: plugnmeet.PlugNmeetInfo + (*CopyToPath)(nil), // 9: plugnmeet.CopyToPath } var file_plugnmeet_recorder_proto_depIdxs = []int32{ 0, // 0: plugnmeet.PlugNmeetToRecorder.task:type_name -> plugnmeet.RecordingTasks 0, // 1: plugnmeet.RecorderToPlugNmeet.task:type_name -> plugnmeet.RecordingTasks 0, // 2: plugnmeet.FromParentToChild.task:type_name -> plugnmeet.RecordingTasks 0, // 3: plugnmeet.FromChildToParent.task:type_name -> plugnmeet.RecordingTasks - 7, // 4: plugnmeet.StartRecorderChildArgs.plug_n_meet_info:type_name -> plugnmeet.PlugNmeetInfo - 8, // 5: plugnmeet.StartRecorderChildArgs.copy_to_path:type_name -> plugnmeet.CopyToPath - 1, // 6: plugnmeet.StartRecorderChildArgs.serviceType:type_name -> plugnmeet.RecorderServiceType - 7, // [7:7] is the sub-list for method output_type - 7, // [7:7] is the sub-list for method input_type - 7, // [7:7] is the sub-list for extension type_name - 7, // [7:7] is the sub-list for extension extendee - 0, // [0:7] is the sub-list for field type_name + 1, // 4: plugnmeet.StartRecorderChildArgs.serviceType:type_name -> plugnmeet.RecorderServiceType + 5, // [5:5] is the sub-list for method output_type + 5, // [5:5] is the sub-list for method input_type + 5, // [5:5] is the sub-list for extension type_name + 5, // [5:5] is the sub-list for extension extendee + 0, // [0:5] is the sub-list for field type_name } func init() { file_plugnmeet_recorder_proto_init() } @@ -1079,7 +1098,7 @@ func file_plugnmeet_recorder_proto_init() { File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_plugnmeet_recorder_proto_rawDesc, - NumEnums: 2, + NumEnums: 3, NumMessages: 7, NumExtensions: 0, NumServices: 0, diff --git a/plugnmeet/plugnmeet_recorder.pb.validate.go b/plugnmeet/plugnmeet_recorder.pb.validate.go index ddf2f8d..ffc291a 100644 --- a/plugnmeet/plugnmeet_recorder.pb.validate.go +++ b/plugnmeet/plugnmeet_recorder.pb.validate.go @@ -523,82 +523,20 @@ func (m *StartRecorderChildArgs) validate(all bool) error { var errors []error + // no validation rules for ServiceType + // no validation rules for RoomTableId // no validation rules for RecordingId // no validation rules for AccessToken - if all { - switch v := interface{}(m.GetPlugNMeetInfo()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, StartRecorderChildArgsValidationError{ - field: "PlugNMeetInfo", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, StartRecorderChildArgsValidationError{ - field: "PlugNMeetInfo", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetPlugNMeetInfo()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return StartRecorderChildArgsValidationError{ - field: "PlugNMeetInfo", - reason: "embedded message failed validation", - cause: err, - } - } - } - - // no validation rules for PostMp4Convert - - if all { - switch v := interface{}(m.GetCopyToPath()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, StartRecorderChildArgsValidationError{ - field: "CopyToPath", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, StartRecorderChildArgsValidationError{ - field: "CopyToPath", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetCopyToPath()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return StartRecorderChildArgsValidationError{ - field: "CopyToPath", - reason: "embedded message failed validation", - cause: err, - } - } - } - - // no validation rules for ServiceType + // no validation rules for PnmHost // no validation rules for WebsocketUrl - if m.RecorderId != nil { - // no validation rules for RecorderId - } - - if m.RtmpUrl != nil { - // no validation rules for RtmpUrl + if m.PnmJoinHost != nil { + // no validation rules for PnmJoinHost } if m.CustomChromePath != nil { diff --git a/proto_files/plugnmeet_recorder.proto b/proto_files/plugnmeet_recorder.proto index 5f77806..ed27c64 100644 --- a/proto_files/plugnmeet_recorder.proto +++ b/proto_files/plugnmeet_recorder.proto @@ -88,3 +88,9 @@ enum RecorderServiceType { RECORDING = 0; RTMP = 1; } + +enum RecorderInfoKeys { + RECORDER_INFO_MAX_LIMIT = 0; + RECORDER_INFO_LAST_PING = 1; + RECORDER_INFO_CURRENT_PROGRESS = 3; +}