diff --git a/httpd-client/index.ts b/httpd-client/index.ts index 3543a2723..788b33b7c 100644 --- a/httpd-client/index.ts +++ b/httpd-client/index.ts @@ -102,39 +102,33 @@ const nodeStatsSchema = object({ export class HttpdClient { #fetcher: Fetcher; - #baseUrl: BaseUrl; + public baseUrl: BaseUrl; public project: project.Client; public session: session.Client; public constructor(baseUrl: BaseUrl) { - this.#baseUrl = baseUrl; - this.#fetcher = new Fetcher(this.#baseUrl); + this.baseUrl = baseUrl; + this.#fetcher = new Fetcher(this.baseUrl); this.project = new project.Client(this.#fetcher); this.session = new session.Client(this.#fetcher); } public changePort(port: number): void { - this.#baseUrl.port = port; + this.baseUrl.port = port; } public get url(): string { - return `${this.#baseUrl.scheme}://${this.#baseUrl.hostname}:${ - this.#baseUrl.port - }`; - } - - public get hostAndPort(): string { - return `${this.#baseUrl.hostname}:${this.#baseUrl.port}`; + return `${this.baseUrl.scheme}://${this.baseUrl.hostname}:${this.baseUrl.port}`; } public get hostname(): string { - return this.#baseUrl.hostname; + return this.baseUrl.hostname; } public get port(): string { - return this.#baseUrl.port.toString(); + return this.baseUrl.port.toString(); } public async getNodeInfo(options?: RequestOptions): Promise { diff --git a/src/App/Header/Connect.svelte b/src/App/Header/Connect.svelte index b207cfc06..5d3fb59fa 100644 --- a/src/App/Header/Connect.svelte +++ b/src/App/Header/Connect.svelte @@ -120,7 +120,7 @@ route={{ resource: "seeds", params: { - hostAndPort: httpd.api.hostAndPort, + baseUrl: httpd.api.baseUrl, projectPageIndex: 0, }, }}> @@ -153,7 +153,7 @@ route={{ resource: "seeds", params: { - hostAndPort: httpd.api.hostAndPort, + baseUrl: httpd.api.baseUrl, projectPageIndex: 0, }, }}> diff --git a/src/App/Header/Search.svelte b/src/App/Header/Search.svelte index 0a3b2c131..f15047216 100644 --- a/src/App/Header/Search.svelte +++ b/src/App/Header/Search.svelte @@ -6,7 +6,7 @@ import * as modal from "@app/lib/modal"; import * as router from "@app/lib/router"; import { searchPlaceholder } from "@app/lib/shared"; - import { getHostAndPort, unreachable } from "@app/lib/utils"; + import { unreachable } from "@app/lib/utils"; import Icon from "@app/components/Icon.svelte"; import SearchResultsModal from "@app/App/Header/SearchResultsModal.svelte"; @@ -54,7 +54,7 @@ view: { resource: "tree" }, id: project.id, peer: undefined, - hostAndPort: getHostAndPort(baseUrl), + baseUrl, hash: undefined, search: undefined, }, diff --git a/src/App/Header/SearchResultsModal.svelte b/src/App/Header/SearchResultsModal.svelte index 432557797..3158a9f6f 100644 --- a/src/App/Header/SearchResultsModal.svelte +++ b/src/App/Header/SearchResultsModal.svelte @@ -2,7 +2,7 @@ import type { ProjectBaseUrl } from "@app/lib/search"; import * as modal from "@app/lib/modal"; - import { formatRepositoryId, getHostAndPort } from "@app/lib/utils"; + import { formatRepositoryId } from "@app/lib/utils"; import Link from "@app/components/Link.svelte"; import Modal from "@app/components/Modal.svelte"; @@ -40,7 +40,7 @@ resource: "projects", params: { view: { resource: "tree" }, - hostAndPort: getHostAndPort(result.baseUrl), + baseUrl: result.baseUrl, id: result.project.id, }, }}> diff --git a/src/lib/router.ts b/src/lib/router.ts index a37ebbfe8..d91e108ca 100644 --- a/src/lib/router.ts +++ b/src/lib/router.ts @@ -1,14 +1,16 @@ +import type { BaseUrl } from "@httpd-client"; import type { LoadedRoute, Route } from "@app/lib/router/definitions"; import { get, writable } from "svelte/store"; import * as mutexExecutor from "@app/lib/mutexExecutor"; -import { loadRoute } from "@app/lib/router/definitions"; -import { unreachable } from "@app/lib/utils"; +import * as utils from "@app/lib/utils"; +import { config } from "@app/lib/config"; import { createProjectRoute, resolveProjectRoute, } from "@app/views/projects/router"; +import { loadRoute } from "@app/lib/router/definitions"; // Only used by Safari. const DOCUMENT_TITLE = "Radicle Interface"; @@ -118,6 +120,34 @@ export async function replace(newRoute: Route): Promise { await navigate("replace", newRoute); } +function extractBaseUrl(hostAndPort: string): BaseUrl { + if ( + hostAndPort === "radicle.local" || + hostAndPort === "radicle.local:8080" || + hostAndPort === "0.0.0.0" || + hostAndPort === "0.0.0.0:8080" || + hostAndPort === "127.0.0.1" || + hostAndPort === "127.0.0.1:8080" + ) { + return { hostname: "127.0.0.1", port: 8080, scheme: "http" }; + } else if (hostAndPort.includes(":")) { + const [hostname, port] = hostAndPort.split(":"); + return { + hostname, + port: Number(port), + scheme: utils.isLocal(hostname) + ? "http" + : config.seeds.defaultHttpdScheme, + }; + } else { + return { + hostname: hostAndPort, + port: config.seeds.defaultHttpdPort, + scheme: config.seeds.defaultHttpdScheme, + }; + } +} + function pathToRoute(url: URL): Route | null { const segments = url.pathname.substring(1).split("/"); @@ -126,6 +156,7 @@ function pathToRoute(url: URL): Route | null { case "seeds": { const hostAndPort = segments.shift(); if (hostAndPort) { + const baseUrl = extractBaseUrl(hostAndPort); const id = segments.shift(); if (id) { // Allows project paths with or without trailing slash @@ -139,17 +170,17 @@ function pathToRoute(url: URL): Route | null { view: { resource: "tree" }, id, peer: undefined, - hostAndPort, + baseUrl, }, }; } - const params = resolveProjectRoute(url, hostAndPort, id, segments); + const params = resolveProjectRoute(url, baseUrl, id, segments); if (params) { return { resource: "projects", params: { ...params, - hostAndPort, + baseUrl, id, }, }; @@ -158,7 +189,7 @@ function pathToRoute(url: URL): Route | null { } return { resource: "seeds", - params: { hostAndPort, projectPageIndex: 0 }, + params: { baseUrl, projectPageIndex: 0 }, }; } return null; @@ -186,17 +217,27 @@ function pathToRoute(url: URL): Route | null { } } +function seedPath(baseUrl: BaseUrl) { + const port = baseUrl.port ?? config.seeds.defaultHttpdPort; + + if (port === config.seeds.defaultHttpdPort) { + return `/seeds/${baseUrl.hostname}`; + } else { + return `/seeds/${baseUrl.hostname}:${port}`; + } +} + export function routeToPath(route: Route) { if (route.resource === "home") { return "/"; } else if (route.resource === "session") { return `/session?id=${route.params.id}&sig=${route.params.signature}&pk=${route.params.publicKey}`; } else if (route.resource === "seeds") { - return `/seeds/${route.params.hostAndPort}`; + return seedPath(route.params.baseUrl); } else if (route.resource === "loadError") { return ""; } else if (route.resource === "projects") { - const hostAndPortPrefix = `/seeds/${route.params.hostAndPort}`; + const seed = seedPath(route.params.baseUrl); const content = `/${route.params.view.resource}`; let peer = ""; @@ -230,38 +271,38 @@ export function routeToPath(route: Route) { if (route.params.view.resource === "tree") { if (suffix) { - return `${hostAndPortPrefix}/${route.params.id}${peer}/tree${suffix}`; + return `${seed}/${route.params.id}${peer}/tree${suffix}`; } - return `${hostAndPortPrefix}/${route.params.id}${peer}`; + return `${seed}/${route.params.id}${peer}`; } else if (route.params.view.resource === "commits") { - return `${hostAndPortPrefix}/${route.params.id}${peer}/commits${suffix}`; + return `${seed}/${route.params.id}${peer}/commits${suffix}`; } else if (route.params.view.resource === "history") { - return `${hostAndPortPrefix}/${route.params.id}${peer}/history${suffix}`; + return `${seed}/${route.params.id}${peer}/history${suffix}`; } else if ( route.params.view.resource === "issues" && route.params.view.params?.view.resource === "new" ) { - return `${hostAndPortPrefix}/${route.params.id}${peer}/issues/new${suffix}`; + return `${seed}/${route.params.id}${peer}/issues/new${suffix}`; } else if (route.params.view.resource === "issues") { - return `${hostAndPortPrefix}/${route.params.id}${peer}/issues${suffix}`; + return `${seed}/${route.params.id}${peer}/issues${suffix}`; } else if (route.params.view.resource === "issue") { - return `${hostAndPortPrefix}/${route.params.id}${peer}/issues/${route.params.view.params.issue}`; + return `${seed}/${route.params.id}${peer}/issues/${route.params.view.params.issue}`; } else if (route.params.view.resource === "patches") { - return `${hostAndPortPrefix}/${route.params.id}${peer}/patches${suffix}`; + return `${seed}/${route.params.id}${peer}/patches${suffix}`; } else if (route.params.view.resource === "patch") { if (route.params.view.params.revision) { - return `${hostAndPortPrefix}/${route.params.id}${peer}/patches/${route.params.view.params.patch}/${route.params.view.params.revision}${suffix}`; + return `${seed}/${route.params.id}${peer}/patches/${route.params.view.params.patch}/${route.params.view.params.revision}${suffix}`; } - return `${hostAndPortPrefix}/${route.params.id}${peer}/patches/${route.params.view.params.patch}${suffix}`; + return `${seed}/${route.params.id}${peer}/patches/${route.params.view.params.patch}${suffix}`; } else { - return `${hostAndPortPrefix}/${route.params.id}${peer}${content}`; + return `${seed}/${route.params.id}${peer}${content}`; } } else if (route.resource === "booting") { return ""; } else if (route.resource === "notFound") { return route.params.url; } else { - unreachable(route); + utils.unreachable(route); } } diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 4af7b7ed8..f7b8eb888 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -5,7 +5,6 @@ import bs58 from "bs58"; import twemojiModule from "twemoji"; import { base } from "@app/lib/router"; -import { config } from "@app/lib/config"; export async function toClipboard(text: string): Promise { await navigator.clipboard.writeText(text); @@ -244,38 +243,6 @@ export function twemoji( }); } -export function extractBaseUrl(hostAndPort: string): BaseUrl { - if ( - hostAndPort === "radicle.local" || - hostAndPort === "radicle.local:8080" || - hostAndPort === "0.0.0.0" || - hostAndPort === "0.0.0.0:8080" || - hostAndPort === "127.0.0.1" || - hostAndPort === "127.0.0.1:8080" - ) { - return { hostname: "127.0.0.1", port: 8080, scheme: "http" }; - } else if (hostAndPort.includes(":")) { - const [hostname, port] = hostAndPort.split(":"); - return { - hostname, - port: Number(port), - scheme: isLocal(hostname) ? "http" : config.seeds.defaultHttpdScheme, - }; - } else { - return { - hostname: hostAndPort, - port: config.seeds.defaultHttpdPort, - scheme: config.seeds.defaultHttpdScheme, - }; - } -} - -export function getHostAndPort(baseUrl: BaseUrl): string { - return baseUrl.port === config.seeds.defaultHttpdPort - ? baseUrl.hostname - : `${baseUrl.hostname}:${baseUrl.port}`; -} - export function createAddRemoveArrays( currentArray: string[], newArray: string[], diff --git a/src/views/home/Index.svelte b/src/views/home/Index.svelte index 4c3d5aaef..c59102b36 100644 --- a/src/views/home/Index.svelte +++ b/src/views/home/Index.svelte @@ -1,7 +1,7 @@