mirror of
https://github.com/hanzoai/livekit.git
synced 2026-10-30 18:29:34 +00:00
zeekay
f47fd29d53
livekit cannot use github.com/hanzokv/go, for a structural reason rather than a
stylistic one: the client type flows through two upstream libraries we do not
fork. livekit/protocol/redis.GetRedisClient PRODUCES a
github.com/redis/go-redis/v9.UniversalClient and livekit/psrpc CONSUMES one, so
substituting the client in the middle fails to type-check at both seams:
cannot use redis2.GetRedisClient(&conf.Redis) (go-redis UniversalClient)
as kv.UniversalClient in return statement
cannot use rc (kv.UniversalClient)
as go-redis UniversalClient in argument to psrpc.NewRedisMessageBus
Forking psrpc made it worse rather than better: livekit/protocol/rpc demands
livekit/psrpc's OWN types, so pointing at hanzoai/psrpc broke pkg/agent, which
had compiled. Verified by building pkg/agent at the commit before the fork
(compiles) and after (2 type errors) with a working SDKROOT — an earlier check
of mine reported "compiles in both" and was simply wrong.
So this repo keeps upstream go-redis and upstream psrpc (v0.7.1). That is the
honest consequence of livekit/protocol being unforkable: you cannot substitute a
client library inside a module whose upstream dependencies both produce and
consume that library's types.
What stays, because it is correct and independent: the module path
(github.com/hanzoai/livekit, which this fork now actually declares) and the
luxfi/metric repair in the parent commit that made this repo build at all.
64 lines
1.9 KiB
Go
64 lines
1.9 KiB
Go
// Copyright 2023 LiveKit, Inc.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package routing
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/hanzoai/livekit/pkg/config"
|
|
"github.com/livekit/protocol/livekit"
|
|
"github.com/livekit/protocol/rpc"
|
|
"github.com/livekit/psrpc"
|
|
"github.com/livekit/psrpc/pkg/middleware"
|
|
)
|
|
|
|
//counterfeiter:generate . RoomManagerClient
|
|
type RoomManagerClient interface {
|
|
rpc.TypedRoomManagerClient
|
|
}
|
|
|
|
type roomManagerClient struct {
|
|
config config.RoomConfig
|
|
client rpc.TypedRoomManagerClient
|
|
}
|
|
|
|
func NewRoomManagerClient(clientParams rpc.ClientParams, config config.RoomConfig) (RoomManagerClient, error) {
|
|
c, err := rpc.NewTypedRoomManagerClient(
|
|
clientParams.Bus,
|
|
psrpc.WithClientChannelSize(clientParams.BufferSize),
|
|
middleware.WithClientMetrics(clientParams.Observer),
|
|
rpc.WithClientLogger(clientParams.Logger),
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &roomManagerClient{
|
|
config: config,
|
|
client: c,
|
|
}, nil
|
|
}
|
|
|
|
func (c *roomManagerClient) CreateRoom(ctx context.Context, nodeID livekit.NodeID, req *livekit.CreateRoomRequest, opts ...psrpc.RequestOption) (*livekit.Room, error) {
|
|
return c.client.CreateRoom(ctx, nodeID, req, append(opts, psrpc.WithRequestInterceptors(middleware.NewRPCRetryInterceptor(middleware.RetryOptions{
|
|
MaxAttempts: c.config.CreateRoomAttempts,
|
|
Timeout: c.config.CreateRoomTimeout,
|
|
})))...)
|
|
}
|
|
|
|
func (c *roomManagerClient) Close() {
|
|
c.client.Close()
|
|
}
|