update logic for disconnection detection

Author: xzyaoi

src/.gitignore

@@ -1 +1,2 @@
-build/
+build/
+bin/

src/.golangci.yml

@@ -0,0 +1,12 @@
+run:
+  timeout: 5m
+  modules-download-mode: mod
+  go: "1.23"
+
+linters:
+  disable:
+    - typecheck
+
+issues:
+  exclude-dirs-use-default: true
+

src/Makefile

@@ -24,7 +24,10 @@ endif
 
 # Dependency versions
 GOTESTSUM_VERSION ?= 0.4.2
-GOLANGCI_VERSION ?= 1.60.3
+GOLANGCI_VERSION ?= 1.61.0
+# Default flags for golangci-lint
+GOLANGCI_FLAGS ?= --timeout=5m
+LINT_PKGS ?= ./internal/common/... ./entry/... ./bin/...
 
 GOLANG_VERSION ?= 1.14
 
@@ -111,7 +114,7 @@ post-build-release: ${POST_BUILD_RELEASE_TARGETS}
 build-release: build-release-deps pre-build-release
 build-release: ## Build binaries without debug information
 	@${MAKE} LDFLAGS="-w ${LDFLAGS}" GOARGS="${GOARGS} -trimpath" BUILD_DIR="${BUILD_DIR}/release" build
-
+	mv build/release/entry build/release/ocf-amd64
 	@${MAKE} post-build-release
 
 .PHONY: build-debug-deps
@@ -157,12 +160,12 @@ bin/golangci-lint: bin/golangci-lint-${GOLANGCI_VERSION}
 	@ln -sf golangci-lint-${GOLANGCI_VERSION} bin/golangci-lint
 bin/golangci-lint-${GOLANGCI_VERSION}:
 	@mkdir -p bin
-	curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | BINARY=golangci-lint bash -s -- v${GOLANGCI_VERSION}
+	GOBIN=$(abspath bin) go install github.com/golangci/golangci-lint/cmd/golangci-lint@v${GOLANGCI_VERSION}
 	@mv bin/golangci-lint $@
 
 .PHONY: lint
 lint: bin/golangci-lint ## Run linters
-	bin/golangci-lint run ./...
+	GOTOOLCHAIN=go1.23.0 bin/golangci-lint run ${GOLANGCI_FLAGS} ${LINT_PKGS}
 
 release-%: TAG_PREFIX = v
 release-%:

src/entry/cmd/update.go

@@ -20,11 +20,11 @@ func doUpdate() error {
 		return err
 	}
 	defer resp.Body.Close()
