feat(backend): implement backend for variants

seed-hypermedia · Dec 1, 2023 · 41a4b09 · 41a4b09
1 parent 3f93778
commit 41a4b09
Show file tree

Hide file tree

Showing 63 changed files with 1,272 additions and 895 deletions.
diff --git a/backend/cmd/mintter-site/sites/daemon.go b/backend/cmd/mintter-site/sites/daemon.go
@@ -11,9 +11,9 @@ import (
 	accounts "mintter/backend/genproto/accounts/v1alpha"
 	"mintter/backend/hyper"
 	"mintter/backend/mttnet"
+	"mintter/backend/pkg/colx"
 	"mintter/backend/pkg/future"
 	"mintter/backend/pkg/libp2px"
-	"mintter/backend/pkg/slicex"
 	"net/url"
 
 	"crawshaw.io/sqlite/sqlitex"
@@ -44,7 +44,7 @@ func Load(ctx context.Context, address string, cfg config.Config, dir *storage.D
 		return nil, fmt.Errorf("address URL must not have a path: %s", address)
 	}
 
-	cfg.P2P.AnnounceAddrs, err = slicex.MapE(libp2px.DefaultListenAddrsDNS(u.Hostname(), cfg.P2P.Port), multiaddr.NewMultiaddr)
+	cfg.P2P.AnnounceAddrs, err = colx.SliceMapErr(libp2px.DefaultListenAddrsDNS(u.Hostname(), cfg.P2P.Port), multiaddr.NewMultiaddr)
 	if err != nil {
 		panic(fmt.Errorf("failed to parse announce addresses: %w", err))
 	}

diff --git a/backend/cmd/mintter-site/sites/sites.go b/backend/cmd/mintter-site/sites/sites.go
@@ -13,8 +13,8 @@ import (
 	"mintter/backend/hyper"
 	"mintter/backend/hyper/hypersql"
 	"mintter/backend/mttnet"
+	"mintter/backend/pkg/colx"
 	"mintter/backend/pkg/future"
-	"mintter/backend/pkg/slicex"
 	"net/http"
 	"sync"
 
@@ -137,7 +137,7 @@ func (ws *Website) GetSiteInfo(ctx context.Context, in *groups.GetSiteInfoReques
 		PeerInfo: &groups.PeerInfo{
 			PeerId:    ai.ID.String(),
 			AccountId: n.ID().Account().Principal().String(),
-			Addrs:     slicex.Map(ai.Addrs, multiaddr.Multiaddr.String),
+			Addrs:     colx.SliceMap(ai.Addrs, multiaddr.Multiaddr.String),
 		},
 		GroupId: groupID,
 	}

diff --git a/backend/crdt2/map.go b/backend/crdt2/map.go
@@ -2,10 +2,10 @@ package crdt2
 
 import (
 	"math"
-	"mintter/backend/pkg/maps"
 	"sort"
 
 	"github.com/tidwall/btree"
+	"golang.org/x/exp/maps"
 )
 
 type Map struct {

diff --git a/backend/daemon/api/accounts/v1alpha/accounts.go b/backend/daemon/api/accounts/v1alpha/accounts.go
@@ -282,7 +282,7 @@ func (srv *Server) ListAccounts(ctx context.Context, in *accounts.ListAccountsRe
 		return nil, err
 	}
 
-	entities, err := srv.blobs.ListEntities(ctx, "hm://a/")
+	entities, err := srv.blobs.ListEntities(ctx, "hm://a/*")
 	if err != nil {
 		return nil, err
 	}

diff --git a/backend/daemon/api/daemon/v1alpha/daemon.go b/backend/daemon/api/daemon/v1alpha/daemon.go
@@ -127,7 +127,7 @@ func Register(ctx context.Context, bs *hyper.Storage, account core.KeyPair, devi
 	}
 
 	if err = bs.SetAccountTrust(ctx, account.Principal()); err != nil {
-		return blob.CID, fmt.Errorf("Could not set own account to trusted: " + err.Error())
+		return blob.CID, fmt.Errorf("could not set own account to trusted: " + err.Error())
 	}
 	return blob.CID, nil
 }

diff --git a/backend/daemon/api/documents/v1alpha/document_model.go b/backend/daemon/api/documents/v1alpha/document_model.go
@@ -8,7 +8,7 @@ import (
 	documents "mintter/backend/genproto/documents/v1alpha"
 	"mintter/backend/hlc"
 	"mintter/backend/hyper"
-	"mintter/backend/pkg/maputil"
+	"mintter/backend/pkg/colx"
 	"sort"
 	"strings"
 	"time"
@@ -225,7 +225,7 @@ func (dm *docModel) ReplaceBlock(blk *documents.Block) error {
 		return err
 	}
 
-	maputil.Set(dm.patch, []string{"blocks", blk.Id, "#map"}, v)
+	colx.ObjectSet(dm.patch, []string{"blocks", blk.Id, "#map"}, v)
 
 	return nil
 }
@@ -336,7 +336,7 @@ func (dm *docModel) cleanupPatch() {
 	for blk := range dm.deletedBlocks {
 		_, mustIgnore := dm.createdBlocks[blk]
 		if mustIgnore {
-			maputil.Delete(dm.patch, []string{"blocks", blk})
+			colx.ObjectDelete(dm.patch, []string{"blocks", blk})
 			continue
 		}
 

diff --git a/backend/daemon/api/documents/v1alpha/documents.go b/backend/daemon/api/documents/v1alpha/documents.go
@@ -239,7 +239,7 @@ func (api *Server) GetDraft(ctx context.Context, in *documents.GetDraftRequest)
 
 // ListDrafts implements the corresponding gRPC method.
 func (api *Server) ListDrafts(ctx context.Context, in *documents.ListDraftsRequest) (*documents.ListDraftsResponse, error) {
-	entities, err := api.blobs.ListEntities(ctx, "hm://d/")
+	entities, err := api.blobs.ListEntities(ctx, "hm://d/*")
 	if err != nil {
 		return nil, err
 	}
@@ -344,7 +344,7 @@ func (api *Server) GetPublication(ctx context.Context, in *documents.GetPublicat
 	eid := hyper.EntityID(in.DocumentId)
 	version := hyper.Version(in.Version)
 
-	pub, err := api.loadPublication(ctx, eid, version, in.TrustedOnly)
+	pub, err := api.loadPublication(ctx, eid, version)
 	if err == nil {
 		return pub, nil
 	}
@@ -376,10 +376,10 @@ func (api *Server) GetPublication(ctx context.Context, in *documents.GetPublicat
 		return nil, status.Errorf(codes.NotFound, "failed to discover object %q at version %q: %s", eid, version, err.Error())
 	}
 
-	return api.loadPublication(ctx, eid, version, in.TrustedOnly)
+	return api.loadPublication(ctx, eid, version)
 }
 
-func (api *Server) loadPublication(ctx context.Context, docid hyper.EntityID, version hyper.Version, trustedOnly bool) (docpb *documents.Publication, err error) {
+func (api *Server) loadPublication(ctx context.Context, docid hyper.EntityID, version hyper.Version) (docpb *documents.Publication, err error) {
 	var entity *hyper.Entity
 	if version != "" {
 		heads, err := hyper.Version(version).Parse()
@@ -392,11 +392,7 @@ func (api *Server) loadPublication(ctx context.Context, docid hyper.EntityID, ve
 			return nil, err
 		}
 	} else {
-		if trustedOnly {
-			entity, err = api.blobs.LoadTrustedEntity(ctx, docid)
-		} else {
-			entity, err = api.blobs.LoadEntity(ctx, docid)
-		}
+		entity, err = api.blobs.LoadEntity(ctx, docid)
 		if err != nil {
 			return nil, err
 		}
@@ -449,21 +445,33 @@ func (api *Server) DeletePublication(ctx context.Context, in *documents.DeletePu
 
 // ListPublications implements the corresponding gRPC method.
 func (api *Server) ListPublications(ctx context.Context, in *documents.ListPublicationsRequest) (*documents.ListPublicationsResponse, error) {
-	entities, err := api.blobs.ListEntities(ctx, "hm://d/")
-	if err != nil {
-		return nil, err
+	var (
+		entities []hyper.EntityID
+		err      error
+	)
+	if in.TrustedOnly {
+		entities, err = api.blobs.ListTrustedEntities(ctx, "hm://d/*")
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		entities, err = api.blobs.ListEntities(ctx, "hm://d/*")
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	resp := &documents.ListPublicationsResponse{
 		Publications: make([]*documents.Publication, 0, len(entities)),
 	}
 
+	// TODO(burdiyan): this is very inefficient. Index the attributes necessary for listing,
+	// and use the database without loading the changes from disk all the time one by one.
 	for _, e := range entities {
 		docid := string(e)
 		pub, err := api.GetPublication(ctx, &documents.GetPublicationRequest{
-			DocumentId:  docid,
-			LocalOnly:   true,
-			TrustedOnly: in.TrustedOnly,
+			DocumentId: docid,
+			LocalOnly:  true,
 		})
 		if err != nil {
 			continue

diff --git a/backend/daemon/api/documents/v1alpha/documents_bugs_test.go b/backend/daemon/api/documents/v1alpha/documents_bugs_test.go
@@ -83,10 +83,6 @@ func TestBug_DraftsInTrustedPublicationList(t *testing.T) {
 	require.Error(t, err, "must fail asking for doc ID that only has a draft")
 	require.Nil(t, pub)
 
-	pub, err = api.GetPublication(ctx, &documents.GetPublicationRequest{DocumentId: draft.Id, TrustedOnly: true})
-	require.Error(t, err, "must fail asking for doc ID that only has a draft when requested trusted version")
-	require.Nil(t, pub)
-
 	pubs, err := api.ListPublications(ctx, &documents.ListPublicationsRequest{TrustedOnly: false})
 	require.NoError(t, err)
 	require.Len(t, pubs.Publications, 0, "must have no publications")