diff --git a/indexedDb/impl/dm/implementation.go b/indexedDb/impl/dm/implementation.go index e3677828757499cc7c71ccfbc71ab14bab140e73..197cd51eb678abeb0a3a3c638088f4863c90485e 100644 --- a/indexedDb/impl/dm/implementation.go +++ b/indexedDb/impl/dm/implementation.go @@ -395,7 +395,7 @@ func (w *wasmModel) GetConversation(senderPubKey ed25519.PublicKey) *dm.ModelCon // getConversation is a helper that returns the Conversation with the given senderPubKey. func (w *wasmModel) getConversation(senderPubKey ed25519.PublicKey) (*Conversation, error) { - resultObj, err := impl.Get(w.db, conversationStoreName, utils.CopyBytesToJS(senderPubKey)) + resultObj, err := impl.Get(w.db, conversationStoreName, impl.EncodeBytes(senderPubKey)) if err != nil { return nil, err } diff --git a/indexedDb/impl/utils.go b/indexedDb/impl/utils.go index b76606154ba8337d2dd8d662fc934ba270b43a03..5000b108a4864a92d1335f2852b81b026eaef404 100644 --- a/indexedDb/impl/utils.go +++ b/indexedDb/impl/utils.go @@ -48,7 +48,7 @@ func EncodeBytes(input []byte) js.Value { // Get is a generic helper for getting values from the given [idb.ObjectStore]. // Only usable by primary key. func Get(db *idb.Database, objectStoreName string, key js.Value) (js.Value, error) { - parentErr := errors.Errorf("failed to Get %s/%s", objectStoreName, key) + parentErr := errors.Errorf("failed to Get %s", objectStoreName) // Prepare the Transaction txn, err := db.Transaction(idb.TransactionReadOnly, objectStoreName) @@ -82,8 +82,8 @@ func Get(db *idb.Database, objectStoreName string, key js.Value) (js.Value, erro } // Process result into string - jww.DEBUG.Printf("Got from %s/%s: %s", - objectStoreName, key, utils.JsToJson(resultObj)) + jww.DEBUG.Printf("Got from %s: %s", + objectStoreName, utils.JsToJson(resultObj)) return resultObj, nil } @@ -131,8 +131,8 @@ func GetAll(db *idb.Database, objectStoreName string) ([]js.Value, error) { // [idb.ObjectStore] using the given [idb.Index]. func GetIndex(db *idb.Database, objectStoreName, indexName string, key js.Value) (js.Value, error) { - parentErr := errors.Errorf("failed to GetIndex %s/%s/%s", - objectStoreName, indexName, key) + parentErr := errors.Errorf("failed to GetIndex %s/%s", + objectStoreName, indexName) // Prepare the Transaction txn, err := db.Transaction(idb.TransactionReadOnly, objectStoreName) @@ -171,8 +171,8 @@ func GetIndex(db *idb.Database, objectStoreName, } // Process result into string - jww.DEBUG.Printf("Got from %s/%s/%s: %s", - objectStoreName, indexName, key, utils.JsToJson(resultObj)) + jww.DEBUG.Printf("Got from %s/%s: %s", + objectStoreName, indexName, utils.JsToJson(resultObj)) return resultObj, nil } @@ -210,7 +210,7 @@ func Put(db *idb.Database, objectStoreName string, value js.Value) (js.Value, er // Delete is a generic helper for removing values from the given // [idb.ObjectStore]. Only usable by primary key. func Delete(db *idb.Database, objectStoreName string, key js.Value) error { - parentErr := errors.Errorf("failed to Delete %s/%s", objectStoreName, key) + parentErr := errors.Errorf("failed to Delete %s", objectStoreName) // Prepare the Transaction txn, err := db.Transaction(idb.TransactionReadWrite, objectStoreName) diff --git a/wasm/dm.go b/wasm/dm.go index d243f88b9dc89a17f42dd641e61ea6f293849179..b4b705c624b717ff247cca10549154b9f310c4db 100644 --- a/wasm/dm.go +++ b/wasm/dm.go @@ -113,7 +113,7 @@ func (emb *dmReceiverBuilder) Build(path string) bindings.DMReceiver { func NewDMClient(_ js.Value, args []js.Value) any { privateIdentity := utils.CopyBytesToGo(args[1]) - em := &dmReceiverBuilder{args[2].IsNaN} + em := &dmReceiverBuilder{args[2].Invoke} cm, err := bindings.NewDMClient(args[0].Int(), privateIdentity, em) if err != nil { @@ -473,8 +473,8 @@ func (dmc *DMClient) SetNickname(_ js.Value, args []js.Value) any { // Returns: // - The nickname (string). // - Throws TypeError if the channel has no nickname set. -func (ch *DMClient) GetNickname(_ js.Value, args []js.Value) any { - nickname, err := ch.api.GetNickname() +func (dmc *DMClient) GetNickname(_ js.Value, _ []js.Value) any { + nickname, err := dmc.api.GetNickname() if err != nil { utils.Throw(utils.TypeError, err) return nil @@ -490,7 +490,7 @@ func (ch *DMClient) GetNickname(_ js.Value, args []js.Value) any { // // Returns: // - The storage tag (string). -func (dmc *DMClient) GetDatabaseName(_ js.Value, args []js.Value) any { +func (dmc *DMClient) GetDatabaseName(_ js.Value, _ []js.Value) any { return base64.RawStdEncoding.EncodeToString(dmc.api.GetPublicKey()) + "_speakeasy_dm" }