remove listeners, set auth function onto system
This commit is contained in:
parent
97a467260d
commit
2d75139065
@ -7,8 +7,6 @@ import { RootState } from "State/Store";
|
|||||||
import { HexKey, RawEvent, u256, UserMetadata } from "Nostr";
|
import { HexKey, RawEvent, u256, UserMetadata } from "Nostr";
|
||||||
import { bech32ToHex } from "Util"
|
import { bech32ToHex } from "Util"
|
||||||
import { DefaultRelays, HashtagRegex } from "Const";
|
import { DefaultRelays, HashtagRegex } from "Const";
|
||||||
import { useEffect } from "react";
|
|
||||||
import { NIP42AuthChallenge, NIP42AuthResponse } from "Nostr/Auth";
|
|
||||||
|
|
||||||
declare global {
|
declare global {
|
||||||
interface Window {
|
interface Window {
|
||||||
@ -79,7 +77,7 @@ export default function useEventPublisher() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
nip42Auth: async (challenge: string, relay:string): Promise<NEvent> => {
|
nip42Auth: async (challenge: string, relay:string) => {
|
||||||
if(pubKey) {
|
if(pubKey) {
|
||||||
const ev = NEvent.ForPubKey(pubKey);
|
const ev = NEvent.ForPubKey(pubKey);
|
||||||
ev.Kind = EventKind.Auth;
|
ev.Kind = EventKind.Auth;
|
||||||
@ -88,7 +86,6 @@ export default function useEventPublisher() {
|
|||||||
ev.Tags.push(new Tag(["challenge", challenge], 1));
|
ev.Tags.push(new Tag(["challenge", challenge], 1));
|
||||||
return await signEvent(ev);
|
return await signEvent(ev);
|
||||||
}
|
}
|
||||||
return Promise.reject();
|
|
||||||
},
|
},
|
||||||
broadcast: (ev: NEvent | undefined) => {
|
broadcast: (ev: NEvent | undefined) => {
|
||||||
if (ev) {
|
if (ev) {
|
||||||
|
@ -1,19 +0,0 @@
|
|||||||
import {default as NEvent} from "./Event"
|
|
||||||
|
|
||||||
export class NIP42AuthChallenge extends Event {
|
|
||||||
challenge?:string
|
|
||||||
relay?:string
|
|
||||||
constructor(challenge:string, relay:string) {
|
|
||||||
super("nip42auth");
|
|
||||||
this.challenge = challenge;
|
|
||||||
this.relay = relay;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export class NIP42AuthResponse extends Event {
|
|
||||||
event?: NEvent
|
|
||||||
constructor(challenge: string, event: NEvent) {
|
|
||||||
super(`nip42response:${challenge}`);
|
|
||||||
this.event = event;
|
|
||||||
}
|
|
||||||
}
|
|
@ -8,6 +8,7 @@ import { ConnectionStats } from "Nostr/ConnectionStats";
|
|||||||
import { RawEvent, TaggedRawEvent, u256 } from "Nostr";
|
import { RawEvent, TaggedRawEvent, u256 } from "Nostr";
|
||||||
import { RelayInfo } from "./RelayInfo";
|
import { RelayInfo } from "./RelayInfo";
|
||||||
import Nips from "./Nips";
|
import Nips from "./Nips";
|
||||||
|
import { System } from "./System";
|
||||||
|
|
||||||
export type CustomHook = (state: Readonly<StateSnapshot>) => void;
|
export type CustomHook = (state: Readonly<StateSnapshot>) => void;
|
||||||
|
|
||||||
@ -367,17 +368,14 @@ export default class Connection {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async _OnAuthAsync(challenge: string) {
|
async _OnAuthAsync(challenge: string): Promise<void> {
|
||||||
const challengeEvent = new NIP42AuthChallenge(challenge, this.Address)
|
|
||||||
|
|
||||||
const authCleanup = () => {
|
const authCleanup = () => {
|
||||||
this.AwaitingAuth.delete(challenge)
|
this.AwaitingAuth.delete(challenge)
|
||||||
}
|
}
|
||||||
|
this.AwaitingAuth.set(challenge, true)
|
||||||
const authCallback = (e:NIP42AuthResponse):Promise<void> => {
|
const authEvent = await System.nip42Auth(challenge, this.Address)
|
||||||
window.removeEventListener(`nip42response:${challenge}`, authCallback)
|
|
||||||
return new Promise((resolve,_) => {
|
return new Promise((resolve,_) => {
|
||||||
if(!e.event) {
|
if(!authEvent) {
|
||||||
authCleanup();
|
authCleanup();
|
||||||
return Promise.reject('no event');
|
return Promise.reject('no event');
|
||||||
}
|
}
|
||||||
@ -387,7 +385,7 @@ export default class Connection {
|
|||||||
resolve();
|
resolve();
|
||||||
}, 10_000);
|
}, 10_000);
|
||||||
|
|
||||||
this.EventsCallback.set(e.event.Id, (msg:any[]) => {
|
this.EventsCallback.set(authEvent.Id, (msg:any[]) => {
|
||||||
clearTimeout(t);
|
clearTimeout(t);
|
||||||
authCleanup();
|
authCleanup();
|
||||||
if(msg.length > 3 && msg[2] === true) {
|
if(msg.length > 3 && msg[2] === true) {
|
||||||
@ -397,18 +395,13 @@ export default class Connection {
|
|||||||
resolve();
|
resolve();
|
||||||
});
|
});
|
||||||
|
|
||||||
let req = ["AUTH", e.event.ToObject()];
|
let req = ["AUTH", authEvent.ToObject()];
|
||||||
this._SendJson(req);
|
this._SendJson(req);
|
||||||
this.Stats.EventsSent++;
|
this.Stats.EventsSent++;
|
||||||
this._UpdateState();
|
this._UpdateState();
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
this.AwaitingAuth.set(challenge, true)
|
|
||||||
window.addEventListener(`nip42response:${challenge}`, authCallback)
|
|
||||||
window.dispatchEvent(challengeEvent)
|
|
||||||
}
|
|
||||||
|
|
||||||
_OnEnd(subId: string) {
|
_OnEnd(subId: string) {
|
||||||
let sub = this.Subscriptions.get(subId);
|
let sub = this.Subscriptions.get(subId);
|
||||||
if (sub) {
|
if (sub) {
|
||||||
|
@ -212,6 +212,10 @@ export class NostrSystem {
|
|||||||
|
|
||||||
setTimeout(() => this._FetchMetadata(), 500);
|
setTimeout(() => this._FetchMetadata(), 500);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async nip42Auth(challenge: string, relay:string): Promise<Event|undefined> {
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export const System = new NostrSystem();
|
export const System = new NostrSystem();
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import "./Layout.css";
|
import "./Layout.css";
|
||||||
import { useEffect } from "react"
|
import { useEffect, useMemo } from "react"
|
||||||
import { useDispatch, useSelector } from "react-redux";
|
import { useDispatch, useSelector } from "react-redux";
|
||||||
import { Outlet, useNavigate } from "react-router-dom";
|
import { Outlet, useNavigate } from "react-router-dom";
|
||||||
import { faBell, faMessage, faSearch } from "@fortawesome/free-solid-svg-icons";
|
import { faBell, faMessage, faSearch } from "@fortawesome/free-solid-svg-icons";
|
||||||
@ -15,7 +15,6 @@ import useLoginFeed from "Feed/LoginFeed";
|
|||||||
import { totalUnread } from "Pages/MessagesPage";
|
import { totalUnread } from "Pages/MessagesPage";
|
||||||
import { SearchRelays } from 'Const';
|
import { SearchRelays } from 'Const';
|
||||||
import useEventPublisher from "Feed/EventPublisher";
|
import useEventPublisher from "Feed/EventPublisher";
|
||||||
import { NIP42AuthChallenge, NIP42AuthResponse } from "Nostr/Auth";
|
|
||||||
|
|
||||||
export default function Layout() {
|
export default function Layout() {
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
@ -30,17 +29,12 @@ export default function Layout() {
|
|||||||
const pub = useEventPublisher();
|
const pub = useEventPublisher();
|
||||||
useLoginFeed();
|
useLoginFeed();
|
||||||
|
|
||||||
|
useMemo(() => {
|
||||||
|
System.nip42Auth = pub.nip42Auth
|
||||||
|
},[pub])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (relays) {
|
if (relays) {
|
||||||
const nip42AuthEvent = async (event: NIP42AuthChallenge) => {
|
|
||||||
if(event.challenge && event.relay) {
|
|
||||||
const signedEvent = await pub.nip42Auth(event.challenge, event.relay);
|
|
||||||
const response = new NIP42AuthResponse(event.challenge, signedEvent);
|
|
||||||
window.dispatchEvent(response);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
window.addEventListener("nip42auth", nip42AuthEvent)
|
|
||||||
|
|
||||||
for (let [k, v] of Object.entries(relays)) {
|
for (let [k, v] of Object.entries(relays)) {
|
||||||
System.ConnectToRelay(k, v);
|
System.ConnectToRelay(k, v);
|
||||||
}
|
}
|
||||||
@ -49,10 +43,6 @@ export default function Layout() {
|
|||||||
System.DisconnectRelay(k);
|
System.DisconnectRelay(k);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return () => {
|
|
||||||
window.removeEventListener("nip42auth", nip42AuthEvent)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}, [relays]);
|
}, [relays]);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user