From 61215e50ff9e4c84787c8d99c75fd36dafbd8815 Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <saschanaz@outlook.com>
Date: Fri, 3 Mar 2023 03:13:12 +0100
Subject: test(backend): APIテストの復活 (#10163)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Revert 1c5291f8185651c231903129ee7c1cee263f9f03

* APIテストの復活

* apiテストの移行

* moduleNameMapper修正

* simpleGetでthrowしないように

status確認しているので要らない

* longer timeout

* ローカルでは問題ないのになんで

* case sensitive

* Run Nest instance within the current process

* Skip some setIntervals

* wait for 5 seconds

* kill them all!!

* logHeapUsage: true

* detectOpenHandlesがじゃましているらしい

* maxWorkers=1?

* restore drive api tests

* workerIdleMemoryLimit: 500MB

* 1024MiB

* Wait what
---
 .../backend/src/core/CreateNotificationService.ts  | 37 +++++++++++++---------
 1 file changed, 22 insertions(+), 15 deletions(-)

(limited to 'packages/backend/src/core/CreateNotificationService.ts')

diff --git a/packages/backend/src/core/CreateNotificationService.ts b/packages/backend/src/core/CreateNotificationService.ts
index cd47844a75..eba7171fb6 100644
--- a/packages/backend/src/core/CreateNotificationService.ts
+++ b/packages/backend/src/core/CreateNotificationService.ts
@@ -1,4 +1,5 @@
-import { Inject, Injectable } from '@nestjs/common';
+import { setTimeout } from 'node:timers/promises';
+import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
 import type { MutingsRepository, NotificationsRepository, UserProfilesRepository, UsersRepository } from '@/models/index.js';
 import type { User } from '@/models/entities/User.js';
 import type { Notification } from '@/models/entities/Notification.js';
@@ -10,7 +11,9 @@ import { PushNotificationService } from '@/core/PushNotificationService.js';
 import { bindThis } from '@/decorators.js';
 
 @Injectable()
-export class CreateNotificationService {
+export class CreateNotificationService implements OnApplicationShutdown {
+	#shutdownController = new AbortController();
+
 	constructor(
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
@@ -40,11 +43,11 @@ export class CreateNotificationService {
 		if (data.notifierId && (notifieeId === data.notifierId)) {
 			return null;
 		}
-	
+
 		const profile = await this.userProfilesRepository.findOneBy({ userId: notifieeId });
-	
+
 		const isMuted = profile?.mutingNotificationTypes.includes(type);
-	
+
 		// Create notification
 		const notification = await this.notificationsRepository.insert({
 			id: this.idService.genId(),
@@ -56,18 +59,18 @@ export class CreateNotificationService {
 			...data,
 		} as Partial<Notification>)
 			.then(x => this.notificationsRepository.findOneByOrFail(x.identifiers[0]));
-	
+
 		const packed = await this.notificationEntityService.pack(notification, {});
-	
+
 		// Publish notification event
 		this.globalEventService.publishMainStream(notifieeId, 'notification', packed);
-	
+
 		// 2秒経っても(今回作成した)通知が既読にならなかったら「未読の通知がありますよ」イベントを発行する
-		setTimeout(async () => {
+		setTimeout(2000, 'unread note', { signal: this.#shutdownController.signal }).then(async () => {
 			const fresh = await this.notificationsRepository.findOneBy({ id: notification.id });
 			if (fresh == null) return; // 既に削除されているかもしれない
 			if (fresh.isRead) return;
-	
+
 			//#region ただしミュートしているユーザーからの通知なら無視
 			const mutings = await this.mutingsRepository.findBy({
 				muterId: notifieeId,
@@ -76,14 +79,14 @@ export class CreateNotificationService {
 				return;
 			}
 			//#endregion
-	
+
 			this.globalEventService.publishMainStream(notifieeId, 'unreadNotification', packed);
 			this.pushNotificationService.pushNotification(notifieeId, 'notification', packed);
-	
+
 			if (type === 'follow') this.emailNotificationFollow(notifieeId, await this.usersRepository.findOneByOrFail({ id: data.notifierId! }));
 			if (type === 'receiveFollowRequest') this.emailNotificationReceiveFollowRequest(notifieeId, await this.usersRepository.findOneByOrFail({ id: data.notifierId! }));
-		}, 2000);
-	
+		}, () => { /* aborted, ignore it */ });
+
 		return notification;
 	}
 
@@ -103,7 +106,7 @@ export class CreateNotificationService {
 		sendEmail(userProfile.email, i18n.t('_email._follow.title'), `${follower.name} (@${Acct.toString(follower)})`, `${follower.name} (@${Acct.toString(follower)})`);
 		*/
 	}
-	
+
 	@bindThis
 	private async emailNotificationReceiveFollowRequest(userId: User['id'], follower: User) {
 		/*
@@ -115,4 +118,8 @@ export class CreateNotificationService {
 		sendEmail(userProfile.email, i18n.t('_email._receiveFollowRequest.title'), `${follower.name} (@${Acct.toString(follower)})`, `${follower.name} (@${Acct.toString(follower)})`);
 		*/
 	}
+
+	onApplicationShutdown(signal?: string | undefined): void {
+		this.#shutdownController.abort();
+	}
 }
-- 
cgit v1.2.3-freya