mirror/ditto
mirror/ditto
1
0
Fork 0
mirror of https://gitlab.com/soapbox-pub/ditto.git synced 2025-12-06 11:29:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sign: refactor the unnecessarily complex awaitSignedEvent function

Browse source
This commit is contained in:
Alex Gleason 2023-09-02 18:56:20 -05:00
parent 61f5acc937
commit c8d6389132
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
1 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/sign.ts
View file

@ -58,7 +58,7 @@ async function signNostrConnect<K extends number = number>(event: EventTemplate<
} }
/** Wait for signed event to be sent through Nostr relay. */ /** Wait for signed event to be sent through Nostr relay. */
function awaitSignedEvent<K extends number = number>( async function awaitSignedEvent<K extends number = number>(
pubkey: string, pubkey: string,
messageId: string, messageId: string,
c: AppContext, c: AppContext,
@ -69,30 +69,29 @@ function awaitSignedEvent<K extends number = number>(
Sub.close(messageId); Sub.close(messageId);
} }
return new Promise((resolve, reject) => { const timeout = setTimeout(() => {
const timeout = setTimeout(() => { close();
close(); throw new HTTPException(408, {
reject( res: c.json({ id: 'ditto.timeout', error: 'Signing timeout' }),
new HTTPException(408, { });
res: c.json({ id: 'ditto.timeout', error: 'Signing timeout' }), }, Time.minutes(1));
}),
);
}, Time.minutes(1));
(async () => { for await (const event of sub) {
for await (const event of sub) { if (event.kind === 24133) {
if (event.kind === 24133) { const decrypted = await decryptAdmin(event.pubkey, event.content);
const decrypted = await decryptAdmin(event.pubkey, event.content); const msg = jsonSchema.pipe(connectResponseSchema).parse(decrypted);
const msg = jsonSchema.pipe(connectResponseSchema).parse(decrypted);
if (msg.id === messageId) { if (msg.id === messageId) {
close(); close();
clearTimeout(timeout); clearTimeout(timeout);
resolve(msg.result as Event<K>); return msg.result as Event<K>;
}
}
} }
})(); }
}
// This should never happen.
throw new HTTPException(500, {
res: c.json({ id: 'ditto.sign', error: 'Unable to sign event' }, 500),
}); });
} }