Update codeberg.org/gruf libraries and fix go-store issue (#347)

* update codeberg.org/gruf/ libraries

Signed-off-by: kim <grufwub@gmail.com>

* another update

Signed-off-by: kim <grufwub@gmail.com>

2 files changed, 81 insertions, 24 deletions

diff --git a/vendor/codeberg.org/gruf/go-store/kv/state.go b/vendor/codeberg.org/gruf/go-store/kv/state.go
index a8c1b9c82..20a3e951d 100644
--- a/vendor/codeberg.org/gruf/go-store/kv/state.go
+++ b/vendor/codeberg.org/gruf/go-store/kv/state.go
@@ -2,6 +2,7 @@ package kv
 
 import (
 	"io"
+	"sync"
 
 	"codeberg.org/gruf/go-errors"
 )
@@ -15,9 +16,14 @@ var ErrStateClosed = errors.New("store/kv: state closed")
 // then the state has zero guarantees
 type StateRO struct {
 	store *KVStore
+	mutex sync.RWMutex
 }
 
 func (st *StateRO) Get(key string) ([]byte, error) {
+	// Get state read lock
+	st.mutex.RLock()
+	defer st.mutex.RUnlock()
+
 	// Check not closed
 	if st.store == nil {
 		return nil, ErrStateClosed
@@ -28,6 +34,10 @@ func (st *StateRO) Get(key string) ([]byte, error) {
 }
 
 func (st *StateRO) GetStream(key string) (io.ReadCloser, error) {
+	// Get state read lock
+	st.mutex.RLock()
+	defer st.mutex.RUnlock()
+
 	// Check not closed
 	if st.store == nil {
 		return nil, ErrStateClosed
@@ -38,6 +48,10 @@ func (st *StateRO) GetStream(key string) (io.ReadCloser, error) {
 }
 
 func (st *StateRO) Has(key string) (bool, error) {
+	// Get state read lock
+	st.mutex.RLock()
+	defer st.mutex.RUnlock()
+
 	// Check not closed
 	if st.store == nil {
 		return false, ErrStateClosed
@@ -47,8 +61,16 @@ func (st *StateRO) Has(key string) (bool, error) {
 	return st.store.has(key)
 }
 
-func (st *StateRO) close() {
-	st.store = nil
+func (st *StateRO) Release() {
+	// Get state write lock
+	st.mutex.Lock()
+	defer st.mutex.Unlock()
+
+	// Release the store
+	if st.store != nil {
+		st.store.mutex.RUnlock()
+		st.store = nil
+	}
 }
 
 // StateRW provides a read-write window to the store. While this
@@ -58,9 +80,14 @@ func (st *StateRO) close() {
 // then the state has zero guarantees
 type StateRW struct {
 	store *KVStore
+	mutex sync.RWMutex
 }
 
 func (st *StateRW) Get(key string) ([]byte, error) {
+	// Get state read lock
+	st.mutex.RLock()
+	defer st.mutex.RUnlock()
+
 	// Check not closed
 	if st.store == nil {
 		return nil, ErrStateClosed
@@ -71,6 +98,10 @@ func (st *StateRW) Get(key string) ([]byte, error) {
 }
 
 func (st *StateRW) GetStream(key string) (io.ReadCloser, error) {
+	// Get state read lock
+	st.mutex.RLock()
+	defer st.mutex.RUnlock()
+
 	// Check not closed
 	if st.store == nil {
 		return nil, ErrStateClosed
@@ -81,6 +112,10 @@ func (st *StateRW) GetStream(key string) (io.ReadCloser, error) {
 }
 
 func (st *StateRW) Put(key string, value []byte) error {
+	// Get state read lock
+	st.mutex.RLock()
+	defer st.mutex.RUnlock()
+
 	// Check not closed
 	if st.store == nil {
 		return ErrStateClosed
@@ -91,6 +126,10 @@ func (st *StateRW) Put(key string, value []byte) error {
 }
 
 func (st *StateRW) PutStream(key string, r io.Reader) error {
+	// Get state read lock
+	st.mutex.RLock()
+	defer st.mutex.RUnlock()
+
 	// Check not closed
 	if st.store == nil {
 		return ErrStateClosed
@@ -101,6 +140,10 @@ func (st *StateRW) PutStream(key string, r io.Reader) error {
 }
 
 func (st *StateRW) Has(key string) (bool, error) {
+	// Get state read lock
+	st.mutex.RLock()
+	defer st.mutex.RUnlock()
+
 	// Check not closed
 	if st.store == nil {
 		return false, ErrStateClosed
@@ -111,6 +154,10 @@ func (st *StateRW) Has(key string) (bool, error) {
 }
 
 func (st *StateRW) Delete(key string) error {
+	// Get state read lock
+	st.mutex.RLock()
+	defer st.mutex.RUnlock()
+
 	// Check not closed
 	if st.store == nil {
 		return ErrStateClosed
@@ -120,6 +167,14 @@ func (st *StateRW) Delete(key string) error {
 	return st.store.delete(key)
 }
 
-func (st *StateRW) close() {
-	st.store = nil
+func (st *StateRW) Release() {
+	// Get state write lock
+	st.mutex.Lock()
+	defer st.mutex.Unlock()
+
+	// Release the store
+	if st.store != nil {
+		st.store.mutex.Unlock()
+		st.store = nil
+	}
 }
diff --git a/vendor/codeberg.org/gruf/go-store/kv/store.go b/vendor/codeberg.org/gruf/go-store/kv/store.go
index 148e3f33d..34fe91987 100644
--- a/vendor/codeberg.org/gruf/go-store/kv/store.go
+++ b/vendor/codeberg.org/gruf/go-store/kv/store.go
@@ -212,32 +212,34 @@ func (st *KVStore) Iterator(matchFn func(string) bool) (*KVIterator, error) {
 	}, nil
 }
 
-// Read provides a read-only window to the store, holding it in a read-locked state until
-// the supplied function returns
-func (st *KVStore) Read(do func(*StateRO)) {
-	// Get store read lock
+// Read provides a read-only window to the store, holding it in a read-locked state until release
+func (st *KVStore) Read() *StateRO {
 	st.mutex.RLock()
-	defer st.mutex.RUnlock()
+	return &StateRO{store: st}
+}
 
-	// Create new store state (defer close)
-	state := &StateRO{store: st}
-	defer state.close()
+// ReadFn provides a read-only window to the store, holding it in a read-locked state until fn return.
+func (st *KVStore) ReadFn(fn func(*StateRO)) {
+	// Acquire read-only state
+	state := st.Read()
+	defer state.Release()
 
-	// Pass state
-	do(state)
+	// Pass to fn
+	fn(state)
 }
 
-// Update provides a read-write window to the store, holding it in a read-write-locked state
-// until the supplied functions returns
-func (st *KVStore) Update(do func(*StateRW)) {
-	// Get store lock
+// Update provides a read-write window to the store, holding it in a write-locked state until release
+func (st *KVStore) Update() *StateRW {
 	st.mutex.Lock()
-	defer st.mutex.Unlock()
+	return &StateRW{store: st}
+}
 
-	// Create new store state (defer close)
-	state := &StateRW{store: st}
-	defer state.close()
+// UpdateFn provides a read-write window to the store, holding it in a write-locked state until fn return.
+func (st *KVStore) UpdateFn(fn func(*StateRW)) {
+	// Acquire read-write state
+	state := st.Update()
+	defer state.Release()
 
-	// Pass state
-	do(state)
+	// Pass to fn
+	fn(state)
 }