From 54e4969d26d68c33d25d694edc7633620b969add Mon Sep 17 00:00:00 2001
From: yusing <yusing@6uo.me>
Date: Wed, 16 Apr 2025 14:44:31 +0800
Subject: [PATCH] chore: fix import and err marshal handling

---
 internal/gperr/utils.go      | 4 ++--
 internal/net/types/stream.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/internal/gperr/utils.go b/internal/gperr/utils.go
index 6b749f57..f64559c1 100644
--- a/internal/gperr/utils.go
+++ b/internal/gperr/utils.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/yusing/go-proxy/pkg/json"
+	stdJSON "encoding/json"
 )
 
 func newError(message string) error {
@@ -73,7 +73,7 @@ func IsJSONMarshallable(err error) bool {
 	case *baseError:
 		return IsJSONMarshallable(err.Err)
 	default:
-		var v json.Marshaler
+		var v stdJSON.Marshaler
 		return errors.As(err, &v)
 	}
 }
diff --git a/internal/net/types/stream.go b/internal/net/types/stream.go
index 2892a5fc..371621d9 100644
--- a/internal/net/types/stream.go
+++ b/internal/net/types/stream.go
@@ -1,4 +1,4 @@
-package types
+package gpnet
 
 import (
 	"fmt"