From e541399d7f734e9b4b72c08044a00dc9c1849b3c Mon Sep 17 00:00:00 2001 From: David Colburn Date: Thu, 26 Oct 2023 01:38:37 -0700 Subject: [PATCH] psrpc 0.5 --- livekit/livekit_agent.pb.go | 2 +- livekit/livekit_analytics.pb.go | 2 +- livekit/livekit_analytics_grpc.pb.go | 2 +- livekit/livekit_egress.pb.go | 2 +- livekit/livekit_ingress.pb.go | 2 +- livekit/livekit_internal.pb.go | 2 +- livekit/livekit_models.pb.go | 2 +- livekit/livekit_room.pb.go | 2 +- livekit/livekit_rtc.pb.go | 2 +- livekit/livekit_webhook.pb.go | 2 +- rpc/agent.psrpc.go | 13 +++++++------ rpc/egress.pb.go | 2 +- rpc/ingress.pb.go | 2 +- rpc/io.pb.go | 2 +- rpc/room.pb.go | 2 +- rpc/signal.pb.go | 2 +- 16 files changed, 22 insertions(+), 21 deletions(-) diff --git a/livekit/livekit_agent.pb.go b/livekit/livekit_agent.pb.go index bbe2d409e..4bdda2803 100644 --- a/livekit/livekit_agent.pb.go +++ b/livekit/livekit_agent.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.31.0 -// protoc v3.20.3 +// protoc v3.21.12 // source: livekit_agent.proto package livekit diff --git a/livekit/livekit_analytics.pb.go b/livekit/livekit_analytics.pb.go index e68ddbaef..8d0c69a20 100644 --- a/livekit/livekit_analytics.pb.go +++ b/livekit/livekit_analytics.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.31.0 -// protoc v3.20.3 +// protoc v3.21.12 // source: livekit_analytics.proto package livekit diff --git a/livekit/livekit_analytics_grpc.pb.go b/livekit/livekit_analytics_grpc.pb.go index 5ae976652..bfc0b8f4c 100644 --- a/livekit/livekit_analytics_grpc.pb.go +++ b/livekit/livekit_analytics_grpc.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v3.20.3 +// - protoc v3.21.12 // source: livekit_analytics.proto package livekit diff --git a/livekit/livekit_egress.pb.go b/livekit/livekit_egress.pb.go index 7643479d1..6146d97e2 100644 --- a/livekit/livekit_egress.pb.go +++ b/livekit/livekit_egress.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.31.0 -// protoc v3.20.3 +// protoc v3.21.12 // source: livekit_egress.proto package livekit diff --git a/livekit/livekit_ingress.pb.go b/livekit/livekit_ingress.pb.go index 556265208..6c1c8c739 100644 --- a/livekit/livekit_ingress.pb.go +++ b/livekit/livekit_ingress.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.31.0 -// protoc v3.20.3 +// protoc v3.21.12 // source: livekit_ingress.proto package livekit diff --git a/livekit/livekit_internal.pb.go b/livekit/livekit_internal.pb.go index cf39437f3..54c89e979 100644 --- a/livekit/livekit_internal.pb.go +++ b/livekit/livekit_internal.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.31.0 -// protoc v3.20.3 +// protoc v3.21.12 // source: livekit_internal.proto package livekit diff --git a/livekit/livekit_models.pb.go b/livekit/livekit_models.pb.go index e20ef7127..afa652641 100644 --- a/livekit/livekit_models.pb.go +++ b/livekit/livekit_models.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.31.0 -// protoc v3.20.3 +// protoc v3.21.12 // source: livekit_models.proto package livekit diff --git a/livekit/livekit_room.pb.go b/livekit/livekit_room.pb.go index 5fcfb0663..938cba1bf 100644 --- a/livekit/livekit_room.pb.go +++ b/livekit/livekit_room.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.31.0 -// protoc v3.20.3 +// protoc v3.21.12 // source: livekit_room.proto package livekit diff --git a/livekit/livekit_rtc.pb.go b/livekit/livekit_rtc.pb.go index 9ba64ed9c..2a8e125e7 100644 --- a/livekit/livekit_rtc.pb.go +++ b/livekit/livekit_rtc.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.31.0 -// protoc v3.20.3 +// protoc v3.21.12 // source: livekit_rtc.proto package livekit diff --git a/livekit/livekit_webhook.pb.go b/livekit/livekit_webhook.pb.go index 962073750..07e6539b2 100644 --- a/livekit/livekit_webhook.pb.go +++ b/livekit/livekit_webhook.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.31.0 -// protoc v3.20.3 +// protoc v3.21.12 // source: livekit_webhook.proto package livekit diff --git a/rpc/agent.psrpc.go b/rpc/agent.psrpc.go index a8bf3d1c6..6fc064539 100644 --- a/rpc/agent.psrpc.go +++ b/rpc/agent.psrpc.go @@ -1,4 +1,4 @@ -// Code generated by protoc-gen-psrpc v0.3.4, DO NOT EDIT. +// Code generated by protoc-gen-psrpc v0.5.0, DO NOT EDIT. // source: rpc/agent.proto package rpc @@ -9,13 +9,14 @@ import ( "github.com/livekit/psrpc" "github.com/livekit/psrpc/pkg/client" "github.com/livekit/psrpc/pkg/info" + "github.com/livekit/psrpc/pkg/rand" "github.com/livekit/psrpc/pkg/server" "github.com/livekit/psrpc/version" ) import google_protobuf "google.golang.org/protobuf/types/known/emptypb" import livekit1 "github.com/livekit/protocol/livekit" -var _ = version.PsrpcVersion_0_3_4 +var _ = version.PsrpcVersion_0_5 // ============================== // AgentInternal Client Interface @@ -58,10 +59,10 @@ type agentInternalClient struct { } // NewAgentInternalClient creates a psrpc client that implements the AgentInternalClient interface. -func NewAgentInternalClient(clientID string, bus psrpc.MessageBus, opts ...psrpc.ClientOption) (AgentInternalClient, error) { +func NewAgentInternalClient(bus psrpc.MessageBus, opts ...psrpc.ClientOption) (AgentInternalClient, error) { sd := &info.ServiceDefinition{ Name: "AgentInternal", - ID: clientID, + ID: rand.NewClientID(), } sd.RegisterMethod("JobRequest", true, false, true, false) @@ -91,10 +92,10 @@ type agentInternalServer struct { // NewAgentInternalServer builds a RPCServer that will route requests // to the corresponding method in the provided svc implementation. -func NewAgentInternalServer(serverID string, svc AgentInternalServerImpl, bus psrpc.MessageBus, opts ...psrpc.ServerOption) (AgentInternalServer, error) { +func NewAgentInternalServer(svc AgentInternalServerImpl, bus psrpc.MessageBus, opts ...psrpc.ServerOption) (AgentInternalServer, error) { sd := &info.ServiceDefinition{ Name: "AgentInternal", - ID: serverID, + ID: rand.NewServerID(), } s := server.NewRPCServer(sd, bus, opts...) diff --git a/rpc/egress.pb.go b/rpc/egress.pb.go index 2eb36a9d3..4216ea73a 100644 --- a/rpc/egress.pb.go +++ b/rpc/egress.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.31.0 -// protoc v4.23.4 +// protoc v3.21.12 // source: rpc/egress.proto package rpc diff --git a/rpc/ingress.pb.go b/rpc/ingress.pb.go index f00b198c3..f453354dd 100644 --- a/rpc/ingress.pb.go +++ b/rpc/ingress.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.31.0 -// protoc v4.23.4 +// protoc v3.21.12 // source: rpc/ingress.proto package rpc diff --git a/rpc/io.pb.go b/rpc/io.pb.go index 4abc3f67c..d80f72fb5 100644 --- a/rpc/io.pb.go +++ b/rpc/io.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.31.0 -// protoc v4.23.4 +// protoc v3.21.12 // source: rpc/io.proto package rpc diff --git a/rpc/room.pb.go b/rpc/room.pb.go index 2839f01e7..dc3312e35 100644 --- a/rpc/room.pb.go +++ b/rpc/room.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.31.0 -// protoc v4.23.4 +// protoc v3.21.12 // source: rpc/room.proto package rpc diff --git a/rpc/signal.pb.go b/rpc/signal.pb.go index f7a95aaf6..c2057637a 100644 --- a/rpc/signal.pb.go +++ b/rpc/signal.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.31.0 -// protoc v4.23.4 +// protoc v3.21.12 // source: rpc/signal.proto package rpc