sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ActivityPubのHTTPリクエストの強化 (#2820)

Browse Source 
* Fix error handling in AP deliver

* Set timeout to resolver

* Tune looks
This commit is contained in:
MeiMei
2018-10-05 01:58:41 +09:00
committed by syuilo
parent baf9b65801
commit f243ce66e7
3 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/remote/activitypub/request.ts
View File

@ -12,6 +12,8 @@ const log = debug('misskey:activitypub:deliver');
export default (user: ILocalUser, url: string, object: any) => new Promise((resolve, reject) => {
log(`--> ${url}`);
const timeout = 10 * 1000;
const { protocol, hostname, port, pathname, search } = new URL(url);
const data = JSON.stringify(object);
@ -26,6 +28,7 @@ export default (user: ILocalUser, url: string, object: any) => new Promise((reso
port,
method: 'POST',
path: pathname + search,
timeout,
headers: {
'User-Agent': config.user_agent,
'Content-Type': 'application/activity+json',
@ -35,7 +38,7 @@ export default (user: ILocalUser, url: string, object: any) => new Promise((reso
log(`${url} --> ${res.statusCode}`);
if (res.statusCode >= 400) {
reject();
reject(res);
} else {
resolve();
}
@ -53,5 +56,12 @@ export default (user: ILocalUser, url: string, object: any) => new Promise((reso
sig = sig.replace(/^Signature /, '');
req.setHeader('Signature', sig);
req.on('timeout', () => req.abort());
req.on('error', e => {
if (req.aborted) reject('timeout');
reject(e);
});
req.end(data);
});