Merge branch 'develop' into feat/schedule-create

refactor: types

Co-authored-by: Lhcfl <Lhcfl@outlook.com>

See merge request firefish/firefish!10762

.gitlab-ci.yml

@@ -3,29 +3,31 @@ image: docker.io/rust:slim-bookworm
 services:
   - name: docker.io/groonga/pgroonga:latest-alpine-12-slim
     alias: postgres
+    pull_policy: if-not-present
   - name: docker.io/redis:7-alpine
     alias: redis
+    pull_policy: if-not-present
 
 workflow:
   rules:
-    - if: $CI_PROJECT_PATH == 'firefish/firefish'
-      when: always
-    - if: $CI_MERGE_REQUEST_PROJECT_PATH == 'firefish/firefish'
+    - if: $CI_PROJECT_PATH == 'firefish/firefish' || $CI_MERGE_REQUEST_PROJECT_PATH == 'firefish/firefish'
+      changes:
+        paths:
+          - packages/**/*
+          - locales/**/*
+          - scripts/**/*
+          - package.json
+          - Cargo.toml
+          - Cargo.lock
+          - Dockerfile
+          - .dockerignore
       when: always
     - when: never
 
-cache:
-  paths:
-    - node_modules
-    # - /usr/local/cargo/registry/index
-    # - /usr/local/cargo/registry/cache
-    - target/debug/deps
-    - target/debug/build
-
 stages:
+  - dependency
   - test
   - build
-  - dependency
 
 variables:
   POSTGRES_DB: 'firefish_db'
@@ -36,6 +38,8 @@ variables:
   CARGO_PROFILE_DEV_OPT_LEVEL: '0'
   CARGO_PROFILE_DEV_LTO: 'off'
   CARGO_PROFILE_DEV_DEBUG: 'none'
+  CARGO_TERM_COLOR: 'always'
+  GIT_CLEAN_FLAGS: -ffdx -e node_modules/ -e built/ -e target/ -e packages/backend-rs/built/
 
 default:
   before_script:
@@ -50,29 +54,114 @@ default:
     - export PGPASSWORD="${POSTGRES_PASSWORD}"
     - psql --host postgres --user "${POSTGRES_USER}" --dbname "${POSTGRES_DB}" --command 'CREATE EXTENSION pgroonga'
 
-build_test:
+test:build:
   stage: test
   rules:
-    - if: $CI_PIPELINE_SOURCE == 'push' || $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $TEST == 'false'
+      when: never
+    - if: $CI_COMMIT_BRANCH == 'develop' || $CI_PIPELINE_SOURCE == 'merge_request_event'
       changes:
         paths:
-          - packages/**/*
+          - packages/backend-rs/**/*
+          - packages/macro-rs/**/*
           - scripts/**/*
-          - locales/**/*
           - package.json
-          - pnpm-lock.yaml
           - Cargo.toml
           - Cargo.lock
+      when: always
+  needs:
+    - job: cargo:clippy
+      optional: true
+    - job: cargo:test
+      optional: true
   script:
     - pnpm install --frozen-lockfile
     - pnpm run build:debug
     - pnpm run migrate
 
-container_image_build:
+test:build:backend_ts_only:
+  stage: test
+  rules:
+    - if: $TEST == 'false'
+      when: never
+    - if: $CI_COMMIT_BRANCH == 'develop' || $CI_PIPELINE_SOURCE == 'merge_request_event'
+      changes:
+        paths:
+          - packages/backend-rs/**/*
+          - packages/macro-rs/**/*
+          - scripts/**/*
+          - package.json
+          - Cargo.toml
+          - Cargo.lock
+      when: never 
+    - if: $CI_COMMIT_BRANCH == 'develop' || $CI_PIPELINE_SOURCE == 'merge_request_event'
+      changes:
+        paths:
+          - packages/backend/**/*
+          - packages/firefish-js/**/*
+          - packages/megalodon/**/*
+      when: always
+  before_script:
+    - apt-get update && apt-get -y upgrade
+    - apt-get -y --no-install-recommends install curl
+    - curl -fsSL 'https://deb.nodesource.com/setup_18.x' | bash -
+    - apt-get install -y --no-install-recommends build-essential python3 nodejs postgresql-client
+    - corepack enable
+    - corepack prepare pnpm@latest --activate
+    - mkdir -p packages/backend-rs/built
+    - cp packages/backend-rs/index.js packages/backend-rs/built/index.js
+    - cp packages/backend-rs/index.d.ts packages/backend-rs/built/index.d.ts
+    - cp .config/ci.yml .config/default.yml
+    - export PGPASSWORD="${POSTGRES_PASSWORD}"
+    - psql --host postgres --user "${POSTGRES_USER}" --dbname "${POSTGRES_DB}" --command 'CREATE EXTENSION pgroonga'
+  script:
+    - pnpm install --frozen-lockfile
+    - pnpm --filter 'backend' --filter 'firefish-js' --filter 'megalodon' run build:debug
+    - pnpm run migrate
+
+test:build:client_only:
+  stage: test
+  rules:
+    - if: $TEST == 'false'
+      when: never
+    - if: $CI_COMMIT_BRANCH == 'develop' || $CI_PIPELINE_SOURCE == 'merge_request_event'
+      changes:
+        paths:
+          - packages/backend-rs/**/*
+          - packages/macro-rs/**/*
+          - scripts/**/*
+          - package.json
+          - Cargo.toml
+          - Cargo.lock
+      when: never
+    - if: $CI_COMMIT_BRANCH == 'develop' || $CI_PIPELINE_SOURCE == 'merge_request_event'
+      changes:
+        paths:
+          - packages/client/**/*
+          - packages/firefish-js/**/*
+          - packages/sw/**/*
+          - locales/**/*
+      when: always
+  services: []
+  before_script:
+    - apt-get update && apt-get -y upgrade
+    - apt-get -y --no-install-recommends install curl
+    - curl -fsSL 'https://deb.nodesource.com/setup_18.x' | bash -
+    - apt-get install -y --no-install-recommends build-essential python3 perl nodejs
+    - corepack enable
+    - corepack prepare pnpm@latest --activate
+    - cp .config/ci.yml .config/default.yml
+  script:
+    - pnpm install --frozen-lockfile
+    - pnpm --filter 'firefish-js' --filter 'client' --filter 'sw' run build:debug
+
+build:container:
   stage: build
   image: docker.io/debian:bookworm-slim
   services: []
   rules:
+    - if: $BUILD == 'false'
+      when: never
     - if: $CI_COMMIT_BRANCH == 'develop'
       changes:
         paths:
@@ -80,54 +169,87 @@ container_image_build:
           - locales/**/*
           - scripts/copy-assets.mjs
           - package.json
-          - pnpm-lock.yaml
           - Cargo.toml
           - Cargo.lock
           - Dockerfile
           - .dockerignore
+      when: always
+  needs:
+    - job: test:build
+      optional: true
+    - job: test:build:backend_ts_only
+      optional: true
+    - job: test:build:client_only
+      optional: true
   before_script:
     - apt-get update && apt-get -y upgrade
     - apt-get install -y --no-install-recommends buildah ca-certificates fuse-overlayfs
     - buildah login --username "${CI_REGISTRY_USER}" --password "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}"
     - export IMAGE_TAG="${CI_REGISTRY}/${CI_PROJECT_PATH}/develop:not-for-production"
+    - export IMAGE_CACHE="${CI_REGISTRY}/${CI_PROJECT_PATH}/develop/cache"
   script:
-    - buildah build --isolation chroot --device /dev/fuse:rw --security-opt seccomp=unconfined --security-opt apparmor=unconfined --cap-add all --tag "${IMAGE_TAG}" --platform linux/amd64 .
+    - |-
+      buildah build \
+        --isolation chroot \
+        --device /dev/fuse:rw \
+        --security-opt seccomp=unconfined \
+        --security-opt apparmor=unconfined \
+        --cap-add all \
+        --platform linux/amd64 \
+        --layers \
+        --cache-to "${IMAGE_CACHE}" \
+        --cache-from "${IMAGE_CACHE}" \
+        --tag "${IMAGE_TAG}" \
+        .
     - buildah inspect "${IMAGE_TAG}"
     - buildah push "${IMAGE_TAG}"
 
-cargo_unit_test:
+cargo:test:
   stage: test
   rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_COMMIT_BRANCH == 'develop'
+    - if: $TEST == 'false'
+      when: never
+    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'main'
+      when: never
+    - if: $CI_COMMIT_BRANCH == 'develop' || $CI_PIPELINE_SOURCE == 'merge_request_event'
       changes:
         paths:
           - packages/backend-rs/**/*
           - packages/macro-rs/**/*
           - Cargo.toml
           - Cargo.lock
-    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'main'
-      when: never
+      when: always
   script:
-    - cargo check --features napi
+    - curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C /usr/local/cargo/bin
     - pnpm install --frozen-lockfile
-    - mkdir packages/backend-rs/built
+    - mkdir -p packages/backend-rs/built
     - cp packages/backend-rs/index.js packages/backend-rs/built/index.js
     - cp packages/backend-rs/index.d.ts packages/backend-rs/built/index.d.ts
     - pnpm --filter='!backend-rs' run build:debug
-    - cargo test
+    - cargo test --doc
+    - cargo nextest run
 
-cargo_clippy:
+cargo:clippy:
   stage: test
   rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $TEST == 'false'
+      when: never
+    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'main'
+      when: never
+    - if: $CI_COMMIT_BRANCH == 'develop' || $CI_PIPELINE_SOURCE == 'merge_request_event'
       changes:
         paths:
           - packages/backend-rs/**/*
           - packages/macro-rs/**/*
           - Cargo.toml
           - Cargo.lock
-    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'main'
-      when: never
+      when: always
+  services: []
+  before_script:
+    - apt-get update && apt-get -y upgrade
+    - apt-get install -y --no-install-recommends build-essential clang mold perl
+    - cp ci/cargo/config.toml /usr/local/cargo/config.toml
+    - rustup component add clippy
   script:
     - cargo clippy -- -D warnings
 

Cargo.toml

@@ -5,8 +5,8 @@ resolver = "2"
 [workspace.dependencies]
 macro_rs = { path = "packages/macro-rs" }
 
-napi = { version = "2.16.4", default-features = false }
-napi-derive = "2.16.3"
+napi = { version = "2.16.6", default-features = false }
+napi-derive = "2.16.4"
 napi-build = "2.1.3"
 
 argon2 = "0.5.3"
@@ -23,24 +23,26 @@ nom-exif = "1.2.0"
 once_cell = "1.19.0"
 openssl = "0.10.64"
 pretty_assertions = "1.4.0"
-proc-macro2 = "1.0.81"
+proc-macro2 = "1.0.82"
 quote = "1.0.36"
 rand = "0.8.5"
 redis = "0.25.3"
 regex = "1.10.4"
-rmp-serde = "1.2.0"
+rmp-serde = "1.3.0"
 sea-orm = "0.12.15"
-serde = "1.0.198"
-serde_json = "1.0.116"
+serde = "1.0.202"
+serde_json = "1.0.117"
 serde_yaml = "0.9.34"
 strum = "0.26.2"
-syn = "2.0.60"
-thiserror = "1.0.59"
+syn = "2.0.63"
+sysinfo = "0.30.12"
+thiserror = "1.0.60"
 tokio = "1.37.0"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
 url = "2.5.0"
 urlencoding = "2.1.3"
+web-push = { git = "https://github.com/pimeys/rust-web-push", rev = "40febe4085e3cef9cdfd539c315e3e945aba0656" }
 
 [profile.release]
 lto = true

Dockerfile

@@ -7,7 +7,12 @@ RUN apk update && apk add --no-cache build-base linux-headers curl ca-certificat
 RUN curl --proto '=https' --tlsv1.2 --silent --show-error --fail https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
 
-# Copy only the cargo dependency-related files first, to cache efficiently
+# Copy only backend-rs dependency-related files first, to cache efficiently
+COPY package.json pnpm-workspace.yaml ./
+COPY packages/backend-rs/package.json packages/backend-rs/package.json
+COPY packages/backend-rs/npm/linux-x64-musl/package.json packages/backend-rs/npm/linux-x64-musl/package.json
+COPY packages/backend-rs/npm/linux-arm64-musl/package.json packages/backend-rs/npm/linux-arm64-musl/package.json
+
 COPY Cargo.toml Cargo.toml
 COPY Cargo.lock Cargo.lock
 COPY packages/backend-rs/Cargo.toml packages/backend-rs/Cargo.toml
@@ -15,22 +20,9 @@ COPY packages/backend-rs/src/lib.rs packages/backend-rs/src/
 COPY packages/macro-rs/Cargo.toml packages/macro-rs/Cargo.toml
 COPY packages/macro-rs/src/lib.rs packages/macro-rs/src/
 
-# Install cargo dependencies
-RUN cargo fetch --locked --manifest-path /firefish/packages/backend-rs/Cargo.toml
-
-# Copy only the dependency-related files first, to cache efficiently
-COPY package.json pnpm*.yaml ./
-COPY packages/backend/package.json packages/backend/package.json
-COPY packages/client/package.json packages/client/package.json
-COPY packages/sw/package.json packages/sw/package.json
-COPY packages/firefish-js/package.json packages/firefish-js/package.json
-COPY packages/megalodon/package.json packages/megalodon/package.json
-COPY packages/backend-rs/package.json packages/backend-rs/package.json
-COPY packages/backend-rs/npm/linux-x64-musl/package.json packages/backend-rs/npm/linux-x64-musl/package.json
-COPY packages/backend-rs/npm/linux-arm64-musl/package.json packages/backend-rs/npm/linux-arm64-musl/package.json
-
-# Configure pnpm, and install dev mode dependencies for compilation
-RUN corepack enable && corepack prepare pnpm@latest --activate && pnpm install --frozen-lockfile
+# Configure pnpm, and install backend-rs dependencies
+RUN corepack enable && corepack prepare pnpm@latest --activate && pnpm --filter backend-rs install
+RUN cargo fetch --locked --manifest-path Cargo.toml
 
 # Copy in the rest of the rust files
 COPY packages/backend-rs packages/backend-rs/
@@ -42,10 +34,22 @@ RUN NODE_ENV='production' pnpm run --filter backend-rs build
 # Copy/Overwrite index.js to mitigate the bug in napi-rs codegen
 COPY packages/backend-rs/index.js packages/backend-rs/built/index.js
 
-# Copy in the rest of the files to compile
+# Copy only the dependency-related files first, to cache efficiently
+COPY packages/backend/package.json packages/backend/package.json
+COPY packages/client/package.json packages/client/package.json
+COPY packages/sw/package.json packages/sw/package.json
+COPY packages/firefish-js/package.json packages/firefish-js/package.json
+COPY packages/megalodon/package.json packages/megalodon/package.json
+COPY pnpm-lock.yaml ./
+
+# Install dev mode dependencies for compilation
+RUN pnpm install --frozen-lockfile
+
+# Copy in the rest of the files to build
 COPY . ./
-RUN NODE_ENV='production' pnpm run --filter firefish-js build
-RUN NODE_ENV='production' pnpm run --recursive --parallel --filter '!backend-rs' --filter '!firefish-js' build && pnpm run build:assets
+
+# Build other workspaces
+RUN NODE_ENV='production' pnpm run --recursive --filter '!backend-rs' build && pnpm run build:assets
 
 # Trim down the dependencies to only those for production
 RUN find . -path '*/node_modules/*' -delete && pnpm install --prod --frozen-lockfile

docs/api-change.md

@@ -2,8 +2,10 @@
 
 Breaking changes are indicated by the :warning: icon.
 
-## Unreleased
+## v20240516
 
