Update to protocol v1.12

Automatically convert wss scheme to https
livekit · Mar 21, 2024 · 87224df · 87224df
1 parent 786de7e
commit 87224df
Show file tree

Hide file tree

Showing 16 changed files with 114 additions and 23 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    livekit-server-sdk (0.6.0)
+    livekit-server-sdk (0.6.4)
       google-protobuf (>= 3.21.0, < 4.0)
       jwt (>= 2.2.3, < 3.0)
       rack (>= 2.2.3, < 3.0)

diff --git a/Rakefile b/Rakefile
@@ -8,13 +8,14 @@ task default: %i[spec]
 desc "Generate protobuf stubs"
 task :proto do
   system("protoc",
-         "--proto_path=protocol",
+         "--proto_path=protocol/protobufs",
          "--ruby_out=lib/livekit/proto",
          "--twirp_ruby_out=lib/livekit/proto",
          "-Iprotocol",
-         "./protocol/livekit_egress.proto",
-         "./protocol/livekit_ingress.proto",
-         "./protocol/livekit_models.proto",
-         "./protocol/livekit_room.proto",
-         "./protocol/livekit_webhook.proto")
+         "./protocol/protobufs/livekit_egress.proto",
+         "./protocol/protobufs/livekit_ingress.proto",
+         "./protocol/protobufs/livekit_sip.proto",
+         "./protocol/protobufs/livekit_models.proto",
+         "./protocol/protobufs/livekit_room.proto",
+         "./protocol/protobufs/livekit_webhook.proto")
 end
diff --git a/lib/livekit/egress_service_client.rb b/lib/livekit/egress_service_client.rb
@@ -1,5 +1,6 @@
 require "livekit/proto/livekit_egress_twirp"
 require "livekit/auth_mixin"
+require 'livekit/utils'
 
 module LiveKit
   class EgressServiceClient < Twirp::Client
@@ -8,7 +9,7 @@ class EgressServiceClient < Twirp::Client
     attr_accessor :api_key, :api_secret
 
     def initialize(base_url, api_key: nil, api_secret: nil)
-      super(File.join(base_url, "/twirp"))
+      super(File.join(to_http_url(base_url), "/twirp"))
       @api_key = api_key
       @api_secret = api_secret
     end

diff --git a/lib/livekit/ingress_service_client.rb b/lib/livekit/ingress_service_client.rb
@@ -1,5 +1,6 @@
 require "livekit/proto/livekit_ingress_twirp"
 require "livekit/auth_mixin"
+require 'livekit/utils'
 
 module LiveKit
   class IngressServiceClient < Twirp::Client
@@ -8,7 +9,7 @@ class IngressServiceClient < Twirp::Client
     attr_accessor :api_key, :api_secret
 
     def initialize(base_url, api_key: nil, api_secret: nil)
-      super(File.join(base_url, "/twirp"))
+      super(File.join(to_http_url(base_url), "/twirp"))
       @api_key = api_key
       @api_secret = api_secret
     end

diff --git a/lib/livekit/proto/livekit_egress_pb.rb b/lib/livekit/proto/livekit_egress_pb.rb
diff --git a/lib/livekit/proto/livekit_egress_twirp.rb b/lib/livekit/proto/livekit_egress_twirp.rb
@@ -14,7 +14,6 @@ class EgressService < ::Twirp::Service
       rpc :StartTrackEgress, TrackEgressRequest, EgressInfo, :ruby_method => :start_track_egress
       rpc :UpdateLayout, UpdateLayoutRequest, EgressInfo, :ruby_method => :update_layout
       rpc :UpdateStream, UpdateStreamRequest, EgressInfo, :ruby_method => :update_stream
-      rpc :UpdateOutputs, UpdateOutputsRequest, EgressInfo, :ruby_method => :update_outputs
       rpc :ListEgress, ListEgressRequest, ListEgressResponse, :ruby_method => :list_egress
       rpc :StopEgress, StopEgressRequest, EgressInfo, :ruby_method => :stop_egress
     end

diff --git a/lib/livekit/proto/livekit_ingress_pb.rb b/lib/livekit/proto/livekit_ingress_pb.rb