From ff6a025c06ef285f4376043980480275437210e0 Mon Sep 17 00:00:00 2001
From: Markus Wiegand <mail@morphy.dev>
Date: Tue, 8 Apr 2025 20:31:08 +0200
Subject: [PATCH 1/2] refactor configuration and watcher structure

---
 Cargo.lock                         | 563 +++++++++++++++++++++--------
 Cargo.toml                         |   1 +
 src/config.rs                      |  31 +-
 src/error.rs                       |  16 +
 src/main.rs                        |  95 ++---
 src/sink/discord.rs                |   9 +-
 src/sink/mod.rs                    |  13 +-
 src/sink/slack.rs                  |   9 +-
 src/watcher/builder.rs             |  79 ++++
 src/{watcher.rs => watcher/mod.rs} | 129 +++++--
 10 files changed, 672 insertions(+), 273 deletions(-)
 create mode 100644 src/watcher/builder.rs
 rename src/{watcher.rs => watcher/mod.rs} (60%)

diff --git a/Cargo.lock b/Cargo.lock
index e168ef2..1735148 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -43,9 +43,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.16"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "103db485efc3e41214fe4fda9f3dbeae2eb9082f48fd236e6095627a9422066e"
+checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522"
 dependencies = [
  "brotli",
  "flate2",
@@ -151,15 +151,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.2"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 
 [[package]]
 name = "cc"
-version = "1.1.31"
+version = "1.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
+checksum = "8d6dbb628b8f8555f86d0323c2eb39e3ec81901f4b83e091db8a6a76d316a333"
 dependencies = [
  "shlex",
 ]
@@ -170,6 +170,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
 version = "0.4.39"
@@ -213,13 +219,24 @@ checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
 [[package]]
 name = "diligent-date-parser"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6cf7fe294274a222363f84bcb63cdea762979a0443b4cf1f4f8fd17c86b1182"
+checksum = "c8ede7d79366f419921e2e2f67889c12125726692a313bffb474bd5f37a581e9"
 dependencies = [
  "chrono",
 ]
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "either"
 version = "1.13.0"
@@ -228,9 +245,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.34"
+version = "0.8.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 dependencies = [
  "cfg-if",
 ]
@@ -255,25 +272,25 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "fastrand"
-version = "2.1.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "flate2"
-version = "1.0.34"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -372,8 +389,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "wasi",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -384,9 +403,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "h2"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
+checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -413,17 +432,11 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
 [[package]]
 name = "hickory-proto"