+- :warning: `server-info` (an endpoint to get server hardware information) now requires credentials.
+- :warning: `net` (server's default network interface) has been removed from `admin/server-info`.
 - Adding `lang` to the response of `i` and the request parameter of `i/update`.
 
 ## v20240504

docs/changelog.md

@@ -5,6 +5,13 @@ Critical security updates are indicated by the :warning: icon.
 - Server administrators should check [notice-for-admins.md](./notice-for-admins.md) as well.
 - Third-party client/bot developers may want to check [api-change.md](./api-change.md) as well.
 
+## [v20240516](https://firefish.dev/firefish/firefish/-/merge_requests/10854/commits)
+
+- Improve timeline UX (you can restore the original appearance by settings)
+- Remove `$[center]` MFM function
+	- This function was suddenly added last year (https://firefish.dev/firefish/firefish/-/commit/1a971efa689323d54eebb4d3646e102fb4d1d95a), but according to the [MFM spec](https://github.com/misskey-dev/mfm.js/blob/6aaf68089023c6adebe44123eebbc4dcd75955e0/docs/syntax.md#fn), `$[something]` must be an inline element (while `center` is a block element), so such a syntax is not expected by MFM renderers. Please use `<center></center>` instead.
+- Fix bugs
+
 ## [v20240504](https://firefish.dev/firefish/firefish/-/merge_requests/10790/commits)
 
 - Fix bugs

docs/notice-for-admins.md

@@ -2,6 +2,12 @@
 
 You can skip intermediate versions when upgrading from an old version, but please read the notices and follow the instructions for each intermediate version before [upgrading](./upgrade.md).
 
+## v20240516
+
+### For all users
+
+Firefish is now compatible with [Node v22](https://nodejs.org/en/blog/announcements/v22-release-announce). The pre-built OCI container image will still be using the latest LTS version (v20.13.1 as of now).
+
 ## v20240430
 
 ### For all users
@@ -17,11 +23,13 @@ You can control the verbosity of the server log by adding `maxLogLevel` in `.con
 - Not only Firefish but also Node.js has recently fixed a few security issues:
   - https://nodejs.org/en/blog/vulnerability/april-2024-security-releases
   - https://nodejs.org/en/blog/vulnerability/april-2024-security-releases-2
+
   So, it is highly recommended that you upgrade your Node.js version as well. The new versions are
     - Node v18.20.2 (v18.x LTS)
     - Node v20.12.2 (v20.x LTS)
     - Node v21.7.3 (v21.x)
-  - You can check your Node.js version by this command:
+
+  You can check your Node.js version by this command:
     ```sh
     node --version
     ```

locales/ca-ES.yml

@@ -2301,3 +2301,9 @@ getQrCode: Mostrar el codi QR
 copyRemoteFollowUrl: Còpia la adreça URL del seguidor remot
 foldNotification: Agrupar les notificacions similars
 slashQuote: Cita encadenada
+i18nServerInfo: Els nous clients els trobares en {language} per defecte.
+i18nServerChange: Fes servir {language} en comptes.
+i18nServerSet: Fes servir {language} per els nous clients.
+mergeThreadInTimeline: Fusiona diferents publicacions en un mateix fil a les línies
+  de temps
+mergeRenotesInTimeline: Agrupa diferents impulsos d'una mateixa publicació

locales/en-US.yml

@@ -1588,7 +1588,7 @@ _ago:
   yearsAgo: "{n}y ago"
 _later:
   future: "Future"
-  justNow: "Immediate"
+  justNow: "Right now"
   secondsAgo: "{n}s later"
   minutesAgo: "{n}m later"
   hoursAgo: "{n}h later"
@@ -2256,3 +2256,5 @@ slashQuote: "Chain quote"
 foldNotification: "Group similar notifications"
 scheduledPost: "Scheduled post"
 scheduledDate: "Scheduled date"
+mergeThreadInTimeline: "Merge multiple posts in the same thread in timelines"
+mergeRenotesInTimeline: "Group multiple boosts of the same post"

locales/eo.yml

@@ -0,0 +1 @@
+_lang_: "Esperanto"

locales/fr-FR.yml

@@ -1142,8 +1142,8 @@ _wordMute:
   mutedNotes: "Publications masquées"
   muteLangsDescription2: Utiliser les codes de langue (i.e en, fr, ja, zh).
   lang: Langue
-  langDescription: Cacher du fil de publication les publications qui correspondent
-    à ces langues.
+  langDescription: Cachez les publications qui correspondent à la langue définie dans
+    le fil d'actualité.
   muteLangs: Langues filtrées
   muteLangsDescription: Séparer avec des espaces ou des retours à la ligne pour une
     condition OU (OR).
@@ -1260,7 +1260,7 @@ _tutorial:
   step2_2: "En fournissant quelques informations sur qui vous êtes, il sera plus facile
     pour les autres de savoir s'ils veulent voir vos publcations ou s'abonner à vous."
   step3_1: "Maintenant il est temps de vous abonner à des gens !"
-  step3_2: "Vos fils d'actualités Principal et Social sont basés sur les personnes
+  step3_2: "Vos fils d'actualité Principal et Social sont basés sur les personnes
     que vous êtes abonné, alors essayez de vous abonner à quelques comptes pour commencer.\n
     Cliquez sur le cercle « plus » en haut à droite d'un profil pour vous abonner."
   step4_1: "On y va."
@@ -2332,3 +2332,9 @@ inputAccountId: Veuillez saisir votre compte (par exemple, @firefish@info.firefi
 remoteFollow: Abonnement à distance
 copyRemoteFollowUrl: Copier l'URL d'abonnement à distance
 slashQuote: Citation enchaînée
+i18nServerInfo: Les nouveaux clients seront en {language} par défaut.
+i18nServerChange: Utilisez {language} à la place.
+i18nServerSet: Utilisez {language} pour les nouveaux clients.
+mergeThreadInTimeline: Fusionner plusieurs publications dans le même fil dans les
+  fils d'actualité
+mergeRenotesInTimeline: Regrouper plusieurs boosts du même publication

locales/ja-JP.yml

@@ -2071,3 +2071,5 @@ getQrCode: QRコードを表示
 copyRemoteFollowUrl: リモートからフォローするURLをコピー
 foldNotification: 同じ種類の通知をまとめて表示する
 slashQuote: 繋げて引用
+mergeRenotesInTimeline: タイムラインで同じ投稿のブーストをまとめる
+mergeThreadInTimeline: タイムラインで同じスレッドの投稿をまとめる

locales/zh-CN.yml

@@ -2083,3 +2083,5 @@ slashQuote: "斜杠引用"
 foldNotification: "将通知按同类型分组"
 scheduledPost: "定时发送"
 scheduledDate: "发送日期"
+mergeThreadInTimeline: "将时间线内的连续回复合并成一串"
+mergeRenotesInTimeline: "合并同一个帖子的转发"

package.json

@@ -1,17 +1,17 @@
 {
 	"name": "firefish",
-	"version": "20240504",
+	"version": "20240516",
 	"repository": {
 		"type": "git",
 		"url": "https://firefish.dev/firefish/firefish.git"
 	},
-	"packageManager": "pnpm@8.15.7",
+	"packageManager": "pnpm@9.1.1",
 	"private": true,
 	"scripts": {
 		"rebuild": "pnpm run clean && pnpm run build",
-		"build": "pnpm node ./scripts/build.mjs && pnpm run build:assets",
+		"build": "pnpm --recursive --color run build && pnpm node ./scripts/copy-index.mjs && pnpm run build:assets",
 		"build:assets": "pnpm node ./scripts/copy-assets.mjs",
-		"build:debug": "pnpm run clean && pnpm node ./scripts/dev-build.mjs && pnpm run build:assets",
+		"build:debug": "pnpm run clean && pnpm --recursive --color run build:debug && pnpm node ./scripts/copy-index-dev.mjs && pnpm run build:assets",
 		"start": "pnpm --filter backend run start",
 		"start:container": "pnpm run build:assets && pnpm run migrate && pnpm run start",
 		"start:test": "pnpm --filter backend run start:test",
@@ -41,14 +41,14 @@
 		"js-yaml": "4.1.0"
 	},
 	"devDependencies": {
-		"@biomejs/biome": "1.7.1",
-		"@biomejs/cli-darwin-arm64": "^1.7.1",
-		"@biomejs/cli-darwin-x64": "^1.7.1",
-		"@biomejs/cli-linux-arm64": "^1.7.1",
-		"@biomejs/cli-linux-x64": "^1.7.1",
-		"@types/node": "20.12.7",
-		"execa": "8.0.1",
-		"pnpm": "8.15.7",
+		"@biomejs/biome": "1.7.3",
+		"@biomejs/cli-darwin-arm64": "1.7.3",
+		"@biomejs/cli-darwin-x64": "1.7.3",
+		"@biomejs/cli-linux-arm64": "1.7.3",
+		"@biomejs/cli-linux-x64": "1.7.3",
+		"@types/node": "20.12.12",
+		"execa": "9.1.0",
+		"pnpm": "9.1.1",
 		"typescript": "5.4.5"
 	}
 }

packages/backend-rs/Cargo.toml

@@ -39,12 +39,14 @@ serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }
 strum = { workspace = true, features = ["derive"] }
+sysinfo = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 url = { workspace = true }
 urlencoding = { workspace = true }
+web-push = { workspace = true }
 
 [dev-dependencies]
 pretty_assertions = { workspace = true }

packages/backend-rs/index.d.ts

@@ -41,7 +41,6 @@ export interface ServerConfig {
   proxySmtp?: string
   proxyBypassHosts?: Array<string>
   allowedPrivateNetworks?: Array<string>
-  /** `NapiValue` is not implemented for `u64` */
   maxFileSize?: number
   accessLog?: string
   clusterLimits?: WorkerConfigInternal
@@ -212,6 +211,8 @@ export interface Acct {
 }
 export function stringToAcct(acct: string): Acct
 export function acctToString(acct: Acct): string
+export function showServerInfo(): void
+export function initializeRustLogger(): void
 export function addNoteToAntenna(antennaId: string, note: Note): void
 /**
  * Checks if a server is blocked.
@@ -235,7 +236,6 @@ export function isSilencedServer(host: string): Promise<boolean>
  * `host` - punycoded instance host
  */
 export function isAllowedServer(host: string): Promise<boolean>
-/** TODO: handle name collisions better */
 export interface NoteLikeForCheckWordMute {
   fileIds: Array<string>
   userId: string | null
@@ -260,7 +260,6 @@ export interface ImageSize {
   height: number
 }
 export function getImageSizeFromUrl(url: string): Promise<ImageSize>
-/** TODO: handle name collisions better */
 export interface NoteLikeForGetNoteSummary {
   fileIds: Array<string>
   text: string | null
@@ -268,6 +267,28 @@ export interface NoteLikeForGetNoteSummary {
   hasPoll: boolean
 }
 export function getNoteSummary(note: NoteLikeForGetNoteSummary): string
+export interface Cpu {
+  model: string
+  cores: number
+}
+export interface Memory {
+  /** Total memory amount in bytes */
+  total: number
+  /** Used memory amount in bytes */
+  used: number
+  /** Available (for (re)use) memory amount in bytes */
+  available: number
+}
+export interface Storage {
+  /** Total storage space in bytes */
+  total: number
+  /** Used storage space in bytes */
+  used: number
+}
+export function cpuInfo(): Cpu
+export function cpuUsage(): number
+export function memoryUsage(): Memory
+export function storageUsage(): Storage | null
 export function isSafeUrl(url: string): boolean
 export function latestVersion(): Promise<string>
 export function toMastodonId(firefishId: string): string | null
@@ -1156,7 +1177,6 @@ export interface Webhook {
   latestSentAt: Date | null
   latestStatus: number | null
 }
-export function initializeRustLogger(): void
 export function fetchNodeinfo(host: string): Promise<Nodeinfo>
 export function nodeinfo_2_1(): Promise<any>
 export function nodeinfo_2_0(): Promise<any>
@@ -1259,6 +1279,15 @@ export interface Users {
 }
 export function watchNote(watcherId: string, noteAuthorId: string, noteId: string): Promise<void>
 export function unwatchNote(watcherId: string, noteId: string): Promise<void>
+export enum PushNotificationKind {
+  Generic = 'generic',
+  Chat = 'chat',
+  ReadAllChats = 'readAllChats',
+  ReadAllChatsInTheRoom = 'readAllChatsInTheRoom',
+  ReadNotifications = 'readNotifications',
+  ReadAllNotifications = 'readAllNotifications'
+}
+export function sendPushNotification(receiverUserId: string, kind: PushNotificationKind, content: any): Promise<void>
 export function publishToChannelStream(channelId: string, userId: string): void
 export enum ChatEvent {
   Message = 'message',
@@ -1304,4 +1333,6 @@ export function getTimestamp(id: string): number
 export function genId(): string
 /** Generate an ID using a specific datetime */
 export function genIdAt(date: Date): string
-export function secureRndstr(length?: number | undefined | null): string
+/** Generate random string based on [thread_rng] and [Alphanumeric]. */
+export function generateSecureRandomString(length: number): string
+export function generateUserToken(): string

packages/backend-rs/index.js

@@ -310,7 +310,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { SECOND, MINUTE, HOUR, DAY, USER_ONLINE_THRESHOLD, USER_ACTIVE_THRESHOLD, FILE_TYPE_BROWSERSAFE, loadEnv, loadConfig, stringToAcct, acctToString, addNoteToAntenna, isBlockedServer, isSilencedServer, isAllowedServer, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getImageSizeFromUrl, getNoteSummary, isSafeUrl, latestVersion, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, removeOldAttestationChallenges, AntennaSrcEnum, DriveFileUsageHintEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, initializeRustLogger, fetchNodeinfo, nodeinfo_2_1, nodeinfo_2_0, Protocol, Inbound, Outbound, watchNote, unwatchNote, publishToChannelStream, ChatEvent, publishToChatStream, ChatIndexEvent, publishToChatIndexStream, publishToBroadcastStream, publishToGroupChatStream, publishToModerationStream, getTimestamp, genId, genIdAt, secureRndstr } = nativeBinding
+const { SECOND, MINUTE, HOUR, DAY, USER_ONLINE_THRESHOLD, USER_ACTIVE_THRESHOLD, FILE_TYPE_BROWSERSAFE, loadEnv, loadConfig, stringToAcct, acctToString, showServerInfo, initializeRustLogger, addNoteToAntenna, isBlockedServer, isSilencedServer, isAllowedServer, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getImageSizeFromUrl, getNoteSummary, cpuInfo, cpuUsage, memoryUsage, storageUsage, isSafeUrl, latestVersion, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, removeOldAttestationChallenges, AntennaSrcEnum, DriveFileUsageHintEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, fetchNodeinfo, nodeinfo_2_1, nodeinfo_2_0, Protocol, Inbound, Outbound, watchNote, unwatchNote, PushNotificationKind, sendPushNotification, publishToChannelStream, ChatEvent, publishToChatStream, ChatIndexEvent, publishToChatIndexStream, publishToBroadcastStream, publishToGroupChatStream, publishToModerationStream, getTimestamp, genId, genIdAt, generateSecureRandomString, generateUserToken } = nativeBinding
 
 module.exports.SECOND = SECOND
 module.exports.MINUTE = MINUTE
@@ -323,6 +323,8 @@ module.exports.loadEnv = loadEnv
 module.exports.loadConfig = loadConfig
 module.exports.stringToAcct = stringToAcct
 module.exports.acctToString = acctToString
+module.exports.showServerInfo = showServerInfo
+module.exports.initializeRustLogger = initializeRustLogger
 module.exports.addNoteToAntenna = addNoteToAntenna
 module.exports.isBlockedServer = isBlockedServer
 module.exports.isSilencedServer = isSilencedServer
@@ -339,6 +341,10 @@ module.exports.safeForSql = safeForSql
 module.exports.formatMilliseconds = formatMilliseconds
 module.exports.getImageSizeFromUrl = getImageSizeFromUrl
 module.exports.getNoteSummary = getNoteSummary
+module.exports.cpuInfo = cpuInfo
+module.exports.cpuUsage = cpuUsage
+module.exports.memoryUsage = memoryUsage
+module.exports.storageUsage = storageUsage
 module.exports.isSafeUrl = isSafeUrl
 module.exports.latestVersion = latestVersion
 module.exports.toMastodonId = toMastodonId
@@ -364,7 +370,6 @@ module.exports.RelayStatusEnum = RelayStatusEnum
 module.exports.UserEmojimodpermEnum = UserEmojimodpermEnum
 module.exports.UserProfileFfvisibilityEnum = UserProfileFfvisibilityEnum
 module.exports.UserProfileMutingnotificationtypesEnum = UserProfileMutingnotificationtypesEnum
-module.exports.initializeRustLogger = initializeRustLogger
 module.exports.fetchNodeinfo = fetchNodeinfo
 module.exports.nodeinfo_2_1 = nodeinfo_2_1
 module.exports.nodeinfo_2_0 = nodeinfo_2_0
@@ -373,6 +378,8 @@ module.exports.Inbound = Inbound
 module.exports.Outbound = Outbound
 module.exports.watchNote = watchNote
 module.exports.unwatchNote = unwatchNote
+module.exports.PushNotificationKind = PushNotificationKind
+module.exports.sendPushNotification = sendPushNotification
 module.exports.publishToChannelStream = publishToChannelStream
 module.exports.ChatEvent = ChatEvent
 module.exports.publishToChatStream = publishToChatStream
@@ -384,4 +391,5 @@ module.exports.publishToModerationStream = publishToModerationStream
 module.exports.getTimestamp = getTimestamp
 module.exports.genId = genId
 module.exports.genIdAt = genIdAt
-module.exports.secureRndstr = secureRndstr
+module.exports.generateSecureRandomString = generateSecureRandomString
+module.exports.generateUserToken = generateUserToken

packages/backend-rs/package.json

@@ -22,10 +22,7 @@
 		}
 	},
 	"devDependencies": {
-		"@napi-rs/cli": "2.18.1"
-	},
-	"engines": {
-		"node": ">= 10"
+		"@napi-rs/cli": "2.18.3"
 	},
 	"scripts": {
 		"artifacts": "napi artifacts",

packages/backend-rs/src/config/server.rs

@@ -22,7 +22,7 @@ struct ServerConfig {
     pub proxy_bypass_hosts: Option<Vec<String>>,
 
     pub allowed_private_networks: Option<Vec<String>>,
-    /// `NapiValue` is not implemented for `u64`
+    // TODO: i64 -> u64 (NapiValue is not implemented for u64)
     pub max_file_size: Option<i64>,
     pub access_log: Option<String>,
     pub cluster_limits: Option<WorkerConfigInternal>,
@@ -298,7 +298,7 @@ fn read_manifest() -> Manifest {
 }
 
 #[crate::export]
-fn load_config() -> Config {
+pub fn load_config() -> Config {
     let server_config = read_config_file();
     let version = read_meta().version;
     let manifest = read_manifest();

packages/backend-rs/src/database/cache.rs

@@ -49,7 +49,7 @@ fn wildcard(category: Category) -> String {
 /// ## Example
 ///
 /// ```
-/// use backend_rs::database::cache;
+/// # use backend_rs::database::cache;
 /// let key = "apple";
 /// let data = "I want to cache this string".to_string();
 ///
@@ -85,8 +85,7 @@ pub fn set<V: for<'a> Deserialize<'a> + Serialize>(
 /// ## Example
 ///
 /// ```
-/// use backend_rs::database::cache;
-///
+/// # use backend_rs::database::cache;
 /// let key = "banana";
 /// let data = "I want to cache this string".to_string();
 ///
@@ -121,20 +120,19 @@ pub fn get<V: for<'a> Deserialize<'a> + Serialize>(key: &str) -> Result<Option<V
 /// ## Example
 ///
 /// ```
-/// use backend_rs::database::cache::{set, get, delete};
-///
+/// # use backend_rs::database::cache;
 /// let key = "chocolate";
 /// let value = "I want to cache this string".to_string();
 ///
 /// // set cache
-/// set(key, &value, 10).unwrap();
+/// cache::set(key, &value, 10).unwrap();
 ///
 /// // delete the cache
-/// delete("foo").unwrap();
-/// delete("nonexistent").unwrap(); // this is okay
+/// cache::delete("foo").unwrap();
+/// cache::delete("nonexistent").unwrap(); // this is okay
 ///
 /// // the cache is gone
-/// let cached_value = get::<String>("foo").unwrap();
+/// let cached_value = cache::get::<String>("foo").unwrap();
 /// assert!(cached_value.is_none());
 /// ```
 pub fn delete(key: &str) -> Result<(), Error> {

packages/backend-rs/src/database/postgresql.rs

@@ -1,8 +1,9 @@
 use crate::config::CONFIG;
+use once_cell::sync::OnceCell;
 use sea_orm::{ConnectOptions, Database, DbConn, DbErr};
 use tracing::log::LevelFilter;
 
-static DB_CONN: once_cell::sync::OnceCell<DbConn> = once_cell::sync::OnceCell::new();
+static DB_CONN: OnceCell<DbConn> = OnceCell::new();
 
 async fn init_database() -> Result<&'static DbConn, DbErr> {
     let database_uri = format!(

packages/backend-rs/src/database/redis.rs

@@ -1,7 +1,8 @@
 use crate::config::CONFIG;
+use once_cell::sync::OnceCell;
 use redis::{Client, Connection, RedisError};
 
-static REDIS_CLIENT: once_cell::sync::OnceCell<Client> = once_cell::sync::OnceCell::new();
+static REDIS_CLIENT: OnceCell<Client> = OnceCell::new();
 
 fn init_redis() -> Result<Client, RedisError> {
     let redis_url = {
@@ -26,7 +27,7 @@ fn init_redis() -> Result<Client, RedisError> {
         params.concat()
     };
 
-    tracing::info!("Initializing Redis connection");
+    tracing::info!("Initializing Redis client");
 
     Client::open(redis_url)
 }
@@ -38,8 +39,8 @@ pub fn redis_conn() -> Result<Connection, RedisError> {
     }
 }
 
-#[inline]
 /// prefix redis key
+#[inline]
 pub fn key(key: impl ToString) -> String {
     format!("{}:{}", CONFIG.redis_key_prefix, key.to_string())
 }

packages/backend-rs/src/federation/acct.rs

@@ -0,0 +1,105 @@
+use std::fmt;
+use std::str::FromStr;
+
+#[derive(Debug, PartialEq)]
+#[crate::export(object)]
+pub struct Acct {
+    pub username: String,
+    pub host: Option<String>,
+}
+
+impl FromStr for Acct {
+    type Err = ();
+
+    /// This never throw errors. Feel free to `.unwrap()` the result.
+    fn from_str(value: &str) -> Result<Self, Self::Err> {
+        let split: Vec<&str> = if let Some(stripped) = value.strip_prefix('@') {
+            stripped
+        } else {
+            value
+        }
+        .split('@')
+        .collect();
+
+        Ok(Self {
+            username: split[0].to_string(),
+            host: if split.len() == 1 {
+                None
+            } else {
+                Some(split[1].to_string())
+            },
+        })
+    }
+}
+
+impl fmt::Display for Acct {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let result = match &self.host {
+            Some(host) => format!("{}@{}", self.username, host),
+            None => self.username.clone(),
+        };
+        write!(f, "{result}")
+    }
+}
+
+impl From<Acct> for String {
+    fn from(value: Acct) -> Self {
+        value.to_string()
+    }
+}
+
+#[crate::ts_only_warn("Use `acct.parse().unwrap()` or `Acct::from_str(acct).unwrap()` instead.")]
+#[crate::export]
+pub fn string_to_acct(acct: &str) -> Acct {
+    Acct::from_str(acct).unwrap()
+}
+
+#[crate::ts_only_warn("Use `acct.to_string()` instead.")]
+#[crate::export]
+pub fn acct_to_string(acct: &Acct) -> String {
+    acct.to_string()
+}
+
+#[cfg(test)]
+mod unit_test {
+    use super::Acct;
+    use pretty_assertions::assert_eq;
+    use std::str::FromStr;
+
+    #[test]
+    fn test_acct_to_string() {
+        let remote_acct = Acct {
+            username: "firefish".to_string(),
+            host: Some("example.com".to_string()),
+        };
+        let local_acct = Acct {
+            username: "MisakaMikoto".to_string(),
+            host: None,
+        };
+
+        assert_eq!(remote_acct.to_string(), "firefish@example.com");
+        assert_ne!(remote_acct.to_string(), "mastodon@example.com");
+        assert_eq!(local_acct.to_string(), "MisakaMikoto");
+        assert_ne!(local_acct.to_string(), "ShiraiKuroko");
+    }
+
+    #[test]
+    fn test_string_to_acct() {
+        let remote_acct = Acct {
+            username: "firefish".to_string(),
+            host: Some("example.com".to_string()),
+        };
+        let local_acct = Acct {
+            username: "MisakaMikoto".to_string(),
+            host: None,
+        };
+
+        assert_eq!(
+            Acct::from_str("@firefish@example.com").unwrap(),
+            remote_acct
+        );
+        assert_eq!(Acct::from_str("firefish@example.com").unwrap(), remote_acct);
+        assert_eq!(Acct::from_str("@MisakaMikoto").unwrap(), local_acct);
+        assert_eq!(Acct::from_str("MisakaMikoto").unwrap(), local_acct);
+    }
+}

packages/backend-rs/src/federation/mod.rs

@@ -0,0 +1 @@
+pub mod acct;

packages/backend-rs/src/init/hardware_stats.rs

@@ -0,0 +1,39 @@
+use std::sync::{Mutex, MutexGuard, OnceLock, PoisonError};
+use sysinfo::System;
+
+pub type SystemMutexError = PoisonError<MutexGuard<'static, System>>;
+
+// TODO: handle this in a more proper way when we move the entry point to backend-rs
+pub fn system() -> Result<MutexGuard<'static, System>, SystemMutexError> {
+    pub static SYSTEM: OnceLock<Mutex<System>> = OnceLock::new();
+    SYSTEM.get_or_init(|| Mutex::new(System::new_all())).lock()
+}
+
+#[crate::export]
+pub fn show_server_info() -> Result<(), SystemMutexError> {
+    let system_info = system()?;
+
+    tracing::info!(
+        "Hostname: {}",
+        System::host_name().unwrap_or("unknown".to_string())
+    );
+    tracing::info!(
+        "OS: {}",
+        System::long_os_version().unwrap_or("unknown".to_string())
+    );
+    tracing::info!(
+        "Kernel: {}",
+        System::kernel_version().unwrap_or("unknown".to_string())
+    );
+    tracing::info!(
+        "CPU architecture: {}",
+        System::cpu_arch().unwrap_or("unknown".to_string())
+    );
+    tracing::info!("CPU threads: {}", system_info.cpus().len());
+    tracing::info!("Total memory: {} MiB", system_info.total_memory() / 1048576);
+    tracing::info!("Free memory: {} MiB", system_info.free_memory() / 1048576);
+    tracing::info!("Total swap: {} MiB", system_info.total_swap() / 1048576);
+    tracing::info!("Free swap: {} MiB", system_info.free_swap() / 1048576);
+
+    Ok(())
+}

packages/backend-rs/src/init/mod.rs

@@ -0,0 +1,2 @@
+pub mod hardware_stats;
+pub mod log;

packages/backend-rs/src/lib.rs

@@ -1,7 +1,9 @@
-pub use macro_rs::export;
+pub use macro_rs::{export, ts_only_warn};
 
 pub mod config;
 pub mod database;
+pub mod federation;
+pub mod init;
 pub mod misc;
 pub mod model;
 pub mod service;

packages/backend-rs/src/misc/acct.rs

@@ -1,74 +0,0 @@
-#[derive(Debug, PartialEq)]
-#[crate::export(object)]
-pub struct Acct {
-    pub username: String,
-    pub host: Option<String>,
-}
-
-#[crate::export]
-pub fn string_to_acct(acct: &str) -> Acct {
-    let split: Vec<&str> = if let Some(stripped) = acct.strip_prefix('@') {
-        stripped
-    } else {
-        acct
-    }
-    .split('@')
-    .collect();
-
-    Acct {
-        username: split[0].to_string(),
-        host: if split.len() == 1 {
-            None
-        } else {
-            Some(split[1].to_string())
-        },
-    }
-}
-
-#[crate::export]
-pub fn acct_to_string(acct: &Acct) -> String {
-    match &acct.host {
-        Some(host) => format!("{}@{}", acct.username, host),
-        None => acct.username.clone(),
-    }
-}
-
-#[cfg(test)]
-mod unit_test {
-    use super::{acct_to_string, string_to_acct, Acct};
-    use pretty_assertions::assert_eq;
-
-    #[test]
-    fn test_acct_to_string() {
-        let remote_acct = Acct {
-            username: "firefish".to_string(),
-            host: Some("example.com".to_string()),
-        };
-        let local_acct = Acct {
-            username: "MisakaMikoto".to_string(),
-            host: None,
-        };
-
-        assert_eq!(acct_to_string(&remote_acct), "firefish@example.com");
-        assert_ne!(acct_to_string(&remote_acct), "mastodon@example.com");
-        assert_eq!(acct_to_string(&local_acct), "MisakaMikoto");
-        assert_ne!(acct_to_string(&local_acct), "ShiraiKuroko");
-    }
-
-    #[test]
-    fn test_string_to_acct() {
-        let remote_acct = Acct {
-            username: "firefish".to_string(),
-            host: Some("example.com".to_string()),
-        };
-        let local_acct = Acct {
-            username: "MisakaMikoto".to_string(),
-            host: None,
-        };
-
-        assert_eq!(string_to_acct("@firefish@example.com"), remote_acct);
-        assert_eq!(string_to_acct("firefish@example.com"), remote_acct);
-        assert_eq!(string_to_acct("@MisakaMikoto"), local_acct);
-        assert_eq!(string_to_acct("MisakaMikoto"), local_acct);
-    }
-}

packages/backend-rs/src/misc/check_word_mute.rs

@@ -4,7 +4,7 @@ use once_cell::sync::Lazy;
 use regex::Regex;
 use sea_orm::{prelude::*, QuerySelect};
 
-/// TODO: handle name collisions better
+// TODO: handle name collisions in a better way
 #[crate::export(object, js_name = "NoteLikeForCheckWordMute")]
 pub struct NoteLike {
     pub file_ids: Vec<String>,

packages/backend-rs/src/misc/get_note_summary.rs

@@ -1,4 +1,8 @@
-/// TODO: handle name collisions better
+use serde::{Deserialize, Serialize};
+
+// TODO: handle name collisions in a better way
+#[derive(Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
 #[crate::export(object, js_name = "NoteLikeForGetNoteSummary")]
 pub struct NoteLike {
     pub file_ids: Vec<String>,

packages/backend-rs/src/misc/hardware_stats.rs

@@ -0,0 +1,90 @@
+use crate::init::hardware_stats::{system, SystemMutexError};
+use sysinfo::{Disks, MemoryRefreshKind};
+
+// TODO: i64 -> u64 (we can't export u64 to Node.js)
+
+#[crate::export(object)]
+pub struct Cpu {
+    pub model: String,
+    // TODO: u16 -> usize (we can't export usize to Node.js)
+    pub cores: u16,
+}
+
+#[crate::export(object)]
+pub struct Memory {
+    /// Total memory amount in bytes
+    pub total: i64,
+    /// Used memory amount in bytes
+    pub used: i64,
+    /// Available (for (re)use) memory amount in bytes
+    pub available: i64,
+}
+
+#[crate::export(object)]
+pub struct Storage {
+    /// Total storage space in bytes
+    pub total: i64,
+    /// Used storage space in bytes
+    pub used: i64,
+}
+
+#[crate::export]
+pub fn cpu_info() -> Result<Cpu, SystemMutexError> {
+    let system_info = system()?;
+
+    Ok(Cpu {
+        model: match system_info.cpus() {
+            [] => {
+                tracing::debug!("failed to get CPU info");
+                "unknown".to_string()
+            }
+            cpus => cpus[0].brand().to_string(),
+        },
+        cores: system_info.cpus().len() as u16,
+    })
+}
+
+#[crate::export]
+pub fn cpu_usage() -> Result<f32, SystemMutexError> {
+    let mut system_info = system()?;
+    system_info.refresh_cpu_usage();
+
+    let total_cpu_usage: f32 = system_info.cpus().iter().map(|cpu| cpu.cpu_usage()).sum();
+    let cpu_threads = system_info.cpus().len();
+
+    Ok(total_cpu_usage / (cpu_threads as f32))
+}
+
+#[crate::export]
+pub fn memory_usage() -> Result<Memory, SystemMutexError> {
+    let mut system_info = system()?;
+
+    system_info.refresh_memory_specifics(MemoryRefreshKind::new().with_ram());
+
+    Ok(Memory {
+        total: system_info.total_memory() as i64,
+        used: system_info.used_memory() as i64,
+        available: system_info.available_memory() as i64,
+    })
+}
+
+#[crate::export]
+pub fn storage_usage() -> Option<Storage> {
+    // Get the first disk that is actualy used.
+    let disks = Disks::new_with_refreshed_list();
+    let disk = disks
+        .iter()
+        .find(|disk| disk.available_space() > 0 && disk.total_space() > disk.available_space());
+
+    if let Some(disk) = disk {
+        let total = disk.total_space() as i64;
+        let available = disk.available_space() as i64;
+        return Some(Storage {
+            total,
+            used: total - available,
+        });
+    }
+
+    tracing::debug!("failed to get stats");
+    None
+}

packages/backend-rs/src/misc/mod.rs

@@ -1,4 +1,3 @@
-pub mod acct;
 pub mod add_note_to_antenna;
 pub mod check_server_block;
 pub mod check_word_mute;
@@ -8,6 +7,7 @@ pub mod escape_sql;
 pub mod format_milliseconds;
 pub mod get_image_size;
 pub mod get_note_summary;
+pub mod hardware_stats;
 pub mod is_safe_url;
 pub mod latest_version;
 pub mod mastodon_id;

packages/backend-rs/src/service/mod.rs

@@ -1,4 +1,4 @@
-pub mod log;
 pub mod nodeinfo;
 pub mod note;
+pub mod push_notification;
 pub mod stream;

packages/backend-rs/src/service/push_notification.rs

@@ -0,0 +1,232 @@
+use crate::database::db_conn;
+use crate::misc::get_note_summary::{get_note_summary, NoteLike};
+use crate::misc::meta::fetch_meta;
+use crate::model::entity::sw_subscription;
+use crate::util::http_client;
+use once_cell::sync::OnceCell;
+use sea_orm::{prelude::*, DbErr};
+use web_push::{
+    ContentEncoding, IsahcWebPushClient, SubscriptionInfo, SubscriptionKeys, VapidSignatureBuilder,
+    WebPushClient, WebPushError, WebPushMessageBuilder,
+};
+
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+    #[error("Database error: {0}")]
+    DbErr(#[from] DbErr),
+    #[error("Web Push error: {0}")]
+    WebPushErr(#[from] WebPushError),
+    #[error("Failed to (de)serialize an object: {0}")]
+    SerializeErr(#[from] serde_json::Error),
+    #[error("Invalid content: {0}")]
+    InvalidContentErr(String),
+    #[error("HTTP client aquisition error: {0}")]
+    HttpClientErr(#[from] http_client::Error),
+}
+
+static CLIENT: OnceCell<IsahcWebPushClient> = OnceCell::new();
+
+fn get_client() -> Result<IsahcWebPushClient, Error> {
+    Ok(CLIENT
+        .get_or_try_init(|| http_client::client().map(IsahcWebPushClient::from))
+        .cloned()?)
+}
+
+#[derive(strum::Display, PartialEq)]
+#[crate::export(string_enum = "camelCase")]
+pub enum PushNotificationKind {
+    #[strum(serialize = "notification")]
+    Generic,
+    #[strum(serialize = "unreadMessagingMessage")]
+    Chat,
+    #[strum(serialize = "readAllMessagingMessages")]
+    ReadAllChats,
+    #[strum(serialize = "readAllMessagingMessagesOfARoom")]
+    ReadAllChatsInTheRoom,
+    #[strum(serialize = "readNotifications")]
+    ReadNotifications,
+    #[strum(serialize = "readAllNotifications")]
+    ReadAllNotifications,
+}
+
+fn compact_content(
+    kind: &PushNotificationKind,
+    mut content: serde_json::Value,
+) -> Result<serde_json::Value, Error> {
+    if kind != &PushNotificationKind::Generic {
+        return Ok(content);
+    }
+
+    if !content.is_object() {
+        return Err(Error::InvalidContentErr("not a JSON object".to_string()));
+    }
+
+    let object = content.as_object_mut().unwrap();
+
+    if !object.contains_key("note") {
+        return Ok(content);
+    }
+
+    let mut note = if object.contains_key("type") && object.get("type").unwrap() == "renote" {
+        object
+            .get("note")
+            .unwrap()
+            .get("renote")
+            .ok_or(Error::InvalidContentErr(
+                "renote object is missing".to_string(),
+            ))?
+    } else {
+        object.get("note").unwrap()
+    }
+    .clone();
+
+    if !note.is_object() {
+        return Err(Error::InvalidContentErr(
+            "(re)note is not an object".to_string(),
+        ));
+    }
+
+    let note_like: NoteLike = serde_json::from_value(note.clone())?;
+    let text = get_note_summary(note_like);
+
+    let note_object = note.as_object_mut().unwrap();
+
+    note_object.remove("reply");
+    note_object.remove("renote");
+    note_object.remove("user");
+    note_object.insert("text".to_string(), text.into());
+    object.insert("note".to_string(), note);
+
+    Ok(serde_json::from_value(Json::Object(object.clone()))?)
+}
+
+async fn handle_web_push_failure(
+    db: &DatabaseConnection,
+    err: WebPushError,
+    subscription_id: &str,
+    error_message: &str,
+) -> Result<(), DbErr> {
+    match err {
+        WebPushError::BadRequest(_)
+        | WebPushError::ServerError(_)
+        | WebPushError::InvalidUri
+        | WebPushError::EndpointNotValid
+        | WebPushError::EndpointNotFound
+        | WebPushError::TlsError
+        | WebPushError::SslError
+        | WebPushError::InvalidPackageName
+        | WebPushError::MissingCryptoKeys
+        | WebPushError::InvalidCryptoKeys
+        | WebPushError::InvalidResponse => {
+            sw_subscription::Entity::delete_by_id(subscription_id)
+                .exec(db)
+                .await?;
+            tracing::info!("{}; {} was unsubscribed", error_message, subscription_id);
+            tracing::debug!("reason: {:#?}", err);
+        }
+        _ => {
+            tracing::warn!("{}; subscription id: {}", error_message, subscription_id);
+            tracing::info!("reason: {:#?}", err);
+        }
+    };
+
+    Ok(())
+}
+
+#[crate::export]
+pub async fn send_push_notification(
+    receiver_user_id: &str,
+    kind: PushNotificationKind,
+    content: &serde_json::Value,
+) -> Result<(), Error> {
+    let meta = fetch_meta(true).await?;
+
+    if !meta.enable_service_worker || meta.sw_public_key.is_none() || meta.sw_private_key.is_none()
+    {
+        return Ok(());
+    }
+
+    let db = db_conn().await?;
+
+    let signature_builder = VapidSignatureBuilder::from_base64_no_sub(
+        meta.sw_private_key.unwrap().as_str(),
+        web_push::URL_SAFE_NO_PAD,
+    )?;
+
+    let subscriptions = sw_subscription::Entity::find()
+        .filter(sw_subscription::Column::UserId.eq(receiver_user_id))
+        .all(db)
+        .await?;
+
+    let payload = format!(
+        "{{\"type\":\"{}\",\"userId\":\"{}\",\"dateTime\":{},\"body\":{}}}",
+        kind,
+        receiver_user_id,
+        chrono::Utc::now().timestamp_millis(),
+        serde_json::to_string(&compact_content(&kind, content.clone())?)?
+    );
+    tracing::trace!("payload: {:#?}", payload);
+
+    for subscription in subscriptions.iter() {
+        if !subscription.send_read_message
+            && [
+                PushNotificationKind::ReadAllChats,
+                PushNotificationKind::ReadAllChatsInTheRoom,
+                PushNotificationKind::ReadAllNotifications,
+                PushNotificationKind::ReadNotifications,
+            ]
+            .contains(&kind)
+        {
+            continue;
+        }
+
+        let subscription_info = SubscriptionInfo {
+            endpoint: subscription.endpoint.to_owned(),
+            keys: SubscriptionKeys {
+                // convert standard base64 into base64url
+                // https://en.wikipedia.org/wiki/Base64#Variants_summary_table
+                p256dh: subscription
+                    .publickey
+                    .replace('+', "-")
+                    .replace('/', "_")
+                    .to_owned(),
+                auth: subscription
+                    .auth
+                    .replace('+', "-")
+                    .replace('/', "_")
+                    .to_owned(),
+            },
+        };
+
+        let signature = signature_builder
+            .clone()
+            .add_sub_info(&subscription_info)
+            .build();
+
+        if let Err(err) = signature {
+            handle_web_push_failure(db, err, &subscription.id, "failed to build a signature")
+                .await?;
+            continue;
+        }
+
+        let mut message_builder = WebPushMessageBuilder::new(&subscription_info);
+        message_builder.set_ttl(1000);
+        message_builder.set_payload(ContentEncoding::Aes128Gcm, payload.as_bytes());
+        message_builder.set_vapid_signature(signature.unwrap());
+
+        let message = message_builder.build();
+
+        if let Err(err) = message {
+            handle_web_push_failure(db, err, &subscription.id, "failed to build a payload").await?;
+            continue;
+        }
+        if let Err(err) = get_client()?.send(message.unwrap()).await {
+            handle_web_push_failure(db, err, &subscription.id, "failed to send").await?;
+            continue;
+        }
+
+        tracing::debug!("success; subscription id: {}", subscription.id);
+    }
+
+    Ok(())
+}

packages/backend-rs/src/util/random.rs

@@ -1,7 +1,8 @@
 use rand::{distributions::Alphanumeric, thread_rng, Rng};
 
 /// Generate random string based on [thread_rng] and [Alphanumeric].
-pub fn gen_string(length: u16) -> String {
+#[crate::export]
+pub fn generate_secure_random_string(length: u16) -> String {
     thread_rng()
         .sample_iter(Alphanumeric)
         .take(length.into())
@@ -9,9 +10,9 @@ pub fn gen_string(length: u16) -> String {
         .collect()
 }
 
-#[crate::export(js_name = "secureRndstr")]
-pub fn native_random_str(length: Option<u16>) -> String {
-    gen_string(length.unwrap_or(32))
+#[crate::export]
+pub fn generate_user_token() -> String {
+    generate_secure_random_string(16)
 }
 
 #[cfg(test)]
@@ -19,14 +20,17 @@ mod unit_test {
     use pretty_assertions::{assert_eq, assert_ne};
     use std::thread;
 
-    use super::gen_string;
+    use super::generate_secure_random_string;
 
     #[test]
     fn can_generate_unique_strings() {
-        assert_eq!(gen_string(16).len(), 16);
-        assert_ne!(gen_string(16), gen_string(16));
-        let s1 = thread::spawn(|| gen_string(16));
-        let s2 = thread::spawn(|| gen_string(16));
+        assert_eq!(generate_secure_random_string(16).len(), 16);
+        assert_ne!(
+            generate_secure_random_string(16),
+            generate_secure_random_string(16)
+        );
+        let s1 = thread::spawn(|| generate_secure_random_string(16));
+        let s2 = thread::spawn(|| generate_secure_random_string(16));
         assert_ne!(s1.join().unwrap(), s2.join().unwrap());
     }
 }

packages/backend/package.json

@@ -22,54 +22,55 @@
 		"@swc/core-android-arm64": "1.3.11"
 	},
 	"dependencies": {
-		"@bull-board/api": "5.16.0",
-		"@bull-board/koa": "5.16.0",
-		"@bull-board/ui": "5.16.0",
-		"@discordapp/twemoji": "^15.0.3",
+		"@bull-board/api": "5.17.1",
+		"@bull-board/koa": "5.17.1",
+		"@bull-board/ui": "5.17.1",
+		"@discordapp/twemoji": "15.0.3",
 		"@koa/cors": "5.0.0",
 		"@koa/multer": "3.0.2",
 		"@koa/router": "12.0.1",
 		"@ladjs/koa-views": "9.0.0",
 		"@peertube/http-signature": "1.7.0",
-		"@redocly/openapi-core": "1.12.0",
+		"@redocly/openapi-core": "1.12.2",
 		"@sinonjs/fake-timers": "11.2.2",
 		"adm-zip": "0.5.10",
-		"ajv": "8.12.0",
+		"ajv": "8.13.0",
 		"archiver": "7.0.1",
-		"aws-sdk": "2.1608.0",
-		"axios": "^1.6.8",
+		"aws-sdk": "2.1621.0",
+		"axios": "1.6.8",
 		"backend-rs": "workspace:*",
 		"blurhash": "2.0.5",
-		"bull": "4.12.2",
+		"bull": "4.12.4",
 		"cacheable-lookup": "TheEssem/cacheable-lookup",
-		"cbor-x": "^1.5.9",
+		"cbor-x": "1.5.9",
 		"chalk": "5.3.0",
 		"chalk-template": "1.1.0",
 		"cli-highlight": "2.1.11",
 		"color-convert": "2.0.1",
 		"content-disposition": "0.5.4",
 		"date-fns": "3.6.0",
-		"decompress": "^4.2.1",
+		"decompress": "4.2.1",
 		"deep-email-validator": "0.1.21",
 		"deepl-node": "1.13.0",
 		"escape-regexp": "0.0.1",
 		"feed": "4.2.2",
 		"file-type": "19.0.0",
+		"firefish-js": "workspace:*",
 		"fluent-ffmpeg": "2.1.2",
-		"form-data": "^4.0.0",
+		"form-data": "4.0.0",
 		"got": "14.2.1",
-		"gunzip-maybe": "^1.4.2",
-		"happy-dom": "^14.7.1",
+		"gunzip-maybe": "1.4.2",
 		"hpagent": "1.2.0",
 		"ioredis": "5.4.1",
 		"ip-cidr": "4.0.0",
-		"is-svg": "5.0.0",
+		"is-svg": "5.0.1",
+		"jsdom": "24.0.0",
 		"json5": "2.2.3",
 		"jsonld": "8.3.2",
 		"jsrsasign": "11.1.0",
 		"katex": "0.16.10",
 		"koa": "2.15.3",
-		"koa-body": "^6.0.1",
+		"koa-body": "6.0.1",
 		"koa-bodyparser": "4.4.1",
 		"koa-favicon": "2.1.0",
 		"koa-json-body": "5.3.0",
@@ -81,14 +82,13 @@
 		"megalodon": "workspace:*",
 		"mfm-js": "0.24.0",
 		"mime-types": "2.1.35",
-		"msgpackr": "^1.10.1",
+		"msgpackr": "1.10.2",
 		"multer": "1.4.5-lts.1",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.3.2",
 		"nodemailer": "6.9.13",
-		"opencc-js": "^1.0.5",
-		"os-utils": "0.0.14",
-		"otpauth": "^9.2.3",
+		"opencc-js": "1.0.5",
+		"otpauth": "9.2.4",
 		"parse5": "7.1.2",
 		"pg": "8.11.5",
 		"private-ip": "3.0.2",
@@ -106,33 +106,32 @@
 		"rndstr": "1.0.0",
 		"rss-parser": "3.13.0",
 		"sanitize-html": "2.13.0",
-		"semver": "7.6.0",
+		"semver": "7.6.2",
 		"sharp": "0.33.3",
 		"stringz": "2.1.0",
 		"summaly": "2.7.0",
 		"syslog-pro": "1.0.0",
-		"systeminformation": "5.22.7",
-		"tar-stream": "^3.1.7",
-		"tesseract.js": "^5.0.5",
+		"tar-stream": "3.1.7",
+		"tesseract.js": "5.1.0",
 		"tinycolor2": "1.6.0",
 		"tmp": "0.2.3",
 		"typeorm": "0.3.20",
 		"ulid": "2.3.0",
 		"uuid": "9.0.1",
-		"web-push": "3.6.7",
-		"websocket": "1.0.34",
+		"websocket": "1.0.35",
 		"xev": "3.0.2"
 	},
 	"devDependencies": {
 		"@swc/cli": "0.3.12",
-		"@swc/core": "1.5.0",
-		"@types/adm-zip": "^0.5.5",
-		"@types/color-convert": "^2.0.3",
-		"@types/content-disposition": "^0.5.8",
+		"@swc/core": "1.5.7",
+		"@types/adm-zip": "0.5.5",
+		"@types/color-convert": "2.0.3",
+		"@types/content-disposition": "0.5.8",
 		"@types/escape-regexp": "0.0.3",
 		"@types/fluent-ffmpeg": "2.1.24",
+		"@types/jsdom": "21.1.6",
 		"@types/jsonld": "1.5.13",
-		"@types/jsrsasign": "10.5.13",
+		"@types/jsrsasign": "10.5.14",
 		"@types/katex": "0.16.7",
 		"@types/koa": "2.15.0",
 		"@types/koa-bodyparser": "4.3.12",
@@ -145,13 +144,13 @@
 		"@types/koa__multer": "2.0.7",
 		"@types/koa__router": "12.0.4",
 		"@types/mocha": "10.0.6",
-		"@types/node": "20.12.7",
+		"@types/node": "20.12.12",
 		"@types/node-fetch": "2.6.11",
-		"@types/nodemailer": "6.4.14",
+		"@types/nodemailer": "6.4.15",
 		"@types/oauth": "0.9.4",
-		"@types/opencc-js": "^1.0.3",
-		"@types/pg": "^8.11.5",
-		"@types/probe-image-size": "^7.2.4",
+		"@types/opencc-js": "1.0.3",
+		"@types/pg": "8.11.6",
+		"@types/probe-image-size": "7.2.4",
 		"@types/pug": "2.0.10",
 		"@types/punycode": "2.1.4",
 		"@types/qrcode": "1.5.5",
@@ -162,7 +161,7 @@
 		"@types/sanitize-html": "2.11.0",
 		"@types/semver": "7.5.8",
 		"@types/sinonjs__fake-timers": "8.1.5",
-		"@types/syslog-pro": "^1.0.3",
+		"@types/syslog-pro": "1.0.3",
 		"@types/tinycolor2": "1.4.6",
 		"@types/tmp": "0.2.6",
 		"@types/uuid": "9.0.8",
@@ -170,17 +169,17 @@
 		"@types/websocket": "1.0.10",
 		"@types/ws": "8.5.10",
 		"cross-env": "7.0.3",
-		"eslint": "^9.1.1",
+		"eslint": "9.2.0",
 		"mocha": "10.4.0",
 		"pug": "3.0.2",
 		"strict-event-emitter-types": "2.0.0",
-		"swc-loader": "^0.2.6",
+		"swc-loader": "0.2.6",
 		"ts-loader": "9.5.1",
 		"ts-node": "10.9.2",
 		"tsconfig-paths": "4.2.0",
-		"type-fest": "4.17.0",
+		"type-fest": "4.18.2",
 		"typescript": "5.4.5",
-		"webpack": "^5.91.0",
-		"ws": "8.16.0"
+		"webpack": "5.91.0",
+		"ws": "8.17.0"
 	}
 }

packages/backend/src/@types/os-utils.d.ts

@@ -1,33 +0,0 @@
-declare module "os-utils" {
-	type FreeCommandCallback = (usedmem: number) => void;
-
-	type HarddriveCallback = (total: number, free: number, used: number) => void;
-
-	type GetProcessesCallback = (result: string) => void;
-
-	type CPUCallback = (perc: number) => void;
-
-	export function platform(): NodeJS.Platform;
-	export function cpuCount(): number;
-	export function sysUptime(): number;
-	export function processUptime(): number;
-
-	export function freemem(): number;
-	export function totalmem(): number;
-	export function freememPercentage(): number;
-	export function freeCommand(callback: FreeCommandCallback): void;
-
-	export function harddrive(callback: HarddriveCallback): void;
-
-	export function getProcesses(callback: GetProcessesCallback): void;
-	export function getProcesses(
-		nProcess: number,
-		callback: GetProcessesCallback,
-	): void;
-
-	export function allLoadavg(): string;
-	export function loadavg(_time?: number): number;
-
-	export function cpuFree(callback: CPUCallback): void;
-	export function cpuUsage(callback: CPUCallback): void;
-}

packages/backend/src/boot/master.ts

@@ -8,11 +8,14 @@ import chalkTemplate from "chalk-template";
 import semver from "semver";
 
 import Logger from "@/services/logger.js";
-import type { Config } from "backend-rs";
-import { initializeRustLogger } from "backend-rs";
-import { fetchMeta, removeOldAttestationChallenges } from "backend-rs";
+import {
+	fetchMeta,
+	initializeRustLogger,
+	removeOldAttestationChallenges,
+	showServerInfo,
+	type Config,
+} from "backend-rs";
 import { config, envOption } from "@/config.js";
-import { showMachineInfo } from "@/misc/show-machine-info.js";
 import { db, initDb } from "@/db/postgre.js";
 import { inspect } from "node:util";
 
@@ -90,12 +93,12 @@ function greet() {
 export async function masterMain() {
 	// initialize app
 	try {
+		initializeRustLogger();
 		greet();
 		showEnvironment();
-		await showMachineInfo(bootLogger);
+		showServerInfo();
 		showNodejsVersion();
 		await connectDb();
-		initializeRustLogger();
 	} catch (e) {
 		bootLogger.error(
 			`Fatal error occurred during initialization:\n${inspect(e)}`,

packages/backend/src/daemons/server-stats.ts

@@ -1,15 +1,8 @@
-import si from "systeminformation";
 import Xev from "xev";
-import * as osUtils from "os-utils";
-import { fetchMeta } from "backend-rs";
+import { fetchMeta, cpuUsage, memoryUsage } from "backend-rs";
 
 const ev = new Xev();
 
-const interval = 2000;
-
-const roundCpu = (num: number) => Math.round(num * 1000) / 1000;
-const round = (num: number) => Math.round(num * 10) / 10;
-
 /**
  * Report server stats regularly
  */
@@ -24,26 +17,9 @@ export default async function () {
 	if (!meta.enableServerMachineStats) return;
 
 	async function tick() {
-		const cpu = await cpuUsage();
-		const memStats = await mem();
-		const netStats = await net();
-		const fsStats = await fs();
-
 		const stats = {
-			cpu: roundCpu(cpu),
-			mem: {
-				used: round(memStats.used - memStats.buffers - memStats.cached),
-				active: round(memStats.active),
-				total: round(memStats.total),
-			},
-			net: {
-				rx: round(Math.max(0, netStats.rx_sec)),
-				tx: round(Math.max(0, netStats.tx_sec)),
-			},
-			fs: {
-				r: round(Math.max(0, fsStats.rIO_sec ?? 0)),
-				w: round(Math.max(0, fsStats.wIO_sec ?? 0)),
-			},
+			cpu: cpuUsage(),
+			mem: memoryUsage(),
 		};
 		ev.emit("serverStats", stats);
 		log.unshift(stats);
@@ -52,33 +28,5 @@ export default async function () {
 
 	tick();
 
-	setInterval(tick, interval);
-}
-
-// CPU STAT
-function cpuUsage(): Promise<number> {
-	return new Promise((res, rej) => {
-		osUtils.cpuUsage((cpuUsage) => {
-			res(cpuUsage);
-		});
-	});
-}
-
-// MEMORY STAT
-async function mem() {
-	const data = await si.mem();
-	return data;
-}
-
-// NETWORK STAT
-async function net() {
-	const iface = await si.networkInterfaceDefault();
-	const data = await si.networkStats(iface);
-	return data[0];
-}
-
-// FS STAT
-async function fs() {
-	const data = await si.disksIO().catch(() => ({ rIO_sec: 0, wIO_sec: 0 }));
-	return data || { rIO_sec: 0, wIO_sec: 0 };
+	setInterval(tick, 3000);
 }

packages/backend/src/mfm/to-html.ts

@@ -1,21 +1,17 @@
-import { type HTMLElement, Window } from "happy-dom";
+import { JSDOM } from "jsdom";
 import type * as mfm from "mfm-js";
 import katex from "katex";
 import { config } from "@/config.js";
 import { intersperse } from "@/prelude/array.js";
 import type { IMentionedRemoteUsers } from "@/models/entities/note.js";
 
-function toMathMl(code: string, displayMode: boolean): HTMLElement | null {
-	const { window } = new Window();
-	const document = window.document;
-
-	document.body.innerHTML = katex.renderToString(code, {
+function toMathMl(code: string, displayMode: boolean): MathMLElement | null {
+	const rendered = katex.renderToString(code, {
 		throwOnError: false,
 		output: "mathml",
 		displayMode,
 	});
-
-	return document.querySelector("math");
+	return JSDOM.fragment(rendered).querySelector("math");
 }
 
 export function toHtml(
@@ -26,7 +22,7 @@ export function toHtml(
 		return null;
 	}
 
-	const { window } = new Window();
+	const { window } = new JSDOM("");
 
 	const doc = window.document;
 

packages/backend/src/misc/schema.ts

@@ -1,234 +1,7 @@
-import {
-	packedUserLiteSchema,
-	packedUserDetailedNotMeOnlySchema,
-	packedMeDetailedOnlySchema,
-	packedUserDetailedNotMeSchema,
-	packedMeDetailedSchema,
-	packedUserDetailedSchema,
-	packedUserSchema,
-} from "@/models/schema/user.js";
-import { packedNoteSchema } from "@/models/schema/note.js";
-import { packedUserListSchema } from "@/models/schema/user-list.js";
-import { packedAppSchema } from "@/models/schema/app.js";
-import { packedMessagingMessageSchema } from "@/models/schema/messaging-message.js";
-import { packedNotificationSchema } from "@/models/schema/notification.js";
-import { packedDriveFileSchema } from "@/models/schema/drive-file.js";
-import { packedDriveFolderSchema } from "@/models/schema/drive-folder.js";
-import { packedFollowingSchema } from "@/models/schema/following.js";
-import { packedMutingSchema } from "@/models/schema/muting.js";
-import { packedRenoteMutingSchema } from "@/models/schema/renote-muting.js";
-import { packedReplyMutingSchema } from "@/models/schema/reply-muting.js";
-import { packedBlockingSchema } from "@/models/schema/blocking.js";
-import { packedNoteReactionSchema } from "@/models/schema/note-reaction.js";
-import { packedHashtagSchema } from "@/models/schema/hashtag.js";
-import { packedPageSchema } from "@/models/schema/page.js";
-import { packedUserGroupSchema } from "@/models/schema/user-group.js";
-import { packedNoteFavoriteSchema } from "@/models/schema/note-favorite.js";
-import { packedChannelSchema } from "@/models/schema/channel.js";
-import { packedAntennaSchema } from "@/models/schema/antenna.js";
-import { packedClipSchema } from "@/models/schema/clip.js";
-import { packedFederationInstanceSchema } from "@/models/schema/federation-instance.js";
-import { packedQueueCountSchema } from "@/models/schema/queue.js";
-import { packedGalleryPostSchema } from "@/models/schema/gallery-post.js";
-import { packedEmojiSchema } from "@/models/schema/emoji.js";
-import { packedNoteEdit } from "@/models/schema/note-edit.js";
-import { packedNoteFileSchema } from "@/models/schema/note-file.js";
-import { packedAbuseUserReportSchema } from "@/models/schema/abuse-user-report.js";
+// TODO: use firefish-js
+import { Schema as _Schema } from "firefish-js";
 
-export const refs = {
-	AbuseUserReport: packedAbuseUserReportSchema,
-	UserLite: packedUserLiteSchema,
-	UserDetailedNotMeOnly: packedUserDetailedNotMeOnlySchema,
-	MeDetailedOnly: packedMeDetailedOnlySchema,
-	UserDetailedNotMe: packedUserDetailedNotMeSchema,
-	MeDetailed: packedMeDetailedSchema,
-	UserDetailed: packedUserDetailedSchema,
-	User: packedUserSchema,
-
-	UserList: packedUserListSchema,
-	UserGroup: packedUserGroupSchema,
-	App: packedAppSchema,
-	MessagingMessage: packedMessagingMessageSchema,
-	Note: packedNoteSchema,
-	NoteFile: packedNoteFileSchema,
-	NoteEdit: packedNoteEdit,
-	NoteReaction: packedNoteReactionSchema,
-	NoteFavorite: packedNoteFavoriteSchema,
-	Notification: packedNotificationSchema,
-	DriveFile: packedDriveFileSchema,
-	DriveFolder: packedDriveFolderSchema,
-	Following: packedFollowingSchema,
-	Muting: packedMutingSchema,
-	RenoteMuting: packedRenoteMutingSchema,
-	ReplyMuting: packedReplyMutingSchema,
-	Blocking: packedBlockingSchema,
-	Hashtag: packedHashtagSchema,
-	Page: packedPageSchema,
-	Channel: packedChannelSchema,
-	QueueCount: packedQueueCountSchema,
-	Antenna: packedAntennaSchema,
-	Clip: packedClipSchema,
-	FederationInstance: packedFederationInstanceSchema,
-	GalleryPost: packedGalleryPostSchema,
-	Emoji: packedEmojiSchema,
-};
-
-export type Packed<x extends keyof typeof refs> = SchemaType<(typeof refs)[x]>;
-
-type TypeStringef =
-	| "null"
-	| "boolean"
-	| "integer"
-	| "number"
-	| "string"
-	| "array"
-	| "object"
-	| "any";
-type StringDefToType<T extends TypeStringef> = T extends "null"
-	? null
-	: T extends "boolean"
-		? boolean
-		: T extends "integer"
-			? number
-			: T extends "number"
-				? number
-				: T extends "string"
-					? string | Date
-					: T extends "array"
-						? ReadonlyArray<any>
-						: T extends "object"
-							? Record<string, any>
-							: any;
-
-// https://swagger.io/specification/?sbsearch=optional#schema-object
-type OfSchema = {
-	readonly anyOf?: ReadonlyArray<Schema>;
-	readonly oneOf?: ReadonlyArray<Schema>;
-	readonly allOf?: ReadonlyArray<Schema>;
-};
-
-export interface Schema extends OfSchema {
-	readonly type?: TypeStringef;
-	readonly nullable?: boolean;
-	readonly optional?: boolean;
-	readonly items?: Schema;
-	readonly properties?: Obj;
-	readonly required?: ReadonlyArray<
-		Extract<keyof NonNullable<this["properties"]>, string>
-	>;
-	readonly description?: string;
-	readonly example?: any;
-	readonly format?: string;
-	readonly ref?: keyof typeof refs;
-	readonly enum?: ReadonlyArray<string>;
-	readonly default?:
-		| (this["type"] extends TypeStringef ? StringDefToType<this["type"]> : any)
-		| null;
-	readonly maxLength?: number;
-	readonly minLength?: number;
-	readonly maximum?: number;
-	readonly minimum?: number;
-	readonly pattern?: string;
-}
-
-type RequiredPropertyNames<s extends Obj> = {
-	[K in keyof s]: // K is not optional
-	s[K]["optional"] extends false
-		? K
-		: // K has default value
-			s[K]["default"] extends
-					| null
-					| string
-					| number
-					| boolean
-					| Record<string, unknown>
-			? K
-			: never;
-}[keyof s];
-
-export type Obj = Record<string, Schema>;
-
-// https://github.com/misskey-dev/misskey/issues/8535
-// To avoid excessive stack depth error,
-// deceive TypeScript with UnionToIntersection (or more precisely, `infer` expression within it).
-export type ObjType<
-	s extends Obj,
-	RequiredProps extends keyof s,
-> = UnionToIntersection<
-	{
-		-readonly [R in RequiredPropertyNames<s>]-?: SchemaType<s[R]>;
-	} & {
-		-readonly [R in RequiredProps]-?: SchemaType<s[R]>;
-	} & {
-		-readonly [P in keyof s]?: SchemaType<s[P]>;
-	}
->;
-
-type NullOrUndefined<p extends Schema, T> =
-	| (p["nullable"] extends true ? null : never)
-	| (p["optional"] extends true ? undefined : never)
-	| T;
-
-// https://stackoverflow.com/questions/54938141/typescript-convert-union-to-intersection
-// Get intersection from union
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
-	k: infer I,
-) => void
-	? I
-	: never;
-
-// https://github.com/misskey-dev/misskey/pull/8144#discussion_r785287552
-// To get union, we use `Foo extends any ? Hoge<Foo> : never`
-type UnionSchemaType<
-	a extends readonly any[],
-	X extends Schema = a[number],
-> = X extends any ? SchemaType<X> : never;
-type ArrayUnion<T> = T extends any ? Array<T> : never;
-
-export type SchemaTypeDef<p extends Schema> = p["type"] extends "null"
-	? null
-	: p["type"] extends "integer"
-		? number
-		: p["type"] extends "number"
-			? number
-			: p["type"] extends "string"
-				? p["enum"] extends readonly string[]
-					? p["enum"][number]
-					: p["format"] extends "date-time"
-						? string
-						: // Dateにする？？
-							string
-				: p["type"] extends "boolean"
-					? boolean
-					: p["type"] extends "object"
-						? p["ref"] extends keyof typeof refs
-							? Packed<p["ref"]>
-							: p["properties"] extends NonNullable<Obj>
-								? ObjType<p["properties"], NonNullable<p["required"]>[number]>
-								: p["anyOf"] extends ReadonlyArray<Schema>
-									? UnionSchemaType<p["anyOf"]> &
-											Partial<UnionToIntersection<UnionSchemaType<p["anyOf"]>>>
-									: p["allOf"] extends ReadonlyArray<Schema>
-										? UnionToIntersection<UnionSchemaType<p["allOf"]>>
-										: any
-						: p["type"] extends "array"
-							? p["items"] extends OfSchema
-								? p["items"]["anyOf"] extends ReadonlyArray<Schema>
-									? UnionSchemaType<NonNullable<p["items"]["anyOf"]>>[]
-									: p["items"]["oneOf"] extends ReadonlyArray<Schema>
-										? ArrayUnion<
-												UnionSchemaType<NonNullable<p["items"]["oneOf"]>>
-											>
-										: p["items"]["allOf"] extends ReadonlyArray<Schema>
-											? UnionToIntersection<
-													UnionSchemaType<NonNullable<p["items"]["allOf"]>>
-												>[]
-											: never
-								: p["items"] extends NonNullable<Schema>
-									? SchemaTypeDef<p["items"]>[]
-									: any[]
-							: p["oneOf"] extends ReadonlyArray<Schema>
-								? UnionSchemaType<p["oneOf"]>
-								: any;
-
-export type SchemaType<p extends Schema> = NullOrUndefined<p, SchemaTypeDef<p>>;
+export const refs = _Schema.refs;
+export type Packed<T extends keyof typeof refs> = _Schema.Packed<T>;
+export type Schema = _Schema.Schema;
+export type SchemaType<P extends _Schema.Schema> = _Schema.SchemaType<P>;

packages/backend/src/misc/show-machine-info.ts

@@ -1,17 +0,0 @@
-import * as os from "node:os";
-import sysUtils from "systeminformation";
-import type Logger from "@/services/logger.js";
-
-export async function showMachineInfo(parentLogger: Logger) {
-	const logger = parentLogger.createSubLogger("machine");
-	logger.debug(`Hostname: ${os.hostname()}`);
-	logger.debug(`Platform: ${process.platform} Arch: ${process.arch}`);
-	const mem = await sysUtils.mem();
-	const totalmem = (mem.total / 1024 / 1024 / 1024).toFixed(1);
-	const availmem = (mem.available / 1024 / 1024 / 1024).toFixed(1);
-	logger.debug(
-		`CPU: ${
-			os.cpus().length
-		} core MEM: ${totalmem}GB (available: ${availmem}GB)`,
-	);
-}

packages/backend/src/misc/skipped-instances.ts

@@ -1,8 +1,7 @@
 import { Brackets } from "typeorm";
-import { isBlockedServer } from "backend-rs";
+import { isBlockedServer, DAY } from "backend-rs";
 import { Instances } from "@/models/index.js";
 import type { Instance } from "@/models/entities/instance.js";
-import { DAY } from "backend-rs";
 
 // Threshold from last contact after which an instance will be considered
 // "dead" and should no longer get activities delivered to it.

packages/backend/src/models/entities/scheduled-note-creation.ts

@@ -3,6 +3,7 @@ import {
 	JoinColumn,
 	Column,
 	ManyToOne,
+	OneToOne,
 	PrimaryColumn,
 	Index,
 	type Relation,
@@ -31,7 +32,7 @@ export class ScheduledNoteCreation {
 	public scheduledAt: Date;
 
 	//#region Relations
-	@ManyToOne(() => Note, {
+	@OneToOne(() => Note, {
 		onDelete: "CASCADE",
 	})
 	@JoinColumn()

packages/backend/src/queue/processors/inbox.ts

@@ -5,8 +5,12 @@ import perform from "@/remote/activitypub/perform.js";
 import Logger from "@/services/logger.js";
 import { registerOrFetchInstanceDoc } from "@/services/register-or-fetch-instance-doc.js";
 import { Instances } from "@/models/index.js";
-import { isAllowedServer, isBlockedServer } from "backend-rs";
-import { toPuny, extractHost } from "backend-rs";
+import {
+	extractHost,
+	isAllowedServer,
+	isBlockedServer,
+	toPuny,
+} from "backend-rs";
 import { getApId } from "@/remote/activitypub/type.js";
 import { fetchInstanceMetadata } from "@/services/fetch-instance-metadata.js";
 import type { InboxJobData } from "../types.js";

packages/backend/src/remote/activitypub/check-fetch.ts

@@ -1,11 +1,15 @@
-import { URL } from "url";
+import { URL } from "node:url";
 import httpSignature, { type IParsedSignature } from "@peertube/http-signature";
 import { config } from "@/config.js";
-import { fetchMeta, isAllowedServer, isBlockedServer } from "backend-rs";
-import { toPuny } from "backend-rs";
+import {
+	fetchMeta,
+	isAllowedServer,
+	isBlockedServer,
+	toPuny,
+} from "backend-rs";
 import DbResolver from "@/remote/activitypub/db-resolver.js";
 import { getApId } from "@/remote/activitypub/type.js";
-import type { IncomingMessage } from "http";
+import type { IncomingMessage } from "node:http";
 import type { CacheableRemoteUser } from "@/models/entities/user.js";
 import type { UserPublickey } from "@/models/entities/user-publickey.js";
 import { verify } from "node:crypto";

packages/backend/src/remote/activitypub/kernel/announce/note.ts

@@ -5,12 +5,11 @@ import type { IAnnounce } from "../../type.js";
 import { getApId } from "../../type.js";
 import { fetchNote, resolveNote } from "../../models/note.js";
 import { apLogger } from "../../logger.js";
-import { extractHost } from "backend-rs";
+import { extractHost, isBlockedServer } from "backend-rs";
 import { getApLock } from "@/misc/app-lock.js";
 import { parseAudience } from "../../audience.js";
 import { StatusError } from "@/misc/fetch.js";
 import { Notes } from "@/models/index.js";
-import { isBlockedServer } from "backend-rs";
 import { inspect } from "node:util";
 
 /**

packages/backend/src/remote/activitypub/models/note.ts

@@ -16,7 +16,9 @@ import type { DriveFile } from "@/models/entities/drive-file.js";
 import {
 	type ImageSize,
 	extractHost,
+	genId,
 	getImageSizeFromUrl,
+	isBlockedServer,
 	isSameOrigin,
 	toPuny,
 } from "backend-rs";
@@ -39,7 +41,6 @@ import {
 	getApType,
 } from "../type.js";
 import type { Emoji } from "@/models/entities/emoji.js";
-import { genId, isBlockedServer } from "backend-rs";
 import { getApLock } from "@/misc/app-lock.js";
 import { createMessage } from "@/services/messages/create.js";
 import { parseAudience } from "../audience.js";
@@ -52,7 +53,7 @@ import { UserProfiles } from "@/models/index.js";
 import { In } from "typeorm";
 import { config } from "@/config.js";
 import { truncate } from "@/misc/truncate.js";
-import { langmap } from "@/misc/langmap.js";
+import { langmap } from "firefish-js";
 import { inspect } from "node:util";
 
 export function validateNote(object: any, uri: string) {

packages/backend/src/remote/activitypub/models/person.ts

@@ -16,10 +16,9 @@ import type { IRemoteUser, CacheableUser } from "@/models/entities/user.js";
 import { User } from "@/models/entities/user.js";
 import type { Emoji } from "@/models/entities/emoji.js";
 import { UserNotePining } from "@/models/entities/user-note-pining.js";
-import { genId } from "backend-rs";
+import { genId, isSameOrigin, toPuny } from "backend-rs";
 import { UserPublickey } from "@/models/entities/user-publickey.js";
 import { isDuplicateKeyValueError } from "@/misc/is-duplicate-key-value-error.js";
-import { isSameOrigin, toPuny } from "backend-rs";
 import { UserProfile } from "@/models/entities/user-profile.js";
 import { toArray } from "@/prelude/array.js";
 import { fetchInstanceMetadata } from "@/services/fetch-instance-metadata.js";

packages/backend/src/server/api/common/generate-native-user-token.ts

@@ -1,3 +0,0 @@
-import { secureRndstr } from "backend-rs";
-
-export default () => secureRndstr(16);

packages/backend/src/server/api/common/read-messaging-message.ts

@@ -3,10 +3,11 @@ import {
 	publishToChatStream,
 	publishToGroupChatStream,
 	publishToChatIndexStream,
+	sendPushNotification,
 	ChatEvent,
 	ChatIndexEvent,
+	PushNotificationKind,
 } from "backend-rs";
-import { pushNotification } from "@/services/push-notification.js";
 import type { User, IRemoteUser } from "@/models/entities/user.js";
 import type { MessagingMessage } from "@/models/entities/messaging-message.js";
 import { MessagingMessages, UserGroupJoinings, Users } from "@/models/index.js";
@@ -62,20 +63,19 @@ export async function readUserMessagingMessage(
 	if (!(await Users.getHasUnreadMessagingMessage(userId))) {
 		// 全ての(いままで未読だった)自分宛てのメッセージを(これで)読みましたよというイベントを発行
 		publishMainStream(userId, "readAllMessagingMessages");
-		pushNotification(userId, "readAllMessagingMessages", undefined);
+		sendPushNotification(userId, PushNotificationKind.ReadAllChats, {});
 	} else {
 		// そのユーザーとのメッセージで未読がなければイベント発行
-		const count = await MessagingMessages.count({
+		const hasUnread = await MessagingMessages.exists({
 			where: {
 				userId: otherpartyId,
 				recipientId: userId,
 				isRead: false,
 			},
-			take: 1,
 		});
 
-		if (!count) {
-			pushNotification(userId, "readAllMessagingMessagesOfARoom", {
+		if (!hasUnread) {
+			sendPushNotification(userId, PushNotificationKind.ReadAllChatsInTheRoom, {
 				userId: otherpartyId,
 			});
 		}
@@ -137,10 +137,10 @@ export async function readGroupMessagingMessage(
 	if (!(await Users.getHasUnreadMessagingMessage(userId))) {
 		// 全ての(いままで未読だった)自分宛てのメッセージを(これで)読みましたよというイベントを発行
 		publishMainStream(userId, "readAllMessagingMessages");
-		pushNotification(userId, "readAllMessagingMessages", undefined);
+		sendPushNotification(userId, PushNotificationKind.ReadAllChats, {});
 	} else {
 		// そのグループにおいて未読がなければイベント発行
-		const unreadExist = await MessagingMessages.createQueryBuilder("message")
+		const hasUnread = await MessagingMessages.createQueryBuilder("message")
 			.where("message.groupId = :groupId", { groupId: groupId })
 			.andWhere("message.userId != :userId", { userId: userId })
 			.andWhere("NOT (:userId = ANY(message.reads))", { userId: userId })
@@ -150,8 +150,10 @@ export async function readGroupMessagingMessage(
 			.getOne()
 			.then((x) => x != null);
 
-		if (!unreadExist) {
-			pushNotification(userId, "readAllMessagingMessagesOfARoom", { groupId });
+		if (!hasUnread) {
+			sendPushNotification(userId, PushNotificationKind.ReadAllChatsInTheRoom, {
+				groupId,
+			});
 		}
 	}
 }

packages/backend/src/server/api/common/read-notification.ts

@@ -1,6 +1,6 @@
 import { In } from "typeorm";
 import { publishMainStream } from "@/services/stream.js";
-import { pushNotification } from "@/services/push-notification.js";
+import { sendPushNotification, PushNotificationKind } from "backend-rs";
 import type { User } from "@/models/entities/user.js";
 import type { Notification } from "@/models/entities/notification.js";
 import { Notifications, Users } from "@/models/index.js";
@@ -47,7 +47,11 @@ export async function readNotificationByQuery(
 
 function postReadAllNotifications(userId: User["id"]) {
 	publishMainStream(userId, "readAllNotifications");
-	return pushNotification(userId, "readAllNotifications", undefined);
+	return sendPushNotification(
+		userId,
+		PushNotificationKind.ReadAllNotifications,
+		{},
+	);
 }
 
 function postReadNotifications(
@@ -55,5 +59,7 @@ function postReadNotifications(
 	notificationIds: Notification["id"][],
 ) {
 	publishMainStream(userId, "readNotifications", notificationIds);
-	return pushNotification(userId, "readNotifications", { notificationIds });
+	return sendPushNotification(userId, PushNotificationKind.ReadNotifications, {
+		notificationIds,
+	});
 }

packages/backend/src/server/api/common/signup.ts

@@ -1,10 +1,9 @@
 import { generateKeyPair } from "node:crypto";
-import generateUserToken from "./generate-native-user-token.js";
 import { User } from "@/models/entities/user.js";
 import { Users, UsedUsernames } from "@/models/index.js";
 import { UserProfile } from "@/models/entities/user-profile.js";
 import { IsNull } from "typeorm";
-import { genId, hashPassword, toPuny } from "backend-rs";
+import { genId, generateUserToken, hashPassword, toPuny } from "backend-rs";
 import { UserKeypair } from "@/models/entities/user-keypair.js";
 import { UsedUsername } from "@/models/entities/used-username.js";
 import { db } from "@/db/postgre.js";

packages/backend/src/server/api/endpoints/admin/server-info.ts

@@ -1,8 +1,8 @@
 import * as os from "node:os";
-import si from "systeminformation";
 import define from "@/server/api/define.js";
 import { redisClient } from "@/db/redis.js";
 import { db } from "@/db/postgre.js";
+import { cpuInfo, memoryUsage, storageUsage } from "backend-rs";
 
 export const meta = {
 	requireCredential: true,
@@ -85,19 +85,6 @@ export const meta = {
 					},
 				},
 			},
-			net: {
-				type: "object",
-				optional: false,
-				nullable: false,
-				properties: {
-					interface: {
-						type: "string",
-						optional: false,
-						nullable: false,
-						example: "eth0",
-					},
-				},
-			},
 		},
 	},
 } as const;
@@ -109,13 +96,10 @@ export const paramDef = {
 } as const;
 
 export default define(meta, paramDef, async () => {
-	const memStats = await si.mem();
-	const fsStats = await si.fsSize();
-	const netInterface = await si.networkInterfaceDefault();
-
 	const redisServerInfo = await redisClient.info("Server");
-	const m = redisServerInfo.match(new RegExp("^redis_version:(.*)", "m"));
+	const m = redisServerInfo.match(/^redis_version:(.*)/m);
 	const redis_version = m?.[1];
+	const storage = storageUsage();
 
 	return {
 		machine: os.hostname(),
@@ -125,19 +109,13 @@ export default define(meta, paramDef, async () => {
 			.query("SHOW server_version")
 			.then((x) => x[0].server_version),
 		redis: redis_version,
-		cpu: {
-			model: os.cpus()[0].model,
-			cores: os.cpus().length,
-		},
+		cpu: cpuInfo(),
 		mem: {
-			total: memStats.total,
+			total: memoryUsage().total,
 		},
 		fs: {
-			total: fsStats[0].size,
-			used: fsStats[0].used,
-		},
-		net: {
-			interface: netInterface,
+			total: storage?.total ?? 0,
+			used: storage?.used ?? 0,
 		},
 	};
 });

packages/backend/src/server/api/endpoints/app/create.ts

@@ -1,6 +1,6 @@
 import define from "@/server/api/define.js";
 import { Apps } from "@/models/index.js";
-import { genId, secureRndstr } from "backend-rs";
+import { genId, generateSecureRandomString } from "backend-rs";
 import { unique } from "@/prelude/array.js";
 
 export const meta = {
@@ -40,7 +40,7 @@ export default define(meta, paramDef, async (ps, user) => {
 			includeSecret: true,
 		});
 	// Generate secret
-	const secret = secureRndstr(32);
+	const secret = generateSecureRandomString(32);
 
 	// for backward compatibility
 	const permission = unique(

packages/backend/src/server/api/endpoints/auth/accept.ts

@@ -2,7 +2,7 @@ import * as crypto from "node:crypto";
 import define from "@/server/api/define.js";
 import { ApiError } from "@/server/api/error.js";
 import { AuthSessions, AccessTokens, Apps } from "@/models/index.js";
-import { genId, secureRndstr } from "backend-rs";
+import { genId, generateSecureRandomString } from "backend-rs";
 
 export const meta = {
 	tags: ["auth"],
@@ -37,10 +37,10 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 
 	// Generate access token
-	const accessToken = secureRndstr(32);
+	const accessToken = generateSecureRandomString(32);
 
 	// Fetch exist access token
-	const exist = await AccessTokens.exist({
+	const exist = await AccessTokens.exists({
 		where: {
 			appId: session.appId,
 			userId: user.id,

packages/backend/src/server/api/endpoints/get-sounds.ts

@@ -1,4 +1,4 @@
-import { readdir } from "fs/promises";
+import { readdir } from "node:fs/promises";
 import define from "@/server/api/define.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/i/import-posts.ts

@@ -2,8 +2,7 @@ import define from "@/server/api/define.js";
 import { createImportPostsJob } from "@/queue/index.js";
 import { ApiError } from "@/server/api/error.js";
 import { DriveFiles } from "@/models/index.js";
-import { DAY } from "backend-rs";
-import { fetchMeta } from "backend-rs";
+import { fetchMeta, DAY } from "backend-rs";
 
 export const meta = {
 	secure: true,

packages/backend/src/server/api/endpoints/i/known-as.ts

@@ -4,11 +4,10 @@ import { resolveUser } from "@/remote/resolve-user.js";
 import acceptAllFollowRequests from "@/services/following/requests/accept-all.js";
 import { publishToFollowers } from "@/services/i/update.js";
 import { publishMainStream } from "@/services/stream.js";
-import { DAY } from "backend-rs";
+import { stringToAcct, DAY } from "backend-rs";
 import { apiLogger } from "@/server/api/logger.js";
 import define from "@/server/api/define.js";
 import { ApiError } from "@/server/api/error.js";
-import { stringToAcct } from "backend-rs";
 import { inspect } from "node:util";
 
 export const meta = {

packages/backend/src/server/api/endpoints/i/move.ts

@@ -1,6 +1,6 @@
 import type { User } from "@/models/entities/user.js";
 import { resolveUser } from "@/remote/resolve-user.js";
-import { DAY } from "backend-rs";
+import { stringToAcct, DAY } from "backend-rs";
 import DeliverManager from "@/remote/activitypub/deliver-manager.js";
 import { renderActivity } from "@/remote/activitypub/renderer/index.js";
 import define from "@/server/api/define.js";
@@ -12,7 +12,6 @@ import { getUser } from "@/server/api/common/getters.js";
 import { Followings, Users } from "@/models/index.js";
 import { config } from "@/config.js";
 import { publishMainStream } from "@/services/stream.js";
-import { stringToAcct } from "backend-rs";
 import { inspect } from "node:util";
 
 export const meta = {

packages/backend/src/server/api/endpoints/i/regenerate-token.ts

@@ -3,10 +3,9 @@ import {
 	publishMainStream,
 	publishUserEvent,
 } from "@/services/stream.js";
-import generateUserToken from "@/server/api/common/generate-native-user-token.js";
 import define from "@/server/api/define.js";
 import { Users, UserProfiles } from "@/models/index.js";
-import { verifyPassword } from "backend-rs";
+import { generateUserToken, verifyPassword } from "backend-rs";
 
 export const meta = {
 	requireCredential: true,

packages/backend/src/server/api/endpoints/miauth/gen-token.ts

@@ -1,6 +1,6 @@
 import define from "@/server/api/define.js";
 import { AccessTokens } from "@/models/index.js";
-import { genId, secureRndstr } from "backend-rs";
+import { genId, generateSecureRandomString } from "backend-rs";
 
 export const meta = {
 	tags: ["auth"],
@@ -43,7 +43,7 @@ export const paramDef = {
 
 export default define(meta, paramDef, async (ps, user) => {
 	// Generate access token
-	const accessToken = secureRndstr(32);
+	const accessToken = generateSecureRandomString(32);
 
 	const now = new Date();
 

packages/backend/src/server/api/endpoints/notes/create.ts

@@ -18,8 +18,8 @@ import { ApiError } from "@/server/api/error.js";
 import define from "@/server/api/define.js";
 import { HOUR, genId } from "backend-rs";
 import { getNote } from "@/server/api/common/getters.js";
-import { langmap } from "@/misc/langmap.js";
-import { createScheduledCreateNoteJob } from "@/queue";
+import { langmap } from "firefish-js";
+import { createScheduledCreateNoteJob } from "@/queue/index.js";
 
 export const meta = {
 	tags: ["notes"],

packages/backend/src/server/api/endpoints/notes/edit.ts

@@ -18,7 +18,7 @@ import { config } from "@/config.js";
 import { noteVisibilities } from "@/types.js";
 import { ApiError } from "@/server/api/error.js";
 import define from "@/server/api/define.js";
-import { HOUR } from "backend-rs";
+import { genId, HOUR } from "backend-rs";
 import { getNote } from "@/server/api/common/getters.js";
 import { Poll } from "@/models/entities/poll.js";
 import * as mfm from "mfm-js";
@@ -26,7 +26,6 @@ import { concat } from "@/prelude/array.js";
 import { extractHashtags } from "@/misc/extract-hashtags.js";
 import { extractCustomEmojisFromMfm } from "@/misc/extract-custom-emojis-from-mfm.js";
 import { extractMentionedUsers } from "@/services/note/create.js";
-import { genId } from "backend-rs";
 import { publishNoteStream } from "@/services/stream.js";
 import DeliverManager from "@/remote/activitypub/deliver-manager.js";
 import { renderActivity } from "@/remote/activitypub/renderer/index.js";
@@ -34,7 +33,7 @@ import renderNote from "@/remote/activitypub/renderer/note.js";
 import renderUpdate from "@/remote/activitypub/renderer/update.js";
 import { deliverToRelays } from "@/services/relay.js";
 // import { deliverQuestionUpdate } from "@/services/note/polls/update.js";
-import { langmap } from "@/misc/langmap.js";
+import { langmap } from "firefish-js";
 
 export const meta = {
 	tags: ["notes"],

packages/backend/src/server/api/endpoints/notes/translate.ts

@@ -1,7 +1,7 @@
 import { ApiError } from "@/server/api/error.js";
 import { getNote } from "@/server/api/common/getters.js";
 import { translate } from "@/misc/translate.js";
-import type { PostLanguage } from "@/misc/langmap.js";
+import type { PostLanguage } from "firefish-js";
 import define from "@/server/api/define.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/notifications/mark-all-as-read.ts

@@ -1,5 +1,5 @@
 import { publishMainStream } from "@/services/stream.js";
-import { pushNotification } from "@/services/push-notification.js";
+import { sendPushNotification, PushNotificationKind } from "backend-rs";
 import { Notifications } from "@/models/index.js";
 import define from "@/server/api/define.js";
 
@@ -17,7 +17,7 @@ export const paramDef = {
 	required: [],
 } as const;
 
-export default define(meta, paramDef, async (ps, user) => {
+export default define(meta, paramDef, async (_, user) => {
 	// Update documents
 	await Notifications.update(
 		{
@@ -31,5 +31,5 @@ export default define(meta, paramDef, async (ps, user) => {
 
 	// 全ての通知を読みましたよというイベントを発行
 	publishMainStream(user.id, "readAllNotifications");
-	pushNotification(user.id, "readAllNotifications", undefined);
+	sendPushNotification(user.id, PushNotificationKind.ReadAllNotifications, {});
 });

packages/backend/src/server/api/endpoints/pages/create.ts

@@ -1,9 +1,8 @@
 import { Pages, DriveFiles } from "@/models/index.js";
-import { genId } from "backend-rs";
+import { genId, HOUR } from "backend-rs";
 import { Page } from "@/models/entities/page.js";
 import define from "@/server/api/define.js";
 import { ApiError } from "@/server/api/error.js";
-import { HOUR } from "backend-rs";
 
 export const meta = {
 	tags: ["pages"],

packages/backend/src/server/api/endpoints/pinned-users.ts

@@ -1,7 +1,6 @@
 import { IsNull } from "typeorm";
 import { Users } from "@/models/index.js";
-import { fetchMeta } from "backend-rs";
-import { stringToAcct } from "backend-rs";
+import { fetchMeta, stringToAcct } from "backend-rs";
 import type { User } from "@/models/entities/user.js";
 import define from "@/server/api/define.js";
 

packages/backend/src/server/api/endpoints/server-info.ts

@@ -1,10 +1,9 @@
 import * as os from "node:os";
-import si from "systeminformation";
 import define from "@/server/api/define.js";
-import { fetchMeta } from "backend-rs";
+import { fetchMeta, cpuInfo, memoryUsage, storageUsage } from "backend-rs";
 
 export const meta = {
-	requireCredential: false,
+	requireCredential: true,
 	requireCredentialPrivateMode: true,
 	allowGet: true,
 	cacheSec: 30,
@@ -18,19 +17,8 @@ export const paramDef = {
 } as const;
 
 export default define(meta, paramDef, async () => {
-	const memStats = await si.mem();
-	const fsStats = await si.fsSize();
-
-	let fsIndex = 0;
-	// Get the first index of fs sizes that are actualy used.
-	for (const [i, stat] of fsStats.entries()) {
-		if (stat.rw === true && stat.used > 0) {
-			fsIndex = i;
-			break;
-		}
-	}
-
 	const instanceMeta = await fetchMeta(true);
+
 	if (!instanceMeta.enableServerMachineStats) {
 		return {
 			machine: "Not specified",
@@ -47,18 +35,19 @@ export default define(meta, paramDef, async () => {
 			},
 		};
 	}
+
+	const memory = memoryUsage();
+	const storage = storageUsage();
+
 	return {
 		machine: os.hostname(),
-		cpu: {
-			model: os.cpus()[0].model,
-			cores: os.cpus().length,
-		},
+		cpu: cpuInfo(),
 		mem: {
-			total: memStats.total,
+			total: memory.total,
 		},
 		fs: {
-			total: fsStats[fsIndex].size,
-			used: fsStats[fsIndex].used,
+			total: storage?.total ?? 0,
+			used: storage?.used ?? 0,
 		},
 	};
 });

packages/backend/src/server/api/endpoints/sw/register.ts

@@ -1,5 +1,4 @@
-import { fetchMeta } from "backend-rs";
-import { genId } from "backend-rs";
+import { fetchMeta, genId } from "backend-rs";
 import { SwSubscriptions } from "@/models/index.js";
 import define from "@/server/api/define.js";
 

packages/backend/src/server/api/mastodon/endpoints/timeline.ts

@@ -1,6 +1,6 @@
-import Router from "@koa/router";
+import type Router from "@koa/router";
 import { getClient } from "../ApiMastodonCompatibleService.js";
-import { ParsedUrlQuery } from "querystring";
+import type { ParsedUrlQuery } from "node:querystring";
 import {
 	convertAccount,
 	convertConversation,

packages/backend/src/server/index.ts

@@ -16,10 +16,9 @@ import { IsNull } from "typeorm";
 import { config, envOption } from "@/config.js";
 import Logger from "@/services/logger.js";
 import { Users } from "@/models/index.js";
-import { fetchMeta } from "backend-rs";
+import { fetchMeta, stringToAcct } from "backend-rs";
 import { genIdenticon } from "@/misc/gen-identicon.js";
 import { createTemp } from "@/misc/create-temp.js";
-import { stringToAcct } from "backend-rs";
 import megalodon, { type MegalodonInterface } from "megalodon";
 import activityPub from "./activitypub.js";
 import nodeinfo from "./nodeinfo.js";

packages/backend/src/server/web/index.ts

@@ -149,7 +149,9 @@ router.get<{ Params: { path: string } }>("/emoji/:path(.*)", async (ctx) => {
 		return;
 	}
 
-	let url = new URL(`${config.mediaProxy || config.url + "/proxy"}/emoji.webp`);
+	const url = new URL(
+		`${config.mediaProxy || `${config.url}/proxy`}/emoji.webp`,
+	);
 	// || emoji.originalUrl してるのは後方互換性のため
 	url.searchParams.append("url", emoji.publicUrl || emoji.originalUrl);
 	url.searchParams.append("emoji", "1");
@@ -370,9 +372,8 @@ const getFeed = async (
 };
 
 // As the /@user[.json|.rss|.atom]/sub endpoint is complicated, we will use a regex to switch between them.
-const reUser = new RegExp(
-	"^/@(?<user>[^/]+?)(?:.(?<feed>json|rss|atom)(?:\\?[^/]*)?)?(?:/(?<sub>[^/]+))?$",
-);
+const reUser =
+	/^\/@(?<user>[^\/]+?)(?:.(?<feed>json|rss|atom)(?:\?[^\/]*)?)?(?:\/(?<sub>[^\/]+))?$/;
 router.get(reUser, async (ctx, next) => {
 	const groups = reUser.exec(ctx.originalUrl)?.groups;
 	if (!groups) {

packages/backend/src/server/web/manifest.json

@@ -1,73 +0,0 @@
-{
-	"short_name": "Firefish",
-	"name": "Firefish",
-	"description": "An open source, decentralized social media platform that's free forever!",
-	"start_url": "/",
-	"scope": "/",
-	"display": "standalone",
-	"background_color": "#1f1d2e",
-	"theme_color": "#31748f",
-	"orientation": "natural",
-	"icons": [
-		{
-			"src": "/static-assets/icons/192.png",
-			"sizes": "192x192",
-			"type": "image/png",
-			"purpose": "any"
-		},
-		{
-			"src": "/static-assets/icons/512.png",
-			"sizes": "512x512",
-			"type": "image/png",
-			"purpose": "any"
-		},
-		{
-			"src": "/static-assets/icons/maskable.png",
-			"sizes": "512x512",
-			"type": "image/png",
-			"purpose": "maskable"
-		},
-		{
-			"src": "/static-assets/icons/monochrome.png",
-			"sizes": "512x512",
-			"type": "image/png",
-			"purpose": "monochrome"
-		}
-	],
-	"share_target": {
-		"action": "/share/",
-		"params": {
-			"title": "title",
-			"text": "text",
-			"url": "url"
-		}
-	},
-	"screenshots": [
-		{
-			"src": "/static-assets/screenshots/1.webp",
-			"sizes": "1080x2340",
-			"type": "image/webp",
-			"platform": "narrow",
-			"label": "Profile page"
-		},
-		{
-			"src": "/static-assets/screenshots/2.webp",
-			"sizes": "1080x2340",
-			"type": "image/webp",
-			"platform": "narrow",
-			"label": "Posts"
-		}
-	],
-	"shortcuts": [
-		{
-			"name": "Notifications",
-			"short_name": "Notifs",
-			"url": "/my/notifications"
-		},
-		{
-			"name": "Chats",
-			"url": "/my/messaging"
-		}
-	],
-	"categories": ["social"]
-}

packages/backend/src/server/web/manifest.ts

@@ -1,27 +1,97 @@
 import type Koa from "koa";
 import { fetchMeta } from "backend-rs";
 import { config } from "@/config.js";
-import manifest from "./manifest.json" assert { type: "json" };
+
+const manifest = {
+	short_name: "Firefish",
+	name: "Firefish",
+	description:
+		"An open source, decentralized social media platform that's free forever!",
+	start_url: "/",
+	scope: "/",
+	display: "standalone",
+	background_color: "#1f1d2e",
+	theme_color: "#31748f",
+	orientation: "natural",
+	icons: [
+		{
+			src: "/static-assets/icons/192.png",
+			sizes: "192x192",
+			type: "image/png",
+			purpose: "any",
+		},
+		{
+			src: "/static-assets/icons/512.png",
+			sizes: "512x512",
+			type: "image/png",
+			purpose: "any",
+		},
+		{
+			src: "/static-assets/icons/maskable.png",
+			sizes: "512x512",
+			type: "image/png",
+			purpose: "maskable",
+		},
+		{
+			src: "/static-assets/icons/monochrome.png",
+			sizes: "512x512",
+			type: "image/png",
+			purpose: "monochrome",
+		},
+	],
+	share_target: {
+		action: "/share/",
+		params: {
+			title: "title",
+			text: "text",
+			url: "url",
+		},
+	},
+	screenshots: [
+		{
+			src: "/static-assets/screenshots/1.webp",
+			sizes: "1080x2340",
+			type: "image/webp",
+			platform: "narrow",
+			label: "Profile page",
+		},
+		{
+			src: "/static-assets/screenshots/2.webp",
+			sizes: "1080x2340",
+			type: "image/webp",
+			platform: "narrow",
+			label: "Posts",
+		},
+	],
+	shortcuts: [
+		{
+			name: "Notifications",
+			short_name: "Notifs",
+			url: "/my/notifications",
+		},
+		{
+			name: "Chats",
+			url: "/my/messaging",
+		},
+	],
+	categories: ["social"],
+};
 
 export const manifestHandler = async (ctx: Koa.Context) => {
-	// TODO
-	//const res = structuredClone(manifest);
-	const res = JSON.parse(JSON.stringify(manifest));
+	const instance = await fetchMeta(true);
 
-	const instance = await fetchMeta(false);
-
-	res.short_name = instance.name || "Firefish";
-	res.name = instance.name || "Firefish";
-	if (instance.themeColor) res.theme_color = instance.themeColor;
-	for (const icon of res.icons) {
+	manifest.short_name = instance.name || "Firefish";
+	manifest.name = instance.name || "Firefish";
+	if (instance.themeColor) manifest.theme_color = instance.themeColor;
+	for (const icon of manifest.icons) {
 		icon.src = `${icon.src}?v=${config.version.replace(/[^0-9]/g, "")}`;
 	}
-	for (const screenshot of res.screenshots) {
+	for (const screenshot of manifest.screenshots) {
 		screenshot.src = `${screenshot.src}?v=${config.version.replace(
 			/[^0-9]/g,
 			"",
 		)}`;
 	}
 	ctx.set("Cache-Control", "max-age=300");
-	ctx.body = res;
+	ctx.body = manifest;
 };

packages/backend/src/services/create-notification.ts

@@ -1,5 +1,4 @@
 import { publishMainStream } from "@/services/stream.js";
-import { pushNotification } from "@/services/push-notification.js";
 import {
 	Notifications,
 	Mutings,
@@ -8,7 +7,12 @@ import {
 	Users,
 	Followings,
 } from "@/models/index.js";
-import { genId, isSilencedServer } from "backend-rs";
+import {
+	genId,
+	isSilencedServer,
+	sendPushNotification,
+	PushNotificationKind,
+} from "backend-rs";
 import type { User } from "@/models/entities/user.js";
 import type { Notification } from "@/models/entities/notification.js";
 import { sendEmailNotification } from "./send-email-notification.js";
@@ -81,7 +85,7 @@ export async function createNotification(
 		if (fresh == null) return; // 既に削除されているかもしれない
 		// We execute this before, because the server side "read" check doesnt work well with push notifications, the app and service worker will decide themself
 		// when it is best to show push notifications
-		pushNotification(notifieeId, "notification", packed);
+		sendPushNotification(notifieeId, PushNotificationKind.Generic, packed);
 		if (fresh.isRead) return;
 
 		//#region ただしミュートしているユーザーからの通知なら無視

packages/backend/src/services/create-system-user.ts

@@ -1,10 +1,9 @@
 import { v4 as uuid } from "uuid";
-import generateNativeUserToken from "@/server/api/common/generate-native-user-token.js";
 import { genRsaKeyPair } from "@/misc/gen-key-pair.js";
 import { User } from "@/models/entities/user.js";
 import { UserProfile } from "@/models/entities/user-profile.js";
 import { IsNull } from "typeorm";
-import { genId, hashPassword } from "backend-rs";
+import { generateUserToken, genId, hashPassword } from "backend-rs";
 import { UserKeypair } from "@/models/entities/user-keypair.js";
 import { UsedUsername } from "@/models/entities/used-username.js";
 import { db } from "@/db/postgre.js";
@@ -16,7 +15,7 @@ export async function createSystemUser(username: string) {
 	const hash = hashPassword(password);
 
 	// Generate secret
-	const secret = generateNativeUserToken();
+	const secret = generateUserToken();
 
 	const keyPair = await genRsaKeyPair(4096);
 

packages/backend/src/services/fetch-instance-metadata.ts

@@ -1,8 +1,8 @@
 import { URL } from "node:url";
-import { Window } from "happy-dom";
+import { type DOMWindow, JSDOM } from "jsdom";
 import fetch from "node-fetch";
 import tinycolor from "tinycolor2";
-import { getJson, getAgentByUrl } from "@/misc/fetch.js";
+import { getJson, getHtml, getAgentByUrl } from "@/misc/fetch.js";
 import {
 	type Instance,
 	MAX_LENGTH_INSTANCE,
@@ -112,15 +112,13 @@ export async function fetchInstanceMetadata(
 	}
 }
 
-async function fetchDom(instance: Instance): Promise<Window["document"]> {
+async function fetchDom(instance: Instance): Promise<DOMWindow["document"]> {
 	logger.info(`Fetching HTML of ${instance.host} ...`);
 
-	const window = new Window({
-		url: `https://${instance.host}`,
-	});
-	const doc = window.document;
+	const html = await getHtml(`https://${instance.host}`);
+	const { window } = new JSDOM(html);
 
-	return doc;
+	return window.document;
 }
 
 async function fetchManifest(
@@ -137,7 +135,7 @@ async function fetchManifest(
 
 async function fetchFaviconUrl(
 	instance: Instance,
-	doc: Window["document"] | null,
+	doc: DOMWindow["document"] | null,
 ): Promise<string | null> {
 	const url = `https://${instance.host}`;
 
@@ -169,7 +167,7 @@ async function fetchFaviconUrl(
 
 async function fetchIconUrl(
 	instance: Instance,
-	doc: Window["document"] | null,
+	doc: DOMWindow["document"] | null,
 	manifest: Record<string, any> | null,
 ): Promise<string | null> {
 	if (manifest?.icons && manifest.icons.length > 0 && manifest.icons[0].src) {
@@ -219,9 +217,9 @@ async function getThemeColor(
 
 async function getSiteName(
 	info: Nodeinfo | null,
-	doc: Window["document"] | null,
+	doc: DOMWindow["document"] | null,
 	manifest: Record<string, any> | null,
-): Promise<string | undefined | null> {
+): Promise<string | null> {
 	if (info?.metadata) {
 		if (info.metadata.nodeName || info.metadata.name) {
 			return info.metadata.nodeName || info.metadata.name;
@@ -247,7 +245,7 @@ async function getSiteName(
 
 async function getDescription(
 	info: Nodeinfo | null,
-	doc: Window["document"] | null,
+	doc: DOMWindow["document"] | null,
 	manifest: Record<string, any> | null,
 ): Promise<string | null> {
 	if (info?.metadata) {

packages/backend/src/services/fetch-rel-me.ts

@@ -1,12 +1,11 @@
-import { Window } from "happy-dom";
-import type { HTMLAnchorElement, HTMLLinkElement } from "happy-dom";
+import { JSDOM } from "jsdom";
 import { config } from "@/config.js";
+import { getHtml } from "@/misc/fetch.js";
 
 async function getRelMeLinks(url: string): Promise<string[]> {
 	try {
-		const dom = new Window({
-			url: url,
-		});
+		const html = await getHtml(url);
+		const dom = new JSDOM(html);
 		const allLinks = [...dom.window.document.querySelectorAll("a, link")];
 		const relMeLinks = allLinks
 			.filter((a) => {

packages/backend/src/services/messages/create.ts

@@ -9,16 +9,17 @@ import {
 } from "@/models/index.js";
 import {
 	genId,
+	sendPushNotification,
 	publishToChatStream,
 	publishToGroupChatStream,
 	publishToChatIndexStream,
 	toPuny,
 	ChatEvent,
 	ChatIndexEvent,
+	PushNotificationKind,
 } from "backend-rs";
 import type { MessagingMessage } from "@/models/entities/messaging-message.js";
 import { publishMainStream } from "@/services/stream.js";
-import { pushNotification } from "@/services/push-notification.js";
 import { Not } from "typeorm";
 import type { Note } from "@/models/entities/note.js";
 import renderNote from "@/remote/activitypub/renderer/note.js";
@@ -118,7 +119,11 @@ export async function createMessage(
 			//#endregion
 
 			publishMainStream(recipientUser.id, "unreadMessagingMessage", messageObj);
-			pushNotification(recipientUser.id, "unreadMessagingMessage", messageObj);
+			sendPushNotification(
+				recipientUser.id,
+				PushNotificationKind.Chat,
+				messageObj,
+			);
 		} else if (recipientGroup) {
 			const joinings = await UserGroupJoinings.findBy({
 				userGroupId: recipientGroup.id,
@@ -127,7 +132,11 @@ export async function createMessage(
 			for (const joining of joinings) {
 				if (freshMessage.reads.includes(joining.userId)) return; // 既読
 				publishMainStream(joining.userId, "unreadMessagingMessage", messageObj);
-				pushNotification(joining.userId, "unreadMessagingMessage", messageObj);
+				sendPushNotification(
+					joining.userId,
+					PushNotificationKind.Chat,
+					messageObj,
+				);
 			}
 		}
 	}, 2000);

packages/backend/src/services/note/create.ts

@@ -63,7 +63,7 @@ import { db } from "@/db/postgre.js";
 import { getActiveWebhooks } from "@/misc/webhook-cache.js";
 import { redisClient } from "@/db/redis.js";
 import { Mutex } from "redis-semaphore";
-import { langmap } from "@/misc/langmap.js";
+import { langmap } from "firefish-js";
 import Logger from "@/services/logger.js";
 import { inspect } from "node:util";
 import { toRustObject } from "@/prelude/undefined-to-null.js";

packages/backend/src/services/push-notification.ts

@@ -1,115 +0,0 @@
-import push from "web-push";
-import { config } from "@/config.js";
-import { SwSubscriptions } from "@/models/index.js";
-import { fetchMeta, getNoteSummary } from "backend-rs";
-import type { Packed } from "@/misc/schema.js";
-
-// Defined also packages/sw/types.ts#L14-L21
-type pushNotificationsTypes = {
-	notification: Packed<"Notification">;
-	unreadMessagingMessage: Packed<"MessagingMessage">;
-	readNotifications: { notificationIds: string[] };
-	readAllNotifications: undefined;
-	readAllMessagingMessages: undefined;
-	readAllMessagingMessagesOfARoom: { userId: string } | { groupId: string };
-};
-
-// プッシュメッセージサーバーには文字数制限があるため、内容を削減します
-function truncateNotification(notification: Packed<"Notification">): any {
-	if (notification.note != null) {
-		return {
-			...notification,
-			note: {
-				...notification.note,
-				// replace the text with summary
-				text: getNoteSummary(
-					notification.type === "renote" && notification.note.renote != null
-						? notification.note.renote
-						: notification.note,
-				),
-
-				cw: undefined,
-				reply: undefined,
-				renote: undefined,
-				user: undefined as any, // 通知を受け取ったユーザーである場合が多いのでこれも捨てる
-			},
-		};
-	}
-
-	return notification;
-}
-
-export async function pushNotification<T extends keyof pushNotificationsTypes>(
-	userId: string,
-	type: T,
-	body: pushNotificationsTypes[T],
-) {
-	const meta = await fetchMeta(true);
-
-	if (
-		!meta.enableServiceWorker ||
-		meta.swPublicKey == null ||
-		meta.swPrivateKey == null
-	)
-		return;
-
-	// アプリケーションの連絡先と、サーバーサイドの鍵ペアの情報を登録
-	push.setVapidDetails(config.url, meta.swPublicKey, meta.swPrivateKey);
-
-	// Fetch
-	const subscriptions = await SwSubscriptions.findBy({
-		userId: userId,
-	});
-
-	for (const subscription of subscriptions) {
-		if (
-			[
-				"readNotifications",
-				"readAllNotifications",
-				"readAllMessagingMessages",
-				"readAllMessagingMessagesOfARoom",
-			].includes(type) &&
-			!subscription.sendReadMessage
-		)
-			continue;
-
-		const pushSubscription = {
-			endpoint: subscription.endpoint,
-			keys: {
-				auth: subscription.auth,
-				p256dh: subscription.publickey,
-			},
-		};
-
-		push
-			.sendNotification(
-				pushSubscription,
-				JSON.stringify({
-					type,
-					body:
-						type === "notification"
-							? truncateNotification(body as Packed<"Notification">)
-							: body,
-					userId,
-					dateTime: Date.now(),
-				}),
-				{
-					proxy: config.proxy,
-				},
-			)
-			.catch((err: any) => {
-				//swLogger.info(err.statusCode);
-				//swLogger.info(err.headers);
-				//swLogger.info(err.body);
-
-				if (err.statusCode === 410) {
-					SwSubscriptions.delete({
-						userId: userId,
-						endpoint: subscription.endpoint,
-						auth: subscription.auth,
-						publickey: subscription.publickey,
-					});
-				}
-			});
-	}
-}

packages/backend/src/services/register-or-fetch-instance-doc.ts

@@ -3,8 +3,7 @@ import {
 	MAX_LENGTH_INSTANCE,
 } from "@/models/entities/instance.js";
 import { Instances } from "@/models/index.js";
-import { genId } from "backend-rs";
-import { toPuny } from "backend-rs";
+import { genId, toPuny } from "backend-rs";
 import { Cache } from "@/misc/cache.js";
 import Logger from "@/services/logger.js";
 

packages/client/package.json

@@ -12,54 +12,54 @@
 		"format": "pnpm biome format * --write"
 	},
 	"devDependencies": {
-		"@eslint-sets/eslint-config-vue3": "^5.12.0",
-		"@eslint-sets/eslint-config-vue3-ts": "^3.3.0",
-		"@phosphor-icons/web": "^2.1.1",
+		"@eslint-sets/eslint-config-vue3": "5.13.0",
+		"@eslint-sets/eslint-config-vue3-ts": "3.3.0",
+		"@phosphor-icons/web": "2.1.1",
 		"@rollup/plugin-alias": "5.1.0",
 		"@rollup/plugin-json": "6.1.0",
-		"@rollup/pluginutils": "^5.1.0",
+		"@rollup/pluginutils": "5.1.0",
 		"@syuilo/aiscript": "0.17.0",
-		"@types/autosize": "^4.0.3",
+		"@misskey-dev/browser-image-resizer": "2024.1.0",
+		"@types/autosize": "4.0.3",
 		"@types/glob": "8.1.0",
-		"@types/insert-text-at-cursor": "^0.3.2",
+		"@types/insert-text-at-cursor": "0.3.2",
 		"@types/katex": "0.16.7",
 		"@types/matter-js": "0.19.6",
-		"@types/prismjs": "^1.26.3",
+		"@types/prismjs": "1.26.4",
 		"@types/punycode": "2.1.4",
 		"@types/qrcode": "1.5.5",
 		"@types/seedrandom": "3.0.8",
-		"@types/textarea-caret": "^3.0.3",
+		"@types/textarea-caret": "3.0.3",
 		"@types/throttle-debounce": "5.0.2",
 		"@types/tinycolor2": "1.4.6",
 		"@types/uuid": "9.0.8",
 		"@vitejs/plugin-vue": "5.0.4",
-		"@vue/runtime-core": "3.4.25",
+		"@vue/runtime-core": "3.4.27",
 		"autobind-decorator": "2.4.0",
 		"autosize": "6.0.1",
 		"broadcast-channel": "7.0.0",
-		"browser-image-resizer": "github:misskey-dev/browser-image-resizer",
 		"chart.js": "4.4.2",
 		"chartjs-adapter-date-fns": "3.0.0",
-		"chartjs-chart-matrix": "^2.0.1",
+		"chartjs-chart-matrix": "2.0.1",
 		"chartjs-plugin-gradient": "0.6.1",
 		"chartjs-plugin-zoom": "2.0.1",
-		"city-timezones": "^1.2.1",
+		"city-timezones": "1.2.1",
 		"compare-versions": "6.1.0",
-		"cropperjs": "2.0.0-beta.4",
+		"cropperjs": "2.0.0-beta.5",
 		"date-fns": "3.6.0",
-		"emojilib": "^3.0.12",
-		"eslint-plugin-file-progress": "^1.3.0",
+		"emojilib": "3.0.12",
+		"eslint-plugin-file-progress": "1.4.0",
 		"eventemitter3": "5.0.1",
-		"fast-blurhash": "^1.1.2",
+		"fast-blurhash": "1.1.2",
 		"firefish-js": "workspace:*",
-		"focus-trap": "^7.5.4",
-		"focus-trap-vue": "^4.0.3",
-		"gsap": "^3.12.5",
+		"focus-trap": "7.5.4",
+		"focus-trap-vue": "4.0.3",
+		"gsap": "3.12.5",
 		"idb-keyval": "6.2.1",
 		"insert-text-at-cursor": "0.3.0",
 		"json5": "2.2.3",
 		"katex": "0.16.10",
-		"long": "^5.2.3",
+		"long": "5.2.3",
 		"libopenmpt-wasm": "github:TheEssem/libopenmpt-packaging#build",
 		"matter-js": "0.19.0",
 		"mfm-js": "0.24.0",
@@ -69,28 +69,27 @@
 		"prismjs": "1.29.0",
 		"punycode": "2.3.1",
 		"qrcode": "1.5.3",
-		"qrcode-vue3": "^1.6.8",
-		"rollup": "4.16.4",
+		"qrcode-vue3": "1.6.8",
+		"rollup": "4.17.2",
 		"s-age": "1.1.2",
-		"sass": "1.75.0",
+		"sass": "1.77.1",
 		"seedrandom": "3.0.5",
 		"stringz": "2.1.0",
-		"swiper": "11.1.1",
+		"swiper": "11.1.3",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",
-		"three": "0.164.1",
 		"throttle-debounce": "5.0.0",
 		"tinycolor2": "1.6.0",
-		"tinyld": "^1.3.4",
+		"tinyld": "1.3.4",
 		"typescript": "5.4.5",
-		"unicode-emoji-json": "^0.6.0",
+		"unicode-emoji-json": "0.6.0",
 		"uuid": "9.0.1",
-		"vite": "5.2.10",
-		"vite-plugin-compression": "^0.5.1",
-		"vue": "3.4.25",
-		"vue-draggable-plus": "^0.4.0",
-		"vue-plyr": "^7.0.0",
+		"vite": "5.2.11",
+		"vite-plugin-compression": "0.5.1",
+		"vue": "3.4.27",
+		"vue-draggable-plus": "0.4.1",
+		"vue-plyr": "7.0.0",
 		"vue-prism-editor": "2.0.0-alpha.2",
-		"vue-tsc": "2.0.14"
+		"vue-tsc": "2.0.18"
 	}
 }

packages/client/src/account.ts

@@ -7,6 +7,7 @@ import { alert, api, popup, popupMenu, waiting } from "@/os";
 import icon from "@/scripts/icon";
 import { del, get, set } from "@/scripts/idb-proxy";
 import { reloadChannel, unisonReload } from "@/scripts/unison-reload";
+import type { MenuButton, MenuUser } from "./types/menu";
 
 // TODO: 他のタブと永続化されたstateを同期
 
@@ -16,7 +17,7 @@ export async function signOut() {
 	waiting();
 	localStorage.removeItem("account");
 
-	await removeAccount(me.id);
+	await removeAccount(me!.id);
 
 	const accounts = await getAccounts();
 
@@ -26,12 +27,9 @@ export async function signOut() {
 			const registration = await navigator.serviceWorker.ready;
 			const push = await registration.pushManager.getSubscription();
 			if (push) {
-				await fetch(`${apiUrl}/sw/unregister`, {
-					method: "POST",
-					body: JSON.stringify({
-						i: me.token,
-						endpoint: push.endpoint,
-					}),
+				await api("sw/unregister", {
+					endpoint: push.endpoint,
+					i: me!.token, // FIXME: This parameter seems to be removable but I didn't test it
 				});
 			}
 		}
@@ -117,13 +115,13 @@ function showSuspendedDialog() {
 
 export function updateAccount(accountData) {
 	for (const [key, value] of Object.entries(accountData)) {
-		me[key] = value;
+		me![key] = value;
 	}
 	localStorage.setItem("account", JSON.stringify(me));
 }
 
 export async function refreshAccount() {
-	const accountData = await fetchAccount(me.token);
+	const accountData = await fetchAccount(me!.token);
 	return updateAccount(accountData);
 }
 
@@ -189,7 +187,7 @@ export async function openAccountMenu(
 
 	async function switchAccount(account: entities.UserDetailed) {
 		const storedAccounts = await getAccounts();
-		const token = storedAccounts.find((x) => x.id === account.id).token;
+		const token = storedAccounts.find((x) => x.id === account.id)!.token;
 		switchAccountWithToken(token);
 	}
 
@@ -198,15 +196,15 @@ export async function openAccountMenu(
 	}
 
 	const storedAccounts = await getAccounts().then((accounts) =>
-		accounts.filter((x) => x.id !== me.id),
+		accounts.filter((x) => x.id !== me!.id),
 	);
 	const accountsPromise = api("users/show", {
 		userIds: storedAccounts.map((x) => x.id),
 	});
 
-	function createItem(account: entities.UserDetailed) {
+	function createItem(account: entities.UserDetailed): MenuUser {
 		return {
-			type: "user",
+			type: "user" as const,
 			user: account,
 			active: opts.active != null ? opts.active === account.id : false,
 			action: () => {
@@ -221,10 +219,14 @@ export async function openAccountMenu(
 
 	const accountItemPromises = storedAccounts.map(
 		(a) =>
-			new Promise((res) => {
+			new Promise<MenuUser>((res) => {
 				accountsPromise.then((accounts) => {
 					const account = accounts.find((x) => x.id === a.id);
-					if (account == null) return res(null);
+					if (account == null) {
+						// The user is deleted, remove it
+						removeAccount(a.id);
+						return res(null as unknown as MenuUser);
+					}
 					res(createItem(account));
 				});
 			}),
@@ -233,74 +235,72 @@ export async function openAccountMenu(
 	if (opts.withExtraOperation) {
 		popupMenu(
 			[
-				...[
-					...(isMobile ?? false
-						? [
-								{
-									type: "parent",
-									icon: `${icon("ph-plus")}`,
-									text: i18n.ts.addAccount,
-									children: [
-										{
-											text: i18n.ts.existingAccount,
-											action: () => {
-												showSigninDialog();
-											},
+				...(isMobile ?? false
+					? [
+							{
+								type: "parent" as const,
+								icon: `${icon("ph-plus")}`,
+								text: i18n.ts.addAccount,
+								children: [
+									{
+										text: i18n.ts.existingAccount,
+										action: () => {
+											showSigninDialog();
 										},
-										{
-											text: i18n.ts.createAccount,
-											action: () => {
-												createAccount();
-											},
+									},
+									{
+										text: i18n.ts.createAccount,
+										action: () => {
+											createAccount();
 										},
-									],
-								},
-							]
-						: [
-								{
-									type: "link",
-									text: i18n.ts.profile,
-									to: `/@${me.username}`,
-									avatar: me,
-								},
-								null,
-							]),
-					...(opts.includeCurrentAccount ? [createItem(me)] : []),
-					...accountItemPromises,
-					...(isMobile ?? false
-						? [
-								null,
-								{
-									type: "link",
-									text: i18n.ts.profile,
-									to: `/@${me.username}`,
-									avatar: me,
-								},
-							]
-						: [
-								{
-									type: "parent",
-									icon: `${icon("ph-plus")}`,
-									text: i18n.ts.addAccount,
-									children: [
-										{
-											text: i18n.ts.existingAccount,
-											action: () => {
-												showSigninDialog();
-											},
+									},
+								],
+							},
+						]
+					: [
+							{
+								type: "link" as const,
+								text: i18n.ts.profile,
+								to: `/@${me!.username}`,
+								avatar: me!,
+							},
+							null,
+						]),
+				...(opts.includeCurrentAccount ? [createItem(me!)] : []),
+				...accountItemPromises,
+				...(isMobile ?? false
+					? [
+							null,
+							{
+								type: "link" as const,
+								text: i18n.ts.profile,
+								to: `/@${me!.username}`,
+								avatar: me!,
+							},
+						]
+					: [
+							{
+								type: "parent" as const,
+								icon: `${icon("ph-plus")}`,
+								text: i18n.ts.addAccount,
+								children: [
+									{
+										text: i18n.ts.existingAccount,
+										action: () => {
+											showSigninDialog();
 										},
-										{
-											text: i18n.ts.createAccount,
-											action: () => {
-												createAccount();
-											},
+									},
+									{
+										text: i18n.ts.createAccount,
+										action: () => {
+											createAccount();
 										},
-									],
-								},
-							]),
-				],
+									},
+								],
+							},
+						]),
 			],
-			ev.currentTarget ?? ev.target,
+			(ev.currentTarget ?? ev.target) as HTMLElement,
 			{
 				align: "left",
 			},
@@ -308,10 +308,10 @@ export async function openAccountMenu(
 	} else {
 		popupMenu(
 			[
-				...(opts.includeCurrentAccount ? [createItem(me)] : []),
+				...(opts.includeCurrentAccount ? [createItem(me!)] : []),
 				...accountItemPromises,
 			],
-			ev.currentTarget ?? ev.target,
+			(ev.currentTarget ?? ev.target) as HTMLElement,
 			{
 				align: "left",
 			},

packages/client/src/cold-store.ts

@@ -0,0 +1,121 @@
+import { ref as vueRef } from "vue";
+import type { UnwrapRef } from "vue";
+
+// TODO: 他のタブと永続化されたstateを同期
+
+const PREFIX = "miux:";
+
+interface Plugin {
+	id: string;
+	name: string;
+	active: boolean;
+	configData: Record<string, unknown>;
+	token: string;
+	ast: unknown[];
+}
+
+import darkTheme from "@/themes/d-rosepine.json5";
+/**
+ * Storage for configuration information that does not need to be constantly loaded into memory (non-reactive)
+ */
+import lightTheme from "@/themes/l-rosepinedawn.json5";
+
+const ColdStoreDefault = {
+	lightTheme,
+	darkTheme,
+	syncDeviceDarkMode: true,
+	plugins: [] as Plugin[],
+	mediaVolume: 0.5,
+	vibrate: false,
+	sound_masterVolume: 0.3,
+	sound_note: { type: "none", volume: 0 },
+	sound_noteMy: { type: "syuilo/up", volume: 1 },
+	sound_notification: { type: "syuilo/pope2", volume: 1 },
+	sound_chat: { type: "syuilo/pope1", volume: 1 },
+	sound_chatBg: { type: "syuilo/waon", volume: 1 },
+	sound_antenna: { type: "syuilo/triple", volume: 1 },
+	sound_channel: { type: "syuilo/square-pico", volume: 1 },
+};
+
+const watchers: {
+	key: string;
+	callback: (value) => void;
+}[] = [];
+
+function get<T extends keyof typeof ColdStoreDefault>(
+	key: T,
+): (typeof ColdStoreDefault)[T] {
+	// TODO: indexedDBにする
+	//       ただしその際はnullチェックではなくキー存在チェックにしないとダメ
+	//       (indexedDBはnullを保存できるため、ユーザーが意図してnullを格納した可能性がある)
+	const value = localStorage.getItem(PREFIX + key);
+	if (value == null) {
+		return ColdStoreDefault[key];
+	} else {
+		return JSON.parse(value);
+	}
+}
+
+function set<T extends keyof typeof ColdStoreDefault>(
+	key: T,
+	value: (typeof ColdStoreDefault)[T],
+): void {
+	// 呼び出し側のバグ等で undefined が来ることがある
+	// undefined を文字列として localStorage に入れると参照する際の JSON.parse でコケて不具合の元になるため無視
+	if (value === undefined) {
+		console.error(`attempt to store undefined value for key '${key}'`);
+		return;
+	}
+
+	localStorage.setItem(PREFIX + key, JSON.stringify(value));
+
+	for (const watcher of watchers) {
+		if (watcher.key === key) watcher.callback(value);
+	}
+}
+
+function watch<T extends keyof typeof ColdStoreDefault>(
+	key: T,
+	callback: (value: (typeof ColdStoreDefault)[T]) => void,
+) {
+	watchers.push({ key, callback });
+}
+
+// TODO: VueのcustomRef使うと良い感じになるかも
+function ref<T extends keyof typeof ColdStoreDefault>(key: T) {
+	const v = get(key);
+	const r = vueRef(v);
+	// TODO: このままではwatcherがリークするので開放する方法を考える
+	watch(key, (v) => {
+		r.value = v as UnwrapRef<typeof v>;
+	});
+	return r;
+}
+
+/**
+ * 特定のキーの、簡易的なgetter/setterを作ります
+ * 主にvue場で設定コントロールのmodelとして使う用
+ */
+function makeGetterSetter<K extends keyof typeof ColdStoreDefault>(key: K) {
+	// TODO: VueのcustomRef使うと良い感じになるかも
+	const valueRef = ref(key);
+	return {
+		get: () => {
+			return valueRef.value;
+		},
+		set: (value: (typeof ColdStoreDefault)[K]) => {
+			const val = value;
+			set(key, val);
+		},
+	};
+}
+
+export default {
+	default: ColdStoreDefault,
+	watchers,
+	get,
+	set,
+	watch,
+	ref,
+	makeGetterSetter,
+};

packages/client/src/components/MkAnnouncement.vue

@@ -1,5 +1,5 @@
 <template>
-	<MkModal ref="modal" :z-priority="'middle'" @closed="$emit('closed')">
+	<MkModal ref="modal" :z-priority="'middle'" @closed="emit('closed')">
 		<div :class="$style.root">
 			<div :class="$style.title">
 				<MkSparkle v-if="isGoodNews">{{ title }}</MkSparkle>
@@ -41,6 +41,10 @@ const props = defineProps<{
 	announcement: entities.Announcement;
 }>();
 
+const emit = defineEmits<{
+	closed: [];
+}>();
+
 const { id, text, title, imageUrl, isGoodNews } = props.announcement;
 
 const modal = shallowRef<InstanceType<typeof MkModal>>();

packages/client/src/components/MkAutocomplete.vue

@@ -182,7 +182,7 @@ export default {
 const props = defineProps<{
 	type: string;
 	q: string | null;
-	textarea: HTMLTextAreaElement;
+	textarea: HTMLTextAreaElement | HTMLInputElement;
 	close: () => void;
 	x: number;
 	y: number;
@@ -435,7 +435,7 @@ onUpdated(() => {
 onMounted(() => {
 	setPosition();
 
-	props.textarea.addEventListener("keydown", onKeydown);
+	(props.textarea as HTMLTextAreaElement).addEventListener("keydown", onKeydown);
 	document.body.addEventListener("mousedown", onMousedown);
 
 	nextTick(() => {
@@ -453,7 +453,7 @@ onMounted(() => {
 });
 
 onBeforeUnmount(() => {
-	props.textarea.removeEventListener("keydown", onKeydown);
+	(props.textarea as HTMLTextAreaElement).removeEventListener("keydown", onKeydown);
 	document.body.removeEventListener("mousedown", onMousedown);
 });
 </script>

packages/client/src/components/MkManyAnnouncements.vue

@@ -1,5 +1,5 @@
 <template>
-	<MkModal ref="modal" :z-priority="'middle'" @closed="$emit('closed')">
+	<MkModal ref="modal" :z-priority="'middle'" @closed="emit('closed')">
 		<div :class="$style.root">
 			<p :class="$style.title">
 				{{ i18n.ts.youHaveUnreadAnnouncements }}
@@ -21,6 +21,10 @@ import MkModal from "@/components/MkModal.vue";
 import MkButton from "@/components/MkButton.vue";
 import { i18n } from "@/i18n";
 
+const emit = defineEmits<{
+	closed: [];
+}>();
+
 const modal = shallowRef<InstanceType<typeof MkModal>>();
 const checkAnnouncements = () => {
 	modal.value!.close();

packages/client/src/components/MkMediaList.vue

@@ -40,7 +40,7 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref } from "vue";
+import { computed, onMounted, ref } from "vue";
 import type { entities } from "firefish-js";
 import PhotoSwipeLightbox from "photoswipe/lightbox";
 import PhotoSwipe from "photoswipe";
@@ -207,9 +207,9 @@ const isModule = (file: entities.DriveFile): boolean => {
 	);
 };
 
-const previewableCount = props.mediaList.filter((media) =>
-	previewable(media),
-).length;
+const previewableCount = computed(
+	() => props.mediaList.filter((media) => previewable(media)).length,
+);
 </script>
 
 <style lang="scss" scoped>

packages/client/src/components/MkNote.vue

@@ -1,7 +1,7 @@
 <template>
 	<div
 		v-if="!muted.muted"
-		v-show="!isDeleted"
+		v-show="!isDeleted && renotes?.length !== 0"
 		:id="appearNote.historyId || appearNote.id"
 		ref="el"
 		v-hotkey="keymap"
@@ -10,13 +10,20 @@
 		:aria-label="accessibleLabel"
 		class="tkcbzcuz note-container"
 		:tabindex="!isDeleted ? '-1' : undefined"
-		:class="{ renote: isRenote }"
+		:class="{ renote: isRenote || (renotesSliced && renotesSliced.length > 0) }"
 	>
 		<MkNoteSub
-			v-if="appearNote.reply && !detailedView && !collapsedReply"
+			v-if="appearNote.reply && !detailedView && !collapsedReply && !parents"
 			:note="appearNote.reply"
 			class="reply-to"
 		/>
+		<MkNoteSub
+			v-for="n of parents"
+			v-else-if="!detailedView && !collapsedReply && parents"
+			:key="n.id"
+			:note="n"
+			class="reply-to"
+		/>
 		<div
 			v-if="!detailedView"
 			class="note-context"
@@ -86,6 +93,75 @@
 					:custom-emojis="note.emojis"
 				/>
 			</div>
+			<div v-if="isRenote || (renotesSliced && renotesSliced.length > 0)" class="renote">
+				<i :class="icon('ph-rocket-launch')"></i>
+				<I18n
+					v-if="renotesSliced == null"
+					:src="i18n.ts.renotedBy"
+					tag="span"
+				>
+					<template #user>
+						<MkAvatar class="avatar" :user="note.user" />
+						<MkA
+							v-user-preview="note.userId"
+							class="name"
+							:to="userPage(note.user)"
+							@click.stop
+						>
+							<MkUserName :user="note.user" />
+						</MkA>
+					</template>
+				</I18n>
+				<I18n
+					v-else
+					:src="i18n.ts.renotedBy"
+					tag="span"
+				>
+					<template #user>
+						<template
+							v-for="(renote, index) in renotesSliced"
+						>
+							<MkAvatar
+								class="avatar"
+								:user="renote.user"
+							/>
+							<MkA
+								v-user-preview="renote.userId"
+								class="name"
+								:to="userPage(renote.user)"
+								@click.stop
+							>
+								<MkUserName :user="renote.user" />
+							</MkA>
+							{{
+								index !== renotesSliced.length - 1
+									? ", "
+									: renotesSliced.length < renotes!.length
+										? "..."
+										: ""
+							}}
+						</template>
+					</template>
+				</I18n>
+				<div class="info">
+					<button
+						ref="renoteTime"
+						class="_button time"
+						@click.stop="showRenoteMenu()"
+					>
+						<i
+							v-if="isMyNote"
+							:class="icon('ph-dots-three-outline dropdownIcon')"
+						></i>
+						<MkTime 
+							v-if="(renotesSliced && renotesSliced.length > 0)"
+							:time="renotesSliced[0].createdAt"
+						/>
+						<MkTime v-else :time="note.createdAt" />
+					</button>
+					<MkVisibility :note="note" />
+				</div>
+			</div>
 		</div>
 		<article
 			class="article"
@@ -287,7 +363,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, onMounted, ref } from "vue";
+import { computed, inject, onMounted, ref, watch } from "vue";
 import type { Ref } from "vue";
 import type { entities } from "firefish-js";
 import MkSubNoteContent from "./MkSubNoteContent.vue";
@@ -318,17 +394,13 @@ import { notePage } from "@/filters/note";
 import { deepClone } from "@/scripts/clone";
 import { getNoteSummary } from "@/scripts/get-note-summary";
 import icon from "@/scripts/icon";
-import type { NoteTranslation } from "@/types/note";
-
-const router = useRouter();
-
-type NoteType = entities.Note & {
-	_featuredId_?: string;
-	_prId_?: string;
-};
+import type { NoteTranslation, NoteType } from "@/types/note";
+import { isDeleted as _isDeleted, isRenote as _isRenote } from "@/scripts/note";
 
 const props = defineProps<{
 	note: NoteType;
+	parents?: NoteType[];
+	renotes?: entities.Note[];
 	pinned?: boolean;
 	detailedView?: boolean;
 	collapsedReply?: boolean;
@@ -337,37 +409,20 @@ const props = defineProps<{
 	isLongJudger?: (note: entities.Note) => boolean;
 }>();
 
+// #region Constants
+const router = useRouter();
 const inChannel = inject("inChannel", null);
-
-const note = ref(deepClone(props.note));
-
-const softMuteReasonI18nSrc = (what?: string) => {
-	if (what === "note") return i18n.ts.userSaysSomethingReason;
-	if (what === "reply") return i18n.ts.userSaysSomethingReasonReply;
-	if (what === "renote") return i18n.ts.userSaysSomethingReasonRenote;
-	if (what === "quote") return i18n.ts.userSaysSomethingReasonQuote;
-
-	// I don't think here is reachable, but just in case
-	return i18n.ts.userSaysSomething;
+const keymap = {
+	r: () => reply(true),
+	"e|a|plus": () => react(true),
+	q: () => renoteButton.value!.renote(true),
+	"up|k": focusBefore,
+	"down|j": focusAfter,
+	esc: blur,
+	"m|o": () => menu(true),
+	// FIXME: What's this?
+	// s: () => showContent.value !== showContent.value,
 };
-
-// plugin
-if (noteViewInterruptors.length > 0) {
-	onMounted(async () => {
-		let result = deepClone(note.value);
-		for (const interruptor of noteViewInterruptors) {
-			result = await interruptor.handler(result);
-		}
-		note.value = result;
-	});
-}
-
-const isRenote =
-	note.value.renote != null &&
-	note.value.text == null &&
-	note.value.fileIds.length === 0 &&
-	note.value.poll == null;
-
 const el = ref<HTMLElement | null>(null);
 const footerEl = ref<HTMLElement>();
 const menuButton = ref<HTMLElement>();
@@ -375,42 +430,179 @@ const starButton = ref<InstanceType<typeof XStarButton>>();
 const renoteButton = ref<InstanceType<typeof XRenoteButton> | null>(null);
 const renoteTime = ref<HTMLElement>();
 const reactButton = ref<HTMLElement | null>(null);
-const appearNote = computed(() =>
-	isRenote ? (note.value.renote as NoteType) : note.value,
-);
-const isMyRenote = isSignedIn(me) && me.id === note.value.userId;
-// const showContent = ref(false);
-const isDeleted = ref(false);
-const muted = ref(
-	getWordSoftMute(
-		note.value,
-		me?.id,
-		defaultStore.state.mutedWords,
-		defaultStore.state.mutedLangs,
-	),
-);
-const translation = ref<NoteTranslation | null>(null);
-const translating = ref(false);
-const enableEmojiReactions = defaultStore.state.enableEmojiReactions;
-const expandOnNoteClick = defaultStore.state.expandOnNoteClick;
+const enableEmojiReactions = defaultStore.reactiveState.enableEmojiReactions;
+const expandOnNoteClick = defaultStore.reactiveState.expandOnNoteClick;
 const lang = localStorage.getItem("lang");
 const translateLang = localStorage.getItem("translateLang");
 const targetLang = (translateLang || lang || navigator.language)?.slice(0, 2);
+const currentClipPage = inject<Ref<entities.Clip> | null>(
+	"currentClipPage",
+	null,
+);
+// #endregion
 
-const isForeignLanguage: boolean =
-	defaultStore.state.detectPostLanguage &&
-	appearNote.value.text != null &&
-	(() => {
-		const postLang = detectLanguage(appearNote.value.text);
-		return postLang !== "" && postLang !== targetLang;
-	})();
+// #region Variables bound to Notes
+let capture: ReturnType<typeof useNoteCapture> | undefined;
+const note = ref(deepClone(props.note));
+const postIsExpanded = ref(false);
+const translation = ref<NoteTranslation | null>(null);
+const translating = ref(false);
+const isDeleted = ref(false);
+const renotes = ref(props.renotes?.filter((rn) => !_isDeleted(rn.id)));
+// #endregion
 
+// #region computed
+
+const renotesSliced = computed(() => renotes.value?.slice(0, 5));
+
+const isRenote = computed(() => _isRenote(note.value));
+const appearNote = computed(() =>
+	isRenote.value ? (note.value.renote as NoteType) : note.value,
+);
+const isMyNote = computed(
+	() => isSignedIn(me) && me.id === note.value.userId && props.renotes == null,
+);
+const muted = computed(() =>
+	getWordSoftMute(
+		note.value,
+		me?.id,
+		defaultStore.reactiveState.mutedWords.value,
+		defaultStore.reactiveState.mutedLangs.value,
+	),
+);
+const isForeignLanguage = computed(
+	() =>
+		defaultStore.state.detectPostLanguage &&
+		appearNote.value.text != null &&
+		(() => {
+			const postLang = detectLanguage(appearNote.value.text);
+			return postLang !== "" && postLang !== targetLang;
+		})(),
+);
 const reactionCount = computed(() =>
 	Object.values(appearNote.value.reactions).reduce(
 		(partialSum, val) => partialSum + val,
 		0,
 	),
 );
+const accessibleLabel = computed(() => {
+	let label = `${appearNote.value.user.username}; `;
+	if (appearNote.value.renote) {
+		label += `${i18n.ts.renoted} ${appearNote.value.renote.user.username}; `;
+		if (appearNote.value.renote.cw) {
+			label += `${i18n.ts.cw}: ${appearNote.value.renote.cw}; `;
+			if (postIsExpanded.value) {
+				label += `${appearNote.value.renote.text}; `;
+			}
+		} else {
+			label += `${appearNote.value.renote.text}; `;
+		}
+	} else {
+		if (appearNote.value.cw) {
+			label += `${i18n.ts.cw}: ${appearNote.value.cw}; `;
+			if (postIsExpanded.value) {
+				label += `${appearNote.value.text}; `;
+			}
+		} else {
+			label += `${appearNote.value.text}; `;
+		}
+	}
+	const date = new Date(appearNote.value.createdAt);
+	label += `${date.toLocaleTimeString()}`;
+	return label;
+});
+// #endregion
+
+async function pluginInit(newNote: NoteType) {
+	// plugin
+	if (noteViewInterruptors.length > 0) {
+		let result = deepClone(newNote);
+		for (const interruptor of noteViewInterruptors) {
+			result = await interruptor.handler(result);
+		}
+		note.value = result;
+	}
+}
+
+function recalculateRenotes() {
+	renotes.value = props.renotes?.filter((rn) => !_isDeleted(rn.id));
+}
+
+async function init(newNote: NoteType, first = false) {
+	if (!first) {
+		// plugin
+		if (noteViewInterruptors.length > 0) {
+			await pluginInit(newNote);
+		} else {
+			note.value = deepClone(newNote);
+		}
+	}
+
+	translation.value = null;
+	translating.value = false;
+	postIsExpanded.value = false;
+	isDeleted.value = _isDeleted(note.value.id);
+	if (appearNote.value.historyId == null) {
+		capture?.close();
+		capture = useNoteCapture({
+			rootEl: el,
+			note: appearNote,
+			isDeletedRef: isDeleted,
+		});
+		if (isRenote.value === true) {
+			useNoteCapture({
+				rootEl: el,
+				note,
+				isDeletedRef: isDeleted,
+			});
+		}
+		if (props.renotes) {
+			const renoteDeletedTrigger = ref(false);
+			for (const renote of props.renotes) {
+				useNoteCapture({
+					rootEl: el,
+					note: ref(renote),
+					isDeletedRef: renoteDeletedTrigger,
+				});
+			}
+			watch(renoteDeletedTrigger, recalculateRenotes);
+		}
+	}
+}
+
+init(props.note, true);
+
+onMounted(() => {
+	pluginInit(note.value);
+});
+
+watch(isDeleted, () => {
+	if (isDeleted.value === true) {
+		if (props.parents && props.parents.length > 0) {
+			let noteTakePlace: NoteType | null = null;
+			while (noteTakePlace == null || _isDeleted(noteTakePlace.id)) {
+				if (props.parents.length === 0) {
+					return;
+				}
+				noteTakePlace = props.parents[props.parents.length - 1];
+				props.parents.pop();
+			}
+			noteTakePlace.repliesCount -= 1;
+			init(noteTakePlace);
+			isDeleted.value = false;
+		}
+	}
+});
+
+watch(
+	() => props.note.id,
+	(o, n) => {
+		if (o !== n && _isDeleted(note.value.id) !== true) {
+			init(props.note);
+		}
+	},
+);
+watch(() => props.renotes?.length, recalculateRenotes);
 
 async function translate_(noteId: string, targetLang: string) {
 	return await os.api("notes/translate", {
@@ -439,24 +631,14 @@ async function translate() {
 	translating.value = false;
 }
 
-const keymap = {
-	r: () => reply(true),
-	"e|a|plus": () => react(true),
-	q: () => renoteButton.value!.renote(true),
-	"up|k": focusBefore,
-	"down|j": focusAfter,
-	esc: blur,
-	"m|o": () => menu(true),
-	// FIXME: What's this?
-	// s: () => showContent.value !== showContent.value,
-};
+function softMuteReasonI18nSrc(what?: string) {
+	if (what === "note") return i18n.ts.userSaysSomethingReason;
+	if (what === "reply") return i18n.ts.userSaysSomethingReasonReply;
+	if (what === "renote") return i18n.ts.userSaysSomethingReasonRenote;
+	if (what === "quote") return i18n.ts.userSaysSomethingReasonQuote;
 
-if (appearNote.value.historyId == null) {
-	useNoteCapture({
-		rootEl: el,
-		note: appearNote,
-		isDeletedRef: isDeleted,
-	});
+	// I don't think here is reachable, but just in case
+	return i18n.ts.userSaysSomething;
 }
 
 function reply(_viaKeyboard = false): void {
@@ -497,11 +679,6 @@ function undoReact(note: NoteType): void {
 	});
 }
 
-const currentClipPage = inject<Ref<entities.Clip> | null>(
-	"currentClipPage",
-	null,
-);
-
 function onContextmenu(ev: MouseEvent): void {
 	const isLink = (el: HTMLElement): boolean => {
 		if (el.tagName === "A") return true;
@@ -590,7 +767,7 @@ function menu(viaKeyboard = false): void {
 }
 
 function showRenoteMenu(viaKeyboard = false): void {
-	if (!isMyRenote) return;
+	if (!isMyNote.value) return;
 	os.popupMenu(
 		[
 			{
@@ -651,39 +828,10 @@ function readPromo() {
 	isDeleted.value = true;
 }
 
-const postIsExpanded = ref(false);
-
 function setPostExpanded(val: boolean) {
 	postIsExpanded.value = val;
 }
 
-const accessibleLabel = computed(() => {
-	let label = `${appearNote.value.user.username}; `;
-	if (appearNote.value.renote) {
-		label += `${i18n.ts.renoted} ${appearNote.value.renote.user.username}; `;
-		if (appearNote.value.renote.cw) {
-			label += `${i18n.ts.cw}: ${appearNote.value.renote.cw}; `;
-			if (postIsExpanded.value) {
-				label += `${appearNote.value.renote.text}; `;
-			}
-		} else {
-			label += `${appearNote.value.renote.text}; `;
-		}
-	} else {
-		if (appearNote.value.cw) {
-			label += `${i18n.ts.cw}: ${appearNote.value.cw}; `;
-			if (postIsExpanded.value) {
-				label += `${appearNote.value.text}; `;
-			}
-		} else {
-			label += `${appearNote.value.text}; `;
-		}
-	}
-	const date = new Date(appearNote.value.createdAt);
-	label += `${date.toLocaleTimeString()}`;
-	return label;
-});
-
 defineExpose({
 	focus,
 	blur,
@@ -757,6 +905,7 @@ defineExpose({
 		position: relative;
 		padding: 0 32px 0 32px;
 		display: flex;
+		flex-wrap: wrap;
 		z-index: 1;
 		&:first-child {
 			margin-top: 20px;
@@ -809,6 +958,16 @@ defineExpose({
 				margin-right: 4px;
 			}
 
+			.avatar {
+				width: 1.2em;
+				height: 1.2em;
+				border-radius: 2em;
+				overflow: hidden;
+				margin-right: 0.4em;
+				background: var(--panelHighlight);
+				transform: translateY(-4px);
+			}
+
 			> span {
 				overflow: hidden;
 				flex-shrink: 1;

packages/client/src/components/MkNoteHeader.vue

@@ -49,8 +49,6 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from "vue";
-
 import type { entities } from "firefish-js";
 import { defaultStore } from "@/store";
 import MkVisibility from "@/components/MkVisibility.vue";
@@ -67,18 +65,16 @@ const props = defineProps<{
 	canOpenServerInfo?: boolean;
 }>();
 
-const note = ref(props.note);
-
 const showTicker =
 	defaultStore.state.instanceTicker === "always" ||
-	(defaultStore.state.instanceTicker === "remote" && note.value.user.instance);
+	(defaultStore.state.instanceTicker === "remote" && props.note.user.instance);
 
 function openServerInfo() {
 	if (!props.canOpenServerInfo || !defaultStore.state.openServerInfo) return;
 	const instanceInfoUrl =
-		note.value.user.host == null
+		props.note.user.host == null
 			? "/about"
-			: `/instance-info/${note.value.user.host}`;
+			: `/instance-info/${props.note.user.host}`;
 	pageWindow(instanceInfoUrl);
 }
 </script>

packages/client/src/components/MkNoteSimple.vue

@@ -1,5 +1,10 @@
 <template>
-	<div v-size="{ min: [350, 500] }" class="yohlumlk">
+	<div
+		v-show="!deleted"
+		ref="el"
+		v-size="{ min: [350, 500] }"
+		class="yohlumlk"
+	>
 		<MkAvatar class="avatar" :user="note.user" />
 		<div class="main">
 			<XNoteHeader class="header" :note="note" :mini="true" />
@@ -12,13 +17,42 @@
 
 <script lang="ts" setup>
 import type { entities } from "firefish-js";
+import { computed, ref, watch } from "vue";
 import XNoteHeader from "@/components/MkNoteHeader.vue";
 import MkSubNoteContent from "@/components/MkSubNoteContent.vue";
+import { deepClone } from "@/scripts/clone";
+import { useNoteCapture } from "@/scripts/use-note-capture";
+import { isDeleted } from "@/scripts/note";
 
-defineProps<{
+const props = defineProps<{
 	note: entities.Note;
 	pinned?: boolean;
 }>();
+
+const rootEl = ref<HTMLElement | null>(null);
+const note = ref(deepClone(props.note));
+const deleted = computed(() => isDeleted(note.value.id));
+let capture = useNoteCapture({
+	note,
+	rootEl,
+});
+
+function reload() {
+	note.value = deepClone(props.note);
+	capture.close();
+	capture = useNoteCapture({
+		note,
+		rootEl,
+	});
+}
+
+watch(
+	() => props.note.id,
+	(o, n) => {
+		if (o === n) return;
+		reload();
+	},
+);
 </script>
 
 <style lang="scss" scoped>

packages/client/src/components/MkNotes.vue

@@ -3,6 +3,7 @@
 		ref="pagingComponent"
 		:pagination="pagination"
 		:disable-auto-load="disableAutoLoad"
+		:folder
 	>
 		<template #empty>
 			<div class="_fullinfo">
@@ -15,7 +16,7 @@
 			</div>
 		</template>
 
-		<template #default="{ items: notes }">
+		<template #default="{ foldedItems: notes }">
 			<div ref="tlEl" class="giivymft" :class="{ noGap }">
 				<XList
 					ref="notes"
@@ -28,6 +29,21 @@
 					class="notes"
 				>
 					<XNote
+						v-if="'folded' in note && note.folded === 'thread'"
+						:key="note.id"
+						class="qtqtichx"
+						:note="note.note"
+						:parents="note.parents"
+					/>
+					<XNote
+						v-else-if="'folded' in note && note.folded === 'renote'"
+						:key="note.key"
+						class="qtqtichx"
+						:note="note.note"
+						:renotes="note.renotesArr"
+					/>
+					<XNote
+						v-else
 						:key="note._featuredId_ || note._prId_ || note.id"
 						class="qtqtichx"
 						:note="note"
@@ -51,14 +67,21 @@ import XList from "@/components/MkDateSeparatedList.vue";
 import MkPagination from "@/components/MkPagination.vue";
 import { i18n } from "@/i18n";
 import { scroll } from "@/scripts/scroll";
+import type { NoteFolded, NoteThread, NoteType } from "@/types/note";
 
 const tlEl = ref<HTMLElement>();
 
-defineProps<{
-	pagination: PagingOf<entities.Note>;
-	noGap?: boolean;
-	disableAutoLoad?: boolean;
-}>();
+withDefaults(
+	defineProps<{
+		pagination: PagingOf<entities.Note>;
+		noGap?: boolean;
+		disableAutoLoad?: boolean;
+		folder?: (ns: entities.Note[]) => (NoteType | NoteThread | NoteFolded)[];
+	}>(),
+	{
+		folder: (ns: entities.Note[]) => ns,
+	},
+);
 
 const pagingComponent = ref<MkPaginationType<
 	PagingKeyOf<entities.Note>

packages/client/src/components/MkNotifications.vue

@@ -79,29 +79,35 @@ const stream = useStream();
 
 const pagingComponent = ref<MkPaginationType<"i/notifications"> | null>(null);
 
-const shouldFold = defaultStore.state.foldNotification;
+const shouldFold = defaultStore.reactiveState.foldNotification;
+
+const convertNotification = computed(() =>
+	shouldFold.value ? foldNotifications : (ns: entities.Notification[]) => ns,
+);
 
 const FETCH_LIMIT = 90;
 
-const pagination = Object.assign(
-	{
-		endpoint: "i/notifications" as const,
-		params: computed(() => ({
-			includeTypes: props.includeTypes ?? undefined,
-			excludeTypes: props.includeTypes
-				? undefined
-				: me?.mutingNotificationTypes,
-			unreadOnly: props.unreadOnly,
-		})),
-	},
-	shouldFold
-		? {
-				limit: 50,
-				secondFetchLimit: FETCH_LIMIT,
-			}
-		: {
-				limit: 30,
-			},
+const pagination = computed(() =>
+	Object.assign(
+		{
+			endpoint: "i/notifications" as const,
+			params: computed(() => ({
+				includeTypes: props.includeTypes ?? undefined,
+				excludeTypes: props.includeTypes
+					? undefined
+					: me?.mutingNotificationTypes,
+				unreadOnly: props.unreadOnly,
+			})),
+		},
+		shouldFold.value
+			? {
+					limit: 50,
+					secondFetchLimit: FETCH_LIMIT,
+				}
+			: {
+					limit: 30,
+				},
+	),
 );
 
 function isNoteNotification(
@@ -138,14 +144,6 @@ const onNotification = (notification: entities.Notification) => {
 
 let connection: StreamTypes.ChannelOf<"main"> | undefined;
 
-function convertNotification(ns: entities.Notification[]) {
-	if (shouldFold) {
-		return foldNotifications(ns);
-	} else {
-		return ns;
-	}
-}
-
 onMounted(() => {
 	connection = stream.useChannel("main");
 	connection.on("notification", onNotification);

packages/client/src/components/MkPagination.vue

@@ -365,9 +365,9 @@ async function fetch(firstFetching?: boolean) {
 						}
 
 						// biome-ignore lint/style/noParameterAssign: assign it intentially
-						res = res.filter((item) => {
-							if (idMap.has(item)) return false;
-							idMap.set(item, true);
+						res = res.filter((it) => {
+							if (idMap.has(it.id)) return false;
+							idMap.set(it.id, true);
 							return true;
 						});
 					}
@@ -435,8 +435,20 @@ const prepend = (...item: Item[]): void => {
 	}
 };
 
-const append = (...items: Item[]): void => {
-	appended.value.push(...items);
+const append = (...it: Item[]): void => {
+	// If there are too many appended, merge them into arrItems
+	if (
+		appended.value.length >
+		(props.pagination.secondFetchLimit || SECOND_FETCH_LIMIT_DEFAULT)
+	) {
+		for (const item of appended.value) {
+			idMap.set(item.id, true);
+		}
+		arrItems.value.push(appended.value);
+		appended.value = [];
+		// We don't need to calculate here because it won't cause any changes in items
+	}
+	appended.value.push(...it);
 	calculateItems();
 };
 
@@ -486,6 +498,8 @@ if (props.pagination.params && isRef<Param>(props.pagination.params)) {
 	watch(props.pagination.params, reload, { deep: true });
 }
 
+watch(() => props.folder, calculateItems);
+
 watch(
 	queue,
 	(a, b) => {

packages/client/src/components/MkPostForm.vue

@@ -852,13 +852,17 @@ function setLanguage() {
 		actions.push(null);
 	}
 
-	if (language.value != null)
+	if (language.value != null && langmap[language.value] != null) {
 		actions.push({
 			text: langmap[language.value].nativeName,
 			danger: false,
 			active: true,
 			action: () => {},
 		});
+	} else {
+		// Unrecognized language, set to null
+		language.value = null;
+	}
 
 	const langs = Object.keys(langmap);
 

packages/client/src/components/MkSignin.vue

@@ -160,7 +160,7 @@ const hCaptchaResponse = ref(null);
 const reCaptchaResponse = ref(null);
 
 const emit = defineEmits<{
-	(ev: "login", v: any): void;
+	login: [v: { id: string; i: string }];
 }>();
 
 const props = defineProps({

packages/client/src/components/MkSigninDialog.vue

@@ -30,7 +30,7 @@ withDefaults(
 );
 
 const emit = defineEmits<{
-	(ev: "done"): void;
+	(ev: "done", res: { id: string; i: string }): void;
 	(ev: "closed"): void;
 	(ev: "cancelled"): void;
 }>();
@@ -39,11 +39,11 @@ const dialog = ref<InstanceType<typeof XModalWindow>>();
 
 function onClose() {
 	emit("cancelled");
-	dialog.value.close();
+	dialog.value!.close();
 }
 
-function onLogin(res) {
+function onLogin(res: { id: string; i: string }) {
 	emit("done", res);
-	dialog.value.close();
+	dialog.value!.close();
 }
 </script>