diff --git a/cover.html b/cover.html
deleted file mode 100644
index 2f076a2..0000000
--- a/cover.html
+++ /dev/null
@@ -1,280 +0,0 @@
-
-
-
-
-
-
-
package storebus
-
-import (
- "context"
- "crypto/sha256"
- "encoding/json"
- "fmt"
- "sync"
-
- "github.com/gopatchy/bus"
- "github.com/gopatchy/jsrest"
- "github.com/gopatchy/metadata"
- "github.com/gopatchy/store"
-)
-
-type StoreBus struct {
- store *store.Store
- bus *bus.Bus
-
- // This lock ensures that no writes interleave with read/subscribe pairs
- orderMu sync.RWMutex
-
- chanMap map[<-chan []any]<-chan any
- chanMapMu sync.Mutex
-}
-
-func NewStoreBus(dbname string) (*StoreBus, error) {
- st, err := store.NewStore(dbname)
- if err != nil {
- return nil, err
- }
-
- return &StoreBus{
- store: st,
- bus: bus.NewBus(),
- chanMap: map[<-chan []any]<-chan any{},
- }, nil
-}
-
-func (sb *StoreBus) Close() {
- sb.store.Close()
-}
-
-func (sb *StoreBus) Write(ctx context.Context, t string, obj any) error {
- sb.orderMu.Lock()
- defer sb.orderMu.Unlock()
-
- if err := UpdateHash(obj); err != nil {
- return jsrest.Errorf(jsrest.ErrInternalServerError, "hash update failed (%w)", err)
- }
-
- if err := sb.store.Write(ctx, t, obj); err != nil {
- return jsrest.Errorf(jsrest.ErrInternalServerError, "write failed (%w)", err)
- }
-
- sb.bus.Announce(t, obj)
-
- return nil
-}
-
-func (sb *StoreBus) Delete(ctx context.Context, t, id string) error {
- sb.orderMu.Lock()
- defer sb.orderMu.Unlock()
-
- if err := sb.store.Delete(ctx, t, id); err != nil {
- return jsrest.Errorf(jsrest.ErrInternalServerError, "delete failed (%w)", err)
- }
-
- sb.bus.Delete(t, id)
-
- return nil
-}
-
-func (sb *StoreBus) Read(ctx context.Context, t, id string, factory func() any) (any, error) {
- return sb.store.Read(ctx, t, id, factory)
-}
-
-func (sb *StoreBus) ReadStream(ctx context.Context, t, id string, factory func() any) (<-chan any, error) {
- sb.orderMu.RLock()
- defer sb.orderMu.RUnlock()
-
- initial, err := sb.store.Read(ctx, t, id, factory)
- if err != nil {
- return nil, jsrest.Errorf(jsrest.ErrInternalServerError, "read failed (%w)", err)
- }
-
- c := sb.bus.SubscribeKey(t, id, initial)
-
- return c, nil
-}
-
-func (sb *StoreBus) CloseReadStream(t, id string, c <-chan any) {
- sb.bus.UnsubscribeKey(t, id, c)
-}
-
-func (sb *StoreBus) List(ctx context.Context, t string, factory func() any) ([]any, error) {
- return sb.store.List(ctx, t, factory)
-}
-
-func (sb *StoreBus) ListStream(ctx context.Context, t string, factory func() any) (<-chan []any, error) {
- sb.orderMu.RLock()
- defer sb.orderMu.RUnlock()
-
- initial, err := sb.store.List(ctx, t, factory)
- if err != nil {
- return nil, jsrest.Errorf(jsrest.ErrInternalServerError, "list failed (%w)", err)
- }
-
- c := sb.bus.SubscribeType(t, initial)
-
- ret := make(chan []any, 100)
-
- sb.registerChan(c, ret)
-
- go func() {
- defer close(ret)
-
- for range c {
- // List() results are always at least (but not exactly) as new as the write that triggered it
- l, err := sb.store.List(ctx, t, factory)
- if err != nil {
- break
- }
-
- select {
- case ret <- l:
- default:
- break
- }
- }
- }()
-
- return ret, nil
-}
-
-func (sb *StoreBus) CloseListStream(t string, c <-chan []any) {
- sb.chanMapMu.Lock()
- defer sb.chanMapMu.Unlock()
-
- sb.bus.UnsubscribeType(t, sb.chanMap[c])
-
- delete(sb.chanMap, c)
-}
-
-func (sb *StoreBus) registerChan(in <-chan any, out <-chan []any) {
- sb.chanMapMu.Lock()
- defer sb.chanMapMu.Unlock()
-
- sb.chanMap[out] = in
-}
-
-func UpdateHash(obj any) error {
- m := *metadata.GetMetadata(obj)
- metadata.ClearMetadata(obj)
-
- defer metadata.SetMetadata(obj, &m)
-
- hash := sha256.New()
- enc := json.NewEncoder(hash)
-
- if err := enc.Encode(obj); err != nil {
- return jsrest.Errorf(jsrest.ErrInternalServerError, "JSON encode failed (%w)", err)
- }
-
- m.ETag = fmt.Sprintf("etag:%x", hash.Sum(nil))
-
- return nil
-}
-
-
-
-
-
-
diff --git a/cover.out b/cover.out
deleted file mode 100644
index bfb7f8f..0000000
--- a/cover.out
+++ /dev/null
@@ -1,34 +0,0 @@
-mode: atomic
-github.com/gopatchy/storebus/storebus.go:27.52,29.16 2 2
-github.com/gopatchy/storebus/storebus.go:29.16,31.3 1 0
-github.com/gopatchy/storebus/storebus.go:33.2,37.8 1 2
-github.com/gopatchy/storebus/storebus.go:40.29,42.2 1 2
-github.com/gopatchy/storebus/storebus.go:44.73,48.40 3 4
-github.com/gopatchy/storebus/storebus.go:48.40,50.3 1 0
-github.com/gopatchy/storebus/storebus.go:52.2,52.52 1 4
-github.com/gopatchy/storebus/storebus.go:52.52,54.3 1 0
-github.com/gopatchy/storebus/storebus.go:56.2,58.12 2 4
-github.com/gopatchy/storebus/storebus.go:61.69,65.52 3 1
-github.com/gopatchy/storebus/storebus.go:65.52,67.3 1 0
-github.com/gopatchy/storebus/storebus.go:69.2,71.12 2 1
-github.com/gopatchy/storebus/storebus.go:74.94,76.2 1 1
-github.com/gopatchy/storebus/storebus.go:78.107,83.16 4 2
-github.com/gopatchy/storebus/storebus.go:83.16,85.3 1 0
-github.com/gopatchy/storebus/storebus.go:87.2,89.15 2 2
-github.com/gopatchy/storebus/storebus.go:92.65,94.2 1 2
-github.com/gopatchy/storebus/storebus.go:96.92,98.2 1 2
-github.com/gopatchy/storebus/storebus.go:100.105,105.16 4 1
-github.com/gopatchy/storebus/storebus.go:105.16,107.3 1 0
-github.com/gopatchy/storebus/storebus.go:109.2,115.12 4 1
-github.com/gopatchy/storebus/storebus.go:115.12,118.15 2 1
-github.com/gopatchy/storebus/storebus.go:118.15,121.18 2 3
-github.com/gopatchy/storebus/storebus.go:121.18,122.10 1 0
-github.com/gopatchy/storebus/storebus.go:125.4,125.11 1 3
-github.com/gopatchy/storebus/storebus.go:126.18,126.18 0 3
-github.com/gopatchy/storebus/storebus.go:127.12,128.10 1 0
-github.com/gopatchy/storebus/storebus.go:133.2,133.17 1 1
-github.com/gopatchy/storebus/storebus.go:136.63,143.2 4 1
-github.com/gopatchy/storebus/storebus.go:145.67,150.2 3 1
-github.com/gopatchy/storebus/storebus.go:152.32,161.40 6 4
-github.com/gopatchy/storebus/storebus.go:161.40,163.3 1 0
-github.com/gopatchy/storebus/storebus.go:165.2,167.12 2 4
diff --git a/go.mod b/go.mod
index 5b8cd3a..b2e9693 100644
--- a/go.mod
+++ b/go.mod
@@ -4,10 +4,10 @@ go 1.19
require (
github.com/dchest/uniuri v1.2.0
- github.com/gopatchy/bus v0.0.0-20230424233749-c395ddbca3df
- github.com/gopatchy/jsrest v0.0.0-20230511133808-abcf8276d1ad
- github.com/gopatchy/metadata v0.0.0-20230424223338-33e58fee42bf
- github.com/gopatchy/store v0.0.0-20230424234123-d35f011d4f0f
+ github.com/gopatchy/bus v0.0.0-20230516044949-c7eca23ba608
+ github.com/gopatchy/jsrest v0.0.0-20230516044950-1c6d15dad16a
+ github.com/gopatchy/metadata v0.0.0-20230516044939-eed23a0903d5
+ github.com/gopatchy/store v0.0.0-20230516045007-b2385cdea3a9
github.com/stretchr/testify v1.8.2
go.uber.org/goleak v1.2.1
)
diff --git a/go.sum b/go.sum
index e9fc68b..bfed177 100644
--- a/go.sum
+++ b/go.sum
@@ -5,14 +5,28 @@ github.com/dchest/uniuri v1.2.0 h1:koIcOUdrTIivZgSLhHQvKgqdWZq5d7KdMEWF1Ud6+5g=
github.com/dchest/uniuri v1.2.0/go.mod h1:fSzm4SLHzNZvWLvWJew423PhAzkpNQYq+uNLq4kxhkY=
github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
-github.com/gopatchy/bus v0.0.0-20230424233749-c395ddbca3df h1:3sBy+B3e+oLPtbk35aHZby412zbtDF2rbiuoS+UQLN4=
-github.com/gopatchy/bus v0.0.0-20230424233749-c395ddbca3df/go.mod h1:Dkr9lxuxCUgZNA6b+ODThSpYoqiMN9Nyz6LOEN5BGxw=
+github.com/gopatchy/bus v0.0.0-20230516041300-8fb78dfa36a3 h1:lMyoE3JWPwrkd6Fh5srO+gWe5GHkukPbfAd32UFpVOA=
+github.com/gopatchy/bus v0.0.0-20230516041300-8fb78dfa36a3/go.mod h1:Dkr9lxuxCUgZNA6b+ODThSpYoqiMN9Nyz6LOEN5BGxw=
+github.com/gopatchy/bus v0.0.0-20230516044819-2912cf0ea53c h1:81CkG7flwK1/sOFKsOuzkaobvrhopUzWJwkvy1dpPdY=
+github.com/gopatchy/bus v0.0.0-20230516044819-2912cf0ea53c/go.mod h1:Lc5GDOZLIp0oTvg0rRC7T6PegRZA3+qzO+6hxzDxutQ=
+github.com/gopatchy/bus v0.0.0-20230516044949-c7eca23ba608 h1:h8wzQOD6Jp0AzBdJJVJdS0mFUTYFrkNSJ22TPxZttG0=
+github.com/gopatchy/bus v0.0.0-20230516044949-c7eca23ba608/go.mod h1:6tafVYwVvUBHnH9thjDDc08De2pTbW5YC9cB5rWoKSs=
github.com/gopatchy/jsrest v0.0.0-20230511133808-abcf8276d1ad h1:UKIRgnQNkQ7qkMDcaWmp+cV4qYieZXtMVrgyVfS89u4=
github.com/gopatchy/jsrest v0.0.0-20230511133808-abcf8276d1ad/go.mod h1:77Kp7hFjygVlnDH48qO917da0gyKNR2XG8mZtaAEL9w=
+github.com/gopatchy/jsrest v0.0.0-20230516044821-deb630cd744b h1:fnoLhs0kk7rc/hdk1vn8lzJ9uiq1ANr3klSUwbze1ys=
+github.com/gopatchy/jsrest v0.0.0-20230516044821-deb630cd744b/go.mod h1:MQBtK0M/Uota4CpW5NbsjDqWuoQyYjS70PJSxWf3nLE=
+github.com/gopatchy/jsrest v0.0.0-20230516044950-1c6d15dad16a h1:ehV4YITvldTIuTMAq7kk0RcrBE7m3WQKFzFl/jOqh7w=
+github.com/gopatchy/jsrest v0.0.0-20230516044950-1c6d15dad16a/go.mod h1:TVfwj+gk7iCGJRrVYR+0ovXhOc90UXPrBCOGPLE8Fsw=
github.com/gopatchy/metadata v0.0.0-20230424223338-33e58fee42bf h1:HKCbhVEpC3++ydeapSJN2DGs9KGWMvOLpcZrwKkrXQs=
github.com/gopatchy/metadata v0.0.0-20230424223338-33e58fee42bf/go.mod h1:VgD33raUShjDePCDBo55aj+eSXFtUEpMzs+Ie39g2zo=
+github.com/gopatchy/metadata v0.0.0-20230516041300-fc49e5f775fe h1:xPnlis/qCAYoxHx9tow1P4pO17c8JH/Hs/lHDmZej/Q=
+github.com/gopatchy/metadata v0.0.0-20230516041300-fc49e5f775fe/go.mod h1:VgD33raUShjDePCDBo55aj+eSXFtUEpMzs+Ie39g2zo=
+github.com/gopatchy/metadata v0.0.0-20230516044939-eed23a0903d5 h1:b66b4DOGTqDuw4hbxHSp0WbhXr/xAMaiFkU6iCi4nDg=
+github.com/gopatchy/metadata v0.0.0-20230516044939-eed23a0903d5/go.mod h1:VgD33raUShjDePCDBo55aj+eSXFtUEpMzs+Ie39g2zo=
github.com/gopatchy/store v0.0.0-20230424234123-d35f011d4f0f h1:YFUPQfPf4dhGJr1cx/LPqTCCBPUep80FtruksX6kEAU=
github.com/gopatchy/store v0.0.0-20230424234123-d35f011d4f0f/go.mod h1:BPofgH+GHFCHnT0mAqd7hH/LTJg76Qqpgm7pOzZfeMA=
+github.com/gopatchy/store v0.0.0-20230516045007-b2385cdea3a9 h1:v2QP2a+3M8eHSs9olyonrunj0xrWhjYXnYqqeRYzRrQ=
+github.com/gopatchy/store v0.0.0-20230516045007-b2385cdea3a9/go.mod h1:+P5l86yQMEhP3uRO0GYSirP9w1/QC1SrJbRuSCyeeMI=
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=