From 41b32c55355209456469e27d913c057646e95216 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Wed, 15 May 2024 22:19:58 +0000
Subject: [PATCH] refactor (backend): port push notification sender to
backend-rs
---
Cargo.lock | 476 +++++++++++++++++-
Cargo.toml | 1 +
packages/backend-rs/Cargo.toml | 1 +
packages/backend-rs/index.d.ts | 9 +
packages/backend-rs/index.js | 4 +-
.../backend-rs/src/misc/get_note_summary.rs | 3 +
packages/backend-rs/src/service/mod.rs | 1 +
.../src/service/push_notification.rs | 232 +++++++++
packages/backend/package.json | 1 -
.../api/common/read-messaging-message.ts | 22 +-
.../server/api/common/read-notification.ts | 12 +-
.../notifications/mark-all-as-read.ts | 6 +-
.../src/services/create-notification.ts | 10 +-
.../backend/src/services/messages/create.ts | 15 +-
.../backend/src/services/push-notification.ts | 115 -----
pnpm-lock.yaml | 73 ---
16 files changed, 754 insertions(+), 227 deletions(-)
create mode 100644 packages/backend-rs/src/service/push_notification.rs
delete mode 100644 packages/backend/src/services/push-notification.ts
diff --git a/Cargo.lock b/Cargo.lock
index 9ddffb107b..1dd37e0913 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -243,6 +243,7 @@ dependencies = [
"tracing-subscriber",
"url",
"urlencoding",
+ "web-push",
]
[[package]]
@@ -260,6 +261,18 @@ dependencies = [
"rustc-demangle",
]
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
[[package]]
name = "base64"
version = "0.21.7"
@@ -308,6 +321,12 @@ dependencies = [
"num-traits",
]
+[[package]]
+name = "binstring"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e0d60973d9320722cb1206f412740e162a33b8547ea8d6be75d7cff237c7a85"
+
[[package]]
name = "bit_field"
version = "0.10.2"
@@ -521,6 +540,17 @@ dependencies = [
"inout",
]
+[[package]]
+name = "coarsetime"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13b3839cf01bb7960114be3ccf2340f541b6d0c81f8690b007b2b39f750f7e5d"
+dependencies = [
+ "libc",
+ "wasix",
+ "wasm-bindgen",
+]
+
[[package]]
name = "color_quant"
version = "1.1.0"
@@ -546,6 +576,12 @@ dependencies = [
"crossbeam-utils",
]
+[[package]]
+name = "const-oid"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d6f2aa4d0537bcc1c74df8755072bd31c1ef1a3a1b85a68e8404a8c353b7b8b"
+
[[package]]
name = "const-oid"
version = "0.9.6"
@@ -640,6 +676,18 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+[[package]]
+name = "crypto-bigint"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
+dependencies = [
+ "generic-array",
+ "rand_core",
+ "subtle",
+ "zeroize",
+]
+
[[package]]
name = "crypto-common"
version = "0.1.6"
@@ -650,6 +698,12 @@ dependencies = [
"typenum",
]
+[[package]]
+name = "ct-codecs"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df"
+
[[package]]
name = "ctor"
version = "0.2.8"
@@ -709,17 +763,50 @@ dependencies = [
"windows-sys 0.52.0",
]
+[[package]]
+name = "der"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79b71cca7d95d7681a4b3b9cdf63c8dbc3730d0584c2c74e31416d64a90493f4"
+dependencies = [
+ "const-oid 0.6.2",
+ "der_derive",
+]
+
+[[package]]
+name = "der"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
+dependencies = [
+ "const-oid 0.9.6",
+ "pem-rfc7468 0.6.0",
+ "zeroize",
+]
+
[[package]]
name = "der"
version = "0.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
dependencies = [
- "const-oid",
- "pem-rfc7468",
+ "const-oid 0.9.6",
+ "pem-rfc7468 0.7.0",
"zeroize",
]
+[[package]]
+name = "der_derive"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8aed3b3c608dc56cf36c45fe979d04eda51242e6703d8d0bb03426ef7c41db6a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "synstructure",
+]
+
[[package]]
name = "deranged"
version = "0.3.11"
@@ -754,7 +841,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [
"block-buffer",
- "const-oid",
+ "const-oid 0.9.6",
"crypto-common",
"subtle",
]
@@ -765,6 +852,48 @@ version = "0.15.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
+[[package]]
+name = "ecdsa"
+version = "0.16.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
+dependencies = [
+ "der 0.7.9",
+ "digest",
+ "elliptic-curve",
+ "rfc6979",
+ "signature 2.2.0",
+ "spki 0.7.3",
+]
+
+[[package]]
+name = "ece"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2ea1d2f2cc974957a4e2575d8e5bb494549bab66338d6320c2789abcfff5746"
+dependencies = [
+ "base64 0.21.7",
+ "byteorder",
+ "hex",
+ "hkdf",
+ "lazy_static",
+ "once_cell",
+ "openssl",
+ "serde",
+ "sha2",
+ "thiserror",
+]
+
+[[package]]
+name = "ed25519-compact"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190"
+dependencies = [
+ "ct-codecs",
+ "getrandom",
+]
+
[[package]]
name = "either"
version = "1.11.0"
@@ -774,6 +903,27 @@ dependencies = [
"serde",
]
+[[package]]
+name = "elliptic-curve"
+version = "0.13.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
+dependencies = [
+ "base16ct",
+ "crypto-bigint",
+ "digest",
+ "ff",
+ "generic-array",
+ "group",
+ "hkdf",
+ "pem-rfc7468 0.7.0",
+ "pkcs8 0.10.2",
+ "rand_core",
+ "sec1",
+ "subtle",
+ "zeroize",
+]
+
[[package]]
name = "emojis"
version = "0.6.2"
@@ -865,6 +1015,16 @@ dependencies = [
"simd-adler32",
]
+[[package]]
+name = "ff"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "rand_core",
+ "subtle",
+]
+
[[package]]
name = "finl_unicode"
version = "1.2.0"
@@ -1038,6 +1198,7 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
dependencies = [
"typenum",
"version_check",
+ "zeroize",
]
[[package]]
@@ -1047,8 +1208,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
dependencies = [
"cfg-if",
+ "js-sys",
"libc",
"wasi",
+ "wasm-bindgen",
]
[[package]]
@@ -1067,6 +1230,17 @@ version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff",
+ "rand_core",
+ "subtle",
+]
+
[[package]]
name = "half"
version = "2.4.1"
@@ -1150,6 +1324,30 @@ dependencies = [
"digest",
]
+[[package]]
+name = "hmac-sha1-compact"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9d405ec732fa3fcde87264e54a32a84956a377b3e3107de96e59b798c84a7"
+
+[[package]]
+name = "hmac-sha256"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3688e69b38018fec1557254f64c8dc2cc8ec502890182f395dbb0aa997aa5735"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "hmac-sha512"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4ce1f4656bae589a3fab938f9f09bf58645b7ed01a2c5f8a3c238e01a4ef78a"
+dependencies = [
+ "digest",
+]
+
[[package]]
name = "home"
version = "0.5.9"
@@ -1358,6 +1556,46 @@ dependencies = [
"wasm-bindgen",
]
+[[package]]
+name = "jwt-simple"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "357892bb32159d763abdea50733fadcb9a8e1c319a9aa77592db8555d05af83e"
+dependencies = [
+ "anyhow",
+ "binstring",
+ "coarsetime",
+ "ct-codecs",
+ "ed25519-compact",
+ "hmac-sha1-compact",
+ "hmac-sha256",
+ "hmac-sha512",
+ "k256",
+ "p256",
+ "p384",
+ "rand",
+ "rsa 0.7.2",
+ "serde",
+ "serde_json",
+ "spki 0.6.0",
+ "thiserror",
+ "zeroize",
+]
+
+[[package]]
+name = "k256"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b"
+dependencies = [
+ "cfg-if",
+ "ecdsa",
+ "elliptic-curve",
+ "once_cell",
+ "sha2",
+ "signature 2.2.0",
+]
+
[[package]]
name = "keccak"
version = "0.1.5"
@@ -1890,6 +2128,30 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+[[package]]
+name = "p256"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
+dependencies = [
+ "ecdsa",
+ "elliptic-curve",
+ "primeorder",
+ "sha2",
+]
+
+[[package]]
+name = "p384"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
+dependencies = [
+ "ecdsa",
+ "elliptic-curve",
+ "primeorder",
+ "sha2",
+]
+
[[package]]
name = "parking"
version = "2.2.0"
@@ -1936,6 +2198,35 @@ version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+[[package]]
+name = "pem"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb"
+dependencies = [
+ "base64 0.13.1",
+ "once_cell",
+ "regex",
+]
+
+[[package]]
+name = "pem"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
+dependencies = [
+ "base64 0.13.1",
+]
+
+[[package]]
+name = "pem-rfc7468"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac"
+dependencies = [
+ "base64ct",
+]
+
[[package]]
name = "pem-rfc7468"
version = "0.7.0"
@@ -2001,15 +2292,37 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+[[package]]
+name = "pkcs1"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eff33bdbdfc54cc98a2eca766ebdec3e1b8fb7387523d5c9c9a2891da856f719"
+dependencies = [
+ "der 0.6.1",
+ "pkcs8 0.9.0",
+ "spki 0.6.0",
+ "zeroize",
+]
+
[[package]]
name = "pkcs1"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
dependencies = [
- "der",
- "pkcs8",
- "spki",
+ "der 0.7.9",
+ "pkcs8 0.10.2",
+ "spki 0.7.3",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
+dependencies = [
+ "der 0.6.1",
+ "spki 0.6.0",
]
[[package]]
@@ -2018,8 +2331,8 @@ version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
dependencies = [
- "der",
- "spki",
+ "der 0.7.9",
+ "spki 0.7.3",
]
[[package]]
@@ -2079,6 +2392,15 @@ dependencies = [
"yansi",
]
+[[package]]
+name = "primeorder"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
+dependencies = [
+ "elliptic-curve",
+]
+
[[package]]
name = "proc-macro-crate"
version = "3.1.0"
@@ -2361,6 +2683,16 @@ dependencies = [
"bytecheck",
]
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac",
+ "subtle",
+]
+
[[package]]
name = "rgb"
version = "0.8.37"
@@ -2436,22 +2768,43 @@ dependencies = [
"serde",
]
+[[package]]
+name = "rsa"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "094052d5470cbcef561cb848a7209968c9f12dfa6d668f4bca048ac5de51099c"
+dependencies = [
+ "byteorder",
+ "digest",
+ "num-bigint-dig",
+ "num-integer",
+ "num-iter",
+ "num-traits",
+ "pkcs1 0.4.1",
+ "pkcs8 0.9.0",
+ "rand_core",
+ "signature 1.6.4",
+ "smallvec",
+ "subtle",
+ "zeroize",
+]
+
[[package]]
name = "rsa"
version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
dependencies = [
- "const-oid",
+ "const-oid 0.9.6",
"digest",
"num-bigint-dig",
"num-integer",
"num-traits",
- "pkcs1",
- "pkcs8",
+ "pkcs1 0.7.5",
+ "pkcs8 0.10.2",
"rand_core",
- "signature",
- "spki",
+ "signature 2.2.0",
+ "spki 0.7.3",
"subtle",
"zeroize",
]
@@ -2652,6 +3005,31 @@ version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
+[[package]]
+name = "sec1"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+dependencies = [
+ "base16ct",
+ "der 0.7.9",
+ "generic-array",
+ "pkcs8 0.10.2",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "sec1_decode"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6326ddc956378a0739200b2c30892dccaf198992dfd7323274690b9e188af23"
+dependencies = [
+ "der 0.4.5",
+ "pem 0.8.3",
+ "thiserror",
+]
+
[[package]]
name = "semver"
version = "1.0.23"
@@ -2767,6 +3145,16 @@ dependencies = [
"libc",
]
+[[package]]
+name = "signature"
+version = "1.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+dependencies = [
+ "digest",
+ "rand_core",
+]
+
[[package]]
name = "signature"
version = "2.2.0"
@@ -2855,6 +3243,16 @@ dependencies = [
"lock_api",
]
+[[package]]
+name = "spki"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
+dependencies = [
+ "base64ct",
+ "der 0.6.1",
+]
+
[[package]]
name = "spki"
version = "0.7.3"
@@ -2862,7 +3260,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
dependencies = [
"base64ct",
- "der",
+ "der 0.7.9",
]
[[package]]
@@ -3007,7 +3405,7 @@ dependencies = [
"once_cell",
"percent-encoding",
"rand",
- "rsa",
+ "rsa 0.9.6",
"rust_decimal",
"serde",
"sha1",
@@ -3177,6 +3575,18 @@ dependencies = [
"syn 2.0.63",
]
+[[package]]
+name = "synstructure"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "unicode-xid",
+]
+
[[package]]
name = "sysinfo"
version = "0.30.12"
@@ -3503,6 +3913,12 @@ version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+[[package]]
+name = "unicode-xid"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+
[[package]]
name = "unicode_categories"
version = "0.1.1"
@@ -3600,6 +4016,15 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
+[[package]]
+name = "wasix"
+version = "0.12.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1fbb4ef9bbca0c1170e0b00dd28abc9e3b68669821600cad1caaed606583c6d"
+dependencies = [
+ "wasi",
+]
+
[[package]]
name = "wasm-bindgen"
version = "0.2.92"
@@ -3654,6 +4079,27 @@ version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+[[package]]
+name = "web-push"
+version = "0.10.1"
+source = "git+https://github.com/pimeys/rust-web-push?rev=40febe4085e3cef9cdfd539c315e3e945aba0656#40febe4085e3cef9cdfd539c315e3e945aba0656"
+dependencies = [
+ "async-trait",
+ "base64 0.13.1",
+ "chrono",
+ "ece",
+ "futures-lite",
+ "http",
+ "isahc",
+ "jwt-simple",
+ "log",
+ "pem 1.1.1",
+ "sec1_decode",
+ "serde",
+ "serde_derive",
+ "serde_json",
+]
+
[[package]]
name = "webpki-roots"
version = "0.25.4"
diff --git a/Cargo.toml b/Cargo.toml
index 00e1f376c5..ef32f6dc69 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,6 +42,7 @@ 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
diff --git a/packages/backend-rs/Cargo.toml b/packages/backend-rs/Cargo.toml
index 52ae312872..0a307c1ef9 100644
--- a/packages/backend-rs/Cargo.toml
+++ b/packages/backend-rs/Cargo.toml
@@ -46,6 +46,7 @@ tracing = { workspace = true }
tracing-subscriber = { workspace = true }
url = { workspace = true }
urlencoding = { workspace = true }
+web-push = { workspace = true }
[dev-dependencies]
pretty_assertions = { workspace = true }
diff --git a/packages/backend-rs/index.d.ts b/packages/backend-rs/index.d.ts
index 4aab6a46b6..2199920310 100644
--- a/packages/backend-rs/index.d.ts
+++ b/packages/backend-rs/index.d.ts
@@ -1279,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',
diff --git a/packages/backend-rs/index.js b/packages/backend-rs/index.js
index b05fc34adb..36cd88dcbd 100644
--- a/packages/backend-rs/index.js
+++ b/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, 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, publishToChannelStream, ChatEvent, publishToChatStream, ChatIndexEvent, publishToChatIndexStream, publishToBroadcastStream, publishToGroupChatStream, publishToModerationStream, getTimestamp, genId, genIdAt, generateSecureRandomString, generateUserToken } = 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
@@ -378,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
diff --git a/packages/backend-rs/src/misc/get_note_summary.rs b/packages/backend-rs/src/misc/get_note_summary.rs
index 8ed092334e..3103e358af 100644
--- a/packages/backend-rs/src/misc/get_note_summary.rs
+++ b/packages/backend-rs/src/misc/get_note_summary.rs
@@ -1,4 +1,7 @@
+use serde::{Deserialize, Serialize};
+
// TODO: handle name collisions in a better way
+#[derive(Debug, Deserialize, Serialize)]
#[crate::export(object, js_name = "NoteLikeForGetNoteSummary")]
pub struct NoteLike {
pub file_ids: Vec<String>,
diff --git a/packages/backend-rs/src/service/mod.rs b/packages/backend-rs/src/service/mod.rs
index 9569a33b63..6de98f4674 100644
--- a/packages/backend-rs/src/service/mod.rs
+++ b/packages/backend-rs/src/service/mod.rs
@@ -1,3 +1,4 @@
pub mod nodeinfo;
pub mod note;
+pub mod push_notification;
pub mod stream;
diff --git a/packages/backend-rs/src/service/push_notification.rs b/packages/backend-rs/src/service/push_notification.rs
new file mode 100644
index 0000000000..c33567138e
--- /dev/null
+++ b/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(())
+}
diff --git a/packages/backend/package.json b/packages/backend/package.json
index c3751a79ff..c427084f05 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -117,7 +117,6 @@
"typeorm": "0.3.20",
"ulid": "2.3.0",
"uuid": "9.0.1",
- "web-push": "3.6.7",
"websocket": "1.0.35",
"xev": "3.0.2"
},
diff --git a/packages/backend/src/server/api/common/read-messaging-message.ts b/packages/backend/src/server/api/common/read-messaging-message.ts
index f322431608..2a1667f167 100644
--- a/packages/backend/src/server/api/common/read-messaging-message.ts
+++ b/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,
+ });
}
}
}
diff --git a/packages/backend/src/server/api/common/read-notification.ts b/packages/backend/src/server/api/common/read-notification.ts
index 1fb1d642fe..5237406df1 100644
--- a/packages/backend/src/server/api/common/read-notification.ts
+++ b/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,
+ });
}
diff --git a/packages/backend/src/server/api/endpoints/notifications/mark-all-as-read.ts b/packages/backend/src/server/api/endpoints/notifications/mark-all-as-read.ts
index 568036380a..ffb8d8c2c4 100644
--- a/packages/backend/src/server/api/endpoints/notifications/mark-all-as-read.ts
+++ b/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, {});
});
diff --git a/packages/backend/src/services/create-notification.ts b/packages/backend/src/services/create-notification.ts
index 93fec126d3..e62bd38ec4 100644
--- a/packages/backend/src/services/create-notification.ts
+++ b/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 ただしミュートしているユーザーからの通知なら無視
diff --git a/packages/backend/src/services/messages/create.ts b/packages/backend/src/services/messages/create.ts
index d025f57fca..931a1e4c57 100644
--- a/packages/backend/src/services/messages/create.ts
+++ b/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);
diff --git a/packages/backend/src/services/push-notification.ts b/packages/backend/src/services/push-notification.ts
deleted file mode 100644
index 86dd2a32e2..0000000000
--- a/packages/backend/src/services/push-notification.ts
+++ /dev/null
@@ -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,
- });
- }
- });
- }
-}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 09b3b69ed1..837086395e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -327,9 +327,6 @@ importers:
uuid:
specifier: 9.0.1
version: 9.0.1
- web-push:
- specifier: 3.6.7
- version: 3.6.7
websocket:
specifier: 1.0.35
version: 1.0.35
@@ -2998,9 +2995,6 @@ packages:
asap@2.0.6:
resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
- asn1.js@5.4.1:
- resolution: {integrity: sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==}
-
asn1@0.2.6:
resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==}
@@ -3124,9 +3118,6 @@ packages:
bmp-js@0.1.0:
resolution: {integrity: sha512-vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw==}
- bn.js@4.12.0:
- resolution: {integrity: sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==}
-
boolbase@1.0.0:
resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
@@ -3174,9 +3165,6 @@ packages:
resolution: {integrity: sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==}
engines: {node: '>=8.0.0'}
- buffer-equal-constant-time@1.0.1:
- resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==}
-
buffer-fill@1.0.0:
resolution: {integrity: sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==}
@@ -4001,9 +3989,6 @@ packages:
ecc-jsbn@0.1.2:
resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==}
- ecdsa-sig-formatter@1.0.11:
- resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==}
-
editorconfig@1.0.4:
resolution: {integrity: sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==}
engines: {node: '>=14'}
@@ -4936,10 +4921,6 @@ packages:
resolution: {integrity: sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==}
engines: {node: '>=10.19.0'}
- http_ece@1.2.0:
- resolution: {integrity: sha512-JrF8SSLVmcvc5NducxgyOrKXe3EsyHMgBFgSaIUGmArKe+rwr0uphRkRXvwiom3I+fpIfoItveHrfudL8/rxuA==}
- engines: {node: '>=16'}
-
https-proxy-agent@5.0.1:
resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
engines: {node: '>= 6'}
@@ -5571,12 +5552,6 @@ packages:
jstransformer@1.0.0:
resolution: {integrity: sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A==}
- jwa@2.0.0:
- resolution: {integrity: sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==}
-
- jws@4.0.0:
- resolution: {integrity: sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==}
-
katex@0.16.10:
resolution: {integrity: sha512-ZiqaC04tp2O5utMsl2TEZTXxa6WSC4yo0fv5ML++D3QZv/vx2Mct0mTlRx3O+uUkjfuAgOkzsCmq5MiUEsDDdA==}
hasBin: true
@@ -5911,9 +5886,6 @@ packages:
resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
engines: {node: '>=4'}
- minimalistic-assert@1.0.1:
- resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==}
-
minimatch@3.1.2:
resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
@@ -7832,11 +7804,6 @@ packages:
wcwidth@1.0.1:
resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
- web-push@3.6.7:
- resolution: {integrity: sha512-OpiIUe8cuGjrj3mMBFWY+e4MMIkW3SVT+7vEIjvD9kejGUypv8GPDf84JdPWskK8zMRIJ6xYGm+Kxr8YkPyA0A==}
- engines: {node: '>= 16'}
- hasBin: true
-
web-streams-polyfill@3.3.3:
resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==}
engines: {node: '>= 8'}
@@ -10481,13 +10448,6 @@ snapshots:
asap@2.0.6: {}
- asn1.js@5.4.1:
- dependencies:
- bn.js: 4.12.0
- inherits: 2.0.4
- minimalistic-assert: 1.0.1
- safer-buffer: 2.1.2
-
asn1@0.2.6:
dependencies:
safer-buffer: 2.1.2
@@ -10651,8 +10611,6 @@ snapshots:
bmp-js@0.1.0: {}
- bn.js@4.12.0: {}
-
boolbase@1.0.0: {}
brace-expansion@1.1.11:
@@ -10707,8 +10665,6 @@ snapshots:
buffer-crc32@1.0.0: {}
- buffer-equal-constant-time@1.0.1: {}
-
buffer-fill@1.0.0: {}
buffer-from@1.1.2: {}
@@ -11456,10 +11412,6 @@ snapshots:
jsbn: 0.1.1
safer-buffer: 2.1.2
- ecdsa-sig-formatter@1.0.11:
- dependencies:
- safe-buffer: 5.2.1
-
editorconfig@1.0.4:
dependencies:
'@one-ini/wasm': 0.1.1
@@ -12746,8 +12698,6 @@ snapshots:
quick-lru: 5.1.1
resolve-alpn: 1.2.1
- http_ece@1.2.0: {}
-
https-proxy-agent@5.0.1:
dependencies:
agent-base: 6.0.2
@@ -13635,17 +13585,6 @@ snapshots:
is-promise: 2.2.2
promise: 7.3.1
- jwa@2.0.0:
- dependencies:
- buffer-equal-constant-time: 1.0.1
- ecdsa-sig-formatter: 1.0.11
- safe-buffer: 5.2.1
-
- jws@4.0.0:
- dependencies:
- jwa: 2.0.0
- safe-buffer: 5.2.1
-
katex@0.16.10:
dependencies:
commander: 8.3.0
@@ -14070,8 +14009,6 @@ snapshots:
min-indent@1.0.1: {}
- minimalistic-assert@1.0.1: {}
-
minimatch@3.1.2:
dependencies:
brace-expansion: 1.1.11
@@ -16080,16 +16017,6 @@ snapshots:
dependencies:
defaults: 1.0.4
- web-push@3.6.7:
- dependencies:
- asn1.js: 5.4.1
- http_ece: 1.2.0
- https-proxy-agent: 7.0.4
- jws: 4.0.0
- minimist: 1.2.8
- transitivePeerDependencies:
- - supports-color
-
web-streams-polyfill@3.3.3: {}
webidl-conversions@3.0.1: {}