chore(client): support gRPC and gRPC web protocol
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
This commit is contained in:
parent
0b885c5e5f
commit
d359276fe1
5 changed files with 51 additions and 1 deletions
|
@ -15,13 +15,19 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
// New returns a new runner client.
|
// New returns a new runner client.
|
||||||
func New(endpoint, secret string, skipverify bool) *HTTPClient {
|
func New(endpoint, secret string, skipverify bool, opts ...Option) *HTTPClient {
|
||||||
client := &HTTPClient{
|
client := &HTTPClient{
|
||||||
Endpoint: endpoint,
|
Endpoint: endpoint,
|
||||||
Secret: secret,
|
Secret: secret,
|
||||||
SkipVerify: skipverify,
|
SkipVerify: skipverify,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Loop through each option
|
||||||
|
for _, opt := range opts {
|
||||||
|
// Call the option giving the instantiated
|
||||||
|
opt.Apply(client)
|
||||||
|
}
|
||||||
|
|
||||||
client.Client = &http.Client{
|
client.Client = &http.Client{
|
||||||
Timeout: 5 * time.Second,
|
Timeout: 5 * time.Second,
|
||||||
CheckRedirect: func(*http.Request, []*http.Request) error {
|
CheckRedirect: func(*http.Request, []*http.Request) error {
|
||||||
|
@ -57,6 +63,8 @@ type HTTPClient struct {
|
||||||
Endpoint string
|
Endpoint string
|
||||||
Secret string
|
Secret string
|
||||||
SkipVerify bool
|
SkipVerify bool
|
||||||
|
|
||||||
|
opts []connect.ClientOption
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ping sends a ping message to the server to test connectivity.
|
// Ping sends a ping message to the server to test connectivity.
|
||||||
|
@ -64,6 +72,7 @@ func (p *HTTPClient) Ping(ctx context.Context, machine string) error {
|
||||||
client := v1connect.NewPingServiceClient(
|
client := v1connect.NewPingServiceClient(
|
||||||
p.Client,
|
p.Client,
|
||||||
p.Endpoint,
|
p.Endpoint,
|
||||||
|
p.opts...,
|
||||||
)
|
)
|
||||||
req := connect.NewRequest(&v1.PingRequest{
|
req := connect.NewRequest(&v1.PingRequest{
|
||||||
Data: machine,
|
Data: machine,
|
||||||
|
|
36
client/options.go
Normal file
36
client/options.go
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
package client
|
||||||
|
|
||||||
|
import "github.com/bufbuild/connect-go"
|
||||||
|
|
||||||
|
// An Option configures a mutex.
|
||||||
|
type Option interface {
|
||||||
|
Apply(*HTTPClient)
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionFunc is a function that configure a value.
|
||||||
|
type OptionFunc func(*HTTPClient)
|
||||||
|
|
||||||
|
// Apply calls f(option)
|
||||||
|
func (f OptionFunc) Apply(cli *HTTPClient) {
|
||||||
|
f(cli)
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithGRPC configures clients to use the HTTP/2 gRPC protocol.
|
||||||
|
func WithGRPC(c bool) Option {
|
||||||
|
return OptionFunc(func(cli *HTTPClient) {
|
||||||
|
if !c {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
cli.opts = append(cli.opts, connect.WithGRPC())
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithGRPCWeb configures clients to use the gRPC-Web protocol.
|
||||||
|
func WithGRPCWeb(c bool) Option {
|
||||||
|
return OptionFunc(func(cli *HTTPClient) {
|
||||||
|
if !c {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
cli.opts = append(cli.opts, connect.WithGRPCWeb())
|
||||||
|
})
|
||||||
|
}
|
|
@ -20,6 +20,8 @@ type (
|
||||||
Host string `envconfig:"GITEA_RPC_HOST" required:"true"`
|
Host string `envconfig:"GITEA_RPC_HOST" required:"true"`
|
||||||
Secret string `envconfig:"GITEA_RPC_SECRET" required:"true"`
|
Secret string `envconfig:"GITEA_RPC_SECRET" required:"true"`
|
||||||
SkipVerify bool `envconfig:"GITEA_RPC_SKIP_VERIFY"`
|
SkipVerify bool `envconfig:"GITEA_RPC_SKIP_VERIFY"`
|
||||||
|
GRPC bool `envconfig:"GITEA_RPC_GRPC"`
|
||||||
|
GRPCWeb bool `envconfig:"GITEA_RPC_GRPC_WEB"`
|
||||||
}
|
}
|
||||||
|
|
||||||
Runner struct {
|
Runner struct {
|
||||||
|
|
|
@ -176,6 +176,8 @@ func runDaemon(ctx context.Context, input *Input) func(cmd *cobra.Command, args
|
||||||
cfg.Client.Address,
|
cfg.Client.Address,
|
||||||
cfg.Client.Secret,
|
cfg.Client.Secret,
|
||||||
cfg.Client.SkipVerify,
|
cfg.Client.SkipVerify,
|
||||||
|
client.WithGRPC(cfg.Client.GRPC),
|
||||||
|
client.WithGRPCWeb(cfg.Client.GRPCWeb),
|
||||||
)
|
)
|
||||||
|
|
||||||
for {
|
for {
|
||||||
|
|
|
@ -4,6 +4,7 @@ import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
"gitea.com/gitea/act_runner/client"
|
"gitea.com/gitea/act_runner/client"
|
||||||
|
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue