+164 -137

Cargo.lock

··· 162 162 "proc-macro2", 163 163 "quote", 164 164 "serde", 165 165 - "syn 2.0.103", 165 165 + "syn 2.0.106", 166 166 ] 167 167 168 168 [[package]] ··· 204 204 dependencies = [ 205 205 "proc-macro2", 206 206 "quote", 207 207 - "syn 2.0.103", 207 207 + "syn 2.0.106", 208 208 "synstructure", 209 209 ] 210 210 ··· 216 216 dependencies = [ 217 217 "proc-macro2", 218 218 "quote", 219 219 - "syn 2.0.103", 219 219 + "syn 2.0.106", 220 220 ] 221 221 222 222 [[package]] ··· 274 274 dependencies = [ 275 275 "proc-macro2", 276 276 "quote", 277 277 - "syn 2.0.103", 277 277 + "syn 2.0.106", 278 278 ] 279 279 280 280 [[package]] ··· 291 291 dependencies = [ 292 292 "proc-macro2", 293 293 "quote", 294 294 - "syn 2.0.103", 294 294 + "syn 2.0.106", 295 295 ] 296 296 297 297 [[package]] ··· 507 507 "derive_utils", 508 508 "proc-macro2", 509 509 "quote", 510 510 - "syn 2.0.103", 510 510 + "syn 2.0.106", 511 511 ] 512 512 513 513 [[package]] ··· 749 749 "regex", 750 750 "rustc-hash 1.1.0", 751 751 "shlex", 752 752 - "syn 2.0.103", 752 752 + "syn 2.0.106", 753 753 "which", 754 754 ] 755 755 ··· 768 768 "regex", 769 769 "rustc-hash 1.1.0", 770 770 "shlex", 771 771 - "syn 2.0.103", 771 771 + "syn 2.0.106", 772 772 ] 773 773 774 774 [[package]] ··· 786 786 "regex", 787 787 "rustc-hash 2.1.1", 788 788 "shlex", 789 789 - "syn 2.0.103", 789 789 + "syn 2.0.106", 790 790 ] 791 791 792 792 [[package]] ··· 862 862 863 863 [[package]] 864 864 name = "camino" 865 865 - version = "1.1.9" 865 865 + version = "1.2.1" 866 866 source = "registry+https://github.com/rust-lang/crates.io-index" 867 867 - checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" 867 867 + checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609" 868 868 dependencies = [ 869 869 - "serde", 869 869 + "serde_core", 870 870 ] 871 871 872 872 [[package]] ··· 992 992 993 993 [[package]] 994 994 name = "clap" 995 995 - version = "4.5.47" 995 995 + version = "4.5.48" 996 996 source = "registry+https://github.com/rust-lang/crates.io-index" 997 997 - checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931" 997 997 + checksum = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae" 998 998 dependencies = [ 999 999 "clap_builder", 1000 1000 "clap_derive", ··· 1002 1002 1003 1003 [[package]] 1004 1004 name = "clap_builder" 1005 1005 - version = "4.5.47" 1005 1005 + version = "4.5.48" 1006 1006 source = "registry+https://github.com/rust-lang/crates.io-index" 1007 1007 - checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6" 1007 1007 + checksum = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9" 1008 1008 dependencies = [ 1009 1009 "anstream", 1010 1010 "anstyle", ··· 1021 1021 "heck", 1022 1022 "proc-macro2", 1023 1023 "quote", 1024 1024 - "syn 2.0.103", 1024 1024 + "syn 2.0.106", 1025 1025 ] 1026 1026 1027 1027 [[package]] ··· 1313 1313 "proc-macro2", 1314 1314 "quote", 1315 1315 "strsim 0.11.1", 1316 1316 - "syn 2.0.103", 1316 1316 + "syn 2.0.106", 1317 1317 ] 1318 1318 1319 1319 [[package]] ··· 1335 1335 dependencies = [ 1336 1336 "darling_core 0.20.11", 1337 1337 "quote", 1338 1338 - "syn 2.0.103", 1338 1338 + "syn 2.0.106", 1339 1339 ] 1340 1340 1341 1341 [[package]] ··· 1375 1375 checksum = "18e4fdb82bd54a12e42fb58a800dcae6b9e13982238ce2296dc3570b92148e1f" 1376 1376 dependencies = [ 1377 1377 "data-encoding", 1378 1378 - "syn 2.0.103", 1378 1378 + "syn 2.0.106", 1379 1379 ] 1380 1380 1381 1381 [[package]] ··· 1437 1437 "darling 0.20.11", 1438 1438 "proc-macro2", 1439 1439 "quote", 1440 1440 - "syn 2.0.103", 1440 1440 + "syn 2.0.106", 1441 1441 ] 1442 1442 1443 1443 [[package]] ··· 1447 1447 checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" 1448 1448 dependencies = [ 1449 1449 "derive_builder_core", 1450 1450 - "syn 2.0.103", 1450 1450 + "syn 2.0.106", 1451 1451 ] 1452 1452 1453 1453 [[package]] ··· 1467 1467 dependencies = [ 1468 1468 "proc-macro2", 1469 1469 "quote", 1470 1470 - "syn 2.0.103", 1470 1470 + "syn 2.0.106", 1471 1471 "unicode-xid", 1472 1472 ] 1473 1473 ··· 1479 1479 dependencies = [ 1480 1480 "proc-macro2", 1481 1481 "quote", 1482 1482 - "syn 2.0.103", 1482 1482 + "syn 2.0.106", 1483 1483 ] 1484 1484 1485 1485 [[package]] ··· 1523 1523 dependencies = [ 1524 1524 "proc-macro2", 1525 1525 "quote", 1526 1526 - "syn 2.0.103", 1526 1526 + "syn 2.0.106", 1527 1527 ] 1528 1528 1529 1529 [[package]] ··· 1540 1540 1541 1541 [[package]] 1542 1542 name = "dropshot" 1543 1543 - version = "0.16.2" 1543 1543 + version = "0.16.3" 1544 1544 source = "registry+https://github.com/rust-lang/crates.io-index" 1545 1545 - checksum = "50e8fed669e35e757646ad10f97c4d26dd22cce3da689b307954f7000d2719d0" 1545 1545 + checksum = "eedf902e40c1024b8ed9ca16378a54e9655cdf0e698245ba82d81a3778dcbc54" 1546 1546 dependencies = [ 1547 1547 "async-stream", 1548 1548 "async-trait", ··· 1559 1559 "http-body-util", 1560 1560 "hyper", 1561 1561 "hyper-util", 1562 1562 - "indexmap 2.9.0", 1562 1562 + "indexmap 2.11.4", 1563 1563 "multer", 1564 1564 "openapiv3", 1565 1565 "paste", ··· 1582 1582 "thiserror 2.0.16", 1583 1583 "tokio", 1584 1584 "tokio-rustls 0.25.0", 1585 1585 - "toml", 1585 1585 + "toml 0.9.7", 1586 1586 "uuid", 1587 1587 "version_check", 1588 1588 "waitgroup", ··· 1590 1590 1591 1591 [[package]] 1592 1592 name = "dropshot_endpoint" 1593 1593 - version = "0.16.2" 1593 1593 + version = "0.16.4" 1594 1594 source = "registry+https://github.com/rust-lang/crates.io-index" 1595 1595 - checksum = "acebb687581abdeaa2c89fa448818a5f803b0e68e5d7e7a1cf585a8f3c5c57ac" 1595 1595 + checksum = "89d09440e73a9dcf8a0f7fbd6ab889a7751d59f0fe76e5082a0a6d5623ec6da3" 1596 1596 dependencies = [ 1597 1597 "heck", 1598 1598 "proc-macro2", ··· 1600 1600 "semver", 1601 1601 "serde", 1602 1602 "serde_tokenstream", 1603 1603 - "syn 2.0.103", 1603 1603 + "syn 2.0.106", 1604 1604 ] 1605 1605 1606 1606 [[package]] ··· 1673 1673 "heck", 1674 1674 "proc-macro2", 1675 1675 "quote", 1676 1676 - "syn 2.0.103", 1676 1676 + "syn 2.0.106", 1677 1677 ] 1678 1678 1679 1679 [[package]] ··· 1685 1685 "once_cell", 1686 1686 "proc-macro2", 1687 1687 "quote", 1688 1688 - "syn 2.0.103", 1688 1688 + "syn 2.0.106", 1689 1689 ] 1690 1690 1691 1691 [[package]] ··· 2065 2065 dependencies = [ 2066 2066 "proc-macro2", 2067 2067 "quote", 2068 2068 - "syn 2.0.103", 2068 2068 + "syn 2.0.106", 2069 2069 ] 2070 2070 2071 2071 [[package]] ··· 2190 2190 "futures-core", 2191 2191 "futures-sink", 2192 2192 "http", 2193 2193 - "indexmap 2.9.0", 2193 2193 + "indexmap 2.11.4", 2194 2194 "slab", 2195 2195 "tokio", 2196 2196 "tokio-util", ··· 2560 2560 "js-sys", 2561 2561 "log", 2562 2562 "wasm-bindgen", 2563 2563 - "windows-core 0.61.0", 2563 2563 + "windows-core", 2564 2564 ] 2565 2565 2566 2566 [[package]] ··· 2687 2687 dependencies = [ 2688 2688 "proc-macro2", 2689 2689 "quote", 2690 2690 - "syn 2.0.103", 2690 2690 + "syn 2.0.106", 2691 2691 ] 2692 2692 2693 2693 [[package]] ··· 2730 2730 2731 2731 [[package]] 2732 2732 name = "indexmap" 2733 2733 - version = "2.9.0" 2733 2733 + version = "2.11.4" 2734 2734 source = "registry+https://github.com/rust-lang/crates.io-index" 2735 2735 - checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" 2735 2735 + checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" 2736 2736 dependencies = [ 2737 2737 "equivalent", 2738 2738 "hashbrown 0.15.2", 2739 2739 "serde", 2740 2740 + "serde_core", 2740 2741 ] 2741 2742 2742 2743 [[package]] ··· 2890 2891 dependencies = [ 2891 2892 "proc-macro2", 2892 2893 "quote", 2893 2893 - "syn 2.0.103", 2894 2894 + "syn 2.0.106", 2894 2895 ] 2895 2896 2896 2897 [[package]] ··· 3267 3268 "spin", 3268 3269 "tokio", 3269 3270 "tokio-util", 3270 3270 - "toml", 3271 3271 + "toml 0.8.23", 3271 3272 "tracing", 3272 3273 "tracing-subscriber", 3273 3274 ] ··· 3357 3358 "http-body-util", 3358 3359 "hyper", 3359 3360 "hyper-util", 3360 3360 - "indexmap 2.9.0", 3361 3361 + "indexmap 2.11.4", 3361 3362 "ipnet", 3362 3363 "metrics", 3363 3364 "metrics-util 0.19.0", ··· 3378 3379 "hyper", 3379 3380 "hyper-rustls", 3380 3381 "hyper-util", 3381 3381 - "indexmap 2.9.0", 3382 3382 + "indexmap 2.11.4", 3382 3383 "ipnet", 3383 3384 "metrics", 3384 3385 "metrics-util 0.20.0", ··· 3740 3741 3741 3742 [[package]] 3742 3743 name = "openapiv3" 3743 3743 - version = "2.0.0" 3744 3744 + version = "2.2.0" 3744 3745 source = "registry+https://github.com/rust-lang/crates.io-index" 3745 3745 - checksum = "cc02deea53ffe807708244e5914f6b099ad7015a207ee24317c22112e17d9c5c" 3746 3746 + checksum = "5c8d427828b22ae1fff2833a03d8486c2c881367f1c336349f307f321e7f4d05" 3746 3747 dependencies = [ 3747 3747 - "indexmap 2.9.0", 3748 3748 + "indexmap 2.11.4", 3748 3749 "serde", 3749 3750 "serde_json", 3750 3751 ] ··· 3772 3773 dependencies = [ 3773 3774 "proc-macro2", 3774 3775 "quote", 3775 3775 - "syn 2.0.103", 3776 3776 + "syn 2.0.106", 3776 3777 ] 3777 3778 3778 3779 [[package]] ··· 3949 3950 "pest_meta", 3950 3951 "proc-macro2", 3951 3952 "quote", 3952 3952 - "syn 2.0.103", 3953 3953 + "syn 2.0.106", 3953 3954 ] 3954 3955 3955 3956 [[package]] ··· 3979 3980 dependencies = [ 3980 3981 "proc-macro2", 3981 3982 "quote", 3982 3982 - "syn 2.0.103", 3983 3983 + "syn 2.0.106", 3983 3984 ] 3984 3985 3985 3986 [[package]] ··· 4097 4098 "proc-macro-crate", 4098 4099 "proc-macro2", 4099 4100 "quote", 4100 4100 - "syn 2.0.103", 4101 4101 + "syn 2.0.106", 4101 4102 ] 4102 4103 4103 4104 [[package]] ··· 4110 4111 "bytes", 4111 4112 "derive_more", 4112 4113 "futures-util", 4113 4113 - "indexmap 2.9.0", 4114 4114 + "indexmap 2.11.4", 4114 4115 "itertools 0.14.0", 4115 4116 "mime", 4116 4117 "num-traits", ··· 4134 4135 dependencies = [ 4135 4136 "darling 0.20.11", 4136 4137 "http", 4137 4137 - "indexmap 2.9.0", 4138 4138 + "indexmap 2.11.4", 4138 4139 "mime", 4139 4140 "proc-macro-crate", 4140 4141 "proc-macro2", 4141 4142 "quote", 4142 4143 "regex", 4143 4143 - "syn 2.0.103", 4144 4144 + "syn 2.0.106", 4144 4145 "thiserror 2.0.16", 4145 4146 ] 4146 4147 ··· 4181 4182 checksum = "6837b9e10d61f45f987d50808f83d1ee3d206c66acf650c3e4ae2e1f6ddedf55" 4182 4183 dependencies = [ 4183 4184 "proc-macro2", 4184 4184 - "syn 2.0.103", 4185 4185 + "syn 2.0.106", 4185 4186 ] 4186 4187 4187 4188 [[package]] ··· 4492 4493 dependencies = [ 4493 4494 "proc-macro2", 4494 4495 "quote", 4495 4495 - "syn 2.0.103", 4496 4496 + "syn 2.0.106", 4496 4497 ] 4497 4498 4498 4499 [[package]] ··· 4538 4539 4539 4540 [[package]] 4540 4541 name = "reqwest" 4541 4541 - version = "0.12.22" 4542 4542 + version = "0.12.23" 4542 4543 source = "registry+https://github.com/rust-lang/crates.io-index" 4543 4543 - checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531" 4544 4544 + checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb" 4544 4545 dependencies = [ 4545 4546 "async-compression", 4546 4547 "base64 0.22.1", ··· 4874 4875 "proc-macro2", 4875 4876 "quote", 4876 4877 "serde_derive_internals", 4877 4877 - "syn 2.0.103", 4878 4878 + "syn 2.0.106", 4878 4879 ] 4879 4880 4880 4881 [[package]] ··· 4973 4974 4974 4975 [[package]] 4975 4976 name = "serde" 4976 4976 - version = "1.0.219" 4977 4977 + version = "1.0.228" 4977 4978 source = "registry+https://github.com/rust-lang/crates.io-index" 4978 4978 - checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" 4979 4979 + checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" 4979 4980 dependencies = [ 4981 4981 + "serde_core", 4980 4982 "serde_derive", 4981 4983 ] 4982 4984 ··· 4990 4992 ] 4991 4993 4992 4994 [[package]] 4995 4995 + name = "serde_core" 4996 4996 + version = "1.0.228" 4997 4997 + source = "registry+https://github.com/rust-lang/crates.io-index" 4998 4998 + checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" 4999 4999 + dependencies = [ 5000 5000 + "serde_derive", 5001 5001 + ] 5002 5002 + 5003 5003 + [[package]] 4993 5004 name = "serde_derive" 4994 4994 - version = "1.0.219" 5005 5005 + version = "1.0.228" 4995 5006 source = "registry+https://github.com/rust-lang/crates.io-index" 4996 4996 - checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" 5007 5007 + checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" 4997 5008 dependencies = [ 4998 5009 "proc-macro2", 4999 5010 "quote", 5000 5000 - "syn 2.0.103", 5011 5011 + "syn 2.0.106", 5001 5012 ] 5002 5013 5003 5014 [[package]] ··· 5008 5019 dependencies = [ 5009 5020 "proc-macro2", 5010 5021 "quote", 5011 5011 - "syn 2.0.103", 5022 5022 + "syn 2.0.106", 5012 5023 ] 5013 5024 5014 5025 [[package]] ··· 5018 5029 checksum = "9d2de91cf02bbc07cde38891769ccd5d4f073d22a40683aa4bc7a95781aaa2c4" 5019 5030 dependencies = [ 5020 5031 "form_urlencoded", 5021 5021 - "indexmap 2.9.0", 5032 5032 + "indexmap 2.11.4", 5022 5033 "itoa", 5023 5034 "ryu", 5024 5035 "serde", ··· 5026 5037 5027 5038 [[package]] 5028 5039 name = "serde_json" 5029 5029 - version = "1.0.141" 5040 5040 + version = "1.0.145" 5030 5041 source = "registry+https://github.com/rust-lang/crates.io-index" 5031 5031 - checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3" 5042 5042 + checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" 5032 5043 dependencies = [ 5033 5044 "itoa", 5034 5045 "memchr", 5035 5046 "ryu", 5036 5047 "serde", 5048 5048 + "serde_core", 5037 5049 ] 5038 5050 5039 5051 [[package]] ··· 5069 5081 ] 5070 5082 5071 5083 [[package]] 5084 5084 + name = "serde_spanned" 5085 5085 + version = "1.0.2" 5086 5086 + source = "registry+https://github.com/rust-lang/crates.io-index" 5087 5087 + checksum = "5417783452c2be558477e104686f7de5dae53dba813c28435e0e70f82d9b04ee" 5088 5088 + dependencies = [ 5089 5089 + "serde_core", 5090 5090 + ] 5091 5091 + 5092 5092 + [[package]] 5072 5093 name = "serde_tokenstream" 5073 5094 version = "0.2.2" 5074 5095 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 5077 5098 "proc-macro2", 5078 5099 "quote", 5079 5100 "serde", 5080 5080 - "syn 2.0.103", 5101 5101 + "syn 2.0.106", 5081 5102 ] 5082 5103 5083 5104 [[package]] ··· 5102 5123 "chrono", 5103 5124 "hex", 5104 5125 "indexmap 1.9.3", 5105 5105 - "indexmap 2.9.0", 5126 5126 + "indexmap 2.11.4", 5106 5127 "serde", 5107 5128 "serde_derive", 5108 5129 "serde_json", ··· 5119 5140 "darling 0.20.11", 5120 5141 "proc-macro2", 5121 5142 "quote", 5122 5122 - "syn 2.0.103", 5143 5143 + "syn 2.0.106", 5123 5144 ] 5124 5145 5125 5146 [[package]] ··· 5128 5149 source = "registry+https://github.com/rust-lang/crates.io-index" 5129 5150 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" 5130 5151 dependencies = [ 5131 5131 - "indexmap 2.9.0", 5152 5152 + "indexmap 2.11.4", 5132 5153 "itoa", 5133 5154 "ryu", 5134 5155 "serde", ··· 5421 5442 5422 5443 [[package]] 5423 5444 name = "syn" 5424 5424 - version = "2.0.103" 5445 5445 + version = "2.0.106" 5425 5446 source = "registry+https://github.com/rust-lang/crates.io-index" 5426 5426 - checksum = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8" 5447 5447 + checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" 5427 5448 dependencies = [ 5428 5449 "proc-macro2", 5429 5450 "quote", ··· 5447 5468 dependencies = [ 5448 5469 "proc-macro2", 5449 5470 "quote", 5450 5450 - "syn 2.0.103", 5471 5471 + "syn 2.0.106", 5451 5472 ] 5452 5473 5453 5474 [[package]] ··· 5533 5554 dependencies = [ 5534 5555 "proc-macro2", 5535 5556 "quote", 5536 5536 - "syn 2.0.103", 5557 5557 + "syn 2.0.106", 5537 5558 ] 5538 5559 5539 5560 [[package]] ··· 5544 5565 dependencies = [ 5545 5566 "proc-macro2", 5546 5567 "quote", 5547 5547 - "syn 2.0.103", 5568 5568 + "syn 2.0.106", 5548 5569 ] 5549 5570 5550 5571 [[package]] ··· 5669 5690 dependencies = [ 5670 5691 "proc-macro2", 5671 5692 "quote", 5672 5672 - "syn 2.0.103", 5693 5693 + "syn 2.0.106", 5673 5694 ] 5674 5695 5675 5696 [[package]] ··· 5760 5781 checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" 5761 5782 dependencies = [ 5762 5783 "serde", 5763 5763 - "serde_spanned", 5764 5764 - "toml_datetime", 5784 5784 + "serde_spanned 0.6.9", 5785 5785 + "toml_datetime 0.6.11", 5765 5786 "toml_edit", 5766 5787 ] 5767 5788 5768 5789 [[package]] 5790 5790 + name = "toml" 5791 5791 + version = "0.9.7" 5792 5792 + source = "registry+https://github.com/rust-lang/crates.io-index" 5793 5793 + checksum = "00e5e5d9bf2475ac9d4f0d9edab68cc573dc2fd644b0dba36b0c30a92dd9eaa0" 5794 5794 + dependencies = [ 5795 5795 + "indexmap 2.11.4", 5796 5796 + "serde_core", 5797 5797 + "serde_spanned 1.0.2", 5798 5798 + "toml_datetime 0.7.2", 5799 5799 + "toml_parser", 5800 5800 + "toml_writer", 5801 5801 + "winnow", 5802 5802 + ] 5803 5803 + 5804 5804 + [[package]] 5769 5805 name = "toml_datetime" 5770 5806 version = "0.6.11" 5771 5807 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 5775 5811 ] 5776 5812 5777 5813 [[package]] 5814 5814 + name = "toml_datetime" 5815 5815 + version = "0.7.2" 5816 5816 + source = "registry+https://github.com/rust-lang/crates.io-index" 5817 5817 + checksum = "32f1085dec27c2b6632b04c80b3bb1b4300d6495d1e129693bdda7d91e72eec1" 5818 5818 + dependencies = [ 5819 5819 + "serde_core", 5820 5820 + ] 5821 5821 + 5822 5822 + [[package]] 5778 5823 name = "toml_edit" 5779 5824 version = "0.22.27" 5780 5825 source = "registry+https://github.com/rust-lang/crates.io-index" 5781 5826 checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" 5782 5827 dependencies = [ 5783 5783 - "indexmap 2.9.0", 5828 5828 + "indexmap 2.11.4", 5784 5829 "serde", 5785 5785 - "serde_spanned", 5786 5786 - "toml_datetime", 5830 5830 + "serde_spanned 0.6.9", 5831 5831 + "toml_datetime 0.6.11", 5787 5832 "toml_write", 5788 5833 "winnow", 5789 5834 ] 5790 5835 5791 5836 [[package]] 5837 5837 + name = "toml_parser" 5838 5838 + version = "1.0.3" 5839 5839 + source = "registry+https://github.com/rust-lang/crates.io-index" 5840 5840 + checksum = "4cf893c33be71572e0e9aa6dd15e6677937abd686b066eac3f8cd3531688a627" 5841 5841 + dependencies = [ 5842 5842 + "winnow", 5843 5843 + ] 5844 5844 + 5845 5845 + [[package]] 5792 5846 name = "toml_write" 5793 5847 version = "0.1.2" 5794 5848 source = "registry+https://github.com/rust-lang/crates.io-index" 5795 5849 checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" 5850 5850 + 5851 5851 + [[package]] 5852 5852 + name = "toml_writer" 5853 5853 + version = "1.0.3" 5854 5854 + source = "registry+https://github.com/rust-lang/crates.io-index" 5855 5855 + checksum = "d163a63c116ce562a22cda521fcc4d79152e7aba014456fb5eb442f6d6a10109" 5796 5856 5797 5857 [[package]] 5798 5858 name = "tower" ··· 5860 5920 dependencies = [ 5861 5921 "proc-macro2", 5862 5922 "quote", 5863 5863 - "syn 2.0.103", 5923 5923 + "syn 2.0.106", 5864 5924 ] 5865 5925 5866 5926 [[package]] ··· 5910 5970 dependencies = [ 5911 5971 "proc-macro2", 5912 5972 "quote", 5913 5913 - "syn 2.0.103", 5973 5973 + "syn 2.0.106", 5914 5974 ] 5915 5975 5916 5976 [[package]] ··· 6110 6170 6111 6171 [[package]] 6112 6172 name = "uuid" 6113 6113 - version = "1.16.0" 6173 6173 + version = "1.18.1" 6114 6174 source = "registry+https://github.com/rust-lang/crates.io-index" 6115 6115 - checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" 6175 6175 + checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" 6116 6176 dependencies = [ 6117 6177 "getrandom 0.3.3", 6178 6178 + "js-sys", 6118 6179 "serde", 6180 6180 + "wasm-bindgen", 6119 6181 ] 6120 6182 6121 6183 [[package]] ··· 6230 6292 "log", 6231 6293 "proc-macro2", 6232 6294 "quote", 6233 6233 - "syn 2.0.103", 6295 6295 + "syn 2.0.106", 6234 6296 "wasm-bindgen-shared", 6235 6297 ] 6236 6298 ··· 6265 6327 dependencies = [ 6266 6328 "proc-macro2", 6267 6329 "quote", 6268 6268 - "syn 2.0.103", 6330 6330 + "syn 2.0.106", 6269 6331 "wasm-bindgen-backend", 6270 6332 "wasm-bindgen-shared", 6271 6333 ] ··· 6393 6455 source = "registry+https://github.com/rust-lang/crates.io-index" 6394 6456 checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" 6395 6457 dependencies = [ 6396 6396 - "windows-core 0.58.0", 6458 6458 + "windows-core", 6397 6459 "windows-targets 0.52.6", 6398 6460 ] 6399 6461 ··· 6403 6465 source = "registry+https://github.com/rust-lang/crates.io-index" 6404 6466 checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" 6405 6467 dependencies = [ 6406 6406 - "windows-implement 0.58.0", 6407 6407 - "windows-interface 0.58.0", 6468 6468 + "windows-implement", 6469 6469 + "windows-interface", 6408 6470 "windows-result 0.2.0", 6409 6471 "windows-strings 0.1.0", 6410 6472 "windows-targets 0.52.6", 6411 6473 ] 6412 6474 6413 6475 [[package]] 6414 6414 - name = "windows-core" 6415 6415 - version = "0.61.0" 6416 6416 - source = "registry+https://github.com/rust-lang/crates.io-index" 6417 6417 - checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" 6418 6418 - dependencies = [ 6419 6419 - "windows-implement 0.60.0", 6420 6420 - "windows-interface 0.59.1", 6421 6421 - "windows-link", 6422 6422 - "windows-result 0.3.4", 6423 6423 - "windows-strings 0.4.2", 6424 6424 - ] 6425 6425 - 6426 6426 - [[package]] 6427 6476 name = "windows-implement" 6428 6477 version = "0.58.0" 6429 6478 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 6431 6480 dependencies = [ 6432 6481 "proc-macro2", 6433 6482 "quote", 6434 6434 - "syn 2.0.103", 6435 6435 - ] 6436 6436 - 6437 6437 - [[package]] 6438 6438 - name = "windows-implement" 6439 6439 - version = "0.60.0" 6440 6440 - source = "registry+https://github.com/rust-lang/crates.io-index" 6441 6441 - checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" 6442 6442 - dependencies = [ 6443 6443 - "proc-macro2", 6444 6444 - "quote", 6445 6445 - "syn 2.0.103", 6483 6483 + "syn 2.0.106", 6446 6484 ] 6447 6485 6448 6486 [[package]] ··· 6453 6491 dependencies = [ 6454 6492 "proc-macro2", 6455 6493 "quote", 6456 6456 - "syn 2.0.103", 6457 6457 - ] 6458 6458 - 6459 6459 - [[package]] 6460 6460 - name = "windows-interface" 6461 6461 - version = "0.59.1" 6462 6462 - source = "registry+https://github.com/rust-lang/crates.io-index" 6463 6463 - checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" 6464 6464 - dependencies = [ 6465 6465 - "proc-macro2", 6466 6466 - "quote", 6467 6467 - "syn 2.0.103", 6494 6494 + "syn 2.0.106", 6468 6495 ] 6469 6496 6470 6497 [[package]] ··· 6671 6698 6672 6699 [[package]] 6673 6700 name = "winnow" 6674 6674 - version = "0.7.11" 6701 6701 + version = "0.7.13" 6675 6702 source = "registry+https://github.com/rust-lang/crates.io-index" 6676 6676 - checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd" 6703 6703 + checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" 6677 6704 dependencies = [ 6678 6705 "memchr", 6679 6706 ] ··· 6770 6797 dependencies = [ 6771 6798 "proc-macro2", 6772 6799 "quote", 6773 6773 - "syn 2.0.103", 6800 6800 + "syn 2.0.106", 6774 6801 "synstructure", 6775 6802 ] 6776 6803 ··· 6800 6827 dependencies = [ 6801 6828 "proc-macro2", 6802 6829 "quote", 6803 6803 - "syn 2.0.103", 6830 6830 + "syn 2.0.106", 6804 6831 ] 6805 6832 6806 6833 [[package]] ··· 6811 6838 dependencies = [ 6812 6839 "proc-macro2", 6813 6840 "quote", 6814 6814 - "syn 2.0.103", 6841 6841 + "syn 2.0.106", 6815 6842 ] 6816 6843 6817 6844 [[package]] ··· 6831 6858 dependencies = [ 6832 6859 "proc-macro2", 6833 6860 "quote", 6834 6834 - "syn 2.0.103", 6861 6861 + "syn 2.0.106", 6835 6862 "synstructure", 6836 6863 ] 6837 6864 ··· 6853 6880 dependencies = [ 6854 6881 "proc-macro2", 6855 6882 "quote", 6856 6856 - "syn 2.0.103", 6883 6883 + "syn 2.0.106", 6857 6884 ] 6858 6885 6859 6886 [[package]] ··· 6875 6902 dependencies = [ 6876 6903 "proc-macro2", 6877 6904 "quote", 6878 6878 - "syn 2.0.103", 6905 6905 + "syn 2.0.106", 6879 6906 ] 6880 6907 6881 6908 [[package]]

