+21

.github/workflows/build.yml

··· 1 1 + name: Build 2 2 + 3 3 + on: 4 4 + push: 5 5 + tags: 6 6 + - "reflector-v*.*.*" 7 7 + 8 8 + jobs: 9 9 + build: 10 10 + runs-on: ubuntu-latest 11 11 + permissions: 12 12 + contents: write 13 13 + 14 14 + steps: 15 15 + - uses: actions/checkout@v4 16 16 + - name: build reflector 17 17 + run: cargo build --bin reflector --release && mv target/release/reflector target/release/reflector_amd64 18 18 + - name: release 19 19 + uses: softprops/action-gh-release@v2 20 20 + with: 21 21 + files: target/release/reflector_amd64

+1 -1

.github/workflows/checks.yml

··· 28 28 - name: get nightly toolchain for jetstream fmt 29 29 run: rustup toolchain install nightly --allow-downgrade -c rustfmt 30 30 - name: fmt 31 31 - run: cargo fmt --package links --package constellation --package ufos --package spacedust --package who-am-i --package slingshot -- --check 31 31 + run: cargo fmt --package links --package constellation --package ufos --package spacedust --package who-am-i --package slingshot --package pocket -- --check 32 32 - name: fmt jetstream (nightly) 33 33 run: cargo +nightly fmt --package jetstream -- --check 34 34 - name: clippy

+582 -237

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]] ··· 192 192 "nom", 193 193 "num-traits", 194 194 "rusticata-macros", 195 195 - "thiserror 2.0.12", 195 195 + "thiserror 2.0.16", 196 196 "time", 197 197 ] 198 198 ··· 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]] ··· 306 306 source = "registry+https://github.com/rust-lang/crates.io-index" 307 307 checksum = "46355d3245edc7b3160b2a45fe55d09a6963ebd3eee0252feb6b72fb0eb71463" 308 308 dependencies = [ 309 309 - "atrium-common", 310 310 - "atrium-xrpc", 309 309 + "atrium-common 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", 310 310 + "atrium-xrpc 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", 311 311 + "chrono", 312 312 + "http", 313 313 + "ipld-core", 314 314 + "langtag", 315 315 + "regex", 316 316 + "serde", 317 317 + "serde_bytes", 318 318 + "serde_json", 319 319 + "thiserror 1.0.69", 320 320 + "tokio", 321 321 + "trait-variant", 322 322 + ] 323 323 + 324 324 + [[package]] 325 325 + name = "atrium-api" 326 326 + version = "0.25.4" 327 327 + source = "git+https://github.com/uniphil/atrium.git?branch=fix%2Fresolve-handle-https-accept-whitespace#80a355991ac9b48ba3f559d12aac74f071fc638c" 328 328 + dependencies = [ 329 329 + "atrium-common 0.1.2 (git+https://github.com/uniphil/atrium.git?branch=fix%2Fresolve-handle-https-accept-whitespace)", 330 330 + "atrium-xrpc 0.12.3 (git+https://github.com/uniphil/atrium.git?branch=fix%2Fresolve-handle-https-accept-whitespace)", 311 331 "chrono", 312 332 "http", 313 333 "ipld-core", ··· 337 357 ] 338 358 339 359 [[package]] 360 360 + name = "atrium-common" 361 361 + version = "0.1.2" 362 362 + source = "git+https://github.com/uniphil/atrium.git?branch=fix%2Fresolve-handle-https-accept-whitespace#80a355991ac9b48ba3f559d12aac74f071fc638c" 363 363 + dependencies = [ 364 364 + "dashmap", 365 365 + "lru", 366 366 + "moka", 367 367 + "thiserror 1.0.69", 368 368 + "tokio", 369 369 + "trait-variant", 370 370 + "web-time", 371 371 + ] 372 372 + 373 373 + [[package]] 374 374 + name = "atrium-crypto" 375 375 + version = "0.1.2" 376 376 + source = "registry+https://github.com/rust-lang/crates.io-index" 377 377 + checksum = "73a3da430c71dd9006d61072c20771f264e5c498420a49c32305ceab8bd71955" 378 378 + dependencies = [ 379 379 + "ecdsa", 380 380 + "k256", 381 381 + "multibase", 382 382 + "p256", 383 383 + "thiserror 1.0.69", 384 384 + ] 385 385 + 386 386 + [[package]] 340 387 name = "atrium-identity" 341 388 version = "0.1.5" 342 389 source = "registry+https://github.com/rust-lang/crates.io-index" 343 390 checksum = "c9e2d42bb4dbea038f4f5f45e3af2a89d61a9894a75f06aa550b74a60d2be380" 344 391 dependencies = [ 345 345 - "atrium-api", 346 346 - "atrium-common", 347 347 - "atrium-xrpc", 392 392 + "atrium-api 0.25.4 (registry+https://github.com/rust-lang/crates.io-index)", 393 393 + "atrium-common 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", 394 394 + "atrium-xrpc 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", 395 395 + "serde", 396 396 + "serde_html_form", 397 397 + "serde_json", 398 398 + "thiserror 1.0.69", 399 399 + "trait-variant", 400 400 + ] 401 401 + 402 402 + [[package]] 403 403 + name = "atrium-identity" 404 404 + version = "0.1.5" 405 405 + source = "git+https://github.com/uniphil/atrium.git?branch=fix%2Fresolve-handle-https-accept-whitespace#80a355991ac9b48ba3f559d12aac74f071fc638c" 406 406 + dependencies = [ 407 407 + "atrium-api 0.25.4 (git+https://github.com/uniphil/atrium.git?branch=fix%2Fresolve-handle-https-accept-whitespace)", 408 408 + "atrium-common 0.1.2 (git+https://github.com/uniphil/atrium.git?branch=fix%2Fresolve-handle-https-accept-whitespace)", 409 409 + "atrium-xrpc 0.12.3 (git+https://github.com/uniphil/atrium.git?branch=fix%2Fresolve-handle-https-accept-whitespace)", 348 410 "serde", 349 411 "serde_html_form", 350 412 "serde_json", ··· 358 420 source = "registry+https://github.com/rust-lang/crates.io-index" 359 421 checksum = "ca22dc4eaf77fd9bf050b21192ac58cd654a437d28e000ec114ebd93a51d36f5" 360 422 dependencies = [ 361 361 - "atrium-api", 362 362 - "atrium-common", 363 363 - "atrium-identity", 364 364 - "atrium-xrpc", 423 423 + "atrium-api 0.25.4 (registry+https://github.com/rust-lang/crates.io-index)", 424 424 + "atrium-common 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", 425 425 + "atrium-identity 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", 426 426 + "atrium-xrpc 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", 427 427 + "base64 0.22.1", 428 428 + "chrono", 429 429 + "dashmap", 430 430 + "ecdsa", 431 431 + "elliptic-curve", 432 432 + "jose-jwa", 433 433 + "jose-jwk", 434 434 + "p256", 435 435 + "rand 0.8.5", 436 436 + "reqwest", 437 437 + "serde", 438 438 + "serde_html_form", 439 439 + "serde_json", 440 440 + "sha2", 441 441 + "thiserror 1.0.69", 442 442 + "tokio", 443 443 + "trait-variant", 444 444 + ] 445 445 + 446 446 + [[package]] 447 447 + name = "atrium-oauth" 448 448 + version = "0.1.3" 449 449 + source = "git+https://github.com/uniphil/atrium.git?branch=fix%2Fresolve-handle-https-accept-whitespace#80a355991ac9b48ba3f559d12aac74f071fc638c" 450 450 + dependencies = [ 451 451 + "atrium-api 0.25.4 (git+https://github.com/uniphil/atrium.git?branch=fix%2Fresolve-handle-https-accept-whitespace)", 452 452 + "atrium-common 0.1.2 (git+https://github.com/uniphil/atrium.git?branch=fix%2Fresolve-handle-https-accept-whitespace)", 453 453 + "atrium-identity 0.1.5 (git+https://github.com/uniphil/atrium.git?branch=fix%2Fresolve-handle-https-accept-whitespace)", 454 454 + "atrium-xrpc 0.12.3 (git+https://github.com/uniphil/atrium.git?branch=fix%2Fresolve-handle-https-accept-whitespace)", 365 455 "base64 0.22.1", 366 456 "chrono", 367 457 "dashmap", ··· 396 486 ] 397 487 398 488 [[package]] 489 489 + name = "atrium-xrpc" 490 490 + version = "0.12.3" 491 491 + source = "git+https://github.com/uniphil/atrium.git?branch=fix%2Fresolve-handle-https-accept-whitespace#80a355991ac9b48ba3f559d12aac74f071fc638c" 492 492 + dependencies = [ 493 493 + "http", 494 494 + "serde", 495 495 + "serde_html_form", 496 496 + "serde_json", 497 497 + "thiserror 1.0.69", 498 498 + "trait-variant", 499 499 + ] 500 500 + 501 501 + [[package]] 399 502 name = "auto_enums" 400 503 version = "0.8.7" 401 504 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 404 507 "derive_utils", 405 508 "proc-macro2", 406 509 "quote", 407 407 - "syn 2.0.103", 510 510 + "syn 2.0.106", 408 511 ] 409 512 410 513 [[package]] ··· 500 603 "axum-core", 501 604 "bytes", 502 605 "cookie", 606 606 + "form_urlencoded", 503 607 "futures-util", 504 608 "headers", 505 609 "http", ··· 509 613 "pin-project-lite", 510 614 "rustversion", 511 615 "serde", 616 616 + "serde_html_form", 617 617 + "serde_path_to_error", 512 618 "tower", 513 619 "tower-layer", 514 620 "tower-service", ··· 538 644 "axum", 539 645 "handlebars", 540 646 "serde", 541 541 - "thiserror 2.0.12", 647 647 + "thiserror 2.0.16", 542 648 ] 543 649 544 650 [[package]] ··· 643 749 "regex", 644 750 "rustc-hash 1.1.0", 645 751 "shlex", 646 646 - "syn 2.0.103", 752 752 + "syn 2.0.106", 647 753 "which", 648 754 ] 649 755 ··· 662 768 "regex", 663 769 "rustc-hash 1.1.0", 664 770 "shlex", 665 665 - "syn 2.0.103", 771 771 + "syn 2.0.106", 666 772 ] 667 773 668 774 [[package]] ··· 680 786 "regex", 681 787 "rustc-hash 2.1.1", 682 788 "shlex", 683 683 - "syn 2.0.103", 789 789 + "syn 2.0.106", 790 790 + ] 791 791 + 792 792 + [[package]] 793 793 + name = "bitcoin-io" 794 794 + version = "0.1.3" 795 795 + source = "registry+https://github.com/rust-lang/crates.io-index" 796 796 + checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf" 797 797 + 798 798 + [[package]] 799 799 + name = "bitcoin_hashes" 800 800 + version = "0.14.0" 801 801 + source = "registry+https://github.com/rust-lang/crates.io-index" 802 802 + checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" 803 803 + dependencies = [ 804 804 + "bitcoin-io", 805 805 + "hex-conservative", 684 806 ] 685 807 686 808 [[package]] ··· 740 862 741 863 [[package]] 742 864 name = "camino" 743 743 - version = "1.1.9" 865 865 + version = "1.2.1" 744 866 source = "registry+https://github.com/rust-lang/crates.io-index" 745 745 - checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" 867 867 + checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609" 746 868 dependencies = [ 747 747 - "serde", 869 869 + "serde_core", 748 870 ] 749 871 750 872 [[package]] ··· 817 939 ] 818 940 819 941 [[package]] 942 942 + name = "ciborium" 943 943 + version = "0.2.2" 944 944 + source = "registry+https://github.com/rust-lang/crates.io-index" 945 945 + checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" 946 946 + dependencies = [ 947 947 + "ciborium-io", 948 948 + "ciborium-ll", 949 949 + "serde", 950 950 + ] 951 951 + 952 952 + [[package]] 953 953 + name = "ciborium-io" 954 954 + version = "0.2.2" 955 955 + source = "registry+https://github.com/rust-lang/crates.io-index" 956 956 + checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" 957 957 + 958 958 + [[package]] 959 959 + name = "ciborium-ll" 960 960 + version = "0.2.2" 961 961 + source = "registry+https://github.com/rust-lang/crates.io-index" 962 962 + checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" 963 963 + dependencies = [ 964 964 + "ciborium-io", 965 965 + "half", 966 966 + ] 967 967 + 968 968 + [[package]] 820 969 name = "cid" 821 970 version = "0.11.1" 822 971 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 843 992 844 993 [[package]] 845 994 name = "clap" 846 846 - version = "4.5.41" 995 995 + version = "4.5.48" 847 996 source = "registry+https://github.com/rust-lang/crates.io-index" 848 848 - checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9" 997 997 + checksum = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae" 849 998 dependencies = [ 850 999 "clap_builder", 851 1000 "clap_derive", ··· 853 1002 854 1003 [[package]] 855 1004 name = "clap_builder" 856 856 - version = "4.5.41" 1005 1005 + version = "4.5.48" 857 1006 source = "registry+https://github.com/rust-lang/crates.io-index" 858 858 - checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d" 1007 1007 + checksum = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9" 859 1008 dependencies = [ 860 1009 "anstream", 861 1010 "anstyle", ··· 865 1014 866 1015 [[package]] 867 1016 name = "clap_derive" 868 868 - version = "4.5.41" 1017 1017 + version = "4.5.47" 869 1018 source = "registry+https://github.com/rust-lang/crates.io-index" 870 870 - checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491" 1019 1019 + checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c" 871 1020 dependencies = [ 872 1021 "heck", 873 1022 "proc-macro2", 874 1023 "quote", 875 875 - "syn 2.0.103", 1024 1024 + "syn 2.0.106", 876 1025 ] 877 1026 878 1027 [[package]] ··· 1082 1231 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" 1083 1232 1084 1233 [[package]] 1234 1234 + name = "crunchy" 1235 1235 + version = "0.2.4" 1236 1236 + source = "registry+https://github.com/rust-lang/crates.io-index" 1237 1237 + checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" 1238 1238 + 1239 1239 + [[package]] 1085 1240 name = "crypto-bigint" 1086 1241 version = "0.5.5" 1087 1242 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1158 1313 "proc-macro2", 1159 1314 "quote", 1160 1315 "strsim 0.11.1", 1161 1161 - "syn 2.0.103", 1316 1316 + "syn 2.0.106", 1162 1317 ] 1163 1318 1164 1319 [[package]] ··· 1180 1335 dependencies = [ 1181 1336 "darling_core 0.20.11", 1182 1337 "quote", 1183 1183 - "syn 2.0.103", 1338 1338 + "syn 2.0.106", 1184 1339 ] 1185 1340 1186 1341 [[package]] ··· 1220 1375 checksum = "18e4fdb82bd54a12e42fb58a800dcae6b9e13982238ce2296dc3570b92148e1f" 1221 1376 dependencies = [ 1222 1377 "data-encoding", 1223 1223 - "syn 1.0.109", 1378 1378 + "syn 2.0.106", 1224 1379 ] 1225 1380 1226 1381 [[package]] ··· 1282 1437 "darling 0.20.11", 1283 1438 "proc-macro2", 1284 1439 "quote", 1285 1285 - "syn 2.0.103", 1440 1440 + "syn 2.0.106", 1286 1441 ] 1287 1442 1288 1443 [[package]] ··· 1292 1447 checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" 1293 1448 dependencies = [ 1294 1449 "derive_builder_core", 1295 1295 - "syn 2.0.103", 1450 1450 + "syn 2.0.106", 1296 1451 ] 1297 1452 1298 1453 [[package]] ··· 1312 1467 dependencies = [ 1313 1468 "proc-macro2", 1314 1469 "quote", 1315 1315 - "syn 2.0.103", 1470 1470 + "syn 2.0.106", 1316 1471 "unicode-xid", 1317 1472 ] 1318 1473 ··· 1324 1479 dependencies = [ 1325 1480 "proc-macro2", 1326 1481 "quote", 1327 1327 - "syn 2.0.103", 1482 1482 + "syn 2.0.106", 1328 1483 ] 1329 1484 1330 1485 [[package]] ··· 1368 1523 dependencies = [ 1369 1524 "proc-macro2", 1370 1525 "quote", 1371 1371 - "syn 2.0.103", 1526 1526 + "syn 2.0.106", 1372 1527 ] 1373 1528 1374 1529 [[package]] ··· 1385 1540 1386 1541 [[package]] 1387 1542 name = "dropshot" 1388 1388 - version = "0.16.2" 1543 1543 + version = "0.16.3" 1389 1544 source = "registry+https://github.com/rust-lang/crates.io-index" 1390 1390 - checksum = "50e8fed669e35e757646ad10f97c4d26dd22cce3da689b307954f7000d2719d0" 1545 1545 + checksum = "eedf902e40c1024b8ed9ca16378a54e9655cdf0e698245ba82d81a3778dcbc54" 1391 1546 dependencies = [ 1392 1547 "async-stream", 1393 1548 "async-trait", ··· 1404 1559 "http-body-util", 1405 1560 "hyper", 1406 1561 "hyper-util", 1407 1407 - "indexmap 2.9.0", 1562 1562 + "indexmap 2.11.4", 1408 1563 "multer", 1409 1564 "openapiv3", 1410 1565 "paste", ··· 1424 1579 "slog-bunyan", 1425 1580 "slog-json", 1426 1581 "slog-term", 1427 1427 - "thiserror 2.0.12", 1582 1582 + "thiserror 2.0.16", 1428 1583 "tokio", 1429 1584 "tokio-rustls 0.25.0", 1430 1430 - "toml", 1585 1585 + "toml 0.9.7", 1431 1586 "uuid", 1432 1587 "version_check", 1433 1588 "waitgroup", ··· 1435 1590 1436 1591 [[package]] 1437 1592 name = "dropshot_endpoint" 1438 1438 - version = "0.16.2" 1593 1593 + version = "0.16.4" 1439 1594 source = "registry+https://github.com/rust-lang/crates.io-index" 1440 1440 - checksum = "acebb687581abdeaa2c89fa448818a5f803b0e68e5d7e7a1cf585a8f3c5c57ac" 1595 1595 + checksum = "89d09440e73a9dcf8a0f7fbd6ab889a7751d59f0fe76e5082a0a6d5623ec6da3" 1441 1596 dependencies = [ 1442 1597 "heck", 1443 1598 "proc-macro2", ··· 1445 1600 "semver", 1446 1601 "serde", 1447 1602 "serde_tokenstream", 1448 1448 - "syn 2.0.103", 1603 1603 + "syn 2.0.106", 1449 1604 ] 1450 1605 1451 1606 [[package]] ··· 1518 1673 "heck", 1519 1674 "proc-macro2", 1520 1675 "quote", 1521 1521 - "syn 2.0.103", 1676 1676 + "syn 2.0.106", 1522 1677 ] 1523 1678 1524 1679 [[package]] ··· 1530 1685 "once_cell", 1531 1686 "proc-macro2", 1532 1687 "quote", 1533 1533 - "syn 2.0.103", 1688 1688 + "syn 2.0.106", 1534 1689 ] 1535 1690 1536 1691 [[package]] ··· 1569 1724 checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" 1570 1725 dependencies = [ 1571 1726 "libc", 1572 1572 - "windows-sys 0.52.0", 1727 1727 + "windows-sys 0.59.0", 1573 1728 ] 1574 1729 1575 1730 [[package]] ··· 1594 1749 ] 1595 1750 1596 1751 [[package]] 1752 1752 + name = "fallible-iterator" 1753 1753 + version = "0.3.0" 1754 1754 + source = "registry+https://github.com/rust-lang/crates.io-index" 1755 1755 + checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" 1756 1756 + 1757 1757 + [[package]] 1758 1758 + name = "fallible-streaming-iterator" 1759 1759 + version = "0.1.9" 1760 1760 + source = "registry+https://github.com/rust-lang/crates.io-index" 1761 1761 + checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" 1762 1762 + 1763 1763 + [[package]] 1597 1764 name = "fastrand" 1598 1765 version = "2.3.0" 1599 1766 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1612 1779 [[package]] 1613 1780 name = "fjall" 1614 1781 version = "2.11.2" 1615 1615 - source = "git+https://github.com/fjall-rs/fjall.git#42d811f7c8cc9004407d520d37d2a1d8d246c03d" 1782 1782 + source = "registry+https://github.com/rust-lang/crates.io-index" 1783 1783 + checksum = "0b25ad44cd4360a0448a9b5a0a6f1c7a621101cca4578706d43c9a821418aebc" 1784 1784 + dependencies = [ 1785 1785 + "byteorder", 1786 1786 + "byteview", 1787 1787 + "dashmap", 1788 1788 + "log", 1789 1789 + "lsm-tree", 1790 1790 + "path-absolutize", 1791 1791 + "std-semaphore", 1792 1792 + "tempfile", 1793 1793 + "xxhash-rust", 1794 1794 + ] 1795 1795 + 1796 1796 + [[package]] 1797 1797 + name = "fjall" 1798 1798 + version = "2.11.2" 1799 1799 + source = "git+https://github.com/fjall-rs/fjall.git?rev=fb229572bb7d1d6966a596994dc1708e47ec57d8#fb229572bb7d1d6966a596994dc1708e47ec57d8" 1616 1800 dependencies = [ 1617 1801 "byteorder", 1618 1802 "byteview", ··· 1707 1891 "mixtrics", 1708 1892 "pin-project", 1709 1893 "serde", 1710 1710 - "thiserror 2.0.12", 1894 1894 + "thiserror 2.0.16", 1711 1895 "tokio", 1712 1896 "tracing", 1713 1897 ] ··· 1727 1911 "parking_lot", 1728 1912 "pin-project", 1729 1913 "serde", 1730 1730 - "thiserror 2.0.12", 1914 1914 + "thiserror 2.0.16", 1731 1915 "tokio", 1732 1916 "twox-hash", 1733 1917 ] ··· 1760 1944 "parking_lot", 1761 1945 "pin-project", 1762 1946 "serde", 1763 1763 - "thiserror 2.0.12", 1947 1947 + "thiserror 2.0.16", 1764 1948 "tokio", 1765 1949 "tracing", 1766 1950 ] ··· 1792 1976 "pin-project", 1793 1977 "rand 0.9.1", 1794 1978 "serde", 1795 1795 - "thiserror 2.0.12", 1979 1979 + "thiserror 2.0.16", 1796 1980 "tokio", 1797 1981 "tracing", 1798 1982 "twox-hash", ··· 1881 2065 dependencies = [ 1882 2066 "proc-macro2", 1883 2067 "quote", 1884 1884 - "syn 2.0.103", 2068 2068 + "syn 2.0.106", 1885 2069 ] 1886 2070 1887 2071 [[package]] ··· 2006 2190 "futures-core", 2007 2191 "futures-sink", 2008 2192 "http", 2009 2009 - "indexmap 2.9.0", 2193 2193 + "indexmap 2.11.4", 2010 2194 "slab", 2011 2195 "tokio", 2012 2196 "tokio-util", ··· 2014 2198 ] 2015 2199 2016 2200 [[package]] 2201 2201 + name = "half" 2202 2202 + version = "2.6.0" 2203 2203 + source = "registry+https://github.com/rust-lang/crates.io-index" 2204 2204 + checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" 2205 2205 + dependencies = [ 2206 2206 + "cfg-if", 2207 2207 + "crunchy", 2208 2208 + ] 2209 2209 + 2210 2210 + [[package]] 2017 2211 name = "handlebars" 2018 2212 version = "6.3.2" 2019 2213 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2026 2220 "pest_derive", 2027 2221 "serde", 2028 2222 "serde_json", 2029 2029 - "thiserror 2.0.12", 2223 2223 + "thiserror 2.0.16", 2030 2224 "walkdir", 2031 2225 ] 2032 2226 ··· 2063 2257 ] 2064 2258 2065 2259 [[package]] 2260 2260 + name = "hashlink" 2261 2261 + version = "0.10.0" 2262 2262 + source = "registry+https://github.com/rust-lang/crates.io-index" 2263 2263 + checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" 2264 2264 + dependencies = [ 2265 2265 + "hashbrown 0.15.2", 2266 2266 + ] 2267 2267 + 2268 2268 + [[package]] 2066 2269 name = "headers" 2067 2270 version = "0.4.0" 2068 2271 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2116 2319 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" 2117 2320 2118 2321 [[package]] 2322 2322 + name = "hex-conservative" 2323 2323 + version = "0.2.1" 2324 2324 + source = "registry+https://github.com/rust-lang/crates.io-index" 2325 2325 + checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd" 2326 2326 + dependencies = [ 2327 2327 + "arrayvec", 2328 2328 + ] 2329 2329 + 2330 2330 + [[package]] 2119 2331 name = "hickory-proto" 2120 2332 version = "0.25.2" 2121 2333 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2133 2345 "once_cell", 2134 2346 "rand 0.9.1", 2135 2347 "ring", 2136 2136 - "thiserror 2.0.12", 2348 2348 + "thiserror 2.0.16", 2137 2349 "tinyvec", 2138 2350 "tokio", 2139 2351 "tracing", ··· 2156 2368 "rand 0.9.1", 2157 2369 "resolv-conf", 2158 2370 "smallvec", 2159 2159 - "thiserror 2.0.12", 2371 2371 + "thiserror 2.0.16", 2160 2372 "tokio", 2161 2373 "tracing", 2162 2374 ] ··· 2348 2560 "js-sys", 2349 2561 "log", 2350 2562 "wasm-bindgen", 2351 2351 - "windows-core 0.61.0", 2563 2563 + "windows-core", 2352 2564 ] 2353 2565 2354 2566 [[package]] ··· 2475 2687 dependencies = [ 2476 2688 "proc-macro2", 2477 2689 "quote", 2478 2478 - "syn 2.0.103", 2690 2690 + "syn 2.0.106", 2479 2691 ] 2480 2692 2481 2693 [[package]] ··· 2518 2730 2519 2731 [[package]] 2520 2732 name = "indexmap" 2521 2521 - version = "2.9.0" 2733 2733 + version = "2.11.4" 2522 2734 source = "registry+https://github.com/rust-lang/crates.io-index" 2523 2523 - checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" 2735 2735 + checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" 2524 2736 dependencies = [ 2525 2737 "equivalent", 2526 2738 "hashbrown 0.15.2", 2527 2739 "serde", 2740 2740 + "serde_core", 2528 2741 ] 2529 2742 2530 2743 [[package]] ··· 2594 2807 dependencies = [ 2595 2808 "hermit-abi", 2596 2809 "libc", 2597 2597 - "windows-sys 0.52.0", 2810 2810 + "windows-sys 0.59.0", 2598 2811 ] 2599 2812 2600 2813 [[package]] ··· 2642 2855 dependencies = [ 2643 2856 "anyhow", 2644 2857 "async-trait", 2645 2645 - "atrium-api", 2858 2858 + "atrium-api 0.25.4 (git+https://github.com/uniphil/atrium.git?branch=fix%2Fresolve-handle-https-accept-whitespace)", 2646 2859 "chrono", 2647 2860 "clap", 2648 2861 "futures-util", ··· 2650 2863 "metrics", 2651 2864 "serde", 2652 2865 "serde_json", 2653 2653 - "thiserror 2.0.12", 2866 2866 + "thiserror 2.0.16", 2654 2867 "tokio", 2655 2868 "tokio-tungstenite 0.26.2", 2656 2869 "url", ··· 2678 2891 dependencies = [ 2679 2892 "proc-macro2", 2680 2893 "quote", 2681 2681 - "syn 2.0.103", 2894 2894 + "syn 2.0.106", 2682 2895 ] 2683 2896 2684 2897 [[package]] ··· 2753 2966 ] 2754 2967 2755 2968 [[package]] 2969 2969 + name = "jwt-compact" 2970 2970 + version = "0.9.0-beta.1" 2971 2971 + source = "git+https://github.com/fatfingers23/jwt-compact.git#aed088b8ff5ad44ef2785c453f6a4b7916728b1c" 2972 2972 + dependencies = [ 2973 2973 + "anyhow", 2974 2974 + "base64ct", 2975 2975 + "chrono", 2976 2976 + "ciborium", 2977 2977 + "hmac", 2978 2978 + "lazy_static", 2979 2979 + "rand_core 0.6.4", 2980 2980 + "secp256k1", 2981 2981 + "serde", 2982 2982 + "serde_json", 2983 2983 + "sha2", 2984 2984 + "smallvec", 2985 2985 + "subtle", 2986 2986 + "zeroize", 2987 2987 + ] 2988 2988 + 2989 2989 + [[package]] 2990 2990 + name = "k256" 2991 2991 + version = "0.13.4" 2992 2992 + source = "registry+https://github.com/rust-lang/crates.io-index" 2993 2993 + checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" 2994 2994 + dependencies = [ 2995 2995 + "cfg-if", 2996 2996 + "ecdsa", 2997 2997 + "elliptic-curve", 2998 2998 + "sha2", 2999 2999 + ] 3000 3000 + 3001 3001 + [[package]] 2756 3002 name = "langtag" 2757 3003 version = "0.3.4" 2758 3004 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2799 3045 checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" 2800 3046 dependencies = [ 2801 3047 "cfg-if", 2802 2802 - "windows-targets 0.48.5", 3048 3048 + "windows-targets 0.52.6", 2803 3049 ] 2804 3050 2805 3051 [[package]] ··· 2845 3091 ] 2846 3092 2847 3093 [[package]] 3094 3094 + name = "libsqlite3-sys" 3095 3095 + version = "0.35.0" 3096 3096 + source = "registry+https://github.com/rust-lang/crates.io-index" 3097 3097 + checksum = "133c182a6a2c87864fe97778797e46c7e999672690dc9fa3ee8e241aa4a9c13f" 3098 3098 + dependencies = [ 3099 3099 + "pkg-config", 3100 3100 + "vcpkg", 3101 3101 + ] 3102 3102 + 3103 3103 + [[package]] 2848 3104 name = "libz-sys" 2849 3105 version = "1.1.22" 2850 3106 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2862 3118 "anyhow", 2863 3119 "fluent-uri", 2864 3120 "nom", 2865 2865 - "thiserror 2.0.12", 3121 3121 + "thiserror 2.0.16", 2866 3122 "tinyjson", 2867 3123 ] 2868 3124 ··· 2896 3152 2897 3153 [[package]] 2898 3154 name = "log" 2899 2899 - version = "0.4.27" 3155 3155 + version = "0.4.28" 2900 3156 source = "registry+https://github.com/rust-lang/crates.io-index" 2901 2901 - checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" 3157 3157 + checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" 2902 3158 2903 3159 [[package]] 2904 3160 name = "loom" ··· 3012 3268 "spin", 3013 3269 "tokio", 3014 3270 "tokio-util", 3015 3015 - "toml", 3271 3271 + "toml 0.8.23", 3016 3272 "tracing", 3017 3273 "tracing-subscriber", 3018 3274 ] ··· 3048 3304 3049 3305 [[package]] 3050 3306 name = "matchers" 3051 3051 - version = "0.1.0" 3307 3307 + version = "0.2.0" 3052 3308 source = "registry+https://github.com/rust-lang/crates.io-index" 3053 3053 - checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" 3309 3309 + checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" 3054 3310 dependencies = [ 3055 3055 - "regex-automata 0.1.10", 3311 3311 + "regex-automata", 3056 3312 ] 3057 3313 3058 3314 [[package]] ··· 3102 3358 "http-body-util", 3103 3359 "hyper", 3104 3360 "hyper-util", 3105 3105 - "indexmap 2.9.0", 3361 3361 + "indexmap 2.11.4", 3106 3362 "ipnet", 3107 3363 "metrics", 3108 3364 "metrics-util 0.19.0", ··· 3123 3379 "hyper", 3124 3380 "hyper-rustls", 3125 3381 "hyper-util", 3126 3126 - "indexmap 2.9.0", 3382 3382 + "indexmap 2.11.4", 3127 3383 "ipnet", 3128 3384 "metrics", 3129 3385 "metrics-util 0.20.0", 3130 3386 "quanta", 3131 3131 - "thiserror 2.0.12", 3387 3387 + "thiserror 2.0.16", 3132 3388 "tokio", 3133 3389 "tracing", 3134 3390 ] ··· 3351 3607 3352 3608 [[package]] 3353 3609 name = "nu-ansi-term" 3354 3354 - version = "0.46.0" 3610 3610 + version = "0.50.1" 3355 3611 source = "registry+https://github.com/rust-lang/crates.io-index" 3356 3356 - checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" 3612 3612 + checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" 3357 3613 dependencies = [ 3358 3358 - "overload", 3359 3359 - "winapi", 3614 3614 + "windows-sys 0.52.0", 3360 3615 ] 3361 3616 3362 3617 [[package]] ··· 3486 3741 3487 3742 [[package]] 3488 3743 name = "openapiv3" 3489 3489 - version = "2.0.0" 3744 3744 + version = "2.2.0" 3490 3745 source = "registry+https://github.com/rust-lang/crates.io-index" 3491 3491 - checksum = "cc02deea53ffe807708244e5914f6b099ad7015a207ee24317c22112e17d9c5c" 3746 3746 + checksum = "5c8d427828b22ae1fff2833a03d8486c2c881367f1c336349f307f321e7f4d05" 3492 3747 dependencies = [ 3493 3493 - "indexmap 2.9.0", 3748 3748 + "indexmap 2.11.4", 3494 3749 "serde", 3495 3750 "serde_json", 3496 3751 ] ··· 3518 3773 dependencies = [ 3519 3774 "proc-macro2", 3520 3775 "quote", 3521 3521 - "syn 2.0.103", 3776 3776 + "syn 2.0.106", 3522 3777 ] 3523 3778 3524 3779 [[package]] ··· 3557 3812 dependencies = [ 3558 3813 "hashbrown 0.13.2", 3559 3814 ] 3560 3560 - 3561 3561 - [[package]] 3562 3562 - name = "overload" 3563 3563 - version = "0.1.1" 3564 3564 - source = "registry+https://github.com/rust-lang/crates.io-index" 3565 3565 - checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" 3566 3815 3567 3816 [[package]] 3568 3817 name = "p256" ··· 3677 3926 checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323" 3678 3927 dependencies = [ 3679 3928 "memchr", 3680 3680 - "thiserror 2.0.12", 3929 3929 + "thiserror 2.0.16", 3681 3930 "ucd-trie", 3682 3931 ] 3683 3932 ··· 3701 3950 "pest_meta", 3702 3951 "proc-macro2", 3703 3952 "quote", 3704 3704 - "syn 2.0.103", 3953 3953 + "syn 2.0.106", 3705 3954 ] 3706 3955 3707 3956 [[package]] ··· 3731 3980 dependencies = [ 3732 3981 "proc-macro2", 3733 3982 "quote", 3734 3734 - "syn 2.0.103", 3983 3983 + "syn 2.0.106", 3735 3984 ] 3736 3985 3737 3986 [[package]] ··· 3774 4023 checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" 3775 4024 3776 4025 [[package]] 4026 4026 + name = "pocket" 4027 4027 + version = "0.1.0" 4028 4028 + dependencies = [ 4029 4029 + "atrium-crypto", 4030 4030 + "clap", 4031 4031 + "jwt-compact", 4032 4032 + "log", 4033 4033 + "poem", 4034 4034 + "poem-openapi", 4035 4035 + "reqwest", 4036 4036 + "rusqlite", 4037 4037 + "serde", 4038 4038 + "serde_json", 4039 4039 + "thiserror 2.0.16", 4040 4040 + "tokio", 4041 4041 + "tracing-subscriber", 4042 4042 + ] 4043 4043 + 4044 4044 + [[package]] 3777 4045 name = "poem" 3778 4046 version = "3.1.12" 3779 4047 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 3811 4079 "smallvec", 3812 4080 "sync_wrapper", 3813 4081 "tempfile", 3814 3814 - "thiserror 2.0.12", 4082 4082 + "thiserror 2.0.16", 3815 4083 "tokio", 3816 4084 "tokio-rustls 0.26.2", 3817 4085 "tokio-stream", ··· 3830 4098 "proc-macro-crate", 3831 4099 "proc-macro2", 3832 4100 "quote", 3833 3833 - "syn 2.0.103", 4101 4101 + "syn 2.0.106", 3834 4102 ] 3835 4103 3836 4104 [[package]] ··· 3843 4111 "bytes", 3844 4112 "derive_more", 3845 4113 "futures-util", 3846 3846 - "indexmap 2.9.0", 4114 4114 + "indexmap 2.11.4", 3847 4115 "itertools 0.14.0", 3848 4116 "mime", 3849 4117 "num-traits", ··· 3855 4123 "serde_json", 3856 4124 "serde_urlencoded", 3857 4125 "serde_yaml", 3858 3858 - "thiserror 2.0.12", 4126 4126 + "thiserror 2.0.16", 3859 4127 "tokio", 3860 4128 ] 3861 4129 ··· 3867 4135 dependencies = [ 3868 4136 "darling 0.20.11", 3869 4137 "http", 3870 3870 - "indexmap 2.9.0", 4138 4138 + "indexmap 2.11.4", 3871 4139 "mime", 3872 4140 "proc-macro-crate", 3873 4141 "proc-macro2", 3874 4142 "quote", 3875 4143 "regex", 3876 3876 - "syn 2.0.103", 3877 3877 - "thiserror 2.0.12", 4144 4144 + "syn 2.0.106", 4145 4145 + "thiserror 2.0.16", 3878 4146 ] 3879 4147 3880 4148 [[package]] ··· 3914 4182 checksum = "6837b9e10d61f45f987d50808f83d1ee3d206c66acf650c3e4ae2e1f6ddedf55" 3915 4183 dependencies = [ 3916 4184 "proc-macro2", 3917 3917 - "syn 2.0.103", 4185 4185 + "syn 2.0.106", 3918 4186 ] 3919 4187 3920 4188 [[package]] ··· 3982 4250 ] 3983 4251 3984 4252 [[package]] 4253 4253 + name = "quasar" 4254 4254 + version = "0.1.0" 4255 4255 + dependencies = [ 4256 4256 + "clap", 4257 4257 + "fjall 2.11.2 (registry+https://github.com/rust-lang/crates.io-index)", 4258 4258 + ] 4259 4259 + 4260 4260 + [[package]] 3985 4261 name = "quick-xml" 3986 4262 version = "0.36.2" 3987 4263 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 4015 4291 "rustc-hash 2.1.1", 4016 4292 "rustls 0.23.31", 4017 4293 "socket2 0.5.9", 4018 4018 - "thiserror 2.0.12", 4294 4294 + "thiserror 2.0.16", 4019 4295 "tokio", 4020 4296 "tracing", 4021 4297 "web-time", ··· 4036 4312 "rustls 0.23.31", 4037 4313 "rustls-pki-types", 4038 4314 "slab", 4039 4039 - "thiserror 2.0.12", 4315 4315 + "thiserror 2.0.16", 4040 4316 "tinyvec", 4041 4317 "tracing", 4042 4318 "web-time", ··· 4053 4329 "once_cell", 4054 4330 "socket2 0.5.9", 4055 4331 "tracing", 4056 4056 - "windows-sys 0.52.0", 4332 4332 + "windows-sys 0.59.0", 4057 4333 ] 4058 4334 4059 4335 [[package]] ··· 4217 4493 dependencies = [ 4218 4494 "proc-macro2", 4219 4495 "quote", 4220 4220 - "syn 2.0.103", 4496 4496 + "syn 2.0.106", 4497 4497 + ] 4498 4498 + 4499 4499 + [[package]] 4500 4500 + name = "reflector" 4501 4501 + version = "0.1.0" 4502 4502 + dependencies = [ 4503 4503 + "clap", 4504 4504 + "log", 4505 4505 + "poem", 4506 4506 + "serde", 4507 4507 + "tokio", 4508 4508 + "tracing-subscriber", 4221 4509 ] 4222 4510 4223 4511 [[package]] ··· 4228 4516 dependencies = [ 4229 4517 "aho-corasick", 4230 4518 "memchr", 4231 4231 - "regex-automata 0.4.9", 4232 4232 - "regex-syntax 0.8.5", 4233 4233 - ] 4234 4234 - 4235 4235 - [[package]] 4236 4236 - name = "regex-automata" 4237 4237 - version = "0.1.10" 4238 4238 - source = "registry+https://github.com/rust-lang/crates.io-index" 4239 4239 - checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" 4240 4240 - dependencies = [ 4241 4241 - "regex-syntax 0.6.29", 4519 4519 + "regex-automata", 4520 4520 + "regex-syntax", 4242 4521 ] 4243 4522 4244 4523 [[package]] ··· 4249 4528 dependencies = [ 4250 4529 "aho-corasick", 4251 4530 "memchr", 4252 4252 - "regex-syntax 0.8.5", 4531 4531 + "regex-syntax", 4253 4532 ] 4254 4533 4255 4534 [[package]] 4256 4535 name = "regex-syntax" 4257 4257 - version = "0.6.29" 4258 4258 - source = "registry+https://github.com/rust-lang/crates.io-index" 4259 4259 - checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" 4260 4260 - 4261 4261 - [[package]] 4262 4262 - name = "regex-syntax" 4263 4536 version = "0.8.5" 4264 4537 source = "registry+https://github.com/rust-lang/crates.io-index" 4265 4538 checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" 4266 4539 4267 4540 [[package]] 4268 4541 name = "reqwest" 4269 4269 - version = "0.12.22" 4542 4542 + version = "0.12.23" 4270 4543 source = "registry+https://github.com/rust-lang/crates.io-index" 4271 4271 - checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531" 4544 4544 + checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb" 4272 4545 dependencies = [ 4273 4546 "async-compression", 4274 4547 "base64 0.22.1", ··· 4390 4663 ] 4391 4664 4392 4665 [[package]] 4666 4666 + name = "rusqlite" 4667 4667 + version = "0.37.0" 4668 4668 + source = "registry+https://github.com/rust-lang/crates.io-index" 4669 4669 + checksum = "165ca6e57b20e1351573e3729b958bc62f0e48025386970b6e4d29e7a7e71f3f" 4670 4670 + dependencies = [ 4671 4671 + "bitflags", 4672 4672 + "fallible-iterator", 4673 4673 + "fallible-streaming-iterator", 4674 4674 + "hashlink", 4675 4675 + "libsqlite3-sys", 4676 4676 + "smallvec", 4677 4677 + ] 4678 4678 + 4679 4679 + [[package]] 4393 4680 name = "rustc-demangle" 4394 4681 version = "0.1.24" 4395 4682 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 4435 4722 "errno", 4436 4723 "libc", 4437 4724 "linux-raw-sys 0.4.15", 4438 4438 - "windows-sys 0.52.0", 4725 4725 + "windows-sys 0.59.0", 4439 4726 ] 4440 4727 4441 4728 [[package]] ··· 4448 4735 "errno", 4449 4736 "libc", 4450 4737 "linux-raw-sys 0.9.4", 4451 4451 - "windows-sys 0.52.0", 4738 4738 + "windows-sys 0.59.0", 4452 4739 ] 4453 4740 4454 4741 [[package]] ··· 4588 4875 "proc-macro2", 4589 4876 "quote", 4590 4877 "serde_derive_internals", 4591 4591 - "syn 2.0.103", 4878 4878 + "syn 2.0.106", 4592 4879 ] 4593 4880 4594 4881 [[package]] ··· 4618 4905 ] 4619 4906 4620 4907 [[package]] 4908 4908 + name = "secp256k1" 4909 4909 + version = "0.30.0" 4910 4910 + source = "registry+https://github.com/rust-lang/crates.io-index" 4911 4911 + checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" 4912 4912 + dependencies = [ 4913 4913 + "bitcoin_hashes", 4914 4914 + "rand 0.8.5", 4915 4915 + "secp256k1-sys", 4916 4916 + ] 4917 4917 + 4918 4918 + [[package]] 4919 4919 + name = "secp256k1-sys" 4920 4920 + version = "0.10.1" 4921 4921 + source = "registry+https://github.com/rust-lang/crates.io-index" 4922 4922 + checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" 4923 4923 + dependencies = [ 4924 4924 + "cc", 4925 4925 + ] 4926 4926 + 4927 4927 + [[package]] 4621 4928 name = "security-framework" 4622 4929 version = "2.11.1" 4623 4930 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 4667 4974 4668 4975 [[package]] 4669 4976 name = "serde" 4670 4670 - version = "1.0.219" 4977 4977 + version = "1.0.228" 4671 4978 source = "registry+https://github.com/rust-lang/crates.io-index" 4672 4672 - checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" 4979 4979 + checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" 4673 4980 dependencies = [ 4981 4981 + "serde_core", 4674 4982 "serde_derive", 4675 4983 ] 4676 4984 ··· 4684 4992 ] 4685 4993 4686 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]] 4687 5004 name = "serde_derive" 4688 4688 - version = "1.0.219" 5005 5005 + version = "1.0.228" 4689 5006 source = "registry+https://github.com/rust-lang/crates.io-index" 4690 4690 - checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" 5007 5007 + checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" 4691 5008 dependencies = [ 4692 5009 "proc-macro2", 4693 5010 "quote", 4694 4694 - "syn 2.0.103", 5011 5011 + "syn 2.0.106", 4695 5012 ] 4696 5013 4697 5014 [[package]] ··· 4702 5019 dependencies = [ 4703 5020 "proc-macro2", 4704 5021 "quote", 4705 4705 - "syn 2.0.103", 5022 5022 + "syn 2.0.106", 4706 5023 ] 4707 5024 4708 5025 [[package]] ··· 4712 5029 checksum = "9d2de91cf02bbc07cde38891769ccd5d4f073d22a40683aa4bc7a95781aaa2c4" 4713 5030 dependencies = [ 4714 5031 "form_urlencoded", 4715 4715 - "indexmap 2.9.0", 5032 5032 + "indexmap 2.11.4", 4716 5033 "itoa", 4717 5034 "ryu", 4718 5035 "serde", ··· 4720 5037 4721 5038 [[package]] 4722 5039 name = "serde_json" 4723 4723 - version = "1.0.141" 5040 5040 + version = "1.0.145" 4724 5041 source = "registry+https://github.com/rust-lang/crates.io-index" 4725 4725 - checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3" 5042 5042 + checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" 4726 5043 dependencies = [ 4727 5044 "itoa", 4728 5045 "memchr", 4729 5046 "ryu", 4730 5047 "serde", 5048 5048 + "serde_core", 4731 5049 ] 4732 5050 4733 5051 [[package]] ··· 4750 5068 "percent-encoding", 4751 5069 "ryu", 4752 5070 "serde", 4753 4753 - "thiserror 2.0.12", 5071 5071 + "thiserror 2.0.16", 4754 5072 ] 4755 5073 4756 5074 [[package]] ··· 4763 5081 ] 4764 5082 4765 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]] 4766 5093 name = "serde_tokenstream" 4767 5094 version = "0.2.2" 4768 5095 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 4771 5098 "proc-macro2", 4772 5099 "quote", 4773 5100 "serde", 4774 4774 - "syn 2.0.103", 5101 5101 + "syn 2.0.106", 4775 5102 ] 4776 5103 4777 5104 [[package]] ··· 4796 5123 "chrono", 4797 5124 "hex", 4798 5125 "indexmap 1.9.3", 4799 4799 - "indexmap 2.9.0", 5126 5126 + "indexmap 2.11.4", 4800 5127 "serde", 4801 5128 "serde_derive", 4802 5129 "serde_json", ··· 4813 5140 "darling 0.20.11", 4814 5141 "proc-macro2", 4815 5142 "quote", 4816 4816 - "syn 2.0.103", 5143 5143 + "syn 2.0.106", 4817 5144 ] 4818 5145 4819 5146 [[package]] ··· 4822 5149 source = "registry+https://github.com/rust-lang/crates.io-index" 4823 5150 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" 4824 5151 dependencies = [ 4825 4825 - "indexmap 2.9.0", 5152 5152 + "indexmap 2.11.4", 4826 5153 "itoa", 4827 5154 "ryu", 4828 5155 "serde", ··· 4893 5220 dependencies = [ 4894 5221 "num-bigint", 4895 5222 "num-traits", 4896 4896 - "thiserror 2.0.12", 5223 5223 + "thiserror 2.0.16", 4897 5224 "time", 4898 5225 ] 4899 5226 ··· 4916 5243 name = "slingshot" 4917 5244 version = "0.1.0" 4918 5245 dependencies = [ 4919 4919 - "atrium-api", 4920 4920 - "atrium-common", 4921 4921 - "atrium-identity", 4922 4922 - "atrium-oauth", 5246 5246 + "atrium-api 0.25.4 (git+https://github.com/uniphil/atrium.git?branch=fix%2Fresolve-handle-https-accept-whitespace)", 5247 5247 + "atrium-common 0.1.2 (git+https://github.com/uniphil/atrium.git?branch=fix%2Fresolve-handle-https-accept-whitespace)", 5248 5248 + "atrium-identity 0.1.5 (git+https://github.com/uniphil/atrium.git?branch=fix%2Fresolve-handle-https-accept-whitespace)", 5249 5249 + "atrium-oauth 0.1.3 (git+https://github.com/uniphil/atrium.git?branch=fix%2Fresolve-handle-https-accept-whitespace)", 4923 5250 "clap", 4924 5251 "ctrlc", 4925 5252 "foyer", ··· 4935 5262 "rustls 0.23.31", 4936 5263 "serde", 4937 5264 "serde_json", 4938 4938 - "thiserror 2.0.12", 5265 5265 + "thiserror 2.0.16", 4939 5266 "time", 4940 5267 "tokio", 4941 5268 "tokio-util", ··· 5046 5373 "serde", 5047 5374 "serde_json", 5048 5375 "serde_qs", 5049 5049 - "thiserror 2.0.12", 5376 5376 + "thiserror 2.0.16", 5050 5377 "tinyjson", 5051 5378 "tokio", 5052 5379 "tokio-tungstenite 0.27.0", ··· 5115 5442 5116 5443 [[package]] 5117 5444 name = "syn" 5118 5118 - version = "2.0.103" 5445 5445 + version = "2.0.106" 5119 5446 source = "registry+https://github.com/rust-lang/crates.io-index" 5120 5120 - checksum = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8" 5447 5447 + checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" 5121 5448 dependencies = [ 5122 5449 "proc-macro2", 5123 5450 "quote", ··· 5141 5468 dependencies = [ 5142 5469 "proc-macro2", 5143 5470 "quote", 5144 5144 - "syn 2.0.103", 5471 5471 + "syn 2.0.106", 5145 5472 ] 5146 5473 5147 5474 [[package]] ··· 5187 5514 "getrandom 0.3.3", 5188 5515 "once_cell", 5189 5516 "rustix 1.0.5", 5190 5190 - "windows-sys 0.52.0", 5517 5517 + "windows-sys 0.59.0", 5191 5518 ] 5192 5519 5193 5520 [[package]] ··· 5212 5539 5213 5540 [[package]] 5214 5541 name = "thiserror" 5215 5215 - version = "2.0.12" 5542 5542 + version = "2.0.16" 5216 5543 source = "registry+https://github.com/rust-lang/crates.io-index" 5217 5217 - checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" 5544 5544 + checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0" 5218 5545 dependencies = [ 5219 5219 - "thiserror-impl 2.0.12", 5546 5546 + "thiserror-impl 2.0.16", 5220 5547 ] 5221 5548 5222 5549 [[package]] ··· 5227 5554 dependencies = [ 5228 5555 "proc-macro2", 5229 5556 "quote", 5230 5230 - "syn 2.0.103", 5557 5557 + "syn 2.0.106", 5231 5558 ] 5232 5559 5233 5560 [[package]] 5234 5561 name = "thiserror-impl" 5235 5235 - version = "2.0.12" 5562 5562 + version = "2.0.16" 5236 5563 source = "registry+https://github.com/rust-lang/crates.io-index" 5237 5237 - checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" 5564 5564 + checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960" 5238 5565 dependencies = [ 5239 5566 "proc-macro2", 5240 5567 "quote", 5241 5241 - "syn 2.0.103", 5568 5568 + "syn 2.0.106", 5242 5569 ] 5243 5570 5244 5571 [[package]] ··· 5337 5664 5338 5665 [[package]] 5339 5666 name = "tokio" 5340 5340 - version = "1.47.0" 5667 5667 + version = "1.47.1" 5341 5668 source = "registry+https://github.com/rust-lang/crates.io-index" 5342 5342 - checksum = "43864ed400b6043a4757a25c7a64a8efde741aed79a056a2fb348a406701bb35" 5669 5669 + checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" 5343 5670 dependencies = [ 5344 5671 "backtrace", 5345 5672 "bytes", ··· 5363 5690 dependencies = [ 5364 5691 "proc-macro2", 5365 5692 "quote", 5366 5366 - "syn 2.0.103", 5693 5693 + "syn 2.0.106", 5367 5694 ] 5368 5695 5369 5696 [[package]] ··· 5454 5781 checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" 5455 5782 dependencies = [ 5456 5783 "serde", 5457 5457 - "serde_spanned", 5458 5458 - "toml_datetime", 5784 5784 + "serde_spanned 0.6.9", 5785 5785 + "toml_datetime 0.6.11", 5459 5786 "toml_edit", 5460 5787 ] 5461 5788 5462 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]] 5463 5805 name = "toml_datetime" 5464 5806 version = "0.6.11" 5465 5807 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 5469 5811 ] 5470 5812 5471 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]] 5472 5823 name = "toml_edit" 5473 5824 version = "0.22.27" 5474 5825 source = "registry+https://github.com/rust-lang/crates.io-index" 5475 5826 checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" 5476 5827 dependencies = [ 5477 5477 - "indexmap 2.9.0", 5828 5828 + "indexmap 2.11.4", 5478 5829 "serde", 5479 5479 - "serde_spanned", 5480 5480 - "toml_datetime", 5830 5830 + "serde_spanned 0.6.9", 5831 5831 + "toml_datetime 0.6.11", 5481 5832 "toml_write", 5482 5833 "winnow", 5483 5834 ] 5484 5835 5485 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]] 5486 5846 name = "toml_write" 5487 5847 version = "0.1.2" 5488 5848 source = "registry+https://github.com/rust-lang/crates.io-index" 5489 5849 checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" 5490 5850 5491 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" 5856 5856 + 5857 5857 + [[package]] 5492 5858 name = "tower" 5493 5859 version = "0.5.2" 5494 5860 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 5554 5920 dependencies = [ 5555 5921 "proc-macro2", 5556 5922 "quote", 5557 5557 - "syn 2.0.103", 5923 5923 + "syn 2.0.106", 5558 5924 ] 5559 5925 5560 5926 [[package]] ··· 5580 5946 5581 5947 [[package]] 5582 5948 name = "tracing-subscriber" 5583 5583 - version = "0.3.19" 5949 5949 + version = "0.3.20" 5584 5950 source = "registry+https://github.com/rust-lang/crates.io-index" 5585 5585 - checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" 5951 5951 + checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5" 5586 5952 dependencies = [ 5587 5953 "matchers", 5588 5954 "nu-ansi-term", 5589 5955 "once_cell", 5590 5590 - "regex", 5956 5956 + "regex-automata", 5591 5957 "sharded-slab", 5592 5958 "smallvec", 5593 5959 "thread_local", ··· 5604 5970 dependencies = [ 5605 5971 "proc-macro2", 5606 5972 "quote", 5607 5607 - "syn 2.0.103", 5973 5973 + "syn 2.0.106", 5608 5974 ] 5609 5975 5610 5976 [[package]] ··· 5627 5993 "native-tls", 5628 5994 "rand 0.9.1", 5629 5995 "sha1", 5630 5630 - "thiserror 2.0.12", 5996 5996 + "thiserror 2.0.16", 5631 5997 "url", 5632 5998 "utf-8", 5633 5999 ] ··· 5645 6011 "log", 5646 6012 "rand 0.9.1", 5647 6013 "sha1", 5648 5648 - "thiserror 2.0.12", 6014 6014 + "thiserror 2.0.16", 5649 6015 "utf-8", 5650 6016 ] 5651 6017 ··· 5683 6049 "clap", 5684 6050 "dropshot", 5685 6051 "env_logger", 5686 5686 - "fjall", 6052 6052 + "fjall 2.11.2 (git+https://github.com/fjall-rs/fjall.git?rev=fb229572bb7d1d6966a596994dc1708e47ec57d8)", 5687 6053 "getrandom 0.3.3", 5688 6054 "http", 5689 6055 "jetstream", ··· 5698 6064 "serde_qs", 5699 6065 "sha2", 5700 6066 "tempfile", 5701 5701 - "thiserror 2.0.12", 6067 6067 + "thiserror 2.0.16", 5702 6068 "tikv-jemallocator", 5703 6069 "tokio", 5704 6070 "tokio-util", ··· 5804 6170 5805 6171 [[package]] 5806 6172 name = "uuid" 5807 5807 - version = "1.16.0" 6173 6173 + version = "1.18.1" 5808 6174 source = "registry+https://github.com/rust-lang/crates.io-index" 5809 5809 - checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" 6175 6175 + checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" 5810 6176 dependencies = [ 5811 6177 "getrandom 0.3.3", 6178 6178 + "js-sys", 5812 6179 "serde", 6180 6180 + "wasm-bindgen", 5813 6181 ] 5814 6182 5815 6183 [[package]] ··· 5924 6292 "log", 5925 6293 "proc-macro2", 5926 6294 "quote", 5927 5927 - "syn 2.0.103", 6295 6295 + "syn 2.0.106", 5928 6296 "wasm-bindgen-shared", 5929 6297 ] 5930 6298 ··· 5959 6327 dependencies = [ 5960 6328 "proc-macro2", 5961 6329 "quote", 5962 5962 - "syn 2.0.103", 6330 6330 + "syn 2.0.106", 5963 6331 "wasm-bindgen-backend", 5964 6332 "wasm-bindgen-shared", 5965 6333 ] ··· 6009 6377 name = "who-am-i" 6010 6378 version = "0.1.0" 6011 6379 dependencies = [ 6012 6012 - "atrium-api", 6013 6013 - "atrium-common", 6014 6014 - "atrium-identity", 6015 6015 - "atrium-oauth", 6380 6380 + "atrium-api 0.25.4 (registry+https://github.com/rust-lang/crates.io-index)", 6381 6381 + "atrium-common 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", 6382 6382 + "atrium-identity 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", 6383 6383 + "atrium-oauth 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", 6016 6384 "axum", 6017 6385 "axum-extra", 6018 6386 "axum-template", ··· 6032 6400 "reqwest", 6033 6401 "serde", 6034 6402 "serde_json", 6035 6035 - "thiserror 2.0.12", 6403 6403 + "thiserror 2.0.16", 6036 6404 "tokio", 6037 6405 "tokio-util", 6038 6406 "url", ··· 6072 6440 source = "registry+https://github.com/rust-lang/crates.io-index" 6073 6441 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" 6074 6442 dependencies = [ 6075 6075 - "windows-sys 0.48.0", 6443 6443 + "windows-sys 0.59.0", 6076 6444 ] 6077 6445 6078 6446 [[package]] ··· 6087 6455 source = "registry+https://github.com/rust-lang/crates.io-index" 6088 6456 checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" 6089 6457 dependencies = [ 6090 6090 - "windows-core 0.58.0", 6458 6458 + "windows-core", 6091 6459 "windows-targets 0.52.6", 6092 6460 ] 6093 6461 ··· 6097 6465 source = "registry+https://github.com/rust-lang/crates.io-index" 6098 6466 checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" 6099 6467 dependencies = [ 6100 6100 - "windows-implement 0.58.0", 6101 6101 - "windows-interface 0.58.0", 6468 6468 + "windows-implement", 6469 6469 + "windows-interface", 6102 6470 "windows-result 0.2.0", 6103 6471 "windows-strings 0.1.0", 6104 6472 "windows-targets 0.52.6", 6105 6473 ] 6106 6474 6107 6475 [[package]] 6108 6108 - name = "windows-core" 6109 6109 - version = "0.61.0" 6110 6110 - source = "registry+https://github.com/rust-lang/crates.io-index" 6111 6111 - checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" 6112 6112 - dependencies = [ 6113 6113 - "windows-implement 0.60.0", 6114 6114 - "windows-interface 0.59.1", 6115 6115 - "windows-link", 6116 6116 - "windows-result 0.3.4", 6117 6117 - "windows-strings 0.4.2", 6118 6118 - ] 6119 6119 - 6120 6120 - [[package]] 6121 6476 name = "windows-implement" 6122 6477 version = "0.58.0" 6123 6478 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 6125 6480 dependencies = [ 6126 6481 "proc-macro2", 6127 6482 "quote", 6128 6128 - "syn 2.0.103", 6129 6129 - ] 6130 6130 - 6131 6131 - [[package]] 6132 6132 - name = "windows-implement" 6133 6133 - version = "0.60.0" 6134 6134 - source = "registry+https://github.com/rust-lang/crates.io-index" 6135 6135 - checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" 6136 6136 - dependencies = [ 6137 6137 - "proc-macro2", 6138 6138 - "quote", 6139 6139 - "syn 2.0.103", 6483 6483 + "syn 2.0.106", 6140 6484 ] 6141 6485 6142 6486 [[package]] ··· 6147 6491 dependencies = [ 6148 6492 "proc-macro2", 6149 6493 "quote", 6150 6150 - "syn 2.0.103", 6151 6151 - ] 6152 6152 - 6153 6153 - [[package]] 6154 6154 - name = "windows-interface" 6155 6155 - version = "0.59.1" 6156 6156 - source = "registry+https://github.com/rust-lang/crates.io-index" 6157 6157 - checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" 6158 6158 - dependencies = [ 6159 6159 - "proc-macro2", 6160 6160 - "quote", 6161 6161 - "syn 2.0.103", 6494 6494 + "syn 2.0.106", 6162 6495 ] 6163 6496 6164 6497 [[package]] ··· 6365 6698 6366 6699 [[package]] 6367 6700 name = "winnow" 6368 6368 - version = "0.7.11" 6701 6701 + version = "0.7.13" 6369 6702 source = "registry+https://github.com/rust-lang/crates.io-index" 6370 6370 - checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd" 6703 6703 + checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" 6371 6704 dependencies = [ 6372 6705 "memchr", 6373 6706 ] ··· 6425 6758 "nom", 6426 6759 "oid-registry", 6427 6760 "rusticata-macros", 6428 6428 - "thiserror 2.0.12", 6761 6761 + "thiserror 2.0.16", 6429 6762 "time", 6430 6763 ] 6431 6764 ··· 6464 6797 dependencies = [ 6465 6798 "proc-macro2", 6466 6799 "quote", 6467 6467 - "syn 2.0.103", 6800 6800 + "syn 2.0.106", 6468 6801 "synstructure", 6469 6802 ] 6470 6803 ··· 6494 6827 dependencies = [ 6495 6828 "proc-macro2", 6496 6829 "quote", 6497 6497 - "syn 2.0.103", 6830 6830 + "syn 2.0.106", 6498 6831 ] 6499 6832 6500 6833 [[package]] ··· 6505 6838 dependencies = [ 6506 6839 "proc-macro2", 6507 6840 "quote", 6508 6508 - "syn 2.0.103", 6841 6841 + "syn 2.0.106", 6509 6842 ] 6510 6843 6511 6844 [[package]] ··· 6525 6858 dependencies = [ 6526 6859 "proc-macro2", 6527 6860 "quote", 6528 6528 - "syn 2.0.103", 6861 6861 + "syn 2.0.106", 6529 6862 "synstructure", 6530 6863 ] 6531 6864 ··· 6536 6869 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" 6537 6870 dependencies = [ 6538 6871 "serde", 6872 6872 + "zeroize_derive", 6873 6873 + ] 6874 6874 + 6875 6875 + [[package]] 6876 6876 + name = "zeroize_derive" 6877 6877 + version = "1.4.2" 6878 6878 + source = "registry+https://github.com/rust-lang/crates.io-index" 6879 6879 + checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" 6880 6880 + dependencies = [ 6881 6881 + "proc-macro2", 6882 6882 + "quote", 6883 6883 + "syn 2.0.106", 6539 6884 ] 6540 6885 6541 6886 [[package]] ··· 6557 6902 dependencies = [ 6558 6903 "proc-macro2", 6559 6904 "quote", 6560 6560 - "syn 2.0.103", 6905 6905 + "syn 2.0.106", 6561 6906 ] 6562 6907 6563 6908 [[package]]

