Merge branch 'develop' into trim-trailing-whitespace

.devcontainer/devcontainer.json

@@ -6,7 +6,7 @@
 	"features": {
 		"ghcr.io/devcontainers-contrib/features/pnpm:2": {},
 		"ghcr.io/devcontainers/features/node:1": {
-			"version": "18.16.0"
+			"version": "20.4.0"
 		}
 	},
 	"forwardPorts": [3000],

.github/ISSUE_TEMPLATE/01_bug-report.md

@@ -54,7 +54,7 @@ Please include errors from the developer console and/or server log files if you
 
 * Installation Method or Hosting Service: <!-- Example: docker compose, k8s/docker, systemd, "Misskey install shell script", development environment -->
 * Misskey: 13.x.x
-* Node: 18.x.x
+* Node: 20.x.x
 * PostgreSQL: 15.x.x
 * Redis: 7.x.x
 * OS and Architecture: <!-- Example: Ubuntu 22.04.2 LTS aarch64 -->

.github/workflows/storybook.yml

@@ -37,7 +37,7 @@ jobs:
       with:
         version: 8
         run_install: false
-    - name: Use Node.js 18.x
+    - name: Use Node.js 20.x
       uses: actions/setup-node@v3.6.0
       with:
         node-version-file: '.node-version'

.github/workflows/test-backend.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
 
     services:
       postgres:

.github/workflows/test-frontend.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
 
     steps:
     - uses: actions/checkout@v3.3.0
@@ -51,7 +51,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
         browser: [chrome]
 
     services:

.github/workflows/test-misskey-js.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

.github/workflows/test-production.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
 
     steps:
     - uses: actions/checkout@v3.3.0

.gitignore

@@ -64,3 +64,6 @@ temp
 *.blend3
 *.blend4
 *.blend5
+
+# VSCode addon
+.favorites.json

.node-version

@@ -1 +1 @@
-18.16.0
+20.4.0

CHANGELOG.md

@@ -14,19 +14,26 @@
 
 ## 13.x.x (unreleased)
 
+### NOTE
+- Node.js 20.4.0以上が必要になりました
+
 ### General
 - identicon生成を無効にしてパフォーマンスを向上させることができるようになりました
 - サーバーのマシン情報の公開を無効にしてパフォーマンスを向上させることができるようになりました
 
 ### Client
 - Fix: サーバーメトリクスが90度傾いている
 - Fix: sparkle内にリンクを入れるとクリック不能になる問題の修正
+- Fix: ZenUIでポップアップの表示位置がおかしい問題を修正
 - deck UIのカラムのメニューからアンテナとリストの編集画面を開けるように
 - ドライブファイルのメニューで画像をクロップできるように
 - 画像を動画と同様に簡単に隠せるように
+- オリジナル画像を保持せずにアップロードする場合webpでアップロードされるように(Safari以外)
+- 見たことのあるRenoteを省略して表示をオンのときに自分のnoteのrenoteを省略するように
 
 ### Server
 - JSON.parse の回数を削減することで、ストリーミングのパフォーマンスを向上しました
+- 連合の配送ジョブのパフォーマンスを向上（ロック機構の見直し、Redisキャッシュの活用）
 
 ## 13.13.2
 

Dockerfile

@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.4
 
-ARG NODE_VERSION=18.16.0-bullseye
+ARG NODE_VERSION=20.4.0-bullseye
 
 # build assets & compile TypeScript
 

package.json

@@ -51,16 +51,16 @@
 		"gulp-replace": "1.1.4",
 		"gulp-terser": "2.1.0",
 		"js-yaml": "4.1.0",
