moon
/
ditto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sign: simplify awaitSignedEvent (remove unnecessary conditional, rearrange error, fix crash)

This commit is contained in:
Alex Gleason 2023-09-02 22:38:55 -05:00
parent 93f06fd342
commit 3c45a4a3aa
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/sign.ts
View File

@ -70,34 +70,26 @@ async function awaitSignedEvent<K extends number = number>(
Sub.close(messageId);
}
const timeout = setTimeout(() => {
close();
throw new HTTPException(408, {
res: c.json({ id: 'ditto.timeout', error: 'Signing timeout' }),
});
}, Time.minutes(1));
const timeout = setTimeout(close, Time.minutes(1));
for await (const event of sub) {
if (event.kind === 24133) {
const decrypted = await decryptAdmin(event.pubkey, event.content);
const decrypted = await decryptAdmin(event.pubkey, event.content);
const result = jsonSchema
.pipe(connectResponseSchema)
.refine((msg) => msg.id === messageId)
.refine((msg) => eventMatchesTemplate(msg.result, template))
.safeParse(decrypted);
const result = jsonSchema
.pipe(connectResponseSchema)
.refine((msg) => msg.id === messageId, 'Message ID mismatch')
.refine((msg) => eventMatchesTemplate(msg.result, template), 'Event template mismatch')
.safeParse(decrypted);
if (result.success) {
close();
clearTimeout(timeout);
return result.data.result as Event<K>;
}
if (result.success) {
close();
clearTimeout(timeout);
return result.data.result as Event<K>;
}
}
// This should never happen.
throw new HTTPException(500, {
res: c.json({ id: 'ditto.sign', error: 'Unable to sign event' }, 500),
throw new HTTPException(408, {
res: c.json({ id: 'ditto.timeout', error: 'Signing timeout' }),
});
}