+3

Cargo.toml

··· 9 9 "spacedust", 10 10 "who-am-i", 11 11 "slingshot", 12 12 + "quasar", 13 13 + "pocket", 14 14 + "reflector", 12 15 ]

+8 -1

Makefile

··· 5 5 cargo test --all-features 6 6 7 7 fmt: 8 8 - cargo fmt --package links --package constellation --package ufos --package spacedust --package who-am-i --package slingshot 8 8 + cargo fmt --package links \ 9 9 + --package constellation \ 10 10 + --package ufos \ 11 11 + --package spacedust \ 12 12 + --package who-am-i \ 13 13 + --package slingshot \ 14 14 + --package pocket \ 15 15 + --package reflector 9 16 cargo +nightly fmt --package jetstream 10 17 11 18 clippy:

+1 -1

constellation/Cargo.toml

··· 8 8 anyhow = "1.0.95" 9 9 askama = { version = "0.12.1", features = ["serde-json"] } 10 10 axum = "0.8.1" 11 11 - axum-extra = { version = "0.10.0", features = ["typed-header"] } 11 11 + axum-extra = { version = "0.10.0", features = ["query", "typed-header"] } 12 12 axum-metrics = "0.2" 13 13 bincode = "1.3.3" 14 14 clap = { version = "4.5.26", features = ["derive"] }

