[优化] 目录调整

openflare-relay/Dockerfile

@@ -12,6 +12,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
 
 COPY openflare-server ./openflare-server
 COPY openflare-relay ./openflare-relay
+COPY pkg ./pkg
 RUN --mount=type=cache,target=/go/pkg/mod \
     --mount=type=cache,target=/root/.cache/go-build \
     CGO_ENABLED=0 GOOS=linux go build -trimpath -ldflags "-s -w -X 'github.com/rain-kl/openflare/openflare-relay/internal/config.Version=$VERSION'" -o /build/bin/openflare-relay ./openflare-relay/cmd/relay
@@ -30,4 +31,3 @@ ENV OPENFLARE_FRPS_PATH=/usr/bin/frps
 ENV OPENFLARE_DATA_DIR=/app/data
 
 ENTRYPOINT ["/app/openflare-relay"]
-

openflare-relay/internal/config/config.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/utils/geoip"
-	"github.com/rain-kl/openflare/openflare-server/utils/geoip/iputil"
+	"github.com/rain-kl/openflare/pkg/geoip"
+	"github.com/rain-kl/openflare/pkg/geoip/iputil"
 )
 
 type MillisecondDuration time.Duration

openflare-relay/internal/frps/manager.go

@@ -12,7 +12,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/service"
+	service "github.com/rain-kl/openflare/pkg/protocol"
 )
 
 type Manager struct {

openflare-relay/internal/frps/manager_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/service"
+	service "github.com/rain-kl/openflare/pkg/protocol"
 )
 
 // Helper to write control file for the dummy script

openflare-relay/internal/heartbeat/service.go

@@ -11,7 +11,7 @@ import (
 	"github.com/rain-kl/openflare/openflare-relay/internal/observability"
 	"github.com/rain-kl/openflare/openflare-relay/internal/state"
 	"github.com/rain-kl/openflare/openflare-relay/internal/updater"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	service "github.com/rain-kl/openflare/pkg/protocol"
 )
 
 type Service struct {

openflare-relay/internal/httpclient/client.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/service"
+	service "github.com/rain-kl/openflare/pkg/protocol"
 )
 
 type APIResponse[T any] struct {

openflare-relay/internal/observability/collector.go

@@ -16,7 +16,7 @@ import (
 	"github.com/rain-kl/openflare/openflare-relay/internal/config"
 	"github.com/rain-kl/openflare/openflare-relay/internal/frps"
 	"github.com/rain-kl/openflare/openflare-relay/internal/state"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	service "github.com/rain-kl/openflare/pkg/protocol"
 )
 
 func BuildProfile(cfg *config.Config, stateStore *state.Store) *service.AgentNodeSystemProfile {

openflare-relay/internal/relay/runner.go

@@ -12,7 +12,7 @@ import (
 	"github.com/rain-kl/openflare/openflare-relay/internal/httpclient"
 	"github.com/rain-kl/openflare/openflare-relay/internal/state"
 	"github.com/rain-kl/openflare/openflare-relay/internal/wsclient"
-	"github.com/rain-kl/openflare/openflare-server/service"
+	service "github.com/rain-kl/openflare/pkg/protocol"
 )
 
 type Runner struct {

openflare-relay/internal/updater/updater.go

@@ -14,7 +14,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/utils"
+	"github.com/rain-kl/openflare/pkg/utils"
 
 	"github.com/rain-kl/openflare/openflare-relay/internal/config"
 )

openflare-relay/internal/wsclient/client.go

@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/service"
-	shared "github.com/rain-kl/openflare/openflare-server/utils/wsclient"
+	service "github.com/rain-kl/openflare/pkg/protocol"
+	shared "github.com/rain-kl/openflare/pkg/wsclient"
 )
 
 type WSMessage = shared.WSMessage