From 216a600224fde22ce76b367557a02094ec693886 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Fri, 1 Dec 2023 20:04:13 -0800 Subject: prettier --- src/lib/socket.js | 122 +++++++++++++++++++++++++++++------------------------- 1 file changed, 65 insertions(+), 57 deletions(-) (limited to 'src/lib/socket.js') diff --git a/src/lib/socket.js b/src/lib/socket.js index 96fde317..d51ab39b 100644 --- a/src/lib/socket.js +++ b/src/lib/socket.js @@ -1,50 +1,58 @@ -import { get } from 'svelte/store'; -import { event, invoice, request, newPayment, last, rate, user } from '$lib/store'; -import { success, sat } from '$lib/utils'; -import { PUBLIC_SOCKET } from '$env/static/public'; -import { invalidate } from '$app/navigation'; -import { browser } from '$app/environment'; +import { get } from "svelte/store"; +import { + event, + invoice, + request, + newPayment, + last, + rate, + user, +} from "$lib/store"; +import { success, sat } from "$lib/utils"; +import { PUBLIC_SOCKET } from "$env/static/public"; +import { invalidate } from "$app/navigation"; +import { browser } from "$app/environment"; let socket, token; -export const auth = () => token && send('login', token); +export const auth = () => token && send("login", token); export const send = (type, data) => { - socket?.readyState === 1 && socket.send(JSON.stringify({ type, data })); - return true; + socket?.readyState === 1 && socket.send(JSON.stringify({ type, data })); + return true; }; export const messages = (data) => ({ - id() { - last.set(Date.now()); - }, - invoice() { - invoice.set(data); - }, - event() { - event.set(data); - }, - rate() { - rate.set(data); - }, - - request() { - request.set(data); - invalidate('app:invoice'); - }, - - async payment() { - let { amount, confirmed } = data; - invalidate('app:user'); - invalidate('app:invoice'); - invalidate('app:payments'); - - if (amount > 0) { - success(`${confirmed ? 'Received' : 'Detected'} ${sat(amount)}!`); - } - }, - - connected: auth + id() { + last.set(Date.now()); + }, + invoice() { + invoice.set(data); + }, + event() { + event.set(data); + }, + rate() { + rate.set(data); + }, + + request() { + request.set(data); + invalidate("app:invoice"); + }, + + async payment() { + let { amount, confirmed } = data; + invalidate("app:user"); + invalidate("app:invoice"); + invalidate("app:payments"); + + if (amount > 0) { + success(`${confirmed ? "Received" : "Detected"} ${sat(amount)}!`); + } + }, + + connected: auth, }); const initialReconnectDelay = 1000; @@ -53,39 +61,39 @@ const maxReconnectDelay = 16000; let currentReconnectDelay = initialReconnectDelay; export function connect(t) { - token = t; + token = t; - if (socket) return auth(); + if (socket) return auth(); - socket = new WebSocket(PUBLIC_SOCKET); - socket.addEventListener('open', onWebsocketOpen); - socket.addEventListener('close', onWebsocketClose); - socket.addEventListener('message', onWebsocketMessage); + socket = new WebSocket(PUBLIC_SOCKET); + socket.addEventListener("open", onWebsocketOpen); + socket.addEventListener("close", onWebsocketClose); + socket.addEventListener("message", onWebsocketMessage); } export function close() { - if (socket) socket.close(); + if (socket) socket.close(); } function onWebsocketMessage(msg) { - let { type, data } = JSON.parse(msg.data); - messages(data)[type] && messages(data)[type](); + let { type, data } = JSON.parse(msg.data); + messages(data)[type] && messages(data)[type](); } function onWebsocketOpen() { - currentReconnectDelay = initialReconnectDelay; + currentReconnectDelay = initialReconnectDelay; } function onWebsocketClose() { - socket = null; - setTimeout(() => { - reconnectToWebsocket(); - }, currentReconnectDelay + Math.floor(Math.random() * 3000)); + socket = null; + setTimeout(() => { + reconnectToWebsocket(); + }, currentReconnectDelay + Math.floor(Math.random() * 3000)); } function reconnectToWebsocket() { - if (currentReconnectDelay < maxReconnectDelay) { - currentReconnectDelay *= 2; - } - connect(token); + if (currentReconnectDelay < maxReconnectDelay) { + currentReconnectDelay *= 2; + } + connect(token); } -- cgit v1.2.3 From 036828c786dfe752a8de3fd90529a7f09e94e77b Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Sun, 3 Dec 2023 13:53:31 -0800 Subject: rm rate message --- src/lib/socket.js | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/lib/socket.js') diff --git a/src/lib/socket.js b/src/lib/socket.js index d51ab39b..695b512f 100644 --- a/src/lib/socket.js +++ b/src/lib/socket.js @@ -5,7 +5,6 @@ import { request, newPayment, last, - rate, user, } from "$lib/store"; import { success, sat } from "$lib/utils"; @@ -32,9 +31,6 @@ export const messages = (data) => ({ event() { event.set(data); }, - rate() { - rate.set(data); - }, request() { request.set(data); -- cgit v1.2.3 From 152900e464169e3fffea076af5c6252f12f7645a Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Mon, 4 Dec 2023 22:28:21 -0800 Subject: prettier --- src/components/Balance.svelte | 2 +- src/components/Lnurlp.svelte | 2 +- src/lib/socket.js | 9 +-------- src/routes/(app)/+layout.svelte | 2 +- src/routes/(app)/[username]/generate/+page.svelte | 2 +- src/routes/(app)/admin/+layout.svelte | 2 +- src/routes/(app)/buy/+page.svelte | 2 +- src/routes/(app)/launch/+page.svelte | 4 ++-- src/routes/(app)/ln/[lnurl]/+page.svelte | 3 ++- src/routes/(app)/register/+page.svelte | 2 +- src/routes/(app)/scan/+page.svelte | 2 +- src/routes/(app)/send/+layout.svelte | 2 +- svelte.config.js | 4 ++-- 13 files changed, 16 insertions(+), 22 deletions(-) (limited to 'src/lib/socket.js') diff --git a/src/components/Balance.svelte b/src/components/Balance.svelte index cf926b44..98a04ef6 100644 --- a/src/components/Balance.svelte +++ b/src/components/Balance.svelte @@ -1,7 +1,7 @@ diff --git a/src/routes/(app)/buy/+page.svelte b/src/routes/(app)/buy/+page.svelte index 952d9ff5..2b81b7a8 100644 --- a/src/routes/(app)/buy/+page.svelte +++ b/src/routes/(app)/buy/+page.svelte @@ -4,7 +4,7 @@ import Lock from "$comp/Lock.svelte"; import Card from "$comp/Card.svelte"; import Calendar from "$comp/Calendar.svelte"; - import Spinner from "$comp/Spinner.svelte"; + import Spinner from "$comp/Spinner.svelte"; import { f } from "$lib/utils"; export let data, form; diff --git a/src/routes/(app)/launch/+page.svelte b/src/routes/(app)/launch/+page.svelte index b7c472c1..ef02ae0f 100644 --- a/src/routes/(app)/launch/+page.svelte +++ b/src/routes/(app)/launch/+page.svelte @@ -1,9 +1,9 @@ diff --git a/src/routes/(app)/register/+page.svelte b/src/routes/(app)/register/+page.svelte index 9cd13ebe..5783059a 100644 --- a/src/routes/(app)/register/+page.svelte +++ b/src/routes/(app)/register/+page.svelte @@ -9,7 +9,7 @@ import Pin from "$comp/Pin.svelte"; import Icon from "$comp/Icon.svelte"; - import Spinner from "$comp/Spinner.svelte"; + import Spinner from "$comp/Spinner.svelte"; import { focus, fail } from "$lib/utils"; import { avatar, password, loginRedirect } from "$lib/store"; diff --git a/src/routes/(app)/scan/+page.svelte b/src/routes/(app)/scan/+page.svelte index 6f22121e..e23b9bb8 100644 --- a/src/routes/(app)/scan/+page.svelte +++ b/src/routes/(app)/scan/+page.svelte @@ -1,5 +1,5 @@