+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

+75 -16

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 + /// optionally disable the metrics server 30 30 + #[arg(long)] 31 31 + #[clap(default_value_t = false)] 32 32 + collect_metrics: bool, 33 33 + /// metrics server's listen address 34 34 + #[arg(long)] 35 35 + #[clap(default_value = "0.0.0.0:8765")] 36 36 + bind_metrics: SocketAddr, 25 37 /// Jetstream server to connect to (exclusive with --fixture). Provide either a wss:// URL, or a shorhand value: 26 38 /// 'us-east-1', 'us-east-2', 'us-west-1', or 'us-west-2' 27 39 #[arg(short, long)] ··· 46 58 /// Saved jsonl from jetstream to use instead of a live subscription 47 59 #[arg(short, long)] 48 60 fixture: Option<PathBuf>, 61 61 + /// run a scan across the target id table and write all key -> ids to id -> keys 62 62 + #[arg(long, action)] 63 63 + repair_target_ids: bool, 49 64 } 50 65 51 66 #[derive(Debug, Clone, ValueEnum)] ··· 78 93 let stream = jetstream_url(&args.jetstream); 79 94 println!("using jetstream server {stream:?}...",); 80 95 96 96 + let bind = args.bind; 97 97 + let metrics_bind = args.bind_metrics; 98 98 + 99 99 + let collect_metrics = args.collect_metrics; 81 100 let stay_alive = CancellationToken::new(); 82 101 83 102 match args.backend { 84 84 - StorageBackend::Memory => run(MemStorage::new(), fixture, None, stream, stay_alive), 103 103 + StorageBackend::Memory => run( 104 104 + MemStorage::new(), 105 105 + fixture, 106 106 + None, 107 107 + stream, 108 108 + bind, 109 109 + metrics_bind, 110 110 + collect_metrics, 111 111 + stay_alive, 112 112 + ), 85 113 #[cfg(feature = "rocks")] 86 114 StorageBackend::Rocks => { 87 115 let storage_dir = args.data.clone().unwrap_or("rocks.test".into()); ··· 96 124 rocks.start_backup(backup_dir, auto_backup, stay_alive.clone())?; 97 125 } 98 126 println!("rocks ready."); 99 99 - run(rocks, fixture, args.data, stream, stay_alive) 127 127 + std::thread::scope(|s| { 128 128 + if args.repair_target_ids { 129 129 + let rocks = rocks.clone(); 130 130 + let stay_alive = stay_alive.clone(); 131 131 + s.spawn(move || { 132 132 + let rep = rocks.run_repair(time::Duration::from_millis(0), stay_alive); 133 133 + eprintln!("repair finished: {rep:?}"); 134 134 + rep 135 135 + }); 136 136 + } 137 137 + s.spawn(|| { 138 138 + let r = run( 139 139 + rocks, 140 140 + fixture, 141 141 + args.data, 142 142 + stream, 143 143 + bind, 144 144 + metrics_bind, 145 145 + collect_metrics, 146 146 + stay_alive, 147 147 + ); 148 148 + eprintln!("run finished: {r:?}"); 149 149 + r 150 150 + }); 151 151 + }); 152 152 + Ok(()) 100 153 } 101 154 } 102 155 } 103 156 157 157 + #[allow(clippy::too_many_lines)] 158 158 + #[allow(clippy::too_many_arguments)] 104 159 fn run( 105 160 mut storage: impl LinkStorage, 106 161 fixture: Option<PathBuf>, 107 162 data_dir: Option<PathBuf>, 108 163 stream: String, 164 164 + bind: SocketAddr, 165 165 + metrics_bind: SocketAddr, 166 166 + collect_metrics: bool, 109 167 stay_alive: CancellationToken, 110 168 ) -> Result<()> { 111 169 ctrlc::set_handler({ ··· 150 208 .build() 151 209 .expect("axum startup") 152 210 .block_on(async { 153 153 - install_metrics_server()?; 154 154 - serve(readable, "0.0.0.0:6789", staying_alive).await 211 211 + // Install metrics server only if requested 212 212 + if collect_metrics { 213 213 + install_metrics_server(metrics_bind)?; 214 214 + } 215 215 + serve(readable, bind, staying_alive).await 155 216 }) 156 217 .unwrap(); 157 218 stay_alive.drop_guard(); 158 219 } 159 220 }); 160 221 161 161 - s.spawn(move || { // monitor thread 222 222 + // only spawn monitoring thread if the metrics server is running 223 223 + if collect_metrics { 224 224 + s.spawn(move || { // monitor thread 162 225 let stay_alive = stay_alive.clone(); 163 226 let check_alive = stay_alive.clone(); 164 227 ··· 184 247 185 248 'monitor: loop { 186 249 match readable.get_stats() { 187 187 - Ok(StorageStats { dids, targetables, linking_records }) => { 250 250 + Ok(StorageStats { dids, targetables, linking_records, .. }) => { 188 251 metrics::gauge!("storage.stats.dids").set(dids as f64); 189 252 metrics::gauge!("storage.stats.targetables").set(targetables as f64); 190 253 metrics::gauge!("storage.stats.linking_records").set(linking_records as f64); ··· 210 273 } 211 274 } 212 275 stay_alive.drop_guard(); 213 213 - }); 276 276 + }); 277 277 + } 214 278 }); 215 279 216 280 println!("byeeee"); ··· 218 282 Ok(()) 219 283 } 220 284 221 221 - fn install_metrics_server() -> Result<()> { 285 285 + fn install_metrics_server(metrics_bind: SocketAddr) -> Result<()> { 222 286 println!("installing metrics server..."); 223 223 - let host = [0, 0, 0, 0]; 224 224 - let port = 8765; 225 287 PrometheusBuilder::new() 226 288 .set_quantiles(&[0.5, 0.9, 0.99, 1.0])? 227 289 .set_bucket_duration(time::Duration::from_secs(30))? 228 290 .set_bucket_count(NonZero::new(10).unwrap()) // count * duration = 5 mins. stuff doesn't happen that fast here. 229 291 .set_enable_unit_suffix(true) 230 230 - .with_http_listener((host, port)) 292 292 + .with_http_listener(metrics_bind) 231 293 .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 - ); 294 294 + println!("metrics server installed! listening at {metrics_bind:?}"); 236 295 Ok(()) 237 296 } 238 297

+239 -238

constellation/src/bin/rocks-link-stats.rs

··· 1 1 - use bincode::config::Options; 2 2 - use clap::Parser; 3 3 - use serde::Serialize; 4 4 - use std::collections::HashMap; 5 5 - use std::path::PathBuf; 1 1 + // use bincode::config::Options; 2 2 + // use clap::Parser; 3 3 + // use serde::Serialize; 4 4 + // use std::collections::HashMap; 5 5 + // use std::path::PathBuf; 6 6 7 7 - use tokio_util::sync::CancellationToken; 7 7 + // use tokio_util::sync::CancellationToken; 8 8 9 9 - use constellation::storage::rocks_store::{ 10 10 - Collection, DidId, RKey, RPath, Target, TargetKey, TargetLinkers, _bincode_opts, 11 11 - }; 12 12 - use constellation::storage::RocksStorage; 13 13 - use constellation::Did; 9 9 + // use constellation::storage::rocks_store::{ 10 10 + // Collection, DidId, RKey, RPath, Target, TargetKey, TargetLinkers, _bincode_opts, 11 11 + // }; 12 12 + // use constellation::storage::RocksStorage; 13 13 + // use constellation::Did; 14 14 15 15 - use links::parse_any_link; 16 16 - use rocksdb::IteratorMode; 17 17 - use std::time; 15 15 + // use links::parse_any_link; 16 16 + // use rocksdb::IteratorMode; 17 17 + // use std::time; 18 18 19 19 - /// Aggregate links in the at-mosphere 20 20 - #[derive(Parser, Debug)] 21 21 - #[command(version, about, long_about = None)] 22 22 - struct Args { 23 23 - /// where is rocksdb's data 24 24 - #[arg(short, long)] 25 25 - data: PathBuf, 26 26 - /// slow down so we don't kill the firehose consumer, if running concurrently 27 27 - #[arg(short, long)] 28 28 - limit: Option<u64>, 29 29 - } 19 19 + // xxxx/// Aggregate links in the at-mosphere 20 20 + // #[derive(Parser, Debug)] 21 21 + // #[command(version, about, long_about = None)] 22 22 + // struct Args { 23 23 + // /// where is rocksdb's data 24 24 + // #[arg(short, long)] 25 25 + // data: PathBuf, 26 26 + // /// slow down so we don't kill the firehose consumer, if running concurrently 27 27 + // #[arg(short, long)] 28 28 + // limit: Option<u64>, 29 29 + // } 30 30 31 31 - type LinkType = String; 31 31 + // type LinkType = String; 32 32 33 33 - #[derive(Debug, Eq, Hash, PartialEq, Serialize)] 34 34 - struct SourceLink(Collection, RPath, LinkType, Option<Collection>); // last is target collection, if it's an at-uri link with a collection 33 33 + // #[derive(Debug, Eq, Hash, PartialEq, Serialize)] 34 34 + // struct SourceLink(Collection, RPath, LinkType, Option<Collection>); // last is target collection, if it's an at-uri link with a collection 35 35 36 36 - #[derive(Debug, Serialize)] 37 37 - struct SourceSample { 38 38 - did: String, 39 39 - rkey: String, 40 40 - } 36 36 + // #[derive(Debug, Serialize)] 37 37 + // struct SourceSample { 38 38 + // did: String, 39 39 + // rkey: String, 40 40 + // } 41 41 42 42 - #[derive(Debug, Default, Serialize)] 43 43 - struct Bucket { 44 44 - count: u64, 45 45 - sum: u64, 46 46 - sample: Option<SourceSample>, 47 47 - } 42 42 + // #[derive(Debug, Default, Serialize)] 43 43 + // struct Bucket { 44 44 + // count: u64, 45 45 + // sum: u64, 46 46 + // sample: Option<SourceSample>, 47 47 + // } 48 48 49 49 - #[derive(Debug, Default, Serialize)] 50 50 - struct Buckets([Bucket; 23]); 49 49 + // #[derive(Debug, Default, Serialize)] 50 50 + // struct Buckets([Bucket; 23]); 51 51 52 52 - const BUCKETS: [u64; 23] = [ 53 53 - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 16, 32, 64, 128, 256, 512, 1024, 4096, 16_384, 65_535, 54 54 - 262_144, 1_048_576, 55 55 - ]; 52 52 + // const BUCKETS: [u64; 23] = [ 53 53 + // 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 16, 32, 64, 128, 256, 512, 1024, 4096, 16_384, 65_535, 54 54 + // 262_144, 1_048_576, 55 55 + // ]; 56 56 57 57 - // b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b12, b16, b32, b64, b128, b256, b512, b1024, b4096, b16384, b65535, b262144, bmax 57 57 + // xxx// b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b12, b16, b32, b64, b128, b256, b512, b1024, b4096, b16384, b65535, b262144, bmax 58 58 59 59 - static DID_IDS_CF: &str = "did_ids"; 60 60 - static TARGET_IDS_CF: &str = "target_ids"; 61 61 - static TARGET_LINKERS_CF: &str = "target_links"; 59 59 + // static DID_IDS_CF: &str = "did_ids"; 60 60 + // static TARGET_IDS_CF: &str = "target_ids"; 61 61 + // static TARGET_LINKERS_CF: &str = "target_links"; 62 62 63 63 - const REPORT_INTERVAL: usize = 50_000; 63 63 + // const REPORT_INTERVAL: usize = 50_000; 64 64 65 65 - type Stats = HashMap<SourceLink, Buckets>; 65 65 + // type Stats = HashMap<SourceLink, Buckets>; 66 66 67 67 - #[derive(Debug, Serialize)] 68 68 - struct Printable { 69 69 - collection: String, 70 70 - path: String, 71 71 - link_type: String, 72 72 - target_collection: Option<String>, 73 73 - buckets: Buckets, 74 74 - } 67 67 + // #[derive(Debug, Serialize)] 68 68 + // struct Printable { 69 69 + // collection: String, 70 70 + // path: String, 71 71 + // link_type: String, 72 72 + // target_collection: Option<String>, 73 73 + // buckets: Buckets, 74 74 + // } 75 75 76 76 - #[derive(Debug, Default)] 77 77 - struct ErrStats { 78 78 - failed_to_get_sample: usize, 79 79 - failed_to_read_target_id: usize, 80 80 - failed_to_deserialize_target_key: usize, 81 81 - failed_to_parse_target_as_link: usize, 82 82 - failed_to_get_links: usize, 83 83 - failed_to_deserialize_linkers: usize, 84 84 - } 76 76 + // #[derive(Debug, Default)] 77 77 + // struct ErrStats { 78 78 + // failed_to_get_sample: usize, 79 79 + // failed_to_read_target_id: usize, 80 80 + // failed_to_deserialize_target_key: usize, 81 81 + // failed_to_parse_target_as_link: usize, 82 82 + // failed_to_get_links: usize, 83 83 + // failed_to_deserialize_linkers: usize, 84 84 + // } 85 85 86 86 - fn thousands(n: usize) -> String { 87 87 - n.to_string() 88 88 - .as_bytes() 89 89 - .rchunks(3) 90 90 - .rev() 91 91 - .map(std::str::from_utf8) 92 92 - .collect::<Result<Vec<&str>, _>>() 93 93 - .unwrap() 94 94 - .join(",") 95 95 - } 86 86 + // fn thousands(n: usize) -> String { 87 87 + // n.to_string() 88 88 + // .as_bytes() 89 89 + // .rchunks(3) 90 90 + // .rev() 91 91 + // .map(std::str::from_utf8) 92 92 + // .collect::<Result<Vec<&str>, _>>() 93 93 + // .unwrap() 94 94 + // .join(",") 95 95 + // } 96 96 97 97 - fn main() { 98 98 - let args = Args::parse(); 97 97 + // fn main() { 98 98 + // let args = Args::parse(); 99 99 100 100 - let limit = args.limit.map(|amount| { 101 101 - ratelimit::Ratelimiter::builder(amount, time::Duration::from_secs(1)) 102 102 - .max_tokens(amount) 103 103 - .initial_available(amount) 104 104 - .build() 105 105 - .unwrap() 106 106 - }); 100 100 + // let limit = args.limit.map(|amount| { 101 101 + // ratelimit::Ratelimiter::builder(amount, time::Duration::from_secs(1)) 102 102 + // .max_tokens(amount) 103 103 + // .initial_available(amount) 104 104 + // .build() 105 105 + // .unwrap() 106 106 + // }); 107 107 108 108 - eprintln!("starting rocksdb..."); 109 109 - let rocks = RocksStorage::open_readonly(args.data).unwrap(); 110 110 - eprintln!("rocks ready."); 108 108 + // eprintln!("starting rocksdb..."); 109 109 + // let rocks = RocksStorage::open_readonly(args.data).unwrap(); 110 110 + // eprintln!("rocks ready."); 111 111 112 112 - let RocksStorage { ref db, .. } = rocks; 112 112 + // let RocksStorage { ref db, .. } = rocks; 113 113 114 114 - let stay_alive = CancellationToken::new(); 115 115 - ctrlc::set_handler({ 116 116 - let mut desperation: u8 = 0; 117 117 - let stay_alive = stay_alive.clone(); 118 118 - move || match desperation { 119 119 - 0 => { 120 120 - eprintln!("ok, shutting down..."); 121 121 - stay_alive.cancel(); 122 122 - desperation += 1; 123 123 - } 124 124 - 1.. => panic!("fine, panicking!"), 125 125 - } 126 126 - }) 127 127 - .unwrap(); 114 114 + // let stay_alive = CancellationToken::new(); 115 115 + // ctrlc::set_handler({ 116 116 + // let mut desperation: u8 = 0; 117 117 + // let stay_alive = stay_alive.clone(); 118 118 + // move || match desperation { 119 119 + // 0 => { 120 120 + // eprintln!("ok, shutting down..."); 121 121 + // stay_alive.cancel(); 122 122 + // desperation += 1; 123 123 + // } 124 124 + // 1.. => panic!("fine, panicking!"), 125 125 + // } 126 126 + // }) 127 127 + // .unwrap(); 128 128 129 129 - let mut stats = Stats::new(); 130 130 - let mut err_stats: ErrStats = Default::default(); 129 129 + // let mut stats = Stats::new(); 130 130 + // let mut err_stats: ErrStats = Default::default(); 131 131 132 132 - let did_ids_cf = db.cf_handle(DID_IDS_CF).unwrap(); 133 133 - let target_id_cf = db.cf_handle(TARGET_IDS_CF).unwrap(); 134 134 - let target_links_cf = db.cf_handle(TARGET_LINKERS_CF).unwrap(); 132 132 + // let did_ids_cf = db.cf_handle(DID_IDS_CF).unwrap(); 133 133 + // let target_id_cf = db.cf_handle(TARGET_IDS_CF).unwrap(); 134 134 + // let target_links_cf = db.cf_handle(TARGET_LINKERS_CF).unwrap(); 135 135 136 136 - let t0 = time::Instant::now(); 137 137 - let mut t_prev = t0; 136 136 + // let t0 = time::Instant::now(); 137 137 + // let mut t_prev = t0; 138 138 139 139 - let mut i = 0; 140 140 - for item in db.iterator_cf(&target_id_cf, IteratorMode::Start) { 141 141 - if stay_alive.is_cancelled() { 142 142 - break; 143 143 - } 139 139 + // let mut i = 0; 140 140 + // for item in db.iterator_cf(&target_id_cf, IteratorMode::Start) { 141 141 + // if stay_alive.is_cancelled() { 142 142 + // break; 143 143 + // } 144 144 145 145 - if let Some(ref limiter) = limit { 146 146 - if let Err(dur) = limiter.try_wait() { 147 147 - std::thread::sleep(dur) 148 148 - } 149 149 - } 145 145 + // if let Some(ref limiter) = limit { 146 146 + // if let Err(dur) = limiter.try_wait() { 147 147 + // std::thread::sleep(dur) 148 148 + // } 149 149 + // } 150 150 151 151 - if i > 0 && i % REPORT_INTERVAL == 0 { 152 152 - let now = time::Instant::now(); 153 153 - let rate = (REPORT_INTERVAL as f32) / (now.duration_since(t_prev).as_secs_f32()); 154 154 - eprintln!( 155 155 - "{i}\t({}k)\t{:.2}\t{rate:.1}/s", 156 156 - thousands(i / 1000), 157 157 - t0.elapsed().as_secs_f32() 158 158 - ); 159 159 - t_prev = now; 160 160 - } 161 161 - i += 1; 151 151 + // if i > 0 && i % REPORT_INTERVAL == 0 { 152 152 + // let now = time::Instant::now(); 153 153 + // let rate = (REPORT_INTERVAL as f32) / (now.duration_since(t_prev).as_secs_f32()); 154 154 + // eprintln!( 155 155 + // "{i}\t({}k)\t{:.2}\t{rate:.1}/s", 156 156 + // thousands(i / 1000), 157 157 + // t0.elapsed().as_secs_f32() 158 158 + // ); 159 159 + // t_prev = now; 160 160 + // } 161 161 + // i += 1; 162 162 163 163 - let Ok((target_key, target_id)) = item else { 164 164 - err_stats.failed_to_read_target_id += 1; 165 165 - continue; 166 166 - }; 163 163 + // let Ok((target_key, target_id)) = item else { 164 164 + // err_stats.failed_to_read_target_id += 1; 165 165 + // continue; 166 166 + // }; 167 167 168 168 - let Ok(TargetKey(Target(target), collection, rpath)) = 169 169 - _bincode_opts().deserialize(&target_key) 170 170 - else { 171 171 - err_stats.failed_to_deserialize_target_key += 1; 172 172 - continue; 173 173 - }; 168 168 + // let Ok(TargetKey(Target(target), collection, rpath)) = 169 169 + // _bincode_opts().deserialize(&target_key) 170 170 + // else { 171 171 + // err_stats.failed_to_deserialize_target_key += 1; 172 172 + // continue; 173 173 + // }; 174 174 175 175 - let source = { 176 176 - let Some(parsed) = parse_any_link(&target) else { 177 177 - err_stats.failed_to_parse_target_as_link += 1; 178 178 - continue; 179 179 - }; 180 180 - SourceLink( 181 181 - collection, 182 182 - rpath, 183 183 - parsed.name().into(), 184 184 - parsed.at_uri_collection().map(Collection), 185 185 - ) 186 186 - }; 175 175 + // let source = { 176 176 + // let Some(parsed) = parse_any_link(&target) else { 177 177 + // err_stats.failed_to_parse_target_as_link += 1; 178 178 + // continue; 179 179 + // }; 180 180 + // SourceLink( 181 181 + // collection, 182 182 + // rpath, 183 183 + // parsed.name().into(), 184 184 + // parsed.at_uri_collection().map(Collection), 185 185 + // ) 186 186 + // }; 187 187 188 188 - let Ok(Some(links_raw)) = db.get_cf(&target_links_cf, &target_id) else { 189 189 - err_stats.failed_to_get_links += 1; 190 190 - continue; 191 191 - }; 192 192 - let Ok(linkers) = _bincode_opts().deserialize::<TargetLinkers>(&links_raw) else { 193 193 - err_stats.failed_to_deserialize_linkers += 1; 194 194 - continue; 195 195 - }; 196 196 - let (n, _) = linkers.count(); 188 188 + // let Ok(Some(links_raw)) = db.get_cf(&target_links_cf, &target_id) else { 189 189 + // err_stats.failed_to_get_links += 1; 190 190 + // continue; 191 191 + // }; 192 192 + // let Ok(linkers) = _bincode_opts().deserialize::<TargetLinkers>(&links_raw) else { 193 193 + // err_stats.failed_to_deserialize_linkers += 1; 194 194 + // continue; 195 195 + // }; 196 196 + // let (n, _) = linkers.count(); 197 197 198 198 - if n == 0 { 199 199 - continue; 200 200 - } 198 198 + // if n == 0 { 199 199 + // continue; 200 200 + // } 201 201 202 202 - let mut bucket = 0; 203 203 - for edge in BUCKETS { 204 204 - if n <= edge || bucket == 22 { 205 205 - break; 206 206 - } 207 207 - bucket += 1; 208 208 - } 202 202 + // let mut bucket = 0; 203 203 + // for edge in BUCKETS { 204 204 + // if n <= edge || bucket == 22 { 205 205 + // break; 206 206 + // } 207 207 + // bucket += 1; 208 208 + // } 209 209 210 210 - let b = &mut stats.entry(source).or_default().0[bucket]; 211 211 - b.count += 1; 212 212 - b.sum += n; 213 213 - if b.sample.is_none() { 214 214 - let (DidId(did_id), RKey(k)) = &linkers.0[(n - 1) as usize]; 215 215 - if let Ok(Some(did_bytes)) = db.get_cf(&did_ids_cf, did_id.to_be_bytes()) { 216 216 - if let Ok(Did(did)) = _bincode_opts().deserialize(&did_bytes) { 217 217 - b.sample = Some(SourceSample { 218 218 - did, 219 219 - rkey: k.clone(), 220 220 - }); 221 221 - } else { 222 222 - err_stats.failed_to_get_sample += 1; 223 223 - } 224 224 - } else { 225 225 - err_stats.failed_to_get_sample += 1; 226 226 - } 227 227 - } 210 210 + // let b = &mut stats.entry(source).or_default().0[bucket]; 211 211 + // b.count += 1; 212 212 + // b.sum += n; 213 213 + // if b.sample.is_none() { 214 214 + // let (DidId(did_id), RKey(k)) = &linkers.0[(n - 1) as usize]; 215 215 + // if let Ok(Some(did_bytes)) = db.get_cf(&did_ids_cf, did_id.to_be_bytes()) { 216 216 + // if let Ok(Did(did)) = _bincode_opts().deserialize(&did_bytes) { 217 217 + // b.sample = Some(SourceSample { 218 218 + // did, 219 219 + // rkey: k.clone(), 220 220 + // }); 221 221 + // } else { 222 222 + // err_stats.failed_to_get_sample += 1; 223 223 + // } 224 224 + // } else { 225 225 + // err_stats.failed_to_get_sample += 1; 226 226 + // } 227 227 + // } 228 228 229 229 - // if i >= 40_000 { 230 230 - // break; 231 231 - // } 232 232 - } 229 229 + // // if i >= 40_000 { 230 230 + // // break; 231 231 + // // } 232 232 + // } 233 233 234 234 - let dt = t0.elapsed(); 234 234 + // let dt = t0.elapsed(); 235 235 236 236 - eprintln!("gathering stats for output..."); 236 236 + // eprintln!("gathering stats for output..."); 237 237 238 238 - let itemified = stats 239 239 - .into_iter() 240 240 - .map( 241 241 - |( 242 242 - SourceLink(Collection(collection), RPath(path), link_type, target_collection), 243 243 - buckets, 244 244 - )| Printable { 245 245 - collection, 246 246 - path, 247 247 - link_type, 248 248 - target_collection: target_collection.map(|Collection(c)| c), 249 249 - buckets, 250 250 - }, 251 251 - ) 252 252 - .collect::<Vec<_>>(); 238 238 + // let itemified = stats 239 239 + // .into_iter() 240 240 + // .map( 241 241 + // |( 242 242 + // SourceLink(Collection(collection), RPath(path), link_type, target_collection), 243 243 + // buckets, 244 244 + // )| Printable { 245 245 + // collection, 246 246 + // path, 247 247 + // link_type, 248 248 + // target_collection: target_collection.map(|Collection(c)| c), 249 249 + // buckets, 250 250 + // }, 251 251 + // ) 252 252 + // .collect::<Vec<_>>(); 253 253 254 254 - match serde_json::to_string(&itemified) { 255 255 - Ok(s) => println!("{s}"), 256 256 - Err(e) => eprintln!("failed to serialize results: {e:?}"), 257 257 - } 254 254 + // match serde_json::to_string(&itemified) { 255 255 + // Ok(s) => println!("{s}"), 256 256 + // Err(e) => eprintln!("failed to serialize results: {e:?}"), 257 257 + // } 258 258 259 259 - eprintln!( 260 260 - "{} summarizing {} link targets in {:.1}s", 261 261 - if stay_alive.is_cancelled() { 262 262 - "STOPPED" 263 263 - } else { 264 264 - "FINISHED" 265 265 - }, 266 266 - thousands(i), 267 267 - dt.as_secs_f32() 268 268 - ); 269 269 - eprintln!("{err_stats:?}"); 270 270 - eprintln!("bye."); 271 271 - } 259 259 + // eprintln!( 260 260 + // "{} summarizing {} link targets in {:.1}s", 261 261 + // if stay_alive.is_cancelled() { 262 262 + // "STOPPED" 263 263 + // } else { 264 264 + // "FINISHED" 265 265 + // }, 266 266 + // thousands(i), 267 267 + // dt.as_secs_f32() 268 268 + // ); 269 269 + // eprintln!("{err_stats:?}"); 270 270 + // eprintln!("bye."); 271 271 + // } 272 272 273 273 - // scan plan 273 273 + // xxx// scan plan 274 274 275 275 - // buckets (backlink count) 276 276 - // 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 16, 32, 64, 128, 256, 512, 1024, 4096, 16384, 65535, 262144, 1048576+ 277 277 - // by 278 278 - // - collection 279 279 - // - json path 280 280 - // - link type 281 281 - // samples for each bucket for each variation 275 275 + // xxx// buckets (backlink count) 276 276 + // xxx// 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 16, 32, 64, 128, 256, 512, 1024, 4096, 16384, 65535, 262144, 1048576+ 277 277 + // xxx// by 278 278 + // xxx// - collection 279 279 + // xxx// - json path 280 280 + // xxx// - link type 281 281 + // xxx// samples for each bucket for each variation 282 282 + fn main() {}

