From 12b9a93202893203dba54da39fc3a5b35be9722d Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sat, 31 Aug 2024 19:21:00 +0300 Subject: [PATCH] electron: fix base64 mode and key order --- pkg/connector/electron.go | 6 +++--- pkg/connector/electron.mjs | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkg/connector/electron.go b/pkg/connector/electron.go index 6d66666..8106823 100644 --- a/pkg/connector/electron.go +++ b/pkg/connector/electron.go @@ -107,9 +107,9 @@ func (gc *GVClient) runElectron(ctx context.Context) { defer responseWaiters.Delete(reqID) defer close(waiter) payload := map[string]string{ - "thread_id": base64.RawStdEncoding.EncodeToString(threadIDHash[:]), - "destinations": base64.RawStdEncoding.EncodeToString(recipientsHash[:]), - "message_ids": base64.RawStdEncoding.EncodeToString(messageIDHash[:]), + "thread_id": base64.StdEncoding.EncodeToString(threadIDHash[:]), + "destinations": base64.StdEncoding.EncodeToString(recipientsHash[:]), + "message_ids": base64.StdEncoding.EncodeToString(messageIDHash[:]), } zerolog.Ctx(ctx).Debug(). Str("req_id", reqID). diff --git a/pkg/connector/electron.mjs b/pkg/connector/electron.mjs index 2ee7536..1536b17 100644 --- a/pkg/connector/electron.mjs +++ b/pkg/connector/electron.mjs @@ -36,8 +36,9 @@ const loadScript = ({script_source, checksum}) => { }) } -const executeScript = ({payload, program, global_name}) => { - console.log("Executing", window.globalName, "with", payload) +const executeScript = ({payload: {message_ids, destinations, thread_id}, program, global_name}) => { + const reorderedPayload = { message_ids, destinations, thread_id } + console.log("Executing", global_name, "with", reorderedPayload) return new Promise((resolve, reject) => { new Promise(resolve => { window[global_name].a(program, (fn1, fn2, fn3, fn4) => { @@ -46,7 +47,7 @@ const executeScript = ({payload, program, global_name}) => { }).then(fns => { fns.fn1(result => { resolve(result) - }, [payload, undefined, undefined, undefined]) + }, [reorderedPayload, undefined, undefined, undefined]) }, reject) }) }