From beb74abec38d9134a4aa9269d12cdac850f894d6 Mon Sep 17 00:00:00 2001 From: Georgios Jason Efstathiou Date: Tue, 6 Feb 2024 12:10:03 +0100 Subject: [PATCH] Load home page sections asynchronously --- src/App/Header.svelte | 2 +- src/lib/deduplicateStore.ts | 18 +++ src/lib/httpd.ts | 17 +-- src/lib/seeds.ts | 20 ++-- src/views/home/Index.svelte | 111 ++++++++++++------ .../home/components/HomepageSection.svelte | 12 +- .../components/PreferredSeedDropdown.svelte | 3 +- src/views/home/router.ts | 61 +--------- 8 files changed, 127 insertions(+), 117 deletions(-) create mode 100644 src/lib/deduplicateStore.ts diff --git a/src/App/Header.svelte b/src/App/Header.svelte index 8b58f5567..143315ca6 100644 --- a/src/App/Header.svelte +++ b/src/App/Header.svelte @@ -76,7 +76,7 @@ {:else} - + {/if} diff --git a/src/lib/deduplicateStore.ts b/src/lib/deduplicateStore.ts new file mode 100644 index 000000000..f7f8b0c2e --- /dev/null +++ b/src/lib/deduplicateStore.ts @@ -0,0 +1,18 @@ +import type { Readable, Writable } from "svelte/store"; + +import { derived } from "svelte/store"; +import { isEqual } from "lodash"; + +// Returns a derived store that only notifies subscribers if the value has changed. +export function deduplicateStore( + store: Readable | Writable, +): Readable { + let previous: T; + + return derived(store, ($value, set) => { + if (!isEqual($value, previous)) { + previous = $value; + set($value); + } + }); +} diff --git a/src/lib/httpd.ts b/src/lib/httpd.ts index ce2a71cc2..88236b417 100644 --- a/src/lib/httpd.ts +++ b/src/lib/httpd.ts @@ -1,8 +1,11 @@ -import { derived, get, writable } from "svelte/store"; +import type { Node } from "@httpd-client"; + +import { get, writable } from "svelte/store"; import { withTimeout, Mutex, E_CANCELED, E_TIMEOUT } from "async-mutex"; import { HttpdClient } from "@httpd-client"; import { config } from "@app/lib/config"; +import { deduplicateStore } from "@app/lib/deduplicateStore"; export interface Session { id: string; @@ -12,18 +15,18 @@ export interface Session { export type HttpdState = | { state: "stopped" } - | { state: "running"; node: "running" | "stopped" } + | { state: "running"; node: Node } | { state: "authenticated"; session: Session; - node: "running" | "stopped"; + node: Node; }; const HTTPD_STATE_STORAGE_KEY = "httpdState"; const HTTPD_CUSTOM_PORT_KEY = "httpdCustomPort"; const store = writable({ state: "stopped" }); -export const httpdStore = derived(store, s => s); +export const httpdStore = deduplicateStore(store); export const api = new HttpdClient({ hostname: "127.0.0.1", @@ -57,7 +60,7 @@ export async function authenticate(params: { sig: params.signature, pk: params.publicKey, }); - const { state: node } = await api.getNode(); + const node = await api.getNode(); const sess = await api.session.getById(params.id); update({ state: "authenticated", @@ -88,7 +91,7 @@ export async function disconnect() { try { await api.session.delete(httpd.session.id); - const { state: node } = await api.getNode(); + const node = await api.getNode(); update({ state: "running", node }); } catch (error) { console.error(error); @@ -120,7 +123,7 @@ async function checkState() { await stateMutex .runExclusive(async () => { try { - const { state: node } = await api.getNode(); + const node = await api.getNode(); if (httpdState && httpdState.state !== "stopped") { httpdState.node = node; diff --git a/src/lib/seeds.ts b/src/lib/seeds.ts index 700d07c26..4e6133cab 100644 --- a/src/lib/seeds.ts +++ b/src/lib/seeds.ts @@ -1,17 +1,17 @@ -import storedWritable from "@efstajas/svelte-stored-writable"; import type { BaseUrl } from "@httpd-client"; -import { z } from "zod"; -import { api, httpdStore, type HttpdState } from "./httpd"; + +import storedWritable from "@efstajas/svelte-stored-writable"; import { writable, derived, get } from "svelte/store"; +import { number, string, object } from "zod"; + +import { api, httpdStore, type HttpdState } from "./httpd"; import { config } from "./config"; -const preferredSeedSchema = z - .object({ - hostname: z.string(), - port: z.number(), - scheme: z.string(), - }) - .optional(); +const preferredSeedSchema = object({ + hostname: string(), + port: number(), + scheme: string(), +}).optional(); const configuredPreferredSeeds = writable(undefined); const storedPreferredSeed = storedWritable( diff --git a/src/views/home/Index.svelte b/src/views/home/Index.svelte index 8bf69dbe7..e7d7a8b58 100644 --- a/src/views/home/Index.svelte +++ b/src/views/home/Index.svelte @@ -2,61 +2,90 @@ import type { ProjectWithListingData } from "@app/lib/projects"; import type { BaseUrl } from "@httpd-client"; - import { z } from "zod"; import storedWritable from "@efstajas/svelte-stored-writable"; + import { HttpdClient } from "@httpd-client"; + import { derived } from "svelte/store"; + import { literal, union } from "zod"; - import { httpdStore } from "@app/lib/httpd"; + import { api, httpdStore } from "@app/lib/httpd"; + import { deduplicateStore } from "@app/lib/deduplicateStore"; + import { getProjectsListingData } from "@app/lib/projects"; import { isDelegate } from "@app/lib/roles"; + import { prefferedSeeds } from "@app/lib/seeds"; import AppLayout from "@app/App/AppLayout.svelte"; + import Button from "@app/components/Button.svelte"; import ConnectInstructions from "@app/components/ConnectInstructions.svelte"; import ProjectCard from "@app/components/ProjectCard.svelte"; - import Button from "@app/components/Button.svelte"; import FilterButton from "./components/FilterButton.svelte"; + import HomepageSection from "./components/HomepageSection.svelte"; import NewProjectButton from "./components/NewProjectButton.svelte"; import PreferredSeedDropdown from "./components/PreferredSeedDropdown.svelte"; - import HomepageSection from "./components/HomepageSection.svelte"; - export let localProjects: ProjectWithListingData[] | "error"; - export let preferredSeedProjects: ProjectWithListingData[] | "error"; - export let preferredSeed: BaseUrl; - export let nodeId: string | undefined; - - const localProjectsFilterSchema = z.union([ - z.literal("all"), - z.literal("delegating"), + const selectedSeed = deduplicateStore( + derived(prefferedSeeds, $ => $?.selected), + ); + const localProjectsFilterSchema = union([ + literal("all"), + literal("delegating"), ]); - const localProjectsFilter = storedWritable( "localProjectsFilter", localProjectsFilterSchema, "all", ); - $: filteredLocalProjects = - $localProjectsFilter === "all" || localProjects === "error" - ? localProjects - : localProjects.filter(p => isDelegate(nodeId, p.project.delegates)); + let localProjects: ProjectWithListingData[] | "error" | undefined; + let preferredSeedProjects: ProjectWithListingData[] | "error" | undefined; + + async function fetchProjects(baseUrl: BaseUrl, show: "all" | "pinned") { + const api = new HttpdClient(baseUrl); + + const projects = (await api.project.getAll({ perPage: 30, show })).map( + project => ({ + project, + baseUrl, + }), + ); + + return await getProjectsListingData(projects); + } + + function handleProjectLoadError(): "error" { + return "error"; + } + + async function loadLocalProjects() { + localProjects = undefined; + localProjects = await fetchProjects(api.baseUrl, "all").catch( + handleProjectLoadError, + ); + } + + async function loadPreferredSeedProjects() { + preferredSeedProjects = undefined; + + if (!$selectedSeed) return; + preferredSeedProjects = await fetchProjects($selectedSeed, "pinned").catch( + handleProjectLoadError, + ); + } function isSeeding(projectId: string) { if (localProjects === "error") return false; - return localProjects.some(p => p.project.id === projectId); + return localProjects?.some(p => p.project.id === projectId) ?? false; } - let prevHttpdState = $httpdStore.state; - - function handleHttpdStateChange(newState: (typeof $httpdStore)["state"]) { - if (prevHttpdState === newState) return; - - if (newState === "stopped" || newState === "authenticated") { - window.location.reload(); - } - - prevHttpdState = newState; - } - - $: handleHttpdStateChange($httpdStore.state); + $: nodeId = $httpdStore.state !== "stopped" ? $httpdStore.node.id : undefined; + $: nodeId && void loadLocalProjects(); + $: $selectedSeed && void loadPreferredSeedProjects(); + $: filteredLocalProjects = + $localProjectsFilter === "all" || + localProjects === "error" || + localProjects === undefined + ? localProjects + : localProjects.filter(p => isDelegate(nodeId, p.project.delegates));