+2

constellation/src/bin/rocks-restore-from-backup.rs

··· 3 3 use clap::Parser; 4 4 use std::path::PathBuf; 5 5 6 6 + #[cfg(feature = "rocks")] 6 7 use rocksdb::backup::{BackupEngine, BackupEngineOptions, RestoreOptions}; 7 8 8 9 use std::time; ··· 19 20 to_data_dir: PathBuf, 20 21 } 21 22 23 23 + #[cfg(feature = "rocks")] 22 24 fn main() -> Result<()> { 23 25 let args = Args::parse(); 24 26

+13 -6

constellation/src/consumer/jetstream.rs

··· 226 226 println!("jetstream closed the websocket cleanly."); 227 227 break; 228 228 } 229 229 - r => eprintln!("jetstream: close result after error: {r:?}"), 229 229 + Err(_) => { 230 230 + counter!("jetstream_read_fail", "url" => stream.clone(), "reason" => "dirty close").increment(1); 231 231 + println!("jetstream failed to close the websocket cleanly."); 232 232 + break; 233 233 + } 234 234 + Ok(r) => { 235 235 + eprintln!("jetstream: close result after error: {r:?}"); 236 236 + counter!("jetstream_read_fail", "url" => stream.clone(), "reason" => "read error") 237 237 + .increment(1); 238 238 + // if we didn't immediately get ConnectionClosed, we should keep polling read 239 239 + // until we get it. 240 240 + continue; 241 241 + } 230 242 } 231 231 - counter!("jetstream_read_fail", "url" => stream.clone(), "reason" => "read error") 232 232 - .increment(1); 233 233 - // if we didn't immediately get ConnectionClosed, we should keep polling read 234 234 - // until we get it. 235 235 - continue; 236 243 } 237 244 }; 238 245

+8 -6

constellation/src/server/filters.rs

··· 5 5 Ok({ 6 6 if let Some(link) = parse_any_link(s) { 7 7 match link { 8 8 - Link::AtUri(at_uri) => at_uri.strip_prefix("at://").map(|noproto| { 9 9 - format!("https://atproto-browser-plus-links.vercel.app/at/{noproto}") 10 10 - }), 11 11 - Link::Did(did) => Some(format!( 12 12 - "https://atproto-browser-plus-links.vercel.app/at/{did}" 13 13 - )), 8 8 + Link::AtUri(at_uri) => at_uri 9 9 + .strip_prefix("at://") 10 10 + .map(|noproto| format!("https://pdsls.dev/at://{noproto}")), 11 11 + Link::Did(did) => Some(format!("https://pdsls.dev/at://{did}")), 14 12 Link::Uri(uri) => Some(uri), 15 13 } 16 14 } else { ··· 22 20 pub fn human_number(n: &u64) -> askama::Result<String> { 23 21 Ok(n.to_formatted_string(&Locale::en)) 24 22 } 23 23 + 24 24 + pub fn to_u64(n: usize) -> askama::Result<u64> { 25 25 + Ok(n as u64) 26 26 + }

+334 -21

constellation/src/server/mod.rs

··· 11 11 use bincode::Options; 12 12 use serde::{Deserialize, Serialize}; 13 13 use serde_with::serde_as; 14 14 - use std::collections::HashMap; 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}; ··· 25 25 26 26 use acceptable::{acceptable, ExtractAccept}; 27 27 28 28 - const DEFAULT_CURSOR_LIMIT: u64 = 16; 29 29 - const DEFAULT_CURSOR_LIMIT_MAX: u64 = 100; 28 28 + const DEFAULT_CURSOR_LIMIT: u64 = 100; 29 29 + const DEFAULT_CURSOR_LIMIT_MAX: u64 = 1000; 30 30 + 31 31 + fn get_default_cursor_limit() -> u64 { 32 32 + DEFAULT_CURSOR_LIMIT 33 33 + } 30 34 31 31 - const INDEX_BEGAN_AT_TS: u64 = 1738083600; // TODO: not this 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, 239 494 path: String, 240 495 cursor: Option<OpaqueApiCursor>, 241 241 - limit: Option<u64>, 496 496 + /// Filter links only from these DIDs 497 497 + /// 498 498 + /// include multiple times to filter by multiple source DIDs 499 499 + #[serde(default)] 500 500 + did: Vec<String>, 501 501 + /// [deprecated] Filter links only from these DIDs 502 502 + /// 503 503 + /// format: comma-separated sequence of DIDs 504 504 + /// 505 505 + /// errors: if `did` parameter is also present 506 506 + /// 507 507 + /// deprecated: use `did`, which can be repeated multiple times 508 508 + from_dids: Option<String>, // comma separated: gross 509 509 + #[serde(default = "get_default_cursor_limit")] 510 510 + limit: u64, 242 511 // TODO: allow reverse (er, forward) order as well 243 512 } 244 513 #[derive(Template, Serialize)] ··· 255 524 } 256 525 fn get_links( 257 526 accept: ExtractAccept, 258 258 - query: Query<GetLinkItemsQuery>, 527 527 + query: axum_extra::extract::Query<GetLinkItemsQuery>, // supports multiple param occurrences 259 528 store: impl LinkReader, 260 529 ) -> Result<impl IntoResponse, http::StatusCode> { 261 530 let until = query ··· 265 534 .transpose()? 266 535 .map(|c| c.next); 267 536 268 268 - let limit = query.limit.unwrap_or(DEFAULT_CURSOR_LIMIT); 537 537 + let limit = query.limit; 269 538 if limit > DEFAULT_CURSOR_LIMIT_MAX { 270 539 return Err(http::StatusCode::BAD_REQUEST); 271 540 } 272 541 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 + ); 550 550 + 551 551 + if let Some(comma_joined) = &query.from_dids { 552 552 + if !filter_dids.is_empty() { 553 553 + return Err(http::StatusCode::BAD_REQUEST); 554 554 + } 555 555 + for did in comma_joined.split(',') { 556 556 + filter_dids.insert(Did(did.to_string())); 557 557 + } 558 558 + } 559 559 + 273 560 let paged = store 274 274 - .get_links(&query.target, &query.collection, &query.path, limit, until) 561 561 + .get_links( 562 562 + &query.target, 563 563 + &query.collection, 564 564 + &query.path, 565 565 + limit, 566 566 + until, 567 567 + &filter_dids, 568 568 + ) 275 569 .map_err(|_| http::StatusCode::INTERNAL_SERVER_ERROR)?; 276 570 277 571 let cursor = paged.next.map(|next| { ··· 433 727 OpaqueApiCursor(bincode::DefaultOptions::new().serialize(&item).unwrap()) 434 728 } 435 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 + }

+93 -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 { ··· 166 241 path: &str, 167 242 limit: u64, 168 243 until: Option<u64>, 244 244 + filter_dids: &HashSet<Did>, 169 245 ) -> Result<PagedAppendingCollection<RecordId>> { 170 246 let data = self.0.lock().unwrap(); 171 247 let Some(paths) = data.targets.get(&Target::new(target)) else { ··· 183 259 next: None, 184 260 total: 0, 185 261 }); 262 262 + }; 263 263 + 264 264 + let did_rkeys: Vec<_> = if !filter_dids.is_empty() { 265 265 + did_rkeys 266 266 + .iter() 267 267 + .filter(|m| { 268 268 + Option::<(Did, RKey)>::clone(m) 269 269 + .map(|(did, _)| filter_dids.contains(&did)) 270 270 + .unwrap_or(false) 271 271 + }) 272 272 + .cloned() 273 273 + .collect() 274 274 + } else { 275 275 + did_rkeys.to_vec() 186 276 }; 187 277 188 278 let total = did_rkeys.len(); ··· 338 428 dids, 339 429 targetables, 340 430 linking_records, 431 431 + started_at: None, 432 432 + other_data: Default::default(), 341 433 }) 342 434 } 343 435 }

+484 -14

constellation/src/storage/mod.rs

··· 1 1 use crate::{ActionableEvent, CountsByCount, Did, RecordId}; 2 2 use anyhow::Result; 3 3 use serde::{Deserialize, Serialize}; 4 4 - use std::collections::HashMap; 4 4 + use std::collections::{HashMap, HashSet}; 5 5 6 6 pub mod mem_store; 7 7 pub use mem_store::MemStorage; ··· 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>; ··· 59 89 path: &str, 60 90 limit: u64, 61 91 until: Option<u64>, 92 92 + filter_dids: &HashSet<Did>, 62 93 ) -> Result<PagedAppendingCollection<RecordId>>; 63 94 64 95 fn get_distinct_dids( ··· 145 176 ); 146 177 assert_eq!(storage.get_distinct_did_count("", "", "")?, 0); 147 178 assert_eq!( 148 148 - storage.get_links("a.com", "app.t.c", ".abc.uri", 100, None)?, 179 179 + storage.get_links( 180 180 + "a.com", 181 181 + "app.t.c", 182 182 + ".abc.uri", 183 183 + 100, 184 184 + None, 185 185 + &HashSet::default() 186 186 + )?, 149 187 PagedAppendingCollection { 150 188 version: (0, 0), 151 189 items: vec![], ··· 641 679 0, 642 680 )?; 643 681 assert_eq!( 644 644 - storage.get_links("a.com", "app.t.c", ".abc.uri", 100, None)?, 682 682 + storage.get_links( 683 683 + "a.com", 684 684 + "app.t.c", 685 685 + ".abc.uri", 686 686 + 100, 687 687 + None, 688 688 + &HashSet::default() 689 689 + )?, 645 690 PagedAppendingCollection { 646 691 version: (1, 0), 647 692 items: vec![RecordId { ··· 682 727 0, 683 728 )?; 684 729 } 685 685 - let links = storage.get_links("a.com", "app.t.c", ".abc.uri", 2, None)?; 730 730 + let links = 731 731 + storage.get_links("a.com", "app.t.c", ".abc.uri", 2, None, &HashSet::default())?; 686 732 let dids = storage.get_distinct_dids("a.com", "app.t.c", ".abc.uri", 2, None)?; 687 733 assert_eq!( 688 734 links, ··· 713 759 total: 5, 714 760 } 715 761 ); 716 716 - let links = storage.get_links("a.com", "app.t.c", ".abc.uri", 2, links.next)?; 762 762 + let links = storage.get_links( 763 763 + "a.com", 764 764 + "app.t.c", 765 765 + ".abc.uri", 766 766 + 2, 767 767 + links.next, 768 768 + &HashSet::default(), 769 769 + )?; 717 770 let dids = storage.get_distinct_dids("a.com", "app.t.c", ".abc.uri", 2, dids.next)?; 718 771 assert_eq!( 719 772 links, ··· 744 797 total: 5, 745 798 } 746 799 ); 747 747 - let links = storage.get_links("a.com", "app.t.c", ".abc.uri", 2, links.next)?; 800 800 + let links = storage.get_links( 801 801 + "a.com", 802 802 + "app.t.c", 803 803 + ".abc.uri", 804 804 + 2, 805 805 + links.next, 806 806 + &HashSet::default(), 807 807 + )?; 748 808 let dids = storage.get_distinct_dids("a.com", "app.t.c", ".abc.uri", 2, dids.next)?; 749 809 assert_eq!( 750 810 links, ··· 771 831 assert_stats(storage.get_stats()?, 5..=5, 1..=1, 5..=5); 772 832 }); 773 833 834 834 + test_each_storage!(get_filtered_links, |storage| { 835 835 + let links = storage.get_links( 836 836 + "a.com", 837 837 + "app.t.c", 838 838 + ".abc.uri", 839 839 + 2, 840 840 + None, 841 841 + &HashSet::from([Did("did:plc:linker".to_string())]), 842 842 + )?; 843 843 + assert_eq!( 844 844 + links, 845 845 + PagedAppendingCollection { 846 846 + version: (0, 0), 847 847 + items: vec![], 848 848 + next: None, 849 849 + total: 0, 850 850 + } 851 851 + ); 852 852 + 853 853 + storage.push( 854 854 + &ActionableEvent::CreateLinks { 855 855 + record_id: RecordId { 856 856 + did: "did:plc:linker".into(), 857 857 + collection: "app.t.c".into(), 858 858 + rkey: "asdf".into(), 859 859 + }, 860 860 + links: vec![CollectedLink { 861 861 + target: Link::Uri("a.com".into()), 862 862 + path: ".abc.uri".into(), 863 863 + }], 864 864 + }, 865 865 + 0, 866 866 + )?; 867 867 + 868 868 + let links = storage.get_links( 869 869 + "a.com", 870 870 + "app.t.c", 871 871 + ".abc.uri", 872 872 + 2, 873 873 + None, 874 874 + &HashSet::from([Did("did:plc:linker".to_string())]), 875 875 + )?; 876 876 + assert_eq!( 877 877 + links, 878 878 + PagedAppendingCollection { 879 879 + version: (1, 0), 880 880 + items: vec![RecordId { 881 881 + did: "did:plc:linker".into(), 882 882 + collection: "app.t.c".into(), 883 883 + rkey: "asdf".into(), 884 884 + },], 885 885 + next: None, 886 886 + total: 1, 887 887 + } 888 888 + ); 889 889 + 890 890 + let links = storage.get_links( 891 891 + "a.com", 892 892 + "app.t.c", 893 893 + ".abc.uri", 894 894 + 2, 895 895 + None, 896 896 + &HashSet::from([Did("did:plc:someone-else".to_string())]), 897 897 + )?; 898 898 + assert_eq!( 899 899 + links, 900 900 + PagedAppendingCollection { 901 901 + version: (0, 0), 902 902 + items: vec![], 903 903 + next: None, 904 904 + total: 0, 905 905 + } 906 906 + ); 907 907 + 908 908 + storage.push( 909 909 + &ActionableEvent::CreateLinks { 910 910 + record_id: RecordId { 911 911 + did: "did:plc:linker".into(), 912 912 + collection: "app.t.c".into(), 913 913 + rkey: "asdf-2".into(), 914 914 + }, 915 915 + links: vec![CollectedLink { 916 916 + target: Link::Uri("a.com".into()), 917 917 + path: ".abc.uri".into(), 918 918 + }], 919 919 + }, 920 920 + 0, 921 921 + )?; 922 922 + storage.push( 923 923 + &ActionableEvent::CreateLinks { 924 924 + record_id: RecordId { 925 925 + did: "did:plc:someone-else".into(), 926 926 + collection: "app.t.c".into(), 927 927 + rkey: "asdf".into(), 928 928 + }, 929 929 + links: vec![CollectedLink { 930 930 + target: Link::Uri("a.com".into()), 931 931 + path: ".abc.uri".into(), 932 932 + }], 933 933 + }, 934 934 + 0, 935 935 + )?; 936 936 + 937 937 + let links = storage.get_links( 938 938 + "a.com", 939 939 + "app.t.c", 940 940 + ".abc.uri", 941 941 + 2, 942 942 + None, 943 943 + &HashSet::from([Did("did:plc:linker".to_string())]), 944 944 + )?; 945 945 + assert_eq!( 946 946 + links, 947 947 + PagedAppendingCollection { 948 948 + version: (2, 0), 949 949 + items: vec![ 950 950 + RecordId { 951 951 + did: "did:plc:linker".into(), 952 952 + collection: "app.t.c".into(), 953 953 + rkey: "asdf-2".into(), 954 954 + }, 955 955 + RecordId { 956 956 + did: "did:plc:linker".into(), 957 957 + collection: "app.t.c".into(), 958 958 + rkey: "asdf".into(), 959 959 + }, 960 960 + ], 961 961 + next: None, 962 962 + total: 2, 963 963 + } 964 964 + ); 965 965 + 966 966 + let links = storage.get_links( 967 967 + "a.com", 968 968 + "app.t.c", 969 969 + ".abc.uri", 970 970 + 2, 971 971 + None, 972 972 + &HashSet::from([ 973 973 + Did("did:plc:linker".to_string()), 974 974 + Did("did:plc:someone-else".to_string()), 975 975 + ]), 976 976 + )?; 977 977 + assert_eq!( 978 978 + links, 979 979 + PagedAppendingCollection { 980 980 + version: (3, 0), 981 981 + items: vec![ 982 982 + RecordId { 983 983 + did: "did:plc:someone-else".into(), 984 984 + collection: "app.t.c".into(), 985 985 + rkey: "asdf".into(), 986 986 + }, 987 987 + RecordId { 988 988 + did: "did:plc:linker".into(), 989 989 + collection: "app.t.c".into(), 990 990 + rkey: "asdf-2".into(), 991 991 + }, 992 992 + ], 993 993 + next: Some(1), 994 994 + total: 3, 995 995 + } 996 996 + ); 997 997 + 998 998 + let links = storage.get_links( 999 999 + "a.com", 1000 1000 + "app.t.c", 1001 1001 + ".abc.uri", 1002 1002 + 2, 1003 1003 + None, 1004 1004 + &HashSet::from([Did("did:plc:someone-unknown".to_string())]), 1005 1005 + )?; 1006 1006 + assert_eq!( 1007 1007 + links, 1008 1008 + PagedAppendingCollection { 1009 1009 + version: (0, 0), 1010 1010 + items: vec![], 1011 1011 + next: None, 1012 1012 + total: 0, 1013 1013 + } 1014 1014 + ); 1015 1015 + }); 1016 1016 + 774 1017 test_each_storage!(get_links_exact_multiple, |storage| { 775 1018 for i in 1..=4 { 776 1019 storage.push( ··· 788 1031 0, 789 1032 )?; 790 1033 } 791 791 - let links = storage.get_links("a.com", "app.t.c", ".abc.uri", 2, None)?; 1034 1034 + let links = 1035 1035 + storage.get_links("a.com", "app.t.c", ".abc.uri", 2, None, &HashSet::default())?; 792 1036 assert_eq!( 793 1037 links, 794 1038 PagedAppendingCollection { ··· 809 1053 total: 4, 810 1054 } 811 1055 ); 812 812 - let links = storage.get_links("a.com", "app.t.c", ".abc.uri", 2, links.next)?; 1056 1056 + let links = storage.get_links( 1057 1057 + "a.com", 1058 1058 + "app.t.c", 1059 1059 + ".abc.uri", 1060 1060 + 2, 1061 1061 + links.next, 1062 1062 + &HashSet::default(), 1063 1063 + )?; 813 1064 assert_eq!( 814 1065 links, 815 1066 PagedAppendingCollection { ··· 850 1101 0, 851 1102 )?; 852 1103 } 853 853 - let links = storage.get_links("a.com", "app.t.c", ".abc.uri", 2, None)?; 1104 1104 + let links = 1105 1105 + storage.get_links("a.com", "app.t.c", ".abc.uri", 2, None, &HashSet::default())?; 854 1106 assert_eq!( 855 1107 links, 856 1108 PagedAppendingCollection { ··· 885 1137 }, 886 1138 0, 887 1139 )?; 888 888 - let links = storage.get_links("a.com", "app.t.c", ".abc.uri", 2, links.next)?; 1140 1140 + let links = storage.get_links( 1141 1141 + "a.com", 1142 1142 + "app.t.c", 1143 1143 + ".abc.uri", 1144 1144 + 2, 1145 1145 + links.next, 1146 1146 + &HashSet::default(), 1147 1147 + )?; 889 1148 assert_eq!( 890 1149 links, 891 1150 PagedAppendingCollection { ··· 926 1185 0, 927 1186 )?; 928 1187 } 929 929 - let links = storage.get_links("a.com", "app.t.c", ".abc.uri", 2, None)?; 1188 1188 + let links = 1189 1189 + storage.get_links("a.com", "app.t.c", ".abc.uri", 2, None, &HashSet::default())?; 930 1190 assert_eq!( 931 1191 links, 932 1192 PagedAppendingCollection { ··· 955 1215 }), 956 1216 0, 957 1217 )?; 958 958 - let links = storage.get_links("a.com", "app.t.c", ".abc.uri", 2, links.next)?; 1218 1218 + let links = storage.get_links( 1219 1219 + "a.com", 1220 1220 + "app.t.c", 1221 1221 + ".abc.uri", 1222 1222 + 2, 1223 1223 + links.next, 1224 1224 + &HashSet::default(), 1225 1225 + )?; 959 1226 assert_eq!( 960 1227 links, 961 1228 PagedAppendingCollection { ··· 989 1256 0, 990 1257 )?; 991 1258 } 992 992 - let links = storage.get_links("a.com", "app.t.c", ".abc.uri", 2, None)?; 1259 1259 + let links = 1260 1260 + storage.get_links("a.com", "app.t.c", ".abc.uri", 2, None, &HashSet::default())?; 993 1261 assert_eq!( 994 1262 links, 995 1263 PagedAppendingCollection { ··· 1014 1282 &ActionableEvent::DeactivateAccount("did:plc:asdf-1".into()), 1015 1283 0, 1016 1284 )?; 1017 1017 - let links = storage.get_links("a.com", "app.t.c", ".abc.uri", 2, links.next)?; 1285 1285 + let links = storage.get_links( 1286 1286 + "a.com", 1287 1287 + "app.t.c", 1288 1288 + ".abc.uri", 1289 1289 + 2, 1290 1290 + links.next, 1291 1291 + &HashSet::default(), 1292 1292 + )?; 1018 1293 assert_eq!( 1019 1294 links, 1020 1295 PagedAppendingCollection { ··· 1081 1356 counts 1082 1357 }); 1083 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 + ); 1084 1554 }); 1085 1555 }