+661

constellation/LICENSE

··· 1 1 + GNU AFFERO GENERAL PUBLIC LICENSE 2 2 + Version 3, 19 November 2007 3 3 + 4 4 + Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> 5 5 + Everyone is permitted to copy and distribute verbatim copies 6 6 + of this license document, but changing it is not allowed. 7 7 + 8 8 + Preamble 9 9 + 10 10 + The GNU Affero General Public License is a free, copyleft license for 11 11 + software and other kinds of works, specifically designed to ensure 12 12 + cooperation with the community in the case of network server software. 13 13 + 14 14 + The licenses for most software and other practical works are designed 15 15 + to take away your freedom to share and change the works. By contrast, 16 16 + our General Public Licenses are intended to guarantee your freedom to 17 17 + share and change all versions of a program--to make sure it remains free 18 18 + software for all its users. 19 19 + 20 20 + When we speak of free software, we are referring to freedom, not 21 21 + price. Our General Public Licenses are designed to make sure that you 22 22 + have the freedom to distribute copies of free software (and charge for 23 23 + them if you wish), that you receive source code or can get it if you 24 24 + want it, that you can change the software or use pieces of it in new 25 25 + free programs, and that you know you can do these things. 26 26 + 27 27 + Developers that use our General Public Licenses protect your rights 28 28 + with two steps: (1) assert copyright on the software, and (2) offer 29 29 + you this License which gives you legal permission to copy, distribute 30 30 + and/or modify the software. 31 31 + 32 32 + A secondary benefit of defending all users' freedom is that 33 33 + improvements made in alternate versions of the program, if they 34 34 + receive widespread use, become available for other developers to 35 35 + incorporate. Many developers of free software are heartened and 36 36 + encouraged by the resulting cooperation. However, in the case of 37 37 + software used on network servers, this result may fail to come about. 38 38 + The GNU General Public License permits making a modified version and 39 39 + letting the public access it on a server without ever releasing its 40 40 + source code to the public. 41 41 + 42 42 + The GNU Affero General Public License is designed specifically to 43 43 + ensure that, in such cases, the modified source code becomes available 44 44 + to the community. It requires the operator of a network server to 45 45 + provide the source code of the modified version running there to the 46 46 + users of that server. Therefore, public use of a modified version, on 47 47 + a publicly accessible server, gives the public access to the source 48 48 + code of the modified version. 49 49 + 50 50 + An older license, called the Affero General Public License and 51 51 + published by Affero, was designed to accomplish similar goals. This is 52 52 + a different license, not a version of the Affero GPL, but Affero has 53 53 + released a new version of the Affero GPL which permits relicensing under 54 54 + this license. 55 55 + 56 56 + The precise terms and conditions for copying, distribution and 57 57 + modification follow. 58 58 + 59 59 + TERMS AND CONDITIONS 60 60 + 61 61 + 0. Definitions. 62 62 + 63 63 + "This License" refers to version 3 of the GNU Affero General Public License. 64 64 + 65 65 + "Copyright" also means copyright-like laws that apply to other kinds of 66 66 + works, such as semiconductor masks. 67 67 + 68 68 + "The Program" refers to any copyrightable work licensed under this 69 69 + License. Each licensee is addressed as "you". "Licensees" and 70 70 + "recipients" may be individuals or organizations. 71 71 + 72 72 + To "modify" a work means to copy from or adapt all or part of the work 73 73 + in a fashion requiring copyright permission, other than the making of an 74 74 + exact copy. The resulting work is called a "modified version" of the 75 75 + earlier work or a work "based on" the earlier work. 76 76 + 77 77 + A "covered work" means either the unmodified Program or a work based 78 78 + on the Program. 79 79 + 80 80 + To "propagate" a work means to do anything with it that, without 81 81 + permission, would make you directly or secondarily liable for 82 82 + infringement under applicable copyright law, except executing it on a 83 83 + computer or modifying a private copy. Propagation includes copying, 84 84 + distribution (with or without modification), making available to the 85 85 + public, and in some countries other activities as well. 86 86 + 87 87 + To "convey" a work means any kind of propagation that enables other 88 88 + parties to make or receive copies. Mere interaction with a user through 89 89 + a computer network, with no transfer of a copy, is not conveying. 90 90 + 91 91 + An interactive user interface displays "Appropriate Legal Notices" 92 92 + to the extent that it includes a convenient and prominently visible 93 93 + feature that (1) displays an appropriate copyright notice, and (2) 94 94 + tells the user that there is no warranty for the work (except to the 95 95 + extent that warranties are provided), that licensees may convey the 96 96 + work under this License, and how to view a copy of this License. If 97 97 + the interface presents a list of user commands or options, such as a 98 98 + menu, a prominent item in the list meets this criterion. 99 99 + 100 100 + 1. Source Code. 101 101 + 102 102 + The "source code" for a work means the preferred form of the work 103 103 + for making modifications to it. "Object code" means any non-source 104 104 + form of a work. 105 105 + 106 106 + A "Standard Interface" means an interface that either is an official 107 107 + standard defined by a recognized standards body, or, in the case of 108 108 + interfaces specified for a particular programming language, one that 109 109 + is widely used among developers working in that language. 110 110 + 111 111 + The "System Libraries" of an executable work include anything, other 112 112 + than the work as a whole, that (a) is included in the normal form of 113 113 + packaging a Major Component, but which is not part of that Major 114 114 + Component, and (b) serves only to enable use of the work with that 115 115 + Major Component, or to implement a Standard Interface for which an 116 116 + implementation is available to the public in source code form. A 117 117 + "Major Component", in this context, means a major essential component 118 118 + (kernel, window system, and so on) of the specific operating system 119 119 + (if any) on which the executable work runs, or a compiler used to 120 120 + produce the work, or an object code interpreter used to run it. 121 121 + 122 122 + The "Corresponding Source" for a work in object code form means all 123 123 + the source code needed to generate, install, and (for an executable 124 124 + work) run the object code and to modify the work, including scripts to 125 125 + control those activities. However, it does not include the work's 126 126 + System Libraries, or general-purpose tools or generally available free 127 127 + programs which are used unmodified in performing those activities but 128 128 + which are not part of the work. For example, Corresponding Source 129 129 + includes interface definition files associated with source files for 130 130 + the work, and the source code for shared libraries and dynamically 131 131 + linked subprograms that the work is specifically designed to require, 132 132 + such as by intimate data communication or control flow between those 133 133 + subprograms and other parts of the work. 134 134 + 135 135 + The Corresponding Source need not include anything that users 136 136 + can regenerate automatically from other parts of the Corresponding 137 137 + Source. 138 138 + 139 139 + The Corresponding Source for a work in source code form is that 140 140 + same work. 141 141 + 142 142 + 2. Basic Permissions. 143 143 + 144 144 + All rights granted under this License are granted for the term of 145 145 + copyright on the Program, and are irrevocable provided the stated 146 146 + conditions are met. This License explicitly affirms your unlimited 147 147 + permission to run the unmodified Program. The output from running a 148 148 + covered work is covered by this License only if the output, given its 149 149 + content, constitutes a covered work. This License acknowledges your 150 150 + rights of fair use or other equivalent, as provided by copyright law. 151 151 + 152 152 + You may make, run and propagate covered works that you do not 153 153 + convey, without conditions so long as your license otherwise remains 154 154 + in force. You may convey covered works to others for the sole purpose 155 155 + of having them make modifications exclusively for you, or provide you 156 156 + with facilities for running those works, provided that you comply with 157 157 + the terms of this License in conveying all material for which you do 158 158 + not control copyright. Those thus making or running the covered works 159 159 + for you must do so exclusively on your behalf, under your direction 160 160 + and control, on terms that prohibit them from making any copies of 161 161 + your copyrighted material outside their relationship with you. 162 162 + 163 163 + Conveying under any other circumstances is permitted solely under 164 164 + the conditions stated below. Sublicensing is not allowed; section 10 165 165 + makes it unnecessary. 166 166 + 167 167 + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. 168 168 + 169 169 + No covered work shall be deemed part of an effective technological 170 170 + measure under any applicable law fulfilling obligations under article 171 171 + 11 of the WIPO copyright treaty adopted on 20 December 1996, or 172 172 + similar laws prohibiting or restricting circumvention of such 173 173 + measures. 174 174 + 175 175 + When you convey a covered work, you waive any legal power to forbid 176 176 + circumvention of technological measures to the extent such circumvention 177 177 + is effected by exercising rights under this License with respect to 178 178 + the covered work, and you disclaim any intention to limit operation or 179 179 + modification of the work as a means of enforcing, against the work's 180 180 + users, your or third parties' legal rights to forbid circumvention of 181 181 + technological measures. 182 182 + 183 183 + 4. Conveying Verbatim Copies. 184 184 + 185 185 + You may convey verbatim copies of the Program's source code as you 186 186 + receive it, in any medium, provided that you conspicuously and 187 187 + appropriately publish on each copy an appropriate copyright notice; 188 188 + keep intact all notices stating that this License and any 189 189 + non-permissive terms added in accord with section 7 apply to the code; 190 190 + keep intact all notices of the absence of any warranty; and give all 191 191 + recipients a copy of this License along with the Program. 192 192 + 193 193 + You may charge any price or no price for each copy that you convey, 194 194 + and you may offer support or warranty protection for a fee. 195 195 + 196 196 + 5. Conveying Modified Source Versions. 197 197 + 198 198 + You may convey a work based on the Program, or the modifications to 199 199 + produce it from the Program, in the form of source code under the 200 200 + terms of section 4, provided that you also meet all of these conditions: 201 201 + 202 202 + a) The work must carry prominent notices stating that you modified 203 203 + it, and giving a relevant date. 204 204 + 205 205 + b) The work must carry prominent notices stating that it is 206 206 + released under this License and any conditions added under section 207 207 + 7. This requirement modifies the requirement in section 4 to 208 208 + "keep intact all notices". 209 209 + 210 210 + c) You must license the entire work, as a whole, under this 211 211 + License to anyone who comes into possession of a copy. This 212 212 + License will therefore apply, along with any applicable section 7 213 213 + additional terms, to the whole of the work, and all its parts, 214 214 + regardless of how they are packaged. This License gives no 215 215 + permission to license the work in any other way, but it does not 216 216 + invalidate such permission if you have separately received it. 217 217 + 218 218 + d) If the work has interactive user interfaces, each must display 219 219 + Appropriate Legal Notices; however, if the Program has interactive 220 220 + interfaces that do not display Appropriate Legal Notices, your 221 221 + work need not make them do so. 222 222 + 223 223 + A compilation of a covered work with other separate and independent 224 224 + works, which are not by their nature extensions of the covered work, 225 225 + and which are not combined with it such as to form a larger program, 226 226 + in or on a volume of a storage or distribution medium, is called an 227 227 + "aggregate" if the compilation and its resulting copyright are not 228 228 + used to limit the access or legal rights of the compilation's users 229 229 + beyond what the individual works permit. Inclusion of a covered work 230 230 + in an aggregate does not cause this License to apply to the other 231 231 + parts of the aggregate. 232 232 + 233 233 + 6. Conveying Non-Source Forms. 234 234 + 235 235 + You may convey a covered work in object code form under the terms 236 236 + of sections 4 and 5, provided that you also convey the 237 237 + machine-readable Corresponding Source under the terms of this License, 238 238 + in one of these ways: 239 239 + 240 240 + a) Convey the object code in, or embodied in, a physical product 241 241 + (including a physical distribution medium), accompanied by the 242 242 + Corresponding Source fixed on a durable physical medium 243 243 + customarily used for software interchange. 244 244 + 245 245 + b) Convey the object code in, or embodied in, a physical product 246 246 + (including a physical distribution medium), accompanied by a 247 247 + written offer, valid for at least three years and valid for as 248 248 + long as you offer spare parts or customer support for that product 249 249 + model, to give anyone who possesses the object code either (1) a 250 250 + copy of the Corresponding Source for all the software in the 251 251 + product that is covered by this License, on a durable physical 252 252 + medium customarily used for software interchange, for a price no 253 253 + more than your reasonable cost of physically performing this 254 254 + conveying of source, or (2) access to copy the 255 255 + Corresponding Source from a network server at no charge. 256 256 + 257 257 + c) Convey individual copies of the object code with a copy of the 258 258 + written offer to provide the Corresponding Source. This 259 259 + alternative is allowed only occasionally and noncommercially, and 260 260 + only if you received the object code with such an offer, in accord 261 261 + with subsection 6b. 262 262 + 263 263 + d) Convey the object code by offering access from a designated 264 264 + place (gratis or for a charge), and offer equivalent access to the 265 265 + Corresponding Source in the same way through the same place at no 266 266 + further charge. You need not require recipients to copy the 267 267 + Corresponding Source along with the object code. If the place to 268 268 + copy the object code is a network server, the Corresponding Source 269 269 + may be on a different server (operated by you or a third party) 270 270 + that supports equivalent copying facilities, provided you maintain 271 271 + clear directions next to the object code saying where to find the 272 272 + Corresponding Source. Regardless of what server hosts the 273 273 + Corresponding Source, you remain obligated to ensure that it is 274 274 + available for as long as needed to satisfy these requirements. 275 275 + 276 276 + e) Convey the object code using peer-to-peer transmission, provided 277 277 + you inform other peers where the object code and Corresponding 278 278 + Source of the work are being offered to the general public at no 279 279 + charge under subsection 6d. 280 280 + 281 281 + A separable portion of the object code, whose source code is excluded 282 282 + from the Corresponding Source as a System Library, need not be 283 283 + included in conveying the object code work. 284 284 + 285 285 + A "User Product" is either (1) a "consumer product", which means any 286 286 + tangible personal property which is normally used for personal, family, 287 287 + or household purposes, or (2) anything designed or sold for incorporation 288 288 + into a dwelling. In determining whether a product is a consumer product, 289 289 + doubtful cases shall be resolved in favor of coverage. For a particular 290 290 + product received by a particular user, "normally used" refers to a 291 291 + typical or common use of that class of product, regardless of the status 292 292 + of the particular user or of the way in which the particular user 293 293 + actually uses, or expects or is expected to use, the product. A product 294 294 + is a consumer product regardless of whether the product has substantial 295 295 + commercial, industrial or non-consumer uses, unless such uses represent 296 296 + the only significant mode of use of the product. 297 297 + 298 298 + "Installation Information" for a User Product means any methods, 299 299 + procedures, authorization keys, or other information required to install 300 300 + and execute modified versions of a covered work in that User Product from 301 301 + a modified version of its Corresponding Source. The information must 302 302 + suffice to ensure that the continued functioning of the modified object 303 303 + code is in no case prevented or interfered with solely because 304 304 + modification has been made. 305 305 + 306 306 + If you convey an object code work under this section in, or with, or 307 307 + specifically for use in, a User Product, and the conveying occurs as 308 308 + part of a transaction in which the right of possession and use of the 309 309 + User Product is transferred to the recipient in perpetuity or for a 310 310 + fixed term (regardless of how the transaction is characterized), the 311 311 + Corresponding Source conveyed under this section must be accompanied 312 312 + by the Installation Information. But this requirement does not apply 313 313 + if neither you nor any third party retains the ability to install 314 314 + modified object code on the User Product (for example, the work has 315 315 + been installed in ROM). 316 316 + 317 317 + The requirement to provide Installation Information does not include a 318 318 + requirement to continue to provide support service, warranty, or updates 319 319 + for a work that has been modified or installed by the recipient, or for 320 320 + the User Product in which it has been modified or installed. Access to a 321 321 + network may be denied when the modification itself materially and 322 322 + adversely affects the operation of the network or violates the rules and 323 323 + protocols for communication across the network. 324 324 + 325 325 + Corresponding Source conveyed, and Installation Information provided, 326 326 + in accord with this section must be in a format that is publicly 327 327 + documented (and with an implementation available to the public in 328 328 + source code form), and must require no special password or key for 329 329 + unpacking, reading or copying. 330 330 + 331 331 + 7. Additional Terms. 332 332 + 333 333 + "Additional permissions" are terms that supplement the terms of this 334 334 + License by making exceptions from one or more of its conditions. 335 335 + Additional permissions that are applicable to the entire Program shall 336 336 + be treated as though they were included in this License, to the extent 337 337 + that they are valid under applicable law. If additional permissions 338 338 + apply only to part of the Program, that part may be used separately 339 339 + under those permissions, but the entire Program remains governed by 340 340 + this License without regard to the additional permissions. 341 341 + 342 342 + When you convey a copy of a covered work, you may at your option 343 343 + remove any additional permissions from that copy, or from any part of 344 344 + it. (Additional permissions may be written to require their own 345 345 + removal in certain cases when you modify the work.) You may place 346 346 + additional permissions on material, added by you to a covered work, 347 347 + for which you have or can give appropriate copyright permission. 348 348 + 349 349 + Notwithstanding any other provision of this License, for material you 350 350 + add to a covered work, you may (if authorized by the copyright holders of 351 351 + that material) supplement the terms of this License with terms: 352 352 + 353 353 + a) Disclaiming warranty or limiting liability differently from the 354 354 + terms of sections 15 and 16 of this License; or 355 355 + 356 356 + b) Requiring preservation of specified reasonable legal notices or 357 357 + author attributions in that material or in the Appropriate Legal 358 358 + Notices displayed by works containing it; or 359 359 + 360 360 + c) Prohibiting misrepresentation of the origin of that material, or 361 361 + requiring that modified versions of such material be marked in 362 362 + reasonable ways as different from the original version; or 363 363 + 364 364 + d) Limiting the use for publicity purposes of names of licensors or 365 365 + authors of the material; or 366 366 + 367 367 + e) Declining to grant rights under trademark law for use of some 368 368 + trade names, trademarks, or service marks; or 369 369 + 370 370 + f) Requiring indemnification of licensors and authors of that 371 371 + material by anyone who conveys the material (or modified versions of 372 372 + it) with contractual assumptions of liability to the recipient, for 373 373 + any liability that these contractual assumptions directly impose on 374 374 + those licensors and authors. 375 375 + 376 376 + All other non-permissive additional terms are considered "further 377 377 + restrictions" within the meaning of section 10. If the Program as you 378 378 + received it, or any part of it, contains a notice stating that it is 379 379 + governed by this License along with a term that is a further 380 380 + restriction, you may remove that term. If a license document contains 381 381 + a further restriction but permits relicensing or conveying under this 382 382 + License, you may add to a covered work material governed by the terms 383 383 + of that license document, provided that the further restriction does 384 384 + not survive such relicensing or conveying. 385 385 + 386 386 + If you add terms to a covered work in accord with this section, you 387 387 + must place, in the relevant source files, a statement of the 388 388 + additional terms that apply to those files, or a notice indicating 389 389 + where to find the applicable terms. 390 390 + 391 391 + Additional terms, permissive or non-permissive, may be stated in the 392 392 + form of a separately written license, or stated as exceptions; 393 393 + the above requirements apply either way. 394 394 + 395 395 + 8. Termination. 396 396 + 397 397 + You may not propagate or modify a covered work except as expressly 398 398 + provided under this License. Any attempt otherwise to propagate or 399 399 + modify it is void, and will automatically terminate your rights under 400 400 + this License (including any patent licenses granted under the third 401 401 + paragraph of section 11). 402 402 + 403 403 + However, if you cease all violation of this License, then your 404 404 + license from a particular copyright holder is reinstated (a) 405 405 + provisionally, unless and until the copyright holder explicitly and 406 406 + finally terminates your license, and (b) permanently, if the copyright 407 407 + holder fails to notify you of the violation by some reasonable means 408 408 + prior to 60 days after the cessation. 409 409 + 410 410 + Moreover, your license from a particular copyright holder is 411 411 + reinstated permanently if the copyright holder notifies you of the 412 412 + violation by some reasonable means, this is the first time you have 413 413 + received notice of violation of this License (for any work) from that 414 414 + copyright holder, and you cure the violation prior to 30 days after 415 415 + your receipt of the notice. 416 416 + 417 417 + Termination of your rights under this section does not terminate the 418 418 + licenses of parties who have received copies or rights from you under 419 419 + this License. If your rights have been terminated and not permanently 420 420 + reinstated, you do not qualify to receive new licenses for the same 421 421 + material under section 10. 422 422 + 423 423 + 9. Acceptance Not Required for Having Copies. 424 424 + 425 425 + You are not required to accept this License in order to receive or 426 426 + run a copy of the Program. Ancillary propagation of a covered work 427 427 + occurring solely as a consequence of using peer-to-peer transmission 428 428 + to receive a copy likewise does not require acceptance. However, 429 429 + nothing other than this License grants you permission to propagate or 430 430 + modify any covered work. These actions infringe copyright if you do 431 431 + not accept this License. Therefore, by modifying or propagating a 432 432 + covered work, you indicate your acceptance of this License to do so. 433 433 + 434 434 + 10. Automatic Licensing of Downstream Recipients. 435 435 + 436 436 + Each time you convey a covered work, the recipient automatically 437 437 + receives a license from the original licensors, to run, modify and 438 438 + propagate that work, subject to this License. You are not responsible 439 439 + for enforcing compliance by third parties with this License. 440 440 + 441 441 + An "entity transaction" is a transaction transferring control of an 442 442 + organization, or substantially all assets of one, or subdividing an 443 443 + organization, or merging organizations. If propagation of a covered 444 444 + work results from an entity transaction, each party to that 445 445 + transaction who receives a copy of the work also receives whatever 446 446 + licenses to the work the party's predecessor in interest had or could 447 447 + give under the previous paragraph, plus a right to possession of the 448 448 + Corresponding Source of the work from the predecessor in interest, if 449 449 + the predecessor has it or can get it with reasonable efforts. 450 450 + 451 451 + You may not impose any further restrictions on the exercise of the 452 452 + rights granted or affirmed under this License. For example, you may 453 453 + not impose a license fee, royalty, or other charge for exercise of 454 454 + rights granted under this License, and you may not initiate litigation 455 455 + (including a cross-claim or counterclaim in a lawsuit) alleging that 456 456 + any patent claim is infringed by making, using, selling, offering for 457 457 + sale, or importing the Program or any portion of it. 458 458 + 459 459 + 11. Patents. 460 460 + 461 461 + A "contributor" is a copyright holder who authorizes use under this 462 462 + License of the Program or a work on which the Program is based. The 463 463 + work thus licensed is called the contributor's "contributor version". 464 464 + 465 465 + A contributor's "essential patent claims" are all patent claims 466 466 + owned or controlled by the contributor, whether already acquired or 467 467 + hereafter acquired, that would be infringed by some manner, permitted 468 468 + by this License, of making, using, or selling its contributor version, 469 469 + but do not include claims that would be infringed only as a 470 470 + consequence of further modification of the contributor version. For 471 471 + purposes of this definition, "control" includes the right to grant 472 472 + patent sublicenses in a manner consistent with the requirements of 473 473 + this License. 474 474 + 475 475 + Each contributor grants you a non-exclusive, worldwide, royalty-free 476 476 + patent license under the contributor's essential patent claims, to 477 477 + make, use, sell, offer for sale, import and otherwise run, modify and 478 478 + propagate the contents of its contributor version. 479 479 + 480 480 + In the following three paragraphs, a "patent license" is any express 481 481 + agreement or commitment, however denominated, not to enforce a patent 482 482 + (such as an express permission to practice a patent or covenant not to 483 483 + sue for patent infringement). To "grant" such a patent license to a 484 484 + party means to make such an agreement or commitment not to enforce a 485 485 + patent against the party. 486 486 + 487 487 + If you convey a covered work, knowingly relying on a patent license, 488 488 + and the Corresponding Source of the work is not available for anyone 489 489 + to copy, free of charge and under the terms of this License, through a 490 490 + publicly available network server or other readily accessible means, 491 491 + then you must either (1) cause the Corresponding Source to be so 492 492 + available, or (2) arrange to deprive yourself of the benefit of the 493 493 + patent license for this particular work, or (3) arrange, in a manner 494 494 + consistent with the requirements of this License, to extend the patent 495 495 + license to downstream recipients. "Knowingly relying" means you have 496 496 + actual knowledge that, but for the patent license, your conveying the 497 497 + covered work in a country, or your recipient's use of the covered work 498 498 + in a country, would infringe one or more identifiable patents in that 499 499 + country that you have reason to believe are valid. 500 500 + 501 501 + If, pursuant to or in connection with a single transaction or 502 502 + arrangement, you convey, or propagate by procuring conveyance of, a 503 503 + covered work, and grant a patent license to some of the parties 504 504 + receiving the covered work authorizing them to use, propagate, modify 505 505 + or convey a specific copy of the covered work, then the patent license 506 506 + you grant is automatically extended to all recipients of the covered 507 507 + work and works based on it. 508 508 + 509 509 + A patent license is "discriminatory" if it does not include within 510 510 + the scope of its coverage, prohibits the exercise of, or is 511 511 + conditioned on the non-exercise of one or more of the rights that are 512 512 + specifically granted under this License. You may not convey a covered 513 513 + work if you are a party to an arrangement with a third party that is 514 514 + in the business of distributing software, under which you make payment 515 515 + to the third party based on the extent of your activity of conveying 516 516 + the work, and under which the third party grants, to any of the 517 517 + parties who would receive the covered work from you, a discriminatory 518 518 + patent license (a) in connection with copies of the covered work 519 519 + conveyed by you (or copies made from those copies), or (b) primarily 520 520 + for and in connection with specific products or compilations that 521 521 + contain the covered work, unless you entered into that arrangement, 522 522 + or that patent license was granted, prior to 28 March 2007. 523 523 + 524 524 + Nothing in this License shall be construed as excluding or limiting 525 525 + any implied license or other defenses to infringement that may 526 526 + otherwise be available to you under applicable patent law. 527 527 + 528 528 + 12. No Surrender of Others' Freedom. 529 529 + 530 530 + If conditions are imposed on you (whether by court order, agreement or 531 531 + otherwise) that contradict the conditions of this License, they do not 532 532 + excuse you from the conditions of this License. If you cannot convey a 533 533 + covered work so as to satisfy simultaneously your obligations under this 534 534 + License and any other pertinent obligations, then as a consequence you may 535 535 + not convey it at all. For example, if you agree to terms that obligate you 536 536 + to collect a royalty for further conveying from those to whom you convey 537 537 + the Program, the only way you could satisfy both those terms and this 538 538 + License would be to refrain entirely from conveying the Program. 539 539 + 540 540 + 13. Remote Network Interaction; Use with the GNU General Public License. 541 541 + 542 542 + Notwithstanding any other provision of this License, if you modify the 543 543 + Program, your modified version must prominently offer all users 544 544 + interacting with it remotely through a computer network (if your version 545 545 + supports such interaction) an opportunity to receive the Corresponding 546 546 + Source of your version by providing access to the Corresponding Source 547 547 + from a network server at no charge, through some standard or customary 548 548 + means of facilitating copying of software. This Corresponding Source 549 549 + shall include the Corresponding Source for any work covered by version 3 550 550 + of the GNU General Public License that is incorporated pursuant to the 551 551 + following paragraph. 552 552 + 553 553 + Notwithstanding any other provision of this License, you have 554 554 + permission to link or combine any covered work with a work licensed 555 555 + under version 3 of the GNU General Public License into a single 556 556 + combined work, and to convey the resulting work. The terms of this 557 557 + License will continue to apply to the part which is the covered work, 558 558 + but the work with which it is combined will remain governed by version 559 559 + 3 of the GNU General Public License. 560 560 + 561 561 + 14. Revised Versions of this License. 562 562 + 563 563 + The Free Software Foundation may publish revised and/or new versions of 564 564 + the GNU Affero General Public License from time to time. Such new versions 565 565 + will be similar in spirit to the present version, but may differ in detail to 566 566 + address new problems or concerns. 567 567 + 568 568 + Each version is given a distinguishing version number. If the 569 569 + Program specifies that a certain numbered version of the GNU Affero General 570 570 + Public License "or any later version" applies to it, you have the 571 571 + option of following the terms and conditions either of that numbered 572 572 + version or of any later version published by the Free Software 573 573 + Foundation. If the Program does not specify a version number of the 574 574 + GNU Affero General Public License, you may choose any version ever published 575 575 + by the Free Software Foundation. 576 576 + 577 577 + If the Program specifies that a proxy can decide which future 578 578 + versions of the GNU Affero General Public License can be used, that proxy's 579 579 + public statement of acceptance of a version permanently authorizes you 580 580 + to choose that version for the Program. 581 581 + 582 582 + Later license versions may give you additional or different 583 583 + permissions. However, no additional obligations are imposed on any 584 584 + author or copyright holder as a result of your choosing to follow a 585 585 + later version. 586 586 + 587 587 + 15. Disclaimer of Warranty. 588 588 + 589 589 + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY 590 590 + APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT 591 591 + HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY 592 592 + OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, 593 593 + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 594 594 + PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM 595 595 + IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF 596 596 + ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 597 597 + 598 598 + 16. Limitation of Liability. 599 599 + 600 600 + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 601 601 + WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS 602 602 + THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY 603 603 + GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE 604 604 + USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF 605 605 + DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD 606 606 + PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), 607 607 + EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF 608 608 + SUCH DAMAGES. 609 609 + 610 610 + 17. Interpretation of Sections 15 and 16. 611 611 + 612 612 + If the disclaimer of warranty and limitation of liability provided 613 613 + above cannot be given local legal effect according to their terms, 614 614 + reviewing courts shall apply local law that most closely approximates 615 615 + an absolute waiver of all civil liability in connection with the 616 616 + Program, unless a warranty or assumption of liability accompanies a 617 617 + copy of the Program in return for a fee. 618 618 + 619 619 + END OF TERMS AND CONDITIONS 620 620 + 621 621 + How to Apply These Terms to Your New Programs 622 622 + 623 623 + If you develop a new program, and you want it to be of the greatest 624 624 + possible use to the public, the best way to achieve this is to make it 625 625 + free software which everyone can redistribute and change under these terms. 626 626 + 627 627 + To do so, attach the following notices to the program. It is safest 628 628 + to attach them to the start of each source file to most effectively 629 629 + state the exclusion of warranty; and each file should have at least 630 630 + the "copyright" line and a pointer to where the full notice is found. 631 631 + 632 632 + <one line to give the program's name and a brief idea of what it does.> 633 633 + Copyright (C) <year> <name of author> 634 634 + 635 635 + This program is free software: you can redistribute it and/or modify 636 636 + it under the terms of the GNU Affero General Public License as published 637 637 + by the Free Software Foundation, either version 3 of the License, or 638 638 + (at your option) any later version. 639 639 + 640 640 + This program is distributed in the hope that it will be useful, 641 641 + but WITHOUT ANY WARRANTY; without even the implied warranty of 642 642 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 643 643 + GNU Affero General Public License for more details. 644 644 + 645 645 + You should have received a copy of the GNU Affero General Public License 646 646 + along with this program. If not, see <https://www.gnu.org/licenses/>. 647 647 + 648 648 + Also add information on how to contact you by electronic and paper mail. 649 649 + 650 650 + If your software can interact with users remotely through a computer 651 651 + network, you should also make sure that it provides a way for users to 652 652 + get its source. For example, if your program is a web application, its 653 653 + interface could display a "Source" link that leads users to an archive 654 654 + of the code. There are many ways you could offer source, and different 655 655 + solutions will be better for different programs; see section 13 for the 656 656 + specific requirements. 657 657 + 658 658 + You should also get your employer (if you work as a programmer) or school, 659 659 + if any, to sign a "copyright disclaimer" for the program, if necessary. 660 660 + For more information on this, and how to apply and follow the GNU AGPL, see 661 661 + <https://www.gnu.org/licenses/>.

