Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull the protocol submodule forward and rebuild all of the protobufs. #114

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion protocol
Submodule protocol updated 62 files
+3 −9 .github/workflows/generate.yaml
+8 −0 auth/grants.go
+3 −3 bootstrap.sh
+31 −34 go.mod
+67 −75 go.sum
+1 −1 infra/link.pb.go
+1 −1 infra/link_grpc.pb.go
+1,250 −0 livekit/livekit_agent.pb.go
+1 −1 livekit/livekit_analytics.pb.go
+1 −1 livekit/livekit_analytics_grpc.pb.go
+472 −537 livekit/livekit_egress.pb.go
+189 −470 livekit/livekit_egress.twirp.go
+1 −1 livekit/livekit_ingress.pb.go
+1 −1 livekit/livekit_internal.pb.go
+430 −415 livekit/livekit_models.pb.go
+1 −1 livekit/livekit_room.pb.go
+1 −1 livekit/livekit_rtc.pb.go
+1,832 −0 livekit/livekit_sip.pb.go
+3,096 −0 livekit/livekit_sip.twirp.go
+1 −1 livekit/livekit_webhook.pb.go
+111 −0 livekit_agent.proto
+4 −10 livekit_egress.proto
+4 −1 livekit_models.proto
+230 −0 livekit_sip.proto
+6 −0 magefile.go
+6 −2 psrpc/compilercheck.go
+82 −0 psrpc/errors.go
+245 −0 rpc/agent.pb.go
+40 −0 rpc/agent.proto
+164 −0 rpc/agent.psrpc.go
+1 −1 rpc/egress.pb.go
+26 −25 rpc/egress.psrpc.go
+4 −5 rpc/egress_client.go
+1 −1 rpc/ingress.pb.go
+31 −30 rpc/ingress.psrpc.go
+3 −5 rpc/ingress_client.go
+540 −72 rpc/io.pb.go
+62 −1 rpc/io.proto
+153 −43 rpc/io.psrpc.go
+119 −0 rpc/participant.pb.go
+52 −0 rpc/participant.proto
+225 −0 rpc/participant.psrpc.go
+100 −0 rpc/room.pb.go
+42 −0 rpc/room.proto
+200 −0 rpc/room.psrpc.go
+380 −0 rpc/rpcfakes/fake_typed_participant_client.go
+295 −0 rpc/rpcfakes/fake_typed_room_client.go
+1 −1 rpc/signal.pb.go
+8 −7 rpc/signal.psrpc.go
+436 −0 rpc/sip.pb.go
+59 −0 rpc/sip.proto
+165 −0 rpc/sip.psrpc.go
+42 −0 rpc/sip_client.go
+114 −2 rpc/typed_api.go
+32 −0 utils/connectionquality.go
+20 −17 utils/id.go
+61 −0 utils/multitonservice.go
+108 −0 utils/multitonservice_test.go
+22 −0 utils/must.go
+1 −1 utils/protoproxy_test.go
+191 −0 utils/rtpstats.go
+1 −1 webhook/url_notifier.go
2 changes: 1 addition & 1 deletion src/proto/google/protobuf/timestamp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export const protobufPackage = "google.protobuf";
* [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
* the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
* the Joda Time's [`ISODateTimeFormat.dateTime()`](
* http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D
* http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime()
* ) to obtain a formatter capable of generating timestamps in this format.
*/
export interface Timestamp {
Expand Down
179 changes: 57 additions & 122 deletions src/proto/livekit_egress.ts
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,7 @@ export interface S3Upload {
forcePathStyle?: boolean | undefined;
metadata?: { [key: string]: string } | undefined;
tagging?: string | undefined;
contentDisposition?: string | undefined;
}

export interface S3Upload_MetadataEntry {
Expand Down Expand Up @@ -642,6 +643,10 @@ export interface EncodingOptions {
audioBitrate?:
| number
| undefined;
/** quality setting on audio encoder */
audioQuality?:
| number
| undefined;
/** (default 44100) */
audioFrequency?:
| number
Expand All @@ -654,6 +659,10 @@ export interface EncodingOptions {
videoBitrate?:
| number
| undefined;
/** quality setting on video encoder */
videoQuality?:
| number
| undefined;
/** in seconds (default 4s for streaming, segment duration for segmented output, encoder default for files) */
keyFrameInterval?: number | undefined;
}
Expand All @@ -669,12 +678,6 @@ export interface UpdateStreamRequest {
removeOutputUrls?: string[] | undefined;
}

export interface UpdateOutputsRequest {
egressId?: string | undefined;
addImageOutputs?: ImageOutput[] | undefined;
removeImageOutputs?: ImageOutput[] | undefined;
}

export interface ListEgressRequest {
/** (optional, filter by room name) */
roomName?:
Expand Down Expand Up @@ -800,7 +803,6 @@ export interface SegmentsInfo {
segmentCount?: number | undefined;
startedAt?: number | undefined;
endedAt?: number | undefined;
dataEventLocation?: string | undefined;
}

export interface ImagesInfo {
Expand Down Expand Up @@ -2735,6 +2737,7 @@ function createBaseS3Upload(): S3Upload {
forcePathStyle: false,
metadata: {},
tagging: "",
contentDisposition: "",
};
}

Expand Down Expand Up @@ -2764,6 +2767,9 @@ export const S3Upload = {
if (message.tagging !== undefined && message.tagging !== "") {
writer.uint32(66).string(message.tagging);
}
if (message.contentDisposition !== undefined && message.contentDisposition !== "") {
writer.uint32(74).string(message.contentDisposition);
}
return writer;
},

Expand Down Expand Up @@ -2833,6 +2839,13 @@ export const S3Upload = {

message.tagging = reader.string();
continue;
case 9:
if (tag !== 74) {
break;
}

message.contentDisposition = reader.string();
continue;
}
if ((tag & 7) === 4 || tag === 0) {
break;
Expand All @@ -2857,6 +2870,7 @@ export const S3Upload = {
}, {})
: {},
tagging: isSet(object.tagging) ? globalThis.String(object.tagging) : "",
contentDisposition: isSet(object.contentDisposition) ? globalThis.String(object.contentDisposition) : "",
};
},

Expand Down Expand Up @@ -2892,6 +2906,9 @@ export const S3Upload = {
if (message.tagging !== undefined && message.tagging !== "") {
obj.tagging = message.tagging;
}
if (message.contentDisposition !== undefined && message.contentDisposition !== "") {
obj.contentDisposition = message.contentDisposition;
}
return obj;
},

Expand All @@ -2913,6 +2930,7 @@ export const S3Upload = {
return acc;
}, {});
message.tagging = object.tagging ?? "";
message.contentDisposition = object.contentDisposition ?? "";
return message;
},
};
Expand Down Expand Up @@ -3357,9 +3375,11 @@ function createBaseEncodingOptions(): EncodingOptions {
framerate: 0,
audioCodec: 0,
audioBitrate: 0,
audioQuality: 0,
audioFrequency: 0,
videoCodec: 0,
videoBitrate: 0,
videoQuality: 0,
keyFrameInterval: 0,
};
}
Expand All @@ -3384,6 +3404,9 @@ export const EncodingOptions = {
if (message.audioBitrate !== undefined && message.audioBitrate !== 0) {
writer.uint32(48).int32(message.audioBitrate);
}
if (message.audioQuality !== undefined && message.audioQuality !== 0) {
writer.uint32(88).int32(message.audioQuality);
}
if (message.audioFrequency !== undefined && message.audioFrequency !== 0) {
writer.uint32(56).int32(message.audioFrequency);
}
Expand All @@ -3393,6 +3416,9 @@ export const EncodingOptions = {
if (message.videoBitrate !== undefined && message.videoBitrate !== 0) {
writer.uint32(72).int32(message.videoBitrate);
}
if (message.videoQuality !== undefined && message.videoQuality !== 0) {
writer.uint32(96).int32(message.videoQuality);
}
if (message.keyFrameInterval !== undefined && message.keyFrameInterval !== 0) {
writer.uint32(81).double(message.keyFrameInterval);
}
Expand Down Expand Up @@ -3448,6 +3474,13 @@ export const EncodingOptions = {

message.audioBitrate = reader.int32();
continue;
case 11:
if (tag !== 88) {
break;
}

message.audioQuality = reader.int32();
continue;
case 7:
if (tag !== 56) {
break;
Expand All @@ -3469,6 +3502,13 @@ export const EncodingOptions = {

message.videoBitrate = reader.int32();
continue;
case 12:
if (tag !== 96) {
break;
}

message.videoQuality = reader.int32();
continue;
case 10:
if (tag !== 81) {
break;
Expand All @@ -3493,9 +3533,11 @@ export const EncodingOptions = {
framerate: isSet(object.framerate) ? globalThis.Number(object.framerate) : 0,
audioCodec: isSet(object.audioCodec) ? audioCodecFromJSON(object.audioCodec) : 0,
audioBitrate: isSet(object.audioBitrate) ? globalThis.Number(object.audioBitrate) : 0,
audioQuality: isSet(object.audioQuality) ? globalThis.Number(object.audioQuality) : 0,
audioFrequency: isSet(object.audioFrequency) ? globalThis.Number(object.audioFrequency) : 0,
videoCodec: isSet(object.videoCodec) ? videoCodecFromJSON(object.videoCodec) : 0,
videoBitrate: isSet(object.videoBitrate) ? globalThis.Number(object.videoBitrate) : 0,
videoQuality: isSet(object.videoQuality) ? globalThis.Number(object.videoQuality) : 0,
keyFrameInterval: isSet(object.keyFrameInterval) ? globalThis.Number(object.keyFrameInterval) : 0,
};
},
Expand All @@ -3520,6 +3562,9 @@ export const EncodingOptions = {
if (message.audioBitrate !== undefined && message.audioBitrate !== 0) {
obj.audioBitrate = Math.round(message.audioBitrate);
}
if (message.audioQuality !== undefined && message.audioQuality !== 0) {
obj.audioQuality = Math.round(message.audioQuality);
}
if (message.audioFrequency !== undefined && message.audioFrequency !== 0) {
obj.audioFrequency = Math.round(message.audioFrequency);
}
Expand All @@ -3529,6 +3574,9 @@ export const EncodingOptions = {
if (message.videoBitrate !== undefined && message.videoBitrate !== 0) {
obj.videoBitrate = Math.round(message.videoBitrate);
}
if (message.videoQuality !== undefined && message.videoQuality !== 0) {
obj.videoQuality = Math.round(message.videoQuality);
}
if (message.keyFrameInterval !== undefined && message.keyFrameInterval !== 0) {
obj.keyFrameInterval = message.keyFrameInterval;
}
Expand All @@ -3546,9 +3594,11 @@ export const EncodingOptions = {
message.framerate = object.framerate ?? 0;
message.audioCodec = object.audioCodec ?? 0;
message.audioBitrate = object.audioBitrate ?? 0;
message.audioQuality = object.audioQuality ?? 0;
message.audioFrequency = object.audioFrequency ?? 0;
message.videoCodec = object.videoCodec ?? 0;
message.videoBitrate = object.videoBitrate ?? 0;
message.videoQuality = object.videoQuality ?? 0;
message.keyFrameInterval = object.keyFrameInterval ?? 0;
return message;
},
Expand Down Expand Up @@ -3725,103 +3775,6 @@ export const UpdateStreamRequest = {
},
};

function createBaseUpdateOutputsRequest(): UpdateOutputsRequest {
return { egressId: "", addImageOutputs: [], removeImageOutputs: [] };
}

export const UpdateOutputsRequest = {
encode(message: UpdateOutputsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
if (message.egressId !== undefined && message.egressId !== "") {
writer.uint32(10).string(message.egressId);
}
if (message.addImageOutputs !== undefined && message.addImageOutputs.length !== 0) {
for (const v of message.addImageOutputs) {
ImageOutput.encode(v!, writer.uint32(18).fork()).ldelim();
}
}
if (message.removeImageOutputs !== undefined && message.removeImageOutputs.length !== 0) {
for (const v of message.removeImageOutputs) {
ImageOutput.encode(v!, writer.uint32(26).fork()).ldelim();
}
}
return writer;
},

decode(input: _m0.Reader | Uint8Array, length?: number): UpdateOutputsRequest {
const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
let end = length === undefined ? reader.len : reader.pos + length;
const message = createBaseUpdateOutputsRequest();
while (reader.pos < end) {
const tag = reader.uint32();
switch (tag >>> 3) {
case 1:
if (tag !== 10) {
break;
}

message.egressId = reader.string();
continue;
case 2:
if (tag !== 18) {
break;
}

message.addImageOutputs!.push(ImageOutput.decode(reader, reader.uint32()));
continue;
case 3:
if (tag !== 26) {
break;
}

message.removeImageOutputs!.push(ImageOutput.decode(reader, reader.uint32()));
continue;
}
if ((tag & 7) === 4 || tag === 0) {
break;
}
reader.skipType(tag & 7);
}
return message;
},

fromJSON(object: any): UpdateOutputsRequest {
return {
egressId: isSet(object.egressId) ? globalThis.String(object.egressId) : "",
addImageOutputs: globalThis.Array.isArray(object?.addImageOutputs)
? object.addImageOutputs.map((e: any) => ImageOutput.fromJSON(e))
: [],
removeImageOutputs: globalThis.Array.isArray(object?.removeImageOutputs)
? object.removeImageOutputs.map((e: any) => ImageOutput.fromJSON(e))
: [],
};
},

toJSON(message: UpdateOutputsRequest): unknown {
const obj: any = {};
if (message.egressId !== undefined && message.egressId !== "") {
obj.egressId = message.egressId;
}
if (message.addImageOutputs?.length) {
obj.addImageOutputs = message.addImageOutputs.map((e) => ImageOutput.toJSON(e));
}
if (message.removeImageOutputs?.length) {
obj.removeImageOutputs = message.removeImageOutputs.map((e) => ImageOutput.toJSON(e));
}
return obj;
},

create<I extends Exact<DeepPartial<UpdateOutputsRequest>, I>>(base?: I): UpdateOutputsRequest {
return UpdateOutputsRequest.fromPartial(base ?? ({} as any));
},
fromPartial<I extends Exact<DeepPartial<UpdateOutputsRequest>, I>>(object: I): UpdateOutputsRequest {
const message = createBaseUpdateOutputsRequest();
message.egressId = object.egressId ?? "";
message.addImageOutputs = object.addImageOutputs?.map((e) => ImageOutput.fromPartial(e)) || [];
message.removeImageOutputs = object.removeImageOutputs?.map((e) => ImageOutput.fromPartial(e)) || [];
return message;
},
};

function createBaseListEgressRequest(): ListEgressRequest {
return { roomName: "", egressId: "", active: false };
}
Expand Down Expand Up @@ -4766,7 +4719,6 @@ function createBaseSegmentsInfo(): SegmentsInfo {
segmentCount: 0,
startedAt: 0,
endedAt: 0,
dataEventLocation: "",
};
}

Expand Down Expand Up @@ -4799,9 +4751,6 @@ export const SegmentsInfo = {
if (message.endedAt !== undefined && message.endedAt !== 0) {
writer.uint32(56).int64(message.endedAt);
}
if (message.dataEventLocation !== undefined && message.dataEventLocation !== "") {
writer.uint32(82).string(message.dataEventLocation);
}
return writer;
},

Expand Down Expand Up @@ -4875,13 +4824,6 @@ export const SegmentsInfo = {

message.endedAt = longToNumber(reader.int64() as Long);
continue;
case 10:
if (tag !== 82) {
break;
}

message.dataEventLocation = reader.string();
continue;
}
if ((tag & 7) === 4 || tag === 0) {
break;
Expand All @@ -4902,7 +4844,6 @@ export const SegmentsInfo = {
segmentCount: isSet(object.segmentCount) ? globalThis.Number(object.segmentCount) : 0,
startedAt: isSet(object.startedAt) ? globalThis.Number(object.startedAt) : 0,
endedAt: isSet(object.endedAt) ? globalThis.Number(object.endedAt) : 0,
dataEventLocation: isSet(object.dataEventLocation) ? globalThis.String(object.dataEventLocation) : "",
};
},

Expand Down Expand Up @@ -4935,9 +4876,6 @@ export const SegmentsInfo = {
if (message.endedAt !== undefined && message.endedAt !== 0) {
obj.endedAt = Math.round(message.endedAt);
}
if (message.dataEventLocation !== undefined && message.dataEventLocation !== "") {
obj.dataEventLocation = message.dataEventLocation;
}
return obj;
},

Expand All @@ -4955,7 +4893,6 @@ export const SegmentsInfo = {
message.segmentCount = object.segmentCount ?? 0;
message.startedAt = object.startedAt ?? 0;
message.endedAt = object.endedAt ?? 0;
message.dataEventLocation = object.dataEventLocation ?? "";
return message;
},
};
Expand Down Expand Up @@ -5295,8 +5232,6 @@ export interface Egress {
UpdateLayout(request: UpdateLayoutRequest): Promise<EgressInfo>;
/** add or remove stream endpoints */
UpdateStream(request: UpdateStreamRequest): Promise<EgressInfo>;
/** add or remove outputs */
UpdateOutputs(request: UpdateOutputsRequest): Promise<EgressInfo>;
/** list available egress */
ListEgress(request: ListEgressRequest): Promise<ListEgressResponse>;
/** stop a recording or stream */
Expand Down
Loading