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

add psrpc middleware to suppress errors #490

Merged
merged 1 commit into from
Oct 5, 2023
Merged
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
82 changes: 82 additions & 0 deletions psrpc/errors.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
// 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 psrpc

import (
"context"
"errors"

"google.golang.org/protobuf/proto"

"github.com/livekit/psrpc"
)

func WithSuppressClientErrors(errs ...error) psrpc.ClientOption {
return psrpc.WithClientOptions(
psrpc.WithClientRPCInterceptors(newClientRPCErrorInterceptor(errs...)),
psrpc.WithClientMultiRPCInterceptors(newMultiRPCErorrInterceptor(errs...)),
)
}

func WithSuppressServerErrors(errs ...error) psrpc.ServerOption {
return psrpc.WithServerOptions(
psrpc.WithServerRPCInterceptors(newServerRPCErorrInterceptor(errs...)),
)
}

func suppressErrors(err error, ignored ...error) error {
if err != nil {
for _, e := range ignored {
if errors.Is(err, e) {
return nil
}
}
}
return err
}

func newClientRPCErrorInterceptor(errs ...error) psrpc.ClientRPCInterceptor {
return func(rpcInfo psrpc.RPCInfo, next psrpc.ClientRPCHandler) psrpc.ClientRPCHandler {
return func(ctx context.Context, req proto.Message, opts ...psrpc.RequestOption) (res proto.Message, err error) {
res, err = next(ctx, req, opts...)
return res, suppressErrors(err, errs...)
}
}
}

func newServerRPCErorrInterceptor(errs ...error) psrpc.ServerRPCInterceptor {
return func(ctx context.Context, req proto.Message, rpcInfo psrpc.RPCInfo, handler psrpc.ServerRPCHandler) (res proto.Message, err error) {
res, err = handler(ctx, req)
return res, suppressErrors(err, errs...)
}
}

func newMultiRPCErorrInterceptor(errs ...error) psrpc.ClientMultiRPCInterceptor {
return func(rpcInfo psrpc.RPCInfo, next psrpc.ClientMultiRPCHandler) psrpc.ClientMultiRPCHandler {
return &multiRPCErorrInterceptor{
ClientMultiRPCHandler: next,
errors: errs,
}
}
}

type multiRPCErorrInterceptor struct {
psrpc.ClientMultiRPCHandler
errors []error
}

func (r *multiRPCErorrInterceptor) Recv(msg proto.Message, err error) {
r.ClientMultiRPCHandler.Recv(msg, suppressErrors(err, r.errors...))
}