- Fix middleware order

- Update tests
- Move worker handler into a separate folder with separate package name

Signed-off-by: Valery Piashchynski <[email protected]>

7 files changed, 58 insertions, 58 deletions

diff --git a/tests/plugins/http/configs/.rr-http-static.yaml b/tests/plugins/http/configs/.rr-http-static.yaml
index 9bb2abc0..9351f020 100644
--- a/tests/plugins/http/configs/.rr-http-static.yaml
+++ b/tests/plugins/http/configs/.rr-http-static.yaml
@@ -1,5 +1,5 @@
 server:
-  command: "php ../../http/client.php pid pipes"
+  command: "php ../../psr-worker-bench.php"
   user: ""
   group: ""
   env:
@@ -24,7 +24,7 @@ http:
     response:
       "output": "output-header"
   pool:
-    num_workers: 2
+    num_workers: 12
     max_jobs: 0
     allocate_timeout: 60s
     destroy_timeout: 60s
diff --git a/tests/plugins/http/handler_test.go b/tests/plugins/http/handler_test.go
index cf445aad..575fe656 100644
--- a/tests/plugins/http/handler_test.go
+++ b/tests/plugins/http/handler_test.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/spiral/roadrunner/v2/pkg/pool"
 	"github.com/spiral/roadrunner/v2/pkg/transport/pipe"
-	httpPlugin "github.com/spiral/roadrunner/v2/plugins/http"
 	"github.com/spiral/roadrunner/v2/plugins/http/config"
+	handler "github.com/spiral/roadrunner/v2/plugins/http/worker_handler"
 	"github.com/stretchr/testify/assert"
 
 	"net/http"
