G findings: mesh-config's and mesh-vault's owner views are followed by the reader (Follow), not adopted: they hear the owner's own views event
Adopt subscribes a seat's event with further parts (<seat>.<event>.>), which never matches the plain views event of an owner; the reader's Follow hears it and asks again on a gap. Also the distribution whole test counts its own two events by subject, as the writer's are said beside them. Builds: design 47 G A-28, A-26, A-30
This commit is contained in:
@@ -18,7 +18,6 @@ import (
|
||||
catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog"
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
stdio "git.novox.be/novox/mesh-sdk/go"
|
||||
"git.novox.be/novox/mesh-sdk/go/views"
|
||||
@@ -49,48 +48,37 @@ var followed = []struct{ Read, Owner, State, Tool string }{
|
||||
}
|
||||
|
||||
// ownerViews are the pictures, by the read name, followed through one views.Reader holding the module's writer (design 47 G
|
||||
// A-28): each follower is adopted, so the reader raises and clears its findings and hears its owner's views event.
|
||||
// A-28): the reader raises and clears the first views' findings and hears each owner's views event, and asks the first view
|
||||
// again on a gap.
|
||||
type ownerViews struct {
|
||||
by map[string]*views.Follower
|
||||
reader *views.Reader
|
||||
}
|
||||
|
||||
// newOwnerViews makes a follower for each state and adopts it; changed is told when any picture changes. findings is the
|
||||
// module's writer, which the reader writes the first views' findings through.
|
||||
// newOwnerViews makes a follower for each state; changed is told when any picture changes. findings is the module's writer,
|
||||
// which the reader writes the first views' findings through.
|
||||
func newOwnerViews(ask func(key string, body any) (json.RawMessage, error), changed func(), findings views.WireWriter) *ownerViews {
|
||||
o := &ownerViews{by: map[string]*views.Follower{}, reader: &views.Reader{Module: Module, Findings: findings, Logf: logf}}
|
||||
o := &ownerViews{by: map[string]*views.Follower{}}
|
||||
o.reader = &views.Reader{Module: Module, Findings: findings, Logf: logf,
|
||||
Changed: func(string, string, json.RawMessage, bool) { changed() }}
|
||||
for _, f := range followed {
|
||||
f := f
|
||||
fol := &views.Follower{Owner: f.Owner, Tool: f.Owner + "." + f.Tool, State: f.State,
|
||||
Ask: func(_ context.Context, after string) (views.Answer, error) {
|
||||
body := map[string]any{"values": true}
|
||||
if after != "" {
|
||||
body["after"] = after
|
||||
}
|
||||
raw, err := ask(f.Owner+"."+f.Tool, body)
|
||||
if err != nil {
|
||||
return views.Answer{}, err
|
||||
}
|
||||
answer, output, ok := unwrapAnswer(raw)
|
||||
if !ok {
|
||||
return views.Answer{}, fmt.Errorf("%s refused: %s", f.Tool, output)
|
||||
}
|
||||
return views.DecodeAnswer(answer)
|
||||
},
|
||||
Changed: func(string, json.RawMessage, bool, time.Time) { changed() }}
|
||||
hear := func(ctx context.Context, body []byte) error {
|
||||
ev, err := views.DecodeEvent(body)
|
||||
fol := o.reader.Follow(f.Owner, f.State, f.Owner+"."+f.Tool)
|
||||
// the owner's ordinary read tool answers wrapped as a tool's answer, or refused with its output
|
||||
fol.Ask = func(_ context.Context, after string) (views.Answer, error) {
|
||||
body := map[string]any{"values": true}
|
||||
if after != "" {
|
||||
body["after"] = after
|
||||
}
|
||||
raw, err := ask(f.Owner+"."+f.Tool, body)
|
||||
if err != nil {
|
||||
return err
|
||||
return views.Answer{}, err
|
||||
}
|
||||
if gap, why := fol.Apply(ev); gap {
|
||||
logf("[mesh-config] a gap in %s's %s (%s): its first view is asked once more", f.Owner, f.State, why)
|
||||
go func() { _ = fol.Start(ctx) }()
|
||||
answer, output, ok := unwrapAnswer(raw)
|
||||
if !ok {
|
||||
return views.Answer{}, fmt.Errorf("%s refused: %s", f.Tool, output)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if err := o.reader.Adopt(fol, f.Owner, views.EventName(f.State), hear); err != nil {
|
||||
logf("[mesh-config] %v", err)
|
||||
return views.DecodeAnswer(answer)
|
||||
}
|
||||
o.by[f.Read] = fol
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@ func TestAFollowedStateIsReadFromItsOwnersFirstViewAndEvents(t *testing.T) {
|
||||
t.Fatalf("before the first view: followed %v, %v", followed, err)
|
||||
}
|
||||
if !o.reader.Follows("mesh-delivery-assigner.wants") {
|
||||
t.Error("the wants view is not one of the reader's (A-28: adopted)")
|
||||
t.Error("the wants view is not one of the reader's (A-28)")
|
||||
}
|
||||
if _, followed, _ := o.get(BuildsRead, "x"); followed {
|
||||
t.Error("the builder's builds is followed, and it has no owner tool")
|
||||
|
||||
Reference in New Issue
Block a user