feat: eventMeta -> event.IsEvent

app/gql/resolver.go

@@ -45,13 +45,13 @@ func (*noop) IsResolver() {}
 func (*noop) CreateSaltyUser(ctx context.Context, nick string, pubkey string) (*salty.SaltyUser, error) {
 	panic("not implemented")
 }
-func (*noop) Posts(ctx context.Context, streamID string, paging *gql.PageInput) (*gql.Connection, error) {
+func (*noop) Posts(ctx context.Context, name, tag string, paging *gql.PageInput) (*gql.Connection, error) {
 	panic("not implemented")
 }
 func (*noop) SaltyUser(ctx context.Context, nick string) (*salty.SaltyUser, error) {
 	panic("not implemented")
 }
-func (*noop) PostAdded(ctx context.Context, streamID string, after int64) (<-chan *msgbus.PostEvent, error) {
+func (*noop) PostAdded(ctx context.Context, name, tag string, after int64) (<-chan *msgbus.PostEvent, error) {
 	panic("not implemented")
 }
 func (*noop) Events(ctx context.Context, streamID string, paging *gql.PageInput) (*gql.Connection, error) {

app/msgbus/msgbus.graphqls

@@ -1,9 +1,9 @@
 extend type Query {
-    posts(streamID: String! paging: PageInput): Connection!
+    posts(name: String!, tag: String! = "", paging: PageInput): Connection!
 }
 extend type Subscription {
     """after == 0 start from begining, after == -1 start from end"""
-    postAdded(streamID: String! after: Int! = -1): PostEvent
+    postAdded(name: String!, tag: String! = "", after: Int! = -1): PostEvent
 }
 type PostEvent implements Edge @goModel(model: "go.sour.is/ev/app/msgbus.PostEvent") {
     id: ID!

app/msgbus/service.go

@@ -3,8 +3,10 @@ package msgbus
 import (
 	"bytes"
 	"context"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"hash/fnv"
 	"io"
 	"net/http"
 	"strconv"
@@ -33,8 +35,8 @@ type service struct {
 }
 
 type MsgbusResolver interface {
-	Posts(ctx context.Context, streamID string, paging *gql.PageInput) (*gql.Connection, error)
-	PostAdded(ctx context.Context, streamID string, after int64) (<-chan *PostEvent, error)
+	Posts(ctx context.Context, name, tag string, paging *gql.PageInput) (*gql.Connection, error)
+	PostAdded(ctx context.Context, name, tag string, after int64) (<-chan *PostEvent, error)
 	IsResolver()
 }
 
@@ -115,7 +117,7 @@ func (s *service) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }
 
 // Posts is the resolver for the events field.
-func (s *service) Posts(ctx context.Context, streamID string, paging *gql.PageInput) (*gql.Connection, error) {
+func (s *service) Posts(ctx context.Context, name, tag string, paging *gql.PageInput) (*gql.Connection, error) {
 	ctx, span := lg.Span(ctx)
 	defer span.End()
 
@@ -124,6 +126,7 @@ func (s *service) Posts(ctx context.Context, streamID string, paging *gql.PageIn
 	start := time.Now()
 	defer s.m_req_time.Record(ctx, time.Since(start).Milliseconds())
 
+	streamID := withTag("post-"+name, tag)
 	lis, err := s.es.Read(ctx, streamID, paging.GetIdx(0), paging.GetCount(30))
 	if err != nil {
 		span.RecordError(err)
@@ -164,7 +167,7 @@ func (s *service) Posts(ctx context.Context, streamID string, paging *gql.PageIn
 	}, nil
 }
 
-func (r *service) PostAdded(ctx context.Context, streamID string, after int64) (<-chan *PostEvent, error) {
+func (r *service) PostAdded(ctx context.Context, name, tag string, after int64) (<-chan *PostEvent, error) {
 	ctx, span := lg.Span(ctx)
 	defer span.End()
 
@@ -175,6 +178,8 @@ func (r *service) PostAdded(ctx context.Context, streamID string, after int64) (
 		return nil, fmt.Errorf("EventStore does not implement streaming")
 	}
 
+	streamID := withTag("post-"+name, tag)
+
 	sub, err := es.Subscribe(ctx, streamID, after)
 	if err != nil {
 		span.RecordError(err)
@@ -232,14 +237,15 @@ func (s *service) get(w http.ResponseWriter, r *http.Request) {
 	start := time.Now()
 	defer s.m_req_time.Record(ctx, time.Since(start).Milliseconds())
 
-	name, _, _ := strings.Cut(r.URL.Path, "/")
+	name, tag, _ := strings.Cut(r.URL.Path, "/")
 	if name == "" {
 		w.WriteHeader(http.StatusNotFound)
 		return
 	}
+	streamID := withTag("post-"+name, tag)
 
 	var first event.Event = event.NilEvent
-	if lis, err := s.es.Read(ctx, "post-"+name, 0, 1); err == nil && len(lis) > 0 {
+	if lis, err := s.es.Read(ctx, streamID, 0, 1); err == nil && len(lis) > 0 {
 		first = lis[0]
 	}
 
@@ -256,8 +262,8 @@ func (s *service) get(w http.ResponseWriter, r *http.Request) {
 		count = i
 	}
 
-	span.AddEvent(fmt.Sprint("GET topic=", name, " idx=", pos, " n=", count))
-	events, err := s.es.Read(ctx, "post-"+name, pos, count)
+	span.AddEvent(fmt.Sprint("GET topic=", streamID, " idx=", pos, " n=", count))
+	events, err := s.es.Read(ctx, streamID, pos, count)
 	if err != nil {
 		span.RecordError(err)
 		w.WriteHeader(http.StatusInternalServerError)
@@ -356,14 +362,16 @@ func (s *service) websocket(w http.ResponseWriter, r *http.Request) {
 	ctx, span := lg.Span(ctx)
 	defer span.End()
 
-	name, _, _ := strings.Cut(r.URL.Path, "/")
+	name, tag, _ := strings.Cut(r.URL.Path, "/")
 	if name == "" {
 		w.WriteHeader(http.StatusNotFound)
 		return
 	}
 
+	streamID := withTag("post-"+name, tag)
+
 	var first event.Event = event.NilEvent
-	if lis, err := s.es.Read(ctx, "post-"+name, 0, 1); err == nil && len(lis) > 0 {
+	if lis, err := s.es.Read(ctx, streamID, 0, 1); err == nil && len(lis) > 0 {
 		first = lis[0]
 	}
 
@@ -374,7 +382,7 @@ func (s *service) websocket(w http.ResponseWriter, r *http.Request) {
 		pos = i - 1
 	}
 
-	span.AddEvent(fmt.Sprint("WS topic=", name, " idx=", pos))
+	span.AddEvent(fmt.Sprint("WS topic=", streamID, " idx=", pos))
 
 	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
@@ -409,7 +417,7 @@ func (s *service) websocket(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	sub, err := es.Subscribe(ctx, "post-"+name, pos)
+	sub, err := es.Subscribe(ctx, streamID, pos)
 	if err != nil {
 		span.RecordError(err)
 		return
@@ -457,21 +465,9 @@ type PostEvent struct {
 	payload []byte
 	tags    []string
 
-	eventMeta event.Meta
+	event.IsEvent
 }
 
-func (e *PostEvent) EventMeta() event.Meta {
-	if e == nil {
-		return event.Meta{}
-	}
-	return e.eventMeta
-}
-func (e *PostEvent) SetEventMeta(eventMeta event.Meta) {
-	if e == nil {
-		return
-	}
-	e.eventMeta = eventMeta
-}
 func (e *PostEvent) Values() any {
 	if e == nil {
 		return nil
@@ -503,25 +499,23 @@ func (e *PostEvent) UnmarshalBinary(b []byte) error {
 func (e *PostEvent) MarshalJSON() ([]byte, error) { return e.MarshalBinary() }
 func (e *PostEvent) UnmarshalJSON(b []byte) error { return e.UnmarshalBinary(b) }
 
-func (e *PostEvent) ID() string      { return e.eventMeta.GetEventID() }
+func (e *PostEvent) ID() string      { return e.EventMeta().GetEventID() }
 func (e *PostEvent) Tags() []string  { return e.tags }
 func (e *PostEvent) Payload() string { return string(e.payload) }
 func (e *PostEvent) PayloadJSON(ctx context.Context) (m map[string]interface{}, err error) {
 	err = json.Unmarshal([]byte(e.payload), &m)
 	return
 }
-func (e *PostEvent) Meta() *event.Meta { return &e.eventMeta }
-func (e *PostEvent) IsEdge()           {}
+func (e *PostEvent) Meta() event.Meta { return e.EventMeta() }
+func (e *PostEvent) IsEdge()          {}
 
 func (e *PostEvent) String() string {
 	var b bytes.Buffer
 
-	// b.WriteString(e.eventMeta.StreamID)
-	// b.WriteRune('@')
-	b.WriteString(strconv.FormatUint(e.eventMeta.Position, 10))
+	b.WriteString(strconv.FormatUint(e.EventMeta().Position, 10))
 	b.WriteRune('\t')
 
-	b.WriteString(e.eventMeta.EventID.String())
+	b.WriteString(e.EventMeta().EventID.String())
 	b.WriteRune('\t')
 	b.WriteString(string(e.payload))
 	if len(e.tags) > 0 {
@@ -536,7 +530,7 @@ func fields(s string) []string {
 	if s == "" {
 		return nil
 	}
-	return strings.Split(s, "/")
+	return strings.Split(s, ";")
 }
 
 func encodeJSON(w io.Writer, first event.Event, events ...event.Event) error {
@@ -573,3 +567,32 @@ func encodeJSON(w io.Writer, first event.Event, events ...event.Event) error {
 
 	return json.NewEncoder(w).Encode(out)
 }
+
+func Projector(e event.Event) []event.Event {
+	m := e.EventMeta()
+	streamID := m.StreamID
+	streamPos := m.Position
+
+	switch e := e.(type) {
+	case *PostEvent:
+		lis := make([]event.Event, len(e.tags))
+		for i := range lis {
+			tag := e.tags[i]
+			ne := event.NewPtr(streamID, streamPos)
+			event.SetStreamID(withTag(streamID, tag), ne)
+			lis[i] = ne
+		}
+
+		return lis
+	}
+	return nil
+}
+func withTag(id, tag string) string {
+	if tag == "" {
+		return id
+	}
+
+	h := fnv.New128a()
+	fmt.Fprint(h, tag)
+	return id + "-" + base64.RawURLEncoding.EncodeToString(h.Sum(nil))
+}

app/peerfinder/ev-info.go

@@ -51,22 +51,11 @@ func (a *Info) OnUpsert() error {
 type VersionChanged struct {
 	ScriptVersion string `json:"script_version"`
 
-	eventMeta event.Meta
+	event.IsEvent
 }
 
 var _ event.Event = (*VersionChanged)(nil)
 
-func (e *VersionChanged) EventMeta() event.Meta {
-	if e == nil {
-		return event.Meta{}
-	}
-	return e.eventMeta
-}
-func (e *VersionChanged) SetEventMeta(m event.Meta) {
-	if e != nil {
-		e.eventMeta = m
-	}
-}
 func (e *VersionChanged) MarshalBinary() (text []byte, err error) {
 	return json.Marshal(e)
 }

app/peerfinder/ev-request.go

@@ -33,7 +33,7 @@ func (a *Request) ApplyEvent(lis ...event.Event) {
 	for _, e := range lis {
 		switch e := e.(type) {
 		case *RequestSubmitted:
-			a.RequestID = e.eventMeta.EventID.String()
+			a.RequestID = e.EventMeta().EventID.String()
 			a.RequestIP = e.RequestIP
 			a.Hidden = e.Hidden
 			a.Created = ulid.Time(e.EventMeta().EventID.Time())
@@ -120,7 +120,7 @@ func (lis ListResponse) Swap(i, j int) {
 }
 
 type RequestSubmitted struct {
-	eventMeta event.Meta
+	event.IsEvent
 
 	RequestIP string `json:"req_ip"`
 	Hidden    bool   `json:"hide,omitempty"`
@@ -154,22 +154,11 @@ func (r *RequestSubmitted) Family() int {
 	}
 }
 func (r *RequestSubmitted) String() string {
-	return fmt.Sprint(r.eventMeta.EventID, r.RequestIP, r.Hidden, r.CreatedString())
+	return fmt.Sprint(r.EventMeta().EventID, r.RequestIP, r.Hidden, r.CreatedString())
 }
 
 var _ event.Event = (*RequestSubmitted)(nil)
 
-func (e *RequestSubmitted) EventMeta() event.Meta {
-	if e == nil {
-		return event.Meta{}
-	}
-	return e.eventMeta
-}
-func (e *RequestSubmitted) SetEventMeta(m event.Meta) {
-	if e != nil {
-		e.eventMeta = m
-	}
-}
 func (e *RequestSubmitted) MarshalBinary() (text []byte, err error) {
 	return json.Marshal(e)
 }
@@ -204,7 +193,7 @@ func (e *RequestSubmitted) MarshalEnviron() ([]byte, error) {
 }
 
 type ResultSubmitted struct {
-	eventMeta event.Meta
+	event.IsEvent
 
 	RequestID   string  `json:"req_id"`
 	PeerID      string  `json:"peer_id"`
@@ -219,22 +208,11 @@ type ResultSubmitted struct {
 }
 
 func (r *ResultSubmitted) Created() time.Time {
-	return r.eventMeta.Created()
+	return r.EventMeta().Created()
 }
 
 var _ event.Event = (*ResultSubmitted)(nil)
 
-func (e *ResultSubmitted) EventMeta() event.Meta {
-	if e == nil {
-		return event.Meta{}
-	}
-	return e.eventMeta
-}
-func (e *ResultSubmitted) SetEventMeta(m event.Meta) {
-	if e != nil {
-		e.eventMeta = m
-	}
-}
 func (e *ResultSubmitted) MarshalBinary() (text []byte, err error) {
 	return json.Marshal(e)
 }
@@ -248,22 +226,11 @@ func (e *ResultSubmitted) String() string {
 type RequestTruncated struct {
 	RequestID string
 
-	eventMeta event.Meta
+	event.IsEvent
 }
 
 var _ event.Event = (*RequestTruncated)(nil)
 
-func (e *RequestTruncated) EventMeta() event.Meta {
-	if e == nil {
-		return event.Meta{}
-	}
-	return e.eventMeta
-}
-func (e *RequestTruncated) SetEventMeta(m event.Meta) {
-	if e != nil {
-		e.eventMeta = m
-	}
-}
 func (e *RequestTruncated) MarshalBinary() (text []byte, err error) {
 	return json.Marshal(e)
 }

app/peerfinder/jobs.go

@@ -164,7 +164,7 @@ func (s *service) cleanRequests(ctx context.Context, now time.Time) error {
 		for _, event := range events {
 			switch e := event.(type) {
 			case *RequestSubmitted:
-				if e.eventMeta.ActualPosition < last-maxResults {
+				if e.EventMeta().ActualPosition < last-maxResults {
 					streamIDs = append(streamIDs, e.RequestID())
 				}
 			}

app/salty/salty-user.go

@@ -60,22 +60,11 @@ type UserRegistered struct {
 	Name   string
 	Pubkey *keys.EdX25519PublicKey
 
-	eventMeta event.Meta
+	event.IsEvent
 }
 
 var _ event.Event = (*UserRegistered)(nil)
 
-func (e *UserRegistered) EventMeta() event.Meta {
-	if e == nil {
-		return event.Meta{}
-	}
-	return e.eventMeta
-}
-func (e *UserRegistered) SetEventMeta(m event.Meta) {
-	if e != nil {
-		e.eventMeta = m
-	}
-}
 func (e *UserRegistered) MarshalBinary() (text []byte, err error) {
 	var b bytes.Buffer
 	b.WriteString(e.Name)

app/webfinger/events.go

@@ -11,20 +11,9 @@ type SubjectSet struct {
 	Aliases    []string           `json:"aliases,omitempty"`
 	Properties map[string]*string `json:"properties,omitempty"`
 
-	eventMeta event.Meta
+	event.IsEvent
 }
 
-func (e *SubjectSet) EventMeta() event.Meta {
-	if e == nil {
-		return event.Meta{}
-	}
-	return e.eventMeta
-}
-func (e *SubjectSet) SetEventMeta(m event.Meta) {
-	if e != nil {
-		e.eventMeta = m
-	}
-}
 func (e *SubjectSet) MarshalBinary() (text []byte, err error) {
 	return json.Marshal(e)
 }
@@ -37,20 +26,9 @@ var _ event.Event = (*SubjectSet)(nil)
 type SubjectDeleted struct {
 	Subject string `json:"subject"`
 
-	eventMeta event.Meta
+	event.IsEvent
 }
 
-func (e *SubjectDeleted) EventMeta() event.Meta {
-	if e == nil {
-		return event.Meta{}
-	}
-	return e.eventMeta
-}
-func (e *SubjectDeleted) SetEventMeta(m event.Meta) {
-	if e != nil {
-		e.eventMeta = m
-	}
-}
 func (e *SubjectDeleted) MarshalBinary() (text []byte, err error) {
 	return json.Marshal(e)
 }
@@ -67,20 +45,9 @@ type LinkSet struct {
 	Titles     map[string]string  `json:"titles,omitempty"`
 	Properties map[string]*string `json:"properties,omitempty"`
 
-	eventMeta event.Meta
+	event.IsEvent
 }
 
-func (e *LinkSet) EventMeta() event.Meta {
-	if e == nil {
-		return event.Meta{}
-	}
-	return e.eventMeta
-}
-func (e *LinkSet) SetEventMeta(m event.Meta) {
-	if e != nil {
-		e.eventMeta = m
-	}
-}
 func (e *LinkSet) MarshalBinary() (text []byte, err error) {
 	return json.Marshal(e)
 }
@@ -93,20 +60,9 @@ var _ event.Event = (*LinkSet)(nil)
 type LinkDeleted struct {
 	Rel string `json:"rel"`
 
-	eventMeta event.Meta
+	event.IsEvent
 }
 
-func (e *LinkDeleted) EventMeta() event.Meta {
-	if e == nil {
-		return event.Meta{}
-	}
-	return e.eventMeta
-}
-func (e *LinkDeleted) SetEventMeta(m event.Meta) {
-	if e != nil {
-		e.eventMeta = m
-	}
-}
 func (e *LinkDeleted) MarshalBinary() (text []byte, err error) {
 	return json.Marshal(e)
 }