From 96be7385f983d67444a73da20be4efd89ceff840 Mon Sep 17 00:00:00 2001 From: tiero <3596602+tiero@users.noreply.github.com> Date: Fri, 6 Jan 2023 01:21:19 +0100 Subject: [PATCH] format --- src/connect.ts | 12 ++++++++---- src/rpc.ts | 53 +++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 52 insertions(+), 13 deletions(-) diff --git a/src/connect.ts b/src/connect.ts index aec11a0..60574ba 100644 --- a/src/connect.ts +++ b/src/connect.ts @@ -54,9 +54,9 @@ export class ConnectURI { } toString() { - return `nostr://connect?target=${this.target}&metadata=${JSON.stringify(this.metadata)}&relay=${ - this.relayURL - }`; + return `nostr://connect?target=${this.target}&metadata=${JSON.stringify( + this.metadata + )}&relay=${this.relayURL}`; } async approve(secretKey: string): Promise { @@ -120,7 +120,11 @@ export class Connect { let payload; /* eslint-disable @typescript-eslint/no-unused-vars */ try { - const plaintext = await nip04.decrypt(this.rpc.self.secret, event.pubkey, event.content); + const plaintext = await nip04.decrypt( + this.rpc.self.secret, + event.pubkey, + event.content + ); if (!plaintext) throw new Error('failed to decrypt event'); payload = JSON.parse(plaintext); } catch (ignore) { diff --git a/src/rpc.ts b/src/rpc.ts index 0057fcc..eff9582 100644 --- a/src/rpc.ts +++ b/src/rpc.ts @@ -78,7 +78,11 @@ export class NostrRPC { let payload; /* eslint-disable @typescript-eslint/no-unused-vars */ try { - const plaintext = await nip04.decrypt(this.self.secret, event.pubkey, event.content); + const plaintext = await nip04.decrypt( + this.self.secret, + event.pubkey, + event.content + ); if (!plaintext) throw new Error('failed to decrypt event'); payload = JSON.parse(plaintext); } catch (ignore) { @@ -119,7 +123,11 @@ export class NostrRPC { let payload: NostrRPCRequest; /* eslint-disable @typescript-eslint/no-unused-vars */ try { - const plaintext = await nip04.decrypt(this.self.secret, event.pubkey, event.content); + const plaintext = await nip04.decrypt( + this.self.secret, + event.pubkey, + event.content + ); if (!plaintext) throw new Error('failed to decrypt event'); payload = JSON.parse(plaintext); } catch (ignore) { @@ -133,9 +141,17 @@ export class NostrRPC { if (typeof this[payload.method] !== 'function') Promise.resolve(); const response = await this.handleRequest(payload, event); - const body = prepareResponse(response.id, response.result, response.error); + const body = prepareResponse( + response.id, + response.result, + response.error + ); - const responseEvent = await prepareEvent(this.self.secret, event.pubkey, body); + const responseEvent = await prepareEvent( + this.self.secret, + event.pubkey, + body + ); // send response via relay await new Promise((resolve, reject) => { @@ -152,7 +168,10 @@ export class NostrRPC { return sub; } - private async handleRequest(request: NostrRPCRequest, event: Event): Promise { + private async handleRequest( + request: NostrRPCRequest, + event: Event + ): Promise { const { id, method, params } = request; let result = null; let error = null; @@ -179,9 +198,15 @@ export function now(): number { return Math.floor(Date.now() / 1000); } export function randomID(): string { - return Math.random().toString().slice(2); + return Math.random() + .toString() + .slice(2); } -export function prepareRequest(id: string, method: string, params: any[]): string { +export function prepareRequest( + id: string, + method: string, + params: any[] +): string { return JSON.stringify({ id, method, @@ -227,7 +252,12 @@ export function isValidRequest(payload: any): boolean { if (!payload) return false; const keys = Object.keys(payload); - if (!keys.includes('id') || !keys.includes('method') || !keys.includes('params')) return false; + if ( + !keys.includes('id') || + !keys.includes('method') || + !keys.includes('params') + ) + return false; return true; } @@ -236,7 +266,12 @@ export function isValidResponse(payload: any): boolean { if (!payload) return false; const keys = Object.keys(payload); - if (!keys.includes('id') || !keys.includes('result') || !keys.includes('error')) return false; + if ( + !keys.includes('id') || + !keys.includes('result') || + !keys.includes('error') + ) + return false; return true; }