Merge remote-tracking branch 'origin/project/DM' into XX-4324/finale

indexedDb/channels/implementation_test.go

@@ -20,12 +20,14 @@ import (
 	"github.com/hack-pad/go-indexeddb/idb"
 	"gitlab.com/elixxir/xxdk-wasm/indexedDb"
 	"gitlab.com/elixxir/xxdk-wasm/storage"
+	"gitlab.com/xx_network/crypto/csprng"
 	"gitlab.com/xx_network/primitives/netTime"
 
 	jww "github.com/spf13/jwalterweatherman"
 	"gitlab.com/elixxir/client/v4/channels"
 	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	cryptoBroadcast "gitlab.com/elixxir/crypto/broadcast"
+	cryptoChannel "gitlab.com/elixxir/crypto/channel"
 	"gitlab.com/elixxir/crypto/message"
 	"gitlab.com/xx_network/primitives/id"
 )
@@ -39,11 +41,22 @@ func dummyCallback(uint64, *id.ID, bool) {}
 
 // Happy path, insert message and look it up
 func TestWasmModel_msgIDLookup(t *testing.T) {
+	cipher, err := cryptoChannel.NewCipher([]byte("testpass"), []byte("testsalt"), 128, csprng.NewSystemRNG())
+	if err != nil {
+		t.Fatalf("Failed to create cipher")
+	}
+	for _, c := range []cryptoChannel.Cipher{nil, cipher} {
+		cs := ""
+		if cipher != nil {
+			cs = "_withCipher"
+		}
+		t.Run(fmt.Sprintf("TestWasmModel_msgIDLookup%s", cs), func(t *testing.T) {
+
 			storage.GetLocalStorage().Clear()
 			testString := "test"
-	testMsgId := message.DeriveChannelMessageID(&id.ID{1}, 0,
-		[]byte(testString))
-	eventModel, err := newWASMModel(testString, nil, dummyCallback)
+			testMsgId := message.DeriveChannelMessageID(&id.ID{1},
+				0, []byte(testString))
+			eventModel, err := newWASMModel(testString, c, dummyCallback)
 			if err != nil {
 				t.Fatalf("%+v", err)
 			}
@@ -63,15 +76,27 @@ func TestWasmModel_msgIDLookup(t *testing.T) {
 			if uuid == 0 {
 				t.Fatalf("Expected to get a UUID!")
 			}
+		})
+	}
 }
 
 // Test wasmModel.UpdateSentStatus happy path and ensure fields don't change.
 func Test_wasmModel_UpdateSentStatus(t *testing.T) {
+	cipher, err := cryptoChannel.NewCipher([]byte("testpass"), []byte("testsalt"), 128, csprng.NewSystemRNG())
+	if err != nil {
+		t.Fatalf("Failed to create cipher")
+	}
+	for _, c := range []cryptoChannel.Cipher{nil, cipher} {
+		cs := ""
+		if cipher != nil {
+			cs = "_withCipher"
+		}
+		t.Run(fmt.Sprintf("Test_wasmModel_UpdateSentStatus%s", cs), func(t *testing.T) {
 			storage.GetLocalStorage().Clear()
 			testString := "test"
-	testMsgId := message.DeriveChannelMessageID(&id.ID{1}, 0,
-		[]byte(testString))
-	eventModel, err := newWASMModel(testString, nil, dummyCallback)
+			testMsgId := message.DeriveChannelMessageID(&id.ID{1},
+				0, []byte(testString))
+			eventModel, err := newWASMModel(testString, c, dummyCallback)
 			if err != nil {
 				t.Fatalf("%+v", err)
 			}
@@ -120,12 +145,24 @@ func Test_wasmModel_UpdateSentStatus(t *testing.T) {
 			if resultMsg.Nickname != testString {
 				t.Fatalf("Unexpected Nickname: %v", resultMsg.Nickname)
 			}
+		})
+	}
 }
 
 // Smoke test wasmModel.JoinChannel/wasmModel.LeaveChannel happy paths.
 func Test_wasmModel_JoinChannel_LeaveChannel(t *testing.T) {
+	cipher, err := cryptoChannel.NewCipher([]byte("testpass"), []byte("testsalt"), 128, csprng.NewSystemRNG())
+	if err != nil {
+		t.Fatalf("Failed to create cipher")
+	}
+	for _, c := range []cryptoChannel.Cipher{nil, cipher} {
+		cs := ""
+		if cipher != nil {
+			cs = "_withCipher"
+		}
+		t.Run(fmt.Sprintf("Test_wasmModel_JoinChannel_LeaveChannel%s", cs), func(t *testing.T) {
 			storage.GetLocalStorage().Clear()
-	eventModel, err := newWASMModel("test", nil, dummyCallback)
+			eventModel, err := newWASMModel("test", c, dummyCallback)
 			if err != nil {
 				t.Fatalf("%+v", err)
 			}
@@ -159,13 +196,25 @@ func Test_wasmModel_JoinChannel_LeaveChannel(t *testing.T) {
 			if len(results) != 1 {
 				t.Fatalf("Expected 1 channels to exist")
 			}
+		})
+	}
 }
 
 // Test UUID gets returned when different messages are added.
 func Test_wasmModel_UUIDTest(t *testing.T) {
+	cipher, err := cryptoChannel.NewCipher([]byte("testpass"), []byte("testsalt"), 128, csprng.NewSystemRNG())
+	if err != nil {
+		t.Fatalf("Failed to create cipher")
+	}
+	for _, c := range []cryptoChannel.Cipher{nil, cipher} {
+		cs := ""
+		if cipher != nil {
+			cs = "_withCipher"
+		}
+		t.Run(fmt.Sprintf("Test_wasmModel_UUIDTest%s", cs), func(t *testing.T) {
 			storage.GetLocalStorage().Clear()
 			testString := "testHello"
-	eventModel, err := newWASMModel(testString, nil, dummyCallback)
+			eventModel, err := newWASMModel(testString, c, dummyCallback)
 			if err != nil {
 				t.Fatalf("%+v", err)
 			}
@@ -192,13 +241,25 @@ func Test_wasmModel_UUIDTest(t *testing.T) {
 					}
 				}
 			}
+		})
+	}
 }
 
 // Tests if the same message ID being sent always returns the same UUID.
 func Test_wasmModel_DuplicateReceives(t *testing.T) {
+	cipher, err := cryptoChannel.NewCipher([]byte("testpass"), []byte("testsalt"), 128, csprng.NewSystemRNG())
+	if err != nil {
+		t.Fatalf("Failed to create cipher")
+	}
+	for _, c := range []cryptoChannel.Cipher{nil, cipher} {
+		cs := ""
+		if cipher != nil {
+			cs = "_withCipher"
+		}
+		t.Run(fmt.Sprintf("Test_wasmModel_DuplicateReceives%s", cs), func(t *testing.T) {
 			storage.GetLocalStorage().Clear()
 			testString := "testHello"
-	eventModel, err := newWASMModel(testString, nil, dummyCallback)
+			eventModel, err := newWASMModel(testString, c, dummyCallback)
 			if err != nil {
 				t.Fatalf("%+v", err)
 			}
@@ -225,16 +286,29 @@ func Test_wasmModel_DuplicateReceives(t *testing.T) {
 					}
 				}
 			}
+		})
+	}
+
 }
 
 // Happy path: Inserts many messages, deletes some, and checks that the final
 // result is as expected.
 func Test_wasmModel_deleteMsgByChannel(t *testing.T) {
+	cipher, err := cryptoChannel.NewCipher([]byte("testpass"), []byte("testsalt"), 128, csprng.NewSystemRNG())
+	if err != nil {
+		t.Fatalf("Failed to create cipher")
+	}
+	for _, c := range []cryptoChannel.Cipher{nil, cipher} {
+		cs := ""
+		if cipher != nil {
+			cs = "_withCipher"
+		}
+		t.Run(fmt.Sprintf("Test_wasmModel_deleteMsgByChannel%s", cs), func(t *testing.T) {
 			storage.GetLocalStorage().Clear()
 			testString := "test_deleteMsgByChannel"
 			totalMessages := 10
 			expectedMessages := 5
-	eventModel, err := newWASMModel(testString, nil, dummyCallback)
+			eventModel, err := newWASMModel(testString, c, dummyCallback)
 			if err != nil {
 				t.Fatalf("%+v", err)
 			}
@@ -253,7 +327,8 @@ func Test_wasmModel_deleteMsgByChannel(t *testing.T) {
 					thisChannel = keepChannel
 				}
 
-		testMsgId := message.DeriveChannelMessageID(&id.ID{1}, 0, []byte(testStr))
+				testMsgId := message.DeriveChannelMessageID(
+					&id.ID{1}, 0, []byte(testStr))
 				eventModel.ReceiveMessage(thisChannel, testMsgId, testStr, testStr,
 					[]byte{8, 6, 7, 5}, 0, 0, netTime.Now(), time.Second,
 					rounds.Round{ID: id.Round(0)}, 0, channels.Sent)
@@ -282,14 +357,26 @@ func Test_wasmModel_deleteMsgByChannel(t *testing.T) {
 			if len(result) != expectedMessages {
 				t.Errorf("Expected %d messages, got %d", expectedMessages, len(result))
 			}
+		})
+	}
 }
 
 // This test is designed to prove the behavior of unique indexes.
 // Inserts will not fail, they simply will not happen.
 func TestWasmModel_receiveHelper_UniqueIndex(t *testing.T) {
+	cipher, err := cryptoChannel.NewCipher([]byte("testpass"), []byte("testsalt"), 128, csprng.NewSystemRNG())
+	if err != nil {
+		t.Fatalf("Failed to create cipher")
+	}
+	for i, c := range []cryptoChannel.Cipher{nil, cipher} {
+		cs := ""
+		if cipher != nil {
+			cs = "_withCipher"
+		}
+		t.Run(fmt.Sprintf("TestWasmModel_receiveHelper_UniqueIndex%s", cs), func(t *testing.T) {
 			storage.GetLocalStorage().Clear()
-	testString := "test_receiveHelper_UniqueIndex"
-	eventModel, err := newWASMModel(testString, nil, dummyCallback)
+			testString := fmt.Sprintf("test_receiveHelper_UniqueIndex_%d", i)
+			eventModel, err := newWASMModel(testString, c, dummyCallback)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -315,8 +402,8 @@ func TestWasmModel_receiveHelper_UniqueIndex(t *testing.T) {
 			}
 
 			// First message insert should succeed
-	testMsgId := message.DeriveChannelMessageID(&id.ID{1}, 0,
-		[]byte(testString))
+			testMsgId := message.DeriveChannelMessageID(&id.ID{1},
+				0, []byte(testString))
 			testMsg := buildMessage([]byte(testString), testMsgId.Bytes(), nil,
 				testString, []byte(testString), []byte{8, 6, 7, 5}, 0, 0, netTime.Now(),
 				time.Second, 0, 0, channels.Sent)
@@ -339,8 +426,8 @@ func TestWasmModel_receiveHelper_UniqueIndex(t *testing.T) {
 			}
 
 			// Now insert a message with a different message ID from the first
-	testMsgId2 := message.DeriveChannelMessageID(&id.ID{2}, 0,
-		[]byte(testString))
+			testMsgId2 := message.DeriveChannelMessageID(&id.ID{1},
+				0, []byte(testString))
 			testMsg = buildMessage([]byte(testString), testMsgId2.Bytes(), nil,
 				testString, []byte(testString), []byte{8, 6, 7, 5}, 0, 0, netTime.Now(),
 				time.Second, 0, 0, channels.Sent)
@@ -365,4 +452,7 @@ func TestWasmModel_receiveHelper_UniqueIndex(t *testing.T) {
 				t.Fatalf("%+v", err)
 			}
 			// TODO: Convert JSON to Message, ensure Message ID fields differ
+
+		})
+	}
 }

indexedDb/dm/implementation.go

@@ -12,6 +12,7 @@ package channelEventModel
 import (
 	"crypto/ed25519"
 	"encoding/json"
+	"strings"
 	"sync"
 	"syscall/js"
 	"time"
@@ -101,14 +102,16 @@ func (w *wasmModel) Receive(messageID message.ID, nickname string, text []byte,
 	var err error
 
 	// If there is no extant Conversation, create one.
-	if result, err := indexedDb.Get(w.db, conversationStoreName,
-		utils.CopyBytesToJS(pubKey)); err != nil {
-		jww.ERROR.Printf("%+v", errors.WithMessagef(parentErr,
-			"Unable to get Conversation: %+v", err))
-		return 0
-	} else if len(result.String()) == 0 {
+	if _, err := indexedDb.Get(w.db, conversationStoreName, utils.CopyBytesToJS(pubKey)); err != nil {
+		if strings.Contains(err.Error(), indexedDb.ErrDoesNotExist) {
 			err = w.joinConversation(nickname, pubKey, dmToken, codeset)
+			if err != nil {
 				jww.ERROR.Printf("%+v", err)
+			}
+		} else {
+			jww.ERROR.Printf("%+v", errors.WithMessagef(parentErr,
+				"Unable to get Conversation: %+v", err))
+		}
 		return 0
 	} else {
 		jww.DEBUG.Printf("Conversation with %s already joined", nickname)
@@ -141,14 +144,16 @@ func (w *wasmModel) ReceiveText(messageID message.ID, nickname, text string,
 	var err error
 
 	// If there is no extant Conversation, create one.
-	if result, err := indexedDb.Get(w.db, conversationStoreName,
-		utils.CopyBytesToJS(pubKey)); err != nil {
-		jww.ERROR.Printf("%+v", errors.WithMessagef(parentErr,
-			"Unable to get Conversation: %+v", err))
-		return 0
-	} else if len(result.String()) == 0 {
+	if _, err := indexedDb.Get(w.db, conversationStoreName, utils.CopyBytesToJS(pubKey)); err != nil {
+		if strings.Contains(err.Error(), indexedDb.ErrDoesNotExist) {
 			err = w.joinConversation(nickname, pubKey, dmToken, codeset)
+			if err != nil {
 				jww.ERROR.Printf("%+v", err)
+			}
+		} else {
+			jww.ERROR.Printf("%+v", errors.WithMessagef(parentErr,
+				"Unable to get Conversation: %+v", err))
+		}
 		return 0
 	} else {
 		jww.DEBUG.Printf("Conversation with %s already joined", nickname)
@@ -183,14 +188,16 @@ func (w *wasmModel) ReceiveReply(messageID message.ID, reactionTo message.ID,
 	var err error
 
 	// If there is no extant Conversation, create one.
-	if result, err := indexedDb.Get(w.db, conversationStoreName,
-		utils.CopyBytesToJS(pubKey)); err != nil {
-		jww.ERROR.Printf("%+v", errors.WithMessagef(parentErr,
-			"Unable to get Conversation: %+v", err))
-		return 0
-	} else if len(result.String()) == 0 {
+	if _, err := indexedDb.Get(w.db, conversationStoreName, utils.CopyBytesToJS(pubKey)); err != nil {
+		if strings.Contains(err.Error(), indexedDb.ErrDoesNotExist) {
 			err = w.joinConversation(nickname, pubKey, dmToken, codeset)
+			if err != nil {
 				jww.ERROR.Printf("%+v", err)
+			}
+		} else {
+			jww.ERROR.Printf("%+v", errors.WithMessagef(parentErr,
+				"Unable to get Conversation: %+v", err))
+		}
 		return 0
 	} else {
 		jww.DEBUG.Printf("Conversation with %s already joined", nickname)
@@ -225,14 +232,16 @@ func (w *wasmModel) ReceiveReaction(messageID message.ID, reactionTo message.ID,
 	var err error
 
 	// If there is no extant Conversation, create one.
-	if result, err := indexedDb.Get(w.db, conversationStoreName,
-		utils.CopyBytesToJS(pubKey)); err != nil {
-		jww.ERROR.Printf("%+v", errors.WithMessagef(parentErr,
-			"Unable to get Conversation: %+v", err))
-		return 0
-	} else if len(result.String()) == 0 {
+	if _, err := indexedDb.Get(w.db, conversationStoreName, utils.CopyBytesToJS(pubKey)); err != nil {
+		if strings.Contains(err.Error(), indexedDb.ErrDoesNotExist) {
 			err = w.joinConversation(nickname, pubKey, dmToken, codeset)
+			if err != nil {
 				jww.ERROR.Printf("%+v", err)
+			}
+		} else {
+			jww.ERROR.Printf("%+v", errors.WithMessagef(parentErr,
+				"Unable to get Conversation: %+v", err))
+		}
 		return 0
 	} else {
 		jww.DEBUG.Printf("Conversation with %s already joined", nickname)
@@ -260,8 +269,9 @@ func (w *wasmModel) ReceiveReaction(messageID message.ID, reactionTo message.ID,
 	return uuid
 }
 
-func (w *wasmModel) UpdateSentStatus(uuid uint64, messageID message.ID,
-	timestamp time.Time, round rounds.Round, status dm.Status) {
+func (w *wasmModel) UpdateSentStatus(uuid uint64,
+	messageID message.ID, timestamp time.Time, round rounds.Round,
+	status dm.Status) {
 	parentErr := errors.New("failed to UpdateSentStatus")
 
 	// FIXME: this is a bit of race condition without the mux.
@@ -276,15 +286,20 @@ func (w *wasmModel) UpdateSentStatus(uuid uint64, messageID message.ID,
 	// Use the key to get the existing Message
 	currentMsg, err := indexedDb.Get(w.db, messageStoreName, key)
 	if err != nil {
+		jww.ERROR.Printf("%+v", errors.WithMessagef(parentErr,
+			"Unable to get message: %+v", err))
 		return
 	}
 
 	// Extract the existing Message and update the Status
 	newMessage := &Message{}
-	err = json.Unmarshal([]byte(currentMsg.String()), newMessage)
+	err = json.Unmarshal([]byte(utils.JsToJson(currentMsg)), newMessage)
 	if err != nil {
+		jww.ERROR.Printf("%+v", errors.WithMessagef(parentErr,
+			"Could not JSON unmarshal message: %+v", err))
 		return
 	}
+
 	newMessage.Status = uint8(status)
 	if !messageID.Equals(message.ID{}) {
 		newMessage.MessageID = messageID.Bytes()

indexedDb/utils.go

@@ -22,9 +22,13 @@ import (
 	"time"
 )
 
+const (
 	// dbTimeout is the global timeout for operations with the storage
 	// [context.Context].
-const dbTimeout = time.Second
+	dbTimeout = time.Second
+	// ErrDoesNotExist is an error string for got undefined on Get operations.
+	ErrDoesNotExist = "result is undefined"
+)
 
 // NewContext builds a context for indexedDb operations.
 func NewContext() (context.Context, context.CancelFunc) {
@@ -62,8 +66,8 @@ func Get(db *idb.Database, objectStoreName string, key js.Value) (js.Value, erro
 		return js.Undefined(), errors.WithMessagef(parentErr,
 			"Unable to get from ObjectStore: %+v", err)
 	} else if resultObj.IsUndefined() {
-		return js.Undefined(), errors.WithMessage(parentErr,
-			"Unable to get from ObjectStore: result is undefined")
+		return js.Undefined(), errors.WithMessagef(parentErr,
+			"Unable to get from ObjectStore: %s", ErrDoesNotExist)
 	}
 
 	// Process result into string
@@ -111,8 +115,8 @@ func GetIndex(db *idb.Database, objectStoreName string,
 		return js.Undefined(), errors.WithMessagef(parentErr,
 			"Unable to get from ObjectStore: %+v", err)
 	} else if resultObj.IsUndefined() {
-		return js.Undefined(), errors.WithMessage(parentErr,
-			"Unable to get from ObjectStore: result is undefined")
+		return js.Undefined(), errors.WithMessagef(parentErr,
+			"Unable to get from ObjectStore: %s", ErrDoesNotExist)
 	}
 
 	// Process result into string