-		"typescript": "5.1.3"
+		"typescript": "5.1.6"
 	},
 	"devDependencies": {
 		"@types/gulp": "4.0.10",
 		"@types/gulp-rename": "2.0.1",
-		"@typescript-eslint/eslint-plugin": "5.60.0",
-		"@typescript-eslint/parser": "5.60.0",
+		"@typescript-eslint/eslint-plugin": "5.61.0",
+		"@typescript-eslint/parser": "5.61.0",
 		"cross-env": "7.0.3",
-		"cypress": "12.15.0",
-		"eslint": "8.43.0",
+		"cypress": "12.17.0",
+		"eslint": "8.44.0",
 		"start-server-and-test": "2.0.0"
 	},
 	"optionalDependencies": {

packages/backend/package.json

@@ -51,34 +51,34 @@
 		"utf-8-validate": "^6.0.3"
 	},
 	"dependencies": {
-		"@aws-sdk/client-s3": "3.321.1",
-		"@aws-sdk/lib-storage": "3.321.1",
-		"@aws-sdk/node-http-handler": "3.321.1",
-		"@bull-board/api": "5.5.3",
-		"@bull-board/fastify": "5.5.3",
-		"@bull-board/ui": "5.5.3",
+		"@aws-sdk/client-s3": "3.367.0",
+		"@aws-sdk/lib-storage": "3.367.0",
+		"@aws-sdk/node-http-handler": "3.360.0",
+		"@bull-board/api": "5.6.0",
+		"@bull-board/fastify": "5.6.0",
+		"@bull-board/ui": "5.6.0",
 		"@discordapp/twemoji": "14.1.2",
 		"@fastify/accepts": "4.2.0",
 		"@fastify/cookie": "8.3.0",
 		"@fastify/cors": "8.3.0",
 		"@fastify/http-proxy": "9.2.1",
 		"@fastify/multipart": "7.7.0",
 		"@fastify/static": "6.10.2",
-		"@fastify/view": "7.4.1",
-		"@nestjs/common": "10.0.3",
-		"@nestjs/core": "10.0.3",
-		"@nestjs/testing": "10.0.3",
+		"@fastify/view": "8.0.0",
+		"@nestjs/common": "10.0.5",
+		"@nestjs/core": "10.0.5",
+		"@nestjs/testing": "10.0.5",
 		"@peertube/http-signature": "1.7.0",
 		"@sinonjs/fake-timers": "10.3.0",
 		"@swc/cli": "0.1.62",
-		"@swc/core": "1.3.66",
+		"@swc/core": "1.3.68",
 		"accepts": "1.3.8",
 		"ajv": "8.12.0",
 		"archiver": "5.3.1",
 		"autwh": "0.1.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
-		"bullmq": "4.1.0",
+		"bullmq": "4.2.0",
 		"cacheable-lookup": "7.0.0",
 		"cbor": "9.0.0",
 		"chalk": "5.2.0",
@@ -90,18 +90,18 @@
 		"date-fns": "2.30.0",
 		"deep-email-validator": "0.1.21",
 		"escape-regexp": "0.0.1",
-		"fastify": "4.18.0",
+		"fastify": "4.19.2",
 		"feed": "4.2.2",
 		"file-type": "18.5.0",
 		"fluent-ffmpeg": "2.1.2",
 		"form-data": "4.0.0",
 		"got": "13.0.0",
-		"happy-dom": "9.20.3",
+		"happy-dom": "10.0.3",
 		"hpagent": "1.2.0",
 		"ioredis": "5.3.2",
 		"ip-cidr": "3.1.0",
 		"ipaddr.js": "2.1.0",
-		"is-svg": "4.3.2",
+		"is-svg": "5.0.0",
 		"js-yaml": "4.1.0",
 		"jsdom": "22.1.0",
 		"json5": "2.2.3",
@@ -118,9 +118,9 @@
 		"nsfwjs": "2.4.2",
 		"oauth": "0.10.0",
 		"os-utils": "0.0.14",
-		"otpauth": "9.1.2",
+		"otpauth": "9.1.3",
 		"parse5": "7.1.2",
-		"pg": "8.11.0",
+		"pg": "8.11.1",
 		"probe-image-size": "7.2.3",
 		"promise-limit": "2.7.0",
 		"pug": "3.0.2",
@@ -144,14 +144,14 @@
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
 		"summaly": "github:misskey-dev/summaly",
-		"systeminformation": "5.18.4",
+		"systeminformation": "5.18.6",
 		"tinycolor2": "1.6.0",
 		"tmp": "0.2.1",
-		"tsc-alias": "1.8.6",
+		"tsc-alias": "1.8.7",
 		"tsconfig-paths": "4.2.0",
 		"twemoji-parser": "14.0.0",
 		"typeorm": "0.3.17",
-		"typescript": "5.1.3",
+		"typescript": "5.1.6",
 		"ulid": "2.3.0",
 		"unzipper": "0.10.14",
 		"uuid": "9.0.0",
@@ -161,7 +161,7 @@
 		"xev": "3.0.2"
 	},
 	"devDependencies": {
-		"@jest/globals": "29.5.0",
+		"@jest/globals": "29.6.1",
 		"@swc/jest": "0.2.26",
 		"@types/accepts": "1.3.5",
 		"@types/archiver": "5.3.2",
@@ -178,14 +178,14 @@
 		"@types/jsrsasign": "10.5.8",
 		"@types/mime-types": "2.1.1",
 		"@types/ms": "^0.7.31",
-		"@types/node": "20.3.1",
+		"@types/node": "20.4.0",
 		"@types/node-fetch": "3.0.3",
 		"@types/nodemailer": "6.4.8",
 		"@types/oauth": "0.9.1",
 		"@types/pg": "8.10.2",
 		"@types/pug": "2.0.6",
 		"@types/punycode": "2.1.0",
-		"@types/qrcode": "1.5.0",
+		"@types/qrcode": "1.5.1",
 		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "3.4.4",
 		"@types/redis": "4.0.11",
@@ -202,14 +202,14 @@
 		"@types/web-push": "3.3.2",
 		"@types/websocket": "1.0.5",
 		"@types/ws": "8.5.5",
-		"@typescript-eslint/eslint-plugin": "5.60.0",
-		"@typescript-eslint/parser": "5.60.0",
-		"aws-sdk-client-mock": "2.1.1",
+		"@typescript-eslint/eslint-plugin": "5.61.0",
+		"@typescript-eslint/parser": "5.61.0",
+		"aws-sdk-client-mock": "3.0.0",
 		"cross-env": "7.0.3",
-		"eslint": "8.43.0",
+		"eslint": "8.44.0",
 		"eslint-plugin-import": "2.27.5",
-		"execa": "6.1.0",
-		"jest": "29.5.0",
-		"jest-mock": "29.5.0"
+		"execa": "7.1.1",
+		"jest": "29.6.1",
+		"jest-mock": "29.6.1"
 	}
 }

