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

Firebase functions improvement

Author: ReneWerner87

firebase-functions/Makefile

@@ -1,3 +1,12 @@
+PROJECT_ID=<ProjectID>
+FUNCTION_NAME=<FunctionName>
+RUNTIME=go121
+ENTRY_POINT=ServerFunction
+
 deploy:
-	gcloud config set project <ProjectID>
-	gcloud functions deploy ServerFunction --runtime go120 --trigger-http
+	gcloud config set project $(PROJECT_ID)
+	gcloud functions deploy $(FUNCTION_NAME) \
+		--runtime $(RUNTIME) \
+		--entry-point $(ENTRY_POINT) \
+		--trigger-http \
+		--no-gen2

firebase-functions/README.md

@@ -205,74 +205,18 @@ In `functions.go`, convert Google Cloud Function requests to Fiber and route the
 package app
 
 import (
-	"io"
-	"net"
 	"net/http"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/utils"
-	"github.com/valyala/fasthttp"
+	adaptor "github.com/gofiber/fiber/v2/middleware/adaptor"
 )
 
 // 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 {
-
-	// Convert net/http -> fasthttp Ctx
-	ctx := ConvertNetHTTPRequestToFastHTTPCtx(r, w)
-
-	// Run Fiber
-	fiberApp.Handler()(ctx)
-
-	// 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())
-
-	return err
+func CloudFunctionRouteToFiber(fiberApp *fiber.App, w http.ResponseWriter, r *http.Request) {
+	adaptor.FiberApp(fiberApp)(w, r)
 }
 
-// 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
-}
 ```
 
 ## Main Application Entry
@@ -306,13 +250,9 @@ func Start(addr string) error {
  return app.Listen(addr)
 }
 
-// MyCloudFunction Exported http.HandlerFunc to be deployed to as a Cloud Function
-func MyCloudFunction(w http.ResponseWriter, r *http.Request) {
- err := CloudFunctionRouteToFiber(app, w, r)
- if err != nil {
-  fmt.Fprintf(w, "err : %v", err)
-  return
- }
+// ServerFunction Exported http.HandlerFunc to be deployed to as a Cloud Function
+func ServerFunction(w http.ResponseWriter, r *http.Request) {
+	CloudFunctionRouteToFiber(app, w, r)
 }
 ```
 

firebase-functions/functions.go

@@ -1,71 +1,14 @@
 package app
 
 import (
-	"io"
-	"net"
 	"net/http"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/utils"
-	"github.com/valyala/fasthttp"
+	adaptor "github.com/gofiber/fiber/v2/middleware/adaptor"
 )
 
 // 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 {
-
-	// Convert net/http -> fasthttp Ctx
-	ctx := ConvertNetHTTPRequestToFastHTTPCtx(r, w)
-
-	// Run Fiber
-	fiberApp.Handler()(ctx)
-
-	// 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())
-
-	return err
-}
-
-// 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
+func CloudFunctionRouteToFiber(fiberApp *fiber.App, w http.ResponseWriter, r *http.Request) {
+	adaptor.FiberApp(fiberApp)(w, r)
 }

firebase-functions/main.go

@@ -1,7 +1,6 @@
 package app
 
 import (
-	"fmt"
 	"net/http"
 	"strings"
 
@@ -26,9 +25,5 @@ func Start(addr string) error {
 
 // ServerFunction Exported http.HandlerFunc to be deployed to as a Cloud Function
 func ServerFunction(w http.ResponseWriter, r *http.Request) {
-	err := CloudFunctionRouteToFiber(app, w, r)
-	if err != nil {
-		fmt.Fprintf(w, "err : %v", err)
-		return
-	}
+	CloudFunctionRouteToFiber(app, w, r)
 }