diff --git a/go.mod b/go.mod
index 8c3011f6a1fee6109fe81eb8e968b0bb548b80b7..a2f047722be1535744ff3cf78ab51a8cc08f4ced 100644
--- a/go.mod
+++ b/go.mod
@@ -59,7 +59,6 @@ require (
gitlab.com/elixxir/bloomfilter v0.0.0-20230322223210-fa84f6842de8 // indirect
gitlab.com/elixxir/comms v0.0.4-0.20230519211512-4a998f4b0938 // indirect
gitlab.com/elixxir/ekv v0.3.1-0.20230504190918-f5e96603c2e0 // indirect
- gitlab.com/elixxir/wasm-utils v0.0.0-20230522231408-a43b2c1481b2 // indirect
gitlab.com/xx_network/comms v0.0.4-0.20230214180029-5387fb85736d // indirect
gitlab.com/xx_network/ring v0.0.3-0.20220902183151-a7d3b15bc981 // indirect
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
diff --git a/go.sum b/go.sum
index e596cd0c8a1470a0cd2488f065f69f95ff262519..c341fcefd3bfdc8377ebd1d1c15473db69be455a 100644
--- a/go.sum
+++ b/go.sum
@@ -405,50 +405,16 @@ github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo=
github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
gitlab.com/elixxir/bloomfilter v0.0.0-20230322223210-fa84f6842de8 h1:uAFCyBkXprQoPkcDDfxXtaMyL5x+xSGrAWzR907xROQ=
gitlab.com/elixxir/bloomfilter v0.0.0-20230322223210-fa84f6842de8/go.mod h1:1X8gRIAPDisS3W6Vtr/ymiUmZMJUIwDV1o5DEOo/pzw=
-gitlab.com/elixxir/client/v4 v4.6.2-0.20230413171204-002612660098 h1:bdwXgEa0i9KpLiKQdhv6MEWAYLt3MsbNuIzFanVpWLY=
-gitlab.com/elixxir/client/v4 v4.6.2-0.20230413171204-002612660098/go.mod h1:G+lN+LvQPGcm5BQnrhnqT1xiRIAzH3OffAM+5oI9SUg=
-gitlab.com/elixxir/client/v4 v4.6.2-0.20230425190953-cd51598e9245 h1:pBwoSYD+BFIr5Wyc+PQhqm+fZGsRSNXCpF0z1cQQzK8=
-gitlab.com/elixxir/client/v4 v4.6.2-0.20230425190953-cd51598e9245/go.mod h1:G+lN+LvQPGcm5BQnrhnqT1xiRIAzH3OffAM+5oI9SUg=
-gitlab.com/elixxir/client/v4 v4.6.2-0.20230511215110-b43e18a47875 h1:u9DlU8xAk0rTvguhWK+6D/MfLHdR+jlDTfGJjiszJDE=
-gitlab.com/elixxir/client/v4 v4.6.2-0.20230511215110-b43e18a47875/go.mod h1:dLKU2zSWrZLk/fomAtt1DFGgpTHQAfPdxdXNp3EtRZU=
-gitlab.com/elixxir/client/v4 v4.6.2-0.20230512234533-17b97e5a36cc h1:f5lwmwejXTerTUjro9d5Ws1mKGD6ChXHMaBMhB3OhgA=
-gitlab.com/elixxir/client/v4 v4.6.2-0.20230512234533-17b97e5a36cc/go.mod h1:dLKU2zSWrZLk/fomAtt1DFGgpTHQAfPdxdXNp3EtRZU=
-gitlab.com/elixxir/client/v4 v4.6.2-0.20230515171506-7294c8dd22fa h1:HCt2CMRWlT19OYQkC2xcU2+Saa1ZcH2y4IQeqg3NcX0=
-gitlab.com/elixxir/client/v4 v4.6.2-0.20230515171506-7294c8dd22fa/go.mod h1:dLKU2zSWrZLk/fomAtt1DFGgpTHQAfPdxdXNp3EtRZU=
-gitlab.com/elixxir/client/v4 v4.6.2-0.20230516202225-832a99a19553 h1:jdEpGIKNmFHMVmqIOnXFUeWObmReM0IOMov4eqD8OY8=
-gitlab.com/elixxir/client/v4 v4.6.2-0.20230516202225-832a99a19553/go.mod h1:dLKU2zSWrZLk/fomAtt1DFGgpTHQAfPdxdXNp3EtRZU=
-gitlab.com/elixxir/client/v4 v4.6.2-0.20230519185423-524554d6cfd1 h1:Uksd5R1Hk3j7RJqWDyanmD8fOQTL2bBfH0/F8vC6ysI=
-gitlab.com/elixxir/client/v4 v4.6.2-0.20230519185423-524554d6cfd1/go.mod h1:dLKU2zSWrZLk/fomAtt1DFGgpTHQAfPdxdXNp3EtRZU=
-gitlab.com/elixxir/client/v4 v4.6.3 h1:oUsm5cn2Vnfqz+xwGYKrqFkPNN3sDAyp00EPGhUIA5E=
-gitlab.com/elixxir/client/v4 v4.6.3/go.mod h1:G+lN+LvQPGcm5BQnrhnqT1xiRIAzH3OffAM+5oI9SUg=
-gitlab.com/elixxir/client/v4 v4.6.4-0.20230519223444-1d981a1d95aa h1:PJylTJ4ol3p3Si9cipFmhhWo0YD4VXMrbHQODJ9ACKE=
-gitlab.com/elixxir/client/v4 v4.6.4-0.20230519223444-1d981a1d95aa/go.mod h1:rDC4sLKgj5kuuiJRp8bD1M7r0mlb0ib7q8q1Euct9/k=
-gitlab.com/elixxir/client/v4 v4.6.4-0.20230522204511-a198ba2e5749 h1:mFhb9/TDAtmvuDtBL70vvQCwg7OGSWcCLxXcqcfG3rQ=
-gitlab.com/elixxir/client/v4 v4.6.4-0.20230522204511-a198ba2e5749/go.mod h1:rDC4sLKgj5kuuiJRp8bD1M7r0mlb0ib7q8q1Euct9/k=
-gitlab.com/elixxir/client/v4 v4.6.4-0.20230522213235-dc7d3feb05b9 h1:/g+OA8nsI0LwY1NgR7WPOAztengA2UqrY7xXZarmwgk=
-gitlab.com/elixxir/client/v4 v4.6.4-0.20230522213235-dc7d3feb05b9/go.mod h1:trGefpFqH2+kx4/uEV+yyiEWpGq3AhRMnuBQDhDQKMM=
-gitlab.com/elixxir/client/v4 v4.6.4-0.20230523165030-737b5db25f0d h1:amrJ1WHTJd9+EArwgoq4XUwHu09hFwxYNtTc3S7W7ew=
-gitlab.com/elixxir/client/v4 v4.6.4-0.20230523165030-737b5db25f0d/go.mod h1:trGefpFqH2+kx4/uEV+yyiEWpGq3AhRMnuBQDhDQKMM=
gitlab.com/elixxir/client/v4 v4.6.4-0.20230523181720-70dea644d559 h1:F1/+kAVnCqsxHeAiX7S0wYDGF0VhfNMEGoZZayyvt2w=
gitlab.com/elixxir/client/v4 v4.6.4-0.20230523181720-70dea644d559/go.mod h1:trGefpFqH2+kx4/uEV+yyiEWpGq3AhRMnuBQDhDQKMM=
-gitlab.com/elixxir/comms v0.0.4-0.20230310205528-f06faa0d2f0b h1:8AVK93UEs/aufoqtFgyMVt9gf0oJ8F4pA60ZvEVvG+s=
-gitlab.com/elixxir/comms v0.0.4-0.20230310205528-f06faa0d2f0b/go.mod h1:z+qW0D9VpY5QKTd7wRlb5SK4kBNqLYsa4DXBcUXue9Q=
gitlab.com/elixxir/comms v0.0.4-0.20230519211512-4a998f4b0938 h1:f27+QUFiGWrprKm+fstOg3ABkYLpWcZi3+8Lf5eDnqY=
gitlab.com/elixxir/comms v0.0.4-0.20230519211512-4a998f4b0938/go.mod h1:z+qW0D9VpY5QKTd7wRlb5SK4kBNqLYsa4DXBcUXue9Q=
-gitlab.com/elixxir/crypto v0.0.7-0.20230413162806-a99ec4bfea32 h1:Had0F7rMPgJJ2BUZoFNgeJq33md9RpV15nvd08Uxdzc=
-gitlab.com/elixxir/crypto v0.0.7-0.20230413162806-a99ec4bfea32/go.mod h1:/SLOlvkYVVJf6IU+vEjMLnS7cjjcoTlPV45g6tv6INc=
-gitlab.com/elixxir/crypto v0.0.7-0.20230519214355-b10a9f95d395 h1:aOoL0oyocmLUbCBXgF52QhtBXvAi+eXM1d0DrDsFkIg=
-gitlab.com/elixxir/crypto v0.0.7-0.20230519214355-b10a9f95d395/go.mod h1:IYInxKr5Q7EH3oNhg1QX1/sTTRNi7L0JkcyfdRegoio=
gitlab.com/elixxir/crypto v0.0.7-0.20230522190154-5cbcf67f4b39 h1:cU8066kdJRH88GUetdoYfT4ATg+uzSyquhHbVcbxw7Q=
gitlab.com/elixxir/crypto v0.0.7-0.20230522190154-5cbcf67f4b39/go.mod h1:IYInxKr5Q7EH3oNhg1QX1/sTTRNi7L0JkcyfdRegoio=
-gitlab.com/elixxir/ekv v0.2.1 h1:dtwbt6KmAXG2Tik5d60iDz2fLhoFBgWwST03p7T+9Is=
-gitlab.com/elixxir/ekv v0.2.1/go.mod h1:USLD7xeDnuZEavygdrgzNEwZXeLQJK/w1a+htpN+JEU=
gitlab.com/elixxir/ekv v0.3.1-0.20230504190918-f5e96603c2e0 h1:4d2vg4Sh3N5mR1ta152cg6ybPWHYqsPtkEyJKaDYGnw=
gitlab.com/elixxir/ekv v0.3.1-0.20230504190918-f5e96603c2e0/go.mod h1:EMaUQrsOxvEPQ0/8V/PSkGqFmEC2axBG/uqY0oW2uJM=
gitlab.com/elixxir/primitives v0.0.3-0.20230214180039-9a25e2d3969c h1:muG8ff95woeVVwQoJHCEclxBFB22lc7EixPylEkYDRU=
gitlab.com/elixxir/primitives v0.0.3-0.20230214180039-9a25e2d3969c/go.mod h1:phun4PLkHJA6wcL4JIhhxZztrmCyJHWPNppBP3DUD2Y=
-gitlab.com/elixxir/wasm-utils v0.0.0-20230519212008-29635852d8c7 h1:3pimSfFr0uy3OhOMM9IHXZBeG2xJX0nor2yph9xx3oM=
-gitlab.com/elixxir/wasm-utils v0.0.0-20230519212008-29635852d8c7/go.mod h1:wB7Vh/7LWUm8wYRBSd+6lxfpk4CnDaHTkLCIVKfL2TA=
gitlab.com/elixxir/wasm-utils v0.0.0-20230522231408-a43b2c1481b2 h1:GQb350yPBkWRkPRgNSVFF0ZZDOAlXWIKQBI/1Ff6biU=
gitlab.com/elixxir/wasm-utils v0.0.0-20230522231408-a43b2c1481b2/go.mod h1:wB7Vh/7LWUm8wYRBSd+6lxfpk4CnDaHTkLCIVKfL2TA=
gitlab.com/xx_network/comms v0.0.4-0.20230214180029-5387fb85736d h1:AZf2h0fxyO1KxhZPP9//jG3Swb2BcuKbxtNXJgooLss=
diff --git a/indexedDb/impl/channels/implementation.go b/indexedDb/impl/channels/implementation.go
index 013d4e9a720f02b14b4efa1bfe3e159f0b277c26..d55033349a60c424e946d6e79f352afc78be7e8d 100644
--- a/indexedDb/impl/channels/implementation.go
+++ b/indexedDb/impl/channels/implementation.go
@@ -500,7 +500,7 @@ func (w *wasmModel) DeleteMessage(messageID message.ID) error {
jww.WARN.Printf("couldn't marshal MessageDeleted: %s, %+v",
messageID, err)
} else {
- go w.cbs.EventUpdate(bindings.MessageDeleted, eventData)
+ go w.eventUpdate(bindings.MessageDeleted, eventData)
}
return nil
}
@@ -517,7 +517,7 @@ func (w *wasmModel) MuteUser(
jww.WARN.Printf("couldn't marshal UserMuted: %s, %+v",
pubKey, err)
} else {
- go w.cbs.EventUpdate(bindings.UserMuted, eventData)
+ go w.eventUpdate(bindings.UserMuted, eventData)
}
}
@@ -533,7 +533,7 @@ func (w *wasmModel) sendReceiveMessageUpdate(uuid uint64, channelID *id.ID,
jww.WARN.Printf("couldn't marshal MessageReceive: %v, %+v",
eventMsg, err)
} else {
- go w.cbs.EventUpdate(bindings.MessageReceived, eventData)
+ go w.eventUpdate(bindings.MessageReceived, eventData)
}
}
diff --git a/wasm/channels.go b/wasm/channels.go
index f7aa105d2b27763cdef1f69126812be92594f67b..a551d637a4e38512a54be92cddfc039e58fcbd4b 100644
--- a/wasm/channels.go
+++ b/wasm/channels.go
@@ -17,8 +17,10 @@ import (
"syscall/js"
"gitlab.com/elixxir/client/v4/bindings"
+ "gitlab.com/elixxir/client/v4/channels"
"gitlab.com/elixxir/wasm-utils/exception"
"gitlab.com/elixxir/wasm-utils/utils"
+ channelsDb "gitlab.com/elixxir/xxdk-wasm/indexedDb/worker/channels"
)
////////////////////////////////////////////////////////////////////////////////
@@ -51,30 +53,28 @@ func newChannelsManagerJS(api *bindings.ChannelsManager) map[string]any {
"GetShareURL": js.FuncOf(cm.GetShareURL),
// Channel Sending Methods and Reports
- "SendGeneric": js.FuncOf(cm.SendGeneric),
- "SendAdminGeneric": js.FuncOf(cm.SendAdminGeneric),
- "SendMessage": js.FuncOf(cm.SendMessage),
- "SendReply": js.FuncOf(cm.SendReply),
- "SendReaction": js.FuncOf(cm.SendReaction),
- "SendSilent": js.FuncOf(cm.SendSilent),
- "DeleteMessage": js.FuncOf(cm.DeleteMessage),
- "PinMessage": js.FuncOf(cm.PinMessage),
- "MuteUser": js.FuncOf(cm.MuteUser),
- "GetIdentity": js.FuncOf(cm.GetIdentity),
- "ExportPrivateIdentity": js.FuncOf(cm.ExportPrivateIdentity),
- "GetStorageTag": js.FuncOf(cm.GetStorageTag),
- "SetNickname": js.FuncOf(cm.SetNickname),
- "DeleteNickname": js.FuncOf(cm.DeleteNickname),
- "GetNickname": js.FuncOf(cm.GetNickname),
- "Muted": js.FuncOf(cm.Muted),
- "GetMutedUsers": js.FuncOf(cm.GetMutedUsers),
- "GetNotificationLevel": js.FuncOf(cm.GetNotificationLevel),
- "SetMobileNotificationsLevel": js.FuncOf(cm.SetMobileNotificationsLevel),
- "IsChannelAdmin": js.FuncOf(cm.IsChannelAdmin),
- "ExportChannelAdminKey": js.FuncOf(cm.ExportChannelAdminKey),
- "VerifyChannelAdminKey": js.FuncOf(cm.VerifyChannelAdminKey),
- "ImportChannelAdminKey": js.FuncOf(cm.ImportChannelAdminKey),
- "DeleteChannelAdminKey": js.FuncOf(cm.DeleteChannelAdminKey),
+ "SendGeneric": js.FuncOf(cm.SendGeneric),
+ "SendAdminGeneric": js.FuncOf(cm.SendAdminGeneric),
+ "SendMessage": js.FuncOf(cm.SendMessage),
+ "SendReply": js.FuncOf(cm.SendReply),
+ "SendReaction": js.FuncOf(cm.SendReaction),
+ "SendSilent": js.FuncOf(cm.SendSilent),
+ "DeleteMessage": js.FuncOf(cm.DeleteMessage),
+ "PinMessage": js.FuncOf(cm.PinMessage),
+ "MuteUser": js.FuncOf(cm.MuteUser),
+ "GetIdentity": js.FuncOf(cm.GetIdentity),
+ "ExportPrivateIdentity": js.FuncOf(cm.ExportPrivateIdentity),
+ "GetStorageTag": js.FuncOf(cm.GetStorageTag),
+ "SetNickname": js.FuncOf(cm.SetNickname),
+ "DeleteNickname": js.FuncOf(cm.DeleteNickname),
+ "GetNickname": js.FuncOf(cm.GetNickname),
+ "Muted": js.FuncOf(cm.Muted),
+ "GetMutedUsers": js.FuncOf(cm.GetMutedUsers),
+ "IsChannelAdmin": js.FuncOf(cm.IsChannelAdmin),
+ "ExportChannelAdminKey": js.FuncOf(cm.ExportChannelAdminKey),
+ "VerifyChannelAdminKey": js.FuncOf(cm.VerifyChannelAdminKey),
+ "ImportChannelAdminKey": js.FuncOf(cm.ImportChannelAdminKey),
+ "DeleteChannelAdminKey": js.FuncOf(cm.DeleteChannelAdminKey),
// Channel Receiving Logic and Callback Registration
"RegisterReceiveHandler": js.FuncOf(cm.RegisterReceiveHandler),
diff --git a/wasm/collective.go b/wasm/collective.go
index 294fda36577133ee6da47e0615583770640b7410..77a8fdd35f3c5d45b57881b4cf895209aaab1a1d 100644
--- a/wasm/collective.go
+++ b/wasm/collective.go
@@ -10,11 +10,11 @@
package wasm
import (
- "gitlab.com/elixxir/wasm-utils/exception"
"syscall/js"
- "gitlab.com/elixxir/client/v4/bindings"
"gitlab.com/elixxir/wasm-utils/exception"
+
+ "gitlab.com/elixxir/client/v4/bindings"
"gitlab.com/elixxir/wasm-utils/utils"
)