chore codes
Kim committed
Oct 22, 2025 at 12:19 UTC
abe75f485b676c7c36551b52cc7430e4ed6b40eb
4 files changed
+41
-44
Makefile
+12
-16
@@ -18,29 +18,15 @@ server-build:
18
19
# ---------- Client (local go) ----------
20
# Default flags (override via `make VAR=value`)
21
-SERVER_URL ?= http://localhost:8080
22
-BACKEND_PORT ?= 8081
23
-CLIENT_FLAGS := \
24
- --server-url $(SERVER_URL) \
25
- --port $(BACKEND_PORT)
26
-
21
client-run:
28
- go run ./cmd/example_http_client $(CLIENT_FLAGS)
22
+ go run ./cmd/example_http_client
23
24
client-build:
25
go build -trimpath -o bin/relaydns-client ./cmd/example_http_client
26
27
# ---------- Chat (local go) ----------
34
-CHAT_PORT ?= 8091
35
-CHAT_NAME ?= demo-chat
36
-
37
-CHAT_FLAGS := \
38
- --server-url $(SERVER_URL) \
39
- --port $(CHAT_PORT) \
40
- --name $(CHAT_NAME)
41
-
28
chat-run:
43
- go run ./cmd/example_chat $(CHAT_FLAGS)
29
+ go run ./cmd/example_chat
30
31
chat-build:
32
go build -trimpath -o bin/relaydns-chat ./cmd/example_chat
@@ -165,8 +151,18 @@ help:
151
@echo " make chat-run # run example_chat locally (WS UI + advertiser)"
152
@echo " make chat-build # build example_chat to ./bin/relaydns-chat"
153
@echo ""
154
+ @echo " Tips: override via variables, ARGS or use -- to pass extra flags"
155
+ @echo " make chat-run CHAT_NAME=alice CHAT_PORT=8099"
156
+ @echo " make chat-run ARGS=\"--name alice --port 8099\""
157
+ @echo " make chat-run -- --name alice --port 8099"
158
+ @echo ""
159
@echo "Build:"
160
@echo " make build-all # build all binaries (server, client, chat)"
161
+
162
+# Swallow extra words after `--` so make doesn't error on them
163
+# This keeps explicit targets intact; only unknown goals match this pattern.
164
+%::
165
+ @:
166
@echo ""
167
@echo "Development:"
168
@echo " make fmt # format Go code with gofmt and goimports"
README.md
+4
-3
@@ -91,9 +91,10 @@ func main() {
91
client, _ := relaydns.NewClient(ctx, relaydns.ClientConfig{
92
Protocol: relaydns.DefaultProtocol,
93
Topic: relaydns.DefaultTopic,
94
- AdvertiseEvery: 5 * time.Second,
95
- TargetTCP: "127.0.0.1:8081",
96
- Name: "demo-http",
94
+
95
+ ServerURL: "http://relaydns.gosuda.org",
96
+ TargetTCP: "127.0.0.1:8081",
97
+ Name: "demo-http",
98
})
99
_ = client.Start(ctx)
100
defer client.Close()
relaydns/client.go
+7
-7
@@ -69,13 +69,13 @@ const (
69
70
// applyDefaults fills zero-values in cfg with sane defaults.
71
func applyDefaults(cfg ClientConfig) ClientConfig {
72
- if cfg.AdvertiseEvery <= 0 {
73
- cfg.AdvertiseEvery = defaultAdvertiseEvery
74
- }
75
- if cfg.AdvertiseTTL <= 0 {
76
- // Reduce default TTL from 50s to 15s (3x default advertise interval)
77
- cfg.AdvertiseTTL = 3 * cfg.AdvertiseEvery
78
- }
72
+ if cfg.AdvertiseEvery <= 0 {
73
+ cfg.AdvertiseEvery = defaultAdvertiseEvery
74
+ }
75
+ if cfg.AdvertiseTTL <= 0 {
76
+ // Reduce default TTL from 50s to 15s (3x default advertise interval)
77
+ cfg.AdvertiseTTL = 3 * cfg.AdvertiseEvery
78
+ }
79
if cfg.HTTPTimeout <= 0 {
80
cfg.HTTPTimeout = defaultHTTPTimeout
81
}
relaydns/utils_test.go
+18
-18
@@ -1,18 +1,18 @@
1
-package relaydns
2
-
3
-import (
4
- "fmt"
5
- "testing"
6
- "time"
7
-
8
- "github.com/cockroachdb/crlib/testutils/require"
9
-)
10
-
11
-func TestFetchMultiAddrsFromHosts(t *testing.T) {
12
- url := "http://relaydns.gosuda.org"
13
- timeout := 5 * time.Second
14
-
15
- addrs, err := fetchMultiaddrsFromHosts(url, timeout)
16
- require.NoError(t, err)
17
- fmt.Println(addrs)
18
-}
1
+package relaydns
2
+
3
+import (
4
+ "fmt"
5
+ "testing"
6
+ "time"
7
+
8
+ "github.com/cockroachdb/crlib/testutils/require"
9
+)
10
+
11
+func TestFetchMultiAddrsFromHosts(t *testing.T) {
12
+ url := "http://relaydns.gosuda.org"
13
+ timeout := 5 * time.Second
14
+
15
+ addrs, err := fetchMultiaddrsFromHosts(url, timeout)
16
+ require.NoError(t, err)
17
+ fmt.Println(addrs)
18
+}