Refactoring responses and dependency

gpt.go

@@ -9,6 +9,7 @@ import (
 	"github.com/pavel-one/EdgeGPT-Go/internal/CookieManager"
 	"github.com/pavel-one/EdgeGPT-Go/internal/Helpers"
 	"github.com/pavel-one/EdgeGPT-Go/internal/Logger"
+	"github.com/pavel-one/EdgeGPT-Go/responses"
 	"io"
 	"net/http"
 	"time"
@@ -20,8 +21,8 @@ const (
 	StyleCreative = "h3relaxedimg"
 	StyleBalanced = "galileo"
 	StylePrecise  = "h3precise"
-	Delimiter     = "\x1e"
 	DelimiterByte = uint8(30)
+	Delimiter     = "\x1e"
 )
 
 type GPT struct {
@@ -130,7 +131,7 @@ Example:
 		log.Println(mw.Answer.GetAnswer())
 	}
 */
-func (g *GPT) AskAsync(message string) (*MessageWrapper, error) {
+func (g *GPT) AskAsync(message string) (*responses.MessageWrapper, error) {
 
 	if len(message) > 2000 {
 		return nil, fmt.Errorf("message very long, max: %d", 2000)
@@ -141,7 +142,7 @@ func (g *GPT) AskAsync(message string) (*MessageWrapper, error) {
 }
 
 // AskSync getting answer sync
-func (g *GPT) AskSync(message string) (*MessageWrapper, error) {
+func (g *GPT) AskSync(message string) (*responses.MessageWrapper, error) {
 	if len(message) > 2000 {
 		return nil, fmt.Errorf("message very long, max: %d", 2000)
 	}
@@ -153,7 +154,7 @@ func (g *GPT) AskSync(message string) (*MessageWrapper, error) {
 
 	go m.Worker()
 
-	for _ = range m.Chan {
+	for range m.Chan {
 		if m.Final {
 			break
 		}

hub.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"github.com/gorilla/websocket"
 	"github.com/pavel-one/EdgeGPT-Go/internal/Helpers"
+	"github.com/pavel-one/EdgeGPT-Go/responses"
 	"sync"
 )
 
@@ -32,7 +33,7 @@ func (c *Hub) initialHandshake() error {
 }
 
 // send new message to websocket
-func (c *Hub) send(message string) (*MessageWrapper, error) {
+func (c *Hub) send(message string) (*responses.MessageWrapper, error) {
 	c.mu.Lock()
 
 	m, err := json.Marshal(c.getRequest(message))
@@ -46,7 +47,7 @@ func (c *Hub) send(message string) (*MessageWrapper, error) {
 		return nil, err
 	}
 
-	return NewMessageWrapper(message, &c.mu, c.conn), nil
+	return responses.NewMessageWrapper(message, &c.mu, c.conn), nil
 }
 
 // Close hub and connection

responseFinal.go → responses/final.go

@@ -1,6 +1,8 @@
-package EdgeGPT
+package responses
 
-import "time"
+import (
+	"time"
+)
 
 // FinalResponse response for final generate message
 type FinalResponse struct {

responses/interfaces.go

@@ -0,0 +1,9 @@
+package responses
+
+type GptResponse interface {
+	GetAnswer() string
+	GetType() int
+	GetMaxUnit() int
+	GetUserUnit() int
+	GetSuggestions() []*Suggestion
+}

message.go → responses/message.go

@@ -1,4 +1,4 @@
-package EdgeGPT
+package responses
 
 import (
 	"encoding/json"
@@ -7,6 +7,8 @@ import (
 	"time"
 )
 
+const DelimiterByte = uint8(30)
+
 const (
 	TypeUpdate float64 = 1
 	TypeFinish float64 = 2
@@ -72,7 +74,7 @@ func (m *MessageWrapper) Worker() error {
 
 	var response map[string]any
 	var updateResponse UpdateResponse
-	var finishResponse FinalResponse
+	var finalResponse FinalResponse
 	var undefinedResponse UndefinedResponse
 
 	for {
@@ -104,11 +106,11 @@ func (m *MessageWrapper) Worker() error {
 			m.Answer = &updateResponse
 			break
 		case TypeFinish:
-			if err := json.Unmarshal(message, &finishResponse); err != nil {
+			if err := json.Unmarshal(message, &finalResponse); err != nil {
 				return err
 			}
 
-			m.Answer = &finishResponse
+			m.Answer = &finalResponse
 			m.Final = true
 			m.Chan <- message
 			close(m.Chan)

responseUndefined.go → responses/undefined.go

@@ -1,4 +1,4 @@
-package EdgeGPT
+package responses
 
 // UndefinedResponse response for unused messages
 type UndefinedResponse struct {

responseUpdate.go → responses/update.go

@@ -1,4 +1,4 @@
-package EdgeGPT
+package responses
 
 // UpdateResponse response for work generate message
 type UpdateResponse struct {