2 Commits
v1.0.1 ... main

Author SHA1 Message Date
Adrian Zuercher
8ca441cc24 add optional endpoint to new client 2025-08-24 21:22:11 +02:00
Adrian Zuercher
567d2fe03d add optional endpoint to new client 2025-08-24 21:18:43 +02:00
3 changed files with 9 additions and 6 deletions

View File

@@ -57,8 +57,11 @@ var upgrader = websocket.Upgrader{
EnableCompression: false,
}
func NewClient(ip, id string, port uint, logger *logging.Logger) (*Client, error) {
u := url.URL{Scheme: "ws", Host: fmt.Sprintf("%s:%d", ip, port), Path: "status", RawQuery: "id=" + id}
func NewClient(id, ip, endpoint string, port uint, logger *logging.Logger) (*Client, error) {
if endpoint == "" {
endpoint = "status"
}
u := url.URL{Scheme: "ws", Host: fmt.Sprintf("%s:%d", ip, port), Path: endpoint, RawQuery: "id=" + id}
c := &Client{
id: id,

View File

@@ -24,7 +24,7 @@ type StatusClient struct {
// serviceName: unique ID/name for this client
// ip, port: target server address
// debug: enable debug logging
func NewStatusClient(serviceName, ip string, port uint, debug bool) (*StatusClient, error) {
func NewStatusClient(serviceName, ip, endpoint string, port uint, debug bool) (*StatusClient, error) {
config := models.Config{Log: logging.Config{Debug: debug}}
config.Default()
@@ -43,7 +43,7 @@ func NewStatusClient(serviceName, ip string, port uint, debug bool) (*StatusClie
}
// connect underlying websocket client
sc.client, err = models.NewClient(ip, serviceName, port, logger)
sc.client, err = models.NewClient(serviceName, ip, endpoint, port, logger)
if err != nil {
return nil, err
}

View File

@@ -35,11 +35,11 @@ func TestConnection(t *testing.T) {
time.Sleep(time.Second)
client1, err := statusServer.NewStatusClient("adrian", "127.0.0.1", 8080, true)
client1, err := statusServer.NewStatusClient("adrian", "127.0.0.1", "", 8080, true)
if err != nil {
t.Fatal(err)
}
client, err := statusServer.NewStatusClient("test", "127.0.0.1", 8080, true)
client, err := statusServer.NewStatusClient("test", "127.0.0.1", "", 8080, true)
if err != nil {
t.Fatal(err)
}