diff --git a/src/config.json b/src/config.json index 4067b9fc9..fc909a668 100644 --- a/src/config.json +++ b/src/config.json @@ -3,6 +3,7 @@ "fallbackPublicExplorer": "https://app.radicle.xyz/nodes/$host/$rid$path", "defaultHttpdPort": 443, "defaultLocalHttpdPort": 8080, + "defaultHttpdHostname": "seed.radicle.garden", "defaultHttpdScheme": "https", "defaultNodePort": 8776, "pinned": [ diff --git a/src/lib/config.ts b/src/lib/config.ts index 2db2f8c82..ad7633fc6 100644 --- a/src/lib/config.ts +++ b/src/lib/config.ts @@ -6,6 +6,7 @@ export interface Config { nodes: { fallbackPublicExplorer: string; defaultHttpdPort: number; + defaultHttpdHostname: string; defaultLocalHttpdPort: number; defaultNodePort: number; defaultHttpdScheme: string; @@ -25,6 +26,7 @@ function getConfig(): Config { return { nodes: { fallbackPublicExplorer: "https://app.radicle.xyz/nodes/$host/$rid$path", + defaultHttpdHostname: "127.0.0.1", defaultHttpdPort: 8081, defaultLocalHttpdPort: 8081, defaultHttpdScheme: "http", diff --git a/src/views/projects/Header/ShareButton.svelte b/src/views/projects/Header/ShareButton.svelte index 56c003abc..13d58a44a 100644 --- a/src/views/projects/Header/ShareButton.svelte +++ b/src/views/projects/Header/ShareButton.svelte @@ -36,7 +36,7 @@ seedRoutes.push({ ...route, node: { - hostname: "seed.radicle.garden", + hostname: config.nodes.defaultHttpdHostname, port: config.nodes.defaultHttpdPort, scheme: config.nodes.defaultHttpdScheme, }, diff --git a/tests/e2e/node.spec.ts b/tests/e2e/node.spec.ts index 625493075..3bf116ede 100644 --- a/tests/e2e/node.spec.ts +++ b/tests/e2e/node.spec.ts @@ -11,13 +11,13 @@ test("node metadata", async ({ page, peerManager }) => { const peer = await peerManager.createPeer({ name: "node-metadata-peer", }); - await peer.startHttpd(); await peer.startNode({ policy: "allow", scope: "all", alias: "palm", externalAddresses: ["seed.radicle.test:8123"], }); + await peer.startHttpd(); await page.goto(peer.uiUrl()); diff --git a/tests/e2e/project.spec.ts b/tests/e2e/project.spec.ts index 10baef2e9..a654b1272 100644 --- a/tests/e2e/project.spec.ts +++ b/tests/e2e/project.spec.ts @@ -49,7 +49,7 @@ test("navigate to project", async ({ page }) => { await expect(page.getByText("Git test repository")).toBeVisible(); // Number of nodes seeding this project. - await expect(page.getByText("Seed 4")).toBeVisible(); + await expect(page.getByText("Seed 3")).toBeVisible(); }); test("show source tree at specific revision", async ({ page }) => { diff --git a/tests/e2e/project/commits.spec.ts b/tests/e2e/project/commits.spec.ts index 4141b6ed7..0bd02af15 100644 --- a/tests/e2e/project/commits.spec.ts +++ b/tests/e2e/project/commits.spec.ts @@ -130,8 +130,8 @@ test("pushing changes while viewing history", async ({ page, peerManager }) => { name: "alice", gitOptions: gitOptions["alice"], }); - await alice.startHttpd(); await alice.startNode(); + await alice.startHttpd(); const { rid, projectFolder } = await createProject(alice, { name: "alice-project", }); diff --git a/tests/support/fixtures.ts b/tests/support/fixtures.ts index 95337e603..a7e5ddb16 100644 --- a/tests/support/fixtures.ts +++ b/tests/support/fixtures.ts @@ -74,6 +74,7 @@ export const test = base.extend<{ fallbackPublicExplorer: "https://app.radicle.xyz/nodes/$host/$rid$path", defaultHttpdPort: 8081, + defaultHttpdHostname: "127.0.0.1", defaultLocalHttpdPort: 8081, defaultHttpdScheme: "http", defaultNodePort: 8776, @@ -148,8 +149,8 @@ export const test = base.extend<{ gitOptions: gitOptions["bob"], }); - await peer.startHttpd(); await peer.startNode(); + await peer.startHttpd(); const { stdout } = await peer.spawn("rad-web", [ "http://localhost:3001", "--no-open", @@ -200,7 +201,8 @@ export function appConfigWithFixture(defaultLocalHttpdPort = 8081) { nodes: { fallbackPublicExplorer: "https://app.radicle.xyz/nodes/$host/$rid$path", defaultHttpdPort: 8081, - defaultLocalHttpdPort: defaultLocalHttpdPort, + defaultHttpdHostname: "127.0.0.1", + defaultLocalHttpdPort, defaultHttpdScheme: "http", defaultNodePort: 8776, pinned: [ diff --git a/tests/support/globalSetup.ts b/tests/support/globalSetup.ts index 63ba47c37..7ffeaef50 100644 --- a/tests/support/globalSetup.ts +++ b/tests/support/globalSetup.ts @@ -50,11 +50,9 @@ export default async function globalSetup(): Promise<() => void> { gitOptions: gitOptions["alice"], }); - await palm.startHttpd(defaultHttpdPort); - if (!process.env.SKIP_FIXTURE_CREATION) { - await palm.startHttpd(defaultHttpdPort); await palm.startNode({ policy: "allow", scope: "all", alias: "palm" }); + await palm.startHttpd(defaultHttpdPort); try { console.log("Creating source-browsing fixture"); @@ -74,6 +72,8 @@ export default async function globalSetup(): Promise<() => void> { process.exit(1); } await palm.stopNode(); + } else { + await palm.startHttpd(defaultHttpdPort); } return async () => { diff --git a/tests/support/peerManager.ts b/tests/support/peerManager.ts index 248a2f38d..5c1e75e04 100644 --- a/tests/support/peerManager.ts +++ b/tests/support/peerManager.ts @@ -121,6 +121,8 @@ export async function createPeerManager(createParams: { } export const NodeConfigSchema = object({ + publicExplorer: string(), + preferredSeeds: array(string()), node: object({ alias: string(), peers: union([ @@ -134,8 +136,8 @@ export const NodeConfigSchema = object({ limits: object({ routingMaxSize: number(), routingMaxAge: number(), - fetchConcurrency: number(), gossipMaxAge: number(), + fetchConcurrency: number(), maxOpenFiles: number(), rate: object({ inbound: object({ fillRate: number(), capacity: number() }), @@ -300,22 +302,6 @@ export class RadiclePeer { await updateNodeConfig(this.#radHome, nodeParams); - // Because of a bug in `radicle-node`, `limits.gossipMaxAge` is not included - // in the default config. We add it manually. - await updateNodeConfig(this.#radHome, { - limits: { - routingMaxSize: 1000, - routingMaxAge: 604800, - fetchConcurrency: 1, - gossipMaxAge: 1209600, - maxOpenFiles: 4096, - rate: { - inbound: { fillRate: 0.2, capacity: 32 }, - outbound: { fillRate: 1.0, capacity: 64 }, - }, - }, - }); - this.#nodeProcess = this.spawn("radicle-node", [ "--listen", this.#listenSocketAddr, @@ -453,12 +439,13 @@ async function updateNodeConfig( nodeParams: Partial, ) { const configPath = Path.join(radHome, "config.json"); - const config = await Fs.readFile(configPath, "utf-8"); - const nodeConfig = NodeConfigSchema.parse(JSON.parse(config)); - nodeConfig.node = { - ...nodeConfig.node, + const configFile = await Fs.readFile(configPath, "utf-8"); + const config = NodeConfigSchema.parse(JSON.parse(configFile)); + config.preferredSeeds = []; + config.node = { + ...config.node, network: "test", ...nodeParams, }; - await Fs.writeFile(configPath, JSON.stringify(nodeConfig), "utf-8"); + await Fs.writeFile(configPath, JSON.stringify(config), "utf-8"); }