From 52ad5049dece657d7c7cdfa0958c01b5ce918fc3 Mon Sep 17 00:00:00 2001 From: Francis Dinh Date: Mon, 31 Oct 2022 18:54:02 -0400 Subject: [PATCH 1/5] backend: refactor server/nodeinfo.ts This fixes a few type errors like removing `software.respository` in NodeInfo 2.0 and updating `metadata.repositoryUrl` to not use the now removed meta `repositoryUrl` field. --- packages/backend/src/server/nodeinfo.ts | 34 ++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/packages/backend/src/server/nodeinfo.ts b/packages/backend/src/server/nodeinfo.ts index 1ea3aa2b2..7054dd3f5 100644 --- a/packages/backend/src/server/nodeinfo.ts +++ b/packages/backend/src/server/nodeinfo.ts @@ -18,7 +18,33 @@ export const links = [{ href: config.url + nodeinfo2_0path, }]; -const nodeinfo2 = async () => { +const repository = 'https://akkoma.dev/FoundKeyGang/FoundKey'; + +type NodeInfo2Base = { + software: { + name: string; + version: string; + repository?: string; // Not used in NodeInfo 2.0; used in 2.1 + }; + protocols: string[]; + services: { + inbound: string[]; + outbound: string[]; + }; + openRegistrations: boolean; + usage: { + users: { + total: number; + activeHalfyear: number; + activeMonth: number; + }; + localPosts: number; + localComments: number; + }; + metadata: Record; +}; + +const nodeinfo2 = async (): Promise => { const now = Date.now(); const [ meta, @@ -40,7 +66,7 @@ const nodeinfo2 = async () => { software: { name: 'foundkey', version: config.version, - repository: 'https://akkoma.dev/FoundKeyGang/FoundKey', + repository, }, protocols: ['activitypub'], services: { @@ -62,7 +88,7 @@ const nodeinfo2 = async () => { }, langs: meta.langs, tosUrl: meta.ToSUrl, - repositoryUrl: meta.repositoryUrl, + repositoryUrl: repository, feedbackUrl: 'ircs://irc.akkoma.dev/foundkey', disableRegistration: meta.disableRegistration, disableLocalTimeline: meta.disableLocalTimeline, @@ -82,7 +108,7 @@ const nodeinfo2 = async () => { }; }; -const cache = new Cache>>(1000 * 60 * 10); +const cache = new Cache(1000 * 60 * 10); router.get(nodeinfo2_1path, async ctx => { const base = await cache.fetch(null, () => nodeinfo2()); -- 2.34.1 From f950b08dbfe3c09a23e185c55a204f84e924faad Mon Sep 17 00:00:00 2001 From: Francis Dinh Date: Mon, 31 Oct 2022 19:00:09 -0400 Subject: [PATCH 2/5] use time constant in nodeinfo --- packages/backend/src/server/nodeinfo.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/server/nodeinfo.ts b/packages/backend/src/server/nodeinfo.ts index 7054dd3f5..917ce0be8 100644 --- a/packages/backend/src/server/nodeinfo.ts +++ b/packages/backend/src/server/nodeinfo.ts @@ -4,6 +4,7 @@ import config from '@/config/index.js'; import { fetchMeta } from '@/misc/fetch-meta.js'; import { Users, Notes } from '@/models/index.js'; import { Cache } from '@/misc/cache.js'; +import { MINUTE, SECOND } from '@/const.js'; const router = new Router(); @@ -108,7 +109,7 @@ const nodeinfo2 = async (): Promise => { }; }; -const cache = new Cache(1000 * 60 * 10); +const cache = new Cache(10 * MINUTE); router.get(nodeinfo2_1path, async ctx => { const base = await cache.fetch(null, () => nodeinfo2()); -- 2.34.1 From f1efcf260af1a1533fd173648f41b45ab68ac8f5 Mon Sep 17 00:00:00 2001 From: Francis Dinh Date: Mon, 31 Oct 2022 19:00:46 -0400 Subject: [PATCH 3/5] remove SECOND import --- packages/backend/src/server/nodeinfo.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/src/server/nodeinfo.ts b/packages/backend/src/server/nodeinfo.ts index 917ce0be8..f2c9e6031 100644 --- a/packages/backend/src/server/nodeinfo.ts +++ b/packages/backend/src/server/nodeinfo.ts @@ -4,7 +4,7 @@ import config from '@/config/index.js'; import { fetchMeta } from '@/misc/fetch-meta.js'; import { Users, Notes } from '@/models/index.js'; import { Cache } from '@/misc/cache.js'; -import { MINUTE, SECOND } from '@/const.js'; +import { MINUTE } from '@/const.js'; const router = new Router(); -- 2.34.1 From 4abfacaf16dc3cbb71cd25d77fed4072360f5329 Mon Sep 17 00:00:00 2001 From: Francis Dinh Date: Wed, 2 Nov 2022 17:40:04 -0400 Subject: [PATCH 4/5] remove cache --- packages/backend/src/server/nodeinfo.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/backend/src/server/nodeinfo.ts b/packages/backend/src/server/nodeinfo.ts index f2c9e6031..fe5b3b61a 100644 --- a/packages/backend/src/server/nodeinfo.ts +++ b/packages/backend/src/server/nodeinfo.ts @@ -109,17 +109,15 @@ const nodeinfo2 = async (): Promise => { }; }; -const cache = new Cache(10 * MINUTE); - router.get(nodeinfo2_1path, async ctx => { - const base = await cache.fetch(null, () => nodeinfo2()); + const base = await nodeinfo2(); ctx.body = { version: '2.1', ...base }; ctx.set('Cache-Control', 'public, max-age=600'); }); router.get(nodeinfo2_0path, async ctx => { - const base = await cache.fetch(null, () => nodeinfo2()); + const base = await nodeinfo2(); delete base.software.repository; -- 2.34.1 From 2c9bf52bd4dc9f410ef97c28727a8acc40755338 Mon Sep 17 00:00:00 2001 From: Francis Dinh Date: Wed, 2 Nov 2022 17:41:16 -0400 Subject: [PATCH 5/5] cleanup unused imports --- packages/backend/src/server/nodeinfo.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/backend/src/server/nodeinfo.ts b/packages/backend/src/server/nodeinfo.ts index fe5b3b61a..9037b8ab2 100644 --- a/packages/backend/src/server/nodeinfo.ts +++ b/packages/backend/src/server/nodeinfo.ts @@ -3,8 +3,6 @@ import { IsNull, MoreThan } from 'typeorm'; import config from '@/config/index.js'; import { fetchMeta } from '@/misc/fetch-meta.js'; import { Users, Notes } from '@/models/index.js'; -import { Cache } from '@/misc/cache.js'; -import { MINUTE } from '@/const.js'; const router = new Router(); -- 2.34.1