updated

vortex14 · Feb 14, 2023 · 436e8a1 · 436e8a1
1 parent 3b67d13
commit 436e8a1
Show file tree

Hide file tree

Showing 20 changed files with 100 additions and 218 deletions.
diff --git a/extensions/pipelines/http/emulator/rod/context.go b/extensions/pipelines/http/emulator/rod/context.go
@@ -2,7 +2,9 @@ package rod
 
 import (
 	Context "context"
+
 	"github.com/go-rod/rod"
+
 	"github.com/vortex14/gotyphoon/ctx"
 )
 

diff --git a/extensions/pipelines/http/emulator/rod/middleware.go b/extensions/pipelines/http/emulator/rod/middleware.go
@@ -3,6 +3,7 @@ package rod
 import (
 	"context"
 	"fmt"
+
 	"github.com/go-rod/rod"
 	"github.com/go-rod/rod/lib/launcher"
 

diff --git a/extensions/pipelines/http/emulator/rod/request.go b/extensions/pipelines/http/emulator/rod/request.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"github.com/go-rod/rod"
+
 	"github.com/vortex14/gotyphoon/elements/forms"
 	"github.com/vortex14/gotyphoon/elements/models/task"
 	Errors "github.com/vortex14/gotyphoon/errors"

diff --git a/extensions/pipelines/http/emulator/rod/test_test.go b/extensions/pipelines/http/emulator/rod/test_test.go
diff --git a/extensions/pipelines/http/net-http/body.go b/extensions/pipelines/http/net-http/body.go
@@ -26,7 +26,7 @@ func GetBody(client *http.Client, request *http.Request) (error, *string, *http.
 
 	var reader io.ReadCloser
 	switch response.Header.Get("Content-Encoding") {
-	case "gzip":
+	case GZIP:
 		reader, err = gzip.NewReader(response.Body)
 		if err != nil {
 			return Errors.ResponseHttpGzipDecodeError, nil, nil

diff --git a/extensions/pipelines/http/net-http/context.go b/extensions/pipelines/http/net-http/context.go
@@ -2,11 +2,12 @@ package net_http
 
 import (
 	Context "context"
-	"github.com/PuerkitoBio/goquery"
-	"github.com/vortex14/gotyphoon/interfaces"
 	"net/http"
 
+	"github.com/PuerkitoBio/goquery"
+
 	"github.com/vortex14/gotyphoon/ctx"
+	"github.com/vortex14/gotyphoon/interfaces"
 )
 
 const (
@@ -17,6 +18,7 @@ const (
 	REQUEST   = "request"
 	RESPONSE  = "response"
 	DATA      = "data"
+	GZIP      = "gzip"
 )
 
 type ValidationCallback func(logger interfaces.LoggerInterface, response *http.Response, doc *goquery.Document) bool

diff --git a/extensions/pipelines/http/net-http/installation-proxy-old.go b/extensions/pipelines/http/net-http/installation-proxy-old.go
diff --git a/extensions/pipelines/http/net-http/middlewares.go b/extensions/pipelines/http/net-http/middlewares.go
@@ -4,12 +4,14 @@ import (
 	"context"
 	b64 "encoding/base64"
 	"errors"
+	"net/url"
+
 	Gin "github.com/gin-gonic/gin"
+
 	"github.com/vortex14/gotyphoon/elements/forms"
 	"github.com/vortex14/gotyphoon/elements/models/label"
 	"github.com/vortex14/gotyphoon/extensions/servers/gin"
 	"github.com/vortex14/gotyphoon/interfaces"
-	"net/url"
 )
 
 var (

diff --git a/extensions/pipelines/http/net-http/proxy.go b/extensions/pipelines/http/net-http/proxy.go
@@ -3,12 +3,14 @@ package net_http
 import (
 	"context"
 	"fmt"
-	"github.com/sirupsen/logrus"
-	"github.com/vortex14/gotyphoon/extensions/middlewares"
-	"github.com/vortex14/gotyphoon/log"
 	"net/http"
 	"net/url"
 
+	"github.com/vortex14/gotyphoon/extensions/middlewares"
+	"github.com/vortex14/gotyphoon/log"
+
+	"github.com/sirupsen/logrus"
+
 	"github.com/vortex14/gotyphoon/elements/forms"
 	"github.com/vortex14/gotyphoon/elements/models/label"
 	"github.com/vortex14/gotyphoon/elements/models/task"

diff --git a/extensions/pipelines/http/net-http/request.go b/extensions/pipelines/http/net-http/request.go
@@ -3,19 +3,20 @@ package net_http
 import (
 	"context"
 	"fmt"
-	"github.com/avast/retry-go/v4"
-	"github.com/vortex14/gotyphoon/extensions/models"
-	"github.com/vortex14/gotyphoon/log"
-	"github.com/vortex14/gotyphoon/utils"
 	"net/http"
 	"os"
 
+	"github.com/avast/retry-go/v4"
 	"github.com/fatih/color"
+
 	"github.com/vortex14/gotyphoon/elements/forms"
 	"github.com/vortex14/gotyphoon/elements/models/label"
 	"github.com/vortex14/gotyphoon/elements/models/task"
 	Errors "github.com/vortex14/gotyphoon/errors"
+	"github.com/vortex14/gotyphoon/extensions/models"
 	"github.com/vortex14/gotyphoon/interfaces"
+	"github.com/vortex14/gotyphoon/log"
+	"github.com/vortex14/gotyphoon/utils"
 )
 
 func Request(

diff --git a/extensions/pipelines/http/net-http/stream_test.go b/extensions/pipelines/http/net-http/stream_test.go
@@ -3,16 +3,18 @@ package net_http
 import (
 	"bufio"
 	"fmt"
-	. "github.com/smartystreets/goconvey/convey"
-	Fake "github.com/vortex14/gotyphoon/extensions/data/fake"
-	"github.com/vortex14/gotyphoon/log"
 	"io"
 	"io/ioutil"
 	"os"
 	"strings"
 	"sync"
 	"testing"
 	"time"
+
+	. "github.com/smartystreets/goconvey/convey"
+
+	Fake "github.com/vortex14/gotyphoon/extensions/data/fake"
+	"github.com/vortex14/gotyphoon/log"
 )
 
 func init() {

diff --git a/extensions/pipelines/http/net-http/test_test.go b/extensions/pipelines/http/net-http/test_test.go
@@ -1,17 +1,18 @@
 package net_http
 
 import (
+	"context"
+	"net/http"
+	"testing"
+
 	. "github.com/smartystreets/goconvey/convey"
+
 	"github.com/vortex14/gotyphoon/elements/forms"
 	"github.com/vortex14/gotyphoon/elements/models/label"
 	"github.com/vortex14/gotyphoon/elements/models/task"
 	"github.com/vortex14/gotyphoon/extensions/data/fake"
 	"github.com/vortex14/gotyphoon/interfaces"
 	"github.com/vortex14/gotyphoon/log"
-
-	"context"
-	"net/http"
-	"testing"
 )
 
 func init() {

diff --git a/extensions/pipelines/http/net-http/utils.go b/extensions/pipelines/http/net-http/utils.go
@@ -2,8 +2,9 @@ package net_http
 
 import (
 	"fmt"
-	"github.com/vortex14/gotyphoon/extensions/data/fake"
 	"net/http"
+
+	"github.com/vortex14/gotyphoon/extensions/data/fake"
 )
 
 func FormattingProxy(proxy string) string {

diff --git a/extensions/pipelines/task-pipeline.go b/extensions/pipelines/task-pipeline.go
@@ -17,7 +17,7 @@ type TaskPipeline struct {
 		context context.Context,
 		task interfaces.TaskInterface,
 		logger interfaces.LoggerInterface,
-	)  (error, context.Context)
+	) (error, context.Context)
 
 	Cn func(
 		err error,
@@ -29,7 +29,7 @@ type TaskPipeline struct {
 
 func (t *TaskPipeline) UnpackCtx(
 	ctx context.Context,
-	) (bool, interfaces.TaskInterface, interfaces.LoggerInterface) {
+) (bool, interfaces.TaskInterface, interfaces.LoggerInterface) {
 
 	okT, taskInstance := task.Get(ctx)
 	okL, logger := log.Get(ctx)
@@ -40,15 +40,24 @@ func (t *TaskPipeline) Run(
 	context context.Context,
 	reject func(pipeline interfaces.BasePipelineInterface, err error),
 	next func(ctx context.Context),
-	) {
+) {
 
-	if t.Fn == nil { reject(t, Errors.TaskPipelineRequiredHandler); return }
+	if t.Fn == nil {
+		reject(t, Errors.TaskPipelineRequiredHandler)
+		return
+	}
 
-	ok,taskInstance, logger := t.UnpackCtx(context)
-	if !ok { reject(t, Errors.PipelineContexFailed); return }
+	ok, taskInstance, logger := t.UnpackCtx(context)
+	if !ok {
+		reject(t, Errors.PipelineContexFailed)
+		return
+	}
 
 	err, newContext := t.Fn(context, taskInstance, logger)
-	if err != nil { reject(t, err); return }
+	if err != nil {
+		reject(t, err)
+		return
+	}
 	next(newContext)
 }
 
@@ -58,11 +67,15 @@ func (t *TaskPipeline) Cancel(
 	err error,
 ) {
 
-	if t.Cn == nil { return }
+	if t.Cn == nil {
+		return
+	}
 
-	ok,taskInstance, logger := t.UnpackCtx(context)
-	if !ok { return }
+	ok, taskInstance, _logger := t.UnpackCtx(context)
+	if !ok {
+		return
+	}
 
-	t.Cn(err, context, taskInstance, logger)
+	t.Cn(err, context, taskInstance, _logger)
 
-}
+}