mirror of
https://github.com/ipfs/kubo.git
synced 2026-02-21 18:37:45 +08:00
* feat(p2p): add --foreground flag to listen and forward commands
adds `-f/--foreground` option that keeps the command running until
interrupted (SIGTERM/Ctrl+C) or closed via `ipfs p2p close`. the
listener/forwarder is automatically removed when the command exits.
useful for systemd services and scripts that need cleanup on exit.
* docs: add p2p-tunnels.md with systemd examples
- add dedicated docs/p2p-tunnels.md covering:
- why p2p tunnels (NAT traversal, no public IP needed)
- quick start with netcat
- background and foreground modes
- systemd integration with path-based activation
- security considerations and troubleshooting
- document Experimental.Libp2pStreamMounting in docs/config.md
- simplify docs/experimental-features.md, link to new doc
- add "Learn more" links to ipfs p2p listen/forward --help
- update changelog entry with doc link
- add cross-reference in misc/README.md
* chore: reference kubo#5460 for p2p config
Ref. https://github.com/ipfs/kubo/issues/5460
* fix(daemon): write api/gateway files only after HTTP server is ready
fixes race condition where $IPFS_PATH/api and $IPFS_PATH/gateway files
were written before the HTTP servers were ready to accept connections.
this caused issues for tools like systemd path units that immediately
try to connect when these files appear.
changes:
- add corehttp.ServeWithReady() that signals when server is ready
- wait for ready signal before writing address files
- use sync.WaitGroup.Go() (Go 1.25) for cleaner goroutine management
- add TestAddressFileReady to verify both api and gateway files
* fix(daemon): buffer errc channel and wait for all listeners
- buffer error channel with len(listeners) to prevent deadlock when
multiple servers write errors simultaneously
- wait for ALL listeners to be ready before writing api/gateway file,
not just the first one
Feedback-from: https://github.com/ipfs/kubo/pull/11099#pullrequestreview-3593885839
* docs(changelog): improve p2p tunnel section clarity
reframe to lead with user benefit and add example output
* docs(p2p): remove obsolete race condition caveat
the "First launch fails but restarts work" troubleshooting section
described a race where the api file was written before the daemon was
ready. this was fixed in 80b703a which ensures api/gateway files are
only written after HTTP servers are ready to accept connections.
---------
Co-authored-by: Andrew Gillis <11790789+gammazero@users.noreply.github.com>
105 lines
3.0 KiB
Go
105 lines
3.0 KiB
Go
package cli
|
|
|
|
import (
|
|
"net/http"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/ipfs/kubo/test/cli/harness"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
// TestAddressFileReady verifies that when address files ($IPFS_PATH/api and
|
|
// $IPFS_PATH/gateway) are created, the corresponding HTTP servers are ready
|
|
// to accept connections immediately. This prevents race conditions for tools
|
|
// like systemd path units that start services when these files appear.
|
|
func TestAddressFileReady(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
t.Run("api file", func(t *testing.T) {
|
|
t.Parallel()
|
|
h := harness.NewT(t)
|
|
node := h.NewNode().Init()
|
|
|
|
// Start daemon in background (don't use StartDaemon which waits for API)
|
|
res := node.Runner.MustRun(harness.RunRequest{
|
|
Path: node.IPFSBin,
|
|
Args: []string{"daemon"},
|
|
RunFunc: (*exec.Cmd).Start,
|
|
})
|
|
node.Daemon = res
|
|
defer node.StopDaemon()
|
|
|
|
// Poll for api file to appear
|
|
apiFile := filepath.Join(node.Dir, "api")
|
|
var fileExists bool
|
|
for i := 0; i < 100; i++ {
|
|
if _, err := os.Stat(apiFile); err == nil {
|
|
fileExists = true
|
|
break
|
|
}
|
|
time.Sleep(100 * time.Millisecond)
|
|
}
|
|
require.True(t, fileExists, "api file should be created")
|
|
|
|
// Read the api file to get the address
|
|
apiAddr, err := node.TryAPIAddr()
|
|
require.NoError(t, err)
|
|
|
|
// Extract IP and port from multiaddr
|
|
ip, err := apiAddr.ValueForProtocol(4) // P_IP4
|
|
require.NoError(t, err)
|
|
port, err := apiAddr.ValueForProtocol(6) // P_TCP
|
|
require.NoError(t, err)
|
|
|
|
// Immediately try to use the API - should work on first attempt
|
|
url := "http://" + ip + ":" + port + "/api/v0/id"
|
|
resp, err := http.Post(url, "", nil)
|
|
require.NoError(t, err, "RPC API should be ready immediately when api file exists")
|
|
defer resp.Body.Close()
|
|
require.Equal(t, http.StatusOK, resp.StatusCode)
|
|
})
|
|
|
|
t.Run("gateway file", func(t *testing.T) {
|
|
t.Parallel()
|
|
h := harness.NewT(t)
|
|
node := h.NewNode().Init()
|
|
|
|
// Start daemon in background
|
|
res := node.Runner.MustRun(harness.RunRequest{
|
|
Path: node.IPFSBin,
|
|
Args: []string{"daemon"},
|
|
RunFunc: (*exec.Cmd).Start,
|
|
})
|
|
node.Daemon = res
|
|
defer node.StopDaemon()
|
|
|
|
// Poll for gateway file to appear
|
|
gatewayFile := filepath.Join(node.Dir, "gateway")
|
|
var fileExists bool
|
|
for i := 0; i < 100; i++ {
|
|
if _, err := os.Stat(gatewayFile); err == nil {
|
|
fileExists = true
|
|
break
|
|
}
|
|
time.Sleep(100 * time.Millisecond)
|
|
}
|
|
require.True(t, fileExists, "gateway file should be created")
|
|
|
|
// Read the gateway file to get the URL (already includes http:// prefix)
|
|
gatewayURL, err := os.ReadFile(gatewayFile)
|
|
require.NoError(t, err)
|
|
|
|
// Immediately try to use the Gateway - should work on first attempt
|
|
url := strings.TrimSpace(string(gatewayURL)) + "/ipfs/bafkqaaa" // empty file CID
|
|
resp, err := http.Get(url)
|
|
require.NoError(t, err, "Gateway should be ready immediately when gateway file exists")
|
|
defer resp.Body.Close()
|
|
require.Equal(t, http.StatusOK, resp.StatusCode)
|
|
})
|
|
}
|