packages/backend/src/core/AppLockService.ts

@@ -32,11 +32,6 @@ export class AppLockService {
 		return this.lock(`ap-object:${uri}`, timeout);
 	}
 
-	@bindThis
-	public getFetchInstanceMetadataLock(host: string, timeout = 30 * 1000): Promise<() => void> {
-		return this.lock(`instance:${host}`, timeout);
-	}
-
 	@bindThis
 	public getChartInsertLock(lockKey: string, timeout = 30 * 1000): Promise<() => void> {
 		return this.lock(`chart-insert:${lockKey}`, timeout);

packages/backend/src/core/FetchInstanceMetadataService.ts

@@ -3,15 +3,14 @@ import { Inject, Injectable } from '@nestjs/common';
 import { JSDOM } from 'jsdom';
 import tinycolor from 'tinycolor2';
 import type { Instance } from '@/models/entities/Instance.js';
-import type { InstancesRepository } from '@/models/index.js';
-import { AppLockService } from '@/core/AppLockService.js';
 import type Logger from '@/logger.js';
 import { DI } from '@/di-symbols.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import { HttpRequestService } from '@/core/HttpRequestService.js';
 import { bindThis } from '@/decorators.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import type { DOMWindow } from 'jsdom';
+import * as Redis from 'ioredis';
 
 type NodeInfo = {
 	openRegistrations?: unknown;
@@ -37,33 +36,45 @@ export class FetchInstanceMetadataService {
 	private logger: Logger;
 
 	constructor(
-		@Inject(DI.instancesRepository)
-		private instancesRepository: InstancesRepository,
-
-		private appLockService: AppLockService,
 		private httpRequestService: HttpRequestService,
 		private loggerService: LoggerService,
 		private federatedInstanceService: FederatedInstanceService,
+		@Inject(DI.redis)
+		private redisClient: Redis.Redis,
 	) {
 		this.logger = this.loggerService.getLogger('metadata', 'cyan');
 	}
 
 	@bindThis
-	public async fetchInstanceMetadata(instance: Instance, force = false): Promise<void> {
-		const unlock = await this.appLockService.getFetchInstanceMetadataLock(instance.host);
-
-		if (!force) {
-			const _instance = await this.instancesRepository.findOneBy({ host: instance.host });
-			const now = Date.now();
-			if (_instance && _instance.infoUpdatedAt && (now - _instance.infoUpdatedAt.getTime() < 1000 * 60 * 60 * 24)) {
-				unlock();
-				return;
-			}
-		}
+	public async tryLock(host: string): Promise<boolean> {
+		const mutex = await this.redisClient.set(`fetchInstanceMetadata:mutex:${host}`, '1', 'GET');
+		return mutex !== '1';
+	}
+
+	@bindThis
+	public unlock(host: string): Promise<'OK'> {
+		return this.redisClient.set(`fetchInstanceMetadata:mutex:${host}`, '0');
+	}
 
-		this.logger.info(`Fetching metadata of ${instance.host} ...`);
+	@bindThis
+	public async fetchInstanceMetadata(instance: Instance, force = false): Promise<void> {
+		try {
 
+		const host = instance.host;
+		// Acquire mutex to ensure no parallel runs
+		if (!await this.tryLock(host)) return;
 		try {
+			if (!force) {
+				const _instance = await this.federatedInstanceService.fetch(host);
+				const now = Date.now();
+				if (_instance && _instance.infoUpdatedAt && (now - _instance.infoUpdatedAt.getTime() < 1000 * 60 * 60 * 24)) {
+					// unlock at the finally caluse
+					return;
+				}
+			}
+
+			this.logger.info(`Fetching metadata of ${instance.host} ...`);
+
 			const [info, dom, manifest] = await Promise.all([
 				this.fetchNodeinfo(instance).catch(() => null),
 				this.fetchDom(instance).catch(() => null),
@@ -104,7 +115,7 @@ export class FetchInstanceMetadataService {
 		} catch (e) {
 			this.logger.error(`Failed to update metadata of ${instance.host}: ${e}`);
 		} finally {
-			unlock();
+			await this.unlock(host);
 		}
 	}