+361 -41

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()), ··· 860 1129 path: &str, 861 1130 limit: u64, 862 1131 until: Option<u64>, 1132 1132 + filter_dids: &HashSet<Did>, 863 1133 ) -> Result<PagedAppendingCollection<RecordId>> { 864 1134 let target_key = TargetKey( 865 1135 Target(target.to_string()), ··· 876 1146 }); 877 1147 }; 878 1148 879 879 - let linkers = self.get_target_linkers(&target_id)?; 1149 1149 + let mut linkers = self.get_target_linkers(&target_id)?; 1150 1150 + if !filter_dids.is_empty() { 1151 1151 + let mut did_filter = HashSet::new(); 1152 1152 + for did in filter_dids { 1153 1153 + let Some(DidIdValue(did_id, active)) = 1154 1154 + self.did_id_table.get_id_val(&self.db, did)? 1155 1155 + else { 1156 1156 + eprintln!("failed to find a did_id for {did:?}"); 1157 1157 + continue; 1158 1158 + }; 1159 1159 + if !active { 1160 1160 + eprintln!("excluding inactive did from filtered results"); 1161 1161 + continue; 1162 1162 + } 1163 1163 + did_filter.insert(did_id); 1164 1164 + } 1165 1165 + linkers.0.retain(|linker| did_filter.contains(&linker.0)); 1166 1166 + } 880 1167 881 1168 let (alive, gone) = linkers.count(); 882 1169 let total = alive + gone; ··· 1024 1311 .map(|s| s.parse::<u64>()) 1025 1312 .transpose()? 1026 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 + 1027 1341 Ok(StorageStats { 1028 1342 dids, 1029 1343 targetables, 1030 1344 linking_records, 1345 1345 + started_at: Some(started_at), 1346 1346 + other_data, 1031 1347 }) 1032 1348 } 1033 1349 } ··· 1053 1369 impl AsRocksValue for &TargetId {} 1054 1370 impl KeyFromRocks for TargetKey {} 1055 1371 impl ValueFromRocks for TargetId {} 1372 1372 + 1373 1373 + // temp? 1374 1374 + impl KeyFromRocks for TargetId {} 1375 1375 + impl AsRocksValue for &TargetKey {} 1056 1376 1057 1377 // target_links table 1058 1378 impl AsRocksKey for &TargetId {} ··· 1124 1444 } 1125 1445 1126 1446 // target ids 1127 1127 - #[derive(Debug, Clone, Serialize, Deserialize)] 1447 1447 + #[derive(Debug, Clone, Serialize, Deserialize, PartialOrd, Ord, PartialEq, Eq, Hash)] 1128 1448 struct TargetId(u64); // key 1129 1449 1130 1130 - #[derive(Debug, Clone, Serialize, Deserialize)] 1450 1450 + #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Hash)] 1131 1451 pub struct Target(pub String); // the actual target/uri 1132 1452 1133 1453 // targets (uris, dids, etc.): the reverse index

+1 -1

constellation/templates/dids.html.j2

··· 27 27 {% for did in linking_dids %} 28 28 <pre style="display: block; margin: 1em 2em" class="code"><strong>DID</strong>: {{ did.0 }} 29 29 -> see <a href="/links/all?target={{ did.0|urlencode }}">links to this DID</a> 30 30 - -> browse <a href="https://atproto-browser-plus-links.vercel.app/at/{{ did.0|urlencode }}">this DID record</a></pre> 30 30 + -> browse <a href="https://pdsls.dev/at://{{ did.0 }}">this DID record</a></pre> 31 31 {% endfor %} 32 32 33 33 {% if let Some(c) = cursor %}

+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">

+1 -1

jetstream/Cargo.toml

··· 10 10 11 11 [dependencies] 12 12 async-trait = "0.1.83" 13 13 - atrium-api = { version = "0.25.4", default-features = false, features = [ 13 13 + atrium-api = { git = "https://github.com/uniphil/atrium.git", branch = "fix/resolve-handle-https-accept-whitespace", default-features = false, features = [ 14 14 "namespace-appbsky", 15 15 ] } 16 16 tokio = { version = "1.44.2", features = ["full", "sync", "time"] }

+95

lexicons/blue.microcosm/links/getBacklinks.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "blue.microcosm.links.getBacklinks", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "query", 7 7 + "description": "a list of records linking to any record, identity, or uri", 8 8 + "parameters": { 9 9 + "type": "params", 10 10 + "required": [ 11 11 + "subject", 12 12 + "source" 13 13 + ], 14 14 + "properties": { 15 15 + "subject": { 16 16 + "type": "string", 17 17 + "format": "uri", 18 18 + "description": "the target being linked to (at-uri, did, or uri)" 19 19 + }, 20 20 + "source": { 21 21 + "type": "string", 22 22 + "description": "collection and path specification (e.g., 'app.bsky.feed.like:subject.uri')" 23 23 + }, 24 24 + "did": { 25 25 + "type": "array", 26 26 + "description": "filter links to those from specific users", 27 27 + "items": { 28 28 + "type": "string", 29 29 + "format": "did" 30 30 + } 31 31 + }, 32 32 + "limit": { 33 33 + "type": "integer", 34 34 + "minimum": 1, 35 35 + "maximum": 100, 36 36 + "default": 16, 37 37 + "description": "number of results to return" 38 38 + } 39 39 + } 40 40 + }, 41 41 + "output": { 42 42 + "encoding": "application/json", 43 43 + "schema": { 44 44 + "type": "object", 45 45 + "required": [ 46 46 + "total", 47 47 + "records" 48 48 + ], 49 49 + "properties": { 50 50 + "total": { 51 51 + "type": "integer", 52 52 + "description": "total number of matching links" 53 53 + }, 54 54 + "records": { 55 55 + "type": "array", 56 56 + "items": { 57 57 + "type": "ref", 58 58 + "ref": "#linkRecord" 59 59 + } 60 60 + }, 61 61 + "cursor": { 62 62 + "type": "string", 63 63 + "description": "pagination cursor" 64 64 + } 65 65 + } 66 66 + } 67 67 + } 68 68 + }, 69 69 + "linkRecord": { 70 70 + "type": "object", 71 71 + "required": [ 72 72 + "did", 73 73 + "collection", 74 74 + "rkey" 75 75 + ], 76 76 + "properties": { 77 77 + "did": { 78 78 + "type": "string", 79 79 + "format": "did", 80 80 + "description": "the DID of the linking record's repository" 81 81 + }, 82 82 + "collection": { 83 83 + "type": "string", 84 84 + "format": "nsid", 85 85 + "description": "the collection of the linking record" 86 86 + }, 87 87 + "rkey": { 88 88 + "type": "string", 89 89 + "format": "record-key", 90 90 + "description": "the record key of the linking record" 91 91 + } 92 92 + } 93 93 + } 94 94 + } 95 95 + }

+99

lexicons/blue.microcosm/links/getManyToManyCounts.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "blue.microcosm.links.getManyToManyCounts", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "query", 7 7 + "description": "count many-to-many relationships with secondary link paths", 8 8 + "parameters": { 9 9 + "type": "params", 10 10 + "required": [ 11 11 + "subject", 12 12 + "source", 13 13 + "pathToOther" 14 14 + ], 15 15 + "properties": { 16 16 + "subject": { 17 17 + "type": "string", 18 18 + "format": "uri", 19 19 + "description": "the primary target being linked to (at-uri, did, or uri)" 20 20 + }, 21 21 + "source": { 22 22 + "type": "string", 23 23 + "description": "collection and path specification for the primary link" 24 24 + }, 25 25 + "pathToOther": { 26 26 + "type": "string", 27 27 + "description": "path to the secondary link in the many-to-many record (e.g., 'otherThing.uri')" 28 28 + }, 29 29 + "did": { 30 30 + "type": "array", 31 31 + "description": "filter links to those from specific users", 32 32 + "items": { 33 33 + "type": "string", 34 34 + "format": "did" 35 35 + } 36 36 + }, 37 37 + "otherSubject": { 38 38 + "type": "array", 39 39 + "description": "filter secondary links to specific subjects", 40 40 + "items": { 41 41 + "type": "string" 42 42 + } 43 43 + }, 44 44 + "limit": { 45 45 + "type": "integer", 46 46 + "minimum": 1, 47 47 + "maximum": 100, 48 48 + "default": 16, 49 49 + "description": "number of results to return" 50 50 + } 51 51 + } 52 52 + }, 53 53 + "output": { 54 54 + "encoding": "application/json", 55 55 + "schema": { 56 56 + "type": "object", 57 57 + "required": [ 58 58 + "counts_by_other_subject" 59 59 + ], 60 60 + "properties": { 61 61 + "counts_by_other_subject": { 62 62 + "type": "array", 63 63 + "items": { 64 64 + "type": "ref", 65 65 + "ref": "#countBySubject" 66 66 + } 67 67 + }, 68 68 + "cursor": { 69 69 + "type": "string", 70 70 + "description": "pagination cursor" 71 71 + } 72 72 + } 73 73 + } 74 74 + } 75 75 + }, 76 76 + "countBySubject": { 77 77 + "type": "object", 78 78 + "required": [ 79 79 + "subject", 80 80 + "total", 81 81 + "distinct" 82 82 + ], 83 83 + "properties": { 84 84 + "subject": { 85 85 + "type": "string", 86 86 + "description": "the secondary subject being counted" 87 87 + }, 88 88 + "total": { 89 89 + "type": "integer", 90 90 + "description": "total number of links to this subject" 91 91 + }, 92 92 + "distinct": { 93 93 + "type": "integer", 94 94 + "description": "number of distinct DIDs linking to this subject" 95 95 + } 96 96 + } 97 97 + } 98 98 + } 99 99 + }

+56

lexicons/com.bad-example/identity/resolveMiniDoc.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "com.bad-example.identity.resolveMiniDoc", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "query", 7 7 + "description": "like com.atproto.identity.resolveIdentity but instead of the full didDoc it returns an atproto-relevant subset", 8 8 + "parameters": { 9 9 + "type": "params", 10 10 + "required": [ 11 11 + "identifier" 12 12 + ], 13 13 + "properties": { 14 14 + "identifier": { 15 15 + "type": "string", 16 16 + "format": "at-identifier", 17 17 + "description": "handle or DID to resolve" 18 18 + } 19 19 + } 20 20 + }, 21 21 + "output": { 22 22 + "encoding": "application/json", 23 23 + "schema": { 24 24 + "type": "object", 25 25 + "required": [ 26 26 + "did", 27 27 + "handle", 28 28 + "pds", 29 29 + "signing_key" 30 30 + ], 31 31 + "properties": { 32 32 + "did": { 33 33 + "type": "string", 34 34 + "format": "did", 35 35 + "description": "DID, bi-directionally verified if a handle was provided in the query" 36 36 + }, 37 37 + "handle": { 38 38 + "type": "string", 39 39 + "format": "handle", 40 40 + "description": "the validated handle of the account or 'handle.invalid' if the handle did not bi-directionally match the DID document" 41 41 + }, 42 42 + "pds": { 43 43 + "type": "string", 44 44 + "format": "uri", 45 45 + "description": "the identity's PDS URL" 46 46 + }, 47 47 + "signing_key": { 48 48 + "type": "string", 49 49 + "description": "the atproto signing key publicKeyMultibase" 50 50 + } 51 51 + } 52 52 + } 53 53 + } 54 54 + } 55 55 + } 56 56 + }

+54

lexicons/com.bad-example/repo/getUriRecord.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "com.bad-example.repo.getUriRecord", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "query", 7 7 + "description": "ergonomic complement to com.atproto.repo.getRecord which accepts an at-uri instead of individual repo/collection/rkey params", 8 8 + "parameters": { 9 9 + "type": "params", 10 10 + "required": [ 11 11 + "at_uri" 12 12 + ], 13 13 + "properties": { 14 14 + "at_uri": { 15 15 + "type": "string", 16 16 + "format": "at-uri", 17 17 + "description": "the at-uri of the record (identifier can be a DID or handle)" 18 18 + }, 19 19 + "cid": { 20 20 + "type": "string", 21 21 + "format": "cid", 22 22 + "description": "optional CID of the version of the record. if not specified, return the most recent version. if specified and a newer version exists, returns 404." 23 23 + } 24 24 + } 25 25 + }, 26 26 + "output": { 27 27 + "encoding": "application/json", 28 28 + "schema": { 29 29 + "type": "object", 30 30 + "required": [ 31 31 + "uri", 32 32 + "value" 33 33 + ], 34 34 + "properties": { 35 35 + "uri": { 36 36 + "type": "string", 37 37 + "format": "at-uri", 38 38 + "description": "at-uri for this record" 39 39 + }, 40 40 + "cid": { 41 41 + "type": "string", 42 42 + "format": "cid", 43 43 + "description": "CID for this exact version of the record" 44 44 + }, 45 45 + "value": { 46 46 + "type": "unknown", 47 47 + "description": "the record itself" 48 48 + } 49 49 + } 50 50 + } 51 51 + } 52 52 + } 53 53 + } 54 54 + }

+1

pocket/.gitignore

··· 1 1 + prefs.sqlite3*

+19

pocket/Cargo.toml

··· 1 1 + [package] 2 2 + name = "pocket" 3 3 + version = "0.1.0" 4 4 + edition = "2024" 5 5 + 6 6 + [dependencies] 7 7 + atrium-crypto = "0.1.2" 8 8 + clap = { version = "4.5.41", features = ["derive"] } 9 9 + jwt-compact = { git = "https://github.com/fatfingers23/jwt-compact.git", features = ["es256k"] } 10 10 + log = "0.4.27" 11 11 + poem = { version = "3.1.12", features = ["acme", "static-files"] } 12 12 + poem-openapi = { version = "5.1.16", features = ["scalar"] } 13 13 + reqwest = { version = "0.12.22", features = ["json"] } 14 14 + rusqlite = "0.37.0" 15 15 + serde = { version = "1.0.219", features = ["derive"] } 16 16 + serde_json = { version = "1.0.141" } 17 17 + thiserror = "2.0.16" 18 18 + tokio = { version = "1.47.0", features = ["full"] } 19 19 + tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }

+17

pocket/api-description.md

··· 1 1 + _A pocket dimension to stash a bit of non-public user data._ 2 2 + 3 3 + 4 4 + # Pocket: user preference storage 5 5 + 6 6 + This API leverages atproto service proxying to offer a bit of per-user per-app non-public data storage. 7 7 + Perfect for things like application preferences that might be better left out of the public PDS data. 8 8 + 9 9 + The intent is to use oauth scopes to isolate storage on a per-application basis, and to allow easy data migration from a community hosted instance to your own if you end up needing that. 10 10 + 11 11 + 12 12 + ### Current status 13 13 + 14 14 + > [!important] 15 15 + > Pocket is currently in a **v0, pre-release state**. There is one production instance and you can use it! Expect short downtimes for restarts as development progresses and occaisional data loss until it's stable. 16 16 + 17 17 + ATProto might end up adding a similar feature to [PDSs](https://atproto.com/guides/glossary#pds-personal-data-server). If/when that happens, you should use it instead of this!

+7

pocket/src/lib.rs

··· 1 1 + mod server; 2 2 + mod storage; 3 3 + mod token; 4 4 + 5 5 + pub use server::serve; 6 6 + pub use storage::Storage; 7 7 + pub use token::TokenVerifier;

+34

pocket/src/main.rs

··· 1 1 + use clap::Parser; 2 2 + use pocket::{Storage, serve}; 3 3 + use std::path::PathBuf; 4 4 + 5 5 + /// Slingshot record edge cache 6 6 + #[derive(Parser, Debug, Clone)] 7 7 + #[command(version, about, long_about = None)] 8 8 + struct Args { 9 9 + /// path to the sqlite db file 10 10 + #[arg(long)] 11 11 + db: Option<PathBuf>, 12 12 + /// just initialize the db and exit 13 13 + #[arg(long, action)] 14 14 + init_db: bool, 15 15 + /// the domain for serving a did doc (unused if running behind reflector) 16 16 + #[arg(long)] 17 17 + domain: Option<String>, 18 18 + } 19 19 + 20 20 + #[tokio::main] 21 21 + async fn main() { 22 22 + tracing_subscriber::fmt::init(); 23 23 + log::info!("👖 hi"); 24 24 + let args = Args::parse(); 25 25 + let domain = args.domain.unwrap_or("bad-example.com".into()); 26 26 + let db_path = args.db.unwrap_or("prefs.sqlite3".into()); 27 27 + if args.init_db { 28 28 + Storage::init(&db_path).unwrap(); 29 29 + log::info!("👖 initialized db at {db_path:?}. bye") 30 30 + } else { 31 31 + let storage = Storage::connect(db_path).unwrap(); 32 32 + serve(&domain, storage).await 33 33 + } 34 34 + }

