feat: add net/http adaptor

pkg/common/adaptor/request.go

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2022 CloudWeGo Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package adaptor
+
+import (
+	"bytes"
+	"net/http"
+
+	"github.com/cloudwego/hertz/pkg/protocol"
+)
+
+// GetCompatRequest only support basic function of Request, not for all.
+func GetCompatRequest(req *protocol.Request) (*http.Request, error) {
+	r, err := http.NewRequest(string(req.Method()), req.URI().String(), bytes.NewReader(req.Body()))
+	if err != nil {
+		return r, err
+	}
+
+	h := make(map[string][]string)
+	req.Header.VisitAll(func(k, v []byte) {
+		h[string(k)] = append(h[string(k)], string(v))
+	})
+
+	r.Header = h
+	return r, nil
+}

pkg/common/adaptor/request_test.go

@@ -0,0 +1,121 @@
+/*
+ * Copyright 2022 CloudWeGo Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package adaptor
+
+import (
+	"context"
+	"io/ioutil"
+	"net/http"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/cloudwego/hertz/pkg/app"
+	"github.com/cloudwego/hertz/pkg/app/server"
+)
+
+func TestCompatResponse_WriteHeader(t *testing.T) {
+	var testHeader http.Header
+	var testBody string
+	testUrl := "http://127.0.0.1:9000/test"
+	testStatusCode := 299
+
+	testHeader = make(map[string][]string)
+	testHeader["Key1"] = []string{"value1"}
+	testHeader["Key2"] = []string{"value2", "value22"}
+	testHeader["Key3"] = []string{"value3", "value33", "value333"}
+
+	testBody = "test body"
+
+	h := server.New(server.WithHostPorts("127.0.0.1:9000"))
+	h.POST("/test", func(c context.Context, ctx *app.RequestContext) {
+		req, _ := GetCompatRequest(&ctx.Request)
+		resp := GetCompatResponseWriter(&ctx.Response)
+		handlerAndCheck(t, resp, req, testHeader, testBody, testStatusCode)
+	})
+
+	go h.Spin()
+	time.Sleep(200 * time.Millisecond)
+
+	makeACall(t, http.MethodPost, testUrl, testHeader, testBody, testStatusCode)
+}
+
+func makeACall(t *testing.T, method, url string, header http.Header, body string, expectStatusCode int) {
+	client := http.Client{}
+	req, _ := http.NewRequest(method, url, strings.NewReader(body))
+	req.Header = header
+	resp, err := client.Do(req)
+	if err != nil {
+		t.Fatalf("make a call error: %s", err)
+	}
+
+	respHeader := resp.Header
+
+	for k, v := range header {
+		for i := 0; i < len(v); i++ {
+			if respHeader[k][i] != v[i] {
+				t.Fatalf("Header error: want %s=%s, got %s=%s", respHeader[k], respHeader[k][i], respHeader[k], v[i])
+			}
+		}
+	}
+
+	b, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		t.Fatalf("Read body error: %s", err)
+	}
+	if string(b) != body {
+		t.Fatalf("Body not equal: want: %s, got: %s", body, string(b))
+	}
+
+	if resp.StatusCode != expectStatusCode {
+		t.Fatalf("Status code not equal: want: %d, got: %d", expectStatusCode, resp.StatusCode)
+	}
+}
+
+func handlerAndCheck(t *testing.T, writer http.ResponseWriter, request *http.Request, wantHeader http.Header, wantBody string, statusCode int) {
+	reqHeader := request.Header
+	for k, v := range wantHeader {
+		if reqHeader[k] == nil {
+			t.Fatalf("Header error: want %s=%s, got %s=nil", reqHeader[k], reqHeader[k][0], reqHeader[k])
+		}
+		if reqHeader[k][0] != v[0] {
+			t.Fatalf("Header error: want %s=%s, got %s=%s", reqHeader[k], reqHeader[k][0], reqHeader[k], v[0])
+		}
+	}
+
+	body, err := ioutil.ReadAll(request.Body)
+	if err != nil {
+		t.Fatalf("Read body error: %s", err)
+	}
+	if string(body) != wantBody {
+		t.Fatalf("Body not equal: want: %s, got: %s", wantBody, string(body))
+	}
+
+	respHeader := writer.Header()
+	for k, v := range reqHeader {
+		respHeader[k] = v
+	}
+	writer.WriteHeader(statusCode)
+	_, err = writer.Write([]byte("test"))
+	if err != nil {
+		t.Fatalf("Write body error: %s", err)
+	}
+	_, err = writer.Write([]byte(" body"))
+	if err != nil {
+		t.Fatalf("Write body error: %s", err)
+	}
+}

pkg/common/adaptor/response.go

@@ -0,0 +1,90 @@
+/*
+ * Copyright 2022 CloudWeGo Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package adaptor
+
+import (
+	"net/http"
+
+	"github.com/cloudwego/hertz/pkg/protocol"
+	"github.com/cloudwego/hertz/pkg/protocol/consts"
+)
+
+type compatResponse struct {
+	h           *protocol.Response
+	header      http.Header
+	writeHeader bool
+}
+
+func (c *compatResponse) Header() http.Header {
+	if c.header != nil {
+		return c.header
+	}
+	c.header = make(map[string][]string)
+	return c.header
+}
+
+func (c *compatResponse) Write(b []byte) (int, error) {
+	if !c.writeHeader {
+		c.WriteHeader(consts.StatusOK)
+	}
+
+	return c.h.BodyWriter().Write(b)
+}
+
+func (c *compatResponse) WriteHeader(statusCode int) {
+	if !c.writeHeader {
+		for k, v := range c.header {
+			for _, vv := range v {
+				if k == consts.HeaderContentLength {
+					continue
+				}
+				if k == consts.HeaderSetCookie {
+					cookie := protocol.AcquireCookie()
+					cookie.Parse(vv)
+					c.h.Header.SetCookie(cookie)
+					continue
+				}
+				c.h.Header.Add(k, vv)
+			}
+		}
+		c.writeHeader = true
+	}
+
+	c.h.Header.SetStatusCode(statusCode)
+}
+
+// GetCompatResponseWriter only support basic function of ResponseWriter, not for all.
+func GetCompatResponseWriter(resp *protocol.Response) http.ResponseWriter {
+	c := &compatResponse{
+		h: resp,
+	}
+	c.h.Header.SetNoDefaultContentType(true)
+
+	h := make(map[string][]string)
+	tmpKey := make([][]byte, 0, c.h.Header.Len())
+	c.h.Header.VisitAll(func(k, v []byte) {
+		h[string(k)] = append(h[string(k)], string(v))
+		tmpKey = append(tmpKey, k)
+	})
+
+	for _, k := range tmpKey {
+		c.h.Header.DelBytes(k)
+	}
+
+	c.header = h
+	return c
+}