worldcone/cherrypick
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

feat: nodeinfo 2.1 (#11805)

Browse source 
* feat: enable nodeinfo 2.1

Since 9dd06a7621, nodeinfo 2.1 has been released.

Signed-off-by: xtex <xtexchooser@duck.com>

* feat: only add software.repository to nodeinfo 2.1

e54c48e171
Signed-off-by: xtex <xtexchooser@duck.com>

* feat: add software.homepage url to nodeinfo 2.1

507822cb3c
Signed-off-by: xtex <xtexchooser@duck.com>

* fix: set proper Content-Type for nodeinfo

Signed-off-by: xtex <xtexchooser@duck.com>

* style: fix lint warnings

Signed-off-by: xtex <xtexchooser@duck.com>

---------

Signed-off-by: xtex <xtexchooser@duck.com>
This commit is contained in:
xtex 2023-09-10 15:16:00 +08:00 committed by GitHub
parent 8749716700
commit 054ba3fea5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
packages/backend/src/server/NodeinfoServerService.ts
View file

@ -35,10 +35,10 @@ export class NodeinfoServerService {
@bindThis @bindThis
public getLinks() { public getLinks() {
return [/* (awaiting release) { return [{
rel: 'http://nodeinfo.diaspora.software/ns/schema/2.1', rel: 'http://nodeinfo.diaspora.software/ns/schema/2.1',
href: config.url + nodeinfo2_1path href: this.config.url + nodeinfo2_1path
}, */{ }, {
rel: 'http://nodeinfo.diaspora.software/ns/schema/2.0', rel: 'http://nodeinfo.diaspora.software/ns/schema/2.0',
href: this.config.url + nodeinfo2_0path, href: this.config.url + nodeinfo2_0path,
}]; }];
@ -46,7 +46,7 @@ export class NodeinfoServerService {
@bindThis @bindThis
public createServer(fastify: FastifyInstance, options: FastifyPluginOptions, done: (err?: Error) => void) { public createServer(fastify: FastifyInstance, options: FastifyPluginOptions, done: (err?: Error) => void) {
const nodeinfo2 = async () => { const nodeinfo2 = async (version: number) => {
const now = Date.now(); const now = Date.now();
const notesChart = await this.notesChart.getChart('hour', 1, null); const notesChart = await this.notesChart.getChart('hour', 1, null);
@ -73,11 +73,11 @@ export class NodeinfoServerService {
const basePolicies = { ...DEFAULT_POLICIES, ...meta.policies }; const basePolicies = { ...DEFAULT_POLICIES, ...meta.policies };
return { // eslint-disable-next-line @typescript-eslint/no-explicit-any
const document: any = {
software: { software: {
name: 'misskey', name: 'misskey',
version: this.config.version, version: this.config.version,
repository: meta.repositoryUrl,
}, },
protocols: ['activitypub'], protocols: ['activitypub'],
services: { services: {
@ -114,23 +114,36 @@ export class NodeinfoServerService {
themeColor: meta.themeColor ?? '#86b300', themeColor: meta.themeColor ?? '#86b300',
}, },
}; };
if (version >= 21) {
document.software.repository = meta.repositoryUrl;
document.software.homepage = meta.repositoryUrl;
}
return document;
}; };
const cache = new MemorySingleCache<Awaited<ReturnType<typeof nodeinfo2>>>(1000 * 60 * 10); const cache = new MemorySingleCache<Awaited<ReturnType<typeof nodeinfo2>>>(1000 * 60 * 10);
fastify.get(nodeinfo2_1path, async (request, reply) => { fastify.get(nodeinfo2_1path, async (request, reply) => {
const base = await cache.fetch(() => nodeinfo2()); const base = await cache.fetch(() => nodeinfo2(21));
reply.header('Cache-Control', 'public, max-age=600'); reply
.type(
'application/json; profile="http://nodeinfo.diaspora.software/ns/schema/2.1#"',
)
.header('Cache-Control', 'public, max-age=600');
return { version: '2.1', ...base }; return { version: '2.1', ...base };
}); });
fastify.get(nodeinfo2_0path, async (request, reply) => { fastify.get(nodeinfo2_0path, async (request, reply) => {
const base = await cache.fetch(() => nodeinfo2()); const base = await cache.fetch(() => nodeinfo2(20));
delete (base as any).software.repository; delete (base as any).software.repository;
reply.header('Cache-Control', 'public, max-age=600'); reply
.type(
'application/json; profile="http://nodeinfo.diaspora.software/ns/schema/2.0#"',
)
.header('Cache-Control', 'public, max-age=600');
return { version: '2.0', ...base }; return { version: '2.0', ...base };
}); });