-	err = selfupdate.Apply(resp.Body, selfupdate.Options{})
-	if err != nil {
-		// error handling
-	}
-	return err
+    err = selfupdate.Apply(resp.Body, selfupdate.Options{})
+    if err != nil {
+        return err
+    }
+    return nil
 }
 
 var updateCmd = &cobra.Command{

src/entry/main.go

@@ -10,12 +10,14 @@ var (
 	version     = "dev"
 	commitHash  = "?"
 	buildDate   = ""
-	buildSecret = ""
+    // buildSecret left for future use to verify official builds
+    buildSecret string
 )
 
 func main() {
 	common.JSONVersion.Version = version
 	common.JSONVersion.Commit = commitHash
 	common.JSONVersion.Date = buildDate
+    _ = buildSecret
 	cmd.Execute()
 }

src/internal/common/logger.go

@@ -16,9 +16,8 @@ func init() {
 	}
 	config.EncoderConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder
 	config.Level.SetLevel(zapcore.InfoLevel)
-	zapLogger, err := config.Build()
-	// trunk-ignore(golangci-lint/errcheck)
-	defer zapLogger.Sync()
+    zapLogger, err := config.Build()
+    defer func() { _ = zapLogger.Sync() }()
 	if err != nil {
 		panic(err)
 	}

src/internal/protocol/clock.go

@@ -1,6 +1,7 @@
 package protocol
 
 import (
+	"context"
 	"encoding/json"
 	"math/rand"
 	"ocf/internal/common"
@@ -11,6 +12,7 @@ import (
 	ds "github.com/ipfs/go-datastore"
 	"github.com/jasonlvhit/gocron"
 	"github.com/libp2p/go-libp2p/core/network"
+	libpeer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 // var verificationKey = "ocf-verification-key"
@@ -33,16 +35,29 @@ func StartTicker() {
 		// updateMyself()
 		for _, peer_id := range peers {
 			// check if peer is still connected
-			peer, error := GetPeerFromTable(peer_id.String())
+			p, error := GetPeerFromTable(peer_id.String())
 			if error == nil {
-				peer.Connected = true
+				p.Connected = true
 				if peer_id != host.ID() && host.Network().Connectedness(peer_id) != network.Connected {
-					common.Logger.Info("Peer:" + peer_id.String() + " got disconnected!")
-					peer.Connected = false
+					// try to dial the peer, if cannot dial, then mark it as disconnected
+					ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+					defer cancel()
+					addrInfo := libpeer.AddrInfo{ID: peer_id, Addrs: host.Peerstore().Addrs(peer_id)}
+					if len(addrInfo.Addrs) == 0 {
+						common.Logger.Warnf("No known addresses for peer %s; marking disconnected", peer_id)
+						p.Connected = false
+					} else if err := host.Connect(ctx, addrInfo); err != nil {
+						common.Logger.With("err", err).Warnf("Failed to dial peer %s; marking disconnected", peer_id)
+						p.Connected = false
+					} else {
+						// Successfully reconnected
+						common.Logger.Infof("Reconnected to peer %s", peer_id)
+						p.Connected = true
+					}
 				}
 				// update last seen timestamp
-				peer.LastSeen = time.Now().Unix()
-				value, err := json.Marshal(peer)
+				p.LastSeen = time.Now().Unix()
+				value, err := json.Marshal(p)
 				if err == nil {
 					UpdateNodeTableHook(ds.NewKey(peer_id.String()), value)
 				}

src/internal/protocol/host.go

@@ -72,23 +72,21 @@ func newHost(ctx context.Context, seed int64, ds datastore.Batching) (host.Host,
 			if err != nil {
 				return nil, err
 			}
+			writeKeyToFile(priv)
 		}
 	} else {
 		r := mrand.New(mrand.NewSource(seed))
 		priv, _, err = crypto.GenerateKeyPairWithReader(crypto.RSA, 2048, r)
 		if err != nil {
 			return nil, err
 		}
+		writeKeyToFile(priv)
 	}
-	// persist private key
-	writeKeyToFile(priv)
 	if err != nil {
 		return nil, err
 	}
-
 	// Configure resource manager with higher limits
 	limits := rcmgr.DefaultLimits.AutoScale()
-
 	// Increase connection limits significantly for a distributed system
 	systemLimits := rcmgr.ResourceLimits{
 		ConnsInbound:    1000,  // Allow up to 1000 inbound connections
@@ -97,7 +95,7 @@ func newHost(ctx context.Context, seed int64, ds datastore.Batching) (host.Host,
 		StreamsInbound:  10000, // Increase stream limits
 		StreamsOutbound: 10000,
 		Streams:         20000,
-		Memory:          1 << 30, // 1GB memory limit
+		Memory:          16 << 30, // 16GB memory limit
 	}
 
 	// Apply the custom limits

src/internal/protocol/key.go

@@ -40,6 +40,7 @@ func loadKeyFromFile() crypto.PrivKey {
 		return nil
 	}
 	keyPath := path.Join(home, ".ocfcore", "keys", "id")
+	common.Logger.Info("Looking for keys under: ", keyPath)
 	keyData, err := os.ReadFile(keyPath)
 	if err != nil {
 		return nil

tools/establish_connection.py

@@ -0,0 +1,20 @@
+import os
+import subprocess
+
+command = """curl http://148.187.108.172:8092/v1/p2p/<address>/v1/_service/llm/v1/chat/completions \
+  -H 'Authorization: Bearer YOUR_API_KEY' \
+  -H 'Content-Type: application/json' \
+  -d '{
+    "model": "Qwen/Qwen3-32B",
+    "messages": [
+      { "role": "system", "content": "You are a helpful assistant." },
+      { "role": "user", "content": "What is the capital of France?" }
+    ],
+    "temperature": 0.7
+  }'"""
+
+address = "QmNNRmz2etg76yFhc15cqvVPEKjCywSLSRFiN3brzYEV6u"
+cmd = command.replace("<address>", address)
+print(cmd)
+# Use subprocess to avoid shell interpretation issues
+subprocess.run(cmd, shell=True, check=True)