Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: update ap libs to use core request lib

Browse Source
This commit is contained in:
Julian Lam
2023-12-19 14:33:38 -05:00
parent 510763af30
commit 5c881d3f51
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/activitypub/helpers.js
View File

@@ -1,11 +1,11 @@
'use strict'; 'use strict';
const request = require('request-promise-native');
const { generateKeyPairSync } = require('crypto'); const { generateKeyPairSync } = require('crypto');
const winston = require('winston'); const winston = require('winston');
const nconf = require('nconf'); const nconf = require('nconf');
const validator = require('validator'); const validator = require('validator');
const request = require('../request');
const db = require('../database'); const db = require('../database');
const ttl = require('../cache/ttl'); const ttl = require('../cache/ttl');
const user = require('../user'); const user = require('../user');
@@ -25,24 +25,20 @@ Helpers.query = async (id) => {
} }
// Make a webfinger query to retrieve routing information // Make a webfinger query to retrieve routing information
const response = await request(`https://${hostname}/.well-known/webfinger?resource=acct:${id}`, { const { response, body } = await request.get(`https://${hostname}/.well-known/webfinger?resource=acct:${id}`);
simple: false,
resolveWithFullResponse: true,
json: true,
});
if (response.statusCode !== 200 || !response.body.hasOwnProperty('links')) { if (response.statusCode !== 200 || !body.hasOwnProperty('links')) {
return false; return false;
} }
// Parse links to find actor endpoint // Parse links to find actor endpoint
let actorUri = response.body.links.filter(link => link.type === 'application/activity+json' && link.rel === 'self'); let actorUri = body.links.filter(link => link.type === 'application/activity+json' && link.rel === 'self');
if (actorUri.length) { if (actorUri.length) {
actorUri = actorUri.pop(); actorUri = actorUri.pop();
({ href: actorUri } = actorUri); ({ href: actorUri } = actorUri);
} }
const { publicKey } = response.body; const { publicKey } = body;
webfingerCache.set(id, { username, hostname, actorUri, publicKey }); webfingerCache.set(id, { username, hostname, actorUri, publicKey });
return { username, hostname, actorUri, publicKey }; return { username, hostname, actorUri, publicKey };

16
src/activitypub/index.js
View File

@@ -1,10 +1,10 @@
'use strict'; 'use strict';
const request = require('request-promise-native');
const nconf = require('nconf'); const nconf = require('nconf');
const { createHash, createSign, createVerify } = require('crypto'); const { createHash, createSign, createVerify } = require('crypto');
const validator = require('validator'); const validator = require('validator');
const request = require('../request');
const db = require('../database'); const db = require('../database');
const user = require('../user'); const user = require('../user');
const ttl = require('../cache/ttl'); const ttl = require('../cache/ttl');
@@ -39,12 +39,10 @@ ActivityPub.getActor = async (input) => {
return actorCache.get(uri); return actorCache.get(uri);
} }
const actor = await request({ const { body: actor } = await request.get(uri, {
uri,
headers: { headers: {
Accept: 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', Accept: 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
}, },
json: true,
}); });
actor.hostname = new URL(uri).hostname; actor.hostname = new URL(uri).hostname;
@@ -84,7 +82,7 @@ ActivityPub.getPrivateKey = async (uid) => {
ActivityPub.fetchPublicKey = async (uri) => { ActivityPub.fetchPublicKey = async (uri) => {
// Used for retrieving the public key from the passed-in keyId uri // Used for retrieving the public key from the passed-in keyId uri
const { publicKey } = await request({ const { body } = await request.get({
uri, uri,
headers: { headers: {
Accept: 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', Accept: 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
@@ -92,7 +90,7 @@ ActivityPub.fetchPublicKey = async (uri) => {
json: true, json: true,
}); });
return publicKey; return body.publicKey;
}; };
ActivityPub.sign = async (uid, url, payload) => { ActivityPub.sign = async (uid, url, payload) => {
@@ -193,8 +191,7 @@ ActivityPub.send = async (uid, targets, payload) => {
await Promise.all(inboxes.map(async (uri) => { await Promise.all(inboxes.map(async (uri) => {
const { date, digest, signature } = await ActivityPub.sign(uid, uri, payload); const { date, digest, signature } = await ActivityPub.sign(uid, uri, payload);
const response = await request(uri, { const response = await request.post(uri, {
method: 'post',
headers: { headers: {
date, date,
digest, digest,
@@ -202,10 +199,7 @@ ActivityPub.send = async (uid, targets, payload) => {
'content-type': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', 'content-type': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
accept: 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', accept: 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
}, },
json: true,
body: payload, body: payload,
simple: false,
resolveWithFullResponse: true,
}); });
if (response.statusCode !== 201) { if (response.statusCode !== 201) {