diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b820f22c..8dd21ce6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,30 @@ You should also include the user name that made the change. --> +## 13.2.2 (2023/01/25) +### Improvements +- サーバーのパフォーマンスを改善 + +### Bugfixes +- サインイン時に誤ったレートリミットがかかることがある問題を修正 +- MFMのposition、rotate、scaleで小数が使えない問題を修正 + +## 13.2.1 (2023/01/24) +### Improvements +- デザインの調整 +- サーバーのパフォーマンスを改善 + +## 13.2.0 (2023/01/23) + +### Improvements +- onlyServer / onlyQueue オプションを復活 +- 他人の実績閲覧時は獲得条件を表示しないように +- アニメーション減らすオプション有効時はリアクションのアニメーションを無効に +- カスタム絵文字一覧のパフォーマンスを改善 + +### Bugfixes +- Aiscript: button is not defined + ## 13.1.7 (2023/01/22) ### Improvements diff --git a/gulpfile.js b/gulpfile.js index d567e8bf6..a04ab4c1a 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -20,7 +20,7 @@ gulp.task('copy:frontend:fonts', () => ); gulp.task('copy:frontend:tabler-icons', () => - gulp.src('./packages/frontend/node_modules/@tabler/icons/iconfont/**/*').pipe(gulp.dest('./built/_frontend_dist_/tabler-icons/')) + gulp.src('./packages/frontend/node_modules/@tabler/icons-webfont/**/*').pipe(gulp.dest('./built/_frontend_dist_/tabler-icons/')) ); gulp.task('copy:frontend:locales', cb => { diff --git a/locales/de-DE.yml b/locales/de-DE.yml index e81f7579c..a3e8f221d 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -1104,9 +1104,12 @@ _achievements: title: "I Love Misskey" description: "Sende \"I ❤ #Misskey\"" flavor: "Danke, dass du Misskey verwendest! - vom Entwicklerteam" + _foundTreasure: + title: "Schatzsuche" + description: "Du hast einen verborgenen Schatz gefunden" _client30min: - title: "Kleine Pause" - description: "Seit dem Öffnen deines Clients sind 30 Minuten vergangen" + title: "Kurze Pause" + description: "Habe Misskey für 30 Minuten geöffnet" _noteDeletedWithin1min: title: "Ups" description: "Lösche eine Notiz innerhalb von 1 Minute nachdem sie gesendet wurde" @@ -1124,6 +1127,9 @@ _achievements: _htl20npm: title: "Fließende Chronik" description: "Deine Startseitenchronik erreicht eine Geschwindigkeit von 20 npm (Notizen pro Minute)" + _viewInstanceChart: + title: "Analyst" + description: "Schau dir die Messwerte der Instanz an" _outputHelloWorldOnScratchpad: title: "Hallo Welt!" description: "Gib \"hello world\" in der Testumgebung aus" diff --git a/locales/en-US.yml b/locales/en-US.yml index 6a43d4569..4e2f18629 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -945,7 +945,7 @@ _achievements: _notes1: title: "just setting up my msky" description: "Post your first note" - flavor: "Have a good Misskey life!" + flavor: "Have a good time with Misskey!" _notes10: title: "Some notes" description: "Post 10 notes" @@ -1104,6 +1104,9 @@ _achievements: title: "I Love Misskey" description: "Post \"I ❤ #Misskey\"" flavor: "Misskey's development team greatly appreciates your support!" + _foundTreasure: + title: "Treasure Hunt" + description: "You've found the hidden treasure" _client30min: title: "Short break" description: "Spend 30 minutes on Misskey" @@ -1124,6 +1127,9 @@ _achievements: _htl20npm: title: "Flowing Timeline" description: "Have the speed of your home timeline exceed 20 npm (notes per minute)" + _viewInstanceChart: + title: "Analyst" + description: "View your instance's charts" _outputHelloWorldOnScratchpad: title: "Hello, world!" description: "Output \"hello world\" in the Scratchpad" diff --git a/locales/it-IT.yml b/locales/it-IT.yml index 1726a84ff..66af4654c 100644 --- a/locales/it-IT.yml +++ b/locales/it-IT.yml @@ -1059,8 +1059,8 @@ _achievements: description: "Aggiungi le orecchie da gatto al tuo profilo" flavor: "Ti chiamerò..." _following1: - title: "Hai seguito il tuo primo profilo" - description: "Il tuo primo profilo Follower" + title: "Il mio primo Follow" + description: "Hai seguito il tuo primo profilo" _following10: title: "Segui, segui!" description: "Hai seguito 10 profili" @@ -1074,17 +1074,17 @@ _achievements: title: "Sovraccarico di amici" description: "Hai seguito 300 profili" _followers1: - title: "Primo Follower" - description: "Hai ottenuto un Follower" + title: "Il primo profilo tuo Follower" + description: "Hai ottenuto il tuo primo Follower" _followers10: title: "Follow me!" - description: "Hai ottenuto 10 Follower" + description: "Hai ottenuto 10 profili Follower" _followers50: title: "Follower a frotte" description: "Hai ottenuto 50 Follower" _followers100: title: "Popolare" - description: "Hai ottenuto 100 Follower" + description: "Hai ottenuto 100 profili Follower" _followers300: title: "Mettetevi in fila" description: "Hai ottenuto 300 Follower" @@ -1093,7 +1093,7 @@ _achievements: description: "Hai ottenuto 500 Follower" _followers1000: title: "Influenzer" - description: "Hai superato i 1.000 Follower" + description: "Hai superato i 1.000 profili Follower" _collectAchievements30: title: "Collezionista di successi" description: "Hai raggiunto 30 obiettivi" @@ -1104,9 +1104,12 @@ _achievements: title: "I LOVE Misskey" description: "Pubblica «I ♥ #Misskey»" flavor: "Grazie per aver utilizzato Misskey! Dal team di sviluppo" + _foundTreasure: + title: "Caccia al tesoro" + description: "Hai trovato un tesoro nascosto" _client30min: title: "Piccola pausa" - description: "Hai passato più di 30 minuti di fila su Misskey" + description: "Hai passato più di 30 minuti su Misskey" _noteDeletedWithin1min: title: "Ooops!" description: "Hai eliminato una nota entro un minuto dalla sua pubblicazione" @@ -1124,6 +1127,9 @@ _achievements: _htl20npm: title: "Timeline scorrevole" description: "La tua Timeline personale ha superato la velocità di 20 Note orarie (Note al minuto)" + _viewInstanceChart: + title: "Analista" + description: "Visualizza i grafici dell'istanza" _outputHelloWorldOnScratchpad: title: "Hello, world!" description: "Hai scritto «Hello world» nel blocco appunti" @@ -1501,8 +1507,8 @@ _sfx: channel: "Notifiche di canale" _ago: future: "Futuro" - justNow: "Ora" - secondsAgo: "{n}s fa" + justNow: "Adesso" + secondsAgo: "{n} sec fa" minutesAgo: "{n} min fa" hoursAgo: "{n} ore fa" daysAgo: "{n} gg fa" diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index bf747e3cb..265f14ec5 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -938,13 +938,13 @@ cannotPerformTemporary: "일시적으로 사용할 수 없음" cannotPerformTemporaryDescription: "조작 횟수 제한을 초과하여 일시적으로 사용이 불가합니다. 잠시 후 다시 시도해 주세요." preset: "프리셋" selectFromPresets: "프리셋에서 선택" -achievements: "도전과제" +achievements: "도전 과제" _achievements: earnedAt: "달성 일시" _types: _notes1: - title: "미스키 설정하고 있었는데요" - description: "첫 노트를 포스트했습니다" + title: "미스키 시작했는데요" + description: "첫 노트를 작성했습니다" flavor: "Misskey에 오신 것을 환영합니다!" _notes10: title: "노트 조금" @@ -962,7 +962,7 @@ _achievements: title: "노트가 어디서 솟아?" description: "5,000개의 노트를 작성했습니다" _notes10000: - title: "슈퍼-노트" + title: "슈퍼 노트" description: "10,000개의 노트를 작성했습니다" _notes20000: title: "노트 더 없어?" @@ -989,7 +989,7 @@ _achievements: title: "노트 우주" description: "90,000개의 노트를 작성했습니다" _notes100000: - title: "네 모든 노트는 내 거야" + title: "ALL YOUR NOTE ARE BELONG TO US" description: "100,000개의 노트를 작성했습니다" flavor: "이만큼 쓸 일도 없겠지만... 다른 할 일이 있진 않으신가요?" _login3: @@ -1012,7 +1012,7 @@ _achievements: _login100: title: "미스키스트 III" description: "총 100일간 로그인했습니다" - flavor: "그 유저, 미스키스트를 위하여" + flavor: "그 유저, 미스키스트이다" _login200: title: "단골 I" description: "총 200일간 로그인했습니다" @@ -1025,7 +1025,7 @@ _achievements: _login500: title: "베테랑 I" description: "총 500일간 로그인했습니다" - flavor: "여러분, 저 이 노트들 좋아해요" + flavor: "제군, 나는 노트가 좋다" _login600: title: "베테랑 II" description: "총 600일간 로그인했습니다" @@ -1041,13 +1041,16 @@ _achievements: _login1000: title: "노트 마스터 III" description: "총 1,000일간 로그인했습니다" - flavor: "미스키를 사용해 주셔서 감사합니다!" + flavor: "Misskey를 사용해 주셔서 감사합니다!" _noteClipped1: title: "클립할 수밖에 없었어" description: "처음으로 노트를 클립했습니다" _noteFavorited1: title: "별을 바라보는 자" description: "처음으로 노트를 즐겨찾기했습니다" + _myNoteFavorited1: + title: "별을 원하는 자" + description: "다른 사람이 당신의 노트를 즐겨찾기했습니다" _profileFilled: title: "준비 완료" description: "프로필 설정을 완료했습니다" @@ -1074,7 +1077,7 @@ _achievements: title: "첫 팔로워" description: "사용자가 처음으로 팔로잉했습니다" _followers10: - title: "날 따라와!" + title: "팔로우 미!" description: "10명의 사용자가 팔로우했습니다" _followers50: title: "이곳저곳" @@ -1092,15 +1095,18 @@ _achievements: title: "유명인사" description: "1,000명의 사용자가 팔로우했습니다" _collectAchievements30: - title: "도전과제 콜렉터" + title: "도전 과제 콜렉터" description: "30개의 도전과제를 획득했습니다" _viewAchievements3min: title: "저 도전과제 좋아해요" - description: "도전과제 목록을 3분 이상 보세요" + description: "도전 과제 목록을 3분 이상 쳐다봤습니다" _iLoveMisskey: title: "I Love Misskey" description: "\"I ❤ #Misskey\"를 포스트했습니다" flavor: "Misskey를 이용해주셔서 감사합니다! - 개발팀 일동" + _foundTreasure: + title: "보물찾기" + description: "숨겨진 보물을 발견했습니다" _client30min: title: "잠깐 쉬어" description: "클라이언트를 시작하고 30분이 경과하였습니다" @@ -1113,7 +1119,7 @@ _achievements: flavor: "잠 좀 자세요. 걱정돼요." _postedAt0min0sec: title: "정각" - description: "1초도 어긋나지 않은 정각에 노트를 포스트했습니다" + description: "0분 0초 정각에 노트를 작성했습니다" flavor: "째깍 째깍 째깍 땡!" _selfQuote: title: "혼잣말" @@ -1121,21 +1127,24 @@ _achievements: _htl20npm: title: "타임라인 폭주 중" description: "1분 사이에 홈 타임라인에 노트가 20개 넘게 생성되었습니다" + _viewInstanceChart: + title: "애널리스트" + description: "인스턴스의 차트를 열었습니다" _outputHelloWorldOnScratchpad: title: "Hello, world!" - description: "스크래치패드에서 hello world를 출력하세요" + description: "스크래치패드에서 hello world를 출력했습니다" _open3windows: title: "멀티 윈도우" - description: "3개 이상의 창을 여세요" + description: "3개 이상의 창을 열었습니다" _driveFolderCircularReference: title: "순환 참조" description: "드라이브 폴더를 자신을 가리키도록 만드려 시도했습니다" _reactWithoutRead: title: "읽고 답하긴 하시는 건가요?" - description: "100자가 넘는 포스트에 3초 안에 포스트했습니다" + description: "100자가 넘는 노트가 작성되고 3초 안에 반응했습니다" _clickedClickHere: title: "여길 눌러보세요" - description: "이 곳을 눌러봤습니다" + description: "여길을 눌러봤습니다" _justPlainLucky: title: "그냥 운이 좋았어" description: "매 10초마다 0.01%의 확률로 달성됩니다" @@ -1143,25 +1152,25 @@ _achievements: title: "신 콤플렉스" description: "이름을 syuilo로 설정했습니다" _passedSinceAccountCreated1: - title: "1년" + title: "1주년" description: "계정을 생성하고 1년이 지났습니다" _passedSinceAccountCreated2: - title: "2년" + title: "2주년" description: "계정을 생성하고 2년이 지났습니다" _passedSinceAccountCreated3: - title: "3년" + title: "3주년" description: "계정을 생성하고 3년이 지났습니다" _loggedInOnBirthday: title: "생일 축하합니다!" - description: "설정한 생일에 로그인했습니다" + description: "생일에 로그인했습니다" _loggedInOnNewYearsDay: title: "새해 복 많이 받으세요" description: "새해 첫 날에 로그인했습니다" flavor: "올해에도 저희 인스턴스에 관심을 가져 주셔서 감사합니다" _cookieClicked: - title: "쿠키 클리커 게임" + title: "쿠키를 클릭하는 게임" description: "쿠키를 클릭했습니다" - flavor: "뭔가 문제가 있나요?" + flavor: "소프트웨어 착각하지 않으셨나요?" _brainDiver: title: "Brain Diver" description: "Brain Diver로의 링크를 첨부했습니다" diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml index 541941398..1c0138466 100644 --- a/locales/ru-RU.yml +++ b/locales/ru-RU.yml @@ -1004,7 +1004,7 @@ _achievements: _login100: title: "Мискиец Ⅲ" description: "100 дней на сайте" - flavor: "Жестокий Misskist " + flavor: "Жестокий мискиец" _login200: title: "Завсегдатай Ⅰ" description: "200 дней на сайте" diff --git a/locales/th-TH.yml b/locales/th-TH.yml index 08737fb1b..47c9a3a41 100644 --- a/locales/th-TH.yml +++ b/locales/th-TH.yml @@ -942,14 +942,51 @@ achievements: "ความสำเร็จ" _achievements: earnedAt: "ได้รับเมื่อ" _types: + _notes1: + title: "เพียงแค่ตั้งค่า msky ของฉัน" _followers100: title: "บุคคลที่เป็นที่นิยม" _followers500: title: "เสาสัญญาณ" + _followers1000: + title: "ผู้ทรงอิทธิพล" _iLoveMisskey: title: "ฉันรัก Misskey" + description: "โพสต์ \"I ❤ #Misskey\"" + _foundTreasure: + title: "ล่าสมบัติ" + description: "คุณพบสมบัติที่ซ่อนอยู่" + _client30min: + title: "พักผ่อนสักหน่อย" + _noteDeletedWithin1min: + title: "ไม่เป็นไร" + _postedAtLateNight: + title: "กลางคืน" + _viewInstanceChart: + title: "วิเคราะห์" + description: "ดูแผนภูมิอินสแตนซ์ของคุณ" _driveFolderCircularReference: title: "อ้างอิงวงจร" + _clickedClickHere: + title: "คลิ๊กที่นี่" + description: "คุณได้คลิกที่นี่" + _passedSinceAccountCreated1: + title: "ครบรอบหนึ่งปี" + _passedSinceAccountCreated2: + title: "ครบรอบสองปี" + _passedSinceAccountCreated3: + title: "ครบรอบสามปี" + _loggedInOnBirthday: + title: "สุขสันต์วันเกิด" + description: "เข้าสู่ระบบในวันเกิดของคุณ" + _loggedInOnNewYearsDay: + title: "สวัสดีปีใหม่!" + description: "เข้าสู่ระบบในวันแรกของปี" + _cookieClicked: + description: "คลิกคุกกี้" + _brainDiver: + title: "Brain Diver" + flavor: "Misskey-Misskey La-Tu-Ma" _role: new: "บทบาทใหม่" edit: "แก้ไขบทบาท" diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml index ddb13d875..a77bfa4f8 100644 --- a/locales/uk-UA.yml +++ b/locales/uk-UA.yml @@ -901,6 +901,7 @@ show: "Відображення" color: "Колір" achievements: "Досягнення" _achievements: + earnedAt: "Відкрито" _types: _notes1: title: "налаштовую свій msky" @@ -908,6 +909,124 @@ _achievements: flavor: "Приємного часу з Misskey!" _notes10: title: "Декілька нотаток" + description: "10 нотаток відправлено" + _notes100: + title: "Купа нотаток" + description: "100 нотаток відправлено" + _notes500: + title: "Все в нотатках" + description: "500 нотаток відправлено" + _notes1000: + title: "Гора нотаток" + description: "1 000 нотаток відправлено" + _notes5000: + title: "Переповнюючі нотатки" + description: "5 000 нотаток відправлено" + _notes10000: + title: "Супернотатка" + description: "10 000 нотаток відправлено" + _notes20000: + title: "Треба Більше Нотаток" + description: "20 000 нотаток відправлено" + _notes30000: + title: "Нотатки нотатки нотатки" + description: "30 000 нотаток відправлено" + _notes40000: + title: "Фабрика нотаток" + description: "40 000 нотаток відправлено" + _notes50000: + title: "Планета нотаток" + description: "50 000 нотаток відправлено" + _notes60000: + title: "Нотатковий квазар" + description: "60 000 нотаток відправлено" + _notes70000: + title: "Чорна нотаткова діра" + description: "70 000 нотаток відправлено" + _notes80000: + title: "Галактика нотаток" + description: "80 000 нотаток відправлено" + _notes90000: + title: "Нотатковерс" + description: "90 000 нотаток відправлено" + _notes100000: + title: "ALL YOUR NOTE ARE BELONG TO US" + description: "100 000 нотаток відправлено" + flavor: "Так багато потрібно сказати?" + _login3: + title: "Новачок I" + description: "3 дні користування загально" + _login7: + title: "Новачок II" + description: "7 днів користування загально" + _login15: + title: "Новачок III" + description: "15 днів користування загально" + _login30: + title: "Міскієць I" + description: "30 днів користування загально" + _login60: + title: "Міскієць II" + description: "60 днів користування загально" + _login100: + title: "Міскієць III" + description: "100 днів користування загально" + _login200: + title: "Завсідник I" + description: "200 днів користування загально" + _login300: + title: "Завсідник II" + description: "300 днів користування загально" + _login400: + title: "Завсідник III" + description: "400 днів користування загально" + _login500: + title: "Ветеран I" + description: "500 днів користування загально" + _login600: + title: "Ветеран II" + description: "600 днів користування загально" + _login700: + title: "Ветеран III" + description: "700 днів користування загально" + _login800: + description: "800 днів користування загально" + _login900: + description: "900 днів користування загально" + _login1000: + description: "1000 днів користування загально" + flavor: "Дякуємо, що користуєтеся Misskey!" + _following50: + description: "Кількість підписок сягнула 50" + _following100: + title: "100 друзів" + description: "Кількість підписок сягнула 100" + _following300: + title: "Надлишок друзів" + description: "Кількість підписок сягнула 300" + _followers1: + title: "Перший підписник" + description: "З'явився перший підписник" + _followers10: + title: "Follow me!" + description: "Кількість підписників досягла 10" + _followers50: + description: "Кількість підписників досягла 50" + _followers100: + description: "Кількість підписників досягла 100" + _followers300: + description: "Кількість підписників досягла 300" + _followers500: + description: "Кількість підписників досягла 500" + _followers1000: + title: "Інфлюенсер" + description: "Кількість підписників досягла 1000" + _passedSinceAccountCreated3: + description: "Минуло 3 роки з моменту створення акаунта" + _loggedInOnBirthday: + title: "З Днем народження!" + _brainDiver: + flavor: "Misskey-Misskey La-Tu-Ma" _role: priority: "Пріоритет" _priority: diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index 433af4c83..9d20b8544 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -1007,6 +1007,9 @@ _achievements: flavor: "感谢您使用Misskey！" _noteFavorited1: title: "观星者" + _profileFilled: + title: "整装待发" + description: "设置了个人资料" _markedAsCat: title: "我是猫" description: "将账户设定为一只猫" diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index a8a06528d..c40476c34 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -950,13 +950,13 @@ _achievements: title: "若干貼文" description: "發表了10則貼文" _notes100: - title: "許多的貼文" + title: "許多貼文" description: "發表了100則貼文" _notes500: title: "滿滿的貼文" description: "發表了500則貼文" _notes1000: - title: "一堆貼文" + title: "堆積如山的貼文" description: "發表了1000則貼文" _notes5000: title: "滔滔不絕的貼文" @@ -1104,6 +1104,9 @@ _achievements: title: "I Love Misskey" description: "發布「I ❤ #Misskey」" flavor: "感謝您使用Misskey！ by 開發團隊" + _foundTreasure: + title: "尋寶" + description: "發現了隱藏的寶藏" _client30min: title: "休息一下" description: "用戶端啟動已超過30分鐘" @@ -1124,6 +1127,9 @@ _achievements: _htl20npm: title: "流動的TL" description: "在首頁時間軸的流速超過20npm" + _viewInstanceChart: + title: "分析師" + description: "顯示了實例的圖表" _outputHelloWorldOnScratchpad: title: "Hello world!" description: "在暫存記憶體輸出了 hello world" diff --git a/package.json b/package.json index 31033bafe..800ca39ef 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "13.1.7", + "version": "13.2.2", "codename": "nasubi", "repository": { "type": "git", @@ -54,12 +54,12 @@ "devDependencies": { "@types/gulp": "4.0.10", "@types/gulp-rename": "2.0.1", - "@typescript-eslint/eslint-plugin": "5.48.2", - "@typescript-eslint/parser": "5.48.2", + "@typescript-eslint/eslint-plugin": "5.49.0", + "@typescript-eslint/parser": "5.49.0", "cross-env": "7.0.3", "cypress": "12.3.0", "eslint": "^8.32.0", - "start-server-and-test": "1.15.2" + "start-server-and-test": "1.15.3" }, "optionalDependencies": { "@tensorflow/tfjs-core": "^4.2.0" diff --git a/packages/backend/package.json b/packages/backend/package.json index be9012021..c3b45f6bf 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -19,13 +19,13 @@ "test-and-coverage": "pnpm jest-and-coverage" }, "optionalDependencies": { - "@tensorflow/tfjs": "^4.1.0", - "@tensorflow/tfjs-node": "4.1.0" + "@tensorflow/tfjs": "^4.2.0", + "@tensorflow/tfjs-node": "4.2.0" }, "dependencies": { - "@bull-board/api": "^4.10.2", - "@bull-board/fastify": "^4.10.2", - "@bull-board/ui": "^4.10.2", + "@bull-board/api": "^4.11.0", + "@bull-board/fastify": "^4.11.0", + "@bull-board/ui": "^4.11.0", "@discordapp/twemoji": "14.0.2", "@fastify/accepts": "4.1.0", "@fastify/cookie": "^8.3.0", @@ -63,15 +63,14 @@ "file-type": "18.2.0", "fluent-ffmpeg": "2.1.2", "form-data": "^4.0.0", - "got": "12.5.3", + "got": "^12.5.3", "hpagent": "1.2.0", "ioredis": "4.28.5", "ip-cidr": "3.0.11", "is-svg": "4.3.2", "js-yaml": "4.1.0", - "jsdom": "21.0.0", + "jsdom": "21.1.0", "json5": "2.2.3", - "json5-loader": "4.0.1", "jsonld": "8.1.0", "jsrsasign": "10.6.1", "mfm-js": "0.23.3", @@ -120,14 +119,14 @@ "typeorm": "0.3.11", "typescript": "4.9.4", "ulid": "2.3.0", - "undici": "^5.15.1", "unzipper": "0.10.11", "uuid": "9.0.0", "vary": "1.1.2", "web-push": "3.5.0", "websocket": "1.0.34", "ws": "8.12.0", - "xev": "3.0.2" + "xev": "3.0.2", + "node-fetch": "3.3.0" }, "devDependencies": { "@redocly/openapi-core": "1.0.0-beta.120", @@ -176,14 +175,13 @@ "@types/web-push": "3.3.2", "@types/websocket": "1.0.5", "@types/ws": "8.5.4", - "@typescript-eslint/eslint-plugin": "5.48.2", - "@typescript-eslint/parser": "5.48.2", + "@typescript-eslint/eslint-plugin": "5.49.0", + "@typescript-eslint/parser": "5.49.0", "cross-env": "7.0.3", "eslint": "8.32.0", "eslint-plugin-import": "2.27.5", "execa": "6.1.0", "jest": "29.3.1", - "jest-mock": "^29.3.1", - "node-fetch": "3.3.0" + "jest-mock": "^29.3.1" } } diff --git a/packages/backend/src/boot/common.ts b/packages/backend/src/boot/common.ts new file mode 100644 index 000000000..04aa26e65 --- /dev/null +++ b/packages/backend/src/boot/common.ts @@ -0,0 +1,35 @@ +import { NestFactory } from '@nestjs/core'; +import { ChartManagementService } from '@/core/chart/ChartManagementService.js'; +import { QueueProcessorService } from '@/queue/QueueProcessorService.js'; +import { NestLogger } from '@/NestLogger.js'; +import { QueueProcessorModule } from '@/queue/QueueProcessorModule.js'; +import { JanitorService } from '@/daemons/JanitorService.js'; +import { QueueStatsService } from '@/daemons/QueueStatsService.js'; +import { ServerStatsService } from '@/daemons/ServerStatsService.js'; +import { ServerService } from '@/server/ServerService.js'; +import { MainModule } from '@/MainModule.js'; + +export async function server() { + const app = await NestFactory.createApplicationContext(MainModule, { + logger: new NestLogger(), + }); + app.enableShutdownHooks(); + + const serverService = app.get(ServerService); + serverService.launch(); + + app.get(ChartManagementService).start(); + app.get(JanitorService).start(); + app.get(QueueStatsService).start(); + app.get(ServerStatsService).start(); +} + +export async function jobQueue() { + const jobQueue = await NestFactory.createApplicationContext(QueueProcessorModule, { + logger: new NestLogger(), + }); + jobQueue.enableShutdownHooks(); + + jobQueue.get(QueueProcessorService).start(); + jobQueue.get(ChartManagementService).start(); +} diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts index 93cb3131b..f5d936fad 100644 --- a/packages/backend/src/boot/master.ts +++ b/packages/backend/src/boot/master.ts @@ -6,21 +6,12 @@ import cluster from 'node:cluster'; import chalk from 'chalk'; import chalkTemplate from 'chalk-template'; import semver from 'semver'; -import { NestFactory } from '@nestjs/core'; import Logger from '@/logger.js'; import { loadConfig } from '@/config.js'; import type { Config } from '@/config.js'; -import { lessThan } from '@/misc/prelude/array.js'; import { showMachineInfo } from '@/misc/show-machine-info.js'; -import { DaemonModule } from '@/daemons/DaemonModule.js'; -import { JanitorService } from '@/daemons/JanitorService.js'; -import { QueueStatsService } from '@/daemons/QueueStatsService.js'; -import { ServerStatsService } from '@/daemons/ServerStatsService.js'; -import { NestLogger } from '@/NestLogger.js'; -import { ChartManagementService } from '@/core/chart/ChartManagementService.js'; -import { ServerService } from '@/server/ServerService.js'; -import { MainModule } from '@/MainModule.js'; -import { envOption } from '../env.js'; +import { envOption } from '@/env.js'; +import { jobQueue, server } from './common.js'; const _filename = fileURLToPath(import.meta.url); const _dirname = dirname(_filename); @@ -73,14 +64,13 @@ export async function masterMain() { process.exit(1); } - const app = await NestFactory.createApplicationContext(MainModule, { - logger: new NestLogger(), - }); - app.enableShutdownHooks(); - - // start server - const serverService = app.get(ServerService); - serverService.launch(); + if (envOption.onlyServer) { + await server(); + } else if (envOption.onlyQueue) { + await jobQueue(); + } else { + await server(); + } bootLogger.succ('Misskey initialized'); @@ -89,11 +79,6 @@ export async function masterMain() { } bootLogger.succ(`Now listening on port ${config.port} on ${config.url}`, null, true); - - app.get(ChartManagementService).start(); - app.get(JanitorService).start(); - app.get(QueueStatsService).start(); - app.get(ServerStatsService).start(); } function showEnvironment(): void { diff --git a/packages/backend/src/boot/worker.ts b/packages/backend/src/boot/worker.ts index e0574643b..ab75aaa57 100644 --- a/packages/backend/src/boot/worker.ts +++ b/packages/backend/src/boot/worker.ts @@ -1,23 +1,18 @@ import cluster from 'node:cluster'; -import { NestFactory } from '@nestjs/core'; -import { ChartManagementService } from '@/core/chart/ChartManagementService.js'; -import { QueueProcessorService } from '@/queue/QueueProcessorService.js'; -import { NestLogger } from '@/NestLogger.js'; -import { QueueProcessorModule } from '@/queue/QueueProcessorModule.js'; +import { envOption } from '@/env.js'; +import { jobQueue, server } from './common.js'; /** * Init worker process */ export async function workerMain() { - const jobQueue = await NestFactory.createApplicationContext(QueueProcessorModule, { - logger: new NestLogger(), - }); - jobQueue.enableShutdownHooks(); - - // start job queue - jobQueue.get(QueueProcessorService).start(); - - jobQueue.get(ChartManagementService).start(); + if (envOption.onlyServer) { + await server(); + } else if (envOption.onlyQueue) { + await jobQueue(); + } else { + await jobQueue(); + } if (cluster.isWorker) { // Send a 'ready' message to parent process diff --git a/packages/backend/src/core/AntennaService.ts b/packages/backend/src/core/AntennaService.ts index be755f7da..7db8c43ea 100644 --- a/packages/backend/src/core/AntennaService.ts +++ b/packages/backend/src/core/AntennaService.ts @@ -77,10 +77,16 @@ export class AntennaService implements OnApplicationShutdown { const { type, body } = obj.message as StreamMessages['internal']['payload']; switch (type) { case 'antennaCreated': - this.antennas.push(body); + this.antennas.push({ + ...body, + createdAt: new Date(body.createdAt), + }); break; case 'antennaUpdated': - this.antennas[this.antennas.findIndex(a => a.id === body.id)] = body; + this.antennas[this.antennas.findIndex(a => a.id === body.id)] = { + ...body, + createdAt: new Date(body.createdAt), + }; break; case 'antennaDeleted': this.antennas = this.antennas.filter(a => a.id !== body.id); diff --git a/packages/backend/src/core/CaptchaService.ts b/packages/backend/src/core/CaptchaService.ts index 1e9891405..c8428a26b 100644 --- a/packages/backend/src/core/CaptchaService.ts +++ b/packages/backend/src/core/CaptchaService.ts @@ -21,18 +21,13 @@ export class CaptchaService { response, }); - const res = await this.httpRequestService.fetch( - url, - { - method: 'POST', - body: params, + const res = await this.httpRequestService.send(url, { + method: 'POST', + body: JSON.stringify(params), + headers: { + 'Content-Type': 'application/json', }, - { - noOkError: true, - } - ).catch(err => { - throw `${err.message ?? err}`; - }); + }, { throwErrorWhenResponseNotOk: false }); if (!res.ok) { throw `${res.status}`; diff --git a/packages/backend/src/core/DownloadService.ts b/packages/backend/src/core/DownloadService.ts index a3078bff4..a971e06fd 100644 --- a/packages/backend/src/core/DownloadService.ts +++ b/packages/backend/src/core/DownloadService.ts @@ -4,16 +4,15 @@ import * as util from 'node:util'; import { Inject, Injectable } from '@nestjs/common'; import IPCIDR from 'ip-cidr'; import PrivateIp from 'private-ip'; -import got, * as Got from 'got'; import chalk from 'chalk'; +import got, * as Got from 'got'; import { DI } from '@/di-symbols.js'; import type { Config } from '@/config.js'; -import { HttpRequestService, UndiciFetcher } from '@/core/HttpRequestService.js'; +import { HttpRequestService } from '@/core/HttpRequestService.js'; import { createTemp } from '@/misc/create-temp.js'; import { StatusError } from '@/misc/status-error.js'; import { LoggerService } from '@/core/LoggerService.js'; import type Logger from '@/logger.js'; -import { buildConnector } from 'undici'; const pipeline = util.promisify(stream.pipeline); import { bindThis } from '@/decorators.js'; @@ -21,7 +20,6 @@ import { bindThis } from '@/decorators.js'; @Injectable() export class DownloadService { private logger: Logger; - private undiciFetcher: UndiciFetcher; constructor( @Inject(DI.config) @@ -31,24 +29,6 @@ export class DownloadService { private loggerService: LoggerService, ) { this.logger = this.loggerService.getLogger('download'); - - this.undiciFetcher = new UndiciFetcher(this.httpRequestService.getStandardUndiciFetcherOption( - { - connect: process.env.NODE_ENV === 'development' ? - this.httpRequestService.clientDefaults.connect - : - this.httpRequestService.getConnectorWithIpCheck( - buildConnector({ - ...this.httpRequestService.clientDefaults.connect, - }), - (ip) => !this.isPrivateIp(ip) - ), - bodyTimeout: 30 * 1000, - }, - { - connect: this.httpRequestService.clientDefaults.connect, - } - ), this.logger); } @bindThis @@ -59,14 +39,60 @@ export class DownloadService { const operationTimeout = 60 * 1000; const maxSize = this.config.maxFileSize ?? 262144000; - const response = await this.undiciFetcher.fetch(url); + const req = got.stream(url, { + headers: { + 'User-Agent': this.config.userAgent, + }, + timeout: { + lookup: timeout, + connect: timeout, + secureConnect: timeout, + socket: timeout, // read timeout + response: timeout, + send: timeout, + request: operationTimeout, // whole operation timeout + }, + agent: { + http: this.httpRequestService.httpAgent, + https: this.httpRequestService.httpsAgent, + }, + http2: false, // default + retry: { + limit: 0, + }, + }).on('response', (res: Got.Response) => { + if ((process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'test') && !this.config.proxy && res.ip) { + if (this.isPrivateIp(res.ip)) { + this.logger.warn(`Blocked address: ${res.ip}`); + req.destroy(); + } + } - if (response.body === null) { - throw new StatusError('No body', 400, 'No body'); + const contentLength = res.headers['content-length']; + if (contentLength != null) { + const size = Number(contentLength); + if (size > maxSize) { + this.logger.warn(`maxSize exceeded (${size} > ${maxSize}) on response`); + req.destroy(); + } + } + }).on('downloadProgress', (progress: Got.Progress) => { + if (progress.transferred > maxSize) { + this.logger.warn(`maxSize exceeded (${progress.transferred} > ${maxSize}) on downloadProgress`); + req.destroy(); + } + }); + + try { + await pipeline(req, fs.createWriteStream(path)); + } catch (e) { + if (e instanceof Got.HTTPError) { + throw new StatusError(`${e.response.statusCode} ${e.response.statusMessage}`, e.response.statusCode, e.response.statusMessage); + } else { + throw e; + } } - await pipeline(stream.Readable.fromWeb(response.body), fs.createWriteStream(path)); - this.logger.succ(`Download finished: ${chalk.cyan(url)}`); } diff --git a/packages/backend/src/core/FetchInstanceMetadataService.ts b/packages/backend/src/core/FetchInstanceMetadataService.ts index cb9d099a2..35f30deeb 100644 --- a/packages/backend/src/core/FetchInstanceMetadataService.ts +++ b/packages/backend/src/core/FetchInstanceMetadataService.ts @@ -2,6 +2,7 @@ import { URL } from 'node:url'; import { Inject, Injectable } from '@nestjs/common'; import { JSDOM } from 'jsdom'; import tinycolor from 'tinycolor2'; +import fetch from 'node-fetch'; import type { Instance } from '@/models/entities/Instance.js'; import type { InstancesRepository } from '@/models/index.js'; import { AppLockService } from '@/core/AppLockService.js'; @@ -190,7 +191,9 @@ export class FetchInstanceMetadataService { const faviconUrl = url + '/favicon.ico'; - const favicon = await this.httpRequestService.fetch(faviconUrl, {}, { noOkError: true }); + const favicon = await this.httpRequestService.send(faviconUrl, { + method: 'HEAD', + }, { throwErrorWhenResponseNotOk: false }); if (favicon.ok) { return faviconUrl; diff --git a/packages/backend/src/core/HttpRequestService.ts b/packages/backend/src/core/HttpRequestService.ts index 2864ad440..baf74acfa 100644 --- a/packages/backend/src/core/HttpRequestService.ts +++ b/packages/backend/src/core/HttpRequestService.ts @@ -1,257 +1,67 @@ import * as http from 'node:http'; import * as https from 'node:https'; import CacheableLookup from 'cacheable-lookup'; +import fetch from 'node-fetch'; import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent'; import { Inject, Injectable } from '@nestjs/common'; import { DI } from '@/di-symbols.js'; import type { Config } from '@/config.js'; import { StatusError } from '@/misc/status-error.js'; import { bindThis } from '@/decorators.js'; -import * as undici from 'undici'; -import { LookupFunction } from 'node:net'; -import { LoggerService } from '@/core/LoggerService.js'; -import type Logger from '@/logger.js'; - -// true to allow, false to deny -export type IpChecker = (ip: string) => boolean; - -/* - * Child class to create and save Agent for fetch. - * You should construct this when you want - * to change timeout, size limit, socket connect function, etc. - */ -export class UndiciFetcher { - /** - * Get http non-proxy agent (undici) - */ - public nonProxiedAgent: undici.Agent; - - /** - * Get http proxy or non-proxy agent (undici) - */ - public agent: undici.ProxyAgent | undici.Agent; - - private proxyBypassHosts: string[]; - private userAgent: string | undefined; - - private logger: Logger | undefined; - - constructor( - args: { - agentOptions: undici.Agent.Options; - proxy?: { - uri: string; - options?: undici.Agent.Options; // Override of agentOptions - }, - proxyBypassHosts?: string[]; - userAgent?: string; - }, - logger?: Logger, - ) { - this.logger = logger; - this.logger?.debug('UndiciFetcher constructor', args); - - this.proxyBypassHosts = args.proxyBypassHosts ?? []; - this.userAgent = args.userAgent; - - this.nonProxiedAgent = new undici.Agent({ - ...args.agentOptions, - connect: (process.env.NODE_ENV !== 'production' && typeof args.agentOptions.connect !== 'function') - ? (options, cb) => { - // Custom connector for debug - undici.buildConnector(args.agentOptions.connect as undici.buildConnector.BuildOptions)(options, (err, socket) => { - this.logger?.debug('Socket connector called', socket); - if (err) { - this.logger?.debug(`Socket error`, err); - cb(new Error(`Error while socket connecting\n${err}`), null); - return; - } - this.logger?.debug(`Socket connected: port ${socket.localPort} => remote ${socket.remoteAddress}`); - cb(null, socket); - }); - } : args.agentOptions.connect, - }); - - this.agent = args.proxy - ? new undici.ProxyAgent({ - ...args.agentOptions, - ...args.proxy.options, - - uri: args.proxy.uri, - - connect: (process.env.NODE_ENV !== 'production' && typeof (args.proxy?.options?.connect ?? args.agentOptions.connect) !== 'function') - ? (options, cb) => { - // Custom connector for debug - undici.buildConnector((args.proxy?.options?.connect ?? args.agentOptions.connect) as undici.buildConnector.BuildOptions)(options, (err, socket) => { - this.logger?.debug('Socket connector called (secure)', socket); - if (err) { - this.logger?.debug(`Socket error`, err); - cb(new Error(`Error while socket connecting\n${err}`), null); - return; - } - this.logger?.debug(`Socket connected (secure): port ${socket.localPort} => remote ${socket.remoteAddress}`); - cb(null, socket); - }); - } : (args.proxy?.options?.connect ?? args.agentOptions.connect), - }) - : this.nonProxiedAgent; - } - - /** - * Get agent by URL - * @param url URL - * @param bypassProxy Allways bypass proxy - */ - @bindThis - public getAgentByUrl(url: URL, bypassProxy = false): undici.Agent | undici.ProxyAgent { - if (bypassProxy || this.proxyBypassHosts.includes(url.hostname)) { - return this.nonProxiedAgent; - } else { - return this.agent; - } - } - - @bindThis - public async fetch( - url: string | URL, - options: undici.RequestInit = {}, - privateOptions: { noOkError?: boolean; bypassProxy?: boolean; } = { noOkError: false, bypassProxy: false } - ): Promise { - const res = await undici.fetch(url, { - dispatcher: this.getAgentByUrl(new URL(url), privateOptions.bypassProxy), - ...options, - headers: { - 'User-Agent': this.userAgent ?? '', - ...(options.headers ?? {}), - }, - }).catch((err) => { - this.logger?.error(`fetch error to ${typeof url === 'string' ? url : url.href}`, err); - throw new StatusError('Resource Unreachable', 500, 'Resource Unreachable'); - }); - if (!res.ok && !privateOptions.noOkError) { - throw new StatusError(`${res.status} ${res.statusText}`, res.status, res.statusText); - } - return res; - } - - @bindThis - public async getJson(url: string, accept = 'application/json, */*', headers?: Record): Promise { - const res = await this.fetch( - url, - { - headers: Object.assign({ - Accept: accept, - }, headers ?? {}), - } - ); - - return await res.json() as T; - } - - @bindThis - public async getHtml(url: string, accept = 'text/html, */*', headers?: Record): Promise { - const res = await this.fetch( - url, - { - headers: Object.assign({ - Accept: accept, - }, headers ?? {}), - } - ); - - return await res.text(); - } -} +import type { Response } from 'node-fetch'; +import type { URL } from 'node:url'; @Injectable() export class HttpRequestService { - public defaultFetcher: UndiciFetcher; - public fetch: UndiciFetcher['fetch']; - public getHtml: UndiciFetcher['getHtml']; - public defaultJsonFetcher: UndiciFetcher; - public getJson: UndiciFetcher['getJson']; - - //#region for old http/https, only used in S3Service - // http non-proxy agent + /** + * Get http non-proxy agent + */ private http: http.Agent; - // https non-proxy agent + /** + * Get https non-proxy agent + */ private https: https.Agent; - // http proxy or non-proxy agent + /** + * Get http proxy or non-proxy agent + */ public httpAgent: http.Agent; - // https proxy or non-proxy agent + /** + * Get https proxy or non-proxy agent + */ public httpsAgent: https.Agent; - //#endregion - - public readonly dnsCache: CacheableLookup; - public readonly clientDefaults: undici.Agent.Options; - private maxSockets: number; - - private logger: Logger; constructor( @Inject(DI.config) private config: Config, - private loggerService: LoggerService, ) { - this.logger = this.loggerService.getLogger('http-request'); - - this.dnsCache = new CacheableLookup({ + const cache = new CacheableLookup({ maxTtl: 3600, // 1hours errorTtl: 30, // 30secs lookup: false, // nativeのdns.lookupにfallbackしない }); - - this.clientDefaults = { - keepAliveTimeout: 30 * 1000, - keepAliveMaxTimeout: 10 * 60 * 1000, - keepAliveTimeoutThreshold: 1 * 1000, - strictContentLength: true, - headersTimeout: 10 * 1000, - bodyTimeout: 10 * 1000, - maxHeaderSize: 16364, // default - maxResponseSize: 10 * 1024 * 1024, - maxRedirections: 3, - connect: { - timeout: 10 * 1000, // コネクションが確立するまでのタイムアウト - maxCachedSessions: 300, // TLSセッションのキャッシュ数 https://github.com/nodejs/undici/blob/v5.14.0/lib/core/connect.js#L80 - lookup: this.dnsCache.lookup as LookupFunction, // https://github.com/nodejs/undici/blob/v5.14.0/lib/core/connect.js#L98 - }, - } - - this.maxSockets = Math.max(64, this.config.deliverJobConcurrency ?? 128); - - this.defaultFetcher = new UndiciFetcher(this.getStandardUndiciFetcherOption(), this.logger); - - this.fetch = this.defaultFetcher.fetch; - this.getHtml = this.defaultFetcher.getHtml; - - this.defaultJsonFetcher = new UndiciFetcher(this.getStandardUndiciFetcherOption({ - maxResponseSize: 1024 * 256, - }), this.logger); - - this.getJson = this.defaultJsonFetcher.getJson; - - //#region for old http/https, only used in S3Service + this.http = new http.Agent({ keepAlive: true, keepAliveMsecs: 30 * 1000, - lookup: this.dnsCache.lookup, + lookup: cache.lookup, } as http.AgentOptions); this.https = new https.Agent({ keepAlive: true, keepAliveMsecs: 30 * 1000, - lookup: this.dnsCache.lookup, + lookup: cache.lookup, } as https.AgentOptions); - + + const maxSockets = Math.max(256, config.deliverJobConcurrency ?? 128); + this.httpAgent = config.proxy ? new HttpProxyAgent({ keepAlive: true, keepAliveMsecs: 30 * 1000, - maxSockets: this.maxSockets, + maxSockets, maxFreeSockets: 256, scheduling: 'lifo', proxy: config.proxy, @@ -262,42 +72,21 @@ export class HttpRequestService { ? new HttpsProxyAgent({ keepAlive: true, keepAliveMsecs: 30 * 1000, - maxSockets: this.maxSockets, + maxSockets, maxFreeSockets: 256, scheduling: 'lifo', proxy: config.proxy, }) : this.https; - //#endregion - } - - @bindThis - public getStandardUndiciFetcherOption(opts: undici.Agent.Options = {}, proxyOpts: undici.Agent.Options = {}) { - return { - agentOptions: { - ...this.clientDefaults, - ...opts, - }, - ...(this.config.proxy ? { - proxy: { - uri: this.config.proxy, - options: { - connections: this.maxSockets, - ...proxyOpts, - } - } - } : {}), - userAgent: this.config.userAgent, - } } /** - * Get http agent by URL + * Get agent by URL * @param url URL * @param bypassProxy Allways bypass proxy */ @bindThis - public getHttpAgentByUrl(url: URL, bypassProxy = false): http.Agent | https.Agent { + public getAgentByUrl(url: URL, bypassProxy = false): http.Agent | https.Agent { if (bypassProxy || (this.config.proxyBypassHosts || []).includes(url.hostname)) { return url.protocol === 'http:' ? this.http : this.https; } else { @@ -305,37 +94,67 @@ export class HttpRequestService { } } - /** - * check ip - */ @bindThis - public getConnectorWithIpCheck(connector: undici.buildConnector.connector, checkIp: IpChecker): undici.buildConnector.connectorAsync { - return (options, cb) => { - connector(options, (err, socket) => { - this.logger.debug('Socket connector (with ip checker) called', socket); - if (err) { - this.logger.error(`Socket error`, err) - cb(new Error(`Error while socket connecting\n${err}`), null); - return; - } + public async getJson(url: string, accept = 'application/json, */*', headers?: Record): Promise { + const res = await this.send(url, { + method: 'GET', + headers: Object.assign({ + 'User-Agent': this.config.userAgent, + Accept: accept, + }, headers ?? {}), + timeout: 5000, + size: 1024 * 256, + }); - if (socket.remoteAddress == undefined) { - this.logger.error(`Socket error: remoteAddress is undefined`); - cb(new Error('remoteAddress is undefined (maybe socket destroyed)'), null); - return; - } + return await res.json(); + } - // allow - if (checkIp(socket.remoteAddress)) { - this.logger.debug(`Socket connected (ip ok): ${socket.localPort} => ${socket.remoteAddress}`); - cb(null, socket); - return; - } + @bindThis + public async getHtml(url: string, accept = 'text/html, */*', headers?: Record): Promise { + const res = await this.send(url, { + method: 'GET', + headers: Object.assign({ + 'User-Agent': this.config.userAgent, + Accept: accept, + }, headers ?? {}), + timeout: 5000, + }); - this.logger.error('IP is not allowed', socket); - cb(new StatusError('IP is not allowed', 403, 'IP is not allowed'), null); - socket.destroy(); - }); - }; + return await res.text(); + } + + @bindThis + public async send(url: string, args: { + method?: string, + body?: string, + headers?: Record, + timeout?: number, + size?: number, + } = {}, extra: { + throwErrorWhenResponseNotOk: boolean; + } = { + throwErrorWhenResponseNotOk: true, + }): Promise { + const timeout = args.timeout ?? 5000; + + const controller = new AbortController(); + setTimeout(() => { + controller.abort(); + }, timeout); + + const res = await fetch(url, { + method: args.method ?? 'GET', + headers: args.headers, + body: args.body, + size: args.size ?? 10 * 1024 * 1024, + agent: (url) => this.getAgentByUrl(url), + signal: controller.signal, + }); + + if (!res.ok && extra.throwErrorWhenResponseNotOk) { + throw new StatusError(`${res.status} ${res.statusText}`, res.status, res.statusText); + } + + return res; } } diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts index c0f5eae3d..f8f9231cd 100644 --- a/packages/backend/src/core/RoleService.ts +++ b/packages/backend/src/core/RoleService.ts @@ -91,10 +91,12 @@ export class RoleService implements OnApplicationShutdown { case 'roleCreated': { const cached = this.rolesCache.get(null); if (cached) { - body.createdAt = new Date(body.createdAt); - body.updatedAt = new Date(body.updatedAt); - body.lastUsedAt = new Date(body.lastUsedAt); - cached.push(body); + cached.push({ + ...body, + createdAt: new Date(body.createdAt), + updatedAt: new Date(body.updatedAt), + lastUsedAt: new Date(body.lastUsedAt), + }); } break; } @@ -103,10 +105,12 @@ export class RoleService implements OnApplicationShutdown { if (cached) { const i = cached.findIndex(x => x.id === body.id); if (i > -1) { - body.createdAt = new Date(body.createdAt); - body.updatedAt = new Date(body.updatedAt); - body.lastUsedAt = new Date(body.lastUsedAt); - cached[i] = body; + cached[i] = { + ...body, + createdAt: new Date(body.createdAt), + updatedAt: new Date(body.updatedAt), + lastUsedAt: new Date(body.lastUsedAt), + }; } } break; @@ -121,8 +125,10 @@ export class RoleService implements OnApplicationShutdown { case 'userRoleAssigned': { const cached = this.roleAssignmentByUserIdCache.get(body.userId); if (cached) { - body.createdAt = new Date(body.createdAt); - cached.push(body); + cached.push({ + ...body, + createdAt: new Date(body.createdAt), + }); } break; } diff --git a/packages/backend/src/core/S3Service.ts b/packages/backend/src/core/S3Service.ts index 930188ce6..0ce69aaa7 100644 --- a/packages/backend/src/core/S3Service.ts +++ b/packages/backend/src/core/S3Service.ts @@ -33,7 +33,7 @@ export class S3Service { ? false : meta.objectStorageS3ForcePathStyle, httpOptions: { - agent: this.httpRequestService.getHttpAgentByUrl(new URL(u), !meta.objectStorageUseProxy), + agent: this.httpRequestService.getAgentByUrl(new URL(u), !meta.objectStorageUseProxy), }, }); } diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts index 29f216aa1..91a2767e6 100644 --- a/packages/backend/src/core/activitypub/ApRendererService.ts +++ b/packages/backend/src/core/activitypub/ApRendererService.ts @@ -21,11 +21,11 @@ import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js'; import type { UserKeypair } from '@/models/entities/UserKeypair.js'; import type { UsersRepository, UserProfilesRepository, NotesRepository, DriveFilesRepository, EmojisRepository, PollsRepository } from '@/models/index.js'; +import { bindThis } from '@/decorators.js'; import { LdSignatureService } from './LdSignatureService.js'; import { ApMfmService } from './ApMfmService.js'; import type { IActivity, IObject } from './type.js'; import type { IIdentifier } from './models/identifier.js'; -import { bindThis } from '@/decorators.js'; @Injectable() export class ApRendererService { diff --git a/packages/backend/src/core/activitypub/ApRequestService.ts b/packages/backend/src/core/activitypub/ApRequestService.ts index ab22a0c41..bfd53dfab 100644 --- a/packages/backend/src/core/activitypub/ApRequestService.ts +++ b/packages/backend/src/core/activitypub/ApRequestService.ts @@ -5,7 +5,7 @@ import { DI } from '@/di-symbols.js'; import type { Config } from '@/config.js'; import type { User } from '@/models/entities/User.js'; import { UserKeypairStoreService } from '@/core/UserKeypairStoreService.js'; -import { HttpRequestService, UndiciFetcher } from '@/core/HttpRequestService.js'; +import { HttpRequestService } from '@/core/HttpRequestService.js'; import { LoggerService } from '@/core/LoggerService.js'; import { bindThis } from '@/decorators.js'; import type Logger from '@/logger.js'; @@ -30,7 +30,6 @@ type PrivateKey = { @Injectable() export class ApRequestService { - private undiciFetcher: UndiciFetcher; private logger: Logger; constructor( @@ -41,10 +40,8 @@ export class ApRequestService { private httpRequestService: HttpRequestService, private loggerService: LoggerService, ) { + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition this.logger = this.loggerService?.getLogger('ap-request'); // なぜか TypeError: Cannot read properties of undefined (reading 'getLogger') と言われる - this.undiciFetcher = new UndiciFetcher(this.httpRequestService.getStandardUndiciFetcherOption({ - maxRedirections: 0, - }), this.logger ); } @bindThis @@ -163,14 +160,11 @@ export class ApRequestService { }, }); - await this.undiciFetcher.fetch( - url, - { - method: req.request.method, - headers: req.request.headers, - body, - } - ); + await this.httpRequestService.send(url, { + method: req.request.method, + headers: req.request.headers, + body, + }); } /** @@ -192,13 +186,10 @@ export class ApRequestService { }, }); - const res = await this.httpRequestService.fetch( - url, - { - method: req.request.method, - headers: req.request.headers, - } - ); + const res = await this.httpRequestService.send(url, { + method: req.request.method, + headers: req.request.headers, + }); return await res.json(); } diff --git a/packages/backend/src/core/activitypub/ApResolverService.ts b/packages/backend/src/core/activitypub/ApResolverService.ts index e51ae3795..7e962cb12 100644 --- a/packages/backend/src/core/activitypub/ApResolverService.ts +++ b/packages/backend/src/core/activitypub/ApResolverService.ts @@ -4,22 +4,21 @@ import { InstanceActorService } from '@/core/InstanceActorService.js'; import type { NotesRepository, PollsRepository, NoteReactionsRepository, UsersRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import { MetaService } from '@/core/MetaService.js'; -import { HttpRequestService, UndiciFetcher } from '@/core/HttpRequestService.js'; +import { HttpRequestService } from '@/core/HttpRequestService.js'; import { DI } from '@/di-symbols.js'; import { UtilityService } from '@/core/UtilityService.js'; import { bindThis } from '@/decorators.js'; +import { LoggerService } from '@/core/LoggerService.js'; +import type Logger from '@/logger.js'; import { isCollectionOrOrderedCollection } from './type.js'; import { ApDbResolverService } from './ApDbResolverService.js'; import { ApRendererService } from './ApRendererService.js'; import { ApRequestService } from './ApRequestService.js'; -import { LoggerService } from '@/core/LoggerService.js'; import type { IObject, ICollection, IOrderedCollection } from './type.js'; -import type Logger from '@/logger.js'; export class Resolver { private history: Set; private user?: ILocalUser; - private undiciFetcher: UndiciFetcher; private logger: Logger; constructor( @@ -39,10 +38,8 @@ export class Resolver { private recursionLimit = 100, ) { this.history = new Set(); - this.logger = this.loggerService?.getLogger('ap-resolve'); // なぜか TypeError: Cannot read properties of undefined (reading 'getLogger') と言われる - this.undiciFetcher = new UndiciFetcher(this.httpRequestService.getStandardUndiciFetcherOption({ - maxRedirections: 0, - }), this.logger); + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + this.logger = this.loggerService?.getLogger('ap-resolve'); // なぜか TypeError: Cannot read properties of undefined (reading 'getLogger') と言われる } @bindThis @@ -106,7 +103,7 @@ export class Resolver { const object = (this.user ? await this.apRequestService.signedGet(value, this.user) as IObject - : await this.undiciFetcher.getJson(value, 'application/activity+json, application/ld+json')); + : await this.httpRequestService.getJson(value, 'application/activity+json, application/ld+json')) as IObject; if (object == null || ( Array.isArray(object['@context']) ? diff --git a/packages/backend/src/core/activitypub/LdSignatureService.ts b/packages/backend/src/core/activitypub/LdSignatureService.ts index 4e4b7dce2..5a1e01574 100644 --- a/packages/backend/src/core/activitypub/LdSignatureService.ts +++ b/packages/backend/src/core/activitypub/LdSignatureService.ts @@ -9,7 +9,7 @@ import { CONTEXTS } from './misc/contexts.js'; class LdSignature { public debug = false; public preLoad = true; - public loderTimeout = 10 * 1000; + public loderTimeout = 5000; constructor( private httpRequestService: HttpRequestService, @@ -115,19 +115,12 @@ class LdSignature { @bindThis private async fetchDocument(url: string) { - const json = await this.httpRequestService.fetch( - url, - { - headers: { - Accept: 'application/ld+json, application/json', - }, - // TODO - //timeout: this.loderTimeout, + const json = await this.httpRequestService.send(url, { + headers: { + Accept: 'application/ld+json, application/json', }, - { - noOkError: true, - } - ).then(res => { + timeout: this.loderTimeout, + }, { throwErrorWhenResponseNotOk: false }).then(res => { if (!res.ok) { throw `${res.status} ${res.statusText}`; } else { diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts index e08f33c90..f86b5e6f9 100644 --- a/packages/backend/src/core/activitypub/models/ApPersonService.ts +++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts @@ -566,22 +566,22 @@ export class ApPersonService implements OnModuleInit { this.logger.info(`Updating the featured: ${user.uri}`); - if (resolver == null) resolver = this.apResolverService.createResolver(); + const _resolver = resolver ?? this.apResolverService.createResolver(); // Resolve to (Ordered)Collection Object - const collection = await resolver.resolveCollection(user.featured); + const collection = await _resolver.resolveCollection(user.featured); if (!isCollectionOrOrderedCollection(collection)) throw new Error('Object is not Collection or OrderedCollection'); // Resolve to Object(may be Note) arrays const unresolvedItems = isCollection(collection) ? collection.items : collection.orderedItems; - const items = await Promise.all(toArray(unresolvedItems).map(x => resolver.resolve(x))); + const items = await Promise.all(toArray(unresolvedItems).map(x => _resolver.resolve(x))); // Resolve and regist Notes const limit = promiseLimit(2); const featuredNotes = await Promise.all(items .filter(item => getApType(item) === 'Note') // TODO: Noteでなくてもいいかも .slice(0, 5) - .map(item => limit(() => this.apNoteService.resolveNote(item, resolver)))); + .map(item => limit(() => this.apNoteService.resolveNote(item, _resolver)))); await this.db.transaction(async transactionalEntityManager => { await transactionalEntityManager.delete(UserNotePining, { userId: user.id }); diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts index 34b523e14..f532b5bf6 100644 --- a/packages/backend/src/core/entities/UserEntityService.ts +++ b/packages/backend/src/core/entities/UserEntityService.ts @@ -496,10 +496,10 @@ export class UserEntityService implements OnModuleInit { showTimelineReplies: user.showTimelineReplies ?? falsy, achievements: profile!.achievements, loggedInDays: profile!.loggedInDates.length, + policies: this.roleService.getUserPolicies(user.id), } : {}), ...(opts.includeSecrets ? { - policies: this.roleService.getUserPolicies(user.id), email: profile!.email, emailVerified: profile!.emailVerified, securityKeysList: profile!.twoFactorEnabled diff --git a/packages/backend/src/misc/dev-null.ts b/packages/backend/src/misc/dev-null.ts new file mode 100644 index 000000000..38b9d8266 --- /dev/null +++ b/packages/backend/src/misc/dev-null.ts @@ -0,0 +1,11 @@ +import { Writable, WritableOptions } from "node:stream"; + +export class DevNull extends Writable implements NodeJS.WritableStream { + constructor(opts?: WritableOptions) { + super(opts); + } + + _write (chunk: any, encoding: BufferEncoding, cb: (err?: Error | null) => void) { + setImmediate(cb); + } +} diff --git a/packages/backend/src/misc/get-ip-hash.ts b/packages/backend/src/misc/get-ip-hash.ts index 379325bb1..70e61aef8 100644 --- a/packages/backend/src/misc/get-ip-hash.ts +++ b/packages/backend/src/misc/get-ip-hash.ts @@ -1,9 +1,14 @@ import IPCIDR from 'ip-cidr'; export function getIpHash(ip: string) { - // because a single person may control many IPv6 addresses, - // only a /64 subnet prefix of any IP will be taken into account. - // (this means for IPv4 the entire address is used) - const prefix = IPCIDR.createAddress(ip).mask(64); - return 'ip-' + BigInt('0b' + prefix).toString(36); + try { + // because a single person may control many IPv6 addresses, + // only a /64 subnet prefix of any IP will be taken into account. + // (this means for IPv4 the entire address is used) + const prefix = IPCIDR.createAddress(ip).mask(64); + return 'ip-' + BigInt('0b' + prefix).toString(36); + } catch (e) { + const prefix = IPCIDR.createAddress(ip.replace(/:[0-9]+$/, '')).mask(64); + return 'ip-' + BigInt('0b' + prefix).toString(36); + } } diff --git a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts b/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts index f0543a5ed..57210b25d 100644 --- a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts +++ b/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts @@ -6,10 +6,10 @@ 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'; -import { bindThis } from '@/decorators.js'; @Injectable() export class WebhookDeliverProcessorService { @@ -33,26 +33,23 @@ export class WebhookDeliverProcessorService { try { this.logger.debug(`delivering ${job.data.webhookId}`); - const res = await this.httpRequestService.fetch( - 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, - }, - 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, - }), - } - ); + 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, + }, + 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(), diff --git a/packages/backend/src/server/api/endpoints/fetch-rss.ts b/packages/backend/src/server/api/endpoints/fetch-rss.ts index ae6a87513..5849d3111 100644 --- a/packages/backend/src/server/api/endpoints/fetch-rss.ts +++ b/packages/backend/src/server/api/endpoints/fetch-rss.ts @@ -33,16 +33,13 @@ export default class extends Endpoint { private httpRequestService: HttpRequestService, ) { super(meta, paramDef, async (ps, me) => { - const res = await this.httpRequestService.fetch( - ps.url, - { - method: 'GET', - headers: { - Accept: 'application/rss+xml, */*', - }, - // timeout: 5000, - } - ); + const res = await this.httpRequestService.send(ps.url, { + method: 'GET', + headers: { + Accept: 'application/rss+xml, */*', + }, + timeout: 5000, + }); const text = await res.text(); diff --git a/packages/backend/src/server/api/endpoints/notes/translate.ts b/packages/backend/src/server/api/endpoints/notes/translate.ts index ab1977167..66655234a 100644 --- a/packages/backend/src/server/api/endpoints/notes/translate.ts +++ b/packages/backend/src/server/api/endpoints/notes/translate.ts @@ -7,8 +7,8 @@ import { DI } from '@/di-symbols.js'; import { NoteEntityService } from '@/core/entities/NoteEntityService.js'; import { MetaService } from '@/core/MetaService.js'; import { HttpRequestService } from '@/core/HttpRequestService.js'; -import { ApiError } from '../../error.js'; import { GetterService } from '@/server/api/GetterService.js'; +import { ApiError } from '../../error.js'; export const meta = { tags: ['notes'], @@ -83,20 +83,14 @@ export default class extends Endpoint { const endpoint = instance.deeplIsPro ? 'https://api.deepl.com/v2/translate' : 'https://api-free.deepl.com/v2/translate'; - const res = await this.httpRequestService.fetch( - endpoint, - { - method: 'POST', - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - Accept: 'application/json, */*', - }, - body: params.toString(), + const res = await this.httpRequestService.send(endpoint, { + method: 'POST', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded', + Accept: 'application/json, */*', }, - { - noOkError: false, - } - ); + body: params.toString(), + }); const json = (await res.json()) as { translations: { diff --git a/packages/backend/src/server/api/stream/types.ts b/packages/backend/src/server/api/stream/types.ts index 9daaa4acf..fc145cf0e 100644 --- a/packages/backend/src/server/api/stream/types.ts +++ b/packages/backend/src/server/api/stream/types.ts @@ -30,7 +30,7 @@ export interface InternalStreamTypes { remoteUserUpdated: Serialized<{ id: User['id']; }>; follow: Serialized<{ followerId: User['id']; followeeId: User['id']; }>; unfollow: Serialized<{ followerId: User['id']; followeeId: User['id']; }>; - policiesUpdated: Serialized; + policiesUpdated: Serialized; roleCreated: Serialized; roleDeleted: Serialized; roleUpdated: Serialized; diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug index b27bbcbce..d05901bae 100644 --- a/packages/backend/src/server/web/views/base.pug +++ b/packages/backend/src/server/web/views/base.pug @@ -35,7 +35,7 @@ html link(rel='prefetch' href='https://xn--931a.moe/assets/info.jpg') link(rel='prefetch' href='https://xn--931a.moe/assets/not-found.jpg') link(rel='prefetch' href='https://xn--931a.moe/assets/error.jpg') - link(rel='stylesheet' href='/assets/tabler-icons/tabler-icons.css') + link(rel='stylesheet' href='/assets/tabler-icons/tabler-icons.min.css') link(rel='modulepreload' href=`/vite/${clientEntry.file}`) if !config.clientManifestExists diff --git a/packages/frontend/package.json b/packages/frontend/package.json index cdfa96ea8..da568a9ea 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -12,7 +12,7 @@ "@rollup/plugin-json": "6.0.0", "@rollup/pluginutils": "5.0.2", "@syuilo/aiscript": "0.12.2", - "@tabler/icons": "^1.118.0", + "@tabler/icons-webfont": "^2.0.0", "@vitejs/plugin-vue": "4.0.0", "@vue/compiler-sfc": "3.2.45", "autobind-decorator": "2.4.0", @@ -82,15 +82,15 @@ "@types/uuid": "9.0.0", "@types/websocket": "1.0.5", "@types/ws": "8.5.4", - "@typescript-eslint/eslint-plugin": "5.48.2", - "@typescript-eslint/parser": "5.48.2", + "@typescript-eslint/eslint-plugin": "5.49.0", + "@typescript-eslint/parser": "5.49.0", "@vue/runtime-core": "3.2.45", "cross-env": "7.0.3", "cypress": "12.3.0", "eslint": "8.32.0", "eslint-plugin-import": "2.27.5", "eslint-plugin-vue": "9.9.0", - "start-server-and-test": "1.15.2", + "start-server-and-test": "1.15.3", "vue-eslint-parser": "^9.1.0", "vue-tsc": "^1.0.24" } diff --git a/packages/frontend/src/components/MkAchievements.vue b/packages/frontend/src/components/MkAchievements.vue index 64fea9635..19d04721d 100644 --- a/packages/frontend/src/components/MkAchievements.vue +++ b/packages/frontend/src/components/MkAchievements.vue @@ -16,8 +16,8 @@ -
{{ i18n.ts._achievements._types['_' + achievement.name].description }}
-
{{ i18n.ts._achievements._types['_' + achievement.name].flavor }}
+
{{ withDescription ? i18n.ts._achievements._types['_' + achievement.name].description : '???' }}
+
{{ i18n.ts._achievements._types['_' + achievement.name].flavor }}