added support for cached roster repository

ortuman · Feb 8, 2022 · 74767c5 · 74767c5
1 parent 6db435c
commit 74767c5
Show file tree

Hide file tree

Showing 21 changed files with 692 additions and 83 deletions.
diff --git a/pkg/model/roster/roster.pb.go b/pkg/model/roster/roster.pb.go
diff --git a/pkg/router/router.go b/pkg/router/router.go
@@ -17,12 +17,11 @@ package router
 import (
 	"context"
 
-	c2smodel "github.com/ortuman/jackal/pkg/model/c2s"
-
 	"github.com/jackal-xmpp/stravaganza/v2"
 	streamerror "github.com/jackal-xmpp/stravaganza/v2/errors/stream"
 	"github.com/jackal-xmpp/stravaganza/v2/jid"
 	"github.com/ortuman/jackal/pkg/host"
+	c2smodel "github.com/ortuman/jackal/pkg/model/c2s"
 	"github.com/ortuman/jackal/pkg/router/stream"
 )
 
@@ -33,10 +32,10 @@ type Router interface {
 	// (https://xmpp.org/rfcs/rfc3921.html#rules)
 	Route(ctx context.Context, stanza stravaganza.Stanza) (targets []jid.JID, err error)
 
-	// C2SRouter returns the underlying C2S router.
+	// C2S returns the underlying C2S router.
 	C2S() C2SRouter
 
-	// S2SRouter returns the underlying S2S router.
+	// S2S returns the underlying S2S router.
 	S2S() S2SRouter
 
 	// Start starts global router subsystem.

diff --git a/pkg/storage/cached/blocklist.go b/pkg/storage/cached/blocklist.go
@@ -55,9 +55,9 @@ type cachedBlockListRep struct {
 
 func (c *cachedBlockListRep) UpsertBlockListItem(ctx context.Context, item *blocklistmodel.Item) error {
 	op := updateOp{
-		c:           c.c,
-		namespace:   blockListNS(item.Username),
-		invalidKeys: []string{blockListItems},
+		c:              c.c,
+		namespace:      blockListNS(item.Username),
+		invalidateKeys: []string{blockListItems},
 		updateFn: func(ctx context.Context) error {
 			return c.rep.UpsertBlockListItem(ctx, item)
 		},
@@ -67,9 +67,9 @@ func (c *cachedBlockListRep) UpsertBlockListItem(ctx context.Context, item *bloc
 
 func (c *cachedBlockListRep) DeleteBlockListItem(ctx context.Context, item *blocklistmodel.Item) error {
 	op := updateOp{
-		c:           c.c,
-		namespace:   blockListNS(item.Username),
-		invalidKeys: []string{blockListItems},
+		c:              c.c,
+		namespace:      blockListNS(item.Username),
+		invalidateKeys: []string{blockListItems},
 		updateFn: func(ctx context.Context) error {
 			return c.rep.DeleteBlockListItem(ctx, item)
 		},

diff --git a/pkg/storage/cached/cached.go b/pkg/storage/cached/cached.go
@@ -1,4 +1,4 @@
-// Copyright 2021 The jackal Authors
+// Copyright 2022 The jackal Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ type Cache interface {
 	// Put stores a value into the cache store.
 	Put(ctx context.Context, ns, key string, val []byte) error
 
-	// Del removes k value from the cache store.
+	// Del removes keys values from the cache store.
 	Del(ctx context.Context, ns string, keys ...string) error
 
 	// DelNS removes all keys contained under a given namespace from the cache store.
@@ -89,7 +89,7 @@ func New(cfg Config, rep repository.Repository, logger kitlog.Logger) (repositor
 		Capabilities: &cachedCapsRep{c: c, rep: rep},
 		Private:      &cachedPrivateRep{c: c, rep: rep},
 		BlockList:    &cachedBlockListRep{c: c, rep: rep},
-		Roster:       rep,
+		Roster:       &cachedRosterRep{c: c, rep: rep},
 		VCard:        &cachedVCardRep{c: c, rep: rep},
 		Offline:      rep,
 		Locker:       rep,