mirror of
https://github.com/tendermint/tendermint.git
synced 2026-09-22 07:54:17 +00:00
* rpc: implement the ADR 075 /events method (#7965) This method implements the eventlog extension interface to expose ABCI metadata to the log for query processing. Only the types that have ABCI events need to implement this. - Add an event log to the environment - Add a sketch of the handler method - Add an /events RPCFunc to the route map - Implement query logic - Subscribe to pubsub if confingured, handle termination * add MatchesEvents test * add TODO due to backport sequence Co-authored-by: M. J. Fromberger <fromberger@interchain.io>
This commit is contained in:
co-authored by
M. J. Fromberger
parent
069e402aa1
commit
d47b675cda
@@ -8,6 +8,7 @@ import (
|
||||
cfg "github.com/tendermint/tendermint/config"
|
||||
"github.com/tendermint/tendermint/consensus"
|
||||
"github.com/tendermint/tendermint/crypto"
|
||||
"github.com/tendermint/tendermint/internal/eventlog"
|
||||
tmjson "github.com/tendermint/tendermint/libs/json"
|
||||
"github.com/tendermint/tendermint/libs/log"
|
||||
mempl "github.com/tendermint/tendermint/mempool"
|
||||
@@ -92,6 +93,7 @@ type Environment struct {
|
||||
BlockIndexer indexer.BlockIndexer
|
||||
ConsensusReactor *consensus.Reactor
|
||||
EventBus *types.EventBus // thread safe
|
||||
EventLog *eventlog.Log
|
||||
Mempool mempl.Mempool
|
||||
|
||||
Logger log.Logger
|
||||
|
||||
@@ -2,10 +2,13 @@ package core
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/tendermint/tendermint/internal/eventlog"
|
||||
"github.com/tendermint/tendermint/internal/eventlog/cursor"
|
||||
tmpubsub "github.com/tendermint/tendermint/libs/pubsub"
|
||||
tmquery "github.com/tendermint/tendermint/libs/pubsub/query"
|
||||
ctypes "github.com/tendermint/tendermint/rpc/core/types"
|
||||
@@ -128,3 +131,135 @@ func UnsubscribeAll(ctx *rpctypes.Context) (*ctypes.ResultUnsubscribe, error) {
|
||||
}
|
||||
return &ctypes.ResultUnsubscribe{}, nil
|
||||
}
|
||||
|
||||
// Events applies a query to the event log. If an event log is not enabled,
|
||||
// Events reports an error. Otherwise, it filters the current contents of the
|
||||
// log to return matching events.
|
||||
//
|
||||
// Events returns up to maxItems of the newest eligible event items. An item is
|
||||
// eligible if it is older than before (or before is zero), it is newer than
|
||||
// after (or after is zero), and its data matches the filter. A nil filter
|
||||
// matches all event data.
|
||||
//
|
||||
// If before is zero and no eligible event items are available, Events waits
|
||||
// for up to waitTime for a matching item to become available. The wait is
|
||||
// terminated early if ctx ends.
|
||||
//
|
||||
// If maxItems ≤ 0, a default positive number of events is chosen. The values
|
||||
// of maxItems and waitTime may be capped to sensible internal maxima without
|
||||
// reporting an error to the caller.
|
||||
func Events(ctx context.Context,
|
||||
filter *ctypes.EventFilter,
|
||||
maxItems int,
|
||||
before, after cursor.Cursor,
|
||||
waitTime time.Duration,
|
||||
) (*ctypes.ResultEvents, error) {
|
||||
if env.EventLog == nil {
|
||||
return nil, errors.New("the event log is not enabled")
|
||||
}
|
||||
|
||||
// Parse and validate parameters.
|
||||
if maxItems <= 0 {
|
||||
maxItems = 10
|
||||
} else if maxItems > 100 {
|
||||
maxItems = 100
|
||||
}
|
||||
|
||||
const maxWaitTime = 30 * time.Second
|
||||
if waitTime > maxWaitTime {
|
||||
waitTime = maxWaitTime
|
||||
}
|
||||
|
||||
query := tmquery.All
|
||||
if filter != nil && filter.Query != "" {
|
||||
q, err := tmquery.New(filter.Query)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("invalid filter query: %w", err)
|
||||
}
|
||||
query = q
|
||||
}
|
||||
|
||||
var info eventlog.Info
|
||||
var items []*eventlog.Item
|
||||
var err error
|
||||
accept := func(itm *eventlog.Item) error {
|
||||
// N.B. We accept up to one item more than requested, so we can tell how
|
||||
// to set the "more" flag in the response.
|
||||
if len(items) > maxItems {
|
||||
return eventlog.ErrStopScan
|
||||
}
|
||||
match, err := query.MatchesEvents(itm.Events)
|
||||
if err != nil {
|
||||
return fmt.Errorf("matches failed: %v", err)
|
||||
}
|
||||
if cursorInRange(itm.Cursor, before, after) && match {
|
||||
items = append(items, itm)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
if waitTime > 0 && before.IsZero() {
|
||||
ctx, cancel := context.WithTimeout(ctx, waitTime)
|
||||
defer cancel()
|
||||
|
||||
// Long poll. The loop here is because new items may not match the query,
|
||||
// and we want to keep waiting until we have relevant results (or time out).
|
||||
cur := after
|
||||
for len(items) == 0 {
|
||||
info, err = env.EventLog.WaitScan(ctx, cur, accept)
|
||||
if err != nil {
|
||||
// Don't report a timeout as a request failure.
|
||||
if errors.Is(err, context.DeadlineExceeded) {
|
||||
err = nil
|
||||
}
|
||||
break
|
||||
}
|
||||
cur = info.Newest
|
||||
}
|
||||
} else {
|
||||
// Quick poll, return only what is already available.
|
||||
info, err = env.EventLog.Scan(accept)
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
more := len(items) > maxItems
|
||||
if more {
|
||||
items = items[:len(items)-1]
|
||||
}
|
||||
enc, err := marshalItems(items)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &ctypes.ResultEvents{
|
||||
Items: enc,
|
||||
More: more,
|
||||
Oldest: cursorString(info.Oldest),
|
||||
Newest: cursorString(info.Newest),
|
||||
}, nil
|
||||
}
|
||||
|
||||
func cursorString(c cursor.Cursor) string {
|
||||
if c.IsZero() {
|
||||
return ""
|
||||
}
|
||||
return c.String()
|
||||
}
|
||||
|
||||
func cursorInRange(c, before, after cursor.Cursor) bool {
|
||||
return (before.IsZero() || c.Before(before)) && (after.IsZero() || after.Before(c))
|
||||
}
|
||||
|
||||
func marshalItems(items []*eventlog.Item) ([]*ctypes.EventItem, error) {
|
||||
out := make([]*ctypes.EventItem, len(items))
|
||||
for i, itm := range items {
|
||||
v, err := json.Marshal(itm.Data)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("encoding event data: %w", err)
|
||||
}
|
||||
out[i] = &ctypes.EventItem{Cursor: itm.Cursor.String(), Event: itm.Type}
|
||||
out[i].Data = v
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
+3
-1
@@ -8,7 +8,9 @@ import (
|
||||
|
||||
// Routes is a map of available routes.
|
||||
var Routes = map[string]*rpc.RPCFunc{
|
||||
// subscribe/unsubscribe are reserved for websocket events.
|
||||
// Event subscription. Note that subscribe, unsubscribe, and
|
||||
// unsubscribe_all are only available via the websocket endpoint.
|
||||
"events": rpc.NewRPCFunc(Events, "filter,maxItems,before,after,waitTime"),
|
||||
"subscribe": rpc.NewWSRPCFunc(Subscribe, "query"),
|
||||
"unsubscribe": rpc.NewWSRPCFunc(Unsubscribe, "query"),
|
||||
"unsubscribe_all": rpc.NewWSRPCFunc(UnsubscribeAll, ""),
|
||||
|
||||
@@ -254,3 +254,64 @@ type ResultEvent struct {
|
||||
Data types.TMEventData `json:"data"`
|
||||
Events map[string][]string `json:"events"`
|
||||
}
|
||||
|
||||
// RequestEvents is the argument for the "/events" RPC endpoint.
|
||||
type RequestEvents struct {
|
||||
// Optional filter spec. If nil or empty, all items are eligible.
|
||||
Filter *EventFilter `json:"filter"`
|
||||
|
||||
// The maximum number of eligible items to return.
|
||||
// If zero or negative, the server will report a default number.
|
||||
MaxItems int `json:"max_items"`
|
||||
|
||||
// Return only items after this cursor. If empty, the limit is just
|
||||
// before the the beginning of the event log.
|
||||
After string `json:"after"`
|
||||
|
||||
// Return only items before this cursor. If empty, the limit is just
|
||||
// after the head of the event log.
|
||||
Before string `json:"before"`
|
||||
|
||||
// Wait for up to this long for events to be available.
|
||||
WaitTime time.Duration `json:"wait_time"`
|
||||
}
|
||||
|
||||
// An EventFilter specifies which events are selected by an /events request.
|
||||
type EventFilter struct {
|
||||
Query string `json:"query"`
|
||||
}
|
||||
|
||||
// ResultEvents is the response from the "/events" RPC endpoint.
|
||||
type ResultEvents struct {
|
||||
// The items matching the request parameters, from newest
|
||||
// to oldest, if any were available within the timeout.
|
||||
Items []*EventItem `json:"items"`
|
||||
|
||||
// This is true if there is at least one older matching item
|
||||
// available in the log that was not returned.
|
||||
More bool `json:"more"`
|
||||
|
||||
// The cursor of the oldest item in the log at the time of this reply,
|
||||
// or "" if the log is empty.
|
||||
Oldest string `json:"oldest"`
|
||||
|
||||
// The cursor of the newest item in the log at the time of this reply,
|
||||
// or "" if the log is empty.
|
||||
Newest string `json:"newest"`
|
||||
}
|
||||
|
||||
type EventItem struct {
|
||||
// The cursor of this item.
|
||||
Cursor string `json:"cursor"`
|
||||
|
||||
// The event label of this item (for example, "Vote").
|
||||
Event string `json:"event,omitempty"`
|
||||
|
||||
// The encoded event data for this item. The content is a JSON object with
|
||||
// the following structure:
|
||||
//
|
||||
// <json-encoded-value>
|
||||
//
|
||||
// The known type tags are defined by the tendermint/types package.
|
||||
Data json.RawMessage `json:"data"`
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user