+3

constellation/LICENSE.future

··· 1 1 + constellation's source code is currently only available under the AGPL license. 2 2 + 3 3 + it MAY be relicensed in the future to MIT and/or Apache 2.0, at the sole discretion of the microcosm organization, but is not available under these licenses today.

+9

constellation/readme.md

··· 83 83 ``` 84 84 85 85 86 86 + ## Contributions 87 87 + 88 88 + ### Licensing 89 89 + 90 90 + Constellation's source code is currently available exclusively under the AGPL license (see [LICENSE](./LICENSE)). 91 91 + 92 92 + In the future, its code MAY become available under the MIT and/or Apache2.0 licenses, at the sole discretion of the microcosm organization. Contributing implies acceptance with this possible future licensing change. The change has not happed yet and is not guaranteed. 93 93 + 94 94 + 86 95 some todos 87 96 88 97 - [x] find links and write them to rocksdb

+57 -14

constellation/src/bin/main.rs

··· 1 1 use anyhow::{bail, Result}; 2 2 use clap::{Parser, ValueEnum}; 3 3 use metrics_exporter_prometheus::PrometheusBuilder; 4 4 + use std::net::SocketAddr; 4 5 use std::num::NonZero; 5 6 use std::path::PathBuf; 6 7 use std::sync::{atomic::AtomicU32, Arc}; ··· 21 22 #[derive(Parser, Debug)] 22 23 #[command(version, about, long_about = None)] 23 24 struct Args { 24 24 - #[arg(short, long)] 25 25 + /// constellation server's listen address 26 26 + #[arg(long)] 27 27 + #[clap(default_value = "0.0.0.0:6789")] 28 28 + bind: SocketAddr, 29 29 + /// metrics server's listen address 30 30 + #[arg(long)] 31 31 + #[clap(default_value = "0.0.0.0:8765")] 32 32 + bind_metrics: SocketAddr, 25 33 /// Jetstream server to connect to (exclusive with --fixture). Provide either a wss:// URL, or a shorhand value: 26 34 /// 'us-east-1', 'us-east-2', 'us-west-1', or 'us-west-2' 27 35 #[arg(short, long)] ··· 46 54 /// Saved jsonl from jetstream to use instead of a live subscription 47 55 #[arg(short, long)] 48 56 fixture: Option<PathBuf>, 57 57 + /// run a scan across the target id table and write all key -> ids to id -> keys 58 58 + #[arg(long, action)] 59 59 + repair_target_ids: bool, 49 60 } 50 61 51 62 #[derive(Debug, Clone, ValueEnum)] ··· 78 89 let stream = jetstream_url(&args.jetstream); 79 90 println!("using jetstream server {stream:?}...",); 80 91 92 92 + let bind = args.bind; 93 93 + let metrics_bind = args.bind_metrics; 94 94 + 81 95 let stay_alive = CancellationToken::new(); 82 96 83 97 match args.backend { 84 84 - StorageBackend::Memory => run(MemStorage::new(), fixture, None, stream, stay_alive), 98 98 + StorageBackend::Memory => run( 99 99 + MemStorage::new(), 100 100 + fixture, 101 101 + None, 102 102 + stream, 103 103 + bind, 104 104 + metrics_bind, 105 105 + stay_alive, 106 106 + ), 85 107 #[cfg(feature = "rocks")] 86 108 StorageBackend::Rocks => { 87 109 let storage_dir = args.data.clone().unwrap_or("rocks.test".into()); ··· 96 118 rocks.start_backup(backup_dir, auto_backup, stay_alive.clone())?; 97 119 } 98 120 println!("rocks ready."); 99 99 - run(rocks, fixture, args.data, stream, stay_alive) 121 121 + std::thread::scope(|s| { 122 122 + if args.repair_target_ids { 123 123 + let rocks = rocks.clone(); 124 124 + let stay_alive = stay_alive.clone(); 125 125 + s.spawn(move || { 126 126 + let rep = rocks.run_repair(time::Duration::from_millis(0), stay_alive); 127 127 + eprintln!("repair finished: {rep:?}"); 128 128 + rep 129 129 + }); 130 130 + } 131 131 + s.spawn(|| { 132 132 + let r = run( 133 133 + rocks, 134 134 + fixture, 135 135 + args.data, 136 136 + stream, 137 137 + bind, 138 138 + metrics_bind, 139 139 + stay_alive, 140 140 + ); 141 141 + eprintln!("run finished: {r:?}"); 142 142 + r 143 143 + }); 144 144 + }); 145 145 + Ok(()) 100 146 } 101 147 } 102 148 } ··· 106 152 fixture: Option<PathBuf>, 107 153 data_dir: Option<PathBuf>, 108 154 stream: String, 155 155 + bind: SocketAddr, 156 156 + metrics_bind: SocketAddr, 109 157 stay_alive: CancellationToken, 110 158 ) -> Result<()> { 111 159 ctrlc::set_handler({ ··· 150 198 .build() 151 199 .expect("axum startup") 152 200 .block_on(async { 153 153 - install_metrics_server()?; 154 154 - serve(readable, "0.0.0.0:6789", staying_alive).await 201 201 + install_metrics_server(metrics_bind)?; 202 202 + serve(readable, bind, staying_alive).await 155 203 }) 156 204 .unwrap(); 157 205 stay_alive.drop_guard(); ··· 184 232 185 233 'monitor: loop { 186 234 match readable.get_stats() { 187 187 - Ok(StorageStats { dids, targetables, linking_records }) => { 235 235 + Ok(StorageStats { dids, targetables, linking_records, .. }) => { 188 236 metrics::gauge!("storage.stats.dids").set(dids as f64); 189 237 metrics::gauge!("storage.stats.targetables").set(targetables as f64); 190 238 metrics::gauge!("storage.stats.linking_records").set(linking_records as f64); ··· 218 266 Ok(()) 219 267 } 220 268 221 221 - fn install_metrics_server() -> Result<()> { 269 269 + fn install_metrics_server(metrics_bind: SocketAddr) -> Result<()> { 222 270 println!("installing metrics server..."); 223 223 - let host = [0, 0, 0, 0]; 224 224 - let port = 8765; 225 271 PrometheusBuilder::new() 226 272 .set_quantiles(&[0.5, 0.9, 0.99, 1.0])? 227 273 .set_bucket_duration(time::Duration::from_secs(30))? 228 274 .set_bucket_count(NonZero::new(10).unwrap()) // count * duration = 5 mins. stuff doesn't happen that fast here. 229 275 .set_enable_unit_suffix(true) 230 230 - .with_http_listener((host, port)) 276 276 + .with_http_listener(metrics_bind) 231 277 .install()?; 232 232 - println!( 233 233 - "metrics server installed! listening on http://{}.{}.{}.{}:{port}", 234 234 - host[0], host[1], host[2], host[3] 235 235 - ); 278 278 + println!("metrics server installed! listening at {metrics_bind:?}"); 236 279 Ok(()) 237 280 } 238 281

+4

constellation/src/server/filters.rs

··· 22 22 pub fn human_number(n: &u64) -> askama::Result<String> { 23 23 Ok(n.to_formatted_string(&Locale::en)) 24 24 } 25 25 + 26 26 + pub fn to_u64(n: usize) -> askama::Result<u64> { 27 27 + Ok(n as u64) 28 28 + }

+299 -17

constellation/src/server/mod.rs

··· 14 14 use std::collections::{HashMap, HashSet}; 15 15 use std::time::{Duration, UNIX_EPOCH}; 16 16 use tokio::net::{TcpListener, ToSocketAddrs}; 17 17 - use tokio::task::block_in_place; 17 17 + use tokio::task::spawn_blocking; 18 18 use tokio_util::sync::CancellationToken; 19 19 20 20 use crate::storage::{LinkReader, StorageStats}; ··· 28 28 const DEFAULT_CURSOR_LIMIT: u64 = 16; 29 29 const DEFAULT_CURSOR_LIMIT_MAX: u64 = 100; 30 30 31 31 - const INDEX_BEGAN_AT_TS: u64 = 1738083600; // TODO: not this 31 31 + fn get_default_cursor_limit() -> u64 { 32 32 + DEFAULT_CURSOR_LIMIT 33 33 + } 34 34 + 35 35 + fn to500(e: tokio::task::JoinError) -> http::StatusCode { 36 36 + eprintln!("handler error: {e}"); 37 37 + http::StatusCode::INTERNAL_SERVER_ERROR 38 38 + } 32 39 33 40 pub async fn serve<S, A>(store: S, addr: A, stay_alive: CancellationToken) -> anyhow::Result<()> 34 41 where ··· 41 48 "/", 42 49 get({ 43 50 let store = store.clone(); 44 44 - move |accept| async { block_in_place(|| hello(accept, store)) } 51 51 + move |accept| async { 52 52 + spawn_blocking(|| hello(accept, store)) 53 53 + .await 54 54 + .map_err(to500)? 55 55 + } 56 56 + }), 57 57 + ) 58 58 + .route( 59 59 + "/xrpc/blue.microcosm.links.getManyToManyCounts", 60 60 + get({ 61 61 + let store = store.clone(); 62 62 + move |accept, query| async { 63 63 + spawn_blocking(|| get_many_to_many_counts(accept, query, store)) 64 64 + .await 65 65 + .map_err(to500)? 66 66 + } 45 67 }), 46 68 ) 47 69 .route( 48 70 "/links/count", 49 71 get({ 50 72 let store = store.clone(); 51 51 - move |accept, query| async { block_in_place(|| count_links(accept, query, store)) } 73 73 + move |accept, query| async { 74 74 + spawn_blocking(|| count_links(accept, query, store)) 75 75 + .await 76 76 + .map_err(to500)? 77 77 + } 52 78 }), 53 79 ) 54 80 .route( ··· 56 82 get({ 57 83 let store = store.clone(); 58 84 move |accept, query| async { 59 59 - block_in_place(|| count_distinct_dids(accept, query, store)) 85 85 + spawn_blocking(|| count_distinct_dids(accept, query, store)) 86 86 + .await 87 87 + .map_err(to500)? 88 88 + } 89 89 + }), 90 90 + ) 91 91 + .route( 92 92 + "/xrpc/blue.microcosm.links.getBacklinks", 93 93 + get({ 94 94 + let store = store.clone(); 95 95 + move |accept, query| async { 96 96 + spawn_blocking(|| get_backlinks(accept, query, store)) 97 97 + .await 98 98 + .map_err(to500)? 60 99 } 61 100 }), 62 101 ) ··· 64 103 "/links", 65 104 get({ 66 105 let store = store.clone(); 67 67 - move |accept, query| async { block_in_place(|| get_links(accept, query, store)) } 106 106 + move |accept, query| async { 107 107 + spawn_blocking(|| get_links(accept, query, store)) 108 108 + .await 109 109 + .map_err(to500)? 110 110 + } 68 111 }), 69 112 ) 70 113 .route( ··· 72 115 get({ 73 116 let store = store.clone(); 74 117 move |accept, query| async { 75 75 - block_in_place(|| get_distinct_dids(accept, query, store)) 118 118 + spawn_blocking(|| get_distinct_dids(accept, query, store)) 119 119 + .await 120 120 + .map_err(to500)? 76 121 } 77 122 }), 78 123 ) ··· 82 127 get({ 83 128 let store = store.clone(); 84 129 move |accept, query| async { 85 85 - block_in_place(|| count_all_links(accept, query, store)) 130 130 + spawn_blocking(|| count_all_links(accept, query, store)) 131 131 + .await 132 132 + .map_err(to500)? 86 133 } 87 134 }), 88 135 ) ··· 91 138 get({ 92 139 let store = store.clone(); 93 140 move |accept, query| async { 94 94 - block_in_place(|| explore_links(accept, query, store)) 141 141 + spawn_blocking(|| explore_links(accept, query, store)) 142 142 + .await 143 143 + .map_err(to500)? 95 144 } 96 145 }), 97 146 ) ··· 150 199 #[template(path = "hello.html.j2")] 151 200 struct HelloReponse { 152 201 help: &'static str, 153 153 - days_indexed: u64, 202 202 + days_indexed: Option<u64>, 154 203 stats: StorageStats, 155 204 } 156 205 fn hello( ··· 160 209 let stats = store 161 210 .get_stats() 162 211 .map_err(|_| http::StatusCode::INTERNAL_SERVER_ERROR)?; 163 163 - let days_indexed = (UNIX_EPOCH + Duration::from_secs(INDEX_BEGAN_AT_TS)) 164 164 - .elapsed() 212 212 + let days_indexed = stats 213 213 + .started_at 214 214 + .map(|c| (UNIX_EPOCH + Duration::from_micros(c)).elapsed()) 215 215 + .transpose() 165 216 .map_err(|_| http::StatusCode::INTERNAL_SERVER_ERROR)? 166 166 - .as_secs() 167 167 - / 86400; 217 217 + .map(|d| d.as_secs() / 86_400); 168 218 Ok(acceptable(accept, HelloReponse { 169 219 help: "open this URL in a web browser (or request with Accept: text/html) for information about this API.", 170 220 days_indexed, ··· 173 223 } 174 224 175 225 #[derive(Clone, Deserialize)] 226 226 + #[serde(rename_all = "camelCase")] 227 227 + struct GetManyToManyCountsQuery { 228 228 + subject: String, 229 229 + source: String, 230 230 + /// path to the secondary link in the linking record 231 231 + path_to_other: String, 232 232 + /// filter to linking records (join of the m2m) by these DIDs 233 233 + #[serde(default)] 234 234 + did: Vec<String>, 235 235 + /// filter to specific secondary records 236 236 + #[serde(default)] 237 237 + other_subject: Vec<String>, 238 238 + cursor: Option<OpaqueApiCursor>, 239 239 + /// Set the max number of links to return per page of results 240 240 + #[serde(default = "get_default_cursor_limit")] 241 241 + limit: u64, 242 242 + } 243 243 + #[derive(Serialize)] 244 244 + struct OtherSubjectCount { 245 245 + subject: String, 246 246 + total: u64, 247 247 + distinct: u64, 248 248 + } 249 249 + #[derive(Template, Serialize)] 250 250 + #[template(path = "get-many-to-many-counts.html.j2")] 251 251 + struct GetManyToManyCountsResponse { 252 252 + counts_by_other_subject: Vec<OtherSubjectCount>, 253 253 + cursor: Option<OpaqueApiCursor>, 254 254 + #[serde(skip_serializing)] 255 255 + query: GetManyToManyCountsQuery, 256 256 + } 257 257 + fn get_many_to_many_counts( 258 258 + accept: ExtractAccept, 259 259 + query: axum_extra::extract::Query<GetManyToManyCountsQuery>, 260 260 + store: impl LinkReader, 261 261 + ) -> Result<impl IntoResponse, http::StatusCode> { 262 262 + let cursor_key = query 263 263 + .cursor 264 264 + .clone() 265 265 + .map(|oc| ApiKeyedCursor::try_from(oc).map_err(|_| http::StatusCode::BAD_REQUEST)) 266 266 + .transpose()? 267 267 + .map(|c| c.next); 268 268 + 269 269 + let limit = query.limit; 270 270 + if limit > DEFAULT_CURSOR_LIMIT_MAX { 271 271 + return Err(http::StatusCode::BAD_REQUEST); 272 272 + } 273 273 + 274 274 + let filter_dids: HashSet<Did> = HashSet::from_iter( 275 275 + query 276 276 + .did 277 277 + .iter() 278 278 + .map(|d| d.trim()) 279 279 + .filter(|d| !d.is_empty()) 280 280 + .map(|d| Did(d.to_string())), 281 281 + ); 282 282 + 283 283 + let filter_other_subjects: HashSet<String> = HashSet::from_iter( 284 284 + query 285 285 + .other_subject 286 286 + .iter() 287 287 + .map(|s| s.trim().to_string()) 288 288 + .filter(|s| !s.is_empty()), 289 289 + ); 290 290 + 291 291 + let Some((collection, path)) = query.source.split_once(':') else { 292 292 + return Err(http::StatusCode::BAD_REQUEST); 293 293 + }; 294 294 + let path = format!(".{path}"); 295 295 + 296 296 + let path_to_other = format!(".{}", query.path_to_other); 297 297 + 298 298 + let paged = store 299 299 + .get_many_to_many_counts( 300 300 + &query.subject, 301 301 + collection, 302 302 + &path, 303 303 + &path_to_other, 304 304 + limit, 305 305 + cursor_key, 306 306 + &filter_dids, 307 307 + &filter_other_subjects, 308 308 + ) 309 309 + .map_err(|_| http::StatusCode::INTERNAL_SERVER_ERROR)?; 310 310 + 311 311 + let cursor = paged.next.map(|next| ApiKeyedCursor { next }.into()); 312 312 + 313 313 + let items = paged 314 314 + .items 315 315 + .into_iter() 316 316 + .map(|(subject, total, distinct)| OtherSubjectCount { 317 317 + subject, 318 318 + total, 319 319 + distinct, 320 320 + }) 321 321 + .collect(); 322 322 + 323 323 + Ok(acceptable( 324 324 + accept, 325 325 + GetManyToManyCountsResponse { 326 326 + counts_by_other_subject: items, 327 327 + cursor, 328 328 + query: (*query).clone(), 329 329 + }, 330 330 + )) 331 331 + } 332 332 + 333 333 + #[derive(Clone, Deserialize)] 176 334 struct GetLinksCountQuery { 177 335 target: String, 178 336 collection: String, ··· 233 391 } 234 392 235 393 #[derive(Clone, Deserialize)] 394 394 + struct GetBacklinksQuery { 395 395 + /// The link target 396 396 + /// 397 397 + /// can be an AT-URI, plain DID, or regular URI 398 398 + subject: String, 399 399 + /// Filter links only from this link source 400 400 + /// 401 401 + /// eg.: `app.bsky.feed.like:subject.uri` 402 402 + source: String, 403 403 + cursor: Option<OpaqueApiCursor>, 404 404 + /// Filter links only from these DIDs 405 405 + /// 406 406 + /// include multiple times to filter by multiple source DIDs 407 407 + #[serde(default)] 408 408 + did: Vec<String>, 409 409 + /// Set the max number of links to return per page of results 410 410 + #[serde(default = "get_default_cursor_limit")] 411 411 + limit: u64, 412 412 + // TODO: allow reverse (er, forward) order as well 413 413 + } 414 414 + #[derive(Template, Serialize)] 415 415 + #[template(path = "get-backlinks.html.j2")] 416 416 + struct GetBacklinksResponse { 417 417 + total: u64, 418 418 + records: Vec<RecordId>, 419 419 + cursor: Option<OpaqueApiCursor>, 420 420 + #[serde(skip_serializing)] 421 421 + query: GetBacklinksQuery, 422 422 + #[serde(skip_serializing)] 423 423 + collection: String, 424 424 + #[serde(skip_serializing)] 425 425 + path: String, 426 426 + } 427 427 + fn get_backlinks( 428 428 + accept: ExtractAccept, 429 429 + query: axum_extra::extract::Query<GetBacklinksQuery>, // supports multiple param occurrences 430 430 + store: impl LinkReader, 431 431 + ) -> Result<impl IntoResponse, http::StatusCode> { 432 432 + let until = query 433 433 + .cursor 434 434 + .clone() 435 435 + .map(|oc| ApiCursor::try_from(oc).map_err(|_| http::StatusCode::BAD_REQUEST)) 436 436 + .transpose()? 437 437 + .map(|c| c.next); 438 438 + 439 439 + let limit = query.limit; 440 440 + if limit > DEFAULT_CURSOR_LIMIT_MAX { 441 441 + return Err(http::StatusCode::BAD_REQUEST); 442 442 + } 443 443 + 444 444 + let filter_dids: HashSet<Did> = HashSet::from_iter( 445 445 + query 446 446 + .did 447 447 + .iter() 448 448 + .map(|d| d.trim()) 449 449 + .filter(|d| !d.is_empty()) 450 450 + .map(|d| Did(d.to_string())), 451 451 + ); 452 452 + 453 453 + let Some((collection, path)) = query.source.split_once(':') else { 454 454 + return Err(http::StatusCode::BAD_REQUEST); 455 455 + }; 456 456 + let path = format!(".{path}"); 457 457 + 458 458 + let paged = store 459 459 + .get_links( 460 460 + &query.subject, 461 461 + collection, 462 462 + &path, 463 463 + limit, 464 464 + until, 465 465 + &filter_dids, 466 466 + ) 467 467 + .map_err(|_| http::StatusCode::INTERNAL_SERVER_ERROR)?; 468 468 + 469 469 + let cursor = paged.next.map(|next| { 470 470 + ApiCursor { 471 471 + version: paged.version, 472 472 + next, 473 473 + } 474 474 + .into() 475 475 + }); 476 476 + 477 477 + Ok(acceptable( 478 478 + accept, 479 479 + GetBacklinksResponse { 480 480 + total: paged.total, 481 481 + records: paged.items, 482 482 + cursor, 483 483 + query: (*query).clone(), 484 484 + collection: collection.to_string(), 485 485 + path, 486 486 + }, 487 487 + )) 488 488 + } 489 489 + 490 490 + #[derive(Clone, Deserialize)] 236 491 struct GetLinkItemsQuery { 237 492 target: String, 238 493 collection: String, ··· 251 506 /// 252 507 /// deprecated: use `did`, which can be repeated multiple times 253 508 from_dids: Option<String>, // comma separated: gross 254 254 - limit: Option<u64>, 509 509 + #[serde(default = "get_default_cursor_limit")] 510 510 + limit: u64, 255 511 // TODO: allow reverse (er, forward) order as well 256 512 } 257 513 #[derive(Template, Serialize)] ··· 278 534 .transpose()? 279 535 .map(|c| c.next); 280 536 281 281 - let limit = query.limit.unwrap_or(DEFAULT_CURSOR_LIMIT); 537 537 + let limit = query.limit; 282 538 if limit > DEFAULT_CURSOR_LIMIT_MAX { 283 539 return Err(http::StatusCode::BAD_REQUEST); 284 540 } 285 541 286 286 - let mut filter_dids: HashSet<Did> = HashSet::from_iter(query.did.iter().map(|d| Did(d.to_string()))); 542 542 + let mut filter_dids: HashSet<Did> = HashSet::from_iter( 543 543 + query 544 544 + .did 545 545 + .iter() 546 546 + .map(|d| d.trim()) 547 547 + .filter(|d| !d.is_empty()) 548 548 + .map(|d| Did(d.to_string())), 549 549 + ); 287 550 288 551 if let Some(comma_joined) = &query.from_dids { 289 552 if !filter_dids.is_empty() { ··· 464 727 OpaqueApiCursor(bincode::DefaultOptions::new().serialize(&item).unwrap()) 465 728 } 466 729 } 730 730 + 731 731 + #[derive(Serialize, Deserialize)] // for bincode 732 732 + struct ApiKeyedCursor { 733 733 + next: String, // the key 734 734 + } 735 735 + 736 736 + impl TryFrom<OpaqueApiCursor> for ApiKeyedCursor { 737 737 + type Error = bincode::Error; 738 738 + 739 739 + fn try_from(item: OpaqueApiCursor) -> Result<Self, Self::Error> { 740 740 + bincode::DefaultOptions::new().deserialize(&item.0) 741 741 + } 742 742 + } 743 743 + 744 744 + impl From<ApiKeyedCursor> for OpaqueApiCursor { 745 745 + fn from(item: ApiKeyedCursor) -> Self { 746 746 + OpaqueApiCursor(bincode::DefaultOptions::new().serialize(&item).unwrap()) 747 747 + } 748 748 + }

+78 -1

constellation/src/storage/mem_store.rs

··· 1 1 - use super::{LinkReader, LinkStorage, PagedAppendingCollection, StorageStats}; 1 1 + use super::{ 2 2 + LinkReader, LinkStorage, PagedAppendingCollection, PagedOrderedCollection, StorageStats, 3 3 + }; 2 4 use crate::{ActionableEvent, CountsByCount, Did, RecordId}; 3 5 use anyhow::Result; 4 6 use links::CollectedLink; ··· 132 134 } 133 135 134 136 impl LinkReader for MemStorage { 137 137 + fn get_many_to_many_counts( 138 138 + &self, 139 139 + target: &str, 140 140 + collection: &str, 141 141 + path: &str, 142 142 + path_to_other: &str, 143 143 + limit: u64, 144 144 + after: Option<String>, 145 145 + filter_dids: &HashSet<Did>, 146 146 + filter_to_targets: &HashSet<String>, 147 147 + ) -> Result<PagedOrderedCollection<(String, u64, u64), String>> { 148 148 + let data = self.0.lock().unwrap(); 149 149 + let Some(paths) = data.targets.get(&Target::new(target)) else { 150 150 + return Ok(PagedOrderedCollection::default()); 151 151 + }; 152 152 + let Some(linkers) = paths.get(&Source::new(collection, path)) else { 153 153 + return Ok(PagedOrderedCollection::default()); 154 154 + }; 155 155 + 156 156 + let path_to_other = RecordPath::new(path_to_other); 157 157 + let filter_to_targets: HashSet<Target> = 158 158 + HashSet::from_iter(filter_to_targets.iter().map(|s| Target::new(s))); 159 159 + 160 160 + let mut grouped_counts: HashMap<Target, (u64, HashSet<Did>)> = HashMap::new(); 161 161 + for (did, rkey) in linkers.iter().flatten().cloned() { 162 162 + if !filter_dids.is_empty() && !filter_dids.contains(&did) { 163 163 + continue; 164 164 + } 165 165 + if let Some(fwd_target) = data 166 166 + .links 167 167 + .get(&did) 168 168 + .unwrap_or(&HashMap::new()) 169 169 + .get(&RepoId { 170 170 + collection: collection.to_string(), 171 171 + rkey, 172 172 + }) 173 173 + .unwrap_or(&Vec::new()) 174 174 + .iter() 175 175 + .filter_map(|(path, target)| { 176 176 + if *path == path_to_other 177 177 + && (filter_to_targets.is_empty() || filter_to_targets.contains(target)) 178 178 + { 179 179 + Some(target) 180 180 + } else { 181 181 + None 182 182 + } 183 183 + }) 184 184 + .take(1) 185 185 + .next() 186 186 + { 187 187 + let e = grouped_counts.entry(fwd_target.clone()).or_default(); 188 188 + e.0 += 1; 189 189 + e.1.insert(did.clone()); 190 190 + } 191 191 + } 192 192 + let mut items: Vec<(String, u64, u64)> = grouped_counts 193 193 + .iter() 194 194 + .map(|(k, (n, u))| (k.0.clone(), *n, u.len() as u64)) 195 195 + .collect(); 196 196 + items.sort(); 197 197 + items = items 198 198 + .into_iter() 199 199 + .skip_while(|(t, _, _)| after.as_ref().map(|a| t <= a).unwrap_or(false)) 200 200 + .take(limit as usize) 201 201 + .collect(); 202 202 + let next = if items.len() as u64 >= limit { 203 203 + items.last().map(|(t, _, _)| t.clone()) 204 204 + } else { 205 205 + None 206 206 + }; 207 207 + Ok(PagedOrderedCollection { items, next }) 208 208 + } 209 209 + 135 210 fn get_count(&self, target: &str, collection: &str, path: &str) -> Result<u64> { 136 211 let data = self.0.lock().unwrap(); 137 212 let Some(paths) = data.targets.get(&Target::new(target)) else { ··· 353 428 dids, 354 429 targetables, 355 430 linking_records, 431 431 + started_at: None, 432 432 + other_data: Default::default(), 356 433 }) 357 434 } 358 435 }

+225

constellation/src/storage/mod.rs

··· 19 19 pub total: u64, 20 20 } 21 21 22 22 + /// A paged collection whose keys are sorted instead of indexed 23 23 + /// 24 24 + /// this has weaker guarantees than PagedAppendingCollection: it might 25 25 + /// return a totally consistent snapshot. but it should avoid duplicates 26 26 + /// and each page should at least be internally consistent. 27 27 + #[derive(Debug, PartialEq, Default)] 28 28 + pub struct PagedOrderedCollection<T, K: Ord> { 29 29 + pub items: Vec<T>, 30 30 + pub next: Option<K>, 31 31 + } 32 32 + 22 33 #[derive(Debug, Deserialize, Serialize, PartialEq)] 23 34 pub struct StorageStats { 24 35 /// estimate of how many accounts we've seen create links. the _subjects_ of any links are not represented here. ··· 33 44 /// records with multiple links are single-counted. 34 45 /// for LSM stores, deleted links don't decrement this, and updated records with any links will likely increment it. 35 46 pub linking_records: u64, 47 47 + 48 48 + /// first jetstream cursor when this instance first started 49 49 + pub started_at: Option<u64>, 50 50 + 51 51 + /// anything else we want to throw in 52 52 + pub other_data: HashMap<String, u64>, 36 53 } 37 54 38 55 pub trait LinkStorage: Send + Sync { ··· 48 65 } 49 66 50 67 pub trait LinkReader: Clone + Send + Sync + 'static { 68 68 + #[allow(clippy::too_many_arguments)] 69 69 + fn get_many_to_many_counts( 70 70 + &self, 71 71 + target: &str, 72 72 + collection: &str, 73 73 + path: &str, 74 74 + path_to_other: &str, 75 75 + limit: u64, 76 76 + after: Option<String>, 77 77 + filter_dids: &HashSet<Did>, 78 78 + filter_to_targets: &HashSet<String>, 79 79 + ) -> Result<PagedOrderedCollection<(String, u64, u64), String>>; 80 80 + 51 81 fn get_count(&self, target: &str, collection: &str, path: &str) -> Result<u64>; 52 82 53 83 fn get_distinct_did_count(&self, target: &str, collection: &str, path: &str) -> Result<u64>; ··· 1326 1356 counts 1327 1357 }); 1328 1358 assert_stats(storage.get_stats()?, 1..=1, 2..=2, 1..=1); 1359 1359 + }); 1360 1360 + 1361 1361 + //////// many-to-many ///////// 1362 1362 + 1363 1363 + test_each_storage!(get_m2m_counts_empty, |storage| { 1364 1364 + assert_eq!( 1365 1365 + storage.get_many_to_many_counts( 1366 1366 + "a.com", 1367 1367 + "a.b.c", 1368 1368 + ".d.e", 1369 1369 + ".f.g", 1370 1370 + 10, 1371 1371 + None, 1372 1372 + &HashSet::new(), 1373 1373 + &HashSet::new(), 1374 1374 + )?, 1375 1375 + PagedOrderedCollection { 1376 1376 + items: vec![], 1377 1377 + next: None, 1378 1378 + } 1379 1379 + ); 1380 1380 + }); 1381 1381 + 1382 1382 + test_each_storage!(get_m2m_counts_single, |storage| { 1383 1383 + storage.push( 1384 1384 + &ActionableEvent::CreateLinks { 1385 1385 + record_id: RecordId { 1386 1386 + did: "did:plc:asdf".into(), 1387 1387 + collection: "app.t.c".into(), 1388 1388 + rkey: "asdf".into(), 1389 1389 + }, 1390 1390 + links: vec![ 1391 1391 + CollectedLink { 1392 1392 + target: Link::Uri("a.com".into()), 1393 1393 + path: ".abc.uri".into(), 1394 1394 + }, 1395 1395 + CollectedLink { 1396 1396 + target: Link::Uri("b.com".into()), 1397 1397 + path: ".def.uri".into(), 1398 1398 + }, 1399 1399 + CollectedLink { 1400 1400 + target: Link::Uri("b.com".into()), 1401 1401 + path: ".ghi.uri".into(), 1402 1402 + }, 1403 1403 + ], 1404 1404 + }, 1405 1405 + 0, 1406 1406 + )?; 1407 1407 + assert_eq!( 1408 1408 + storage.get_many_to_many_counts( 1409 1409 + "a.com", 1410 1410 + "app.t.c", 1411 1411 + ".abc.uri", 1412 1412 + ".def.uri", 1413 1413 + 10, 1414 1414 + None, 1415 1415 + &HashSet::new(), 1416 1416 + &HashSet::new(), 1417 1417 + )?, 1418 1418 + PagedOrderedCollection { 1419 1419 + items: vec![("b.com".to_string(), 1, 1)], 1420 1420 + next: None, 1421 1421 + } 1422 1422 + ); 1423 1423 + }); 1424 1424 + 1425 1425 + test_each_storage!(get_m2m_counts_filters, |storage| { 1426 1426 + storage.push( 1427 1427 + &ActionableEvent::CreateLinks { 1428 1428 + record_id: RecordId { 1429 1429 + did: "did:plc:asdf".into(), 1430 1430 + collection: "app.t.c".into(), 1431 1431 + rkey: "asdf".into(), 1432 1432 + }, 1433 1433 + links: vec![ 1434 1434 + CollectedLink { 1435 1435 + target: Link::Uri("a.com".into()), 1436 1436 + path: ".abc.uri".into(), 1437 1437 + }, 1438 1438 + CollectedLink { 1439 1439 + target: Link::Uri("b.com".into()), 1440 1440 + path: ".def.uri".into(), 1441 1441 + }, 1442 1442 + ], 1443 1443 + }, 1444 1444 + 0, 1445 1445 + )?; 1446 1446 + storage.push( 1447 1447 + &ActionableEvent::CreateLinks { 1448 1448 + record_id: RecordId { 1449 1449 + did: "did:plc:asdfasdf".into(), 1450 1450 + collection: "app.t.c".into(), 1451 1451 + rkey: "asdf".into(), 1452 1452 + }, 1453 1453 + links: vec![ 1454 1454 + CollectedLink { 1455 1455 + target: Link::Uri("a.com".into()), 1456 1456 + path: ".abc.uri".into(), 1457 1457 + }, 1458 1458 + CollectedLink { 1459 1459 + target: Link::Uri("b.com".into()), 1460 1460 + path: ".def.uri".into(), 1461 1461 + }, 1462 1462 + ], 1463 1463 + }, 1464 1464 + 1, 1465 1465 + )?; 1466 1466 + storage.push( 1467 1467 + &ActionableEvent::CreateLinks { 1468 1468 + record_id: RecordId { 1469 1469 + did: "did:plc:fdsa".into(), 1470 1470 + collection: "app.t.c".into(), 1471 1471 + rkey: "asdf".into(), 1472 1472 + }, 1473 1473 + links: vec![ 1474 1474 + CollectedLink { 1475 1475 + target: Link::Uri("a.com".into()), 1476 1476 + path: ".abc.uri".into(), 1477 1477 + }, 1478 1478 + CollectedLink { 1479 1479 + target: Link::Uri("c.com".into()), 1480 1480 + path: ".def.uri".into(), 1481 1481 + }, 1482 1482 + ], 1483 1483 + }, 1484 1484 + 2, 1485 1485 + )?; 1486 1486 + storage.push( 1487 1487 + &ActionableEvent::CreateLinks { 1488 1488 + record_id: RecordId { 1489 1489 + did: "did:plc:fdsa".into(), 1490 1490 + collection: "app.t.c".into(), 1491 1491 + rkey: "asdf2".into(), 1492 1492 + }, 1493 1493 + links: vec![ 1494 1494 + CollectedLink { 1495 1495 + target: Link::Uri("a.com".into()), 1496 1496 + path: ".abc.uri".into(), 1497 1497 + }, 1498 1498 + CollectedLink { 1499 1499 + target: Link::Uri("c.com".into()), 1500 1500 + path: ".def.uri".into(), 1501 1501 + }, 1502 1502 + ], 1503 1503 + }, 1504 1504 + 3, 1505 1505 + )?; 1506 1506 + assert_eq!( 1507 1507 + storage.get_many_to_many_counts( 1508 1508 + "a.com", 1509 1509 + "app.t.c", 1510 1510 + ".abc.uri", 1511 1511 + ".def.uri", 1512 1512 + 10, 1513 1513 + None, 1514 1514 + &HashSet::new(), 1515 1515 + &HashSet::new(), 1516 1516 + )?, 1517 1517 + PagedOrderedCollection { 1518 1518 + items: vec![("b.com".to_string(), 2, 2), ("c.com".to_string(), 2, 1),], 1519 1519 + next: None, 1520 1520 + } 1521 1521 + ); 1522 1522 + assert_eq!( 1523 1523 + storage.get_many_to_many_counts( 1524 1524 + "a.com", 1525 1525 + "app.t.c", 1526 1526 + ".abc.uri", 1527 1527 + ".def.uri", 1528 1528 + 10, 1529 1529 + None, 1530 1530 + &HashSet::from_iter([Did("did:plc:fdsa".to_string())]), 1531 1531 + &HashSet::new(), 1532 1532 + )?, 1533 1533 + PagedOrderedCollection { 1534 1534 + items: vec![("c.com".to_string(), 2, 1),], 1535 1535 + next: None, 1536 1536 + } 1537 1537 + ); 1538 1538 + assert_eq!( 1539 1539 + storage.get_many_to_many_counts( 1540 1540 + "a.com", 1541 1541 + "app.t.c", 1542 1542 + ".abc.uri", 1543 1543 + ".def.uri", 1544 1544 + 10, 1545 1545 + None, 1546 1546 + &HashSet::new(), 1547 1547 + &HashSet::from_iter(["b.com".to_string()]), 1548 1548 + )?, 1549 1549 + PagedOrderedCollection { 1550 1550 + items: vec![("b.com".to_string(), 2, 2),], 1551 1551 + next: None, 1552 1552 + } 1553 1553 + ); 1329 1554 }); 1330 1555 }

+342 -40

constellation/src/storage/rocks_store.rs

··· 1 1 - use super::{ActionableEvent, LinkReader, LinkStorage, PagedAppendingCollection, StorageStats}; 1 1 + use super::{ 2 2 + ActionableEvent, LinkReader, LinkStorage, PagedAppendingCollection, PagedOrderedCollection, 3 3 + StorageStats, 4 4 + }; 2 5 use crate::{CountsByCount, Did, RecordId}; 3 6 use anyhow::{bail, Result}; 4 7 use bincode::Options as BincodeOptions; ··· 11 14 MultiThreaded, Options, PrefixRange, ReadOptions, WriteBatch, 12 15 }; 13 16 use serde::{Deserialize, Serialize}; 14 14 - use std::collections::{HashMap, HashSet}; 17 17 + use std::collections::{BTreeMap, HashMap, HashSet}; 15 18 use std::io::Read; 16 19 use std::marker::PhantomData; 17 20 use std::path::{Path, PathBuf}; ··· 20 23 Arc, 21 24 }; 22 25 use std::thread; 23 23 - use std::time::{Duration, Instant}; 26 26 + use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH}; 24 27 use tokio_util::sync::CancellationToken; 25 28 26 29 static DID_IDS_CF: &str = "did_ids"; ··· 29 32 static LINK_TARGETS_CF: &str = "link_targets"; 30 33 31 34 static JETSTREAM_CURSOR_KEY: &str = "jetstream_cursor"; 35 35 + static STARTED_AT_KEY: &str = "jetstream_first_cursor"; 36 36 + // add reverse mappings for targets if this db was running before that was a thing 37 37 + static TARGET_ID_REPAIR_STATE_KEY: &str = "target_id_table_repair_state"; 38 38 + 39 39 + static COZY_FIRST_CURSOR: u64 = 1_738_083_600_000_000; // constellation.microcosm.blue started 40 40 + 41 41 + #[derive(Debug, Clone, Serialize, Deserialize)] 42 42 + struct TargetIdRepairState { 43 43 + /// start time for repair, microseconds timestamp 44 44 + current_us_started_at: u64, 45 45 + /// id table's latest id when repair started 46 46 + id_when_started: u64, 47 47 + /// id table id 48 48 + latest_repaired_i: u64, 49 49 + } 50 50 + impl AsRocksValue for TargetIdRepairState {} 51 51 + impl ValueFromRocks for TargetIdRepairState {} 32 52 33 53 // todo: actually understand and set these options probably better 34 54 fn rocks_opts_base() -> Options { ··· 56 76 #[derive(Debug, Clone)] 57 77 pub struct RocksStorage { 58 78 pub db: Arc<DBWithThreadMode<MultiThreaded>>, // TODO: mov seqs here (concat merge op will be fun) 59 59 - did_id_table: IdTable<Did, DidIdValue, true>, 60 60 - target_id_table: IdTable<TargetKey, TargetId, false>, 79 79 + did_id_table: IdTable<Did, DidIdValue>, 80 80 + target_id_table: IdTable<TargetKey, TargetId>, 61 81 is_writer: bool, 62 82 backup_task: Arc<Option<thread::JoinHandle<Result<()>>>>, 63 83 } ··· 85 105 fn cf_descriptor(&self) -> ColumnFamilyDescriptor { 86 106 ColumnFamilyDescriptor::new(&self.name, rocks_opts_base()) 87 107 } 88 88 - fn init<const WITH_REVERSE: bool>( 89 89 - self, 90 90 - db: &DBWithThreadMode<MultiThreaded>, 91 91 - ) -> Result<IdTable<Orig, IdVal, WITH_REVERSE>> { 108 108 + fn init(self, db: &DBWithThreadMode<MultiThreaded>) -> Result<IdTable<Orig, IdVal>> { 92 109 if db.cf_handle(&self.name).is_none() { 93 110 bail!("failed to get cf handle from db -- was the db open with our .cf_descriptor()?"); 94 111 } ··· 119 136 } 120 137 } 121 138 #[derive(Debug, Clone)] 122 122 - struct IdTable<Orig, IdVal: IdTableValue, const WITH_REVERSE: bool> 139 139 + struct IdTable<Orig, IdVal: IdTableValue> 123 140 where 124 141 Orig: KeyFromRocks, 125 142 for<'a> &'a Orig: AsRocksKey, ··· 127 144 base: IdTableBase<Orig, IdVal>, 128 145 priv_id_seq: u64, 129 146 } 130 130 - impl<Orig: Clone, IdVal: IdTableValue, const WITH_REVERSE: bool> IdTable<Orig, IdVal, WITH_REVERSE> 147 147 + impl<Orig: Clone, IdVal: IdTableValue> IdTable<Orig, IdVal> 131 148 where 132 149 Orig: KeyFromRocks, 133 150 for<'v> &'v IdVal: AsRocksValue, ··· 139 156 _key_marker: PhantomData, 140 157 _val_marker: PhantomData, 141 158 name: name.into(), 142 142 - id_seq: Arc::new(AtomicU64::new(0)), // zero is "uninint", first seq num will be 1 159 159 + id_seq: Arc::new(AtomicU64::new(0)), // zero is "uninit", first seq num will be 1 143 160 } 144 161 } 145 162 fn get_id_val( ··· 178 195 id_value 179 196 })) 180 197 } 198 198 + 181 199 fn estimate_count(&self) -> u64 { 182 200 self.base.id_seq.load(Ordering::SeqCst) - 1 // -1 because seq zero is reserved 183 201 } 184 184 - } 185 185 - impl<Orig: Clone, IdVal: IdTableValue> IdTable<Orig, IdVal, true> 186 186 - where 187 187 - Orig: KeyFromRocks, 188 188 - for<'v> &'v IdVal: AsRocksValue, 189 189 - for<'k> &'k Orig: AsRocksKey, 190 190 - { 202 202 + 191 203 fn get_or_create_id_val( 192 204 &mut self, 193 205 db: &DBWithThreadMode<MultiThreaded>, ··· 215 227 } 216 228 } 217 229 } 218 218 - impl<Orig: Clone, IdVal: IdTableValue> IdTable<Orig, IdVal, false> 219 219 - where 220 220 - Orig: KeyFromRocks, 221 221 - for<'v> &'v IdVal: AsRocksValue, 222 222 - for<'k> &'k Orig: AsRocksKey, 223 223 - { 224 224 - fn get_or_create_id_val( 225 225 - &mut self, 226 226 - db: &DBWithThreadMode<MultiThreaded>, 227 227 - batch: &mut WriteBatch, 228 228 - orig: &Orig, 229 229 - ) -> Result<IdVal> { 230 230 - let cf = db.cf_handle(&self.base.name).unwrap(); 231 231 - self.__get_or_create_id_val(&cf, db, batch, orig) 232 232 - } 233 233 - } 234 230 235 231 impl IdTableValue for DidIdValue { 236 232 fn new(v: u64) -> Self { ··· 249 245 } 250 246 } 251 247 248 248 + fn now() -> u64 { 249 249 + SystemTime::now() 250 250 + .duration_since(UNIX_EPOCH) 251 251 + .unwrap() 252 252 + .as_micros() as u64 253 253 + } 254 254 + 252 255 impl RocksStorage { 253 256 pub fn new(path: impl AsRef<Path>) -> Result<Self> { 254 257 Self::describe_metrics(); 255 255 - RocksStorage::open_readmode(path, false) 258 258 + let me = RocksStorage::open_readmode(path, false)?; 259 259 + me.global_init()?; 260 260 + Ok(me) 256 261 } 257 262 258 263 pub fn open_readonly(path: impl AsRef<Path>) -> Result<Self> { ··· 260 265 } 261 266 262 267 fn open_readmode(path: impl AsRef<Path>, readonly: bool) -> Result<Self> { 263 263 - let did_id_table = IdTable::<_, _, true>::setup(DID_IDS_CF); 264 264 - let target_id_table = IdTable::<_, _, false>::setup(TARGET_IDS_CF); 268 268 + let did_id_table = IdTable::setup(DID_IDS_CF); 269 269 + let target_id_table = IdTable::setup(TARGET_IDS_CF); 265 270 271 271 + // note: global stuff like jetstream cursor goes in the default cf 272 272 + // these are bonus extra cfs 266 273 let cfs = vec![ 267 274 // id reference tables 268 275 did_id_table.cf_descriptor(), ··· 296 303 is_writer: !readonly, 297 304 backup_task: None.into(), 298 305 }) 306 306 + } 307 307 + 308 308 + fn global_init(&self) -> Result<()> { 309 309 + let first_run = self.db.get(JETSTREAM_CURSOR_KEY)?.is_some(); 310 310 + if first_run { 311 311 + self.db.put(STARTED_AT_KEY, _rv(now()))?; 312 312 + 313 313 + // hack / temporary: if we're a new db, put in a completed repair 314 314 + // state so we don't run repairs (repairs are for old-code dbs) 315 315 + let completed = TargetIdRepairState { 316 316 + id_when_started: 0, 317 317 + current_us_started_at: 0, 318 318 + latest_repaired_i: 0, 319 319 + }; 320 320 + self.db.put(TARGET_ID_REPAIR_STATE_KEY, _rv(completed))?; 321 321 + } 322 322 + Ok(()) 323 323 + } 324 324 + 325 325 + pub fn run_repair(&self, breather: Duration, stay_alive: CancellationToken) -> Result<bool> { 326 326 + let mut state = match self 327 327 + .db 328 328 + .get(TARGET_ID_REPAIR_STATE_KEY)? 329 329 + .map(|s| _vr(&s)) 330 330 + .transpose()? 331 331 + { 332 332 + Some(s) => s, 333 333 + None => TargetIdRepairState { 334 334 + id_when_started: self.did_id_table.priv_id_seq, 335 335 + current_us_started_at: now(), 336 336 + latest_repaired_i: 0, 337 337 + }, 338 338 + }; 339 339 + 340 340 + eprintln!("initial repair state: {state:?}"); 341 341 + 342 342 + let cf = self.db.cf_handle(TARGET_IDS_CF).unwrap(); 343 343 + 344 344 + let mut iter = self.db.raw_iterator_cf(&cf); 345 345 + iter.seek_to_first(); 346 346 + 347 347 + eprintln!("repair iterator sent to first key"); 348 348 + 349 349 + // skip ahead if we're done some, or take a single first step 350 350 + for _ in 0..state.latest_repaired_i { 351 351 + iter.next(); 352 352 + } 353 353 + 354 354 + eprintln!( 355 355 + "repair iterator skipped to {}th key", 356 356 + state.latest_repaired_i 357 357 + ); 358 358 + 359 359 + let mut maybe_done = false; 360 360 + 361 361 + let mut write_fast = rocksdb::WriteOptions::default(); 362 362 + write_fast.set_sync(false); 363 363 + write_fast.disable_wal(true); 364 364 + 365 365 + while !stay_alive.is_cancelled() && !maybe_done { 366 366 + // let mut batch = WriteBatch::default(); 367 367 + 368 368 + let mut any_written = false; 369 369 + 370 370 + for _ in 0..1000 { 371 371 + if state.latest_repaired_i % 1_000_000 == 0 { 372 372 + eprintln!("target iter at {}", state.latest_repaired_i); 373 373 + } 374 374 + state.latest_repaired_i += 1; 375 375 + 376 376 + if !iter.valid() { 377 377 + eprintln!("invalid iter, are we done repairing?"); 378 378 + maybe_done = true; 379 379 + break; 380 380 + }; 381 381 + 382 382 + // eprintln!("iterator seems to be valid! getting the key..."); 383 383 + let raw_key = iter.key().unwrap(); 384 384 + if raw_key.len() == 8 { 385 385 + // eprintln!("found an 8-byte key, skipping it since it's probably an id..."); 386 386 + iter.next(); 387 387 + continue; 388 388 + } 389 389 + let target: TargetKey = _kr::<TargetKey>(raw_key)?; 390 390 + let target_id: TargetId = _vr(iter.value().unwrap())?; 391 391 + 392 392 + self.db 393 393 + .put_cf_opt(&cf, target_id.id().to_be_bytes(), _rv(&target), &write_fast)?; 394 394 + any_written = true; 395 395 + iter.next(); 396 396 + } 397 397 + 398 398 + if any_written { 399 399 + self.db 400 400 + .put(TARGET_ID_REPAIR_STATE_KEY, _rv(state.clone()))?; 401 401 + std::thread::sleep(breather); 402 402 + } 403 403 + } 404 404 + 405 405 + eprintln!("repair iterator done."); 406 406 + 407 407 + Ok(false) 299 408 } 300 409 301 410 pub fn start_backup( ··· 826 935 } 827 936 828 937 impl LinkReader for RocksStorage { 938 938 + fn get_many_to_many_counts( 939 939 + &self, 940 940 + target: &str, 941 941 + collection: &str, 942 942 + path: &str, 943 943 + path_to_other: &str, 944 944 + limit: u64, 945 945 + after: Option<String>, 946 946 + filter_dids: &HashSet<Did>, 947 947 + filter_to_targets: &HashSet<String>, 948 948 + ) -> Result<PagedOrderedCollection<(String, u64, u64), String>> { 949 949 + let collection = Collection(collection.to_string()); 950 950 + let path = RPath(path.to_string()); 951 951 + 952 952 + let target_key = TargetKey(Target(target.to_string()), collection.clone(), path.clone()); 953 953 + 954 954 + // unfortunately the cursor is a, uh, stringified number. 955 955 + // this was easier for the memstore (plain target, not target id), and 956 956 + // making it generic is a bit awful. 957 957 + // so... parse the number out of a string here :( 958 958 + // TODO: this should bubble up to a BAD_REQUEST response 959 959 + let after = after.map(|s| s.parse::<u64>().map(TargetId)).transpose()?; 960 960 + 961 961 + let Some(target_id) = self.target_id_table.get_id_val(&self.db, &target_key)? else { 962 962 + eprintln!("nothin doin for this target, {target_key:?}"); 963 963 + return Ok(Default::default()); 964 964 + }; 965 965 + 966 966 + let filter_did_ids: HashMap<DidId, bool> = filter_dids 967 967 + .iter() 968 968 + .filter_map(|did| self.did_id_table.get_id_val(&self.db, did).transpose()) 969 969 + .collect::<Result<Vec<DidIdValue>>>()? 970 970 + .into_iter() 971 971 + .map(|DidIdValue(id, active)| (id, active)) 972 972 + .collect(); 973 973 + 974 974 + // stored targets are keyed by triples of (target, collection, path). 975 975 + // target filtering only consideres the target itself, so we actually 976 976 + // need to do a prefix iteration of all target ids for this target and 977 977 + // keep them all. 978 978 + // i *think* the number of keys at a target prefix should usually be 979 979 + // pretty small, so this is hopefully fine. but if it turns out to be 980 980 + // large, we can push this filtering back into the main links loop and 981 981 + // do forward db queries per backlink to get the raw target back out. 982 982 + let mut filter_to_target_ids: HashSet<TargetId> = HashSet::new(); 983 983 + for t in filter_to_targets { 984 984 + for (_, target_id) in self.iter_targets_for_target(&Target(t.to_string())) { 985 985 + filter_to_target_ids.insert(target_id); 986 986 + } 987 987 + } 988 988 + 989 989 + let linkers = self.get_target_linkers(&target_id)?; 990 990 + 991 991 + let mut grouped_counts: BTreeMap<TargetId, (u64, HashSet<DidId>)> = BTreeMap::new(); 992 992 + 993 993 + for (did_id, rkey) in linkers.0 { 994 994 + if did_id.is_empty() { 995 995 + continue; 996 996 + } 997 997 + 998 998 + if !filter_did_ids.is_empty() && filter_did_ids.get(&did_id) != Some(&true) { 999 999 + continue; 1000 1000 + } 1001 1001 + 1002 1002 + let record_link_key = RecordLinkKey(did_id, collection.clone(), rkey); 1003 1003 + let Some(targets) = self.get_record_link_targets(&record_link_key)? else { 1004 1004 + continue; 1005 1005 + }; 1006 1006 + 1007 1007 + let Some(fwd_target) = targets 1008 1008 + .0 1009 1009 + .into_iter() 1010 1010 + .filter_map(|RecordLinkTarget(rpath, target_id)| { 1011 1011 + if rpath.0 == path_to_other 1012 1012 + && (filter_to_target_ids.is_empty() 1013 1013 + || filter_to_target_ids.contains(&target_id)) 1014 1014 + { 1015 1015 + Some(target_id) 1016 1016 + } else { 1017 1017 + None 1018 1018 + } 1019 1019 + }) 1020 1020 + .take(1) 1021 1021 + .next() 1022 1022 + else { 1023 1023 + eprintln!("no forward match"); 1024 1024 + continue; 1025 1025 + }; 1026 1026 + 1027 1027 + // small relief: we page over target ids, so we can already bail 1028 1028 + // reprocessing previous pages here 1029 1029 + if after.as_ref().map(|a| fwd_target <= *a).unwrap_or(false) { 1030 1030 + continue; 1031 1031 + } 1032 1032 + 1033 1033 + // aand we can skip target ids that must be on future pages 1034 1034 + // (this check continues after the did-lookup, which we have to do) 1035 1035 + let page_is_full = grouped_counts.len() as u64 >= limit; 1036 1036 + if page_is_full { 1037 1037 + let current_max = grouped_counts.keys().next_back().unwrap(); // limit should be non-zero bleh 1038 1038 + if fwd_target > *current_max { 1039 1039 + continue; 1040 1040 + } 1041 1041 + } 1042 1042 + 1043 1043 + // bit painful: 2-step lookup to make sure this did is active 1044 1044 + let Some(did) = self.did_id_table.get_val_from_id(&self.db, did_id.0)? else { 1045 1045 + eprintln!("failed to look up did from did_id {did_id:?}"); 1046 1046 + continue; 1047 1047 + }; 1048 1048 + let Some(DidIdValue(_, active)) = self.did_id_table.get_id_val(&self.db, &did)? else { 1049 1049 + eprintln!("failed to look up did_value from did_id {did_id:?}: {did:?}: data consistency bug?"); 1050 1050 + continue; 1051 1051 + }; 1052 1052 + if !active { 1053 1053 + continue; 1054 1054 + } 1055 1055 + 1056 1056 + // page-management, continued 1057 1057 + // if we have a full page, and we're inserting a *new* key less than 1058 1058 + // the current max, then we can evict the current max 1059 1059 + let mut should_evict = false; 1060 1060 + let entry = grouped_counts.entry(fwd_target.clone()).or_insert_with(|| { 1061 1061 + // this is a *new* key, so kick the max if we're full 1062 1062 + should_evict = page_is_full; 1063 1063 + Default::default() 1064 1064 + }); 1065 1065 + entry.0 += 1; 1066 1066 + entry.1.insert(did_id); 1067 1067 + 1068 1068 + if should_evict { 1069 1069 + grouped_counts.pop_last(); 1070 1070 + } 1071 1071 + } 1072 1072 + 1073 1073 + let mut items: Vec<(String, u64, u64)> = Vec::with_capacity(grouped_counts.len()); 1074 1074 + for (target_id, (n, dids)) in &grouped_counts { 1075 1075 + let Some(target) = self 1076 1076 + .target_id_table 1077 1077 + .get_val_from_id(&self.db, target_id.0)? 1078 1078 + else { 1079 1079 + eprintln!("failed to look up target from target_id {target_id:?}"); 1080 1080 + continue; 1081 1081 + }; 1082 1082 + items.push((target.0 .0, *n, dids.len() as u64)); 1083 1083 + } 1084 1084 + 1085 1085 + let next = if grouped_counts.len() as u64 >= limit { 1086 1086 + // yeah.... it's a number saved as a string......sorry 1087 1087 + grouped_counts 1088 1088 + .keys() 1089 1089 + .next_back() 1090 1090 + .map(|k| format!("{}", k.0)) 1091 1091 + } else { 1092 1092 + None 1093 1093 + }; 1094 1094 + 1095 1095 + Ok(PagedOrderedCollection { items, next }) 1096 1096 + } 1097 1097 + 829 1098 fn get_count(&self, target: &str, collection: &str, path: &str) -> Result<u64> { 830 1099 let target_key = TargetKey( 831 1100 Target(target.to_string()), ··· 1042 1311 .map(|s| s.parse::<u64>()) 1043 1312 .transpose()? 1044 1313 .unwrap_or(0); 1314 1314 + let started_at = self 1315 1315 + .db 1316 1316 + .get(STARTED_AT_KEY)? 1317 1317 + .map(|c| _vr(&c)) 1318 1318 + .transpose()? 1319 1319 + .unwrap_or(COZY_FIRST_CURSOR); 1320 1320 + 1321 1321 + let other_data = self 1322 1322 + .db 1323 1323 + .get(TARGET_ID_REPAIR_STATE_KEY)? 1324 1324 + .map(|s| _vr(&s)) 1325 1325 + .transpose()? 1326 1326 + .map( 1327 1327 + |TargetIdRepairState { 1328 1328 + current_us_started_at, 1329 1329 + id_when_started, 1330 1330 + latest_repaired_i, 1331 1331 + }| { 1332 1332 + HashMap::from([ 1333 1333 + ("current_us_started_at".to_string(), current_us_started_at), 1334 1334 + ("id_when_started".to_string(), id_when_started), 1335 1335 + ("latest_repaired_i".to_string(), latest_repaired_i), 1336 1336 + ]) 1337 1337 + }, 1338 1338 + ) 1339 1339 + .unwrap_or(HashMap::default()); 1340 1340 + 1045 1341 Ok(StorageStats { 1046 1342 dids, 1047 1343 targetables, 1048 1344 linking_records, 1345 1345 + started_at: Some(started_at), 1346 1346 + other_data, 1049 1347 }) 1050 1348 } 1051 1349 } ··· 1071 1369 impl AsRocksValue for &TargetId {} 1072 1370 impl KeyFromRocks for TargetKey {} 1073 1371 impl ValueFromRocks for TargetId {} 1372 1372 + 1373 1373 + // temp? 1374 1374 + impl KeyFromRocks for TargetId {} 1375 1375 + impl AsRocksValue for &TargetKey {} 1074 1376 1075 1377 // target_links table 1076 1378 impl AsRocksKey for &TargetId {} ··· 1142 1444 } 1143 1445 1144 1446 // target ids 1145 1145 - #[derive(Debug, Clone, Serialize, Deserialize)] 1447 1447 + #[derive(Debug, Clone, Serialize, Deserialize, PartialOrd, Ord, PartialEq, Eq, Hash)] 1146 1448 struct TargetId(u64); // key 1147 1449 1148 1148 - #[derive(Debug, Clone, Serialize, Deserialize)] 1450 1450 + #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Hash)] 1149 1451 pub struct Target(pub String); // the actual target/uri 1150 1452 1151 1453 // targets (uris, dids, etc.): the reverse index

+54

constellation/templates/get-backlinks.html.j2

··· 1 1 + {% extends "base.html.j2" %} 2 2 + {% import "try-it-macros.html.j2" as try_it %} 3 3 + 4 4 + {% block title %}Backlinks{% endblock %} 5 5 + {% block description %}All {{ query.source }} records with links to {{ query.subject }}{% endblock %} 6 6 + 7 7 + {% block content %} 8 8 + 9 9 + {% call try_it::get_backlinks(query.subject, query.source, query.did, query.limit) %} 10 10 + 11 11 + <h2> 12 12 + Links to <code>{{ query.subject }}</code> 13 13 + {% if let Some(browseable_uri) = query.subject|to_browseable %} 14 14 + <small style="font-weight: normal; font-size: 1rem"><a href="{{ browseable_uri }}">browse record</a></small> 15 15 + {% endif %} 16 16 + </h2> 17 17 + 18 18 + <p><strong>{{ total|human_number }} links</strong> from <code>{{ query.source }}</code>.</p> 19 19 + 20 20 + <ul> 21 21 + <li>See distinct linking DIDs at <code>/links/distinct-dids</code>: <a href="/links/distinct-dids?target={{ query.subject|urlencode }}&collection={{ collection|urlencode }}&path={{ path|urlencode }}">/links/distinct-dids?target={{ query.subject }}&collection={{ collection }}&path={{ path }}</a></li> 22 22 + <li>See all links to this target at <code>/links/all</code>: <a href="/links/all?target={{ query.subject|urlencode }}">/links/all?target={{ query.subject }}</a></li> 23 23 + </ul> 24 24 + 25 25 + <h3>Links, most recent first:</h3> 26 26 + 27 27 + {% for record in records %} 28 28 + <pre style="display: block; margin: 1em 2em" class="code"><strong>DID</strong>: {{ record.did().0 }} (<a href="/links/all?target={{ record.did().0|urlencode }}">DID links</a>) 29 29 + <strong>Collection</strong>: {{ record.collection }} 30 30 + <strong>RKey</strong>: {{ record.rkey }} 31 31 + -> <a href="https://pdsls.dev/at://{{ record.did().0 }}/{{ record.collection }}/{{ record.rkey }}">browse record</a></pre> 32 32 + {% endfor %} 33 33 + 34 34 + {% if let Some(c) = cursor %} 35 35 + <form method="get" action="/xrpc/blue.microcosm.links.getBacklinks"> 36 36 + <input type="hidden" name="subject" value="{{ query.subject }}" /> 37 37 + <input type="hidden" name="source" value="{{ query.source }}" /> 38 38 + <input type="hidden" name="limit" value="{{ query.limit }}" /> 39 39 + {% for did in query.did %} 40 40 + <input type="hidden" name="did" value="{{ did }}" /> 41 41 + {% endfor %} 42 42 + <input type="hidden" name="cursor" value={{ c|json|safe }} /> 43 43 + <button type="submit">next page&hellip;</button> 44 44 + </form> 45 45 + {% else %} 46 46 + <button disabled><em>end of results</em></button> 47 47 + {% endif %} 48 48 + 49 49 + <details> 50 50 + <summary>Raw JSON response</summary> 51 51 + <pre class="code">{{ self|tojson }}</pre> 52 52 + </details> 53 53 + 54 54 + {% endblock %}

+67

constellation/templates/get-many-to-many-counts.html.j2

··· 1 1 + {% extends "base.html.j2" %} 2 2 + {% import "try-it-macros.html.j2" as try_it %} 3 3 + 4 4 + {% block title %}Many to Many counts{% endblock %} 5 5 + {% block description %}Counts of many-to-many {{ query.source }} join records with links to {{ query.subject }} and a secondary target at {{ query.path_to_other }}{% endblock %} 6 6 + 7 7 + {% block content %} 8 8 + 9 9 + {% call try_it::get_many_to_many_counts( 10 10 + query.subject, 11 11 + query.source, 12 12 + query.path_to_other, 13 13 + query.did, 14 14 + query.other_subject, 15 15 + query.limit, 16 16 + ) %} 17 17 + 18 18 + <h2> 19 19 + Many-to-many links to <code>{{ query.subject }}</code> joining through <code>{{ query.path_to_other }}</code> 20 20 + {% if let Some(browseable_uri) = query.subject|to_browseable %} 21 21 + <small style="font-weight: normal; font-size: 1rem"><a href="{{ browseable_uri }}">browse record</a></small> 22 22 + {% endif %} 23 23 + </h2> 24 24 + 25 25 + <p><strong>{% if cursor.is_some() || query.cursor.is_some() %}more than {% endif %}{{ counts_by_other_subject.len()|to_u64|human_number }} joins</strong> <code>{{ query.source }}→{{ query.path_to_other }}</code></p> 26 26 + 27 27 + <ul> 28 28 + <li>See direct backlinks at <code>/xrpc/blue.microcosm.links.getBacklinks</code>: <a href="/xrpc/blue.microcosm.links.getBacklinks?subject={{ query.subject|urlencode }}&source={{ query.source|urlencode }}">/xrpc/blue.microcosm.links.getBacklinks?subject={{ query.subject }}&source={{ query.source }}</a></li> 29 29 + <li>See all links to this target at <code>/links/all</code>: <a href="/links/all?target={{ query.subject|urlencode }}">/links/all?target={{ query.subject }}</a></li> 30 30 + </ul> 31 31 + 32 32 + <h3>Counts by other subject:</h3> 33 33 + 34 34 + {% for counts in counts_by_other_subject %} 35 35 + <pre style="display: block; margin: 1em 2em" class="code"><strong>Joined subject</strong>: {{ counts.subject }} 36 36 + <strong>Joining records</strong>: {{ counts.total }} 37 37 + <strong>Unique joiner ids</strong>: {{ counts.distinct }} 38 38 + -> {% if let Some(browseable_uri) = counts.subject|to_browseable -%} 39 39 + <a href="{{ browseable_uri }}">browse record</a> 40 40 + {%- endif %}</pre> 41 41 + {% endfor %} 42 42 + 43 43 + {% if let Some(c) = cursor %} 44 44 + <form method="get" action="/xrpc/blue.microcosm.links.getManyToManyCounts"> 45 45 + <input type="hidden" name="subject" value="{{ query.subject }}" /> 46 46 + <input type="hidden" name="source" value="{{ query.source }}" /> 47 47 + <input type="hidden" name="pathToOther" value="{{ query.path_to_other }}" /> 48 48 + {% for did in query.did %} 49 49 + <input type="hidden" name="did" value="{{ did }}" /> 50 50 + {% endfor %} 51 51 + {% for otherSubject in query.other_subject %} 52 52 + <input type="hidden" name="otherSubject" value="{{ otherSubject }}" /> 53 53 + {% endfor %} 54 54 + <input type="hidden" name="limit" value="{{ query.limit }}" /> 55 55 + <input type="hidden" name="cursor" value={{ c|json|safe }} /> 56 56 + <button type="submit">next page&hellip;</button> 57 57 + </form> 58 58 + {% else %} 59 59 + <button disabled><em>end of results</em></button> 60 60 + {% endif %} 61 61 + 62 62 + <details> 63 63 + <summary>Raw JSON response</summary> 64 64 + <pre class="code">{{ self|tojson }}</pre> 65 65 + </details> 66 66 + 67 67 + {% endblock %}

+65 -7

constellation/templates/hello.html.j2

··· 19 19 <p>It works by recursively walking <em>all</em> records coming through the firehose, searching for anything that looks like a link. Links are indexed by the target they point at, the collection the record came from, and the JSON path to the link in that record.</p> 20 20 21 21 <p> 22 22 - This server has indexed <span class="stat">{{ stats.linking_records|human_number }}</span> links between <span class="stat">{{ stats.targetables|human_number }}</span> targets and sources from <span class="stat">{{ stats.dids|human_number }}</span> identities over <span class="stat">{{ days_indexed|human_number }}</span> days.<br/> 23 23 - <small>(indexing new records in real time, backfill still TODO)</small> 22 22 + This server has indexed <span class="stat">{{ stats.linking_records|human_number }}</span> links between <span class="stat">{{ stats.targetables|human_number }}</span> targets and sources from <span class="stat">{{ stats.dids|human_number }}</span> identities over <span class="stat"> 23 23 + {%- if let Some(days) = days_indexed %} 24 24 + {{ days|human_number }} 25 25 + {% else %} 26 26 + ??? 27 27 + {% endif -%} 28 28 + </span> days.<br/> 29 29 + <small>(indexing new records in real time, backfill coming soon!)</small> 24 30 </p> 25 31 26 26 - <p>The API is currently <strong>unstable</strong>. But feel free to use it! If you want to be nice, put your project name and bsky username (or email) in your user-agent header for api requests.</p> 32 32 + {# {% for k, v in stats.other_data.iter() %} 33 33 + <p><strong>{{ k }}</strong>: {{ v }}</p> 34 34 + {% endfor %} #} 35 35 + 36 36 + <p>You're welcome to use this public instance! Please do not build the torment nexus. If you want to be nice, put your project name and bsky username (or email) in your user-agent header for api requests.</p> 27 37 28 38 29 39 <h2>API Endpoints</h2> 30 40 41 41 + <h3 class="route"><code>GET /xrpc/blue.microcosm.links.getBacklinks</code></h3> 42 42 + 43 43 + <p>A list of records linking to any record, identity, or uri.</p> 44 44 + 45 45 + <h4>Query parameters:</h4> 46 46 + 47 47 + <ul> 48 48 + <li><p><code>subject</code>: required, must url-encode. Example: <code>at://did:plc:vc7f4oafdgxsihk4cry2xpze/app.bsky.feed.post/3lgwdn7vd722r</code></p></li> 49 49 + <li><p><code>source</code>: required. Example: <code>app.bsky.feed.like:subject.uri</code></p></li> 50 50 + <li><p><code>did</code>: optional, filter links to those from specific users. Include multiple times to filter by multiple users. Example: <code>did=did:plc:vc7f4oafdgxsihk4cry2xpze&did=did:plc:vc7f4oafdgxsihk4cry2xpze</code></p></li> 51 51 + <li><p><code>limit</code>: optional. Default: <code>16</code>. Maximum: <code>100</code></p></li> 52 52 + </ul> 53 53 + 54 54 + <p style="margin-bottom: 0"><strong>Try it:</strong></p> 55 55 + {% call try_it::get_backlinks("at://did:plc:a4pqq234yw7fqbddawjo7y35/app.bsky.feed.post/3m237ilwc372e", "app.bsky.feed.like:subject.uri", [""], 16) %} 56 56 + 57 57 + 58 58 + <h3 class="route"><code>GET /xrpc/blue.microcosm.links.getManyToManyCounts</code></h3> 59 59 + 60 60 + <p>TODO: description</p> 61 61 + 62 62 + <h4>Query parameters:</h4> 63 63 + 64 64 + <ul> 65 65 + <li><p><code>subject</code>: required, must url-encode. Example: <code>at://did:plc:vc7f4oafdgxsihk4cry2xpze/app.bsky.feed.post/3lgwdn7vd722r</code></p></li> 66 66 + <li><p><code>source</code>: required. Example: <code>app.bsky.feed.like:subject.uri</code></p></li> 67 67 + <li><p><code>pathToOther</code>: required. Path to the secondary link in the many-to-many record. Example: <code>otherThing.uri</code></p></li> 68 68 + <li><p><code>did</code>: optional, filter links to those from specific users. Include multiple times to filter by multiple users. Example: <code>did=did:plc:vc7f4oafdgxsihk4cry2xpze&did=did:plc:vc7f4oafdgxsihk4cry2xpze</code></p></li> 69 69 + <li><p><code>otherSubject</code>: optional, filter secondary links to specific subjects. Include multiple times to filter by multiple users. Example: <code>at://did:plc:vc7f4oafdgxsihk4cry2xpze/app.bsky.feed.post/3lgwdn7vd722r</code></p></li> 70 70 + <li><p><code>limit</code>: optional. Default: <code>16</code>. Maximum: <code>100</code></p></li> 71 71 + </ul> 72 72 + 73 73 + <p style="margin-bottom: 0"><strong>Try it:</strong></p> 74 74 + {% call try_it::get_many_to_many_counts( 75 75 + "at://did:plc:wshs7t2adsemcrrd4snkeqli/sh.tangled.label.definition/good-first-issue", 76 76 + "sh.tangled.label.op:add[].key", 77 77 + "subject", 78 78 + [""], 79 79 + [""], 80 80 + 25, 81 81 + ) %} 82 82 + 83 83 + 31 84 <h3 class="route"><code>GET /links</code></h3> 32 85 33 86 <p>A list of records linking to a target.</p> 34 87 88 88 + <p>[DEPRECATED]: use <code>GET /xrpc/blue.microcosm.links.getBacklinks</code>. New apps should avoid it, but this endpoint <strong>will</strong> remain supported for the forseeable future.</p> 89 89 + 35 90 <h4>Query parameters:</h4> 36 91 37 92 <ul> 38 38 - <li><code>target</code>: required, must url-encode. Example: <code>at://did:plc:vc7f4oafdgxsihk4cry2xpze/app.bsky.feed.post/3lgwdn7vd722r</code></li> 39 39 - <li><code>collection</code>: required. Example: <code>app.bsky.feed.like</code></li> 40 40 - <li><code>path</code>: required, must url-encode. Example: <code>.subject.uri</code></li> 93 93 + <li><p><code>target</code>: required, must url-encode. Example: <code>at://did:plc:vc7f4oafdgxsihk4cry2xpze/app.bsky.feed.post/3lgwdn7vd722r</code></p></li> 94 94 + <li><p><code>collection</code>: required. Example: <code>app.bsky.feed.like</code></p></li> 95 95 + <li><p><code>path</code>: required, must url-encode. Example: <code>.subject.uri</code></p></li> 96 96 + <li><p><code>did</code>: optional, filter links to those from specific users. Include multiple times to filter by multiple users. Example: <code>did=did:plc:vc7f4oafdgxsihk4cry2xpze&did=did:plc:vc7f4oafdgxsihk4cry2xpze</code></p></li> 97 97 + <li><p><code>from_dids</code> [deprecated]: optional. Use <code>did</code> instead. Example: <code>from_dids=did:plc:vc7f4oafdgxsihk4cry2xpze,did:plc:vc7f4oafdgxsihk4cry2xpze</code></p></li> 98 98 + <li><p><code>limit</code>: optional. Default: <code>16</code>. Maximum: <code>100</code></p></li> 41 99 </ul> 42 100 43 101 <p style="margin-bottom: 0"><strong>Try it:</strong></p> 44 44 - {% call try_it::links("at://did:plc:vc7f4oafdgxsihk4cry2xpze/app.bsky.feed.post/3lgwdn7vd722r", "app.bsky.feed.like", ".subject.uri") %} 102 102 + {% call try_it::links("at://did:plc:a4pqq234yw7fqbddawjo7y35/app.bsky.feed.post/3m237ilwc372e", "app.bsky.feed.like", ".subject.uri", [""], 16) %} 45 103 46 104 47 105 <h3 class="route"><code>GET /links/distinct-dids</code></h3>

+2 -2

constellation/templates/links.html.j2

··· 6 6 7 7 {% block content %} 8 8 9 9 - {% call try_it::links(query.target, query.collection, query.path) %} 9 9 + {% call try_it::links(query.target, query.collection, query.path, query.did, query.limit) %} 10 10 11 11 <h2> 12 12 Links to <code>{{ query.target }}</code> ··· 28 28 <pre style="display: block; margin: 1em 2em" class="code"><strong>DID</strong>: {{ record.did().0 }} (<a href="/links/all?target={{ record.did().0|urlencode }}">DID links</a>) 29 29 <strong>Collection</strong>: {{ record.collection }} 30 30 <strong>RKey</strong>: {{ record.rkey }} 31 31 - -> <a href="https://atproto-browser-plus-links.vercel.app/at/{{ record.did().0|urlencode }}/{{ record.collection }}/{{ record.rkey }}">browse record</a></pre> 31 31 + -> <a href="https://pdsls.dev/at://{{ record.did().0 }}/{{ record.collection }}/{{ record.rkey }}">browse record</a></pre> 32 32 {% endfor %} 33 33 34 34 {% if let Some(c) = cursor %}

+88 -3

constellation/templates/try-it-macros.html.j2

··· 1 1 - {% macro links(target, collection, path) %} 1 1 + {% macro get_backlinks(subject, source, dids, limit) %} 2 2 + <form method="get" action="/xrpc/blue.microcosm.links.getBacklinks"> 3 3 + <pre class="code"><strong>GET</strong> /xrpc/blue.microcosm.links.getBacklinks 4 4 + ?subject= <input type="text" name="subject" value="{{ subject }}" placeholder="at-uri, did, uri..." /> 5 5 + &source= <input type="text" name="source" value="{{ source }}" placeholder="app.bsky.feed.like:subject.uri" /> 6 6 + {%- for did in dids %}{% if !did.is_empty() %} 7 7 + &did= <input type="text" name="did" value="{{ did }}" placeholder="did:plc:..." />{% endif %}{% endfor %} 8 8 + <span id="did-placeholder"></span> <button id="add-did">+ did filter</button> 9 9 + &limit= <input type="number" name="limit" value="{{ limit }}" max="100" placeholder="100" /> <button type="submit">get links</button></pre> 10 10 + </form> 11 11 + <script> 12 12 + const addDidButton = document.getElementById('add-did'); 13 13 + const didPlaceholder = document.getElementById('did-placeholder'); 14 14 + addDidButton.addEventListener('click', e => { 15 15 + e.preventDefault(); 16 16 + const i = document.createElement('input'); 17 17 + i.placeholder = 'did:plc:...'; 18 18 + i.name = "did" 19 19 + const p = addDidButton.parentNode; 20 20 + p.insertBefore(document.createTextNode('&did= '), didPlaceholder); 21 21 + p.insertBefore(i, didPlaceholder); 22 22 + p.insertBefore(document.createTextNode('\n '), didPlaceholder); 23 23 + }); 24 24 + </script> 25 25 + {% endmacro %} 26 26 + 27 27 + {% macro get_many_to_many_counts(subject, source, pathToOther, dids, otherSubjects, limit) %} 28 28 + <form method="get" action="/xrpc/blue.microcosm.links.getManyToManyCounts"> 29 29 + <pre class="code"><strong>GET</strong> /xrpc/blue.microcosm.links.getManyToManyCounts 30 30 + ?subject= <input type="text" name="subject" value="{{ subject }}" placeholder="at-uri, did, uri..." /> 31 31 + &source= <input type="text" name="source" value="{{ source }}" placeholder="app.bsky.feed.like:subject.uri" /> 32 32 + &pathToOther= <input type="text" name="pathToOther" value="{{ pathToOther }}" placeholder="otherThing.uri" /> 33 33 + {%- for did in dids %}{% if !did.is_empty() %} 34 34 + &did= <input type="text" name="did" value="{{ did }}" placeholder="did:plc:..." />{% endif %}{% endfor %} 35 35 + <span id="m2m-subject-placeholder"></span> <button id="m2m-add-subject">+ other subject filter</button> 36 36 + {%- for otherSubject in otherSubjects %}{% if !otherSubject.is_empty() %} 37 37 + &otherSubject= <input type="text" name="did" value="{{ otherSubject }}" placeholder="at-uri, did, uri..." />{% endif %}{% endfor %} 38 38 + <span id="m2m-did-placeholder"></span> <button id="m2m-add-did">+ did filter</button> 39 39 + &limit= <input type="number" name="limit" value="{{ limit }}" max="100" placeholder="100" /> <button type="submit">get links</button></pre> 40 40 + </form> 41 41 + <script> 42 42 + const m2mAddDidButton = document.getElementById('m2m-add-did'); 43 43 + const m2mDidPlaceholder = document.getElementById('m2m-did-placeholder'); 44 44 + m2mAddDidButton.addEventListener('click', e => { 45 45 + e.preventDefault(); 46 46 + const i = document.createElement('input'); 47 47 + i.placeholder = 'did:plc:...'; 48 48 + i.name = "did" 49 49 + const p = m2mAddDidButton.parentNode; 50 50 + p.insertBefore(document.createTextNode('&did= '), m2mDidPlaceholder); 51 51 + p.insertBefore(i, m2mDidPlaceholder); 52 52 + p.insertBefore(document.createTextNode('\n '), m2mDidPlaceholder); 53 53 + }); 54 54 + const m2mAddSubjectButton = document.getElementById('m2m-add-subject'); 55 55 + const m2mSubjectPlaceholder = document.getElementById('m2m-subject-placeholder'); 56 56 + m2mAddSubjectButton.addEventListener('click', e => { 57 57 + e.preventDefault(); 58 58 + const i = document.createElement('input'); 59 59 + i.placeholder = 'at-uri, did, uri...'; 60 60 + i.name = "otherSubject" 61 61 + const p = m2mAddSubjectButton.parentNode; 62 62 + p.insertBefore(document.createTextNode('&otherSubject= '), m2mSubjectPlaceholder); 63 63 + p.insertBefore(i, m2mSubjectPlaceholder); 64 64 + p.insertBefore(document.createTextNode('\n '), m2mSubjectPlaceholder); 65 65 + }); 66 66 + </script> 67 67 + {% endmacro %} 68 68 + 69 69 + {% macro links(target, collection, path, dids, limit) %} 2 70 <form method="get" action="/links"> 3 71 <pre class="code"><strong>GET</strong> /links 4 72 ?target= <input type="text" name="target" value="{{ target }}" placeholder="target" /> 5 73 &collection= <input type="text" name="collection" value="{{ collection }}" placeholder="collection" /> 6 6 - &path= <input type="text" name="path" value="{{ path }}" placeholder="path" /> <button type="submit">get links</button></pre> 74 74 + &path= <input type="text" name="path" value="{{ path }}" placeholder="path" /> 75 75 + {%- for did in dids %}{% if !did.is_empty() %} 76 76 + &did= <input type="text" name="did" value="{{ did }}" placeholder="did:plc:..." />{% endif %}{% endfor %} 77 77 + <span id="did-placeholder"></span> <button id="add-did">+ did filter</button> 78 78 + &limit= <input type="number" name="limit" value="{{ limit }}" max="100" placeholder="100" /> <button type="submit">get links</button></pre> 7 79 </form> 80 80 + <script> 81 81 + const addDidButton = document.getElementById('add-did'); 82 82 + const didPlaceholder = document.getElementById('did-placeholder'); 83 83 + addDidButton.addEventListener('click', e => { 84 84 + e.preventDefault(); 85 85 + const i = document.createElement('input'); 86 86 + i.placeholder = 'did:plc:...'; 87 87 + i.name = "did" 88 88 + const p = addDidButton.parentNode; 89 89 + p.insertBefore(document.createTextNode('&did= '), didPlaceholder); 90 90 + p.insertBefore(i, didPlaceholder); 91 91 + p.insertBefore(document.createTextNode('\n '), didPlaceholder); 92 92 + }); 93 93 + </script> 8 94 {% endmacro %} 9 9 - 10 95 11 96 {% macro dids(target, collection, path) %} 12 97 <form method="get" action="/links/distinct-dids">

+6 -7

reflector/src/main.rs

··· 44 44 Data(parent): Data<&Option<String>>, 45 45 Query(AskQuery { domain }): Query<AskQuery>, 46 46 ) -> Response { 47 47 - if let Some(parent) = parent { 48 48 - if let Some(prefix) = domain.strip_suffix(&format!(".{parent}")) { 49 49 - if !prefix.contains('.') { 50 50 - // no sub-sub-domains allowed 51 51 - return Response::builder().body("ok"); 52 52 - } 53 53 - } 47 47 + if let Some(parent) = parent 48 48 + && let Some(prefix) = domain.strip_suffix(&format!(".{parent}")) 49 49 + && !prefix.contains('.') 50 50 + { 51 51 + // no sub-sub-domains allowed 52 52 + return Response::builder().body("ok"); 54 53 }; 55 54 Response::builder() 56 55 .status(StatusCode::FORBIDDEN)

+5 -5

spacedust/src/subscriber.rs

··· 42 42 loop { 43 43 tokio::select! { 44 44 l = receiver.recv() => match l { 45 45 - Ok(link) => if self.filter(&link.properties) { 46 46 - if let Err(e) = ws_sender.send(link.message.clone()).await { 47 47 - log::warn!("failed to send link, dropping subscriber: {e:?}"); 48 48 - break; 49 49 - } 45 45 + Ok(link) => if self.filter(&link.properties) 46 46 + && let Err(e) = ws_sender.send(link.message.clone()).await 47 47 + { 48 48 + log::warn!("failed to send link, dropping subscriber: {e:?}"); 49 49 + break; 50 50 }, 51 51 Err(RecvError::Closed) => self.shutdown.cancel(), 52 52 Err(RecvError::Lagged(n)) => {

+4 -4

who-am-i/src/server.rs

··· 268 268 Some(parent_host), 269 269 ); 270 270 } 271 271 - if let Some(ref app) = params.app { 272 272 - if !allowed_hosts.contains(app) { 273 273 - return err("Login is not allowed for this app", false, Some(app)); 274 274 - } 271 271 + if let Some(ref app) = params.app 272 272 + && !allowed_hosts.contains(app) 273 273 + { 274 274 + return err("Login is not allowed for this app", false, Some(app)); 275 275 } 276 276 let parent_origin = url.origin().ascii_serialization(); 277 277 if parent_origin == "null" {