Merge pull request #2831 from kemalturk/firebase-functions-improvement

Refactored HTTP routing to use fasthttp directly

Author: ReneWerner87

firebase-functions/README.md

@@ -205,81 +205,73 @@ In `functions.go`, convert Google Cloud Function requests to Fiber and route the
 package app
 
 import (
- "bytes"
- "context"
- "fmt"
- "io"
- "log"
- "net"
- "net/http"
- "strings"
+	"io"
+	"net"
+	"net/http"
 
- "github.com/gofiber/fiber/v2"
- "github.com/valyala/fasthttp/fasthttputil"
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/utils"
+	"github.com/valyala/fasthttp"
 )
 
 // CloudFunctionRouteToFiber route cloud function http.Handler to *fiber.App
 // Internally, google calls the function with the /execute base URL
 func CloudFunctionRouteToFiber(fiberApp *fiber.App, w http.ResponseWriter, r *http.Request) error {
- return RouteToFiber(fiberApp, w, r, "/execute")
-}
-
-// RouteToFiber route http.Handler to *fiber.App
-func RouteToFiber(fiberApp *fiber.App, w http.ResponseWriter, r *http.Request, rootURL ...string) error {
- ln := fasthttputil.NewInmemoryListener()
- defer ln.Close()
-
- // Copy request
- body, err := io.ReadAll(r.Body)
- if err != nil {
-  return err
- }
-
- url := fmt.Sprintf("%s://%s%s", "http", "0.0.0.0", r.RequestURI)
- if len(rootURL) > 0 {
-  url = strings.Replace(url, rootURL[0], "", -1)
- }
-
- proxyReq, err := http.NewRequest(r.Method, url, bytes.NewReader(body))
-
- if err != nil {
-  return err
- }
-
- proxyReq.Header = r.Header
 
- // Create http client
- client := http.Client{
-  Transport: &http.Transport{
-   DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
-    return ln.Dial()
-   },
-  },
- }
-
- // Serve request to internal HTTP client
- go func() {
-  log.Fatal(fiberApp.Listener(ln))
- }()
+	// Convert net/http -> fasthttp Ctx
+	ctx := ConvertNetHTTPRequestToFastHTTPCtx(r, w)
 
- // Call internal Fiber API
- response, err := client.Do(proxyReq)
- if err != nil {
-  return err
- }
+	// Run Fiber
+	fiberApp.Handler()(ctx)
 
- // Copy response and headers
- for k, values := range response.Header {
-  for _, v := range values {
-   w.Header().Set(k, v)
-  }
- }
- w.WriteHeader(response.StatusCode)
+	// Convert fasthttp Ctx -> net/http
+	ctx.Response.Header.VisitAll(func(k, v []byte) {
+		w.Header().Add(string(k), string(v))
+	})
+	w.WriteHeader(ctx.Response.StatusCode())
+	_, err := w.Write(ctx.Response.Body())
 
- io.Copy(w, response.Body)
- response.Body.Close()
+	return err
+}
 
