Merge branch 'master' of gfx.cafe:open/jrpc

middleware/log.go

@@ -17,7 +17,7 @@ func Logger(next jrpc.Handler) jrpc.Handler {
 		log.Trace().
 			Stringer("time", time.Since(start)).
 			Str("remote", r.Remote()).
-			Str("method", r.Method()).
+			Str("method", r.Method).
 			Str("params", string(r.Msg().Params)).Msg("RPC Request")
 	}
 	return jrpc.HandlerFunc(fn)

openrpc/types/types.go

@@ -64,6 +64,7 @@ type Schema struct {
 
 type Param struct {
 	Name        string `json:"name"`
+	Description string `json:"description,omitempty"`
 	Required    bool   `json:"required"`
 	Schema      Schema `json:"schema"`
 }
@@ -75,9 +76,40 @@ type Result struct {
 
 type Method struct {
 	Name     string           `json:"name"`
+	Tags     []Tag            `json:"tags,omitempty"`
 	Summary  string           `json:"summary"`
 	Params   []Param          `json:"params"`
 	Result   Result           `json:"result"`
+	Examples []ExamplePairing `json:"examples,omitempty"`
+}
+
+type Tag struct {
+	Ref          string                 `json:"$ref,omitempty"`
+	Name         string                 `json:"name"`
+	Summary      string                 `json:"summary,omitempty"`
+	Description  string                 `json:"description,omitempty"`
+	ExternalDocs *ExternalDocumentation `json:"externalDocs,omitempty"`
+}
+
+type ExternalDocumentation struct {
+	Description string `json:"description,omitempty"`
+	URL         string `json:"url,omitempty"`
+}
+
+type ExamplePairing struct {
+	Name        string    `json:"name"`
+	Description string    `json:"description,omitempty"`
+	Summary     string    `json:"summary,omitempty"`
+	Params      []Example `json:"params"`
+	Result      Example   `json:"result"`
+}
+
+type Example struct {
+	Ref         string `json:"$ref,omitempty"`
+	Name        string `json:"name"`
+	Summary     string `json:"summary,omitempty"`
+	Description string `json:"description,omitempty"`
+	Value       any    `json:"value"`
 }
 
 func (m *Method) Namespace() string {