summaryrefslogtreecommitdiff
path: root/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts
diff options
context:
space:
mode:
authorおさむのひと <46447427+samunohito@users.noreply.github.com>2024-06-08 15:34:19 +0900
committerGitHub <noreply@github.com>2024-06-08 15:34:19 +0900
commit61fae45390283aee7ac582aa5303aae863de0f7a (patch)
tree17182172ef9f932182fc55f2aabd7243d2be66b2 /packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts
parent配信停止したインスタンス一覧が見れなくなる問題を修... (diff)
downloadsharkey-61fae45390283aee7ac582aa5303aae863de0f7a.tar.gz
sharkey-61fae45390283aee7ac582aa5303aae863de0f7a.tar.bz2
sharkey-61fae45390283aee7ac582aa5303aae863de0f7a.zip
feat: 通報を受けた際にメールまたはWebhookで通知を送出出来るようにする (#13758)
* feat: 通報を受けた際にメールまたはWebhookで通知を送出出来るようにする * モデログに対応&エンドポイントを単一オブジェクトでのサポートに変更(API経由で大量に作るシチュエーションもないと思うので) * fix spdx * fix migration * fix migration * fix models * add e2e webhook * tweak * fix modlog * fix bugs * add tests and fix bugs * add tests and fix bugs * add tests * fix path * regenerate locale * 混入除去 * 混入除去 * add abuseReportResolved * fix pnpm-lock.yaml * add abuseReportResolved test * fix bugs * fix ui * add tests * fix CHANGELOG.md * add tests * add RoleService.getModeratorIds tests * WebhookServiceをUserとSystemに分割 * fix CHANGELOG.md * fix test * insertOneを使う用に * fix * regenerate locales * revert version * separate webhook job queue * fix * :art: * Update QueueProcessorService.ts --------- Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com> Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Diffstat (limited to 'packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts')
-rw-r--r--packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts86
1 files changed, 0 insertions, 86 deletions
diff --git a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts b/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts
deleted file mode 100644
index 8c260c0137..0000000000
--- a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import * as Bull from 'bullmq';
-import { DI } from '@/di-symbols.js';
-import type { WebhooksRepository } from '@/models/_.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 { 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({
- server: this.config.url,
- 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.isRetryable) {
- throw new Bull.UnrecoverableError(`${res.statusCode} ${res.statusMessage}`);
- }
-
- // 5xx etc.
- throw new Error(`${res.statusCode} ${res.statusMessage}`);
- } else {
- // DNS error, socket error, timeout ...
- throw res;
- }
- }
- }
-}