Delivery parts: take the essential and optional bucket opens from mesh-sdk (issue 1945)

The open helpers were copied into seven parts; code shared between modules lives in mesh-sdk, so they are mesh-sdk process's now and the parts are pinned at fix/1945-optional-buckets (e0d1de04), moved to its main once it merges, one delivery group with mesh-sdk.
2026-10-25 22:30:22 +01:00
parent 20027e53ff
commit 4628ba26b4
38 changed files with 102 additions and 333 deletions
@@ -22,6 +22,8 @@ import (
 	"syscall"
 	"time"

+	"git.novox.be/novox/mesh-sdk/go/process"
+
 	"github.com/nats-io/nats.go"
 	"github.com/nats-io/nats.go/jetstream"

@@ -188,7 +190,7 @@ func run(ctx context.Context, getenv func(string) string, logOut io.Writer) erro
 	call := callerOn(conn, cred.User)
 	// No forge event is heard while the open pull requests are read and said (ADR 0443 §5): events and syncs take turns.
 	var turn sync.Mutex
-	kv, err := essentialBucket(ctx, js, headsBucket, "keep the heads it wrote on the forge stream")
+	kv, err := process.EssentialBucket(ctx, js, "bridge", headsBucket, "keep the heads it wrote on the forge stream")
 	if err != nil {
 		return err
 	}
@@ -197,7 +199,7 @@ func run(ctx context.Context, getenv func(string) string, logOut io.Writer) erro
 	rec := &recorder{pub: js, heads: heads, logger: logger}
 	said := func(ctx context.Context) error { return syncOpen(ctx, call, rec, heads, &turn, logger) }
 	// What the gate asks of the forge (ADR 0437 §8): its owed acts and its merges, each performed once per revision.
-	performedKV, err := essentialBucket(ctx, js, performedBucket, "perform an act of the gate only once")
+	performedKV, err := process.EssentialBucket(ctx, js, "bridge", performedBucket, "perform an act of the gate only once")
 	if err != nil {
 		return err
 	}
@@ -209,7 +211,7 @@ func run(ctx context.Context, getenv func(string) string, logOut io.Writer) erro
 	}{{delivery.OwedBucket, perf.owed}, {delivery.MergesBucket, perf.merges}} {
 		// The gate's buckets come with the gate and its grant; the bridge does not wait for them (no timer), and is started
 		// again by its delivery when the gate arrives. A bucket refused or not answered is the same (issue 1945).
-		kv := optionalBucket(ctx, js, w.bucket, "nothing of it is performed until the bridge starts again", logger.Printf)
+		kv := process.OptionalBucket(ctx, js, w.bucket, "nothing of it is performed until the bridge starts again", logger.Printf)
 		if kv == nil {
 			continue
 		}
@@ -13,6 +13,8 @@ import (
 	"testing"
 	"time"

+	"git.novox.be/novox/mesh-sdk/go/process"
+
 	"github.com/nats-io/nats.go"
 	"github.com/nats-io/nats.go/jetstream"

@@ -70,10 +72,10 @@ func TestReadableEventIsWrittenOnForgeAndAcked(t *testing.T) { // 1235/AC2 (unit
 	t.Run("1945: a refused bucket is said, or stops the start naming its grant", func(t *testing.T) {
 		refusal := errors.New("nats: permissions violation for publish to $JS.API.STREAM.INFO.KV_x")
 		var said []string
-		if kv := optionalBucket(context.Background(), refusingBus{refusal}, "x", "x is not heard", func(f string, a ...any) { said = append(said, fmt.Sprintf(f, a...)) }); kv != nil || len(said) != 1 || !strings.Contains(said[0], "permissions violation") {
+		if kv := process.OptionalBucket(context.Background(), refusingBus{refusal}, "x", "x is not heard", func(f string, a ...any) { said = append(said, fmt.Sprintf(f, a...)) }); kv != nil || len(said) != 1 || !strings.Contains(said[0], "permissions violation") {
 			t.Errorf("an optional bucket refused: %v, said %v", kv, said)
 		}
-		if _, err := essentialBucket(context.Background(), refusingBus{refusal}, "x", "work"); err == nil || !strings.Contains(err.Error(), "grant of x") {
+		if _, err := process.EssentialBucket(context.Background(), refusingBus{refusal}, "bridge", "x", "work"); err == nil || !strings.Contains(err.Error(), "grant of x") {
 			t.Errorf("an essential bucket refused: %v, want its grant named", err)
 		}
 	})
@@ -1,46 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/nats-io/nats.go/jetstream"
-)
-
-// **A part does not stop for a bucket it can work without** (novox/hq issue 1945, met twice on 2026-10-25: the builder of
-// mesh-delivery #48 exited on a refused read of the gate's source, and its new reasks bucket would have done the same). A
-// grant reaches the bus with a delivery, so a bucket the bus refuses, or times out on, at start is often only not granted
-// yet: exiting for it stops the part until a person's hand. A bucket the bridge cannot do its job at all without still stops
-// the start, naming the grant to look at; every other is said and left. (The same two functions are in each delivery part;
-// they belong in mesh-sdk.)
-
-// bucketOpener is the part of the bus a start opens buckets with.
-type bucketOpener interface {
-	KeyValue(ctx context.Context, bucket string) (jetstream.KeyValue, error)
-}
-
-// essentialBucket opens a bucket the bridge cannot work without; its error names the bucket and the grant.
-func essentialBucket(ctx context.Context, js bucketOpener, name, does string) (jetstream.KeyValue, error) {
-	kv, err := js.KeyValue(ctx, name)
-	if err != nil {
-		return nil, essentialErr(name, does, err)
-	}
-	return kv, nil
-}
-
-// essentialErr is the error of a bucket the part cannot work without: it names the bucket and the grant.
-func essentialErr(name, does string, err error) error {
-	return fmt.Errorf("the bucket %s cannot be read (%v): the bridge cannot %s without it, so it stops; where the bus "+
-		"refused it or did not answer, this module's grant of %s (its manifest's reads or state, issued with its credential) "+
-		"has not reached the bus yet", name, err, does, name)
-}
-
-// optionalBucket opens a bucket the bridge works without: any error is said with what is not heard, and nil answered.
-func optionalBucket(ctx context.Context, js bucketOpener, name, without string, logf func(string, ...any)) jetstream.KeyValue {
-	kv, err := js.KeyValue(ctx, name)
-	if err != nil {
-		logf("the bucket %s cannot be read (%v): %s", name, err, without)
-		return nil
-	}
-	return kv
-}