call OnRequest before handler is called and handle err

webrpc · Sep 30, 2024 · 74fd14a · 74fd14a
1 parent c5c5528
commit 74fd14a
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 16 deletions.
diff --git a/_examples/golang-basics/example.gen.go b/_examples/golang-basics/example.gen.go
diff --git a/_examples/golang-imports/api.gen.go b/_examples/golang-imports/api.gen.go
diff --git a/server.go.tmpl b/server.go.tmpl
@@ -44,10 +44,6 @@ func (s *{{$serviceName}}) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	ctx = context.WithValue(ctx, ServiceNameCtxKey, "{{.Name}}")
 	ctx = context.WithValue(ctx, MethodAnnotationsCtxKey, methodAnnotations[r.URL.Path])
 
-    if s.OnRequest != nil {
-        s.OnRequest(w, r)
-    }
-
 	var handler func(ctx context.Context, w http.ResponseWriter, r *http.Request)
 	switch r.URL.Path {
 	{{- range $_, $method := $service.Methods}}
@@ -75,6 +71,17 @@ func (s *{{$serviceName}}) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	switch contentType {
 	case "application/json":
+        if s.OnRequest != nil {
+            if err := s.OnRequest(w, r); err != nil {
+                rpcErr, ok := err.(WebRPCError)
+                if !ok {
+                    rpcErr = ErrWebrpcEndpoint.WithCause(err)
+                }
+                s.sendErrorJSON(w, r, rpcErr)
+                return
+            }
+        }
+
 		handler(ctx, w, r)
 	default:
 		err := ErrWebrpcBadRequest.WithCause(fmt.Errorf("unsupported Content-Type %q (only application/json is allowed)", r.Header.Get("Content-Type")))

diff --git a/types.go.tmpl b/types.go.tmpl
@@ -29,7 +29,7 @@
 
 {{- end }}
 
-{{- range $_, $service := $services -}}
+{{ range $_, $service := $services -}}
 var (
 	methodAnnotations = map[string]map[string]string{
     	{{- range $_, $method := $service.Methods }}