From f0d5ce34fa037cf41387985c645f59c96018e2d1 Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 30 Nov 2023 22:47:40 +0100 Subject: [PATCH 1/9] remove unsubscribe, fix problem with message rendering --- package-lock.json | 59 +++++++++++++++++++++++--------- package.json | 2 +- src/app/home/components/Waku.tsx | 4 +-- src/hooks/useWaku.ts | 37 +++++++++++++------- src/services/rln.ts | 2 +- src/services/waku.ts | 3 +- src/utils/http.ts | 3 -- 7 files changed, 71 insertions(+), 39 deletions(-) diff --git a/package-lock.json b/package-lock.json index 710bb6f..bc45aa7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "rln-js", "version": "0.1.0", "dependencies": { - "@waku/rln": "0.1.1-7e8cb89", + "@waku/rln": "0.1.1-60a5070", "@waku/utils": "^0.0.12", "ethers": "^5.7.2", "next": "13.5.6", @@ -1424,13 +1424,13 @@ "dev": true }, "node_modules/@waku/rln": { - "version": "0.1.1-7e8cb89", - "resolved": "https://registry.npmjs.org/@waku/rln/-/rln-0.1.1-7e8cb89.tgz", - "integrity": "sha512-ToHwjodXoc1BrllRkIqC8/D73LqMlL4AHRdaSk4ttXjzdlqELdZYaJEwMtEBlupydNPf813RZ6V6hVuE6ttbTg==", + "version": "0.1.1-60a5070", + "resolved": "https://registry.npmjs.org/@waku/rln/-/rln-0.1.1-60a5070.tgz", + "integrity": "sha512-c3rXqzuTTQVIn2l4gZKDG+/2UY2yb0XbumyrsuvX9fQhQxopCAsSi16CYePdG5HCpImXPNJEC3C3JakuiA3v9A==", "dependencies": { "@chainsafe/bls-keystore": "^3.0.0", - "@waku/utils": "^0.0.12", - "@waku/zerokit-rln-wasm": "^0.0.10", + "@waku/utils": "^0.0.13", + "@waku/zerokit-rln-wasm": "^0.0.13", "ethereum-cryptography": "^2.1.2", "ethers": "^5.7.2", "lodash": "^4.17.21", @@ -1441,6 +1441,19 @@ "node": ">=18" } }, + "node_modules/@waku/rln/node_modules/@waku/utils": { + "version": "0.0.13", + "resolved": "https://registry.npmjs.org/@waku/utils/-/utils-0.0.13.tgz", + "integrity": "sha512-sGZRJyYr7+QZpV2tlGJF48gKmwNdFha6rPKPgXiKDsz2YMhPlg70ffbGcND3bEfOwWmX4g/x5i3Oqwwl+HzwJw==", + "dependencies": { + "chai": "^4.3.8", + "debug": "^4.3.4", + "uint8arrays": "^4.0.4" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/@waku/utils": { "version": "0.0.12", "resolved": "https://registry.npmjs.org/@waku/utils/-/utils-0.0.12.tgz", @@ -1455,9 +1468,9 @@ } }, "node_modules/@waku/zerokit-rln-wasm": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/@waku/zerokit-rln-wasm/-/zerokit-rln-wasm-0.0.10.tgz", - "integrity": "sha512-qegIK1P54mxEp59uTa8C0/zidUffLc2Iee61yiKRIuGJDui2mQ+0V+KzPSPImKpIoqfVLT192EqgZkqPmj8VEw==" + "version": "0.0.13", + "resolved": "https://registry.npmjs.org/@waku/zerokit-rln-wasm/-/zerokit-rln-wasm-0.0.13.tgz", + "integrity": "sha512-x7CRIIslmfCmTZc7yVp3dhLlKeLUs8ILIm9kv7+wVJ23H4pPw0Z+uH0ueLIYYfwODI6fDiwJj3S1vdFzM8D1zA==" }, "node_modules/@zeit/schemas": { "version": "2.29.0", @@ -7796,18 +7809,30 @@ "dev": true }, "@waku/rln": { - "version": "0.1.1-7e8cb89", - "resolved": "https://registry.npmjs.org/@waku/rln/-/rln-0.1.1-7e8cb89.tgz", - "integrity": "sha512-ToHwjodXoc1BrllRkIqC8/D73LqMlL4AHRdaSk4ttXjzdlqELdZYaJEwMtEBlupydNPf813RZ6V6hVuE6ttbTg==", + "version": "0.1.1-60a5070", + "resolved": "https://registry.npmjs.org/@waku/rln/-/rln-0.1.1-60a5070.tgz", + "integrity": "sha512-c3rXqzuTTQVIn2l4gZKDG+/2UY2yb0XbumyrsuvX9fQhQxopCAsSi16CYePdG5HCpImXPNJEC3C3JakuiA3v9A==", "requires": { "@chainsafe/bls-keystore": "^3.0.0", - "@waku/utils": "^0.0.12", - "@waku/zerokit-rln-wasm": "^0.0.10", + "@waku/utils": "^0.0.13", + "@waku/zerokit-rln-wasm": "^0.0.13", "ethereum-cryptography": "^2.1.2", "ethers": "^5.7.2", "lodash": "^4.17.21", "rlnjs": "^3.2.3", "uuid": "^9.0.1" + }, + "dependencies": { + "@waku/utils": { + "version": "0.0.13", + "resolved": "https://registry.npmjs.org/@waku/utils/-/utils-0.0.13.tgz", + "integrity": "sha512-sGZRJyYr7+QZpV2tlGJF48gKmwNdFha6rPKPgXiKDsz2YMhPlg70ffbGcND3bEfOwWmX4g/x5i3Oqwwl+HzwJw==", + "requires": { + "chai": "^4.3.8", + "debug": "^4.3.4", + "uint8arrays": "^4.0.4" + } + } } }, "@waku/utils": { @@ -7821,9 +7846,9 @@ } }, "@waku/zerokit-rln-wasm": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/@waku/zerokit-rln-wasm/-/zerokit-rln-wasm-0.0.10.tgz", - "integrity": "sha512-qegIK1P54mxEp59uTa8C0/zidUffLc2Iee61yiKRIuGJDui2mQ+0V+KzPSPImKpIoqfVLT192EqgZkqPmj8VEw==" + "version": "0.0.13", + "resolved": "https://registry.npmjs.org/@waku/zerokit-rln-wasm/-/zerokit-rln-wasm-0.0.13.tgz", + "integrity": "sha512-x7CRIIslmfCmTZc7yVp3dhLlKeLUs8ILIm9kv7+wVJ23H4pPw0Z+uH0ueLIYYfwODI6fDiwJj3S1vdFzM8D1zA==" }, "@zeit/schemas": { "version": "2.29.0", diff --git a/package.json b/package.json index b3996ce..9ad987e 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "lint": "next lint" }, "dependencies": { - "@waku/rln": "0.1.1-7e8cb89", + "@waku/rln": "0.1.1-60a5070", "@waku/utils": "^0.0.12", "ethers": "^5.7.2", "next": "13.5.6", diff --git a/src/app/home/components/Waku.tsx b/src/app/home/components/Waku.tsx index 89023dc..a84856a 100644 --- a/src/app/home/components/Waku.tsx +++ b/src/app/home/components/Waku.tsx @@ -103,11 +103,11 @@ function useMessage() { function renderMessage(content: MessageContent) { return ( -
  • +

  • {content.nick} - ({content.time}) + ({(new Date(content.timestamp)).toString()}) :

    diff --git a/src/hooks/useWaku.ts b/src/hooks/useWaku.ts index 5b67a19..85e9fb8 100644 --- a/src/hooks/useWaku.ts +++ b/src/hooks/useWaku.ts @@ -9,23 +9,25 @@ export type MessageContent = { }; export const useWaku = () => { - const [messages, setMessages] = React.useState([]); + const [messages, setMessages] = React.useState>(new Map()); React.useEffect(() => { const messageListener = (event: CustomEvent) => { - const messages: Message[] = event.detail; - const parsedMessaged = messages.map((message) => { - const time = new Date(message.timestamp); - const payload = JSON.parse(atob(message.payload)); + const nextMessages = new Map(messages); + const newMessages: Message[] = event.detail; - return { + newMessages.forEach((m) => { + const payload = JSON.parse(atob(m.payload)); + + const message = { nick: payload?.nick || "unknown", text: payload?.text || "empty", - time: time.toDateString(), + timestamp: m.timestamp || Date.now(), }; + nextMessages.set(`${message.nick}-${message.timestamp}-${message.text}`, message); }); - setMessages((prev) => [...prev, ...parsedMessaged]); + setMessages(nextMessages); }; waku.relay.addEventListener(CONTENT_TOPIC, messageListener); @@ -33,23 +35,32 @@ export const useWaku = () => { return () => { waku.relay.removeEventListener(CONTENT_TOPIC, messageListener); }; - }, [setMessages]); + }, [messages, setMessages]); const onSend = React.useCallback( async (nick: string, text: string) => { + const timestamp = Date.now(); await waku.relay.send({ version: 0, - timestamp: Date.now(), + timestamp, contentTopic: CONTENT_TOPIC, payload: btoa(JSON.stringify({ nick, text })), }); + const id = `${nick}-${timestamp}-${text}`; + setMessages((prev) => { + if (prev.has(id)) { + return prev; + } + const next = new Map(prev); + next.set(id, { nick, timestamp, text }); + return next; + }); }, - [] + [setMessages] ); - return { onSend, messages }; + return { onSend, messages: Array.from(messages.values()) }; }; - diff --git a/src/services/rln.ts b/src/services/rln.ts index 507f5e8..487b034 100644 --- a/src/services/rln.ts +++ b/src/services/rln.ts @@ -109,7 +109,7 @@ export class RLN implements IRLN { private initKeystore(): Keystore { const localKeystoreString = localStorage.getItem("keystore"); - + try { return Keystore.fromString(localKeystoreString || ""); } catch(error) { diff --git a/src/services/waku.ts b/src/services/waku.ts index b5e3c28..4033760 100644 --- a/src/services/waku.ts +++ b/src/services/waku.ts @@ -32,7 +32,6 @@ class Relay { } public removeEventListener(contentTopic: string, fn: EventListener) { - this.handleUnsubscribed(contentTopic); return this.subscriptionsEmitter.removeEventListener( contentTopic, fn as any @@ -53,7 +52,7 @@ class Relay { this.subscriptionRoutine = window.setInterval(async () => { await this.fetchMessages(); - }, 10 * SECOND); + }, SECOND); this.contentTopicListeners.set(contentTopic, 1); } catch (error) { diff --git a/src/utils/http.ts b/src/utils/http.ts index 47e8522..b6f9698 100644 --- a/src/utils/http.ts +++ b/src/utils/http.ts @@ -2,7 +2,6 @@ export const http = { post(url: string, body: any) { return fetch(new URL(url), { method: "POST", - mode: "no-cors", referrerPolicy: "no-referrer", headers: { 'Content-Type': 'text/plain', @@ -13,8 +12,6 @@ export const http = { delete(url: string, body: any) { return fetch(new URL(url), { method: "DELETE", - mode: "no-cors", - referrerPolicy: "no-referrer", headers: { 'Content-Type': 'text/plain', }, From b9814780ec589c9e19b28da34394b2944547a4e1 Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 30 Nov 2023 22:50:34 +0100 Subject: [PATCH 2/9] add favicon --- src/app/favicon.ico | Bin 25931 -> 4286 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/app/favicon.ico b/src/app/favicon.ico index 718d6fea4835ec2d246af9800eddb7ffb276240c..74cf5df7f8b4404af213e373d45b126260fefdf9 100644 GIT binary patch literal 4286 zcmc(j_fOPm5XSfZ0P*~V#MsbF;G*#~7K{}{!LG3-7VH6ItZ0mY3D#(gCH4|)tQZBm zqNrGiieN*c#)dsnvDet1+s~MHvwMe#HYinz73~OpH{D4z4YnRC#9yQDlRV0Y;g-deE6XI_wNUcxw+E*qJt0TCnhFp z(V|7Ztp^VtRL`D0_2tVK?cTjx-MV$t$B!R<^J~_u(TEWv^!f8=8~3-}x9BGi+qZAm z%$YN7758o4yt&SuJ7@3A_3z)`o==@RrM7L`>eZ`P_I~Bc6}4#5LPw4qvG;lN=4s=` zjrRO2UzaXjQes8Ke4{rYvaY}r!x?%mVdw{O+2Uq4Nm zGR5X@-@a{gIXOAMaRW^x^$@~O`2r)Bi9gOTC-+NHE!J4@*barhli_m>()NKU%!5}oWw5)2?^$x@#Dvv zZp>t5zA;a7SWHY{4Dz88T#uJ%iQ!{Cv%x zJzLePRkQofnKMUV)Sb&2tU*69M>cKRWNX3H)2B~uj4$R33k%I3VPRov-@d)-*RQY1 zlP8-#{4;CTEIohz+}1Q})=V8cc2vWL4b`Pf7atCtLSj09{(MD5L}7g%xIY*G7hSt{HSEA4_#VuT9Xr~ zy{Hw~#(Crz*uiJ;D!y`%*;&7Lwo?Pz#bepa^y%28Z^kx1QVRIZQC}(JvAPFgkQ>+FR$v=tE+bH z+UniAx8}~BYn)utnasgm(ROov~5v2Wi#tz5a%`d94o7q|d?a7VZaPU_I1gYPcnFnA0J2{An< zPMok>T&q?soj-rxRB;CJg1@*g_D+~EK^HGx4B!|4bI}XWa~Aq{?AT$vL@c?36JpF+ z=ghY#)EuJ^=N^w6(6{kE`#FX}wJjnL=eLok|`mlx0%u3o*` zuu0tk2hJ||hQ6mPLf&$BXFst4x8xoe!3VC_ByZ_m$bIq%Y$2B~U$%U9J^ZiOK}^98 z`2i2X3kMDyFcstp{wHq{c$@wVIez@O{ry4g5PatBv4K*4QJY*Z27mE!wUJm-FR&5e z8Gb>SgY)5eY{yq{TUiBt{C(?eaeC<0sVN9t<9x$AHJ!gloV|?w*K+jeQTrPlz0{II PFJ8(b?*9S)uiw7`Lr+Sc literal 25931 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 LrJugUA?W`A8`#=m From 65756f0663da1d91e5d96f80645c69534f5dcb64 Mon Sep 17 00:00:00 2001 From: Sasha Date: Sat, 2 Dec 2023 18:09:46 +0100 Subject: [PATCH 3/9] fix cors again, print better date --- src/app/home/components/Waku.tsx | 3 +-- src/utils/http.ts | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/home/components/Waku.tsx b/src/app/home/components/Waku.tsx index a84856a..807a846 100644 --- a/src/app/home/components/Waku.tsx +++ b/src/app/home/components/Waku.tsx @@ -2,7 +2,6 @@ import React from "react"; import { Block } from "@/components/Block"; import { Subtitle } from "@/components/Subtitle"; import { Button } from "@/components/Button"; -import { Status } from "@/components/Status"; import { MessageContent, useWaku } from "@/hooks"; import { CONTENT_TOPIC } from "@/constants"; @@ -107,7 +106,7 @@ function renderMessage(content: MessageContent) {

    {content.nick} - ({(new Date(content.timestamp)).toString()}) + ({(new Date(content.timestamp)).toDateString()}) :

    diff --git a/src/utils/http.ts b/src/utils/http.ts index b6f9698..b125827 100644 --- a/src/utils/http.ts +++ b/src/utils/http.ts @@ -2,6 +2,7 @@ export const http = { post(url: string, body: any) { return fetch(new URL(url), { method: "POST", + mode: "no-cors", referrerPolicy: "no-referrer", headers: { 'Content-Type': 'text/plain', From 3858b67fa82c5e83217be39f332d392050faed06 Mon Sep 17 00:00:00 2001 From: Sasha Date: Sat, 2 Dec 2023 18:26:24 +0100 Subject: [PATCH 4/9] split keystore and chat pages --- src/app/{home => }/components/Blockchain.tsx | 0 src/app/{home => }/components/Header.tsx | 17 +++++++++++------ src/app/{home => }/components/Keystore.tsx | 0 .../{home => }/components/KeystoreDetails.tsx | 0 src/app/{home => }/components/Waku.tsx | 0 src/app/home/page.tsx | 8 ++------ src/app/keystore/page.tsx | 16 ++++++++++++++++ src/services/waku.ts | 2 +- 8 files changed, 30 insertions(+), 13 deletions(-) rename src/app/{home => }/components/Blockchain.tsx (100%) rename src/app/{home => }/components/Header.tsx (62%) rename src/app/{home => }/components/Keystore.tsx (100%) rename src/app/{home => }/components/KeystoreDetails.tsx (100%) rename src/app/{home => }/components/Waku.tsx (100%) create mode 100644 src/app/keystore/page.tsx diff --git a/src/app/home/components/Blockchain.tsx b/src/app/components/Blockchain.tsx similarity index 100% rename from src/app/home/components/Blockchain.tsx rename to src/app/components/Blockchain.tsx diff --git a/src/app/home/components/Header.tsx b/src/app/components/Header.tsx similarity index 62% rename from src/app/home/components/Header.tsx rename to src/app/components/Header.tsx index bd3712f..75cd167 100644 --- a/src/app/home/components/Header.tsx +++ b/src/app/components/Header.tsx @@ -1,20 +1,25 @@ import { Block, BlockTypes } from "@/components/Block"; import { Title } from "@/components/Title"; import { Status } from "@/components/Status"; -import { useStore, useWallet } from "@/hooks"; +import { useStore } from "@/hooks"; import { Button } from "@/components/Button"; -export const Header: React.FunctionComponent<{}> = () => { +type HeaderProps = { + onWalletConnect?: () => void; +} + +export const Header: React.FunctionComponent = (props) => { const { appStatus, wallet } = useStore(); - const { onWalletConnect } = useWallet(); return ( <> Waku RLN - + {props.onWalletConnect && ( + + )} {wallet &&

    Wallet connected: {wallet}

    } diff --git a/src/app/home/components/Keystore.tsx b/src/app/components/Keystore.tsx similarity index 100% rename from src/app/home/components/Keystore.tsx rename to src/app/components/Keystore.tsx diff --git a/src/app/home/components/KeystoreDetails.tsx b/src/app/components/KeystoreDetails.tsx similarity index 100% rename from src/app/home/components/KeystoreDetails.tsx rename to src/app/components/KeystoreDetails.tsx diff --git a/src/app/home/components/Waku.tsx b/src/app/components/Waku.tsx similarity index 100% rename from src/app/home/components/Waku.tsx rename to src/app/components/Waku.tsx diff --git a/src/app/home/page.tsx b/src/app/home/page.tsx index e8e046f..8270f84 100644 --- a/src/app/home/page.tsx +++ b/src/app/home/page.tsx @@ -1,15 +1,11 @@ "use client"; -import { Header } from "./components/Header"; -import { Waku } from "./components/Waku"; -import { Keystore } from "./components/Keystore"; -import { KeystoreDetails } from "./components/KeystoreDetails"; +import { Header } from "@/app/components/Header"; +import { Waku } from "@/app/components/Waku"; export default function Home() { return (
    - -
    ); diff --git a/src/app/keystore/page.tsx b/src/app/keystore/page.tsx new file mode 100644 index 0000000..269f232 --- /dev/null +++ b/src/app/keystore/page.tsx @@ -0,0 +1,16 @@ +"use client"; +import { Header } from "@/app/components/Header"; +import { Keystore } from "@/app/components/Keystore"; +import { KeystoreDetails } from "@/app/components/KeystoreDetails"; +import { useWallet } from "@/hooks"; + +export default function KeystorePage() { + const { onWalletConnect } = useWallet(); + return ( +
    +
    + + +
    + ); +} diff --git a/src/services/waku.ts b/src/services/waku.ts index 4033760..bf8f8e3 100644 --- a/src/services/waku.ts +++ b/src/services/waku.ts @@ -52,7 +52,7 @@ class Relay { this.subscriptionRoutine = window.setInterval(async () => { await this.fetchMessages(); - }, SECOND); + }, 5 * SECOND); this.contentTopicListeners.set(contentTopic, 1); } catch (error) { From 17866bd142bab9c00be8f3607c1c807d177af96c Mon Sep 17 00:00:00 2001 From: Sasha Date: Sat, 2 Dec 2023 19:00:27 +0100 Subject: [PATCH 5/9] apply styles --- src/app/components/Waku.tsx | 75 +++++++++++++++++++------------------ src/app/home/page.tsx | 2 +- 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/src/app/components/Waku.tsx b/src/app/components/Waku.tsx index 807a846..30f18b8 100644 --- a/src/app/components/Waku.tsx +++ b/src/app/components/Waku.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Block } from "@/components/Block"; +import { Block, BlockTypes } from "@/components/Block"; import { Subtitle } from "@/components/Subtitle"; import { Button } from "@/components/Button"; import { MessageContent, useWaku } from "@/hooks"; @@ -20,52 +20,53 @@ export const Waku: React.FunctionComponent<{}> = () => { ); return ( - + - - Waku - -

    Content topic: {CONTENT_TOPIC}

    -     + + + Waku + +

    Content topic: {CONTENT_TOPIC}

    +     - - - - - - - + - + + + + +