*Switch to using message id based tracking

This commit is contained in:
Derrick Hammer 2023-04-09 02:27:56 -04:00
parent acade9801f
commit 2832694cd5
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 9 additions and 5 deletions

View File

@ -52,6 +52,7 @@ function idFactory(start = 1) {
const getSwarmId = idFactory(); const getSwarmId = idFactory();
const getSocketId = idFactory(); const getSocketId = idFactory();
const getChannelId = idFactory(); const getChannelId = idFactory();
const getMessageId = idFactory();
addHandler("presentSeed", handlePresentSeed); addHandler("presentSeed", handlePresentSeed);
addHandler("join", handleJoin); addHandler("join", handleJoin);
@ -514,7 +515,7 @@ async function createProtomuxMessage(aq: ActiveQuery) {
const data = aq.callerInput.data; const data = aq.callerInput.data;
const defers: { [action: string]: DeferredPromise<any> } = {}; const defers = new Map<number, DeferredPromise<any>>();
const handleEncoding = (enabled: boolean) => { const handleEncoding = (enabled: boolean) => {
if (!enabled) { if (!enabled) {
@ -522,14 +523,16 @@ async function createProtomuxMessage(aq: ActiveQuery) {
} }
const update = async (action: string, args: any) => { const update = async (action: string, args: any) => {
await defers[action]?.promise; const messageId = getMessageId();
defers[action] = defer(); const d = defer();
defers.set(messageId, d);
aq.sendUpdate({ aq.sendUpdate({
id: messageId,
action, action,
args, args,
}); });
const ret = await defers[action]?.promise; const ret = (await d.promise) as any;
if (ret[1]) { if (ret[1]) {
if (ret[1].buffer) { if (ret[1].buffer) {
args[0].buffer = b4a.from(ret[1].buffer); args[0].buffer = b4a.from(ret[1].buffer);
@ -560,7 +563,8 @@ async function createProtomuxMessage(aq: ActiveQuery) {
message.send(...data.args); message.send(...data.args);
} }
defers[data.action]?.resolve(data.args); defers.get(data.id)?.resolve(data.args);
defers.delete(data.id);
}); });
if (data.onmessage) { if (data.onmessage) {