feat!: replace to httputil.ReverseProxy (#1059)

Closes #1054

Author: ykzts

.github/workflows/go.yml

@@ -14,7 +14,6 @@ jobs:
     strategy:
       matrix:
         go-version:
-          - '1.19'
           - '1.20'
           - '1.21'
 

cmd/manael/doc.go

@@ -22,10 +22,9 @@
 //
 // Usage:
 //
-//     manael [arguments]
+//	manael [arguments]
 //
 // Example:
 //
-//    manael -http=:8080 -upstream_url=http://localhost:9000
-//
+//	manael -http=:8080 -upstream_url=http://localhost:9000
 package main

cmd/manael/main.go

@@ -18,17 +18,18 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-package main // import "manael.org/x/manael/cmd/manael"
+package main
 
 import (
 	"flag"
 	"fmt"
 	"log"
 	"net/http"
+	"net/url"
 	"os"
 
 	"github.com/gorilla/handlers"
-	"manael.org/x/manael"
+	"manael.org/x/manael/v2"
 )
 
 const (
@@ -76,12 +77,16 @@ func main() {
 		}
 	}
 
+	upstreamURL, err := url.Parse(conf.upstreamURL)
+	if err != nil {
+		log.Fatalf("Error: %v", err)
+	}
+
 	var handler http.Handler
-	handler = manael.NewServeProxy(conf.upstreamURL)
+	handler = manael.NewServeProxy(upstreamURL)
 	handler = handlers.CombinedLoggingHandler(os.Stdout, handler)
 
-	err := http.ListenAndServe(conf.httpAddr, handler)
-	if err != nil {
-		log.Fatal(err)
+	if err := http.ListenAndServe(conf.httpAddr, handler); err != nil {
+		log.Fatalf("Error: %v", err)
 	}
 }

decode.go

@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-package manael // import "manael.org/x/manael"
+package manael
 
 import (
 	"errors"

encode.go

@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-package manael // import "manael.org/x/manael"
+package manael
 
 import (
 	"errors"

example_test.go

@@ -18,33 +18,25 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-package manael_test // import "manael.org/x/manael"
+package manael_test
 
 import (
-	"fmt"
 	"log"
 	"net/http"
+	"net/url"
 
-	"manael.org/x/manael"
+	"manael.org/x/manael/v2"
 )
 
 func ExampleNewServeProxy() {
-	p := manael.NewServeProxy("http://localhost:9000")
-
-	err := http.ListenAndServe(":8080", p)
+	u, err := url.Parse("http://localhost:9000")
 	if err != nil {
 		log.Fatal(err)
 	}
-}
 
-func ExampleNewResponse() {
-	req, err := http.NewRequest(http.MethodGet, "https://manael.test/", nil)
-	if err != nil {
+	p := manael.NewServeProxy(u)
+
+	if err := http.ListenAndServe(":8080", p); err != nil {
 		log.Fatal(err)
 	}
-
-	resp := manael.NewResponse(req, http.StatusOK)
-
-	fmt.Println(resp.StatusCode)
-	// Output: 200
 }

go.mod

@@ -1,4 +1,4 @@
-module manael.org/x/manael
+module manael.org/x/manael/v2
 
 go 1.21
 

internal/testutil/testutil.go

@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-package testutil // import "manael.org/x/manael/internal/testutil"
+package testutil
 
 import (
 	"image"

internal/testutil/testutil_test.go

@@ -19,13 +19,13 @@
 // SOFTWARE.
 
 // Package manael provides HTTP handler for processing images.
-package testutil_test // import "manael.org/x/manael/internal/testutil"
+package testutil_test
 
 import (
 	"os"
 	"testing"
 
-	"manael.org/x/manael/internal/testutil"
+	"manael.org/x/manael/v2/internal/testutil"
 )
 
 var testutilTests = []struct {

lint-staged.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-  '*.go': 'go fmt',
+  // '*.go': 'go fmt',
   '*.{js,jsx,ts,tsx}': 'eslint --fix',
   '*.{json,yml}': 'prettier --write'
 }