Publish client package (#31)

backendaction/action.go

@@ -9,13 +9,12 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/OpenSlides/openslides-performance/internal/client"
-	"github.com/OpenSlides/openslides-performance/internal/config"
+	"github.com/OpenSlides/openslides-performance/client"
 	"github.com/google/uuid"
 )
 
 // Run runs the command.
-func (o Options) Run(ctx context.Context, cfg config.Config) error {
+func (o Options) Run(ctx context.Context, cfg client.Config) error {
 	c, err := client.New(cfg)
 	if err != nil {
 		return fmt.Errorf("creating client: %w", err)

browser/record.go

@@ -12,12 +12,12 @@ import (
 	"net/http/httputil"
 	"net/url"
 
-	"github.com/OpenSlides/openslides-performance/internal/config"
+	"github.com/OpenSlides/openslides-performance/client"
 )
 
 const prefix = "request:"
 
-func (o record) Run(ctx context.Context, cfg config.Config) error {
+func (o record) Run(ctx context.Context, cfg client.Config) error {
 	target, err := url.Parse(cfg.Addr())
 	if err != nil {
 		return fmt.Errorf("parse url: %w", err)

browser/replay.go

@@ -10,14 +10,13 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/OpenSlides/openslides-performance/internal/client"
-	"github.com/OpenSlides/openslides-performance/internal/config"
+	"github.com/OpenSlides/openslides-performance/client"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/ostcar/topic"
 	"golang.org/x/sync/errgroup"
 )
 
-func (o replay) Run(ctx context.Context, cfg config.Config) error {
+func (o replay) Run(ctx context.Context, cfg client.Config) error {
 	app := tea.NewProgram(initialModel(o.Amount))
 
 	go func() {
@@ -51,7 +50,7 @@ type sender interface {
 // to be sent.
 //
 // The function blocks until an error happens or the context get closed.
-func multiBrowser(ctx context.Context, cfg config.Config, amount int, send sender, r io.Reader) error {
+func multiBrowser(ctx context.Context, cfg client.Config, amount int, send sender, r io.Reader) error {
 	cli, err := client.New(cfg)
 	if err != nil {
 		return fmt.Errorf("create client: %w", err)

internal/client/client.go → client/client.go

@@ -5,20 +5,19 @@ import (
 	"crypto/tls"
 	"encoding/base64"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net"
 	"net/http"
 	"net/url"
 	"strings"
 	"time"
-
-	"github.com/OpenSlides/openslides-performance/internal/config"
 )
 
 // Client holds the connection to the OpenSlides server.
 type Client struct {
-	cfg        config.Config
+	cfg        Config
 	httpClient *http.Client
 
 	authCookie *http.Cookie
@@ -27,7 +26,7 @@ type Client struct {
 }
 
 // New initializes a new client.
-func New(cfg config.Config) (*Client, error) {
+func New(cfg Config) (*Client, error) {
 	var dialContext func(ctx context.Context, network, addr string) (net.Conn, error)
 	if cfg.IPv4 {
 		var zeroDialer net.Dialer
@@ -91,9 +90,12 @@ func (c *Client) LoginWithCredentials(ctx context.Context, username, password st
 	var resp *http.Response
 	for retry := 0; retry < 100; retry++ {
 		resp, err = checkStatus(c.httpClient.Do(req))
-		if err == nil {
+
+		var errStatus HTTPStatusError
+		if errors.As(err, &errStatus) && errStatus.StatusCode == 403 || err == nil {
 			break
 		}
+
 		time.Sleep(time.Second)
 	}
 	if err != nil {
@@ -158,7 +160,18 @@ func checkStatus(resp *http.Response, err error) (*http.Response, error) {
 			body = []byte("[can not read body]")
 		}
 		resp.Body.Close()
-		return nil, fmt.Errorf("got status %s: %s", resp.Status, body)
+		return nil, HTTPStatusError{StatusCode: resp.StatusCode, Body: body}
 	}
 	return resp, nil
 }
+
+// HTTPStatusError is returned, when the http status of a client request is
+// something else then in the 200er.
+type HTTPStatusError struct {
+	StatusCode int
+	Body       []byte
+}
+
+func (err HTTPStatusError) Error() string {
+	return fmt.Sprintf("got status %s: %s", http.StatusText(err.StatusCode), err.Body)
+}

internal/config/config.go → client/config.go

@@ -1,4 +1,4 @@
-package config
+package client
 
 // Config for all commands.
 type Config struct {

connect/connect.go

@@ -11,14 +11,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/OpenSlides/openslides-performance/internal/client"
-	"github.com/OpenSlides/openslides-performance/internal/config"
+	"github.com/OpenSlides/openslides-performance/client"
 	"github.com/vbauerster/mpb/v7"
 	"github.com/vbauerster/mpb/v7/decor"
 )
 
 // Run runs the command.
-func (o Options) Run(ctx context.Context, cfg config.Config) error {
+func (o Options) Run(ctx context.Context, cfg client.Config) error {
 	if o.Body == "" {
 		o.Body = `[{"collection":"organization","ids":[1],"fields":{"committee_ids":{"type":"relation-list","collection":"committee","fields":{"name":null}}}}]`
 	}

createusers/users.go

@@ -8,14 +8,13 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/OpenSlides/openslides-performance/internal/client"
-	"github.com/OpenSlides/openslides-performance/internal/config"
+	"github.com/OpenSlides/openslides-performance/client"
 	"github.com/vbauerster/mpb/v7"
 	"golang.org/x/sync/errgroup"
 )
 
 // Run runs the command.
-func (o Options) Run(ctx context.Context, cfg config.Config) error {
+func (o Options) Run(ctx context.Context, cfg client.Config) error {
 	c, err := client.New(cfg)
 	if err != nil {
 		return fmt.Errorf("creating client: %w", err)

main.go

@@ -10,9 +10,9 @@ import (
 
 	"github.com/OpenSlides/openslides-performance/backendaction"
 	"github.com/OpenSlides/openslides-performance/browser"
+	"github.com/OpenSlides/openslides-performance/client"
 	"github.com/OpenSlides/openslides-performance/connect"
 	"github.com/OpenSlides/openslides-performance/createusers"
-	"github.com/OpenSlides/openslides-performance/internal/config"
 	"github.com/OpenSlides/openslides-performance/request"
 	"github.com/OpenSlides/openslides-performance/vote"
 	"github.com/OpenSlides/openslides-performance/work"
@@ -52,7 +52,7 @@ func interruptContext() (context.Context, context.CancelFunc) {
 }
 
 var cli struct {
-	config.Config
+	client.Config
 
 	BackendAction backendaction.Options `cmd:"" help:"Calls a backend action multiple times."`
 	Browser       browser.Options       `cmd:"" help:"Simulates a browser."`

request/request.go

@@ -9,12 +9,11 @@ import (
 	"os"
 	"strings"
 
-	"github.com/OpenSlides/openslides-performance/internal/client"
-	"github.com/OpenSlides/openslides-performance/internal/config"
+	"github.com/OpenSlides/openslides-performance/client"
 )
 
 // Run sends the request.
-func (o Options) Run(ctx context.Context, cfg config.Config) error {
+func (o Options) Run(ctx context.Context, cfg client.Config) error {
 	c, err := client.New(cfg)
 	if err != nil {
 		return fmt.Errorf("creating client: %w", err)

vote/vote.go

@@ -13,13 +13,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/OpenSlides/openslides-performance/internal/client"
-	"github.com/OpenSlides/openslides-performance/internal/config"
+	"github.com/OpenSlides/openslides-performance/client"
 	"github.com/vbauerster/mpb/v7"
 )
 
 // Run runs the command.
-func (o Options) Run(ctx context.Context, cfg config.Config) error {
+func (o Options) Run(ctx context.Context, cfg client.Config) error {
 	admin, err := client.New(cfg)
 	if err != nil {
 		return fmt.Errorf("create admin user: %w", err)

work/work.go

@@ -8,13 +8,12 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/OpenSlides/openslides-performance/internal/client"
-	"github.com/OpenSlides/openslides-performance/internal/config"
+	"github.com/OpenSlides/openslides-performance/client"
 	"golang.org/x/sync/errgroup"
 )
 
 // Run runs the command.
-func (o Options) Run(ctx context.Context, cfg config.Config) error {
+func (o Options) Run(ctx context.Context, cfg client.Config) error {
 	workFunc := topicDone
 	switch o.Strategy {
 	case "topic-done":