fix for latest client release

indexedDb/impl/dm/implementation.go

@@ -17,17 +17,17 @@ import (
 	"syscall/js"
 	"time"
 
+	"github.com/hack-pad/go-indexeddb/idb"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
+
 	"gitlab.com/elixxir/client/v4/cmix/rounds"
 	"gitlab.com/elixxir/client/v4/dm"
-	"gitlab.com/elixxir/xxdk-wasm/utils"
-	"gitlab.com/xx_network/primitives/id"
-
-	"github.com/hack-pad/go-indexeddb/idb"
 	cryptoChannel "gitlab.com/elixxir/crypto/channel"
 	"gitlab.com/elixxir/crypto/message"
 	"gitlab.com/elixxir/xxdk-wasm/indexedDb/impl"
+	"gitlab.com/elixxir/xxdk-wasm/utils"
+	"gitlab.com/xx_network/primitives/id"
 )
 
 // wasmModel implements dm.EventModel interface, which uses the channels system
@@ -41,16 +41,15 @@ type wasmModel struct {
 
 // joinConversation is used for joining new conversations.
 func (w *wasmModel) joinConversation(nickname string,
-	pubKey ed25519.PublicKey, dmToken uint32, codeset uint8) error {
+	pubKey ed25519.PublicKey, dmToken uint32) error {
 	parentErr := errors.New("failed to joinConversation")
 
 	// Build object
 	newConvo := Conversation{
-		Pubkey:         pubKey,
-		Nickname:       nickname,
-		Token:          dmToken,
-		CodesetVersion: codeset,
-		Blocked:        false,
+		Pubkey:   pubKey,
+		Nickname: nickname,
+		Token:    dmToken,
+		Blocked:  false,
 	}
 
 	// Convert to jsObject
@@ -81,13 +80,15 @@ func (w *wasmModel) joinConversation(nickname string,
 // message, then you need to set it manually yourself.
 func buildMessage(messageID, parentID, text []byte, pubKey ed25519.PublicKey,
 	timestamp time.Time, round id.Round, mType dm.MessageType,
-	status dm.Status) *Message {
+	codeset uint8, status dm.Status) *Message {
 	return &Message{
 		MessageID:          messageID,
 		ConversationPubKey: pubKey,
 		ParentMessageID:    parentID,
 		Timestamp:          timestamp,
+		SenderPubKey:       pubKey[:],
 		Status:             uint8(status),
+		CodesetVersion:     codeset,
 		Text:               text,
 		Type:               uint16(mType),
 		Round:              uint64(round),
@@ -104,37 +105,41 @@ func (w *wasmModel) Receive(messageID message.ID, nickname string, text []byte,
 	_, err := impl.Get(w.db, conversationStoreName, utils.CopyBytesToJS(pubKey))
 	if err != nil {
 		if strings.Contains(err.Error(), impl.ErrDoesNotExist) {
-			err = w.joinConversation(nickname, pubKey, dmToken, codeset)
+			err = w.joinConversation(nickname, pubKey, dmToken)
 			if err != nil {
-				jww.ERROR.Printf("%+v", err)
+				jww.ERROR.Printf("[DM indexedDB] %+v", err)
+				return 0
 			}
 		} else {
-			jww.ERROR.Printf("%+v", errors.WithMessagef(parentErr,
-				"Unable to get Conversation: %+v", err))
+			jww.ERROR.Printf("[DM indexedDB] %+v", errors.WithMessagef(
+				parentErr, "Unable to get Conversation: %+v", err))
+			return 0
 		}
-		return 0
 	} else {
-		jww.DEBUG.Printf("Conversation with %s already joined", nickname)
+		jww.DEBUG.Printf(
+			"[DM indexedDB] Conversation with %s already joined", nickname)
 	}
 
 	// Handle encryption, if it is present
 	if w.cipher != nil {
 		text, err = w.cipher.Encrypt(text)
 		if err != nil {
-			jww.ERROR.Printf("Failed to encrypt Message: %+v", err)
+			jww.ERROR.Printf(
+				"[DM indexedDB] Failed to encrypt Message: %+v", err)
 			return 0
 		}
 	}
 
 	msgToInsert := buildMessage(messageID.Bytes(), nil, text, pubKey, timestamp,
-		round.ID, mType, status)
+		round.ID, mType, codeset, status)
 	uuid, err := w.receiveHelper(msgToInsert, false)
 	if err != nil {
-		jww.ERROR.Printf("Failed to receive Message: %+v", err)
+		jww.ERROR.Printf("[DM indexedDB] Failed to receive Message: %+v", err)
+		return 0
 	}
 
-	jww.TRACE.Printf("[DM indexedDB] Calling ReceiveMessageCB(%v, %v, f)",
-		uuid, pubKey)
+	jww.TRACE.Printf(
+		"[DM indexedDB] Calling ReceiveMessageCB(%v, %v, f)", uuid, pubKey)
 	go w.receivedMessageCB(uuid, pubKey, false)
 	return uuid
 }
@@ -149,17 +154,20 @@ func (w *wasmModel) ReceiveText(messageID message.ID, nickname, text string,
 	_, err := impl.Get(w.db, conversationStoreName, utils.CopyBytesToJS(pubKey))
 	if err != nil {
 		if strings.Contains(err.Error(), impl.ErrDoesNotExist) {
-			err = w.joinConversation(nickname, pubKey, dmToken, codeset)
+			err = w.joinConversation(nickname, pubKey, dmToken)
 			if err != nil {
-				jww.ERROR.Printf("%+v", err)
+				jww.ERROR.Printf("[DM indexedDB] %+v", err)
+				return 0
 			}
 		} else {
-			jww.ERROR.Printf("%+v", errors.WithMessagef(parentErr,
-				"Unable to get Conversation: %+v", err))
+			jww.ERROR.Printf("[DM indexedDB] %+v", errors.WithMessagef(
+				parentErr, "Unable to get Conversation: %+v", err))
+			return 0
 		}
-		return 0
 	} else {
-		jww.DEBUG.Printf("Conversation with %s already joined", nickname)
+		jww.DEBUG.Printf(
+			"[DM indexedDB] Conversation with %s already joined", nickname)
+		return 0
 	}
 
 	// Handle encryption, if it is present
@@ -167,21 +175,23 @@ func (w *wasmModel) ReceiveText(messageID message.ID, nickname, text string,
 	if w.cipher != nil {
 		textBytes, err = w.cipher.Encrypt(textBytes)
 		if err != nil {
-			jww.ERROR.Printf("Failed to encrypt Message: %+v", err)
+			jww.ERROR.Printf(
+				"[DM indexedDB] Failed to encrypt Message: %+v", err)
 			return 0
 		}
 	}
 
 	msgToInsert := buildMessage(messageID.Bytes(), nil, textBytes,
-		pubKey, timestamp, round.ID, dm.TextType, status)
+		pubKey, timestamp, round.ID, dm.TextType, codeset, status)
 
 	uuid, err := w.receiveHelper(msgToInsert, false)
 	if err != nil {
-		jww.ERROR.Printf("Failed to receive Message: %+v", err)
+		jww.ERROR.Printf("[DM indexedDB] Failed to receive Message: %+v", err)
+		return 0
 	}
 
-	jww.TRACE.Printf("[DM indexedDB] Calling ReceiveMessageCB(%v, %v, f)",
-		uuid, pubKey)
+	jww.TRACE.Printf(
+		"[DM indexedDB] Calling ReceiveMessageCB(%v, %v, f)", uuid, pubKey)
 	go w.receivedMessageCB(uuid, pubKey, false)
 	return uuid
 }
@@ -196,17 +206,19 @@ func (w *wasmModel) ReceiveReply(messageID, reactionTo message.ID, nickname,
 	_, err := impl.Get(w.db, conversationStoreName, utils.CopyBytesToJS(pubKey))
 	if err != nil {
 		if strings.Contains(err.Error(), impl.ErrDoesNotExist) {
-			err = w.joinConversation(nickname, pubKey, dmToken, codeset)
+			err = w.joinConversation(nickname, pubKey, dmToken)
 			if err != nil {
-				jww.ERROR.Printf("%+v", err)
+				jww.ERROR.Printf("[DM indexedDB] %+v", err)
+				return 0
 			}
 		} else {
-			jww.ERROR.Printf("%+v", errors.WithMessagef(parentErr,
-				"Unable to get Conversation: %+v", err))
+			jww.ERROR.Printf("[DM indexedDB] %+v", errors.WithMessagef(
+				parentErr, "Unable to get Conversation: %+v", err))
+			return 0
 		}
-		return 0
 	} else {
-		jww.DEBUG.Printf("Conversation with %s already joined", nickname)
+		jww.DEBUG.Printf("[DM indexedDB] Conversation with %s already joined",
+			nickname)
 	}
 
 	// Handle encryption, if it is present
@@ -214,21 +226,24 @@ func (w *wasmModel) ReceiveReply(messageID, reactionTo message.ID, nickname,
 	if w.cipher != nil {
 		textBytes, err = w.cipher.Encrypt(textBytes)
 		if err != nil {
-			jww.ERROR.Printf("Failed to encrypt Message: %+v", err)
+			jww.ERROR.Printf(
+				"[DM indexedDB] Failed to encrypt Message: %+v", err)
 			return 0
 		}
 	}
 
-	msgToInsert := buildMessage(messageID.Bytes(), reactionTo.Marshal(), textBytes,
-		pubKey, timestamp, round.ID, dm.TextType, status)
+	msgToInsert := buildMessage(messageID.Bytes(), reactionTo.Marshal(),
+		textBytes, pubKey, timestamp, round.ID, dm.TextType, codeset,
+		status)
 
 	uuid, err := w.receiveHelper(msgToInsert, false)
 	if err != nil {
-		jww.ERROR.Printf("Failed to receive Message: %+v", err)
+		jww.ERROR.Printf("[DM indexedDB] Failed to receive Message: %+v", err)
+		return 0
 	}
 
-	jww.TRACE.Printf("[DM indexedDB] Calling ReceiveMessageCB(%v, %v, f)",
-		uuid, pubKey)
+	jww.TRACE.Printf(
+		"[DM indexedDB] Calling ReceiveMessageCB(%v, %v, f)", uuid, pubKey)
 	go w.receivedMessageCB(uuid, pubKey, false)
 	return uuid
 }
@@ -243,17 +258,19 @@ func (w *wasmModel) ReceiveReaction(messageID, _ message.ID, nickname,
 	_, err := impl.Get(w.db, conversationStoreName, utils.CopyBytesToJS(pubKey))
 	if err != nil {
 		if strings.Contains(err.Error(), impl.ErrDoesNotExist) {
-			err = w.joinConversation(nickname, pubKey, dmToken, codeset)
+			err = w.joinConversation(nickname, pubKey, dmToken)
 			if err != nil {
-				jww.ERROR.Printf("%+v", err)
+				jww.ERROR.Printf("[DM indexedDB] %+v", err)
+				return 0
 			}
 		} else {
-			jww.ERROR.Printf("%+v", errors.WithMessagef(parentErr,
-				"Unable to get Conversation: %+v", err))
+			jww.ERROR.Printf("[DM indexedDB] %+v", errors.WithMessagef(
+				parentErr, "Unable to get Conversation: %+v", err))
+			return 0
 		}
-		return 0
 	} else {
-		jww.DEBUG.Printf("Conversation with %s already joined", nickname)
+		jww.DEBUG.Printf(
+			"[DM indexedDB] Conversation with %s already joined", nickname)
 	}
 
 	// Handle encryption, if it is present
@@ -261,17 +278,18 @@ func (w *wasmModel) ReceiveReaction(messageID, _ message.ID, nickname,
 	if w.cipher != nil {
 		textBytes, err = w.cipher.Encrypt(textBytes)
 		if err != nil {
-			jww.ERROR.Printf("Failed to encrypt Message: %+v", err)
+			jww.ERROR.Printf("[DM indexedDB] Failed to encrypt Message: %+v", err)
 			return 0
 		}
 	}
 
-	msgToInsert := buildMessage(messageID.Bytes(), nil, textBytes,
-		pubKey, timestamp, round.ID, dm.ReactionType, status)
+	msgToInsert := buildMessage(messageID.Bytes(), nil, textBytes, pubKey,
+		timestamp, round.ID, dm.ReactionType, codeset, status)
 
 	uuid, err := w.receiveHelper(msgToInsert, false)
 	if err != nil {
-		jww.ERROR.Printf("Failed to receive Message: %+v", err)
+		jww.ERROR.Printf("[DM indexedDB] Failed to receive Message: %+v", err)
+		return 0
 	}
 
 	jww.TRACE.Printf("[DM indexedDB] Calling ReceiveMessageCB(%v, %v, f)",
@@ -289,8 +307,8 @@ func (w *wasmModel) UpdateSentStatus(uuid uint64, messageID message.ID,
 	//        special version of receiveHelper)
 	w.updateMux.Lock()
 	defer w.updateMux.Unlock()
-	jww.TRACE.Printf("[DM indexedDB] UpdateSentStatus(%d, %s, ...)",
-		uuid, messageID)
+	jww.TRACE.Printf(
+		"[DM indexedDB] UpdateSentStatus(%d, %s, ...)", uuid, messageID)
 
 	// Convert messageID to the key generated by json.Marshal
 	key := js.ValueOf(uuid)
@@ -298,7 +316,7 @@ func (w *wasmModel) UpdateSentStatus(uuid uint64, messageID message.ID,
 	// Use the key to get the existing Message
 	currentMsg, err := impl.Get(w.db, messageStoreName, key)
 	if err != nil {
-		jww.ERROR.Printf("%+v", errors.WithMessagef(parentErr,
+		jww.ERROR.Printf("[DM indexedDB] %+v", errors.WithMessagef(parentErr,
 			"Unable to get message: %+v", err))
 		return
 	}
@@ -307,7 +325,7 @@ func (w *wasmModel) UpdateSentStatus(uuid uint64, messageID message.ID,
 	newMessage := &Message{}
 	err = json.Unmarshal([]byte(utils.JsToJson(currentMsg)), newMessage)
 	if err != nil {
-		jww.ERROR.Printf("%+v", errors.WithMessagef(parentErr,
+		jww.ERROR.Printf("[DM indexedDB] %+v", errors.WithMessagef(parentErr,
 			"Could not JSON unmarshal message: %+v", err))
 		return
 	}
@@ -328,7 +346,9 @@ func (w *wasmModel) UpdateSentStatus(uuid uint64, messageID message.ID,
 	// Store the updated Message
 	_, err = w.receiveHelper(newMessage, true)
 	if err != nil {
-		jww.ERROR.Printf("%+v", errors.Wrap(parentErr, err.Error()))
+		jww.ERROR.Printf("[DM indexedDB] %+v",
+			errors.Wrap(parentErr, err.Error()))
+		return
 	}
 
 	jww.TRACE.Printf("[DM indexedDB] Calling ReceiveMessageCB(%v, %v, t)",
@@ -368,12 +388,14 @@ func (w *wasmModel) receiveHelper(
 		copy(msgID[:], newMessage.MessageID)
 		uuid, errLookup := w.msgIDLookup(msgID)
 		if uuid != 0 && errLookup == nil {
+			jww.WARN.Printf("[DM indexedDB] Result undefined, but found"+
+				" duplicate? %d, %s", uuid, msgID)
 			return uuid, nil
 		}
 		return 0, errors.Errorf("uuid lookup failure: %+v", err)
 	}
 	uuid := uint64(result.Int())
-	jww.DEBUG.Printf("Successfully stored message %d", uuid)
+	jww.DEBUG.Printf("[DM indexedDB] Successfully stored message %d", uuid)
 
 	return uuid, nil
 }