-version = "0.24.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512"
+checksum = "447afdcdb8afb9d0a852af6dc65d9b285ce720ed7a59e42a8bf2e931c67bc1b5"
 dependencies = [
  "async-trait",
  "cfg-if",
@@ -432,7 +445,7 @@ dependencies = [
  "futures-channel",
  "futures-io",
  "futures-util",
- "idna 0.4.0",
+ "idna",
  "ipnet",
  "once_cell",
  "rand",
@@ -445,9 +458,9 @@ dependencies = [
 
 [[package]]
 name = "hickory-resolver"
-version = "0.24.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243"
+checksum = "0a2e2aba9c389ce5267d31cf1e4dace82390ae276b0b364ea55630b1fa1b44b4"
 dependencies = [
  "cfg-if",
  "futures-util",
@@ -505,9 +518,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -561,9 +574,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.5.0"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
+checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -581,9 +594,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.3"
+version = "0.27.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
  "http",
@@ -633,30 +646,149 @@ dependencies = [
 ]
 
 [[package]]
-name = "idna"
-version = "0.4.0"
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
 name = "indexmap"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -682,16 +814,17 @@ checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "js-sys"
-version = "0.3.72"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -703,9 +836,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.161"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "libmimalloc-sys"
@@ -729,6 +862,12 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -818,20 +957,19 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
 dependencies = [
  "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi",
  "libc",
  "wasi",
  "windows-sys 0.52.0",
@@ -891,9 +1029,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.5"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -1048,9 +1186,9 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -1096,9 +1234,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quick-xml"
-version = "0.37.1"
+version = "0.37.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f22f29bdff3987b4d8632ef95fd6424ec7e4e0a57e2f4fc63e489e75357f6a03"
+checksum = "165859e9e55f79d67b96c5d96f4e88b6f2695a1972849c15a6a3f5c59fc2c003"
 dependencies = [
  "encoding_rs",
  "memchr",
@@ -1106,9 +1244,9 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
 dependencies = [
  "bytes",
  "pin-project-lite",
@@ -1117,34 +1255,38 @@ dependencies = [
  "rustc-hash",
  "rustls",
  "socket2",
- "thiserror 1.0.69",
+ "thiserror 2.0.9",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.8"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
 dependencies = [
  "bytes",
+ "getrandom",
  "rand",
  "ring",
  "rustc-hash",
  "rustls",
+ "rustls-pki-types",
  "slab",
- "thiserror 1.0.69",
+ "thiserror 2.0.9",
  "tinyvec",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.5"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b"
+checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904"
 dependencies = [
+ "cfg_aliases",
  "libc",
  "once_cell",
  "socket2",
@@ -1154,9 +1296,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -1193,22 +1335,22 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
  "bitflags",
 ]
 
 [[package]]
 name = "regex"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.8",
+ "regex-automata 0.4.9",
  "regex-syntax 0.8.5",
 ]
 
@@ -1223,9 +1365,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1246,9 +1388,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.10"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d3536321cfc54baa8cf3e273d5e1f63f889067829c4b410fcdbac8ca7b80994"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
  "async-compression",
  "base64",
@@ -1351,6 +1493,7 @@ dependencies = [
  "toml",
  "tracing",
  "tracing-subscriber",
+ "url",
 ]
 
 [[package]]
@@ -1361,21 +1504,21 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
 
 [[package]]
 name = "rustix"
-version = "0.38.37"
+version = "0.38.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
 dependencies = [
  "bitflags",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1403,9 +1546,12 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.10.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
+checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
+dependencies = [
+ "web-time",
+]
 
 [[package]]
 name = "rustls-webpki"
@@ -1426,9 +1572,9 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "schannel"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
  "windows-sys 0.59.0",
 ]
@@ -1454,9 +1600,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.12.0"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
+checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -1464,18 +1610,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.216"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.216"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1571,9 +1717,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -1585,6 +1731,12 @@ version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "string_cache"
 version = "0.8.7"
@@ -1619,9 +1771,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.92"
+version = "2.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ae51629bf965c5c098cc9e87908a3df5301051a9e087d6f9bef5c9771ed126"
+checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1630,18 +1782,29 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 dependencies = [
  "futures-core",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "tempfile"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
 dependencies = [
  "cfg-if",
  "fastrand",
@@ -1711,11 +1874,21 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -1767,12 +1940,11 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
  "rustls",
- "rustls-pki-types",
  "tokio",
 ]
 
@@ -1790,9 +1962,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.12"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -1943,26 +2115,11 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
-[[package]]
-name = "unicode-bidi"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
-
 [[package]]
 name = "unicode-ident"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
-dependencies = [
- "tinyvec",
-]
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "unicode-width"
@@ -1978,13 +2135,14 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
- "idna 0.5.0",
+ "idna",
  "percent-encoding",
+ "serde",
 ]
 
 [[package]]
@@ -1993,6 +2151,18 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "valuable"
 version = "0.1.0"
@@ -2022,9 +2192,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.95"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -2033,13 +2203,12 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.95"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
  "syn",
@@ -2048,21 +2217,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.45"
+version = "0.4.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
+checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.95"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2070,9 +2240,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.95"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2083,15 +2253,25 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.95"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
 
 [[package]]
 name = "web-sys"
-version = "0.3.72"
+version = "0.3.76"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -2099,9 +2279,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.6"
+version = "0.26.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
+checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -2314,9 +2494,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.20"
+version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+checksum = "e6f5bb5257f2407a5425c6e749bfd9692192a73e70a6060516ac04f889087d68"
 dependencies = [
  "memchr",
 ]
@@ -2331,6 +2511,42 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -2352,8 +2568,51 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
 [[package]]
 name = "zeroize"
 version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/Cargo.toml b/Cargo.toml
index 1a70450..83435f1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,6 +40,7 @@ reqwest = { version = "0.12", features = [
     "http2",
     "charset",
 ], default-features = false }
+url = { version = "2", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
 async-trait = "0.1"
diff --git a/src/config.rs b/src/config.rs
index d22f553..025d933 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,13 +1,23 @@
 use crate::{sink::SinkOptions, Result};
 
-use std::{collections::HashMap, path::Path, time::Duration};
+use std::{path::Path, time::Duration};
 
 use serde::Deserialize;
 use tokio::fs;
+use url::Url;
+
+const fn retry_limit_default() -> usize {
+    10
+}
+
+const fn interval_default() -> Duration {
+    Duration::from_secs(60)
+}
 
 #[derive(Debug, Deserialize)]
 pub struct Config {
-    pub feeds: HashMap<String, Feed>,
+    pub default: Default,
+    pub feeds: Vec<Feed>,
 }
 
 impl Config {
@@ -20,15 +30,18 @@ impl Config {
 }
 
 #[derive(Debug, Deserialize)]
-pub struct Feed {
-    pub url: String,
-    pub sink: SinkOptions,
-    #[serde(default, with = "humantime_serde")]
-    pub interval: Option<Duration>,
+pub struct Default {
+    pub sink: Option<SinkOptions>,
+    #[serde(default = "interval_default", with = "humantime_serde")]
+    pub interval: Duration,
     #[serde(default = "retry_limit_default")]
     pub retry_limit: usize,
 }
 
-const fn retry_limit_default() -> usize {
-    10
+#[derive(Debug, Deserialize)]
+pub struct Feed {
+    pub url: Url,
+    pub sink: Option<SinkOptions>,
+    pub interval: Option<Duration>,
+    pub retry_limit: Option<usize>,
 }
diff --git a/src/error.rs b/src/error.rs
index e20a8c2..4330078 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -2,8 +2,12 @@
 pub enum Error {
     #[error("feed error: {0}")]
     Feed(#[from] FeedError),
+    #[error("config error: {0}")]
+    Config(#[from] ConfigError),
     #[error("sink error: {0}")]
     Sink(String),
+    #[error("watcher error: {0}")]
+    Watcher(#[from] WatcherError),
     #[error("json error: {0}")]
     Json(#[from] serde_json::error::Error),
     #[error("task error: {0}")]
@@ -29,3 +33,15 @@ pub enum FeedError {
     #[error("html2text error: {0}")]
     Html2Text(#[from] html2text::Error),
 }
+
+#[derive(thiserror::Error, Debug)]
+pub enum ConfigError {
+    #[error("no sink configured")]
+    MissingSink,
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum WatcherError {
+    #[error("watcher failed")]
+    Failed,
+}
diff --git a/src/main.rs b/src/main.rs
index e376af9..4294b4c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,13 +4,9 @@ mod feed;
 mod sink;
 mod watcher;
 
-use crate::{
-    config::{Config, Feed},
-    watcher::Watcher,
-};
+use crate::config::Config;
 
 use std::{
-    collections::HashMap,
     env,
     io::{stdout, IsTerminal},
     path::PathBuf,
@@ -25,13 +21,10 @@ use reqwest::{
     header::{self, HeaderMap, HeaderName, HeaderValue},
     Client,
 };
-use tokio::{
-    signal::unix::{signal, SignalKind},
-    sync::broadcast,
-    task::JoinSet,
-};
-use tracing::{debug, error, info};
+use tokio::signal::unix::{signal, SignalKind};
+use tracing::{debug, error};
 use tracing_subscriber::EnvFilter;
+use watcher::WatcherCollection;
 
 #[cfg(feature = "mimalloc")]
 #[global_allocator]
@@ -154,20 +147,28 @@ async fn main() -> Result<()> {
         }
     };
 
-    let client = build_client()?;
+    let watchers = WatcherCollection::try_from(config)?;
+
+    let shutdown_handle = watchers.shutdown_handle();
 
-    let mut tasks = watch_feeds(config.feeds, client)?;
-    let mut task_failed = false;
-    while let Some(res) = tasks.join_next().await {
-        let abort = if let Ok(r) = res { r.is_err() } else { true };
-        if abort && !task_failed {
-            tasks.abort_all();
-            task_failed = true;
+    tokio::spawn(async move {
+        let mut sig_int = signal(SignalKind::interrupt()).unwrap();
+        let mut sig_term = signal(SignalKind::terminate()).unwrap();
+
+        tokio::select! {
+            _ = sig_int.recv() => {},
+            _ = sig_term.recv() => {},
+        };
+
+        debug!("received termination signal");
+
+        if let Err(e) = shutdown_handle.send(()) {
+            error!("error while sending shutdown signal: {e}");
         }
-    }
+    });
 
-    if task_failed {
-        eprintln!("Terminate due to a faulty watcher");
+    if let Err(e) = watchers.wait().await {
+        error!("Error while waiting for watchers: {e}");
         process::exit(1);
     }
 
@@ -272,53 +273,3 @@ fn parse_env_filter(debug: bool, verbose: bool) -> EnvFilter {
         (false, _, _) => EnvFilter::from_default_env(),
     }
 }
-
-fn watch_feeds(feeds: HashMap<String, Feed>, client: Client) -> Result<JoinSet<Result<()>>> {
-    let mut tasks = JoinSet::new();
-
-    let (tx, _) = broadcast::channel(feeds.len());
-
-    for (name, config) in feeds.into_iter() {
-        let sink = config.sink.sink(&client)?;
-        let watcher = Watcher::new(
-            config.url,
-            sink,
-            config.interval,
-            client.clone(),
-            config.retry_limit,
-        )?;
-
-        let rx = tx.subscribe();
-
-        tasks.spawn(async move {
-            info!("starting watcher for \"{name}\"");
-
-            if let Err(err) = watcher.watch(rx).await {
-                error!(
-                    feed = %name,
-                    error = %err,
-                    "shutting down watcher due to an error",
-                );
-                return Err(err);
-            }
-
-            Ok(())
-        });
-    }
-
-    tokio::spawn(async move {
-        let mut sig_int = signal(SignalKind::interrupt()).unwrap();
-        let mut sig_term = signal(SignalKind::terminate()).unwrap();
-
-        tokio::select! {
-            _ = sig_int.recv() => {},
-            _ = sig_term.recv() => {},
-        };
-
-        debug!("received termination signal");
-
-        tx.send(()).unwrap();
-    });
-
-    Ok(tasks)
-}
diff --git a/src/sink/discord.rs b/src/sink/discord.rs
index cc8f17f..21b67c3 100644
--- a/src/sink/discord.rs
+++ b/src/sink/discord.rs
@@ -8,7 +8,7 @@ use super::Sink;
 
 use async_trait::async_trait;
 use chrono::{DateTime, FixedOffset};
-use reqwest::{Client, IntoUrl, Url};
+use reqwest::{Client, Url};
 use serde::Serialize;
 use tracing::debug;
 
@@ -24,11 +24,8 @@ pub struct Discord {
 }
 
 impl Discord {
-    pub fn new<T: IntoUrl>(url: T, client: Client) -> Result<Self> {
-        Ok(Self {
-            url: url.into_url()?,
-            client,
-        })
+    pub fn new(url: Url, client: Client) -> Result<Self> {
+        Ok(Self { url, client })
     }
 }
 
diff --git a/src/sink/mod.rs b/src/sink/mod.rs
index a7a2989..2779067 100644
--- a/src/sink/mod.rs
+++ b/src/sink/mod.rs
@@ -6,18 +6,21 @@ use crate::{feed::item::FeedItem, Result};
 
 use self::{custom::Custom, discord::Discord, slack::Slack};
 
+use std::fmt;
+
 use async_trait::async_trait;
 use reqwest::Client;
 use serde::Deserialize;
+use url::Url;
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Clone, Deserialize)]
 #[serde(rename_all = "snake_case", tag = "type")]
 pub enum SinkOptions {
     Discord {
-        url: String,
+        url: Url,
     },
     Slack {
-        url: String,
+        url: Url,
     },
     Custom {
         command: String,
@@ -41,12 +44,12 @@ impl SinkOptions {
 }
 
 #[async_trait]
-pub trait Sink {
+pub trait Sink: fmt::Debug + Send + Sync {
     async fn push<'a, T>(&self, items: &'a [T]) -> Result<()>
     where
         T: FeedItem<'a>;
 
-    async fn shutdown(mut self) -> Result<()>;
+    async fn shutdown(self) -> Result<()>;
 }
 
 #[derive(Debug)]
diff --git a/src/sink/slack.rs b/src/sink/slack.rs
index 168c736..e547511 100644
--- a/src/sink/slack.rs
+++ b/src/sink/slack.rs
@@ -7,7 +7,7 @@ use crate::{
 use super::Sink;
 
 use async_trait::async_trait;
-use reqwest::{Client, IntoUrl, Url};
+use reqwest::{Client, Url};
 use serde::Serialize;
 use slack_bk::{
     blocks::{Block, Context, ContextElement, Divider, Header, Section},
@@ -24,11 +24,8 @@ pub struct Slack {
 }
 
 impl Slack {
-    pub fn new<T: IntoUrl>(url: T, client: Client) -> Result<Self> {
-        Ok(Self {
-            url: url.into_url()?,
-            client,
-        })
+    pub fn new(url: Url, client: Client) -> Result<Self> {
+        Ok(Self { url, client })
     }
 }
 
diff --git a/src/watcher/builder.rs b/src/watcher/builder.rs
new file mode 100644
index 0000000..f0e085f
--- /dev/null
+++ b/src/watcher/builder.rs
@@ -0,0 +1,79 @@
+use crate::{sink::Sink, Result};
+
+use super::{Watcher, DEFAULT_INTERVAL};
+
+use std::time::Duration;
+
+use chrono::DateTime;
+use reqwest::Client;
+use url::Url;
+
+pub struct WatcherBuilder<State>(State);
+
+impl WatcherBuilder<WantsUrl> {
+    pub fn with_client(client: Client) -> Self {
+        WatcherBuilder(WantsUrl(client))
+    }
+}
+
+impl Default for WatcherBuilder<WantsUrl> {
+    fn default() -> Self {
+        WatcherBuilder(WantsUrl(Client::default()))
+    }
+}
+
+pub struct WantsUrl(Client);
+
+impl WatcherBuilder<WantsUrl> {
+    pub fn url(self, url: Url) -> WatcherBuilder<WantsSink> {
+        WatcherBuilder(WantsSink(self.0 .0, url))
+    }
+}
+
+pub struct WantsSink(Client, Url);
+
+impl WatcherBuilder<WantsSink> {
+    pub fn sink<T: Sink>(self, sink: T) -> WatcherBuilder<Ready<T>> {
+        WatcherBuilder(Ready {
+            url: self.0 .1,
+            sink,
+            client: self.0 .0,
+            interval: DEFAULT_INTERVAL,
+            retry_limit: 3,
+        })
+    }
+}
+
+pub struct Ready<T: Sink> {
+    url: Url,
+    sink: T,
+    client: Client,
+    interval: Duration,
+    retry_limit: usize,
+}
+
+impl<T: Sink> WatcherBuilder<Ready<T>> {
+    pub fn interval(self, interval: Duration) -> WatcherBuilder<Ready<T>> {
+        WatcherBuilder(Ready { interval, ..self.0 })
+    }
+
+    pub fn retry_limit(self, retry_limit: usize) -> WatcherBuilder<Ready<T>> {
+        WatcherBuilder(Ready {
+            retry_limit,
+            ..self.0
+        })
+    }
+
+    pub fn build(self) -> Result<Watcher<T>> {
+        let data = self.0;
+        Ok(Watcher {
+            url: data.url,
+            sink: data.sink,
+            client: data.client,
+            interval: data.interval,
+            retry_limit: data.retry_limit,
+            retries_left: data.retry_limit,
+            last_date: DateTime::default(),
+        })
+    }
+}
diff --git a/src/watcher.rs b/src/watcher/mod.rs
similarity index 60%
rename from src/watcher.rs
rename to src/watcher/mod.rs
index bde09bf..217be58 100644
--- a/src/watcher.rs
+++ b/src/watcher/mod.rs
@@ -1,19 +1,120 @@
+mod builder;
+
 use crate::{
-    error::Error,
+    build_client,
+    config::Config,
+    error::{ConfigError, Error, WatcherError},
     feed::{item::FeedItem, Feed},
-    sink::Sink,
+    sink::{AnySink, Sink},
     Result,
 };
 
 use std::time::Duration;
 
+use builder::WatcherBuilder;
 use chrono::{DateTime, FixedOffset};
-use reqwest::{Client, IntoUrl, Url};
-use tokio::sync::broadcast::Receiver;
-use tracing::{debug, error};
+use reqwest::{Client, Url};
+use tokio::{
+    sync::broadcast::{self, Receiver, Sender},
+    task::JoinSet,
+};
+use tracing::{debug, error, info};
 
 const DEFAULT_INTERVAL: Duration = Duration::from_secs(60);
 
+pub struct WatcherCollection<S: Sink> {
+    scheduled_watchers: Vec<Watcher<S>>,
+    kill_tx: Sender<()>,
+}
+
+impl<S: Sink + 'static> WatcherCollection<S> {
+    pub async fn wait(mut self) -> Result<()> {
+        let mut watchers = JoinSet::new();
+
+        for (idx, watcher) in self.scheduled_watchers.drain(..).enumerate() {
+            let rx = self.kill_tx.subscribe();
+
+            info!(
+                index = idx,
+                url = %watcher.url,
+                "starting watcher",
+            );
+
+            watchers.spawn(async move {
+                if let Err(err) = watcher.watch(rx).await {
+                    error!(
+                        index = idx,
+                        error = %err,
+                        "shutting down watcher due to an error",
+                    );
+                    return Err(err);
+                }
+
+                Ok(())
+            });
+        }
+
+        let mut failed = false;
+
+        while let Some(res) = watchers.join_next().await {
+            let abort = if let Ok(r) = res { r.is_err() } else { true };
+            if abort && !failed {
+                watchers.abort_all();
+                failed = true;
+            }
+        }
+
+        if failed {
+            return Err(WatcherError::Failed)?;
+        }
+
+        Ok(())
+    }
+
+    pub fn shutdown_handle(&self) -> Sender<()> {
+        self.kill_tx.clone()
+    }
+}
+
+impl<S: Sink + 'static> From<Vec<Watcher<S>>> for WatcherCollection<S> {
+    fn from(watchers: Vec<Watcher<S>>) -> Self {
+        let (kill_tx, _) = broadcast::channel(watchers.len());
+
+        Self {
+            scheduled_watchers: watchers,
+            kill_tx,
+        }
+    }
+}
+
+impl TryFrom<Config> for WatcherCollection<AnySink> {
+    type Error = Error;
+
+    fn try_from(Config { default, feeds }: Config) -> Result<Self> {
+        let client = build_client()?;
+
+        let mut scheduled_watchers = Vec::new();
+
+        for feed in feeds.into_iter() {
+            let sink = feed
+                .sink
+                .unwrap_or(default.sink.clone().ok_or(ConfigError::MissingSink)?)
+                .sink(&client)?;
+
+            let watcher = WatcherBuilder::with_client(client.clone())
+                .url(feed.url)
+                .sink(sink)
+                .interval(feed.interval.unwrap_or(default.interval))
+                .retry_limit(feed.retry_limit.unwrap_or(default.retry_limit))
+                .build()?;
+
+            scheduled_watchers.push(watcher);
+        }
+
+        Ok(Self::from(scheduled_watchers))
+    }
+}
+
 #[derive(Debug)]
 pub struct Watcher<T: Sink> {
     url: Url,
@@ -26,24 +127,6 @@ pub struct Watcher<T: Sink> {
 }
 
 impl<T: Sink> Watcher<T> {
-    pub fn new<U: IntoUrl>(
-        url: U,
-        sink: T,
-        interval: Option<Duration>,
-        client: Client,
-        retry_limit: usize,
-    ) -> Result<Self> {
-        Ok(Self {
-            url: url.into_url()?,
-            sink,
-            interval: interval.unwrap_or(DEFAULT_INTERVAL),
-            client,
-            retry_limit,
-            retries_left: retry_limit,
-            last_date: DateTime::default(),
-        })
-    }
-
     #[tracing::instrument(
         name = "watch",
         skip(self, kill),

From c01bf2e681cab165fcd295a4be631c578fbf6f17 Mon Sep 17 00:00:00 2001
From: Markus Wiegand <mail@morphy.dev>
Date: Tue, 8 Apr 2025 20:31:19 +0200
Subject: [PATCH 2/2] update readme

---
 README.md | 52 +++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 37 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index b5979dd..1cdad28 100644
--- a/README.md
+++ b/README.md
@@ -66,14 +66,26 @@ OPTIONS:
 
 The feed configuration is passed as a TOML file.
 
-### Feed
+### Default Settings
+
+The `default` section defines global settings that apply to all feeds:
 
 | Field        | Type | Required | Default | Description  |
 | -------------|:----:|:--------:|:--------:| ----------- |
-| `url`      | string | Yes | | URL to the RSS feed |
 | `interval`  | string      | No | 60s |  Specifies the time interval between checks. E.g. `10m`, `3h`, `1d`. |
 | `retry_limit` | uint      | No | 10 |  Specifies the retries after certain errors. |
-| `sink` | object | Yes | | Sink options |
+| `sink` | object | No | | Default sink options to use for all feeds |
+
+### Feeds
+
+The `feeds` section is an array that contains individual feed configurations:
+
+| Field        | Type | Required | Default | Description  |
+| -------------|:----:|:--------:|:--------:| ----------- |
+| `url`      | string | Yes | | URL to the RSS feed |
+| `interval`  | string      | No | From default |  Override the default interval for this feed |
+| `retry_limit` | uint      | No | From default |  Override the default retry limit for this feed |
+| `sink` | object | No | From default | Override sink options for this feed |
 
 ### Discord Sink
 
@@ -125,21 +137,31 @@ Streams feed items in [NDJSON](https://en.wikipedia.org/wiki/JSON_streaming#Line
 ### Config Example
 
 ```TOML
+# Default settings for all feeds
+[default]
+interval = "5m"
+retry_limit = 10
+
+# Default sink configuration
+[default.sink]
+type = "discord"
+url = "https://discord.com/api/webhooks/84175.../OZdejNBCL1..."
+
 # Feed 1
-[feeds.github-blog]
+[[feeds]]
 url = "https://github.blog/all.atom"
-interval = "10m"
-retry_limit = 5
-sink.type = "discord"
-sink.url = "https://discord.com/api/webhooks/84175.../OZdejNBCL1..."
+interval = "10m"  # Override default interval
+retry_limit = 5   # Override default retry limit
 
 # Feed 2
-[feeds.rust-blog]
+[[feeds]]
 url = "https://blog.rust-lang.org/feed.xml"
-interval = "1m"
-
-[feeds.rust-blog.sink]
-type = "custom"
-command = "bash"
-arguments = ["-c", "cat - >> ./rust-blog.log"]
+interval = "1m"   # Override default interval
+sink.type = "custom"  # Override default sink
+sink.command = "bash"
+sink.arguments = ["-c", "cat - >> ./rust-blog.log"]
+
+# Feed 3 - uses all default settings
+[[feeds]]
+url = "https://example.com/feed.xml"
 ```