+265

pocket/src/server.rs

··· 1 1 + use crate::{Storage, TokenVerifier}; 2 2 + use poem::{ 3 3 + Endpoint, EndpointExt, Route, Server, 4 4 + endpoint::{StaticFileEndpoint, make_sync}, 5 5 + http::Method, 6 6 + listener::TcpListener, 7 7 + middleware::{CatchPanic, Cors, Tracing}, 8 8 + }; 9 9 + use poem_openapi::{ 10 10 + ApiResponse, ContactObject, ExternalDocumentObject, Object, OpenApi, OpenApiService, 11 11 + SecurityScheme, Tags, 12 12 + auth::Bearer, 13 13 + payload::{Json, PlainText}, 14 14 + types::Example, 15 15 + }; 16 16 + use serde::Serialize; 17 17 + use serde_json::{Value, json}; 18 18 + use std::sync::{Arc, Mutex}; 19 19 + 20 20 + #[derive(Debug, SecurityScheme)] 21 21 + #[oai(ty = "bearer")] 22 22 + struct XrpcAuth(Bearer); 23 23 + 24 24 + #[derive(Tags)] 25 25 + enum ApiTags { 26 26 + /// Custom pocket APIs 27 27 + #[oai(rename = "Pocket APIs")] 28 28 + Pocket, 29 29 + } 30 30 + 31 31 + #[derive(Object)] 32 32 + #[oai(example = true)] 33 33 + struct XrpcErrorResponseObject { 34 34 + /// Should correspond an error `name` in the lexicon errors array 35 35 + error: String, 36 36 + /// Human-readable description and possibly additonal context 37 37 + message: String, 38 38 + } 39 39 + impl Example for XrpcErrorResponseObject { 40 40 + fn example() -> Self { 41 41 + Self { 42 42 + error: "PreferencesNotFound".to_string(), 43 43 + message: "No preferences were found for this user".to_string(), 44 44 + } 45 45 + } 46 46 + } 47 47 + type XrpcError = Json<XrpcErrorResponseObject>; 48 48 + fn xrpc_error(error: impl AsRef<str>, message: impl AsRef<str>) -> XrpcError { 49 49 + Json(XrpcErrorResponseObject { 50 50 + error: error.as_ref().to_string(), 51 51 + message: message.as_ref().to_string(), 52 52 + }) 53 53 + } 54 54 + 55 55 + #[derive(Debug, Object)] 56 56 + #[oai(example = true)] 57 57 + struct BskyPrefsObject { 58 58 + /// at-uri for this record 59 59 + preferences: Value, 60 60 + } 61 61 + impl Example for BskyPrefsObject { 62 62 + fn example() -> Self { 63 63 + Self { 64 64 + preferences: json!({ 65 65 + "hello": "world", 66 66 + }), 67 67 + } 68 68 + } 69 69 + } 70 70 + 71 71 + #[derive(ApiResponse)] 72 72 + enum GetBskyPrefsResponse { 73 73 + /// Record found 74 74 + #[oai(status = 200)] 75 75 + Ok(Json<BskyPrefsObject>), 76 76 + /// Bad request or no preferences to return 77 77 + #[oai(status = 400)] 78 78 + BadRequest(XrpcError), 79 79 + } 80 80 + 81 81 + #[derive(ApiResponse)] 82 82 + enum PutBskyPrefsResponse { 83 83 + /// Record found 84 84 + #[oai(status = 200)] 85 85 + Ok(PlainText<String>), 86 86 + /// Bad request or no preferences to return 87 87 + #[oai(status = 400)] 88 88 + BadRequest(XrpcError), 89 89 + // /// Server errors 90 90 + // #[oai(status = 500)] 91 91 + // ServerError(XrpcError), 92 92 + } 93 93 + 94 94 + struct Xrpc { 95 95 + verifier: TokenVerifier, 96 96 + storage: Arc<Mutex<Storage>>, 97 97 + } 98 98 + 99 99 + #[OpenApi] 100 100 + impl Xrpc { 101 101 + /// com.bad-example.pocket.getPreferences 102 102 + /// 103 103 + /// get stored preferencess 104 104 + #[oai( 105 105 + path = "/com.bad-example.pocket.getPreferences", 106 106 + method = "get", 107 107 + tag = "ApiTags::Pocket" 108 108 + )] 109 109 + async fn pocket_get_prefs(&self, XrpcAuth(auth): XrpcAuth) -> GetBskyPrefsResponse { 110 110 + let (did, aud) = match self 111 111 + .verifier 112 112 + .verify("com.bad-example.pocket.getPreferences", &auth.token) 113 113 + .await 114 114 + { 115 115 + Ok(d) => d, 116 116 + Err(e) => return GetBskyPrefsResponse::BadRequest(xrpc_error("boooo", e.to_string())), 117 117 + }; 118 118 + log::info!("verified did: {did}/{aud}"); 119 119 + 120 120 + let storage = self.storage.clone(); 121 121 + 122 122 + let Ok(Ok(res)) = tokio::task::spawn_blocking(move || { 123 123 + storage 124 124 + .lock() 125 125 + .unwrap() 126 126 + .get(&did, &aud) 127 127 + .inspect_err(|e| log::error!("failed to get prefs: {e}")) 128 128 + }) 129 129 + .await 130 130 + else { 131 131 + return GetBskyPrefsResponse::BadRequest(xrpc_error("boooo", "failed to get from db")); 132 132 + }; 133 133 + 134 134 + let Some(serialized) = res else { 135 135 + return GetBskyPrefsResponse::BadRequest(xrpc_error( 136 136 + "NotFound", 137 137 + "could not find prefs for u", 138 138 + )); 139 139 + }; 140 140 + 141 141 + let preferences = match serde_json::from_str(&serialized) { 142 142 + Ok(v) => v, 143 143 + Err(e) => { 144 144 + log::error!("failed to deserialize prefs: {e}"); 145 145 + return GetBskyPrefsResponse::BadRequest(xrpc_error( 146 146 + "boooo", 147 147 + "failed to deserialize prefs", 148 148 + )); 149 149 + } 150 150 + }; 151 151 + 152 152 + GetBskyPrefsResponse::Ok(Json(BskyPrefsObject { preferences })) 153 153 + } 154 154 + 155 155 + /// com.bad-example.pocket.putPreferences 156 156 + /// 157 157 + /// store bluesky prefs 158 158 + #[oai( 159 159 + path = "/com.bad-example.pocket.putPreferences", 160 160 + method = "post", 161 161 + tag = "ApiTags::Pocket" 162 162 + )] 163 163 + async fn pocket_put_prefs( 164 164 + &self, 165 165 + XrpcAuth(auth): XrpcAuth, 166 166 + Json(prefs): Json<BskyPrefsObject>, 167 167 + ) -> PutBskyPrefsResponse { 168 168 + let (did, aud) = match self 169 169 + .verifier 170 170 + .verify("com.bad-example.pocket.putPreferences", &auth.token) 171 171 + .await 172 172 + { 173 173 + Ok(d) => d, 174 174 + Err(e) => return PutBskyPrefsResponse::BadRequest(xrpc_error("boooo", e.to_string())), 175 175 + }; 176 176 + log::info!("verified did: {did}/{aud}"); 177 177 + log::warn!("received prefs: {prefs:?}"); 178 178 + 179 179 + let storage = self.storage.clone(); 180 180 + let serialized = prefs.preferences.to_string(); 181 181 + 182 182 + let Ok(Ok(())) = tokio::task::spawn_blocking(move || { 183 183 + storage 184 184 + .lock() 185 185 + .unwrap() 186 186 + .put(&did, &aud, &serialized) 187 187 + .inspect_err(|e| log::error!("failed to insert prefs: {e}")) 188 188 + }) 189 189 + .await 190 190 + else { 191 191 + return PutBskyPrefsResponse::BadRequest(xrpc_error("boooo", "failed to put to db")); 192 192 + }; 193 193 + 194 194 + PutBskyPrefsResponse::Ok(PlainText("saved.".to_string())) 195 195 + } 196 196 + } 197 197 + 198 198 + #[derive(Debug, Clone, Serialize)] 199 199 + #[serde(rename_all = "camelCase")] 200 200 + struct AppViewService { 201 201 + id: String, 202 202 + r#type: String, 203 203 + service_endpoint: String, 204 204 + } 205 205 + #[derive(Debug, Clone, Serialize)] 206 206 + struct AppViewDoc { 207 207 + id: String, 208 208 + service: [AppViewService; 2], 209 209 + } 210 210 + /// Serve a did document for did:web for this to be an xrpc appview 211 211 + fn get_did_doc(domain: &str) -> impl Endpoint + use<> { 212 212 + let doc = poem::web::Json(AppViewDoc { 213 213 + id: format!("did:web:{domain}"), 214 214 + service: [ 215 215 + AppViewService { 216 216 + id: "#pocket_prefs".to_string(), 217 217 + r#type: "PocketPreferences".to_string(), 218 218 + service_endpoint: format!("https://{domain}"), 219 219 + }, 220 220 + AppViewService { 221 221 + id: "#bsky_appview".to_string(), 222 222 + r#type: "BlueskyAppview".to_string(), 223 223 + service_endpoint: format!("https://{domain}"), 224 224 + }, 225 225 + ], 226 226 + }); 227 227 + make_sync(move |_| doc.clone()) 228 228 + } 229 229 + 230 230 + pub async fn serve(domain: &str, storage: Storage) -> () { 231 231 + let verifier = TokenVerifier::default(); 232 232 + let api_service = OpenApiService::new( 233 233 + Xrpc { 234 234 + verifier, 235 235 + storage: Arc::new(Mutex::new(storage)), 236 236 + }, 237 237 + "Pocket", 238 238 + env!("CARGO_PKG_VERSION"), 239 239 + ) 240 240 + .server(domain) 241 241 + .url_prefix("/xrpc") 242 242 + .contact( 243 243 + ContactObject::new() 244 244 + .name("@microcosm.blue") 245 245 + .url("https://bsky.app/profile/microcosm.blue"), 246 246 + ) 247 247 + .description(include_str!("../api-description.md")) 248 248 + .external_document(ExternalDocumentObject::new("https://microcosm.blue/pocket")); 249 249 + 250 250 + let app = Route::new() 251 251 + .nest("/openapi", api_service.spec_endpoint()) 252 252 + .nest("/xrpc/", api_service) 253 253 + .at("/.well-known/did.json", get_did_doc(domain)) 254 254 + .at("/", StaticFileEndpoint::new("./static/index.html")) 255 255 + .with( 256 256 + Cors::new() 257 257 + .allow_method(Method::GET) 258 258 + .allow_method(Method::POST), 259 259 + ) 260 260 + .with(CatchPanic::new()) 261 261 + .with(Tracing); 262 262 + 263 263 + let listener = TcpListener::bind("127.0.0.1:3000"); 264 264 + Server::new(listener).name("pocket").run(app).await.unwrap(); 265 265 + }

+50

pocket/src/storage.rs

··· 1 1 + use rusqlite::{Connection, OptionalExtension, Result}; 2 2 + use std::path::Path; 3 3 + 4 4 + pub struct Storage { 5 5 + con: Connection, 6 6 + } 7 7 + 8 8 + impl Storage { 9 9 + pub fn connect(path: impl AsRef<Path>) -> Result<Self> { 10 10 + let con = Connection::open(path)?; 11 11 + con.pragma_update(None, "journal_mode", "WAL")?; 12 12 + con.pragma_update(None, "synchronous", "NORMAL")?; 13 13 + con.pragma_update(None, "busy_timeout", "100")?; 14 14 + con.pragma_update(None, "foreign_keys", "ON")?; 15 15 + Ok(Self { con }) 16 16 + } 17 17 + pub fn init(path: impl AsRef<Path>) -> Result<Self> { 18 18 + let me = Self::connect(path)?; 19 19 + me.con.execute( 20 20 + r#" 21 21 + create table prefs ( 22 22 + actor text not null, 23 23 + aud text not null, 24 24 + pref text not null, 25 25 + primary key (actor, aud) 26 26 + ) strict"#, 27 27 + (), 28 28 + )?; 29 29 + Ok(me) 30 30 + } 31 31 + pub fn put(&self, actor: &str, aud: &str, pref: &str) -> Result<()> { 32 32 + self.con.execute( 33 33 + r#"insert into prefs (actor, aud, pref) 34 34 + values (?1, ?2, ?3) 35 35 + on conflict do update set pref = excluded.pref"#, 36 36 + [actor, aud, pref], 37 37 + )?; 38 38 + Ok(()) 39 39 + } 40 40 + pub fn get(&self, actor: &str, aud: &str) -> Result<Option<String>> { 41 41 + self.con 42 42 + .query_one( 43 43 + r#"select pref from prefs 44 44 + where actor = ?1 and aud = ?2"#, 45 45 + [actor, aud], 46 46 + |row| row.get(0), 47 47 + ) 48 48 + .optional() 49 49 + } 50 50 + }

+143

pocket/src/token.rs

··· 1 1 + use atrium_crypto::did::parse_multikey; 2 2 + use atrium_crypto::verify::Verifier; 3 3 + use jwt_compact::UntrustedToken; 4 4 + use serde::Deserialize; 5 5 + use std::collections::HashMap; 6 6 + use std::time::Duration; 7 7 + use thiserror::Error; 8 8 + 9 9 + #[derive(Debug, Deserialize)] 10 10 + struct MiniDoc { 11 11 + signing_key: String, 12 12 + did: String, 13 13 + } 14 14 + 15 15 + #[derive(Error, Debug)] 16 16 + pub enum VerifyError { 17 17 + #[error("The cross-service authorization token failed verification: {0}")] 18 18 + VerificationFailed(&'static str), 19 19 + #[error("Error trying to resolve the DID to a signing key, retry in a moment: {0}")] 20 20 + ResolutionFailed(&'static str), 21 21 + } 22 22 + 23 23 + pub struct TokenVerifier { 24 24 + client: reqwest::Client, 25 25 + } 26 26 + 27 27 + impl TokenVerifier { 28 28 + pub fn new() -> Self { 29 29 + let client = reqwest::Client::builder() 30 30 + .user_agent(format!( 31 31 + "microcosm pocket v{} (dev: @bad-example.com)", 32 32 + env!("CARGO_PKG_VERSION") 33 33 + )) 34 34 + .no_proxy() 35 35 + .timeout(Duration::from_secs(12)) // slingshot timeout is 10s 36 36 + .build() 37 37 + .unwrap(); 38 38 + Self { client } 39 39 + } 40 40 + 41 41 + pub async fn verify( 42 42 + &self, 43 43 + expected_lxm: &str, 44 44 + token: &str, 45 45 + ) -> Result<(String, String), VerifyError> { 46 46 + let untrusted = UntrustedToken::new(token).unwrap(); 47 47 + 48 48 + // danger! unfortunately we need to decode the DID from the jwt body before we have a public key to verify the jwt with 49 49 + let Ok(untrusted_claims) = 50 50 + untrusted.deserialize_claims_unchecked::<HashMap<String, String>>() 51 51 + else { 52 52 + return Err(VerifyError::VerificationFailed( 53 53 + "could not deserialize jtw claims", 54 54 + )); 55 55 + }; 56 56 + 57 57 + // get the (untrusted!) claimed DID 58 58 + let Some(untrusted_did) = untrusted_claims.custom.get("iss") else { 59 59 + return Err(VerifyError::VerificationFailed( 60 60 + "jwt must include the user's did in `iss`", 61 61 + )); 62 62 + }; 63 63 + 64 64 + // bail if it's not even a user-ish did 65 65 + if !untrusted_did.starts_with("did:") { 66 66 + return Err(VerifyError::VerificationFailed("iss should be a did")); 67 67 + } 68 68 + if untrusted_did.contains("#") { 69 69 + return Err(VerifyError::VerificationFailed( 70 70 + "iss should be a user did without a service identifier", 71 71 + )); 72 72 + } 73 73 + 74 74 + let endpoint = 75 75 + "https://slingshot.microcosm.blue/xrpc/com.bad-example.identity.resolveMiniDoc"; 76 76 + let doc: MiniDoc = self 77 77 + .client 78 78 + .get(format!("{endpoint}?identifier={untrusted_did}")) 79 79 + .send() 80 80 + .await 81 81 + .map_err(|_| VerifyError::ResolutionFailed("failed to fetch minidoc"))? 82 82 + .error_for_status() 83 83 + .map_err(|_| VerifyError::ResolutionFailed("non-ok response for minidoc"))? 84 84 + .json() 85 85 + .await 86 86 + .map_err(|_| VerifyError::ResolutionFailed("failed to parse json to minidoc"))?; 87 87 + 88 88 + // sanity check before we go ahead with this signing key 89 89 + if doc.did != *untrusted_did { 90 90 + return Err(VerifyError::VerificationFailed( 91 91 + "wtf, resolveMiniDoc returned a doc for a different DID, slingshot bug", 92 92 + )); 93 93 + } 94 94 + 95 95 + let Ok((alg, public_key)) = parse_multikey(&doc.signing_key) else { 96 96 + return Err(VerifyError::VerificationFailed( 97 97 + "could not parse signing key form minidoc", 98 98 + )); 99 99 + }; 100 100 + 101 101 + // i _guess_ we've successfully bootstrapped the verification of the jwt unless this fails 102 102 + if let Err(e) = Verifier::default().verify( 103 103 + alg, 104 104 + &public_key, 105 105 + &untrusted.signed_data, 106 106 + untrusted.signature_bytes(), 107 107 + ) { 108 108 + log::warn!("jwt verification failed: {e}"); 109 109 + return Err(VerifyError::VerificationFailed( 110 110 + "jwt signature verification failed", 111 111 + )); 112 112 + } 113 113 + 114 114 + // past this point we're should have established trust. crossing ts and dotting is. 115 115 + let did = &untrusted_did; 116 116 + let claims = &untrusted_claims; 117 117 + 118 118 + let Some(aud) = claims.custom.get("aud") else { 119 119 + return Err(VerifyError::VerificationFailed("missing aud")); 120 120 + }; 121 121 + let Some(mut aud) = aud.strip_prefix("did:web:") else { 122 122 + return Err(VerifyError::VerificationFailed("expected a did:web aud")); 123 123 + }; 124 124 + if let Some((aud_without_hash, _)) = aud.split_once("#") { 125 125 + log::warn!("aud claim is missing service id fragment: {aud:?}"); 126 126 + aud = aud_without_hash; 127 127 + } 128 128 + let Some(lxm) = claims.custom.get("lxm") else { 129 129 + return Err(VerifyError::VerificationFailed("missing lxm")); 130 130 + }; 131 131 + if lxm != expected_lxm { 132 132 + return Err(VerifyError::VerificationFailed("wrong lxm")); 133 133 + } 134 134 + 135 135 + Ok((did.to_string(), aud.to_string())) 136 136 + } 137 137 + } 138 138 + 139 139 + impl Default for TokenVerifier { 140 140 + fn default() -> Self { 141 141 + Self::new() 142 142 + } 143 143 + }

+67

pocket/static/index.html

··· 1 1 + <!doctype html> 2 2 + <html lang="en"> 3 3 + <head> 4 4 + <meta charset="utf-8" /> 5 5 + <title>Pocket: atproto user preference storage</title> 6 6 + <meta name="viewport" content="width=device-width, initial-scale=1" /> 7 7 + <meta name="description" content="API Documentation for Pocket, a simple user-preference storage system for atproto" /> 8 8 + <style> 9 9 + :root { 10 10 + --scalar-small: 13px; 11 11 + } 12 12 + .scalar-app .markdown .markdown-alert { 13 13 + font-size: var(--scalar-small); 14 14 + } 15 15 + .sidebar-heading-link-title { 16 16 + line-height: 1.2; 17 17 + } 18 18 + .custom-header { 19 19 + height: 42px; 20 20 + background-color: #221828; 21 21 + box-shadow: inset 0 -1px 0 var(--scalar-border-color); 22 22 + color: var(--scalar-color-1); 23 23 + font-size: var(--scalar-font-size-3); 24 24 + font-family: 'Iowan Old Style', 'Palatino Linotype', 'URW Palladio L', P052, serif; 25 25 + padding: 0 18px; 26 26 + justify-content: space-between; 27 27 + } 28 28 + .custom-header, 29 29 + .custom-header nav { 30 30 + display: flex; 31 31 + align-items: center; 32 32 + gap: 18px; 33 33 + } 34 34 + .custom-header a:hover { 35 35 + color: var(--scalar-color-2); 36 36 + } 37 37 + 38 38 + .light-mode .custom-header { 39 39 + background-color: thistle; 40 40 + } 41 41 + </style> 42 42 + </head> 43 43 + <body> 44 44 + <header class="custom-header scalar-app"> 45 45 + <p> 46 46 + TODO: thing 47 47 + </p> 48 48 + <nav> 49 49 + <b>a <a href="https://microcosm.blue">microcosm</a> project</b> 50 50 + <a href="https://bsky.app/profile/microcosm.blue">@microcosm.blue</a> 51 51 + <a href="https://github.com/at-microcosm">github</a> 52 52 + </nav> 53 53 + </header> 54 54 + 55 55 + <script id="api-reference" type="application/json" data-url="/openapi"></script> 56 56 + 57 57 + <script> 58 58 + var configuration = { 59 59 + theme: 'purple', 60 60 + hideModels: true, 61 61 + } 62 62 + document.getElementById('api-reference').dataset.configuration = JSON.stringify(configuration) 63 63 + </script> 64 64 + 65 65 + <script src="https://cdn.jsdelivr.net/npm/@scalar/api-reference"></script> 66 66 + </body> 67 67 + </html>

+8

quasar/Cargo.toml

··· 1 1 + [package] 2 2 + name = "quasar" 3 3 + version = "0.1.0" 4 4 + edition = "2024" 5 5 + 6 6 + [dependencies] 7 7 + clap = { version = "4.5.46", features = ["derive"] } 8 8 + fjall = "2.11.2"

+3

quasar/readme.md

··· 1 1 + # quasar 2 2 + 3 3 + indexed replay and fan-out for event stream services (wip)

+3

quasar/src/lib.rs

··· 1 1 + mod storage; 2 2 + 3 3 + pub use storage::Storage;

+3

quasar/src/main.rs

··· 1 1 + fn main() { 2 2 + println!("Hello, world!"); 3 3 + }

+4

quasar/src/storage.rs

··· 1 1 + 2 2 + pub trait Storage { 3 3 + 4 4 + }

+12

reflector/Cargo.toml

··· 1 1 + [package] 2 2 + name = "reflector" 3 3 + version = "0.1.0" 4 4 + edition = "2024" 5 5 + 6 6 + [dependencies] 7 7 + clap = { version = "4.5.47", features = ["derive"] } 8 8 + log = "0.4.28" 9 9 + poem = "3.1.12" 10 10 + serde = { version = "1.0.219", features = ["derive"] } 11 11 + tokio = "1.47.1" 12 12 + tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }

+9

reflector/readme.md

··· 1 1 + # reflector 2 2 + 3 3 + a tiny did:web service server that maps subdomains to a single service endpoint 4 4 + 5 5 + receiving requests from multiple subdomains is left as a problem for the reverse proxy to solve, since acme wildcard certificates (ie. letsencrypt) require the most complicated and involved challenge type (DNS). 6 6 + 7 7 + caddy [has good support for](https://caddyserver.com/docs/caddyfile/patterns#wildcard-certificates) configuring the wildcard DNS challenge with various DNS providers, and also supports [on-demand](https://caddyserver.com/docs/automatic-https#using-on-demand-tls) provisioning via the simpler methods. 8 8 + 9 9 + if you only need a small fixed number of subdomains, you can also use certbot or otherwise individually configure them in your reverse proxy.

+112

reflector/src/main.rs

··· 1 1 + use clap::Parser; 2 2 + use poem::{ 3 3 + EndpointExt, Response, Route, Server, get, handler, 4 4 + http::StatusCode, 5 5 + listener::TcpListener, 6 6 + middleware::{AddData, Tracing}, 7 7 + web::{Data, Json, Query, TypedHeader, headers::Host}, 8 8 + }; 9 9 + use serde::{Deserialize, Serialize}; 10 10 + 11 11 + #[handler] 12 12 + fn hello() -> String { 13 13 + "ɹoʇɔǝʅⅎǝɹ".to_string() 14 14 + } 15 15 + 16 16 + #[derive(Debug, Serialize)] 17 17 + struct DidDoc { 18 18 + id: String, 19 19 + service: [DidService; 1], 20 20 + } 21 21 + 22 22 + #[derive(Debug, Clone, Serialize)] 23 23 + #[serde(rename_all = "camelCase")] 24 24 + struct DidService { 25 25 + id: String, 26 26 + r#type: String, 27 27 + service_endpoint: String, 28 28 + } 29 29 + 30 30 + #[handler] 31 31 + fn did_doc(TypedHeader(host): TypedHeader<Host>, service: Data<&DidService>) -> Json<DidDoc> { 32 32 + Json(DidDoc { 33 33 + id: format!("did:web:{}", host.hostname()), 34 34 + service: [service.clone()], 35 35 + }) 36 36 + } 37 37 + 38 38 + #[derive(Deserialize)] 39 39 + struct AskQuery { 40 40 + domain: String, 41 41 + } 42 42 + #[handler] 43 43 + fn ask_caddy( 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 + && 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"); 53 53 + }; 54 54 + Response::builder() 55 55 + .status(StatusCode::FORBIDDEN) 56 56 + .body("nope") 57 57 + } 58 58 + 59 59 + /// Slingshot record edge cache 60 60 + #[derive(Parser, Debug, Clone)] 61 61 + #[command(version, about, long_about = None)] 62 62 + struct Args { 63 63 + /// The DID document service ID to serve 64 64 + /// 65 65 + /// must start with a '#', like `#bsky_appview' 66 66 + #[arg(long)] 67 67 + id: String, 68 68 + /// Service type 69 69 + /// 70 70 + /// Not sure exactly what its requirements are. 'BlueskyAppview' for example 71 71 + #[arg(long)] 72 72 + r#type: String, 73 73 + /// The HTTPS endpoint for the service 74 74 + #[arg(long)] 75 75 + service_endpoint: String, 76 76 + /// The parent domain; requests should come from subdomains of this 77 77 + #[arg(long)] 78 78 + domain: Option<String>, 79 79 + } 80 80 + 81 81 + impl From<Args> for DidService { 82 82 + fn from(a: Args) -> Self { 83 83 + Self { 84 84 + id: a.id, 85 85 + r#type: a.r#type, 86 86 + service_endpoint: a.service_endpoint, 87 87 + } 88 88 + } 89 89 + } 90 90 + 91 91 + #[tokio::main(flavor = "current_thread")] 92 92 + async fn main() { 93 93 + tracing_subscriber::fmt::init(); 94 94 + log::info!("ɹoʇɔǝʅⅎǝɹ"); 95 95 + 96 96 + let args = Args::parse(); 97 97 + let domain = args.domain.clone(); 98 98 + let service: DidService = args.into(); 99 99 + 100 100 + Server::new(TcpListener::bind("0.0.0.0:3001")) 101 101 + .run( 102 102 + Route::new() 103 103 + .at("/", get(hello)) 104 104 + .at("/.well-known/did.json", get(did_doc)) 105 105 + .at("/ask", get(ask_caddy)) 106 106 + .with(AddData::new(service)) 107 107 + .with(AddData::new(domain)) 108 108 + .with(Tracing), 109 109 + ) 110 110 + .await 111 111 + .unwrap() 112 112 + }

+4 -4

slingshot/Cargo.toml

··· 4 4 edition = "2024" 5 5 6 6 [dependencies] 7 7 - atrium-api = { version = "0.25.4", default-features = false } 8 8 - atrium-common = "0.1.2" 9 9 - atrium-identity = "0.1.5" 10 10 - atrium-oauth = "0.1.3" 7 7 + atrium-api = { git = "https://github.com/uniphil/atrium.git", branch = "fix/resolve-handle-https-accept-whitespace", default-features = false } 8 8 + atrium-common = { git = "https://github.com/uniphil/atrium.git", branch = "fix/resolve-handle-https-accept-whitespace" } 9 9 + atrium-identity = { git = "https://github.com/uniphil/atrium.git", branch = "fix/resolve-handle-https-accept-whitespace" } 10 10 + atrium-oauth = { git = "https://github.com/uniphil/atrium.git", branch = "fix/resolve-handle-https-accept-whitespace" } 11 11 clap = { version = "4.5.41", features = ["derive"] } 12 12 ctrlc = "3.4.7" 13 13 foyer = { version = "0.18.0", features = ["serde"] }

+4 -3

slingshot/src/identity.rs

··· 240 240 Err(atrium_identity::Error::NotFound) => { 241 241 Ok(IdentityVal(UtcDateTime::now(), IdentityData::NotFound)) 242 242 } 243 243 - Err(other) => Err(foyer::Error::Other(Box::new( 244 244 - IdentityError::ResolutionFailed(other), 245 245 - ))), 243 243 + Err(other) => Err(foyer::Error::Other(Box::new({ 244 244 + log::debug!("other error resolving handle: {other:?}"); 245 245 + IdentityError::ResolutionFailed(other) 246 246 + }))), 246 247 } 247 248 } 248 249 })

