From b6de7278836d2d520a7559b3722fbf8d7e44b414 Mon Sep 17 00:00:00 2001 From: rm-dr <96270320+rm-dr@users.noreply.github.com> Date: Sun, 16 Nov 2025 12:58:20 -0800 Subject: [PATCH] `page` rewrite --- Cargo.lock | 374 ++++++++++++++++-- Cargo.toml | 6 + crates/lib/page/Cargo.toml | 6 +- crates/lib/page/htmx/htmx-2.0.8.min.js | 1 + crates/lib/page/htmx/json-enc-1.9.12.js | 11 + crates/lib/page/src/lib.rs | 29 +- crates/lib/page/src/route.rs | 275 +++++++++++++ crates/lib/page/src/servable/asset.rs | 65 ++- crates/lib/page/src/servable/mod.rs | 29 +- crates/lib/page/src/servable/page.rs | 269 ++++++++++--- crates/lib/page/src/servable/redirect.rs | 17 +- crates/lib/page/src/server.rs | 324 --------------- .../page/src/{requestcontext.rs => types.rs} | 60 ++- crates/lib/pixel-transform/src/chain.rs | 14 + crates/lib/toolbox/src/mime.rs | 121 ++++++ crates/service/service-webpage/Cargo.toml | 1 + .../service-webpage/src/components/md/mod.rs | 39 +- .../service-webpage/src/pages/handouts.rs | 156 ++++---- .../service-webpage/src/pages/index.rs | 108 ++--- .../service/service-webpage/src/pages/mod.rs | 210 +++++----- .../service-webpage/src/pages/notfound.rs | 39 +- .../service/service-webpage/src/routes/mod.rs | 37 +- typos.toml | 2 +- 23 files changed, 1463 insertions(+), 730 deletions(-) create mode 100644 crates/lib/page/htmx/htmx-2.0.8.min.js create mode 100644 crates/lib/page/htmx/json-enc-1.9.12.js create mode 100644 crates/lib/page/src/route.rs delete mode 100644 crates/lib/page/src/server.rs rename crates/lib/page/src/{requestcontext.rs => types.rs} (53%) diff --git a/Cargo.lock b/Cargo.lock index 03647ad..755c5a8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -394,6 +394,12 @@ version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + [[package]] name = "byteorder-lite" version = "0.1.0" @@ -693,6 +699,29 @@ dependencies = [ "typenum", ] +[[package]] +name = "cssparser" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e901edd733a1472f944a45116df3f846f54d37e67e68640ac8bb69689aca2aa" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa", + "phf 0.11.3", + "smallvec", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.108", +] + [[package]] name = "deranged" version = "0.5.5" @@ -737,6 +766,26 @@ dependencies = [ "syn 2.0.108", ] +[[package]] +name = "derive_more" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + [[package]] name = "diff" version = "0.1.13" @@ -812,6 +861,27 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "dtoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04" + +[[package]] +name = "dtoa-short" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" +dependencies = [ + "dtoa", +] + +[[package]] +name = "ego-tree" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2972feb8dffe7bc8c5463b1dacda1b0dfbed3710e50f977d965429692d74cd8" + [[package]] name = "either" version = "1.15.0" @@ -883,6 +953,16 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" +[[package]] +name = "errno" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" +dependencies = [ + "libc", + "windows-sys 0.61.2", +] + [[package]] name = "exr" version = "1.73.0" @@ -909,6 +989,12 @@ dependencies = [ "regex-syntax", ] +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + [[package]] name = "fax" version = "0.2.6" @@ -961,12 +1047,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foldhash" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" - [[package]] name = "form_urlencoded" version = "1.2.2" @@ -986,6 +1066,31 @@ dependencies = [ "syn 2.0.108", ] +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + [[package]] name = "futures-channel" version = "0.3.31" @@ -1002,6 +1107,17 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + [[package]] name = "futures-io" version = "0.3.31" @@ -1037,6 +1153,7 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ + "futures-channel", "futures-core", "futures-io", "futures-macro", @@ -1048,6 +1165,15 @@ dependencies = [ "slab", ] +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + [[package]] name = "generic-array" version = "0.14.9" @@ -1058,6 +1184,15 @@ dependencies = [ "version_check", ] +[[package]] +name = "getopts" +version = "0.2.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe4fbac503b8d1f88e6676011885f34b7174f46e59956bba534ba83abded4df" +dependencies = [ + "unicode-width 0.2.2", +] + [[package]] name = "getrandom" version = "0.2.16" @@ -1171,11 +1306,6 @@ name = "hashbrown" version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" -dependencies = [ - "allocator-api2", - "equivalent", - "foldhash", -] [[package]] name = "heck" @@ -1212,6 +1342,17 @@ dependencies = [ "utf8-width", ] +[[package]] +name = "html5ever" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55d958c2f74b664487a2035fe1dadb032c48718a03b63f3ab0b8537db8549ed4" +dependencies = [ + "log", + "markup5ever", + "match_token", +] + [[package]] name = "http" version = "1.3.1" @@ -1681,6 +1822,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "linux-raw-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" + [[package]] name = "litemap" version = "0.8.1" @@ -1727,21 +1874,18 @@ dependencies = [ "imgref", ] -[[package]] -name = "lru" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96051b46fc183dc9cd4a223960ef37b9af631b55191852a8274bfef064cda20f" -dependencies = [ - "hashbrown 0.16.0", -] - [[package]] name = "lru-slab" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + [[package]] name = "macro-sass" version = "0.0.1" @@ -1760,7 +1904,7 @@ dependencies = [ "argparse", "const_format", "derivative", - "derive_more", + "derive_more 0.99.20", "downcast-rs", "entities", "html-escape", @@ -1774,6 +1918,28 @@ dependencies = [ "unicode-general-category", ] +[[package]] +name = "markup5ever" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "311fe69c934650f8f19652b3946075f0fc41ad8757dbb68f1ca14e7900ecc1c3" +dependencies = [ + "log", + "tendril", + "web_atoms", +] + +[[package]] +name = "match_token" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac84fd3f360fcc43dc5f5d186f02a94192761a080e8bc58621ad4d12296a58cf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.108", +] + [[package]] name = "matchers" version = "0.2.0" @@ -2085,6 +2251,26 @@ version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" +[[package]] +name = "ormc-scrape" +version = "0.0.1" +dependencies = [ + "anyhow", + "axum", + "base64", + "clap", + "futures", + "reqwest", + "scraper", + "serde", + "serde_json", + "tempfile", + "tokio", + "toolbox", + "tracing", + "url", +] + [[package]] name = "owo-colors" version = "4.2.3" @@ -2097,15 +2283,13 @@ version = "0.0.1" dependencies = [ "axum", "chrono", - "libservice", - "lru", "maud", - "parking_lot", "pixel-transform", "serde", + "serde_urlencoded", "tokio", "toolbox", - "tower-http", + "tower", "tracing", ] @@ -2163,6 +2347,16 @@ dependencies = [ "phf_shared 0.13.1", ] +[[package]] +name = "phf_codegen" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" +dependencies = [ + "phf_generator", + "phf_shared 0.11.3", +] + [[package]] name = "phf_generator" version = "0.11.3" @@ -2283,6 +2477,12 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + [[package]] name = "pretty_assertions" version = "1.4.1" @@ -2829,6 +3029,19 @@ dependencies = [ "semver", ] +[[package]] +name = "rustix" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.61.2", +] + [[package]] name = "rustls" version = "0.23.34" @@ -2897,6 +3110,40 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "scraper" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5f3a24d916e78954af99281a455168d4a9515d65eca99a18da1b813689c4ad9" +dependencies = [ + "cssparser", + "ego-tree", + "getopts", + "html5ever", + "precomputed-hash", + "selectors", + "tendril", +] + +[[package]] +name = "selectors" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5685b6ae43bfcf7d2e7dfcfb5d8e8f61b46442c902531e41a32a9a8bf0ee0fb6" +dependencies = [ + "bitflags", + "cssparser", + "derive_more 2.0.1", + "fxhash", + "log", + "new_debug_unreachable", + "phf 0.11.3", + "phf_codegen", + "precomputed-hash", + "servo_arc", + "smallvec", +] + [[package]] name = "semver" version = "1.0.27" @@ -3012,9 +3259,19 @@ dependencies = [ "tokio", "toml 0.9.8", "toolbox", + "tower-http", "tracing", ] +[[package]] +name = "servo_arc" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "170fb83ab34de17dc69aa7c67482b22218ddb85da56546f9bd6b929e32a05930" +dependencies = [ + "stable_deref_trait", +] + [[package]] name = "sha2" version = "0.10.9" @@ -3130,6 +3387,31 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "string_cache" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f" +dependencies = [ + "new_debug_unreachable", + "parking_lot", + "phf_shared 0.11.3", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0" +dependencies = [ + "phf_generator", + "phf_shared 0.11.3", + "proc-macro2", + "quote", +] + [[package]] name = "strsim" version = "0.11.1" @@ -3329,6 +3611,30 @@ version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +[[package]] +name = "tempfile" +version = "3.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" +dependencies = [ + "fastrand", + "getrandom 0.3.4", + "once_cell", + "rustix", + "windows-sys 0.61.2", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + [[package]] name = "term" version = "0.7.0" @@ -3914,6 +4220,12 @@ dependencies = [ "serde", ] +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + [[package]] name = "utf8-width" version = "0.1.7" @@ -4134,6 +4446,18 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web_atoms" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57ffde1dc01240bdf9992e3205668b235e59421fd085e8a317ed98da0178d414" +dependencies = [ + "phf 0.11.3", + "phf_codegen", + "string_cache", + "string_cache_codegen", +] + [[package]] name = "webpage" version = "0.0.1" diff --git a/Cargo.toml b/Cargo.toml index 9928dcb..0d992d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -80,6 +80,8 @@ service-webpage = { path = "crates/service/service-webpage" } # axum = { version = "0.8.6", features = ["macros", "multipart"] } tower-http = { version = "0.6.6", features = ["trace", "compression-full"] } +tower = { version = "0.5.2" } +serde_urlencoded = { version = "0.7.1" } utoipa = "5.4.0" utoipa-swagger-ui = { version = "9.0.2", features = [ "axum", @@ -93,6 +95,7 @@ emojis = "0.8.0" reqwest = { version = "0.12.24", default-features = false, features = [ "http2", "rustls-tls", + "rustls-tls-webpki-roots", # Need to recompile to update "cookies", "gzip", "stream", @@ -144,6 +147,9 @@ lru = "0.16.2" parking_lot = "0.12.5" lazy_static = "1.5.0" image = "0.25.8" +scraper = "0.24.0" +futures = "0.3.31" +tempfile = "3.23.0" # md_* test utilities prettydiff = "0.9.0" diff --git a/crates/lib/page/Cargo.toml b/crates/lib/page/Cargo.toml index 55bfcd8..0ede90c 100644 --- a/crates/lib/page/Cargo.toml +++ b/crates/lib/page/Cargo.toml @@ -9,7 +9,6 @@ workspace = true [dependencies] toolbox = { workspace = true } -libservice = { workspace = true } pixel-transform = { workspace = true } axum = { workspace = true } @@ -17,7 +16,6 @@ tokio = { workspace = true } tracing = { workspace = true } maud = { workspace = true } chrono = { workspace = true } -parking_lot = { workspace = true } serde = { workspace = true } -lru = { workspace = true } -tower-http = { workspace = true } +tower = { workspace = true } +serde_urlencoded = { workspace = true } diff --git a/crates/lib/page/htmx/htmx-2.0.8.min.js b/crates/lib/page/htmx/htmx-2.0.8.min.js new file mode 100644 index 0000000..faafa3e --- /dev/null +++ b/crates/lib/page/htmx/htmx-2.0.8.min.js @@ -0,0 +1 @@ +var htmx=function(){"use strict";const Q={onLoad:null,process:null,on:null,off:null,trigger:null,ajax:null,find:null,findAll:null,closest:null,values:function(e,t){const n=dn(e,t||"post");return n.values},remove:null,addClass:null,removeClass:null,toggleClass:null,takeClass:null,swap:null,defineExtension:null,removeExtension:null,logAll:null,logNone:null,logger:null,config:{historyEnabled:true,historyCacheSize:10,refreshOnHistoryMiss:false,defaultSwapStyle:"innerHTML",defaultSwapDelay:0,defaultSettleDelay:20,includeIndicatorStyles:true,indicatorClass:"htmx-indicator",requestClass:"htmx-request",addedClass:"htmx-added",settlingClass:"htmx-settling",swappingClass:"htmx-swapping",allowEval:true,allowScriptTags:true,inlineScriptNonce:"",inlineStyleNonce:"",attributesToSettle:["class","style","width","height"],withCredentials:false,timeout:0,wsReconnectDelay:"full-jitter",wsBinaryType:"blob",disableSelector:"[hx-disable], [data-hx-disable]",scrollBehavior:"instant",defaultFocusScroll:false,getCacheBusterParam:false,globalViewTransitions:false,methodsThatUseUrlParams:["get","delete"],selfRequestsOnly:true,ignoreTitle:false,scrollIntoViewOnBoost:true,triggerSpecsCache:null,disableInheritance:false,responseHandling:[{code:"204",swap:false},{code:"[23]..",swap:true},{code:"[45]..",swap:false,error:true}],allowNestedOobSwaps:true,historyRestoreAsHxRequest:true,reportValidityOfForms:false},parseInterval:null,location:location,_:null,version:"2.0.8"};Q.onLoad=V;Q.process=Ft;Q.on=xe;Q.off=be;Q.trigger=ae;Q.ajax=Ln;Q.find=f;Q.findAll=x;Q.closest=g;Q.remove=_;Q.addClass=K;Q.removeClass=G;Q.toggleClass=W;Q.takeClass=Z;Q.swap=ze;Q.defineExtension=_n;Q.removeExtension=zn;Q.logAll=j;Q.logNone=$;Q.parseInterval=d;Q._=e;const n={addTriggerHandler:St,bodyContains:se,canAccessLocalStorage:X,findThisElement:Se,filterValues:yn,swap:ze,hasAttribute:s,getAttributeValue:a,getClosestAttributeValue:ne,getClosestMatch:q,getExpressionVars:Rn,getHeaders:mn,getInputValues:dn,getInternalData:oe,getSwapSpecification:bn,getTriggerSpecs:st,getTarget:Ee,makeFragment:D,mergeObjects:le,makeSettleInfo:Sn,oobSwap:Te,querySelectorExt:ue,settleImmediately:Yt,shouldCancel:ht,triggerEvent:ae,triggerErrorEvent:fe,withExtensions:Vt};const de=["get","post","put","delete","patch"];const R=de.map(function(e){return"[hx-"+e+"], [data-hx-"+e+"]"}).join(", ");function d(e){if(e==undefined){return undefined}let t=NaN;if(e.slice(-2)=="ms"){t=parseFloat(e.slice(0,-2))}else if(e.slice(-1)=="s"){t=parseFloat(e.slice(0,-1))*1e3}else if(e.slice(-1)=="m"){t=parseFloat(e.slice(0,-1))*1e3*60}else{t=parseFloat(e)}return isNaN(t)?undefined:t}function ee(e,t){return e instanceof Element&&e.getAttribute(t)}function s(e,t){return!!e.hasAttribute&&(e.hasAttribute(t)||e.hasAttribute("data-"+t))}function a(e,t){return ee(e,t)||ee(e,"data-"+t)}function u(e){const t=e.parentElement;if(!t&&e.parentNode instanceof ShadowRoot)return e.parentNode;return t}function te(){return document}function y(e,t){return e.getRootNode?e.getRootNode({composed:t}):te()}function q(e,t){while(e&&!t(e)){e=u(e)}return e||null}function o(e,t,n){const r=a(t,n);const o=a(t,"hx-disinherit");var i=a(t,"hx-inherit");if(e!==t){if(Q.config.disableInheritance){if(i&&(i==="*"||i.split(" ").indexOf(n)>=0)){return r}else{return null}}if(o&&(o==="*"||o.split(" ").indexOf(n)>=0)){return"unset"}}return r}function ne(t,n){let r=null;q(t,function(e){return!!(r=o(t,ce(e),n))});if(r!=="unset"){return r}}function h(e,t){return e instanceof Element&&e.matches(t)}function A(e){const t=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i;const n=t.exec(e);if(n){return n[1].toLowerCase()}else{return""}}function L(e){if("parseHTMLUnsafe"in Document){return Document.parseHTMLUnsafe(e)}const t=new DOMParser;return t.parseFromString(e,"text/html")}function N(e,t){while(t.childNodes.length>0){e.append(t.childNodes[0])}}function r(e){const t=te().createElement("script");ie(e.attributes,function(e){t.setAttribute(e.name,e.value)});t.textContent=e.textContent;t.async=false;if(Q.config.inlineScriptNonce){t.nonce=Q.config.inlineScriptNonce}return t}function i(e){return e.matches("script")&&(e.type==="text/javascript"||e.type==="module"||e.type==="")}function I(e){Array.from(e.querySelectorAll("script")).forEach(e=>{if(i(e)){const t=r(e);const n=e.parentNode;try{n.insertBefore(t,e)}catch(e){H(e)}finally{e.remove()}}})}function D(e){const t=e.replace(/]*)?>[\s\S]*?<\/head>/i,"");const n=A(t);let r;if(n==="html"){r=new DocumentFragment;const i=L(e);N(r,i.body);r.title=i.title}else if(n==="body"){r=new DocumentFragment;const i=L(t);N(r,i.body);r.title=i.title}else{const i=L('");r=i.querySelector("template").content;r.title=i.title;var o=r.querySelector("title");if(o&&o.parentNode===r){o.remove();r.title=o.innerText}}if(r){if(Q.config.allowScriptTags){I(r)}else{r.querySelectorAll("script").forEach(e=>e.remove())}}return r}function re(e){if(e){e()}}function t(e,t){return Object.prototype.toString.call(e)==="[object "+t+"]"}function P(e){return typeof e==="function"}function k(e){return t(e,"Object")}function oe(e){const t="htmx-internal-data";let n=e[t];if(!n){n=e[t]={}}return n}function M(t){const n=[];if(t){for(let e=0;e=0}function se(e){return e.getRootNode({composed:true})===document}function B(e){return e.trim().split(/\s+/)}function le(e,t){for(const n in t){if(t.hasOwnProperty(n)){e[n]=t[n]}}return e}function v(e){try{return JSON.parse(e)}catch(e){H(e);return null}}function X(){const e="htmx:sessionStorageTest";try{sessionStorage.setItem(e,e);sessionStorage.removeItem(e);return true}catch(e){return false}}function U(e){const t=new URL(e,"http://x");if(t){e=t.pathname+t.search}if(e!="/"){e=e.replace(/\/+$/,"")}return e}function e(e){return On(te().body,function(){return eval(e)})}function V(t){const e=Q.on("htmx:load",function(e){t(e.detail.elt)});return e}function j(){Q.logger=function(e,t,n){if(console){console.log(t,e,n)}}}function $(){Q.logger=null}function f(e,t){if(typeof e!=="string"){return e.querySelector(t)}else{return f(te(),e)}}function x(e,t){if(typeof e!=="string"){return e.querySelectorAll(t)}else{return x(te(),e)}}function b(){return window}function _(e,t){e=w(e);if(t){b().setTimeout(function(){_(e);e=null},t)}else{u(e).removeChild(e)}}function ce(e){return e instanceof Element?e:null}function z(e){return e instanceof HTMLElement?e:null}function J(e){return typeof e==="string"?e:null}function p(e){return e instanceof Element||e instanceof Document||e instanceof DocumentFragment?e:null}function K(e,t,n){e=ce(w(e));if(!e){return}if(n){b().setTimeout(function(){K(e,t);e=null},n)}else{e.classList&&e.classList.add(t)}}function G(e,t,n){let r=ce(w(e));if(!r){return}if(n){b().setTimeout(function(){G(r,t);r=null},n)}else{if(r.classList){r.classList.remove(t);if(r.classList.length===0){r.removeAttribute("class")}}}}function W(e,t){e=w(e);e.classList.toggle(t)}function Z(e,t){e=w(e);ie(e.parentElement.children,function(e){G(e,t)});K(ce(e),t)}function g(e,t){e=ce(w(e));if(e){return e.closest(t)}return null}function l(e,t){return e.substring(0,t.length)===t}function Y(e,t){return e.substring(e.length-t.length)===t}function pe(e){const t=e.trim();if(l(t,"<")&&Y(t,"/>")){return t.substring(1,t.length-2)}else{return t}}function m(t,r,n){if(r.indexOf("global ")===0){return m(t,r.slice(7),true)}t=w(t);const o=[];{let t=0;let n=0;for(let e=0;e"){t--}}if(n0){const r=pe(o.shift());let e;if(r.indexOf("closest ")===0){e=g(ce(t),pe(r.slice(8)))}else if(r.indexOf("find ")===0){e=f(p(t),pe(r.slice(5)))}else if(r==="next"||r==="nextElementSibling"){e=ce(t).nextElementSibling}else if(r.indexOf("next ")===0){e=ge(t,pe(r.slice(5)),!!n)}else if(r==="previous"||r==="previousElementSibling"){e=ce(t).previousElementSibling}else if(r.indexOf("previous ")===0){e=me(t,pe(r.slice(9)),!!n)}else if(r==="document"){e=document}else if(r==="window"){e=window}else if(r==="body"){e=document.body}else if(r==="root"){e=y(t,!!n)}else if(r==="host"){e=t.getRootNode().host}else{s.push(r)}if(e){i.push(e)}}if(s.length>0){const e=s.join(",");const c=p(y(t,!!n));i.push(...M(c.querySelectorAll(e)))}return i}var ge=function(t,e,n){const r=p(y(t,n)).querySelectorAll(e);for(let e=0;e=0;e--){const o=r[e];if(o.compareDocumentPosition(t)===Node.DOCUMENT_POSITION_FOLLOWING){return o}}};function ue(e,t){if(typeof e!=="string"){return m(e,t)[0]}else{return m(te().body,e)[0]}}function w(e,t){if(typeof e==="string"){return f(p(t)||document,e)}else{return e}}function ye(e,t,n,r){if(P(t)){return{target:te().body,event:J(e),listener:t,options:n}}else{return{target:w(e),event:J(t),listener:n,options:r}}}function xe(t,n,r,o){Gn(function(){const e=ye(t,n,r,o);e.target.addEventListener(e.event,e.listener,e.options)});const e=P(n);return e?n:r}function be(t,n,r){Gn(function(){const e=ye(t,n,r);e.target.removeEventListener(e.event,e.listener)});return P(n)?n:r}const ve=te().createElement("output");function we(t,n){const e=ne(t,n);if(e){if(e==="this"){return[Se(t,n)]}else{const r=m(t,e);const o=/(^|,)(\s*)inherit(\s*)($|,)/.test(e);if(o){const i=ce(q(t,function(e){return e!==t&&s(ce(e),n)}));if(i){r.push(...we(i,n))}}if(r.length===0){H('The selector "'+e+'" on '+n+" returned no matches!");return[ve]}else{return r}}}}function Se(e,t){return ce(q(e,function(e){return a(ce(e),t)!=null}))}function Ee(e){const t=ne(e,"hx-target");if(t){if(t==="this"){return Se(e,"hx-target")}else{return ue(e,t)}}else{const n=oe(e);if(n.boosted){return te().body}else{return e}}}function Ce(e){return Q.config.attributesToSettle.includes(e)}function Oe(t,n){ie(Array.from(t.attributes),function(e){if(!n.hasAttribute(e.name)&&Ce(e.name)){t.removeAttribute(e.name)}});ie(n.attributes,function(e){if(Ce(e.name)){t.setAttribute(e.name,e.value)}})}function He(t,e){const n=Jn(e);for(let e=0;e0){s=e.substring(0,e.indexOf(":"));n=e.substring(e.indexOf(":")+1)}else{s=e}o.removeAttribute("hx-swap-oob");o.removeAttribute("data-hx-swap-oob");const r=m(t,n,false);if(r.length){ie(r,function(e){let t;const n=o.cloneNode(true);t=te().createDocumentFragment();t.appendChild(n);if(!He(s,e)){t=p(n)}const r={shouldSwap:true,target:e,fragment:t};if(!ae(e,"htmx:oobBeforeSwap",r))return;e=r.target;if(r.shouldSwap){qe(t);$e(s,e,e,t,i);Re()}ie(i.elts,function(e){ae(e,"htmx:oobAfterSwap",r)})});o.parentNode.removeChild(o)}else{o.parentNode.removeChild(o);fe(te().body,"htmx:oobErrorNoTarget",{content:o})}return e}function Re(){const e=f("#--htmx-preserve-pantry--");if(e){for(const t of[...e.children]){const n=f("#"+t.id);n.parentNode.moveBefore(t,n);n.remove()}e.remove()}}function qe(e){ie(x(e,"[hx-preserve], [data-hx-preserve]"),function(e){const t=a(e,"id");const n=te().getElementById(t);if(n!=null){if(e.moveBefore){let e=f("#--htmx-preserve-pantry--");if(e==null){te().body.insertAdjacentHTML("afterend","
");e=f("#--htmx-preserve-pantry--")}e.moveBefore(n,null)}else{e.parentNode.replaceChild(n,e)}}})}function Ae(l,e,c){ie(e.querySelectorAll("[id]"),function(t){const n=ee(t,"id");if(n&&n.length>0){const r=n.replace("'","\\'");const o=t.tagName.replace(":","\\:");const e=p(l);const i=e&&e.querySelector(o+"[id='"+r+"']");if(i&&i!==e){const s=t.cloneNode();Oe(t,i);c.tasks.push(function(){Oe(t,s)})}}})}function Le(e){return function(){G(e,Q.config.addedClass);Ft(ce(e));Ne(p(e));ae(e,"htmx:load")}}function Ne(e){const t="[autofocus]";const n=z(h(e,t)?e:e.querySelector(t));if(n!=null){n.focus()}}function c(e,t,n,r){Ae(e,n,r);while(n.childNodes.length>0){const o=n.firstChild;K(ce(o),Q.config.addedClass);e.insertBefore(o,t);if(o.nodeType!==Node.TEXT_NODE&&o.nodeType!==Node.COMMENT_NODE){r.tasks.push(Le(o))}}}function Ie(e,t){let n=0;while(n0}function ze(h,d,p,g){if(!g){g={}}let m=null;let n=null;let e=function(){re(g.beforeSwapCallback);h=w(h);const r=g.contextElement?y(g.contextElement,false):te();const e=document.activeElement;let t={};t={elt:e,start:e?e.selectionStart:null,end:e?e.selectionEnd:null};const o=Sn(h);if(p.swapStyle==="textContent"){h.textContent=d}else{let n=D(d);o.title=g.title||n.title;if(g.historyRequest){n=n.querySelector("[hx-history-elt],[data-hx-history-elt]")||n}if(g.selectOOB){const i=g.selectOOB.split(",");for(let t=0;t0){b().setTimeout(n,p.settleDelay)}else{n()}};let t=Q.config.globalViewTransitions;if(p.hasOwnProperty("transition")){t=p.transition}const r=g.contextElement||te();if(t&&ae(r,"htmx:beforeTransition",g.eventInfo)&&typeof Promise!=="undefined"&&document.startViewTransition){const o=new Promise(function(e,t){m=e;n=t});const i=e;e=function(){document.startViewTransition(function(){i();return o})}}try{if(p?.swapDelay&&p.swapDelay>0){b().setTimeout(e,p.swapDelay)}else{e()}}catch(e){fe(r,"htmx:swapError",g.eventInfo);re(n);throw e}}function Je(e,t,n){const r=e.getResponseHeader(t);if(r.indexOf("{")===0){const o=v(r);for(const i in o){if(o.hasOwnProperty(i)){let e=o[i];if(k(e)){n=e.target!==undefined?e.target:n}else{e={value:e}}ae(n,i,e)}}}else{const s=r.split(",");for(let e=0;e0){const s=o[0];if(s==="]"){e--;if(e===0){if(n===null){t=t+"true"}o.shift();t+=")})";try{const l=On(r,function(){return Function(t)()},function(){return true});l.source=t;return l}catch(e){fe(te().body,"htmx:syntax:error",{error:e,source:t});return null}}}else if(s==="["){e++}if(tt(s,n,i)){t+="(("+i+"."+s+") ? ("+i+"."+s+") : (window."+s+"))"}else{t=t+s}n=o.shift()}}}function O(e,t){let n="";while(e.length>0&&!t.test(e[0])){n+=e.shift()}return n}function rt(e){let t;if(e.length>0&&Ye.test(e[0])){e.shift();t=O(e,Qe).trim();e.shift()}else{t=O(e,E)}return t}const ot="input, textarea, select";function it(e,t,n){const r=[];const o=et(t);do{O(o,C);const l=o.length;const c=O(o,/[,\[\s]/);if(c!==""){if(c==="every"){const u={trigger:"every"};O(o,C);u.pollInterval=d(O(o,/[,\[\s]/));O(o,C);var i=nt(e,o,"event");if(i){u.eventFilter=i}r.push(u)}else{const f={trigger:c};var i=nt(e,o,"event");if(i){f.eventFilter=i}O(o,C);while(o.length>0&&o[0]!==","){const a=o.shift();if(a==="changed"){f.changed=true}else if(a==="once"){f.once=true}else if(a==="consume"){f.consume=true}else if(a==="delay"&&o[0]===":"){o.shift();f.delay=d(O(o,E))}else if(a==="from"&&o[0]===":"){o.shift();if(Ye.test(o[0])){var s=rt(o)}else{var s=O(o,E);if(s==="closest"||s==="find"||s==="next"||s==="previous"){o.shift();const h=rt(o);if(h.length>0){s+=" "+h}}}f.from=s}else if(a==="target"&&o[0]===":"){o.shift();f.target=rt(o)}else if(a==="throttle"&&o[0]===":"){o.shift();f.throttle=d(O(o,E))}else if(a==="queue"&&o[0]===":"){o.shift();f.queue=O(o,E)}else if(a==="root"&&o[0]===":"){o.shift();f[a]=rt(o)}else if(a==="threshold"&&o[0]===":"){o.shift();f[a]=O(o,E)}else{fe(e,"htmx:syntax:error",{token:o.shift()})}O(o,C)}r.push(f)}}if(o.length===l){fe(e,"htmx:syntax:error",{token:o.shift()})}O(o,C)}while(o[0]===","&&o.shift());if(n){n[t]=r}return r}function st(e){const t=a(e,"hx-trigger");let n=[];if(t){const r=Q.config.triggerSpecsCache;n=r&&r[t]||it(e,t,r)}if(n.length>0){return n}else if(h(e,"form")){return[{trigger:"submit"}]}else if(h(e,'input[type="button"], input[type="submit"]')){return[{trigger:"click"}]}else if(h(e,ot)){return[{trigger:"change"}]}else{return[{trigger:"click"}]}}function lt(e){oe(e).cancelled=true}function ct(e,t,n){const r=oe(e);r.timeout=b().setTimeout(function(){if(se(e)&&r.cancelled!==true){if(!pt(n,e,Xt("hx:poll:trigger",{triggerSpec:n,target:e}))){t(e)}ct(e,t,n)}},n.pollInterval)}function ut(e){return location.hostname===e.hostname&&ee(e,"href")&&ee(e,"href").indexOf("#")!==0}function ft(e){return g(e,Q.config.disableSelector)}function at(t,n,e){if(t instanceof HTMLAnchorElement&&ut(t)&&(t.target===""||t.target==="_self")||t.tagName==="FORM"&&String(ee(t,"method")).toLowerCase()!=="dialog"){n.boosted=true;let r,o;if(t.tagName==="A"){r="get";o=ee(t,"href")}else{const i=ee(t,"method");r=i?i.toLowerCase():"get";o=ee(t,"action");if(o==null||o===""){o=location.href}if(r==="get"&&o.includes("?")){o=o.replace(/\?[^#]+/,"")}}e.forEach(function(e){gt(t,function(e,t){const n=ce(e);if(ft(n)){S(n);return}he(r,o,n,t)},n,e,true)})}}function ht(e,t){if(e.type==="submit"&&t.tagName==="FORM"){return true}else if(e.type==="click"){const n=t.closest('input[type="submit"], button');if(n&&n.form&&n.type==="submit"){return true}const r=t.closest("a");const o=/^#.+/;if(r&&r.href&&!o.test(r.getAttribute("href"))){return true}}return false}function dt(e,t){return oe(e).boosted&&e instanceof HTMLAnchorElement&&t.type==="click"&&(t.ctrlKey||t.metaKey)}function pt(e,t,n){const r=e.eventFilter;if(r){try{return r.call(t,n)!==true}catch(e){const o=r.source;fe(te().body,"htmx:eventFilter:error",{error:e,source:o});return true}}return false}function gt(l,c,e,u,f){const a=oe(l);let t;if(u.from){t=m(l,u.from)}else{t=[l]}if(u.changed){if(!("lastValue"in a)){a.lastValue=new WeakMap}t.forEach(function(e){if(!a.lastValue.has(u)){a.lastValue.set(u,new WeakMap)}a.lastValue.get(u).set(e,e.value)})}ie(t,function(i){const s=function(e){if(!se(l)){i.removeEventListener(u.trigger,s);return}if(dt(l,e)){return}if(f||ht(e,i)){e.preventDefault()}if(pt(u,l,e)){return}const t=oe(e);t.triggerSpec=u;if(t.handledFor==null){t.handledFor=[]}if(t.handledFor.indexOf(l)<0){t.handledFor.push(l);if(u.consume){e.stopPropagation()}if(u.target&&e.target){if(!h(ce(e.target),u.target)){return}}if(u.once){if(a.triggeredOnce){return}else{a.triggeredOnce=true}}if(u.changed){const n=e.target;const r=n.value;const o=a.lastValue.get(u);if(o.has(n)&&o.get(n)===r){return}o.set(n,r)}if(a.delayed){clearTimeout(a.delayed)}if(a.throttle){return}if(u.throttle>0){if(!a.throttle){ae(l,"htmx:trigger");c(l,e);a.throttle=b().setTimeout(function(){a.throttle=null},u.throttle)}}else if(u.delay>0){a.delayed=b().setTimeout(function(){ae(l,"htmx:trigger");c(l,e)},u.delay)}else{ae(l,"htmx:trigger");c(l,e)}}};if(e.listenerInfos==null){e.listenerInfos=[]}e.listenerInfos.push({trigger:u.trigger,listener:s,on:i});i.addEventListener(u.trigger,s)})}let mt=false;let yt=null;function xt(){if(!yt){yt=function(){mt=true};window.addEventListener("scroll",yt);window.addEventListener("resize",yt);setInterval(function(){if(mt){mt=false;ie(te().querySelectorAll("[hx-trigger*='revealed'],[data-hx-trigger*='revealed']"),function(e){bt(e)})}},200)}}function bt(e){if(!s(e,"data-hx-revealed")&&F(e)){e.setAttribute("data-hx-revealed","true");const t=oe(e);if(t.initHash){ae(e,"revealed")}else{e.addEventListener("htmx:afterProcessNode",function(){ae(e,"revealed")},{once:true})}}}function vt(e,t,n,r){const o=function(){if(!n.loaded){n.loaded=true;ae(e,"htmx:trigger");t(e)}};if(r>0){b().setTimeout(o,r)}else{o()}}function wt(t,n,e){let i=false;ie(de,function(r){if(s(t,"hx-"+r)){const o=a(t,"hx-"+r);i=true;n.path=o;n.verb=r;e.forEach(function(e){St(t,e,n,function(e,t){const n=ce(e);if(ft(n)){S(n);return}he(r,o,n,t)})})}});return i}function St(r,e,t,n){if(e.trigger==="revealed"){xt();gt(r,n,t,e);bt(ce(r))}else if(e.trigger==="intersect"){const o={};if(e.root){o.root=ue(r,e.root)}if(e.threshold){o.threshold=parseFloat(e.threshold)}const i=new IntersectionObserver(function(t){for(let e=0;e0){t.polling=true;ct(ce(r),n,e)}else{gt(r,n,t,e)}}function Et(e){const t=ce(e);if(!t){return false}const n=t.attributes;for(let e=0;e", "+e).join(""));return o}else{return[]}}function Rt(e){const t=At(e.target);const n=Nt(e);if(n){n.lastButtonClicked=t}}function qt(e){const t=Nt(e);if(t){t.lastButtonClicked=null}}function At(e){return g(ce(e),"button, input[type='submit']")}function Lt(e){return e.form||g(e,"form")}function Nt(e){const t=At(e.target);if(!t){return}const n=Lt(t);if(!n){return}return oe(n)}function It(e){e.addEventListener("click",Rt);e.addEventListener("focusin",Rt);e.addEventListener("focusout",qt)}function Dt(t,e,n){const r=oe(t);if(!Array.isArray(r.onHandlers)){r.onHandlers=[]}let o;const i=function(e){On(t,function(){if(ft(t)){return}if(!o){o=new Function("event",n)}o.call(t,e)})};t.addEventListener(e,i);r.onHandlers.push({event:e,listener:i})}function Pt(t){Pe(t);for(let e=0;eQ.config.historyCacheSize){i.shift()}while(i.length>0){try{sessionStorage.setItem("htmx-history-cache",JSON.stringify(i));break}catch(e){fe(te().body,"htmx:historyCacheError",{cause:e,cache:i});i.shift()}}}function Jt(t){if(!X()){return null}t=U(t);const n=v(sessionStorage.getItem("htmx-history-cache"))||[];for(let e=0;e=200&&this.status<400){r.response=this.response;ae(te().body,"htmx:historyCacheMissLoad",r);ze(r.historyElt,r.response,n,{contextElement:r.historyElt,historyRequest:true});$t(r.path);ae(te().body,"htmx:historyRestore",{path:e,cacheMiss:true,serverResponse:r.response})}else{fe(te().body,"htmx:historyCacheMissLoadError",r)}};if(ae(te().body,"htmx:historyCacheMiss",r)){t.send()}}function en(e){Gt();e=e||location.pathname+location.search;const t=Jt(e);if(t){const n={swapStyle:"innerHTML",swapDelay:0,settleDelay:0,scroll:t.scroll};const r={path:e,item:t,historyElt:_t(),swapSpec:n};if(ae(te().body,"htmx:historyCacheHit",r)){ze(r.historyElt,t.content,n,{contextElement:r.historyElt,title:t.title});$t(r.path);ae(te().body,"htmx:historyRestore",r)}}else{if(Q.config.refreshOnHistoryMiss){Q.location.reload(true)}else{Qt(e)}}}function tn(e){let t=we(e,"hx-indicator");if(t==null){t=[e]}ie(t,function(e){const t=oe(e);t.requestCount=(t.requestCount||0)+1;e.classList.add.call(e.classList,Q.config.requestClass)});return t}function nn(e){let t=we(e,"hx-disabled-elt");if(t==null){t=[]}ie(t,function(e){const t=oe(e);t.requestCount=(t.requestCount||0)+1;e.setAttribute("disabled","");e.setAttribute("data-disabled-by-htmx","")});return t}function rn(e,t){ie(e.concat(t),function(e){const t=oe(e);t.requestCount=(t.requestCount||1)-1});ie(e,function(e){const t=oe(e);if(t.requestCount===0){e.classList.remove.call(e.classList,Q.config.requestClass)}});ie(t,function(e){const t=oe(e);if(t.requestCount===0){e.removeAttribute("disabled");e.removeAttribute("data-disabled-by-htmx")}})}function on(t,n){for(let e=0;en.indexOf(e)<0)}else{e=e.filter(e=>e!==n)}r.delete(t);ie(e,e=>r.append(t,e))}}function un(e){if(e instanceof HTMLSelectElement&&e.multiple){return M(e.querySelectorAll("option:checked")).map(function(e){return e.value})}if(e instanceof HTMLInputElement&&e.files){return M(e.files)}return e.value}function fn(t,n,r,e,o){if(e==null||on(t,e)){return}else{t.push(e)}if(sn(e)){const i=ee(e,"name");ln(i,un(e),n);if(o){an(e,r)}}if(e instanceof HTMLFormElement){ie(e.elements,function(e){if(t.indexOf(e)>=0){cn(e.name,un(e),n)}else{t.push(e)}if(o){an(e,r)}});new FormData(e).forEach(function(e,t){if(e instanceof File&&e.name===""){return}ln(t,e,n)})}}function an(e,t){const n=e;if(n.willValidate){ae(n,"htmx:validation:validate");if(!n.checkValidity()){if(ae(n,"htmx:validation:failed",{message:n.validationMessage,validity:n.validity})&&!t.length&&Q.config.reportValidityOfForms){n.reportValidity()}t.push({elt:n,message:n.validationMessage,validity:n.validity})}}}function hn(n,e){for(const t of e.keys()){n.delete(t)}e.forEach(function(e,t){n.append(t,e)});return n}function dn(e,t){const n=[];const r=new FormData;const o=new FormData;const i=[];const s=oe(e);if(s.lastButtonClicked&&!se(s.lastButtonClicked)){s.lastButtonClicked=null}let l=e instanceof HTMLFormElement&&e.noValidate!==true||a(e,"hx-validate")==="true";if(s.lastButtonClicked){l=l&&s.lastButtonClicked.formNoValidate!==true}if(t!=="get"){fn(n,o,i,Lt(e),l)}fn(n,r,i,e,l);if(s.lastButtonClicked||e.tagName==="BUTTON"||e.tagName==="INPUT"&&ee(e,"type")==="submit"){const u=s.lastButtonClicked||e;const f=ee(u,"name");ln(f,u.value,o)}const c=we(e,"hx-include");ie(c,function(e){fn(n,r,i,ce(e),l);if(!h(e,"form")){ie(p(e).querySelectorAll(ot),function(e){fn(n,r,i,e,l)})}});hn(r,o);return{errors:i,formData:r,values:kn(r)}}function pn(e,t,n){if(e!==""){e+="&"}if(String(n)==="[object Object]"){n=JSON.stringify(n)}const r=encodeURIComponent(n);e+=encodeURIComponent(t)+"="+r;return e}function gn(e){e=Dn(e);let n="";e.forEach(function(e,t){n=pn(n,t,e)});return n}function mn(e,t,n){const r={"HX-Request":"true","HX-Trigger":ee(e,"id"),"HX-Trigger-Name":ee(e,"name"),"HX-Target":a(t,"id"),"HX-Current-URL":location.href};Cn(e,"hx-headers",false,r);if(n!==undefined){r["HX-Prompt"]=n}if(oe(e).boosted){r["HX-Boosted"]="true"}return r}function yn(n,e){const t=ne(e,"hx-params");if(t){if(t==="none"){return new FormData}else if(t==="*"){return n}else if(t.indexOf("not ")===0){ie(t.slice(4).split(","),function(e){e=e.trim();n.delete(e)});return n}else{const r=new FormData;ie(t.split(","),function(t){t=t.trim();if(n.has(t)){n.getAll(t).forEach(function(e){r.append(t,e)})}});return r}}else{return n}}function xn(e){return!!ee(e,"href")&&ee(e,"href").indexOf("#")>=0}function bn(e,t){const n=t||ne(e,"hx-swap");const r={swapStyle:oe(e).boosted?"innerHTML":Q.config.defaultSwapStyle,swapDelay:Q.config.defaultSwapDelay,settleDelay:Q.config.defaultSettleDelay};if(Q.config.scrollIntoViewOnBoost&&oe(e).boosted&&!xn(e)){r.show="top"}if(n){const s=B(n);if(s.length>0){for(let e=0;e0?o.join(":"):null;r.scroll=u;r.scrollTarget=i}else if(l.indexOf("show:")===0){const f=l.slice(5);var o=f.split(":");const a=o.pop();var i=o.length>0?o.join(":"):null;r.show=a;r.showTarget=i}else if(l.indexOf("focus-scroll:")===0){const h=l.slice("focus-scroll:".length);r.focusScroll=h=="true"}else if(e==0){r.swapStyle=l}else{H("Unknown modifier in hx-swap: "+l)}}}}return r}function vn(e){return ne(e,"hx-encoding")==="multipart/form-data"||h(e,"form")&&ee(e,"enctype")==="multipart/form-data"}function wn(t,n,r){let o=null;Vt(n,function(e){if(o==null){o=e.encodeParameters(t,r,n)}});if(o!=null){return o}else{if(vn(n)){return hn(new FormData,Dn(r))}else{return gn(r)}}}function Sn(e){return{tasks:[],elts:[e]}}function En(e,t){const n=e[0];const r=e[e.length-1];if(t.scroll){var o=null;if(t.scrollTarget){o=ce(ue(n,t.scrollTarget))}if(t.scroll==="top"&&(n||o)){o=o||n;o.scrollTop=0}if(t.scroll==="bottom"&&(r||o)){o=o||r;o.scrollTop=o.scrollHeight}if(typeof t.scroll==="number"){b().setTimeout(function(){window.scrollTo(0,t.scroll)},0)}}if(t.show){var o=null;if(t.showTarget){let e=t.showTarget;if(t.showTarget==="window"){e="body"}o=ce(ue(n,e))}if(t.show==="top"&&(n||o)){o=o||n;o.scrollIntoView({block:"start",behavior:Q.config.scrollBehavior})}if(t.show==="bottom"&&(r||o)){o=o||r;o.scrollIntoView({block:"end",behavior:Q.config.scrollBehavior})}}}function Cn(r,e,o,i,s){if(i==null){i={}}if(r==null){return i}const l=a(r,e);if(l){let e=l.trim();let t=o;if(e==="unset"){return null}if(e.indexOf("javascript:")===0){e=e.slice(11);t=true}else if(e.indexOf("js:")===0){e=e.slice(3);t=true}if(e.indexOf("{")!==0){e="{"+e+"}"}let n;if(t){n=On(r,function(){if(s){return Function("event","return ("+e+")").call(r,s)}else{return Function("return ("+e+")").call(r)}},{})}else{n=v(e)}for(const c in n){if(n.hasOwnProperty(c)){if(i[c]==null){i[c]=n[c]}}}}return Cn(ce(u(r)),e,o,i,s)}function On(e,t,n){if(Q.config.allowEval){return t()}else{fe(e,"htmx:evalDisallowedError");return n}}function Hn(e,t,n){return Cn(e,"hx-vars",true,n,t)}function Tn(e,t,n){return Cn(e,"hx-vals",false,n,t)}function Rn(e,t){return le(Hn(e,t),Tn(e,t))}function qn(t,n,r){if(r!==null){try{t.setRequestHeader(n,r)}catch(e){t.setRequestHeader(n,encodeURIComponent(r));t.setRequestHeader(n+"-URI-AutoEncoded","true")}}}function An(t){if(t.responseURL){try{const e=new URL(t.responseURL);return e.pathname+e.search}catch(e){fe(te().body,"htmx:badResponseUrl",{url:t.responseURL})}}}function T(e,t){return t.test(e.getAllResponseHeaders())}function Ln(t,n,r){t=t.toLowerCase();if(r){if(r instanceof Element||typeof r==="string"){return he(t,n,null,null,{targetOverride:w(r)||ve,returnPromise:true})}else{let e=w(r.target);if(r.target&&!e||r.source&&!e&&!w(r.source)){e=ve}return he(t,n,w(r.source),r.event,{handler:r.handler,headers:r.headers,values:r.values,targetOverride:e,swapOverride:r.swap,select:r.select,returnPromise:true,push:r.push,replace:r.replace,selectOOB:r.selectOOB})}}else{return he(t,n,null,null,{returnPromise:true})}}function Nn(e){const t=[];while(e){t.push(e);e=e.parentElement}return t}function In(e,t,n){const r=new URL(t,location.protocol!=="about:"?location.href:window.origin);const o=location.protocol!=="about:"?location.origin:window.origin;const i=o===r.origin;if(Q.config.selfRequestsOnly){if(!i){return false}}return ae(e,"htmx:validateUrl",le({url:r,sameHost:i},n))}function Dn(e){if(e instanceof FormData)return e;const t=new FormData;for(const n in e){if(e.hasOwnProperty(n)){if(e[n]&&typeof e[n].forEach==="function"){e[n].forEach(function(e){t.append(n,e)})}else if(typeof e[n]==="object"&&!(e[n]instanceof Blob)){t.append(n,JSON.stringify(e[n]))}else{t.append(n,e[n])}}}return t}function Pn(r,o,e){return new Proxy(e,{get:function(t,e){if(typeof e==="number")return t[e];if(e==="length")return t.length;if(e==="push"){return function(e){t.push(e);r.append(o,e)}}if(typeof t[e]==="function"){return function(){t[e].apply(t,arguments);r.delete(o);t.forEach(function(e){r.append(o,e)})}}if(t[e]&&t[e].length===1){return t[e][0]}else{return t[e]}},set:function(e,t,n){e[t]=n;r.delete(o);e.forEach(function(e){r.append(o,e)});return true}})}function kn(o){return new Proxy(o,{get:function(e,t){if(typeof t==="symbol"){const r=Reflect.get(e,t);if(typeof r==="function"){return function(){return r.apply(o,arguments)}}else{return r}}if(t==="toJSON"){return()=>Object.fromEntries(o)}if(t in e){if(typeof e[t]==="function"){return function(){return o[t].apply(o,arguments)}}}const n=o.getAll(t);if(n.length===0){return undefined}else if(n.length===1){return n[0]}else{return Pn(e,t,n)}},set:function(t,n,e){if(typeof n!=="string"){return false}t.delete(n);if(e&&typeof e.forEach==="function"){e.forEach(function(e){t.append(n,e)})}else if(typeof e==="object"&&!(e instanceof Blob)){t.append(n,JSON.stringify(e))}else{t.append(n,e)}return true},deleteProperty:function(e,t){if(typeof t==="string"){e.delete(t)}return true},ownKeys:function(e){return Reflect.ownKeys(Object.fromEntries(e))},getOwnPropertyDescriptor:function(e,t){return Reflect.getOwnPropertyDescriptor(Object.fromEntries(e),t)}})}function he(t,n,r,o,i,k){let s=null;let l=null;i=i!=null?i:{};if(i.returnPromise&&typeof Promise!=="undefined"){var e=new Promise(function(e,t){s=e;l=t})}if(r==null){r=te().body}const M=i.handler||Vn;const F=i.select||null;if(!se(r)){re(s);return e}const c=i.targetOverride||ce(Ee(r));if(c==null||c==ve){fe(r,"htmx:targetError",{target:ne(r,"hx-target")});re(l);return e}let u=oe(r);const f=u.lastButtonClicked;if(f){const A=ee(f,"formaction");if(A!=null){n=A}const L=ee(f,"formmethod");if(L!=null){if(de.includes(L.toLowerCase())){t=L}else{re(s);return e}}}const a=ne(r,"hx-confirm");if(k===undefined){const K=function(e){return he(t,n,r,o,i,!!e)};const G={target:c,elt:r,path:n,verb:t,triggeringEvent:o,etc:i,issueRequest:K,question:a};if(ae(r,"htmx:confirm",G)===false){re(s);return e}}let h=r;let d=ne(r,"hx-sync");let p=null;let B=false;if(d){const N=d.split(":");const I=N[0].trim();if(I==="this"){h=Se(r,"hx-sync")}else{h=ce(ue(r,I))}d=(N[1]||"drop").trim();u=oe(h);if(d==="drop"&&u.xhr&&u.abortable!==true){re(s);return e}else if(d==="abort"){if(u.xhr){re(s);return e}else{B=true}}else if(d==="replace"){ae(h,"htmx:abort")}else if(d.indexOf("queue")===0){const W=d.split(" ");p=(W[1]||"last").trim()}}if(u.xhr){if(u.abortable){ae(h,"htmx:abort")}else{if(p==null){if(o){const D=oe(o);if(D&&D.triggerSpec&&D.triggerSpec.queue){p=D.triggerSpec.queue}}if(p==null){p="last"}}if(u.queuedRequests==null){u.queuedRequests=[]}if(p==="first"&&u.queuedRequests.length===0){u.queuedRequests.push(function(){he(t,n,r,o,i)})}else if(p==="all"){u.queuedRequests.push(function(){he(t,n,r,o,i)})}else if(p==="last"){u.queuedRequests=[];u.queuedRequests.push(function(){he(t,n,r,o,i)})}re(s);return e}}const g=new XMLHttpRequest;u.xhr=g;u.abortable=B;const m=function(){u.xhr=null;u.abortable=false;if(u.queuedRequests!=null&&u.queuedRequests.length>0){const e=u.queuedRequests.shift();e()}};const X=ne(r,"hx-prompt");if(X){var y=prompt(X);if(y===null||!ae(r,"htmx:prompt",{prompt:y,target:c})){re(s);m();return e}}if(a&&!k){if(!confirm(a)){re(s);m();return e}}let x=mn(r,c,y);if(t!=="get"&&!vn(r)){x["Content-Type"]="application/x-www-form-urlencoded"}if(i.headers){x=le(x,i.headers)}const U=dn(r,t);let b=U.errors;const V=U.formData;if(i.values){hn(V,Dn(i.values))}const j=Dn(Rn(r,o));const v=hn(V,j);let w=yn(v,r);if(Q.config.getCacheBusterParam&&t==="get"){w.set("org.htmx.cache-buster",ee(c,"id")||"true")}if(n==null||n===""){n=location.href}const S=Cn(r,"hx-request");const $=oe(r).boosted;let E=Q.config.methodsThatUseUrlParams.indexOf(t)>=0;const C={boosted:$,useUrlParams:E,formData:w,parameters:kn(w),unfilteredFormData:v,unfilteredParameters:kn(v),headers:x,elt:r,target:c,verb:t,errors:b,withCredentials:i.credentials||S.credentials||Q.config.withCredentials,timeout:i.timeout||S.timeout||Q.config.timeout,path:n,triggeringEvent:o};if(!ae(r,"htmx:configRequest",C)){re(s);m();return e}n=C.path;t=C.verb;x=C.headers;w=Dn(C.parameters);b=C.errors;E=C.useUrlParams;if(b&&b.length>0){ae(r,"htmx:validation:halted",C);re(s);m();return e}const _=n.split("#");const z=_[0];const O=_[1];let H=n;if(E){H=z;const Z=!w.keys().next().done;if(Z){if(H.indexOf("?")<0){H+="?"}else{H+="&"}H+=gn(w);if(O){H+="#"+O}}}if(!In(r,H,C)){fe(r,"htmx:invalidPath",C);re(l);m();return e}g.open(t.toUpperCase(),H,true);g.overrideMimeType("text/html");g.withCredentials=C.withCredentials;g.timeout=C.timeout;if(S.noHeaders){}else{for(const P in x){if(x.hasOwnProperty(P)){const Y=x[P];qn(g,P,Y)}}}const T={xhr:g,target:c,requestConfig:C,etc:i,boosted:$,select:F,pathInfo:{requestPath:n,finalRequestPath:H,responsePath:null,anchor:O}};g.onload=function(){try{const t=Nn(r);T.pathInfo.responsePath=An(g);M(r,T);if(T.keepIndicators!==true){rn(R,q)}ae(r,"htmx:afterRequest",T);ae(r,"htmx:afterOnLoad",T);if(!se(r)){let e=null;while(t.length>0&&e==null){const n=t.shift();if(se(n)){e=n}}if(e){ae(e,"htmx:afterRequest",T);ae(e,"htmx:afterOnLoad",T)}}re(s)}catch(e){fe(r,"htmx:onLoadError",le({error:e},T));throw e}finally{m()}};g.onerror=function(){rn(R,q);fe(r,"htmx:afterRequest",T);fe(r,"htmx:sendError",T);re(l);m()};g.onabort=function(){rn(R,q);fe(r,"htmx:afterRequest",T);fe(r,"htmx:sendAbort",T);re(l);m()};g.ontimeout=function(){rn(R,q);fe(r,"htmx:afterRequest",T);fe(r,"htmx:timeout",T);re(l);m()};if(!ae(r,"htmx:beforeRequest",T)){re(s);m();return e}var R=tn(r);var q=nn(r);ie(["loadstart","loadend","progress","abort"],function(t){ie([g,g.upload],function(e){e.addEventListener(t,function(e){ae(r,"htmx:xhr:"+t,{lengthComputable:e.lengthComputable,loaded:e.loaded,total:e.total})})})});ae(r,"htmx:beforeSend",T);const J=E?null:wn(g,r,w);g.send(J);return e}function Mn(e,t){const n=t.xhr;let r=null;let o=null;if(T(n,/HX-Push:/i)){r=n.getResponseHeader("HX-Push");o="push"}else if(T(n,/HX-Push-Url:/i)){r=n.getResponseHeader("HX-Push-Url");o="push"}else if(T(n,/HX-Replace-Url:/i)){r=n.getResponseHeader("HX-Replace-Url");o="replace"}if(r){if(r==="false"){return{}}else{return{type:o,path:r}}}const i=t.pathInfo.finalRequestPath;const s=t.pathInfo.responsePath;const l=t.etc.push||ne(e,"hx-push-url");const c=t.etc.replace||ne(e,"hx-replace-url");const u=oe(e).boosted;let f=null;let a=null;if(l){f="push";a=l}else if(c){f="replace";a=c}else if(u){f="push";a=s||i}if(a){if(a==="false"){return{}}if(a==="true"){a=s||i}if(t.pathInfo.anchor&&a.indexOf("#")===-1){a=a+"#"+t.pathInfo.anchor}return{type:f,path:a}}else{return{}}}function Fn(e,t){var n=new RegExp(e.code);return n.test(t.toString(10))}function Bn(e){for(var t=0;t`+`.${t}{opacity:0;visibility: hidden} `+`.${n} .${t}, .${n}.${t}{opacity:1;visibility: visible;transition: opacity 200ms ease-in}`+"")}}function Zn(){const e=te().querySelector('meta[name="htmx-config"]');if(e){return v(e.content)}else{return null}}function Yn(){const e=Zn();if(e){Q.config=le(Q.config,e)}}Gn(function(){Yn();Wn();let e=te().body;Ft(e);const t=te().querySelectorAll("[hx-trigger='restored'],[data-hx-trigger='restored']");e.addEventListener("htmx:abort",function(e){const t=e.detail.elt||e.target;const n=oe(t);if(n&&n.xhr){n.xhr.abort()}});const n=window.onpopstate?window.onpopstate.bind(window):null;window.onpopstate=function(e){if(e.state&&e.state.htmx){en();ie(t,function(e){ae(e,"htmx:restored",{document:te(),triggerEvent:ae})})}else{if(n){n(e)}}};b().setTimeout(function(){ae(e,"htmx:load",{});e=null},0)});return Q}(); \ No newline at end of file diff --git a/crates/lib/page/htmx/json-enc-1.9.12.js b/crates/lib/page/htmx/json-enc-1.9.12.js new file mode 100644 index 0000000..f37a9c5 --- /dev/null +++ b/crates/lib/page/htmx/json-enc-1.9.12.js @@ -0,0 +1,11 @@ +htmx.defineExtension('json-enc', { + onEvent: function (name, evt) { + if (name === "htmx:configRequest") { + evt.detail.headers['Content-Type'] = "application/json"; + } + }, + encodeParameters: function (xhr, parameters, elt) { + xhr.overrideMimeType('text/json'); + return (JSON.stringify(parameters)); + } +}); \ No newline at end of file diff --git a/crates/lib/page/src/lib.rs b/crates/lib/page/src/lib.rs index 056e2f3..314daa7 100644 --- a/crates/lib/page/src/lib.rs +++ b/crates/lib/page/src/lib.rs @@ -1,8 +1,25 @@ -mod servable; -pub use servable::*; +//! A web stack for embedded uis. +//! +//! Featuring: +//! - htmx +//! - axum +//! - rust +//! - and maud -mod requestcontext; -pub use requestcontext::*; +pub mod servable; -mod server; -pub use server::*; +mod types; +pub use types::*; + +mod route; +pub use route::*; + +pub const HTMX_2_0_8: servable::StaticAsset = servable::StaticAsset { + bytes: include_str!("../htmx/htmx-2.0.8.min.js").as_bytes(), + mime: toolbox::mime::MimeType::Javascript, +}; + +pub const EXT_JSON_1_19_12: servable::StaticAsset = servable::StaticAsset { + bytes: include_str!("../htmx/json-enc-1.9.12.js").as_bytes(), + mime: toolbox::mime::MimeType::Javascript, +}; diff --git a/crates/lib/page/src/route.rs b/crates/lib/page/src/route.rs new file mode 100644 index 0000000..0853478 --- /dev/null +++ b/crates/lib/page/src/route.rs @@ -0,0 +1,275 @@ +use axum::{ + Router, + body::Body, + http::{HeaderMap, HeaderValue, Method, Request, StatusCode, header}, + response::{IntoResponse, Response}, +}; +use chrono::TimeDelta; +use std::{ + collections::{BTreeMap, HashMap}, + convert::Infallible, + net::SocketAddr, + pin::Pin, + sync::Arc, + task::{Context, Poll}, + time::Instant, +}; +use toolbox::mime::MimeType; +use tower::Service; +use tracing::trace; + +use crate::{ClientInfo, RenderContext, Rendered, RenderedBody, servable::Servable}; + +struct Default404 {} +impl Servable for Default404 { + fn head<'a>( + &'a self, + _ctx: &'a RenderContext, + ) -> Pin> + 'a + Send + Sync>> { + Box::pin(async { + return Rendered { + code: StatusCode::NOT_FOUND, + body: (), + ttl: Some(TimeDelta::days(1)), + immutable: true, + headers: HeaderMap::new(), + mime: Some(MimeType::Html), + }; + }) + } + + fn render<'a>( + &'a self, + ctx: &'a RenderContext, + ) -> Pin> + 'a + Send + Sync>> { + Box::pin(async { self.head(ctx).await.with_body(RenderedBody::Empty) }) + } +} + +/// A set of related [Servable]s under one route. +/// +/// Use as follows: +/// ```ignore +/// +/// // Add compression, for example. +/// // Also consider CORS and timeout. +/// let compression: CompressionLayer = CompressionLayer::new() +/// .br(true) +/// .deflate(true) +/// .gzip(true) +/// .zstd(true) +/// .compress_when(DefaultPredicate::new()); +/// +/// let route = ServableRoute::new() +/// .add_page( +/// "/page", +/// StaticAsset { +/// bytes: "I am a page".as_bytes(), +/// mime: MimeType::Text, +/// }, +/// ); +/// +/// Router::new() +/// .nest_service("/", route) +/// .layer(compression.clone()); +/// ``` +#[derive(Clone)] +pub struct ServableRoute { + pages: Arc>>, + notfound: Arc, +} + +impl ServableRoute { + pub fn new() -> Self { + Self { + pages: Arc::new(HashMap::new()), + notfound: Arc::new(Default404 {}), + } + } + + /// Set this server's "not found" page + pub fn with_404(mut self, page: S) -> Self { + self.notfound = Arc::new(page); + self + } + + /// Add a page to this server at the given route. + /// - panics if route does not start with a `/`, ends with a `/`, or contains `//`. + /// - urls are normalized, routes that violate this condition will never be served. + /// - `/` is an exception, it is valid. + /// - panics if called after this service is started + /// - overwrites existing pages + pub fn add_page(mut self, route: impl Into, page: S) -> Self { + let route = route.into(); + + if !route.starts_with("/") { + panic!("route must start with /") + }; + + if route.ends_with("/") && route != "/" { + panic!("route must not end with /") + }; + + if route.contains("//") { + panic!("route must not contain //") + }; + + #[expect(clippy::expect_used)] + Arc::get_mut(&mut self.pages) + .expect("add_pages called after service was started") + .insert(route, Arc::new(page)); + + self + } + + /// Convenience method. + /// Turns this service into a router. + /// + /// Equivalent to: + /// ```ignore + /// Router::new().fallback_service(self) + /// ``` + pub fn into_router(self) -> Router { + Router::new().fallback_service(self) + } +} + +// +// MARK: impl Service +// + +impl Service> for ServableRoute { + type Response = Response; + type Error = Infallible; + type Future = + Pin> + Send + 'static>>; + + fn poll_ready(&mut self, _cx: &mut Context<'_>) -> Poll> { + Poll::Ready(Ok(())) + } + + fn call(&mut self, req: Request) -> Self::Future { + if req.method() != Method::GET && req.method() != Method::HEAD { + let mut headers = HeaderMap::with_capacity(1); + headers.insert(header::ACCEPT, HeaderValue::from_static("GET,HEAD")); + return Box::pin(async { + Ok((StatusCode::METHOD_NOT_ALLOWED, headers).into_response()) + }); + } + + let pages = self.pages.clone(); + let notfound = self.notfound.clone(); + Box::pin(async move { + let addr = req.extensions().get::().copied(); + let route = req.uri().path().to_owned(); + let headers = req.headers().clone(); + let query: BTreeMap = + serde_urlencoded::from_str(req.uri().query().unwrap_or("")).unwrap_or_default(); + + let start = Instant::now(); + let client_info = ClientInfo::from_headers(&headers); + let ua = headers + .get("user-agent") + .and_then(|x| x.to_str().ok()) + .unwrap_or(""); + + trace!( + message = "Serving route", + route, + addr = ?addr, + user_agent = ua, + device_type = ?client_info.device_type + ); + + // Normalize url with redirect + if (route.ends_with('/') && route != "/") || route.contains("//") { + let mut new_route = route.clone(); + while new_route.contains("//") { + new_route = new_route.replace("//", "/"); + } + let new_route = new_route.trim_matches('/'); + + trace!( + message = "Redirecting", + route, + new_route, + addr = ?addr, + user_agent = ua, + device_type = ?client_info.device_type + ); + + let mut headers = HeaderMap::with_capacity(1); + match HeaderValue::from_str(&format!("/{new_route}")) { + Ok(x) => headers.append(header::LOCATION, x), + Err(_) => return Ok(StatusCode::BAD_REQUEST.into_response()), + }; + return Ok((StatusCode::PERMANENT_REDIRECT, headers).into_response()); + } + + let ctx = RenderContext { + client_info, + route, + query, + }; + + let page = pages.get(&ctx.route).unwrap_or(¬found); + let mut rend = match req.method() == Method::HEAD { + true => page.head(&ctx).await.with_body(RenderedBody::Empty), + false => page.render(&ctx).await, + }; + + // Tweak headers + { + if !rend.headers.contains_key(header::CACHE_CONTROL) { + let max_age = rend.ttl.map(|x| x.num_seconds()).unwrap_or(1).max(1); + + let mut value = String::new(); + if rend.immutable { + value.push_str("immutable, "); + } + + value.push_str("public, "); + value.push_str(&format!("max-age={}, ", max_age)); + + #[expect(clippy::unwrap_used)] + rend.headers.insert( + header::CACHE_CONTROL, + HeaderValue::from_str(value.trim().trim_end_matches(',')).unwrap(), + ); + } + + if !rend.headers.contains_key("Accept-CH") { + rend.headers + .insert("Accept-CH", HeaderValue::from_static("Sec-CH-UA-Mobile")); + } + + if !rend.headers.contains_key(header::CONTENT_TYPE) + && let Some(mime) = &rend.mime + { + #[expect(clippy::unwrap_used)] + rend.headers.insert( + header::CONTENT_TYPE, + HeaderValue::from_str(&mime.to_string()).unwrap(), + ); + } + } + + trace!( + message = "Served route", + route = ctx.route, + addr = ?addr, + user_agent = ua, + device_type = ?client_info.device_type, + time_ns = start.elapsed().as_nanos() + ); + + Ok(match rend.body { + RenderedBody::Markup(m) => (rend.code, rend.headers, m.0).into_response(), + RenderedBody::Static(d) => (rend.code, rend.headers, d).into_response(), + RenderedBody::Bytes(d) => (rend.code, rend.headers, d).into_response(), + RenderedBody::String(s) => (rend.code, rend.headers, s).into_response(), + RenderedBody::Empty => (rend.code, rend.headers).into_response(), + }) + }) + } +} diff --git a/crates/lib/page/src/servable/asset.rs b/crates/lib/page/src/servable/asset.rs index b7a591a..5739a4a 100644 --- a/crates/lib/page/src/servable/asset.rs +++ b/crates/lib/page/src/servable/asset.rs @@ -5,7 +5,7 @@ use std::{pin::Pin, str::FromStr}; use toolbox::mime::MimeType; use tracing::{error, trace}; -use crate::{Rendered, RenderedBody, RequestContext, Servable}; +use crate::{RenderContext, Rendered, RenderedBody, servable::Servable}; pub struct StaticAsset { pub bytes: &'static [u8], @@ -13,10 +13,69 @@ pub struct StaticAsset { } impl Servable for StaticAsset { + fn head<'a>( + &'a self, + ctx: &'a RenderContext, + ) -> Pin> + 'a + Send + Sync>> { + Box::pin(async { + let ttl = Some(TimeDelta::days(30)); + let is_image = TransformerChain::mime_is_image(&self.mime); + + let transform = match (is_image, ctx.query.get("t")) { + (false, _) | (_, None) => None, + + (true, Some(x)) => match TransformerChain::from_str(x) { + Ok(x) => Some(x), + Err(_err) => { + return Rendered { + code: StatusCode::BAD_REQUEST, + body: (), + ttl, + immutable: true, + + headers: HeaderMap::new(), + mime: None, + }; + } + }, + }; + + match transform { + Some(transform) => { + return Rendered { + code: StatusCode::OK, + body: (), + ttl, + immutable: true, + + headers: HeaderMap::new(), + mime: Some( + transform + .output_mime(&self.mime) + .unwrap_or(self.mime.clone()), + ), + }; + } + + None => { + return Rendered { + code: StatusCode::OK, + body: (), + ttl, + immutable: true, + + headers: HeaderMap::new(), + mime: Some(self.mime.clone()), + }; + } + } + }) + } + fn render<'a>( &'a self, - ctx: &'a RequestContext, - ) -> Pin + 'a + Send + Sync>> { + ctx: &'a RenderContext, + ) -> Pin> + 'a + Send + Sync>> { Box::pin(async { let ttl = Some(TimeDelta::days(30)); diff --git a/crates/lib/page/src/servable/mod.rs b/crates/lib/page/src/servable/mod.rs index 1713a49..a550c20 100644 --- a/crates/lib/page/src/servable/mod.rs +++ b/crates/lib/page/src/servable/mod.rs @@ -1,3 +1,26 @@ -pub mod asset; -pub mod page; -pub mod redirect; +mod asset; +pub use asset::*; + +mod page; +pub use page::*; + +mod redirect; +pub use redirect::*; + +/// Something that may be served over http. +pub trait Servable: Send + Sync { + /// Return the same response as [Servable::render], but with an empty body. + /// Used to respond to `HEAD` requests. + fn head<'a>( + &'a self, + ctx: &'a crate::RenderContext, + ) -> std::pin::Pin> + 'a + Send + Sync>>; + + /// Render this page + fn render<'a>( + &'a self, + ctx: &'a crate::RenderContext, + ) -> std::pin::Pin< + Box> + 'a + Send + Sync>, + >; +} diff --git a/crates/lib/page/src/servable/page.rs b/crates/lib/page/src/servable/page.rs index 8d5ca7c..1f07482 100644 --- a/crates/lib/page/src/servable/page.rs +++ b/crates/lib/page/src/servable/page.rs @@ -1,11 +1,11 @@ use axum::http::{HeaderMap, StatusCode}; use chrono::TimeDelta; -use maud::{Markup, Render, html}; +use maud::{DOCTYPE, Markup, PreEscaped, html}; use serde::Deserialize; -use std::pin::Pin; +use std::{pin::Pin, sync::Arc}; use toolbox::mime::MimeType; -use crate::{Rendered, RenderedBody, RequestContext, Servable}; +use crate::{RenderContext, Rendered, RenderedBody, servable::Servable}; // // MARK: metadata @@ -17,7 +17,6 @@ pub struct PageMetadata { pub author: Option, pub description: Option, pub image: Option, - pub backlinks: Option, } impl Default for PageMetadata { @@ -27,42 +26,15 @@ impl Default for PageMetadata { author: None, description: None, image: None, - backlinks: None, } } } -impl Render for PageMetadata { - fn render(&self) -> Markup { - let empty = String::new(); - let title = &self.title; - let author = &self.author.as_ref().unwrap_or(&empty); - let description = &self.description.as_ref().unwrap_or(&empty); - let image = &self.image.as_ref().unwrap_or(&empty); - - html !( - meta property="og:site_name" content=(title) {} - meta name="title" content=(title) {} - meta property="og:title" content=(title) {} - meta property="twitter:title" content=(title) {} - - meta name="author" content=(author) {} - - meta name="description" content=(description) {} - meta property="og:description" content=(description) {} - meta property="twitter:description" content=(description) {} - - meta content=(image) property="og:image" {} - link rel="shortcut icon" href=(image) type="image/x-icon" {} - ) - } -} - // // MARK: page // -// Some HTML +#[derive(Clone)] pub struct Page { pub meta: PageMetadata, pub immutable: bool, @@ -79,47 +51,101 @@ pub struct Page { /// or the contents of a wrapper element (defined in the page server struct). /// /// This closure must never return `` or ``. - pub generate_html: Box< + pub generate_html: Arc< dyn Send + Sync + + 'static + for<'a> Fn( &'a Page, - &'a RequestContext, - ) -> Pin + 'a + Send + Sync>>, + &'a RenderContext, + ) -> Pin + Send + Sync + 'a>>, >, pub response_code: StatusCode, + + pub scripts_inline: Vec, + pub scripts_linked: Vec, + pub styles_linked: Vec, + pub styles_inline: Vec, + + /// `name`, `content` for extra `` tags + pub extra_meta: Vec<(String, String)>, } impl Default for Page { fn default() -> Self { Page { + // No cache by default + html_ttl: None, + immutable: false, + meta: Default::default(), - html_ttl: Some(TimeDelta::days(1)), - generate_html: Box::new(|_, _| Box::pin(async { html!() })), - immutable: true, + generate_html: Arc::new(|_, _| Box::pin(async { html!() })), response_code: StatusCode::OK, + scripts_inline: Vec::new(), + scripts_linked: Vec::new(), + styles_inline: Vec::new(), + styles_linked: Vec::new(), + extra_meta: Vec::new(), } } } impl Page { - pub async fn generate_html(&self, ctx: &RequestContext) -> Markup { + pub async fn generate_html(&self, ctx: &RenderContext) -> Markup { (self.generate_html)(self, ctx).await } + + pub fn immutable(mut self, immutable: bool) -> Self { + self.immutable = immutable; + self + } + + pub fn html_ttl(mut self, html_ttl: Option) -> Self { + self.html_ttl = html_ttl; + self + } + + pub fn response_code(mut self, response_code: StatusCode) -> Self { + self.response_code = response_code; + self + } + + pub fn with_script_inline(mut self, script: impl Into) -> Self { + self.scripts_inline.push(script.into()); + self + } + + pub fn with_script_linked(mut self, url: impl Into) -> Self { + self.scripts_linked.push(url.into()); + self + } + + pub fn with_style_inline(mut self, style: impl Into) -> Self { + self.styles_inline.push(style.into()); + self + } + + pub fn with_style_linked(mut self, url: impl Into) -> Self { + self.styles_linked.push(url.into()); + self + } + + pub fn with_extra_meta(mut self, key: impl Into, value: impl Into) -> Self { + self.extra_meta.push((key.into(), value.into())); + self + } } impl Servable for Page { - fn render<'a>( + fn head<'a>( &'a self, - ctx: &'a RequestContext, - ) -> Pin + 'a + Send + Sync>> { + _ctx: &'a RenderContext, + ) -> Pin> + 'a + Send + Sync>> { Box::pin(async { - let html = self.generate_html(ctx).await; - return Rendered { code: self.response_code, - body: RenderedBody::Markup(html), + body: (), ttl: self.html_ttl, immutable: self.immutable, headers: HeaderMap::new(), @@ -127,4 +153,157 @@ impl Servable for Page { }; }) } + + fn render<'a>( + &'a self, + ctx: &'a RenderContext, + ) -> Pin> + 'a + Send + Sync>> { + Box::pin(async { + let inner_html = self.generate_html(ctx).await; + + let html = html! { + (DOCTYPE) + html { + head { + meta charset="UTF-8"; + meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no"; + meta content="text/html; charset=UTF-8" http-equiv="content-type"; + meta property="og:type" content="website"; + @for (name, content) in &self.extra_meta { + meta name=(name) content=(content); + } + + // + // Metadata + // + title { (PreEscaped(self.meta.title.clone())) } + meta property="og:site_name" content=(self.meta.title); + meta name="title" content=(self.meta.title); + meta property="og:title" content=(self.meta.title); + meta property="twitter:title" content=(self.meta.title); + + @if let Some(author) = &self.meta.author { + meta name="author" content=(author); + } + + @if let Some(desc) = &self.meta.description { + meta name="description" content=(desc); + meta property="og:description" content=(desc); + meta property="twitter:description" content=(desc); + } + + @if let Some(image) = &self.meta.image { + meta content=(image) property="og:image"; + link rel="shortcut icon" href=(image) type="image/x-icon"; + } + + // + // Scripts & styles + // + @for script in &self.scripts_linked { + script src=(script) {} + } + @for style in &self.styles_linked { + link rel="stylesheet" type="text/css" href=(style); + } + + @for script in &self.scripts_inline { + script { (PreEscaped(script)) } + } + @for style in &self.styles_inline { + style { (PreEscaped(style)) } + } + } + + body { main { (inner_html) } } + } + }; + + return self.head(ctx).await.with_body(RenderedBody::Markup(html)); + }) + } +} + +// +// MARK: template +// + +pub struct PageTemplate { + pub immutable: bool, + pub html_ttl: Option, + pub response_code: StatusCode, + + pub scripts_inline: &'static [&'static str], + pub scripts_linked: &'static [&'static str], + pub styles_inline: &'static [&'static str], + pub styles_linked: &'static [&'static str], + pub extra_meta: &'static [(&'static str, &'static str)], +} + +impl Default for PageTemplate { + fn default() -> Self { + Self::const_default() + } +} + +impl PageTemplate { + pub const fn const_default() -> Self { + Self { + html_ttl: Some(TimeDelta::days(1)), + immutable: true, + response_code: StatusCode::OK, + + scripts_inline: &[], + scripts_linked: &[], + styles_inline: &[], + styles_linked: &[], + extra_meta: &[], + } + } + + /// Create a new page using this template, + /// with the given metadata and renderer. + pub fn derive< + R: Send + + Sync + + 'static + + for<'a> Fn( + &'a Page, + &'a RenderContext, + ) -> Pin + Send + Sync + 'a>>, + >( + &self, + meta: PageMetadata, + generate_html: R, + ) -> Page { + Page { + meta, + immutable: self.immutable, + html_ttl: self.html_ttl, + response_code: self.response_code, + + scripts_inline: self + .scripts_inline + .iter() + .map(|x| (*x).to_owned()) + .collect(), + + scripts_linked: self + .scripts_linked + .iter() + .map(|x| (*x).to_owned()) + .collect(), + + styles_inline: self.styles_inline.iter().map(|x| (*x).to_owned()).collect(), + styles_linked: self.styles_linked.iter().map(|x| (*x).to_owned()).collect(), + + extra_meta: self + .extra_meta + .iter() + .map(|(a, b)| ((*a).to_owned(), (*b).to_owned())) + .collect(), + + generate_html: Arc::new(generate_html), + } + } } diff --git a/crates/lib/page/src/servable/redirect.rs b/crates/lib/page/src/servable/redirect.rs index 64e3479..c6f044b 100644 --- a/crates/lib/page/src/servable/redirect.rs +++ b/crates/lib/page/src/servable/redirect.rs @@ -5,7 +5,7 @@ use axum::http::{ header::{self, InvalidHeaderValue}, }; -use crate::{Rendered, RenderedBody, RequestContext, Servable}; +use crate::{RenderContext, Rendered, RenderedBody, servable::Servable}; pub struct Redirect { to: HeaderValue, @@ -20,10 +20,10 @@ impl Redirect { } impl Servable for Redirect { - fn render<'a>( + fn head<'a>( &'a self, - _ctx: &'a RequestContext, - ) -> Pin + 'a + Send + Sync>> { + _ctx: &'a RenderContext, + ) -> Pin> + 'a + Send + Sync>> { Box::pin(async { let mut headers = HeaderMap::with_capacity(1); headers.append(header::LOCATION, self.to.clone()); @@ -31,11 +31,18 @@ impl Servable for Redirect { return Rendered { code: StatusCode::PERMANENT_REDIRECT, headers, - body: RenderedBody::Empty, + body: (), ttl: None, immutable: true, mime: None, }; }) } + + fn render<'a>( + &'a self, + ctx: &'a RenderContext, + ) -> Pin> + 'a + Send + Sync>> { + Box::pin(async { self.head(ctx).await.with_body(RenderedBody::Empty) }) + } } diff --git a/crates/lib/page/src/server.rs b/crates/lib/page/src/server.rs deleted file mode 100644 index e21fbdb..0000000 --- a/crates/lib/page/src/server.rs +++ /dev/null @@ -1,324 +0,0 @@ -use axum::{ - Router, - extract::{ConnectInfo, Path, Query, State}, - http::{HeaderMap, HeaderValue, StatusCode, header}, - response::{IntoResponse, Response}, - routing::get, -}; -use chrono::{DateTime, TimeDelta, Utc}; -use libservice::ServiceConnectInfo; -use lru::LruCache; -use maud::Markup; -use parking_lot::Mutex; -use std::{ - collections::{BTreeMap, HashMap}, - num::NonZero, - pin::Pin, - sync::Arc, - time::Instant, -}; -use toolbox::mime::MimeType; -use tower_http::compression::{CompressionLayer, DefaultPredicate}; -use tracing::trace; - -use crate::{ClientInfo, RequestContext}; - -#[derive(Clone)] -pub enum RenderedBody { - Markup(Markup), - Static(&'static [u8]), - Bytes(Vec), - String(String), - Empty, -} - -#[derive(Clone)] -pub struct Rendered { - pub code: StatusCode, - pub headers: HeaderMap, - pub body: RenderedBody, - pub mime: Option, - - /// How long to cache this response. - /// If none, don't cache. - pub ttl: Option, - pub immutable: bool, -} - -pub trait Servable: Send + Sync { - fn render<'a>( - &'a self, - ctx: &'a RequestContext, - ) -> Pin + 'a + Send + Sync>>; -} - -pub struct Default404 {} -impl Servable for Default404 { - fn render<'a>( - &'a self, - _ctx: &'a RequestContext, - ) -> Pin + 'a + Send + Sync>> { - Box::pin(async { - return Rendered { - code: StatusCode::NOT_FOUND, - body: RenderedBody::String("page not found".into()), - ttl: Some(TimeDelta::days(1)), - immutable: true, - headers: HeaderMap::new(), - mime: Some(MimeType::Html), - }; - }) - } -} - -// -// MARK: server -// - -pub struct PageServer { - /// If true, expired pages will be rerendered before being sent to the user. - /// If false, requests never trigger rerenders. We rely on the rerender task. - /// - /// If true, we deliver fresher pages but delay responses. - /// TODO: replace this with a smarter rendering strategy? - never_rerender_on_request: bool, - - /// Map of `{ route: page }` - pages: Mutex>>, - - notfound: Mutex>, - - /// Map of `{ route: (page data, expire time) }` - /// - /// We use an LruCache for bounded memory usage. - page_cache: Mutex)>>, -} - -impl PageServer { - pub fn new() -> Arc { - #[expect(clippy::unwrap_used)] - let cache_size = NonZero::new(128).unwrap(); - - Arc::new(Self { - pages: Mutex::new(HashMap::new()), - page_cache: Mutex::new(LruCache::new(cache_size)), - never_rerender_on_request: true, - notfound: Mutex::new(Arc::new(Default404 {})), - }) - } - - /// Set this server's "not found" page - pub fn with_404(&self, page: S) -> &Self { - *self.notfound.lock() = Arc::new(page); - self - } - - pub fn add_page(&self, route: impl Into, page: S) -> &Self { - #[expect(clippy::expect_used)] - let route = route - .into() - .strip_prefix("/") - .expect("route must start with /") - .to_owned(); - - self.pages.lock().insert(route, Arc::new(page)); - self - } - - /// Re-render the page at `route`, regardless of cache state. - /// Does nothing if there is no page at `route`. - /// - /// Returns the rendered page's content. - async fn render_page( - &self, - reason: &'static str, - route: &str, - ctx: RequestContext, - ) -> (Rendered, Option>) { - let now = Utc::now(); - let start = Instant::now(); - - let page = match self.pages.lock().get(route) { - Some(x) => x.clone(), - None => self.notfound.lock().clone(), - }; - - trace!( - message = "Rendering page", - route = route.to_owned(), - reason, - lock_time_ms = start.elapsed().as_millis() - ); - - let rendered = page.render(&ctx).await; - - let mut expires = None; - if let Some(ttl) = rendered.ttl { - expires = Some(now + ttl); - self.page_cache - .lock() - .put(ctx, (rendered.clone(), now + ttl)); - } - - let elapsed = start.elapsed().as_millis(); - trace!( - message = "Rendered page", - route = route.to_owned(), - reason, - time_ms = elapsed - ); - return (rendered, expires); - } - - async fn handler( - Path(route): Path, - Query(query): Query>, - State(state): State>, - ConnectInfo(addr): ConnectInfo, - headers: HeaderMap, - ) -> Response { - let start = Instant::now(); - let client_info = ClientInfo::from_headers(&headers); - let ua = headers - .get("user-agent") - .and_then(|x| x.to_str().ok()) - .unwrap_or(""); - - trace!( - message = "Serving route", - route, - addr = ?addr.addr, - user_agent = ua, - device_type = ?client_info.device_type - ); - - // Normalize url with redirect - if route.ends_with('/') || route.contains("//") || route.starts_with('/') { - let mut new_route = route.clone(); - while new_route.contains("//") { - new_route = new_route.replace("//", "/"); - } - let new_route = new_route.trim_matches('/'); - - trace!( - message = "Redirecting", - route, - new_route, - addr = ?addr.addr, - user_agent = ua, - device_type = ?client_info.device_type - ); - - let mut headers = HeaderMap::with_capacity(2); - - let new_route = match HeaderValue::from_str(&format!("/{new_route}")) { - Ok(x) => x, - Err(_) => { - // Be extra careful, this is user-provided data - return StatusCode::BAD_REQUEST.into_response(); - } - }; - - headers.append(header::LOCATION, new_route); - headers.append("Accept-CH", HeaderValue::from_static("Sec-CH-UA-Mobile")); - return (StatusCode::PERMANENT_REDIRECT, headers).into_response(); - } - - let ctx = RequestContext { - client_info, - route: format!("/{route}"), - query, - }; - - let now = Utc::now(); - let mut html_expires = None; - let mut cached = true; - - // Get from cache, if available - if let Some((html, expires)) = state.page_cache.lock().get(&ctx) - && (*expires > now || state.never_rerender_on_request) - { - html_expires = Some((html.clone(), Some(*expires))); - }; - - if html_expires.is_none() { - cached = false; - html_expires = Some(state.render_page("request", &route, ctx).await); - } - - #[expect(clippy::unwrap_used)] - let (mut html, expires) = html_expires.unwrap(); - - if !html.headers.contains_key(header::CACHE_CONTROL) { - let max_age = match expires { - Some(expires) => (expires - now).num_seconds().max(1), - None => 1, - }; - - let mut value = String::new(); - if html.immutable { - value.push_str("immutable, "); - } - - value.push_str("public, "); - value.push_str(&format!("max-age={}, ", max_age)); - - #[expect(clippy::unwrap_used)] - html.headers.insert( - header::CACHE_CONTROL, - HeaderValue::from_str(value.trim().trim_end_matches(',')).unwrap(), - ); - } - - if !html.headers.contains_key("Accept-CH") { - html.headers - .insert("Accept-CH", HeaderValue::from_static("Sec-CH-UA-Mobile")); - } - - if let Some(mime) = &html.mime { - #[expect(clippy::unwrap_used)] - html.headers.insert( - header::CONTENT_TYPE, - HeaderValue::from_str(&mime.to_string()).unwrap(), - ); - } - - trace!( - message = "Served route", - route, - addr = ?addr.addr, - user_agent = ua, - device_type = ?client_info.device_type, - cached, - time_ns = start.elapsed().as_nanos() - ); - - return match html.body { - RenderedBody::Markup(markup) => (html.code, html.headers, markup.0).into_response(), - RenderedBody::Static(data) => (html.code, html.headers, data).into_response(), - RenderedBody::Bytes(data) => (html.code, html.headers, data).into_response(), - RenderedBody::String(s) => (html.code, html.headers, s).into_response(), - RenderedBody::Empty => (html.code, html.headers).into_response(), - }; - } - - pub fn into_router(self: Arc) -> Router<()> { - let compression: CompressionLayer = CompressionLayer::new() - .br(true) - .deflate(true) - .gzip(true) - .zstd(true) - .compress_when(DefaultPredicate::new()); - - Router::new() - .route( - "/", - get(|state, query, conn, headers| async { - Self::handler(Path(String::new()), query, state, conn, headers).await - }), - ) - .route("/{*path}", get(Self::handler)) - .layer(compression) - .with_state(self) - } -} diff --git a/crates/lib/page/src/requestcontext.rs b/crates/lib/page/src/types.rs similarity index 53% rename from crates/lib/page/src/requestcontext.rs rename to crates/lib/page/src/types.rs index 0806fb2..c08a139 100644 --- a/crates/lib/page/src/requestcontext.rs +++ b/crates/lib/page/src/types.rs @@ -1,16 +1,66 @@ +use axum::http::{HeaderMap, StatusCode}; +use chrono::TimeDelta; +use maud::Markup; use std::collections::BTreeMap; +use toolbox::mime::MimeType; -use axum::http::HeaderMap; +// +// MARK: rendered +// + +#[derive(Clone)] +pub enum RenderedBody { + Markup(Markup), + Static(&'static [u8]), + Bytes(Vec), + String(String), + Empty, +} + +pub trait RenderedBodyType {} +impl RenderedBodyType for () {} +impl RenderedBodyType for RenderedBody {} + +#[derive(Clone)] +pub struct Rendered { + pub code: StatusCode, + pub headers: HeaderMap, + pub body: T, + pub mime: Option, + + /// How long to cache this response. + /// If none, don't cache. + pub ttl: Option, + pub immutable: bool, +} + +impl Rendered<()> { + /// Turn this [Rendered] into a [Rendered] with a body. + pub fn with_body(self, body: RenderedBody) -> Rendered { + Rendered { + code: self.code, + headers: self.headers, + body, + mime: self.mime, + ttl: self.ttl, + immutable: self.immutable, + } + } +} + +// +// MARK: context +// #[derive(Debug, Clone, PartialEq, Eq, Hash)] -pub struct RequestContext { +pub struct RenderContext { pub client_info: ClientInfo, pub route: String, pub query: BTreeMap, } // -// +// MARK: clientinfo // #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] @@ -25,10 +75,6 @@ impl Default for DeviceType { } } -// -// MARK: clientinfo -// - #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] pub struct ClientInfo { /// This is an estimate, but it's probably good enough. diff --git a/crates/lib/pixel-transform/src/chain.rs b/crates/lib/pixel-transform/src/chain.rs index 328da6c..d962940 100644 --- a/crates/lib/pixel-transform/src/chain.rs +++ b/crates/lib/pixel-transform/src/chain.rs @@ -38,6 +38,20 @@ impl TransformerChain { return image; } + pub fn output_mime(&self, input_mime: &MimeType) -> Option { + let mime = self + .steps + .last() + .and_then(|x| match x { + TransformerEnum::Format { format } => Some(MimeType::from(format.to_mime_type())), + _ => None, + }) + .unwrap_or(input_mime.clone()); + + let fmt = ImageFormat::from_mime_type(mime.to_string()); + fmt.map(|_| mime) + } + pub fn transform_bytes( &self, image_bytes: &[u8], diff --git a/crates/lib/toolbox/src/mime.rs b/crates/lib/toolbox/src/mime.rs index 2014ebd..4d99a82 100644 --- a/crates/lib/toolbox/src/mime.rs +++ b/crates/lib/toolbox/src/mime.rs @@ -251,6 +251,23 @@ impl From<&MimeType> for String { // MARK: fromstr // +impl MimeType { + /// Parse a mimetype from a string that may contain + /// whitespace or ";" parameters. + /// + /// Parameters are discarded, write your own parser if you need them. + pub fn from_header(s: &str) -> Result::Err> { + let s = s.trim(); + let semi = s.find(';').unwrap_or(s.len()); + let space = s.find(' ').unwrap_or(s.len()); + let limit = semi.min(space); + let s = &s[0..limit]; + let s = s.trim(); + + return Self::from_str(s); + } +} + impl FromStr for MimeType { type Err = std::convert::Infallible; @@ -687,4 +704,108 @@ impl MimeType { Self::Xul => Some("xul"), } } + + // + // MARK: is_text + // + + /// Returns true if this MIME type is always plain text. + pub fn is_text(&self) -> bool { + match self { + // Text types + Self::Text => true, + Self::Css => true, + Self::Csv => true, + Self::Html => true, + Self::Javascript => true, + Self::Json => true, + Self::JsonLd => true, + Self::Xml => true, + Self::Svg => true, + Self::Ics => true, + Self::Xhtml => true, + + // Script types + Self::Csh => true, + Self::Php => true, + Self::Sh => true, + + // All other types are not plain text + Self::Other(_) => false, + Self::Blob => false, + + // Audio + Self::Aac => false, + Self::Flac => false, + Self::Midi => false, + Self::Mp3 => false, + Self::Oga => false, + Self::Opus => false, + Self::Wav => false, + Self::Weba => false, + + // Video + Self::Avi => false, + Self::Mp4 => false, + Self::Mpeg => false, + Self::Ogv => false, + Self::Ts => false, + Self::WebmVideo => false, + Self::ThreeGp => false, + Self::ThreeG2 => false, + + // Images + Self::Apng => false, + Self::Avif => false, + Self::Bmp => false, + Self::Gif => false, + Self::Ico => false, + Self::Jpg => false, + Self::Png => false, + Self::Qoi => false, + Self::Tiff => false, + Self::Webp => false, + + // Documents + Self::Pdf => false, + Self::Rtf => false, + + // Archives + Self::Arc => false, + Self::Bz => false, + Self::Bz2 => false, + Self::Gz => false, + Self::Jar => false, + Self::Ogg => false, + Self::Rar => false, + Self::SevenZ => false, + Self::Tar => false, + Self::Zip => false, + + // Fonts + Self::Eot => false, + Self::Otf => false, + Self::Ttf => false, + Self::Woff => false, + Self::Woff2 => false, + + // Applications + Self::Abiword => false, + Self::Azw => false, + Self::Cda => false, + Self::Doc => false, + Self::Docx => false, + Self::Epub => false, + Self::Mpkg => false, + Self::Odp => false, + Self::Ods => false, + Self::Odt => false, + Self::Ppt => false, + Self::Pptx => false, + Self::Vsd => false, + Self::Xls => false, + Self::Xlsx => false, + Self::Xul => false, + } + } } diff --git a/crates/service/service-webpage/Cargo.toml b/crates/service/service-webpage/Cargo.toml index 8b68e2d..732ccc7 100644 --- a/crates/service/service-webpage/Cargo.toml +++ b/crates/service/service-webpage/Cargo.toml @@ -28,3 +28,4 @@ toml = { workspace = true } serde = { workspace = true } reqwest = { workspace = true } tokio = { workspace = true } +tower-http = { workspace = true } diff --git a/crates/service/service-webpage/src/components/md/mod.rs b/crates/service/service-webpage/src/components/md/mod.rs index f66eb5e..61eb482 100644 --- a/crates/service/service-webpage/src/components/md/mod.rs +++ b/crates/service/service-webpage/src/components/md/mod.rs @@ -1,9 +1,8 @@ use lazy_static::lazy_static; use markdown_it::generics::inline::full_link; use markdown_it::{MarkdownIt, Node}; -use maud::{Markup, PreEscaped, Render, html}; -use page::RequestContext; -use page::page::{Page, PageMetadata}; +use maud::{Markup, PreEscaped, Render}; +use page::servable::PageMetadata; use crate::components::md::emote::InlineEmote; use crate::components::md::frontmatter::{TomlFrontMatter, YamlFrontMatter}; @@ -86,10 +85,6 @@ impl Markdown<'_> { } } -// -// MARK: helpers -// - /// Try to read page metadata from a markdown file's frontmatter. /// - returns `none` if there is no frontmatter /// - returns an error if we fail to parse frontmatter @@ -101,33 +96,3 @@ pub fn meta_from_markdown(root_node: &Node) -> Result, toml .map(|x| toml::from_str::(&x.content)) .map_or(Ok(None), |v| v.map(Some)) } - -pub fn backlinks(page: &Page, ctx: &RequestContext) -> Option { - let mut last = None; - let mut backlinks = vec![("/", "home")]; - - if page.meta.backlinks.unwrap_or(false) { - let mut segments = ctx.route.split("/").skip(1).collect::>(); - last = segments.pop(); - - let mut end = 0; - for s in segments { - end += s.len(); - backlinks.push((&ctx.route[0..=end], s)); - end += 1; // trailing slash - } - } - - last.map(|last| { - html! { - div { - @for (url, text) in backlinks { - a href=(url) style="padding-left:5pt;padding-right:5pt;" { (text) } - "/" - } - - span style="color:var(--metaColor);padding-left:5pt;padding-right:5pt;" { (last) } - } - } - }) -} diff --git a/crates/service/service-webpage/src/pages/handouts.rs b/crates/service/service-webpage/src/pages/handouts.rs index 06f9f16..0281bc1 100644 --- a/crates/service/service-webpage/src/pages/handouts.rs +++ b/crates/service/service-webpage/src/pages/handouts.rs @@ -6,18 +6,17 @@ use std::{ use chrono::{DateTime, TimeDelta, Utc}; use maud::{Markup, PreEscaped, html}; -use page::{DeviceType, RequestContext, page::Page}; +use page::{DeviceType, RenderContext, servable::Page}; use parking_lot::Mutex; -use reqwest::StatusCode; use serde::Deserialize; use tracing::{debug, warn}; use crate::{ components::{ - md::{Markdown, backlinks, meta_from_markdown}, + md::{Markdown, meta_from_markdown}, misc::FarLink, }, - pages::page_wrapper, + pages::{MAIN_TEMPLATE, backlinks, footer}, }; #[derive(Debug, Deserialize)] @@ -114,11 +113,7 @@ async fn get_index() -> Result, reqwest::Error> { return Ok(res); } -fn build_list_for_group( - handouts: &[HandoutEntry], - group: &str, - req_ctx: &RequestContext, -) -> Markup { +fn build_list_for_group(handouts: &[HandoutEntry], group: &str, req_ctx: &RenderContext) -> Markup { let mobile = req_ctx.client_info.device_type == DeviceType::Mobile; if mobile { @@ -198,74 +193,79 @@ pub fn handouts() -> Page { let html = PreEscaped(md.render()); - Page { - meta, - html_ttl: Some(TimeDelta::seconds(300)), - immutable: false, - response_code: StatusCode::OK, - - generate_html: Box::new(move |page, ctx| { - let html = html.clone(); // TODO: find a way to not clone here + MAIN_TEMPLATE + .derive(meta, move |page, ctx| { + let html = html.clone(); let index = index.clone(); - Box::pin(async move { - let handouts = index.get().await; - - let fallback = html! { - span style="color:var(--yellow)" { - "Could not load handouts, something broke." - } - " " - ( - FarLink( - "https://git.betalupi.com/Mark/-/packages/generic/ormc-handouts/latest", - "Try this direct link." - ) - ) - }; - - let warmups = match &*handouts { - Ok(handouts) => build_list_for_group(handouts, "Warm-Ups", ctx), - Err(error) => { - warn!("Could not load handout index: {error:?}"); - fallback.clone() - } - }; - - let advanced = match &*handouts { - Ok(handouts) => build_list_for_group(handouts, "Advanced", ctx), - Err(_) => fallback, - }; - - let inner = html! { - @if let Some(backlinks) = backlinks(page, ctx) { - (backlinks) - } - - (html) - - (Markdown(concat!( - "## Warm-Ups", - "\n\n", - "Students never show up on time. Some come early, some come late. Warm-ups ", - "are my solution to this problem: we hand these out as students walk in, ", - "giving them something to do until we can start the lesson.", - ))) - (warmups) - br {} - - (Markdown(concat!( - "## Advanced", - "\n\n", - "The highest level of the ORMC, and the group I spend most of my time with. ", - "Students in ORMC Advanced are in high school, which means ", - "they're ~14-18 years old.", - ))) - (advanced) - br {} - }; - - page_wrapper(&page.meta, inner, true).await - }) - }), - } + render(html, index, page, ctx) + }) + .html_ttl(Some(TimeDelta::seconds(300))) +} + +fn render<'a>( + html: Markup, + index: Arc, reqwest::Error>>>, + _page: &'a Page, + ctx: &'a RenderContext, +) -> Pin + Send + Sync + 'a>> { + Box::pin(async move { + let handouts = index.get().await; + + let fallback = html! { + span style="color:var(--yellow)" { + "Could not load handouts, something broke." + } + " " + ( + FarLink( + "https://git.betalupi.com/Mark/-/packages/generic/ormc-handouts/latest", + "Try this direct link." + ) + ) + }; + + let warmups = match &*handouts { + Ok(handouts) => build_list_for_group(handouts, "Warm-Ups", ctx), + Err(error) => { + warn!("Could not load handout index: {error:?}"); + fallback.clone() + } + }; + + let advanced = match &*handouts { + Ok(handouts) => build_list_for_group(handouts, "Advanced", ctx), + Err(_) => fallback, + }; + + html! { + div class="wrapper" style="margin-top:3ex;" { + @if let Some(backlinks) = backlinks(ctx) { + (backlinks) + } + + (html) + + (Markdown(concat!( + "## Warm-Ups", + "\n\n", + "Students never show up on time. Some come early, some come late. Warm-ups ", + "are my solution to this problem: we hand these out as students walk in, ", + "giving them something to do until we can start the lesson.", + ))) + (warmups) + br {} + + (Markdown(concat!( + "## Advanced", + "\n\n", + "The highest level of the ORMC, and the group I spend most of my time with. ", + "Students in ORMC Advanced are in high school, which means ", + "they're ~14-18 years old.", + ))) + (advanced) + br {} + (footer()) + } + } + }) } diff --git a/crates/service/service-webpage/src/pages/index.rs b/crates/service/service-webpage/src/pages/index.rs index 9ad0ebc..a52c25e 100644 --- a/crates/service/service-webpage/src/pages/index.rs +++ b/crates/service/service-webpage/src/pages/index.rs @@ -1,5 +1,9 @@ -use maud::html; -use page::page::{Page, PageMetadata}; +use maud::{Markup, html}; +use page::{ + RenderContext, + servable::{Page, PageMetadata}, +}; +use std::pin::Pin; use crate::{ components::{ @@ -8,76 +12,78 @@ use crate::{ md::Markdown, misc::FarLink, }, - pages::page_wrapper, + pages::{MAIN_TEMPLATE, footer}, }; pub fn index() -> Page { - Page { - meta: PageMetadata { + MAIN_TEMPLATE.derive( + PageMetadata { title: "Betalupi: About".into(), author: Some("Mark".into()), description: None, image: Some("/assets/img/icon.png".to_owned()), - backlinks: Some(false), }, + render, + ) +} - generate_html: Box::new(move |page, _ctx| { - Box::pin(async { - let inner = html! { - h2 id="about" { "About" } +fn render<'a>( + _page: &'a Page, + _ctx: &'a RenderContext, +) -> Pin + Send + Sync + 'a>> { + Box::pin(async { + html! { + div class="wrapper" style="margin-top:3ex;" { + h2 id="about" { "About" } + div { - div { + img + class="img-placeholder" + src="/assets/img/cover-small.jpg?t=maxdim(20,20)" + data-large="/assets/img/cover-small.jpg" + style="image-rendering:pixelated;float:left;margin:10px;display:block;width:25%;" + {} - img - class="img-placeholder" - src="/assets/img/cover-small.jpg?t=maxdim(20,20)" - data-large="/assets/img/cover-small.jpg" - style="image-rendering:pixelated;float:left;margin:10px;display:block;width:25%;" - {} + div style="margin:2ex 1ex 2ex 1ex;display:inline-block;overflow:hidden;width:60%;" { + "Welcome, you've reached Mark's main page. Here you'll find" + " links to various projects I've worked on." - div style="margin:2ex 1ex 2ex 1ex;display:inline-block;overflow:hidden;width:60%;" { - "Welcome, you've reached Mark's main page. Here you'll find" - " links to various projects I've worked on." + ul { + li { (MangledBetaEmail {}) } + li { (MangledGoogleEmail {}) } - ul { - li { (MangledBetaEmail {}) } - li { (MangledGoogleEmail {}) } - - li { - ( - FarLink( - "https://github.com/rm-dr", - html!( - (FAIcon::Github) - "rm-dr" - ) + li { + ( + FarLink( + "https://github.com/rm-dr", + html!( + (FAIcon::Github) + "rm-dr" ) ) - } + ) + } - li { - ( - FarLink( - "https://git.betalupi.com", - html!( - (FAIcon::Git) - "git.betalupi.com" - ) + li { + ( + FarLink( + "https://git.betalupi.com", + html!( + (FAIcon::Git) + "git.betalupi.com" ) ) - } + ) } } - br style="clear:both;" {} } + br style="clear:both;" {} + } - (Markdown(include_str!("index.md"))) - }; + (Markdown(include_str!("index.md"))) - page_wrapper(&page.meta, inner, true).await - }) - }), - - ..Default::default() - } + (footer()) + } + } + }) } diff --git a/crates/service/service-webpage/src/pages/mod.rs b/crates/service/service-webpage/src/pages/mod.rs index ae27c17..c6f2431 100644 --- a/crates/service/service-webpage/src/pages/mod.rs +++ b/crates/service/service-webpage/src/pages/mod.rs @@ -1,12 +1,13 @@ use chrono::TimeDelta; -use maud::{DOCTYPE, Markup, PreEscaped, html}; -use page::page::{Page, PageMetadata}; -use reqwest::StatusCode; -use std::pin::Pin; +use maud::{Markup, PreEscaped, html}; +use page::{ + RenderContext, + servable::{Page, PageMetadata, PageTemplate}, +}; use crate::components::{ fa::FAIcon, - md::{Markdown, backlinks, meta_from_markdown}, + md::{Markdown, meta_from_markdown}, misc::FarLink, }; @@ -67,120 +68,119 @@ fn page_from_markdown(md: impl Into, default_image: Option) -> P let html = PreEscaped(md.render()); - Page { - meta, - immutable: true, - response_code: StatusCode::OK, - - html_ttl: Some(TimeDelta::days(1)), - generate_html: Box::new(move |page, ctx| { + MAIN_TEMPLATE + .derive(meta, move |_page, ctx| { let html = html.clone(); Box::pin(async move { - let inner = html! { - @if let Some(backlinks) = backlinks(page, ctx) { - (backlinks) + html! { + div class="wrapper" style="margin-top:3ex;" { + @if let Some(backlinks) = backlinks(ctx) { + (backlinks) + } + + (html) + + (footer()) } - - (html) - }; - - page_wrapper(&page.meta, inner, true).await + } }) - }), - } + }) + .html_ttl(Some(TimeDelta::days(1))) + .immutable(true) } // -// MARK: wrapper +// MARK: components // -pub fn page_wrapper<'a>( - meta: &'a PageMetadata, - inner: Markup, - footer: bool, -) -> Pin + 'a + Send + Sync>> { - Box::pin(async move { +const MAIN_TEMPLATE: PageTemplate = PageTemplate { + // Order matters, base htmx goes first + scripts_linked: &["/assets/htmx.js", "/assets/htmx-json.js"], + + // TODO: use htmx for this + scripts_inline: &[" + window.onload = function() { + var imgs = document.querySelectorAll('.img-placeholder'); + + imgs.forEach(img => { + img.style.border = 'none'; + img.style.filter = 'blur(10px)'; + img.style.transition = 'filter 0.3s'; + + var lg = new Image(); + lg.src = img.dataset.large; + lg.onload = function () { + img.src = img.dataset.large; + img.style.filter = 'blur(0px)'; + }; + }) + } + "], + + styles_inline: &[], + styles_linked: &["/assets/css/main.css"], + + extra_meta: &[( + "viewport", + "width=device-width,initial-scale=1,user-scalable=no", + )], + + ..PageTemplate::const_default() +}; + +pub fn backlinks(ctx: &RenderContext) -> Option { + let mut backlinks = vec![("/", "home")]; + + let mut segments = ctx.route.split("/").skip(1).collect::>(); + let last = segments.pop(); + + let mut end = 0; + for s in segments { + end += s.len(); + backlinks.push((&ctx.route[0..=end], s)); + end += 1; // trailing slash + } + + last.map(|last| { html! { - (DOCTYPE) - html { - head { - meta charset="UTF8" {} - meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" {} - meta content="text/html; charset=UTF-8" http-equiv="content-type" {} - meta property="og:type" content="website" {} - - link rel="stylesheet" href=("/assets/css/main.css") {} - - (&meta) - title { (PreEscaped(meta.title.clone())) } - - - // Use a small blurred placeholder while full-size images load. - // Requires no other special scripts or css, just add some tags - // to your ! - script { - (PreEscaped(" - window.onload = function() { - var imgs = document.querySelectorAll('.img-placeholder'); - - imgs.forEach(img => { - img.style.border = 'none'; - img.style.filter = 'blur(10px)'; - img.style.transition = 'filter 0.3s'; - - var lg = new Image(); - lg.src = img.dataset.large; - lg.onload = function () { - img.src = img.dataset.large; - img.style.filter = 'blur(0px)'; - }; - }) - } - ")) - } + div { + @for (url, text) in backlinks { + a href=(url) style="padding-left:5pt;padding-right:5pt;" { (text) } + "/" } - body { - main{ - div class="wrapper" style=( - // for 404 page. Margin makes it scroll. - match footer { - true => "margin-top:3ex;", - false =>"" - } - ) { - (inner) - - @if footer { - footer style="margin-top:10rem;" { - hr class = "footline" {} - div class = "footContainer" { - p { - "This site was built by hand with " - (FarLink("https://rust-lang.org", "Rust")) - ", " - (FarLink("https://maud.lambda.xyz", "Maud")) - ", and " - (FarLink("https://docs.rs/axum/latest/axum", "Axum")) - ". " - - ( - FarLink( - "https://git.betalupi.com/Mark/webpage", - html!( - (FAIcon::Git) - "Source here!" - ) - ) - ) - } - } - } - } - } - }} + span style="color:var(--metaColor);padding-left:5pt;padding-right:5pt;" { (last) } } } }) } + +pub fn footer() -> Markup { + html!( + footer style="margin-top:10rem;" { + hr class = "footline"; + div class = "footContainer" { + p { + "This site was built by hand with " + (FarLink("https://rust-lang.org", "Rust")) + ", " + (FarLink("https://maud.lambda.xyz", "Maud")) + ", and " + (FarLink("https://docs.rs/axum/latest/axum", "Axum")) + ". " + + ( + FarLink( + "https://git.betalupi.com/Mark/webpage", + html!( + (FAIcon::Git) + "Source here!" + ) + ) + ) + } + } + } + ) +} diff --git a/crates/service/service-webpage/src/pages/notfound.rs b/crates/service/service-webpage/src/pages/notfound.rs index ab3a6be..4f0d64a 100644 --- a/crates/service/service-webpage/src/pages/notfound.rs +++ b/crates/service/service-webpage/src/pages/notfound.rs @@ -1,34 +1,29 @@ use maud::html; -use page::page::{Page, PageMetadata}; +use page::servable::{Page, PageMetadata}; use reqwest::StatusCode; -use crate::pages::page_wrapper; +use crate::pages::MAIN_TEMPLATE; pub fn notfound() -> Page { - Page { - meta: PageMetadata { - title: "Betalupi: About".into(), - author: None, + MAIN_TEMPLATE.derive( + PageMetadata { + title: "Page not found".into(), + author:None, description: None, image: Some("/assets/img/icon.png".to_owned()), - backlinks: Some(false), }, - - response_code: StatusCode::NOT_FOUND, - generate_html: Box::new(move |page, _ctx| { + move |_page, _ctx| { Box::pin(async { - let inner = html! { - div style="display:flex;flex-direction:column;align-items:center;justify-content:center;min-height:100vh" { - p style="font-weight:bold;font-size:50pt;margin:0;" { "404" } - p style="font-size:13pt;margin:0;color:var(--grey);" { "(page not found)" } - a style="font-size:12pt;margin:10pt;padding:5px;" href="/" {"<- Back to site"} + html! { + div class="wrapper" { + div style="display:flex;flex-direction:column;align-items:center;justify-content:center;min-height:100vh" { + p style="font-weight:bold;font-size:50pt;margin:0;" { "404" } + p style="font-size:13pt;margin:0;color:var(--grey);" { "(page not found)" } + a style="font-size:12pt;margin:10pt;padding:5px;" href="/" {"<- Back to site"} + } } - }; - - page_wrapper(&page.meta, inner, false).await + } }) - }), - - ..Default::default() - } + }, + ).response_code(StatusCode::NOT_FOUND) } diff --git a/crates/service/service-webpage/src/routes/mod.rs b/crates/service/service-webpage/src/routes/mod.rs index e568917..e1dd814 100644 --- a/crates/service/service-webpage/src/routes/mod.rs +++ b/crates/service/service-webpage/src/routes/mod.rs @@ -1,27 +1,39 @@ use axum::Router; use macro_sass::sass; -use page::{PageServer, asset::StaticAsset, redirect::Redirect}; -use std::sync::Arc; +use page::{ + ServableRoute, + servable::{Redirect, StaticAsset}, +}; use toolbox::mime::MimeType; +use tower_http::compression::{CompressionLayer, DefaultPredicate}; use crate::pages; pub(super) fn router() -> Router<()> { - build_server().into_router() + let compression: CompressionLayer = CompressionLayer::new() + .br(true) + .deflate(true) + .gzip(true) + .zstd(true) + .compress_when(DefaultPredicate::new()); + + build_server().into_router().layer(compression) } -fn build_server() -> Arc { - let server = PageServer::new(); - - #[expect(clippy::unwrap_used)] - server +fn build_server() -> ServableRoute { + ServableRoute::new() .with_404(pages::notfound()) .add_page("/", pages::index()) .add_page("/links", pages::links()) .add_page("/whats-a-betalupi", pages::betalupi()) .add_page("/handouts", pages::handouts()) - .add_page("/htwah", Redirect::new("/handouts").unwrap()) + .add_page("/htwah", { + #[expect(clippy::unwrap_used)] + Redirect::new("/handouts").unwrap() + }) .add_page("/htwah/typesetting", pages::htwah_typesetting()) + .add_page("/assets/htmx.js", page::HTMX_2_0_8) + .add_page("/assets/htmx-json.js", page::EXT_JSON_1_19_12) // .add_page( "/assets/css/main.css", @@ -185,9 +197,7 @@ fn build_server() -> Arc { bytes: include_bytes!("../../assets/htwah/spacing-b.pdf"), mime: MimeType::Pdf, }, - ); - - server + ) } #[test] @@ -197,7 +207,6 @@ fn server_builds_without_panic() { .build() .unwrap() .block_on(async { - // Needs tokio context - let _server = build_server().into_router(); + let _server = build_server(); }); } diff --git a/typos.toml b/typos.toml index c71b25f..96ba0a7 100644 --- a/typos.toml +++ b/typos.toml @@ -6,4 +6,4 @@ extend-ignore-re = [ ] [files] -extend-exclude = ["crates/service/service-webpage/css"] +extend-exclude = ["crates/service/service-webpage/css", "crates/lib/page/htmx"]