MetzNet
/
graphvent
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed event to require parent

gql_cataclysm
noah metz 2023-11-04 18:56:35 -06:00
parent ddb3854d00
commit c773ea2b14
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
event.go
Unescape Escape View File

@ -8,10 +8,10 @@ import (
type EventExt struct { type EventExt struct {
Name string `gv:"name"` Name string `gv:"name"`
State string `gv:"state"` State string `gv:"state"`
Parent *NodeID `gv:"parent"` Parent NodeID `gv:"parent"`
} }
func NewEventExt(parent *NodeID, name string) *EventExt { func NewEventExt(parent NodeID, name string) *EventExt {
return &EventExt{ return &EventExt{
Name: name, Name: name,
State: "init", State: "init",
@ -80,8 +80,8 @@ func (ext *EventExt) Process(ctx *Context, node *Node, source NodeID, signal Sig
var messages Messages = nil var messages Messages = nil
var changes Changes = nil var changes Changes = nil
if signal.Direction() == Up && ext.Parent != nil { if signal.Direction() == Up && ext.Parent != node.ID {
messages = messages.Add(ctx, *ext.Parent, node, nil, signal) messages = messages.Add(ctx, ext.Parent, node, nil, signal)
} }
return messages, changes return messages, changes

11
event_test.go
Unescape Escape View File

@ -1,9 +1,11 @@
package graphvent package graphvent
import ( import (
"reflect" "crypto/ed25519"
"testing" "reflect"
"time" "testing"
"time"
"crypto/rand"
) )
func TestEvent(t *testing.T) { func TestEvent(t *testing.T) {
@ -12,8 +14,9 @@ func TestEvent(t *testing.T) {
fatalErr(t, err) fatalErr(t, err)
event_public, event_private, err := ed25519.GenerateKey(rand.Reader)
event_listener := NewListenerExt(100) event_listener := NewListenerExt(100)
event, err := NewNode(ctx, nil, BaseNodeType, 100, nil, NewEventExt(nil, "Test Event"), &TestEventExt{time.Second}, event_listener) event, err := NewNode(ctx, event_private, BaseNodeType, 100, nil, NewEventExt(KeyID(event_public), "Test Event"), &TestEventExt{time.Second}, event_listener)
fatalErr(t, err) fatalErr(t, err)
response, signals := testSend(t, ctx, NewEventControlSignal("ready?"), event, event) response, signals := testSend(t, ctx, NewEventControlSignal("ready?"), event, event)

4
listener.go
Unescape Escape View File

@ -29,8 +29,8 @@ func (listener *ListenerExt) Type() ExtType {
// Send the signal to the channel, logging an overflow if it occurs // Send the signal to the channel, logging an overflow if it occurs
func (ext *ListenerExt) Process(ctx *Context, node *Node, source NodeID, signal Signal) (Messages, Changes) { func (ext *ListenerExt) Process(ctx *Context, node *Node, source NodeID, signal Signal) (Messages, Changes) {
ctx.Log.Logf("listener", "LISTENER_PROCESS: %s - %+v", node.ID, reflect.TypeOf(signal)) ctx.Log.Logf("listener", "%s - %+v", node.ID, reflect.TypeOf(signal))
ctx.Log.Logf("listener_debug", "LISTENER_DETAIL %+v", signal) ctx.Log.Logf("listener_debug", "%s->%s - %+v", source, node.ID, signal)
select { select {
case ext.Chan <- signal: case ext.Chan <- signal:
default: default:

6
signal.go
Unescape Escape View File

@ -208,7 +208,7 @@ type SuccessSignal struct {
} }
func (signal SuccessSignal) String() string { func (signal SuccessSignal) String() string {
return fmt.Sprintf("SuccessSignal(%s)", signal.SignalHeader) return fmt.Sprintf("SuccessSignal(%s)", signal.ResponseHeader)
} }
func (signal SuccessSignal) Permission() Tree { func (signal SuccessSignal) Permission() Tree {
@ -229,7 +229,7 @@ type ErrorSignal struct {
Error string Error string
} }
func (signal ErrorSignal) String() string { func (signal ErrorSignal) String() string {
return fmt.Sprintf("ErrorSignal(%s, %s)", signal.SignalHeader, signal.Error) return fmt.Sprintf("ErrorSignal(%s, %s)", signal.ResponseHeader, signal.Error)
} }
func (signal ErrorSignal) Permission() Tree { func (signal ErrorSignal) Permission() Tree {
return Tree{ return Tree{
@ -371,7 +371,7 @@ type ReadResultSignal struct {
} }
func (signal ReadResultSignal) String() string { func (signal ReadResultSignal) String() string {
return fmt.Sprintf("ReadResultSignal(%s, %s, %+v, %+v)", signal.SignalHeader, signal.NodeID, signal.NodeType, signal.Extensions) return fmt.Sprintf("ReadResultSignal(%s, %s, %+v, %+v)", signal.ResponseHeader, signal.NodeID, signal.NodeType, signal.Extensions)
} }
func (signal ReadResultSignal) Permission() Tree { func (signal ReadResultSignal) Permission() Tree {