prevent nil panics

webrpc · Sep 30, 2024 · 2269e08 · 2269e08
1 parent 2029ca9
commit 2269e08
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 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/helpers.go.tmpl b/helpers.go.tmpl
@@ -6,9 +6,9 @@
 //
 
 type MethodCtx struct  {
-  Name string
-  Service string
-  Annotations map[string]string
+	Name string
+	Service string
+	Annotations map[string]string
 }
 
 type contextKey struct {
@@ -54,7 +54,10 @@ func RequestFromContext(ctx context.Context) *http.Request {
 func MethodFromContext(ctx context.Context) MethodCtx {
 	name, _ := ctx.Value(MethodNameCtxKey).(string)
 	service, _ := ctx.Value(ServiceNameCtxKey).(string)
-	annotations, _ := ctx.Value(methodAnnotationsCtxKey).(map[string]string)
+	annotations, ok := ctx.Value(methodAnnotationsCtxKey).(map[string]string)
+	if !ok {
+		annotations = map[string]string{}
+	}
 
 	return MethodCtx{
 		Name: name,

diff --git a/server.go.tmpl b/server.go.tmpl
@@ -71,7 +71,7 @@ func (s *{{$serviceName}}) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	switch contentType {
 	case "application/json":
-        if s.OnRequest != nil {
+		if s.OnRequest != nil {
 			if err := s.OnRequest(w, r); err != nil {
 				rpcErr, ok := err.(WebRPCError)
 				if !ok {
@@ -80,7 +80,7 @@ func (s *{{$serviceName}}) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 				s.sendErrorJSON(w, r, rpcErr)
 				return
 			}
-        }
+		}
 
 		handler(ctx, w, r)
 	default:

diff --git a/types.go.tmpl b/types.go.tmpl
@@ -35,7 +35,7 @@ var (
 			{{- range $_, $method := $service.Methods }}
 			"/rpc/{{$service.Name}}/{{$method.Name}}": {
 				{{- range $_, $annotation := $method.Annotations -}}
-					"{{$annotation.AnnotationType}}": "{{$annotation.Value}}",
+				"{{$annotation.AnnotationType}}": "{{$annotation.Value}}",
 				{{- end -}}
 			},
 			{{- end -}}