- return nil
+// ConvertNetHTTPRequestToFastHTTPCtx converts a net/http.Request to fasthttp.RequestCtx
+func ConvertNetHTTPRequestToFastHTTPCtx(r *http.Request, w http.ResponseWriter) *fasthttp.RequestCtx {
+	// New fasthttp request
+	req := fasthttp.AcquireRequest()
+	defer fasthttp.ReleaseRequest(req)
+	// Convert net/http -> fasthttp request
+	if r.Body != nil {
+		n, err := io.Copy(req.BodyWriter(), r.Body)
+		req.Header.SetContentLength(int(n))
+
+		if err != nil {
+			http.Error(w, utils.StatusMessage(fiber.StatusInternalServerError), fiber.StatusInternalServerError)
+			return nil
+		}
+	}
+	req.Header.SetMethod(r.Method)
+	req.SetRequestURI(r.RequestURI)
+	req.SetHost(r.Host)
+	req.Header.SetHost(r.Host)
+	for key, val := range r.Header {
+		for _, v := range val {
+			req.Header.Set(key, v)
+		}
+	}
+
+	if _, _, err := net.SplitHostPort(r.RemoteAddr); err != nil && err.(*net.AddrError).Err == "missing port in address" {
+		r.RemoteAddr = net.JoinHostPort(r.RemoteAddr, "80")
+	}
+	remoteAddr, err := net.ResolveTCPAddr("tcp", r.RemoteAddr)
+	if err != nil {
+		http.Error(w, utils.StatusMessage(fiber.StatusInternalServerError), fiber.StatusInternalServerError)
+		return nil
+	}
+
+	var fctx fasthttp.RequestCtx
+	fctx.Init(req, remoteAddr, nil)
+
+	return &fctx
 }
 ```
 

firebase-functions/functions.go

@@ -1,78 +1,71 @@
 package app
 
 import (
-	"bytes"
-	"context"
-	"fmt"
 	"io"
-	"log"
 	"net"
 	"net/http"
-	"strings"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/valyala/fasthttp/fasthttputil"
+	"github.com/gofiber/fiber/v2/utils"
+	"github.com/valyala/fasthttp"
 )
 
 // CloudFunctionRouteToFiber route cloud function http.Handler to *fiber.App
 // Internally, google calls the function with the /execute base URL
 func CloudFunctionRouteToFiber(fiberApp *fiber.App, w http.ResponseWriter, r *http.Request) error {
-	return RouteToFiber(fiberApp, w, r, "/execute")
-}
 
-// RouteToFiber route http.Handler to *fiber.App
-func RouteToFiber(fiberApp *fiber.App, w http.ResponseWriter, r *http.Request, rootURL ...string) error {
-	ln := fasthttputil.NewInmemoryListener()
-	defer ln.Close()
+	// Convert net/http -> fasthttp Ctx
+	ctx := ConvertNetHTTPRequestToFastHTTPCtx(r, w)
 
-	// Copy request
-	body, err := io.ReadAll(r.Body)
-	if err != nil {
-		return err
-	}
+	// Run Fiber
+	fiberApp.Handler()(ctx)
 
-	url := fmt.Sprintf("%s://%s%s", "http", "0.0.0.0", r.RequestURI)
-	if len(rootURL) > 0 {
-		url = strings.Replace(url, rootURL[0], "", -1)
-	}
+	// Convert fasthttp Ctx -> net/http
+	ctx.Response.Header.VisitAll(func(k, v []byte) {
+		w.Header().Add(string(k), string(v))
+	})
+	w.WriteHeader(ctx.Response.StatusCode())
+	_, err := w.Write(ctx.Response.Body())
 
-	proxyReq, err := http.NewRequest(r.Method, url, bytes.NewReader(body))
-	if err != nil {
-		return err
-	}
+	return err
+}
 
-	proxyReq.Header = r.Header
+// ConvertNetHTTPRequestToFastHTTPCtx converts a net/http.Request to fasthttp.RequestCtx
+func ConvertNetHTTPRequestToFastHTTPCtx(r *http.Request, w http.ResponseWriter) *fasthttp.RequestCtx {
+	// New fasthttp request
+	req := fasthttp.AcquireRequest()
+	defer fasthttp.ReleaseRequest(req)
+	// Convert net/http -> fasthttp request
+	if r.Body != nil {
+		n, err := io.Copy(req.BodyWriter(), r.Body)
+		req.Header.SetContentLength(int(n))
 
-	// Create http client
-	client := http.Client{
-		Transport: &http.Transport{
-			DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
-				return ln.Dial()
-			},
-		},
+		if err != nil {
+			http.Error(w, utils.StatusMessage(fiber.StatusInternalServerError), fiber.StatusInternalServerError)
+			return nil
+		}
 	}
-
-	// Serve request to internal HTTP client
-	go func() {
-		log.Fatal(fiberApp.Listener(ln))
-	}()
-
-	// Call internal Fiber API
-	response, err := client.Do(proxyReq)
-	if err != nil {
-		return err
+	req.Header.SetMethod(r.Method)
+	req.SetRequestURI(r.RequestURI)
+	req.SetHost(r.Host)
+	req.Header.SetHost(r.Host)
+	for key, val := range r.Header {
+		for _, v := range val {
+			req.Header.Set(key, v)
+		}
 	}
 
-	// Copy response and headers
-	for k, values := range response.Header {
-		for _, v := range values {
-			w.Header().Set(k, v)
-		}
+	if _, _, err := net.SplitHostPort(r.RemoteAddr); err != nil && err.(*net.AddrError).Err == "missing port in address" {
+		r.RemoteAddr = net.JoinHostPort(r.RemoteAddr, "80")
+	}
+	remoteAddr, err := net.ResolveTCPAddr("tcp", r.RemoteAddr)
+	if err != nil {
+		http.Error(w, utils.StatusMessage(fiber.StatusInternalServerError), fiber.StatusInternalServerError)
+		return nil
 	}
-	w.WriteHeader(response.StatusCode)
 
-	io.Copy(w, response.Body)
-	response.Body.Close()
+	var fctx fasthttp.RequestCtx
+	fctx.Init(req, remoteAddr, nil)
 
-	return nil
+	return &fctx
 }