[优化] 目录调整

openflared/Dockerfile

@@ -13,6 +13,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
 
 COPY openflare-server/ ./openflare-server/
 COPY openflared/ ./openflared/
+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/openflared/internal/config.Version=$VERSION'" -o flared ./openflared/cmd/flared
@@ -30,4 +31,3 @@ ENV OPENFLARE_FRPC_PATH=/usr/bin/frpc
 
 ENTRYPOINT ["/app/flared"]
 CMD []
-

openflared/internal/frpc/manager.go

@@ -14,8 +14,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/service"
 	"github.com/rain-kl/openflare/openflared/internal/config"
+	service "github.com/rain-kl/openflare/pkg/protocol"
 )
 
 type Manager struct {

openflared/internal/frpc/manager_test.go

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

openflared/internal/heartbeat/service.go

@@ -6,13 +6,13 @@ import (
 	"net"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/service"
-	"github.com/rain-kl/openflare/openflare-server/utils/geoip"
-	"github.com/rain-kl/openflare/openflare-server/utils/geoip/iputil"
 	"github.com/rain-kl/openflare/openflared/internal/config"
 	"github.com/rain-kl/openflare/openflared/internal/frpc"
 	"github.com/rain-kl/openflare/openflared/internal/httpclient"
 	"github.com/rain-kl/openflare/openflared/internal/updater"
+	"github.com/rain-kl/openflare/pkg/geoip"
+	"github.com/rain-kl/openflare/pkg/geoip/iputil"
+	service "github.com/rain-kl/openflare/pkg/protocol"
 )
 
 var (

openflared/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 {

openflared/internal/sync/service.go

@@ -5,10 +5,10 @@ import (
 	"log/slog"
 	"time"
 
-	"github.com/rain-kl/openflare/openflare-server/service"
 	"github.com/rain-kl/openflare/openflared/internal/config"
 	"github.com/rain-kl/openflare/openflared/internal/frpc"
 	"github.com/rain-kl/openflare/openflared/internal/httpclient"
+	service "github.com/rain-kl/openflare/pkg/protocol"
 )
 
 type Service struct {

openflared/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/openflared/internal/config"
 )

openflared/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