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

Update streaming comments

This commit is contained in:
Alex Gleason 2023-05-13 20:16:44 -05:00
parent 9ff5e7c738
commit ce02f7d56c
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/controllers/api/streaming.ts
View File

@ -24,6 +24,7 @@ const streamingController: AppController = (c) => {
socket.addEventListener('close', () => console.log('websocket: connection closed')); socket.addEventListener('close', () => console.log('websocket: connection closed'));
socket.addEventListener('message', (e) => console.log('websocket message: ', e.data)); socket.addEventListener('message', (e) => console.log('websocket message: ', e.data));
// FIXME: Only do this for nostr.sign events.
signStreams.set(token, socket); signStreams.set(token, socket);
return response; return response;

13
src/sign.ts
View File

@ -4,6 +4,8 @@ import { getEventHash, getPublicKey, getSignature, HTTPException } from '@/deps.
import type { Event, EventTemplate, SignedEvent } from '@/event.ts'; import type { Event, EventTemplate, SignedEvent } from '@/event.ts';
/** Map of OAuth tokens to WebSocket signing streams. */ /** Map of OAuth tokens to WebSocket signing streams. */
// FIXME: People can eavesdrop on other people's signing streams.
// TODO: Add a secret to the Authorization header.
export const signStreams = new Map<string, WebSocket>(); export const signStreams = new Map<string, WebSocket>();
/** Get signing WebSocket from app context. */ /** Get signing WebSocket from app context. */
@ -12,12 +14,17 @@ function getSignStream(c: AppContext): WebSocket | undefined {
return token ? signStreams.get(token) : undefined; return token ? signStreams.get(token) : undefined;
} }
/** Sign Nostr event using the app context. */ /**
* Sign Nostr event using the app context.
*
* - If a secret key is provided, it will be used to sign the event.
* - If a signing WebSocket is provided, it will be used to sign the event.
*/
async function signEvent<K extends number = number>(event: EventTemplate<K>, c: AppContext): Promise<SignedEvent<K>> { async function signEvent<K extends number = number>(event: EventTemplate<K>, c: AppContext): Promise<SignedEvent<K>> {
const seckey = c.get('seckey'); const seckey = c.get('seckey');
const stream = getSignStream(c); const stream = getSignStream(c);
if (stream) { if (!seckey && stream) {
try { try {
return await new Promise<SignedEvent<K>>((resolve, reject) => { return await new Promise<SignedEvent<K>>((resolve, reject) => {
stream.addEventListener('message', (e) => { stream.addEventListener('message', (e) => {
@ -36,8 +43,6 @@ async function signEvent<K extends number = number>(event: EventTemplate<K>, c:
} }
} }
// Ditto only supports publishing events with a private key (for now).
// TODO: Let the client sign events through a websocket.
if (!seckey) { if (!seckey) {
throw new HTTPException(400, { throw new HTTPException(400, {
res: c.json({ id: 'ditto.private_key', error: 'No private key' }, 400), res: c.json({ id: 'ditto.private_key', error: 'No private key' }, 400),