62efe2b4d5
* fix: webhook delivery content-type (#9823) * style: indent * Update packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com> * style: trailing comma --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
81 lines
2.3 KiB
TypeScript
81 lines
2.3 KiB
TypeScript
import { Inject, Injectable } from '@nestjs/common';
|
|
import { DI } from '@/di-symbols.js';
|
|
import type { WebhooksRepository } from '@/models/index.js';
|
|
import type { Config } from '@/config.js';
|
|
import type Logger from '@/logger.js';
|
|
import { HttpRequestService } from '@/core/HttpRequestService.js';
|
|
import { StatusError } from '@/misc/status-error.js';
|
|
import { bindThis } from '@/decorators.js';
|
|
import { QueueLoggerService } from '../QueueLoggerService.js';
|
|
import type Bull from 'bull';
|
|
import type { WebhookDeliverJobData } from '../types.js';
|
|
|
|
@Injectable()
|
|
export class WebhookDeliverProcessorService {
|
|
private logger: Logger;
|
|
|
|
constructor(
|
|
@Inject(DI.config)
|
|
private config: Config,
|
|
|
|
@Inject(DI.webhooksRepository)
|
|
private webhooksRepository: WebhooksRepository,
|
|
|
|
private httpRequestService: HttpRequestService,
|
|
private queueLoggerService: QueueLoggerService,
|
|
) {
|
|
this.logger = this.queueLoggerService.logger.createSubLogger('webhook');
|
|
}
|
|
|
|
@bindThis
|
|
public async process(job: Bull.Job<WebhookDeliverJobData>): Promise<string> {
|
|
try {
|
|
this.logger.debug(`delivering ${job.data.webhookId}`);
|
|
|
|
const res = await this.httpRequestService.send(job.data.to, {
|
|
method: 'POST',
|
|
headers: {
|
|
'User-Agent': 'Misskey-Hooks',
|
|
'X-Misskey-Host': this.config.host,
|
|
'X-Misskey-Hook-Id': job.data.webhookId,
|
|
'X-Misskey-Hook-Secret': job.data.secret,
|
|
'Content-Type': 'application/json',
|
|
},
|
|
body: JSON.stringify({
|
|
hookId: job.data.webhookId,
|
|
userId: job.data.userId,
|
|
eventId: job.data.eventId,
|
|
createdAt: job.data.createdAt,
|
|
type: job.data.type,
|
|
body: job.data.content,
|
|
}),
|
|
});
|
|
|
|
this.webhooksRepository.update({ id: job.data.webhookId }, {
|
|
latestSentAt: new Date(),
|
|
latestStatus: res.status,
|
|
});
|
|
|
|
return 'Success';
|
|
} catch (res) {
|
|
this.webhooksRepository.update({ id: job.data.webhookId }, {
|
|
latestSentAt: new Date(),
|
|
latestStatus: res instanceof StatusError ? res.statusCode : 1,
|
|
});
|
|
|
|
if (res instanceof StatusError) {
|
|
// 4xx
|
|
if (res.isClientError) {
|
|
return `${res.statusCode} ${res.statusMessage}`;
|
|
}
|
|
|
|
// 5xx etc.
|
|
throw `${res.statusCode} ${res.statusMessage}`;
|
|
} else {
|
|
// DNS error, socket error, timeout ...
|
|
throw res;
|
|
}
|
|
}
|
|
}
|
|
}
|