From 98e7f6ba7b9d847732745d005aceb725e4fde324 Mon Sep 17 00:00:00 2001
From: Jono Wenger <jono@elixxir.io>
Date: Thu, 18 Aug 2022 12:34:32 -0700
Subject: [PATCH] Fix method of calling callbacks from Javascript
---
wasm/backup.go | 4 ++--
wasm/broadcast.go | 3 ++-
wasm/connect.go | 2 +-
wasm/delivery.go | 2 +-
wasm/e2e.go | 15 ++++++---------
wasm/e2eHandler.go | 4 ++--
wasm/fileTransfer.go | 8 ++++----
wasm/follow.go | 5 +++--
wasm/group.go | 4 ++--
wasm/restlikeSingle.go | 2 +-
wasm/single.go | 4 ++--
wasm/ud.go | 8 ++++----
wasm/utils.go | 8 ++++++++
13 files changed, 38 insertions(+), 31 deletions(-)
diff --git a/wasm/backup.go b/wasm/backup.go
index 94ebaad4..7b1e8081 100644
--- a/wasm/backup.go
+++ b/wasm/backup.go
@@ -101,7 +101,7 @@ func NewCmixFromBackup(_ js.Value, args []js.Value) interface{} {
// - Javascript representation of the Backup object
// - Throws a TypeError if initializing the Backup fails.
func InitializeBackup(_ js.Value, args []js.Value) interface{} {
- cb := &updateBackupFunc{args[3].Get("UpdateBackup").Invoke}
+ cb := &updateBackupFunc{WrapCB(args[3].Call, "UpdateBackup")}
api, err := bindings.InitializeBackup(
args[0].Int(), args[1].Int(), args[2].String(), cb)
if err != nil {
@@ -130,7 +130,7 @@ func InitializeBackup(_ js.Value, args []js.Value) interface{} {
// - Javascript representation of the Backup object
// - Throws a TypeError if initializing the Backup fails.
func ResumeBackup(_ js.Value, args []js.Value) interface{} {
- cb := &updateBackupFunc{args[2].Get("UpdateBackup").Invoke}
+ cb := &updateBackupFunc{WrapCB(args[2].Call, "UpdateBackup")}
api, err := bindings.ResumeBackup(args[0].Int(), args[1].Int(), cb)
if err != nil {
Throw(TypeError, err.Error())
diff --git a/wasm/broadcast.go b/wasm/broadcast.go
index 2efc0251..5e73ba56 100644
--- a/wasm/broadcast.go
+++ b/wasm/broadcast.go
@@ -81,7 +81,8 @@ func (bl *broadcastListener) Callback(payload []byte, err error) {
// Returns:
// - Throws a TypeError if registering the listener fails.
func (c *Channel) Listen(_ js.Value, args []js.Value) interface{} {
- err := c.api.Listen(&broadcastListener{args[0].Invoke}, args[1].Int())
+ err := c.api.Listen(
+ &broadcastListener{WrapCB(args[0].Call, "Callback")}, args[1].Int())
if err != nil {
Throw(TypeError, err.Error())
return nil
diff --git a/wasm/connect.go b/wasm/connect.go
index ea87b216..5c02040a 100644
--- a/wasm/connect.go
+++ b/wasm/connect.go
@@ -137,7 +137,7 @@ func (l *listener) Name() string { return l.name().String() }
// - throws a TypeError is registering the listener fails
func (c *Connection) RegisterListener(_ js.Value, args []js.Value) interface{} {
err := c.api.RegisterListener(args[0].Int(),
- &listener{args[1].Get("Hear").Invoke, args[1].Get("Name").Invoke})
+ &listener{WrapCB(args[1].Call, "Hear"), WrapCB(args[1].Call, "Name")})
if err != nil {
Throw(TypeError, err.Error())
return nil
diff --git a/wasm/delivery.go b/wasm/delivery.go
index 603d6922..56f60a69 100644
--- a/wasm/delivery.go
+++ b/wasm/delivery.go
@@ -49,7 +49,7 @@ func (mdc *messageDeliveryCallback) EventCallback(
// fails
func (c *Cmix) WaitForRoundResult(_ js.Value, args []js.Value) interface{} {
roundList := CopyBytesToGo(args[0])
- mdc := &messageDeliveryCallback{args[1].Get("EventCallback").Invoke}
+ mdc := &messageDeliveryCallback{WrapCB(args[1].Call, "EventCallback")}
err := c.api.WaitForRoundResult(roundList, mdc, args[2].Int())
if err != nil {
diff --git a/wasm/e2e.go b/wasm/e2e.go
index cc28db34..7a57391a 100644
--- a/wasm/e2e.go
+++ b/wasm/e2e.go
@@ -192,19 +192,16 @@ type authCallbacks struct {
func newAuthCallbacks(value js.Value) *authCallbacks {
a := &authCallbacks{}
- request := value.Get("Request")
- if !request.IsUndefined() {
- a.request = request.Invoke
+ if value.Get("Request").Type() != js.TypeFunction {
+ a.request = WrapCB(value.Call, "Request")
}
- confirm := value.Get("Confirm")
- if !confirm.IsUndefined() {
- a.confirm = confirm.Invoke
+ if value.Get("Confirm").Type() != js.TypeFunction {
+ a.confirm = WrapCB(value.Call, "Confirm")
}
- reset := value.Get("Reset")
- if !reset.IsUndefined() {
- a.confirm = reset.Invoke
+ if value.Get("Reset").Type() != js.TypeFunction {
+ a.reset = WrapCB(value.Call, "Reset")
}
return a
diff --git a/wasm/e2eHandler.go b/wasm/e2eHandler.go
index 07d137a0..e59b9c56 100644
--- a/wasm/e2eHandler.go
+++ b/wasm/e2eHandler.go
@@ -201,7 +201,7 @@ func (p *processor) String() string {
// Returns:
// - Throws TypeError if registering the service fails
func (e *E2e) AddService(_ js.Value, args []js.Value) interface{} {
- p := &processor{args[1].Get("Process").Invoke, args[1].Get("String").Invoke}
+ p := &processor{WrapCB(args[1].Call, "Process"), WrapCB(args[1].Call, "String")}
err := e.api.AddService(args[0].String(), p)
if err != nil {
@@ -226,7 +226,7 @@ func (e *E2e) AddService(_ js.Value, args []js.Value) interface{} {
// - Throws TypeError if registering the service fails
func (e *E2e) RegisterListener(_ js.Value, args []js.Value) interface{} {
recipientId := CopyBytesToGo(args[0])
- l := &listener{args[1].Get("Hear").Invoke, args[1].Get("Name").Invoke}
+ l := &listener{WrapCB(args[1].Call, "Hear"), WrapCB(args[1].Call, "Name")}
err := e.api.RegisterListener(recipientId, args[1].Int(), l)
if err != nil {
diff --git a/wasm/fileTransfer.go b/wasm/fileTransfer.go
index d1879a16..4d56a629 100644
--- a/wasm/fileTransfer.go
+++ b/wasm/fileTransfer.go
@@ -97,7 +97,7 @@ func (rpc *fileTransferReceiveProgressCallback) Callback(
// - Javascript representation of the FileTransfer object.
// - Throws a TypeError initialising the file transfer manager fails.
func InitFileTransfer(_ js.Value, args []js.Value) interface{} {
- rfc := &receiveFileCallback{args[1].Get("Callback").Invoke}
+ rfc := &receiveFileCallback{WrapCB(args[1].Call, "Callback")}
e2eFileTransferParamsJson := CopyBytesToGo(args[2])
fileTransferParamsJson := CopyBytesToGo(args[3])
@@ -129,7 +129,7 @@ func (f *FileTransfer) Send(_ js.Value, args []js.Value) interface{} {
payload := CopyBytesToGo(args[0])
recipientID := CopyBytesToGo(args[1])
retry := float32(args[2].Float())
- spc := &fileTransferSentProgressCallback{args[3].Get("Callback").Invoke}
+ spc := &fileTransferSentProgressCallback{WrapCB(args[3].Call, "Callback")}
ftID, err := f.api.Send(payload, recipientID, retry, spc, args[4].String())
if err != nil {
@@ -209,7 +209,7 @@ func (f *FileTransfer) CloseSend(_ js.Value, args []js.Value) interface{} {
func (f *FileTransfer) RegisterSentProgressCallback(
_ js.Value, args []js.Value) interface{} {
tidBytes := CopyBytesToGo(args[0])
- spc := &fileTransferSentProgressCallback{args[1].Get("Callback").Invoke}
+ spc := &fileTransferSentProgressCallback{WrapCB(args[1].Call, "Callback")}
err := f.api.RegisterSentProgressCallback(tidBytes, spc, args[2].String())
if err != nil {
@@ -237,7 +237,7 @@ func (f *FileTransfer) RegisterSentProgressCallback(
func (f *FileTransfer) RegisterReceivedProgressCallback(
_ js.Value, args []js.Value) interface{} {
tidBytes := CopyBytesToGo(args[0])
- rpc := &fileTransferReceiveProgressCallback{args[1].Get("Callback").Invoke}
+ rpc := &fileTransferReceiveProgressCallback{WrapCB(args[1].Call, "Callback")}
err := f.api.RegisterReceivedProgressCallback(
tidBytes, rpc, args[2].String())
diff --git a/wasm/follow.go b/wasm/follow.go
index bd713b14..2eff83b2 100644
--- a/wasm/follow.go
+++ b/wasm/follow.go
@@ -162,7 +162,8 @@ func (nhc *networkHealthCallback) Callback(health bool) { nhc.callback(health) }
// Returns:
// - Returns a registration ID that can be used to unregister (int)
func (c *Cmix) AddHealthCallback(_ js.Value, args []js.Value) interface{} {
- return c.api.AddHealthCallback(&networkHealthCallback{args[0].Invoke})
+ return c.api.AddHealthCallback(
+ &networkHealthCallback{WrapCB(args[0].Call, "Callback")})
}
// RemoveHealthCallback removes a health callback using its registration ID.
@@ -191,6 +192,6 @@ func (ce *clientError) Report(source, message, trace string) {
// - args[0] - Javascript object that has functions that implement the
// [bindings.ClientError] interface
func (c *Cmix) RegisterClientErrorCallback(_ js.Value, args []js.Value) interface{} {
- c.api.RegisterClientErrorCallback(&clientError{args[0].Get("Report").Invoke})
+ c.api.RegisterClientErrorCallback(&clientError{WrapCB(args[0].Call, "Report")})
return nil
}
diff --git a/wasm/group.go b/wasm/group.go
index 4fd74d21..08bfd28e 100644
--- a/wasm/group.go
+++ b/wasm/group.go
@@ -55,9 +55,9 @@ func newGroupChatJS(api *bindings.GroupChat) map[string]interface{} {
// - Javascript representation of the GroupChat object.
// - Throws a TypeError if creating the GroupChat fails.
func NewGroupChat(_ js.Value, args []js.Value) interface{} {
- requestFunc := &groupRequest{args[1].Get("Callback").Invoke}
+ requestFunc := &groupRequest{WrapCB(args[1].Call, "Callback")}
p := &groupChatProcessor{
- args[2].Get("Process").Invoke, args[2].Get("String").Invoke}
+ WrapCB(args[2].Call, "Process"), WrapCB(args[2].Call, "String")}
api, err := bindings.NewGroupChat(args[0].Int(), requestFunc, p)
if err != nil {
diff --git a/wasm/restlikeSingle.go b/wasm/restlikeSingle.go
index e0f1beb5..2fc4f416 100644
--- a/wasm/restlikeSingle.go
+++ b/wasm/restlikeSingle.go
@@ -71,7 +71,7 @@ func AsyncRequestRestLike(_ js.Value, args []js.Value) interface{} {
recipient := CopyBytesToGo(args[1])
request := CopyBytesToGo(args[2])
paramsJSON := CopyBytesToGo(args[3])
- cb := &restlikeCallback{args[4].Get("Callback").Invoke}
+ cb := &restlikeCallback{WrapCB(args[4].Call, "Callback")}
err := bindings.AsyncRequestRestLike(
e2eID, recipient, request, paramsJSON, cb)
diff --git a/wasm/single.go b/wasm/single.go
index 7b664ca4..4684a6b6 100644
--- a/wasm/single.go
+++ b/wasm/single.go
@@ -40,7 +40,7 @@ func TransmitSingleUse(_ js.Value, args []js.Value) interface{} {
tag := args[2].String()
payload := CopyBytesToGo(args[3])
paramsJSON := CopyBytesToGo(args[4])
- responseCB := &singleUseResponse{args[5].Get("Callback").Invoke}
+ responseCB := &singleUseResponse{WrapCB(args[5].Call, "Callback")}
report, err := bindings.TransmitSingleUse(
e2eID, recipient, tag, payload, paramsJSON, responseCB)
@@ -67,7 +67,7 @@ func TransmitSingleUse(_ js.Value, args []js.Value) interface{} {
// function used to stop the listener.
// - Throws a TypeError if listening fails.
func Listen(_ js.Value, args []js.Value) interface{} {
- cb := &singleUseCallback{args[2].Get("Callback").Invoke}
+ cb := &singleUseCallback{WrapCB(args[2].Call, "Callback")}
api, err := bindings.Listen(args[0].Int(), args[1].String(), cb)
if err != nil {
Throw(TypeError, err.Error())
diff --git a/wasm/ud.go b/wasm/ud.go
index 503781e9..9d472705 100644
--- a/wasm/ud.go
+++ b/wasm/ud.go
@@ -97,7 +97,7 @@ func (uns *udNetworkStatus) UdNetworkStatus() int {
// - Throws a TypeError if creating or loading fails.
func NewOrLoadUd(_ js.Value, args []js.Value) interface{} {
e2eID := args[0].Int()
- follower := &udNetworkStatus{args[1].Get("UdNetworkStatus").Invoke}
+ follower := &udNetworkStatus{WrapCB(args[1].Call, "UdNetworkStatus")}
username := args[2].String()
registrationValidationSignature := CopyBytesToGo(args[3])
cert := CopyBytesToGo(args[4])
@@ -147,7 +147,7 @@ func NewOrLoadUd(_ js.Value, args []js.Value) interface{} {
// - Throws a TypeError if getting UD from backup fails.
func NewUdManagerFromBackup(_ js.Value, args []js.Value) interface{} {
e2eID := args[0].Int()
- follower := &udNetworkStatus{args[1].Get("UdNetworkStatus").Invoke}
+ follower := &udNetworkStatus{WrapCB(args[1].Call, "UdNetworkStatus")}
emailFactJson := CopyBytesToGo(args[2])
phoneFactJson := CopyBytesToGo(args[3])
cert := CopyBytesToGo(args[4])
@@ -303,7 +303,7 @@ func (ulc *udLookupCallback) Callback(contactBytes []byte, err error) {
func LookupUD(_ js.Value, args []js.Value) interface{} {
e2eID := args[0].Int()
udContact := CopyBytesToGo(args[1])
- cb := &udLookupCallback{args[2].Get("Callback").Invoke}
+ cb := &udLookupCallback{WrapCB(args[2].Call, "Callback")}
lookupId := CopyBytesToGo(args[3])
singleRequestParamsJSON := CopyBytesToGo(args[4])
@@ -350,7 +350,7 @@ func (usc *udSearchCallback) Callback(contactListJSON []byte, err error) {
func SearchUD(_ js.Value, args []js.Value) interface{} {
e2eID := args[0].Int()
udContact := CopyBytesToGo(args[1])
- cb := &udSearchCallback{args[2].Get("Callback").Invoke}
+ cb := &udSearchCallback{WrapCB(args[2].Call, "Callback")}
factListJSON := CopyBytesToGo(args[3])
singleRequestParamsJSON := CopyBytesToGo(args[4])
diff --git a/wasm/utils.go b/wasm/utils.go
index f0ca3516..163b8b19 100644
--- a/wasm/utils.go
+++ b/wasm/utils.go
@@ -30,6 +30,14 @@ func CopyBytesToJS(src []byte) js.Value {
return dst
}
+// WrapCB wraps a js.Call so that it can be called later with only the arguments
+// and without specifying the function name
+func WrapCB(call func(m string, args ...interface{}) js.Value, m string) func(args ...interface{}) js.Value {
+ return func(args ...interface{}) js.Value {
+ return call(m, args)
+ }
+}
+
// JsonToJS converts a marshalled JSON bytes to a Javascript object.
func JsonToJS(src []byte) js.Value {
var inInterface map[string]interface{}
--
GitLab