+40 -31

slingshot/src/server.rs

··· 437 437 Ok(did) => did, 438 438 Err(_) => { 439 439 let Ok(alleged_handle) = Handle::new(identifier) else { 440 440 - return invalid("identifier was not a valid DID or handle"); 440 440 + return invalid("Identifier was not a valid DID or handle"); 441 441 }; 442 442 - if let Ok(res) = self.identity.handle_to_did(alleged_handle.clone()).await { 443 443 - if let Some(did) = res { 444 444 - // we did it joe 445 445 - unverified_handle = Some(alleged_handle); 446 446 - did 447 447 - } else { 448 448 - return invalid("Could not resolve handle identifier to a DID"); 442 442 + 443 443 + match self.identity.handle_to_did(alleged_handle.clone()).await { 444 444 + Ok(res) => { 445 445 + if let Some(did) = res { 446 446 + // we did it joe 447 447 + unverified_handle = Some(alleged_handle); 448 448 + did 449 449 + } else { 450 450 + return invalid("Could not resolve handle identifier to a DID"); 451 451 + } 449 452 } 450 450 - } else { 451 451 - // TODO: ServerError not BadRequest 452 452 - return invalid("errored while trying to resolve handle to DID"); 453 453 + Err(e) => { 454 454 + log::debug!("failed to resolve handle: {e}"); 455 455 + // TODO: ServerError not BadRequest 456 456 + return invalid("Errored while trying to resolve handle to DID"); 457 457 + } 453 458 } 454 459 } 455 460 }; 456 461 let Ok(partial_doc) = self.identity.did_to_partial_mini_doc(&did).await else { 457 457 - return invalid("failed to get DID doc"); 462 462 + return invalid("Failed to get DID doc"); 458 463 }; 459 464 let Some(partial_doc) = partial_doc else { 460 460 - return invalid("failed to find DID doc"); 465 465 + return invalid("Failed to find DID doc"); 461 466 }; 462 467 463 468 // ok so here's where we're at: ··· 478 483 .handle_to_did(partial_doc.unverified_handle.clone()) 479 484 .await 480 485 else { 481 481 - return invalid("failed to get did doc's handle"); 486 486 + return invalid("Failed to get DID doc's handle"); 482 487 }; 483 488 let Some(handle_did) = handle_did else { 484 484 - return invalid("failed to resolve did doc's handle"); 489 489 + return invalid("Failed to resolve DID doc's handle"); 485 490 }; 486 491 if handle_did == did { 487 492 partial_doc.unverified_handle.to_string() ··· 511 516 let Ok(handle) = Handle::new(repo) else { 512 517 return GetRecordResponse::BadRequest(xrpc_error( 513 518 "InvalidRequest", 514 514 - "repo was not a valid DID or handle", 519 519 + "Repo was not a valid DID or handle", 515 520 )); 516 521 }; 517 517 - if let Ok(res) = self.identity.handle_to_did(handle).await { 518 518 - if let Some(did) = res { 519 519 - did 520 520 - } else { 521 521 - return GetRecordResponse::BadRequest(xrpc_error( 522 522 - "InvalidRequest", 523 523 - "Could not resolve handle repo to a DID", 522 522 + match self.identity.handle_to_did(handle).await { 523 523 + Ok(res) => { 524 524 + if let Some(did) = res { 525 525 + did 526 526 + } else { 527 527 + return GetRecordResponse::BadRequest(xrpc_error( 528 528 + "InvalidRequest", 529 529 + "Could not resolve handle repo to a DID", 530 530 + )); 531 531 + } 532 532 + } 533 533 + Err(e) => { 534 534 + log::debug!("handle resolution failed: {e}"); 535 535 + return GetRecordResponse::ServerError(xrpc_error( 536 536 + "ResolutionFailed", 537 537 + "Errored while trying to resolve handle to DID", 524 538 )); 525 539 } 526 526 - } else { 527 527 - return GetRecordResponse::ServerError(xrpc_error( 528 528 - "ResolutionFailed", 529 529 - "errored while trying to resolve handle to DID", 530 530 - )); 531 540 } 532 541 } 533 542 }; ··· 535 544 let Ok(collection) = Nsid::new(collection) else { 536 545 return GetRecordResponse::BadRequest(xrpc_error( 537 546 "InvalidRequest", 538 538 - "invalid NSID for collection", 547 547 + "Invalid NSID for collection", 539 548 )); 540 549 }; 541 550 542 551 let Ok(rkey) = RecordKey::new(rkey) else { 543 543 - return GetRecordResponse::BadRequest(xrpc_error("InvalidRequest", "invalid rkey")); 552 552 + return GetRecordResponse::BadRequest(xrpc_error("InvalidRequest", "Invalid rkey")); 544 553 }; 545 554 546 555 let cid: Option<Cid> = if let Some(cid) = cid { 547 556 let Ok(cid) = Cid::from_str(&cid) else { 548 548 - return GetRecordResponse::BadRequest(xrpc_error("InvalidRequest", "invalid CID")); 557 557 + return GetRecordResponse::BadRequest(xrpc_error("InvalidRequest", "Invalid CID")); 549 558 }; 550 559 Some(cid) 551 560 } else {

+2

spacedust/src/error.rs

··· 30 30 TooManySourcesWanted, 31 31 #[error("more wantedSubjectDids were requested than allowed (max 10,000)")] 32 32 TooManyDidsWanted, 33 33 + #[error("more wantedSubjectPrefixes were requested than allowed (max 100)")] 34 34 + TooManySubjectPrefixesWanted, 33 35 #[error("more wantedSubjects were requested than allowed (max 50,000)")] 34 36 TooManySubjectsWanted, 35 37 }

+11 -2

spacedust/src/server.rs

··· 227 227 #[serde(default)] 228 228 pub wanted_subjects: HashSet<String>, 229 229 #[serde(default)] 230 230 + pub wanted_subject_prefixes: HashSet<String>, 231 231 + #[serde(default)] 230 232 pub wanted_subject_dids: HashSet<String>, 231 233 #[serde(default)] 232 234 pub wanted_sources: HashSet<String>, ··· 241 243 /// 242 244 /// The at-uri must be url-encoded 243 245 /// 244 244 - /// Pass this parameter multiple times to specify multiple collections, like 246 246 + /// Pass this parameter multiple times to specify multiple subjects, like 245 247 /// `wantedSubjects=[...]&wantedSubjects=[...]` 246 248 pub wanted_subjects: String, 249 249 + /// One or more at-uri, URI, or DID prefixes to receive links about 250 250 + /// 251 251 + /// The uri must be url-encoded 252 252 + /// 253 253 + /// Pass this parameter multiple times to specify multiple prefixes, like 254 254 + /// `wantedSubjectPrefixes=[...]&wantedSubjectPrefixes=[...]` 255 255 + pub wanted_subject_prefixes: String, 247 256 /// One or more DIDs to receive links about 248 257 /// 249 249 - /// Pass this parameter multiple times to specify multiple collections 258 258 + /// Pass this parameter multiple times to specify multiple subjects 250 259 pub wanted_subject_dids: String, 251 260 /// One or more link sources to receive links about 252 261 ///

+15 -6

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)) => { ··· 124 124 let query = &self.query; 125 125 126 126 // subject + subject DIDs are logical OR 127 127 - if !(query.wanted_subjects.is_empty() && query.wanted_subject_dids.is_empty() 127 127 + if !(query.wanted_subjects.is_empty() 128 128 + && query.wanted_subject_prefixes.is_empty() 129 129 + && query.wanted_subject_dids.is_empty() 128 130 || query.wanted_subjects.contains(&properties.subject) 131 131 + || query 132 132 + .wanted_subject_prefixes 133 133 + .iter() 134 134 + .any(|p| properties.subject.starts_with(p)) 129 135 || properties 130 136 .subject_did 131 137 .as_ref() ··· 154 160 } 155 161 if opts.wanted_subject_dids.len() > 10_000 { 156 162 return Err(SubscriberUpdateError::TooManyDidsWanted); 163 163 + } 164 164 + if opts.wanted_subject_prefixes.len() > 100 { 165 165 + return Err(SubscriberUpdateError::TooManySubjectPrefixesWanted); 157 166 } 158 167 if opts.wanted_subjects.len() > 50_000 { 159 168 return Err(SubscriberUpdateError::TooManySubjectsWanted);

+1 -1

ufos/Cargo.toml

··· 13 13 clap = { version = "4.5.31", features = ["derive"] } 14 14 dropshot = "0.16.0" 15 15 env_logger = "0.11.7" 16 16 - fjall = { git = "https://github.com/fjall-rs/fjall.git", features = ["lz4"] } 16 16 + fjall = { git = "https://github.com/fjall-rs/fjall.git", rev = "fb229572bb7d1d6966a596994dc1708e47ec57d8", features = ["lz4"] } 17 17 getrandom = "0.3.3" 18 18 http = "1.3.1" 19 19 jetstream = { path = "../jetstream", features = ["metrics"] }

+11 -7

ufos/src/main.rs

··· 80 80 cursor: Option<Cursor>, 81 81 sketch_secret: SketchSecretPrefix, 82 82 ) -> anyhow::Result<()> { 83 83 - let mut tasks: JoinSet<anyhow::Result<()>> = JoinSet::new(); 83 83 + let mut whatever_tasks: JoinSet<anyhow::Result<()>> = JoinSet::new(); 84 84 + let mut consumer_tasks: JoinSet<anyhow::Result<()>> = JoinSet::new(); 84 85 85 86 println!("starting server with storage..."); 86 87 let serving = server::serve(read_store.clone()); 87 87 - tasks.spawn(async move { 88 88 + whatever_tasks.spawn(async move { 88 89 serving.await.map_err(|e| { 89 90 log::warn!("server ended: {e}"); 90 91 anyhow::anyhow!(e) ··· 93 94 94 95 if args.pause_writer { 95 96 log::info!("not starting jetstream or the write loop."); 96 96 - for t in tasks.join_all().await { 97 97 + for t in whatever_tasks.join_all().await { 97 98 if let Err(e) = t { 98 99 return Err(anyhow::anyhow!(e)); 99 100 } ··· 115 116 let rolling = write_store 116 117 .background_tasks(args.reroll)? 117 118 .run(args.backfill); 118 118 - tasks.spawn(async move { 119 119 + whatever_tasks.spawn(async move { 119 120 rolling 120 121 .await 121 122 .inspect_err(|e| log::warn!("rollup ended: {e}"))?; 122 123 Ok(()) 123 124 }); 124 125 125 125 - tasks.spawn(async move { 126 126 + consumer_tasks.spawn(async move { 126 127 write_store 127 128 .receive_batches(batches) 128 129 .await ··· 130 131 Ok(()) 131 132 }); 132 133 133 133 - tasks.spawn(async move { 134 134 + whatever_tasks.spawn(async move { 134 135 do_update_stuff(read_store).await; 135 136 log::warn!("status task ended"); 136 137 Ok(()) ··· 138 139 139 140 install_metrics_server()?; 140 141 141 141 - for (i, t) in tasks.join_all().await.iter().enumerate() { 142 142 + for (i, t) in consumer_tasks.join_all().await.iter().enumerate() { 142 143 log::warn!("task {i} done: {t:?}"); 143 144 } 145 145 + 146 146 + println!("consumer tasks all completed, killing the others"); 147 147 + whatever_tasks.shutdown().await; 144 148 145 149 println!("bye!"); 146 150

+9 -1

ufos/src/storage.rs

··· 41 41 Unit::Microseconds, 42 42 "batches that took more than 3s to insert" 43 43 ); 44 44 + describe_histogram!( 45 45 + "storage_batch_insert_time", 46 46 + Unit::Microseconds, 47 47 + "total time to insert one commit batch" 48 48 + ); 44 49 while let Some(event_batch) = batches.recv().await { 45 50 let token = CancellationToken::new(); 46 51 let cancelled = token.clone(); ··· 69 74 let mut me = self.clone(); 70 75 move || { 71 76 let _guard = token.drop_guard(); 72 72 - me.insert_batch(event_batch) 77 77 + let t0 = Instant::now(); 78 78 + let r = me.insert_batch(event_batch); 79 79 + histogram!("storage_batch_insert_time").record(t0.elapsed().as_micros() as f64); 80 80 + r 73 81 } 74 82 }) 75 83 .await??;

+1 -15

ufos/src/storage_fjall.rs

··· 1143 1143 "how many items are in the fjall batch for batched inserts" 1144 1144 ); 1145 1145 describe_histogram!( 1146 1146 - "storage_insert_batch_db_batch_size", 1147 1147 - Unit::Count, 1148 1148 - "in-memory size of the fjall batch for batched inserts" 1149 1149 - ); 1150 1150 - describe_histogram!( 1151 1146 "storage_rollup_counts_db_batch_items", 1152 1147 Unit::Count, 1153 1148 "how many items are in the fjall batch for a timlies rollup" 1154 1149 ); 1155 1155 - describe_histogram!( 1156 1156 - "storage_rollup_counts_db_batch_size", 1157 1157 - Unit::Count, 1158 1158 - "in-memory size of the fjall batch for a timelies rollup" 1159 1159 - ); 1160 1150 describe_counter!( 1161 1151 "storage_delete_account_partial_commits", 1162 1152 Unit::Count, ··· 1356 1346 insert_batch_static_neu::<NewRollupCursorKey>(&mut batch, &self.global, last_cursor)?; 1357 1347 1358 1348 histogram!("storage_rollup_counts_db_batch_items").record(batch.len() as f64); 1359 1359 - histogram!("storage_rollup_counts_db_batch_size") 1360 1360 - .record(std::mem::size_of_val(&batch) as f64); 1361 1349 batch.commit()?; 1362 1350 Ok((cursors_advanced, dirty_nsids)) 1363 1351 } ··· 1463 1451 ); 1464 1452 1465 1453 histogram!("storage_insert_batch_db_batch_items").record(batch.len() as f64); 1466 1466 - histogram!("storage_insert_batch_db_batch_size") 1467 1467 - .record(std::mem::size_of_val(&batch) as f64); 1468 1454 batch.commit()?; 1469 1455 Ok(()) 1470 1456 } ··· 1619 1605 candidate_new_feed_lower_cursor = Some(feed_key.cursor()); 1620 1606 } 1621 1607 1622 1622 - self.feeds.remove(&location_key_bytes)?; 1608 1608 + self.records.remove(&location_key_bytes)?; 1623 1609 self.feeds.remove(key_bytes)?; 1624 1610 records_deleted += 1; 1625 1611 }

+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" {