@@ -35,7 +35,7 @@ func TestHandler_Echo(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -66,7 +66,7 @@ func TestHandler_Echo(t *testing.T) {
 }
 
 func Test_HandlerErrors(t *testing.T) {
-	_, err := httpPlugin.NewHandler(1024, config.Uploads{
+	_, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, nil)
@@ -89,7 +89,7 @@ func TestHandler_Headers(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -150,7 +150,7 @@ func TestHandler_Empty_User_Agent(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -210,7 +210,7 @@ func TestHandler_User_Agent(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -270,7 +270,7 @@ func TestHandler_Cookies(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -335,7 +335,7 @@ func TestHandler_JsonPayload_POST(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -399,7 +399,7 @@ func TestHandler_JsonPayload_PUT(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -459,7 +459,7 @@ func TestHandler_JsonPayload_PATCH(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -519,7 +519,7 @@ func TestHandler_FormData_POST(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -592,7 +592,7 @@ func TestHandler_FormData_POST_Overwrite(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -665,7 +665,7 @@ func TestHandler_FormData_POST_Form_UrlEncoded_Charset(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -737,7 +737,7 @@ func TestHandler_FormData_PUT(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -809,7 +809,7 @@ func TestHandler_FormData_PATCH(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -881,7 +881,7 @@ func TestHandler_Multipart_POST(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -995,7 +995,7 @@ func TestHandler_Multipart_PUT(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -1109,7 +1109,7 @@ func TestHandler_Multipart_PATCH(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -1225,7 +1225,7 @@ func TestHandler_Error(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -1271,7 +1271,7 @@ func TestHandler_Error2(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -1317,7 +1317,7 @@ func TestHandler_Error3(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1, config.Uploads{
+	h, err := handler.NewHandler(1, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -1376,7 +1376,7 @@ func TestHandler_ResponseDuration(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -1401,7 +1401,7 @@ func TestHandler_ResponseDuration(t *testing.T) {
 	gotresp := make(chan interface{})
 	h.AddListener(func(event interface{}) {
 		switch t := event.(type) {
-		case httpPlugin.ResponseEvent:
+		case handler.ResponseEvent:
 			if t.Elapsed() > 0 {
 				close(gotresp)
 			}
@@ -1437,7 +1437,7 @@ func TestHandler_ResponseDurationDelayed(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -1462,7 +1462,7 @@ func TestHandler_ResponseDurationDelayed(t *testing.T) {
 	gotresp := make(chan interface{})
 	h.AddListener(func(event interface{}) {
 		switch tp := event.(type) {
-		case httpPlugin.ResponseEvent:
+		case handler.ResponseEvent:
 			if tp.Elapsed() > time.Second {
 				close(gotresp)
 			}
@@ -1497,7 +1497,7 @@ func TestHandler_ErrorDuration(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
@@ -1522,7 +1522,7 @@ func TestHandler_ErrorDuration(t *testing.T) {
 	goterr := make(chan interface{})
 	h.AddListener(func(event interface{}) {
 		switch tp := event.(type) {
-		case httpPlugin.ErrorEvent:
+		case handler.ErrorEvent:
 			if tp.Elapsed() > 0 {
 				close(goterr)
 			}
@@ -1571,7 +1571,7 @@ func TestHandler_IP(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, cidrs, p)
@@ -1632,7 +1632,7 @@ func TestHandler_XRealIP(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, cidrs, p)
@@ -1698,7 +1698,7 @@ func TestHandler_XForwardedFor(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, cidrs, p)
@@ -1763,7 +1763,7 @@ func TestHandler_XForwardedFor_NotTrustedRemoteIp(t *testing.T) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, cidrs, p)
@@ -1811,7 +1811,7 @@ func BenchmarkHandler_Listen_Echo(b *testing.B) {
 		p.Destroy(context.Background())
 	}()
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, p)
diff --git a/tests/plugins/http/http_plugin_test.go b/tests/plugins/http/http_plugin_test.go
index 000fd25d..61486eef 100644
--- a/tests/plugins/http/http_plugin_test.go
+++ b/tests/plugins/http/http_plugin_test.go
@@ -1671,7 +1671,7 @@ func staticNotForbid(t *testing.T) {
 func serveStaticSample(t *testing.T) {
 	b, r, err := get("http://localhost:21603/tests/static/sample.txt")
 	assert.NoError(t, err)
-	assert.Equal(t, "sample", b)
+	assert.Equal(t, "sample\n", b)
 	_ = r.Body.Close()
 }
 
diff --git a/tests/plugins/http/parse_test.go b/tests/plugins/http/parse_test.go
index 5cc1ce32..15c82839 100644
--- a/tests/plugins/http/parse_test.go
+++ b/tests/plugins/http/parse_test.go
@@ -3,7 +3,7 @@ package http
 import (
 	"testing"
 
-	"github.com/spiral/roadrunner/v2/plugins/http"
+	handler "github.com/spiral/roadrunner/v2/plugins/http/worker_handler"
 )
 
 var samples = []struct {
@@ -21,7 +21,7 @@ var samples = []struct {
 
 func Test_FetchIndexes(t *testing.T) {
 	for i := 0; i < len(samples); i++ {
-		r := http.FetchIndexes(samples[i].in)
+		r := handler.FetchIndexes(samples[i].in)
 		if !same(r, samples[i].out) {
 			t.Errorf("got %q, want %q", r, samples[i].out)
 		}
@@ -31,7 +31,7 @@ func Test_FetchIndexes(t *testing.T) {
 func BenchmarkConfig_FetchIndexes(b *testing.B) {
 	for _, tt := range samples {
 		for n := 0; n < b.N; n++ {
-			r := http.FetchIndexes(tt.in)
+			r := handler.FetchIndexes(tt.in)
 			if !same(r, tt.out) {
 				b.Fail()
 			}
diff --git a/tests/plugins/http/plugin_middleware.go b/tests/plugins/http/plugin_middleware.go
index 00640b69..9f04d6db 100644
--- a/tests/plugins/http/plugin_middleware.go
+++ b/tests/plugins/http/plugin_middleware.go
@@ -18,8 +18,8 @@ func (p *PluginMiddleware) Init(cfg config.Configurer) error {
 }
 
 // Middleware test
-func (p *PluginMiddleware) Middleware(next http.Handler) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
+func (p *PluginMiddleware) Middleware(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.URL.Path == "/halt" {
 			w.WriteHeader(500)
 			_, err := w.Write([]byte("halted"))
@@ -29,7 +29,7 @@ func (p *PluginMiddleware) Middleware(next http.Handler) http.HandlerFunc {
 		} else {
 			next.ServeHTTP(w, r)
 		}
-	}
+	})
 }
 
 // Name test
@@ -49,8 +49,8 @@ func (p *PluginMiddleware2) Init(cfg config.Configurer) error {
 }
 
 // Middleware test
-func (p *PluginMiddleware2) Middleware(next http.Handler) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
+func (p *PluginMiddleware2) Middleware(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.URL.Path == "/boom" {
 			w.WriteHeader(555)
 			_, err := w.Write([]byte("boom"))
@@ -60,7 +60,7 @@ func (p *PluginMiddleware2) Middleware(next http.Handler) http.HandlerFunc {
 		} else {
 			next.ServeHTTP(w, r)
 		}
-	}
+	})
 }
 
 // Name test
diff --git a/tests/plugins/http/response_test.go b/tests/plugins/http/response_test.go
index dc9856ac..3564d9cd 100644
--- a/tests/plugins/http/response_test.go
+++ b/tests/plugins/http/response_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/spiral/roadrunner/v2/pkg/payload"
-	httpPlugin "github.com/spiral/roadrunner/v2/plugins/http"
+	handler "github.com/spiral/roadrunner/v2/plugins/http/worker_handler"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -45,13 +45,13 @@ func (tw *testWriter) Push(target string, opts *http.PushOptions) error {
 }
 
 func TestNewResponse_Error(t *testing.T) {
-	r, err := httpPlugin.NewResponse(payload.Payload{Context: []byte(`invalid payload`)})
+	r, err := handler.NewResponse(payload.Payload{Context: []byte(`invalid payload`)})
 	assert.Error(t, err)
 	assert.Nil(t, r)
 }
 
 func TestNewResponse_Write(t *testing.T) {
-	r, err := httpPlugin.NewResponse(payload.Payload{
+	r, err := handler.NewResponse(payload.Payload{
 		Context: []byte(`{"headers":{"key":["value"]},"status": 301}`),
 		Body:    []byte(`sample body`),
 	})
@@ -68,7 +68,7 @@ func TestNewResponse_Write(t *testing.T) {
 }
 
 func TestNewResponse_Stream(t *testing.T) {
-	r, err := httpPlugin.NewResponse(payload.Payload{
+	r, err := handler.NewResponse(payload.Payload{
 		Context: []byte(`{"headers":{"key":["value"]},"status": 301}`),
 	})
 
@@ -93,7 +93,7 @@ func TestNewResponse_Stream(t *testing.T) {
 }
 
 func TestNewResponse_StreamError(t *testing.T) {
-	r, err := httpPlugin.NewResponse(payload.Payload{
+	r, err := handler.NewResponse(payload.Payload{
 		Context: []byte(`{"headers":{"key":["value"]},"status": 301}`),
 	})
 
@@ -114,7 +114,7 @@ func TestNewResponse_StreamError(t *testing.T) {
 }
 
 func TestWrite_HandlesPush(t *testing.T) {
-	r, err := httpPlugin.NewResponse(payload.Payload{
+	r, err := handler.NewResponse(payload.Payload{
 		Context: []byte(`{"headers":{"Http2-Push":["/test.js"],"content-type":["text/html"]},"status": 200}`),
 	})
 
@@ -129,7 +129,7 @@ func TestWrite_HandlesPush(t *testing.T) {
 }
 
 func TestWrite_HandlesTrailers(t *testing.T) {
-	r, err := httpPlugin.NewResponse(payload.Payload{
+	r, err := handler.NewResponse(payload.Payload{
 		Context: []byte(`{"headers":{"Trailer":["foo, bar", "baz"],"foo":["test"],"bar":["demo"]},"status": 200}`),
 	})
 
@@ -139,7 +139,7 @@ func TestWrite_HandlesTrailers(t *testing.T) {
 	w := &testWriter{h: http.Header(make(map[string][]string))}
 	assert.NoError(t, r.Write(w))
 
-	assert.Nil(t, w.h[httpPlugin.TrailerHeaderKey])
+	assert.Nil(t, w.h[handler.TrailerHeaderKey])
 	assert.Nil(t, w.h["foo"]) //nolint:staticcheck
 	assert.Nil(t, w.h["baz"]) //nolint:staticcheck
 
@@ -148,7 +148,7 @@ func TestWrite_HandlesTrailers(t *testing.T) {
 }
 
 func TestWrite_HandlesHandlesWhitespacesInTrailer(t *testing.T) {
-	r, err := httpPlugin.NewResponse(payload.Payload{
+	r, err := handler.NewResponse(payload.Payload{
 		Context: []byte(
 			`{"headers":{"Trailer":["foo\t,bar  ,    baz"],"foo":["a"],"bar":["b"],"baz":["c"]},"status": 200}`),
 	})
diff --git a/tests/plugins/http/uploads_test.go b/tests/plugins/http/uploads_test.go
index bc7e17df..5c39589c 100644
--- a/tests/plugins/http/uploads_test.go
+++ b/tests/plugins/http/uploads_test.go
@@ -18,8 +18,8 @@ import (
 	j "github.com/json-iterator/go"
 	poolImpl "github.com/spiral/roadrunner/v2/pkg/pool"
 	"github.com/spiral/roadrunner/v2/pkg/transport/pipe"
-	httpPlugin "github.com/spiral/roadrunner/v2/plugins/http"
 	"github.com/spiral/roadrunner/v2/plugins/http/config"
+	handler "github.com/spiral/roadrunner/v2/plugins/http/worker_handler"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -40,7 +40,7 @@ func TestHandler_Upload_File(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, pool)
@@ -123,7 +123,7 @@ func TestHandler_Upload_NestedFile(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{},
 	}, nil, pool)
@@ -206,7 +206,7 @@ func TestHandler_Upload_File_NoTmpDir(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    "-------",
 		Forbid: []string{},
 	}, nil, pool)
@@ -289,7 +289,7 @@ func TestHandler_Upload_File_Forbids(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	h, err := httpPlugin.NewHandler(1024, config.Uploads{
+	h, err := handler.NewHandler(1024, config.Uploads{
 		Dir:    os.TempDir(),
 		Forbid: []string{".go"},
 	}, nil, pool)