diff --git a/Cargo.lock b/Cargo.lock index 8193fc6..696756d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -90,15 +90,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -179,9 +179,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytecheck" @@ -213,9 +213,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "camino" @@ -228,9 +228,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.3" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" dependencies = [ "serde", ] @@ -243,7 +243,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.20", + "semver 1.0.22", "serde", "serde_json", "thiserror", @@ -251,9 +251,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.90" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" [[package]] name = "cfg-if" @@ -269,15 +269,25 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.52.4", + "windows-targets 0.52.5", +] + +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", ] [[package]] @@ -491,7 +501,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -513,7 +523,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core 0.20.8", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -571,9 +581,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "enum-iterator" @@ -613,7 +623,7 @@ dependencies = [ "darling 0.20.8", "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -705,7 +715,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -771,9 +781,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if 1.0.0", "libc", @@ -815,7 +825,7 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hc_zome_attachments_coordinator" version = "0.0.2" -source = "git+https://github.com/lightningrodlabs/we?branch=main#1e2b0c5b04f12ec841102b3f13b3c73265c9e77d" +source = "git+https://github.com/lightningrodlabs/we?branch=main#6492c89a70a91ca946d22e1c098c2f4a9b05a0b9" dependencies = [ "hc_zome_attachments_integrity", "hdk", @@ -825,7 +835,7 @@ dependencies = [ [[package]] name = "hc_zome_attachments_integrity" version = "0.0.2" -source = "git+https://github.com/lightningrodlabs/we?branch=main#1e2b0c5b04f12ec841102b3f13b3c73265c9e77d" +source = "git+https://github.com/lightningrodlabs/we?branch=main#6492c89a70a91ca946d22e1c098c2f4a9b05a0b9" dependencies = [ "hdi", "serde", @@ -855,7 +865,7 @@ dependencies = [ [[package]] name = "hc_zome_syn_coordinator" version = "0.1.0" -source = "git+https://github.com/holochain/syn?branch=main#96516ef3fb49fe4344dd888b550b56c156b88ed2" +source = "git+https://github.com/holochain/syn?branch=main#f653c9221ff95f289289921f062b7c2e0aee329c" dependencies = [ "hc_zome_syn_integrity", "hdk", @@ -866,7 +876,7 @@ dependencies = [ [[package]] name = "hc_zome_syn_integrity" version = "0.1.0" -source = "git+https://github.com/holochain/syn?branch=main#96516ef3fb49fe4344dd888b550b56c156b88ed2" +source = "git+https://github.com/holochain/syn?branch=main#f653c9221ff95f289289921f062b7c2e0aee329c" dependencies = [ "hdi", "serde", @@ -874,9 +884,9 @@ dependencies = [ [[package]] name = "hdi" -version = "0.4.0-beta-dev.31" +version = "0.4.0-beta-dev.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea34cd9ed5566b38e36933684887ca86662bbac8c3aae635116919a0bda4a125" +checksum = "573077dc8ba0c02ec52b63505ffd09af58a4c724c3ee98a04375125109839c27" dependencies = [ "getrandom", "hdk_derive", @@ -892,9 +902,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.3.0-beta-dev.35" +version = "0.3.0-beta-dev.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78ebe4c746e7e9afbeaad732b53cffd9e8cc45f1ff1a5bb5fc8aec216ee4743" +checksum = "5bc83515fde323014ef26be88b617c0b5150426db0efac5471c9526147f5d235" dependencies = [ "getrandom", "hdi", @@ -912,9 +922,9 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.3.0-beta-dev.29" +version = "0.3.0-beta-dev.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38a8ba16f38ed07da73c8988418ea273dafbe591c1e8338b1c1c2311a009d108" +checksum = "902a95cf3524162f82f20e9d45a06814a2ad4811646b9bf523d865554b0db737" dependencies = [ "darling 0.14.4", "heck", @@ -946,9 +956,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "holo_hash" -version = "0.3.0-beta-dev.24" +version = "0.3.0-beta-dev.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9830117eeb0163bec46835d876f4ae4e463fb1331071d76a3f4fc49f54991546" +checksum = "f6fb4f3280dab253ae029f1988e3cb118581a32a0ced1a42979847af69736e82" dependencies = [ "base64", "blake2b_simd", @@ -964,9 +974,9 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.3.0-beta-dev.28" +version = "0.3.0-beta-dev.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3e8650ee8b7d19e26bc769c0831a55e89acf54b480f122d7378b52f4a7a322" +checksum = "a302edef8a1e90a0e4842d767feb18815521e585bc1da6c9e64b1ef9c233ad7b" dependencies = [ "holo_hash", "holochain_secure_primitive", @@ -982,9 +992,9 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.3.0-beta-dev.25" +version = "0.3.0-beta-dev.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fa99c5d38bb8fe463dd0284e2123ad14405f2a62146c4aaa809d5b24134711" +checksum = "ffdee2f3cb5c43078153ffb6482ed86ba288567eb12febf2688a649882e2c753" dependencies = [ "getrandom", "holochain_secure_primitive", @@ -993,9 +1003,9 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.3.0-beta-dev.22" +version = "0.3.0-beta-dev.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc25ba91f7898688245db538693d7b26504f91df24709111bb3b1d7506af01a" +checksum = "a7701cf72c29cc7ccd0ef02e00e5091ad120d24619e948af1277011583eb566a" dependencies = [ "paste", "serde", @@ -1029,17 +1039,19 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.3.0-beta-dev.5" +version = "0.3.0-beta-dev.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6225aded80caf004c2214e38b39fb2459ee9a7a8fcd0d09146f49ae0771f0" +checksum = "d1b4134b28045c8da6a82a0a28b29d07d5995c547fa4afb8bb7e479c9c948ae9" dependencies = [ "cfg-if 0.1.10", + "colored", "derive_more", "dunce", "futures", "getrandom", "num_cpus", "once_cell", + "tracing", ] [[package]] @@ -1072,9 +1084,9 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.3.0-beta-dev.30" +version = "0.3.0-beta-dev.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a05fba98a0c43609c39df2c93d109d9e845eb30663476cb031588122ba5854a4" +checksum = "c3c8532243ff4a7ba8d31279b0484d80075850f314813d7f5128141a3cb83fc5" dependencies = [ "derive_more", "holo_hash", @@ -1160,9 +1172,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -1201,9 +1213,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" @@ -1216,9 +1228,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_bin_data" -version = "0.3.0-beta-dev.18" +version = "0.3.0-beta-dev.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396bb848a20db92dfcf7d712a73a82fc2c88f7206479136247e8363f1f635b21" +checksum = "3ffc4e64ce96e950d9d4f3b51cbdd1eac36f286cb9859b8a735af93d4b85dbb4" dependencies = [ "base64", "derive_more", @@ -1231,9 +1243,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_block" -version = "0.3.0-beta-dev.20" +version = "0.3.0-beta-dev.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb1fc5e712ee62d90b98a37accfee799fdd90e212532f6f4840f7e2e08cf25c" +checksum = "6527e2c45f6ba049439f37448e016b2042a6bd733454a06dc874275b8826dfc1" dependencies = [ "kitsune_p2p_bin_data", "kitsune_p2p_timestamp", @@ -1242,9 +1254,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_dht_arc" -version = "0.3.0-beta-dev.17" +version = "0.3.0-beta-dev.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5128eb7823b352d0bc24038960c36717510d773e754476b45515d8eec4d1646" +checksum = "20cb39e76f04817b574487993b6bb36fae71836748b02d6c055eea314a477748" dependencies = [ "derive_more", "gcollections", @@ -1256,9 +1268,9 @@ dependencies = [ [[package]] name = "kitsune_p2p_timestamp" -version = "0.3.0-beta-dev.8" +version = "0.3.0-beta-dev.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d587124090ca8e4ab28f3dd3d65aa35fcc72403b7dad4fc790751efd04fbe3" +checksum = "2079319784e851cdcceb11463db7672fec543d73fd045a437737caf70fe5386b" dependencies = [ "chrono", "serde", @@ -1307,11 +1319,20 @@ dependencies = [ "libc", ] +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" @@ -1333,9 +1354,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -1435,9 +1456,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.8" +version = "2.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f8023d0fb78c8e03784ea1c7f3fa36e68a723138990b8d5a47d916b651e7a8" +checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" dependencies = [ "memchr", "thiserror", @@ -1446,9 +1467,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1482,9 +1503,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -1525,9 +1546,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1540,9 +1561,9 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rayon" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -1581,9 +1602,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -1604,20 +1625,20 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "region" -version = "3.0.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e" +checksum = "e6b6ebd13bc009aef9cd476c1310d49ac354d36e240cf1bd753290f3dc7199a7" dependencies = [ "bitflags", "libc", - "mach", - "winapi", + "mach2", + "windows-sys 0.52.0", ] [[package]] @@ -1661,9 +1682,9 @@ dependencies = [ [[package]] name = "rmp" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -1693,14 +1714,14 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.20", + "semver 1.0.22", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "ryu" @@ -1746,9 +1767,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" dependencies = [ "serde", ] @@ -1764,9 +1785,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" dependencies = [ "serde_derive", ] @@ -1802,22 +1823,22 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] name = "serde_json" -version = "1.0.109" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -1880,9 +1901,9 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "stable_deref_trait" @@ -1946,9 +1967,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.53" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -2050,7 +2071,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -2100,7 +2121,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -2235,7 +2256,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -2257,7 +2278,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2475,7 +2496,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -2491,13 +2512,22 @@ dependencies = [ "windows_x86_64_msvc 0.33.0", ] +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + [[package]] name = "windows-sys" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -2517,17 +2547,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -2538,9 +2569,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -2556,9 +2587,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -2574,9 +2605,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -2592,9 +2629,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -2610,9 +2647,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -2622,9 +2659,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -2640,9 +2677,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "wyz" diff --git a/package-lock.json b/package-lock.json index 07bb7cb..3f0d696 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@holochain-playground/cli": "^0.1.1", "@holochain/hc-spin": "^0.100.3", - "@lightningrodlabs/we-dev-cli": "^0.11.0", + "@lightningrodlabs/we-dev-cli": "^0.11.8-dev.2", "bestzip": "^2.2.0", "concurrently": "^6.2.1", "cross-env": "^7.0.3", @@ -2697,6 +2697,7 @@ "version": "0.16.0", "resolved": "https://registry.npmjs.org/@lightningrodlabs/we-applet/-/we-applet-0.16.0.tgz", "integrity": "sha512-UYWVpew6ttt9oRxKpzyZ02rBIRemeRqkp64SIaczyxEuTJUhy01U8sCUTh+XCK2aCUBD2Gz1yXw53J5QJ0dRxw==", + "dev": true, "dependencies": { "@holochain/client": "^0.17.0-dev.7", "@msgpack/msgpack": "^2.8.0", @@ -2707,6 +2708,7 @@ "version": "0.17.0-dev.7", "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.17.0-dev.7.tgz", "integrity": "sha512-dr0S+4Au/sS/PXu0T7Lm1uqwkPVpcWvbMBL9xD7bRv4pfWMratGdP3OpeA356l4bkpSJxkOltz2o2kN3pW3tRQ==", + "dev": true, "dependencies": { "@bitgo/blake2b": "^3.2.4", "@holochain/serialization": "^0.1.0-beta-rc.3", @@ -2727,14 +2729,15 @@ "version": "2.8.0", "resolved": "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.8.0.tgz", "integrity": "sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ==", + "dev": true, "engines": { "node": ">= 10" } }, "node_modules/@lightningrodlabs/we-dev-cli": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@lightningrodlabs/we-dev-cli/-/we-dev-cli-0.11.0.tgz", - "integrity": "sha512-fSGo8ZpgiRCdyOw7KLqFPDUwkGFolBSI99TsEx6fbfeS+xqVTw2pNehz75lP3cEDK3rLx94TF/BdKjVE049CGQ==", + "version": "0.11.8-dev.2", + "resolved": "https://registry.npmjs.org/@lightningrodlabs/we-dev-cli/-/we-dev-cli-0.11.8-dev.2.tgz", + "integrity": "sha512-0yi/eaqXvZ48EwGL964pQhGxQ5o2Ds965MiwDILvCNDjauTj+haq0Gt6G+d1tA8zmK2AOmEjDY7PWSfancVlOQ==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -11816,7 +11819,7 @@ "@holochain-syn/core": "^0.300.0-dev.0", "@holochain-syn/text-editor": "^0.300.0-dev.0", "@holochain/client": "^0.17.0-dev.7", - "@lightningrodlabs/we-applet": "^0.16.0", + "@lightningrodlabs/we-applet": "^0.16.1", "@lit/context": "^1.0.0", "@lit/localize": "^0.12.0", "@mdi/js": "^7.2.96", @@ -11922,6 +11925,24 @@ "node": ">= 10" } }, + "ui/node_modules/@lightningrodlabs/we-applet": { + "version": "0.16.2", + "resolved": "https://registry.npmjs.org/@lightningrodlabs/we-applet/-/we-applet-0.16.2.tgz", + "integrity": "sha512-pQYzq02E+x6LOe+AWaebHTE1nPDgACgwlrYwfXe5k6KEsi8ii3CuxgQnjLkk3OInbEOm3tDx/LIK6J7CPbD1sQ==", + "dependencies": { + "@holochain/client": "^0.17.0-dev.7", + "@msgpack/msgpack": "^2.8.0", + "js-base64": "^3.7.2" + } + }, + "ui/node_modules/@lightningrodlabs/we-applet/node_modules/@msgpack/msgpack": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.8.0.tgz", + "integrity": "sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ==", + "engines": { + "node": ">= 10" + } + }, "ui/node_modules/@lightningrodlabs/we-dev-cli": { "version": "0.10.5", "resolved": "https://registry.npmjs.org/@lightningrodlabs/we-dev-cli/-/we-dev-cli-0.10.5.tgz", diff --git a/package.json b/package.json index d303ae2..50f72b4 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,9 @@ "scripts": { "dev": "VITE_ADMIN_PORT=$(port) VITE_APP_PORT=$(port) SIGNAL_PORT=$(port) BOOTSTRAP_PORT=$(port) UI_PORT=8888 npm run x", "x": "hc s clean && npm run build:happ && UI_PORT=8888 concurrently \"npm start -w ui\" \"npm run start:happ\" \"hc run-local-services -b $BOOTSTRAP_PORT -s $SIGNAL_PORT\"", - "applet-dev": " UI_PORT=8888 npm run applet-devy", - "applet-devy": "concurrently \"npm start -w ui\" \"sleep 1 && we-dev-cli --agent-idx 1 --dev-config we_dev/config.ts\" \"sleep 10 && we-dev-cli --agent-idx 2 --dev-config we_dev/config.ts\"", - "applet-devx": "BPORT=46263 SPORT=46262; concurrently \"hc run-local-services -b $BPORT -s $SPORT\" \"npm start -w ui\" \"./we_dev/we.AppImage --dev-config we_dev/config.json --agent-num 1 -b http://127.0.0.1:$BPORT -s ws://127.0.0.1:$SPORT\" \"sleep 10 && ./we_dev/we.AppImage --dev-config we_dev/config.json --agent-num 2 -b http://127.0.0.1:$BPORT -s ws://127.0.0.1:$SPORT\"", + "tool-dev": " UI_PORT=8888 npm run tool-devy", + "tool-devy": "concurrently \"npm start -w ui\" \"sleep 1 && we-dev-cli --agent-idx 1 --dev-config we_dev/config.ts\" \"sleep 10 && we-dev-cli --agent-idx 2 --dev-config we_dev/config.ts\"", + "tool-devx": "BPORT=46263 SPORT=46262; concurrently \"hc run-local-services -b $BPORT -s $SPORT\" \"npm start -w ui\" \"./we_dev/we.AppImage --dev-config we_dev/config.json --agent-num 1 -b http://127.0.0.1:$BPORT -s ws://127.0.0.1:$SPORT\" \"sleep 10 && ./we_dev/we.AppImage --dev-config we_dev/config.json --agent-num 2 -b http://127.0.0.1:$BPORT -s ws://127.0.0.1:$SPORT\"", "start": "VITE_ADMIN_PORT=$(port) VITE_APP_PORT=$(port) UI_PORT=8888 npm run network", "network": "hc s clean && npm run build:happ && npm run start -w ui && hc-spin -n 2 --ui-port $UI_PORT 8888 ./workdir/notebooks.webhapp", "test": "npm run build:happ && cargo nextest run -j 1", @@ -26,7 +26,7 @@ "devDependencies": { "@holochain-playground/cli": "^0.1.1", "@holochain/hc-spin": "^0.100.3", - "@lightningrodlabs/we-dev-cli": "^0.11.0", + "@lightningrodlabs/we-dev-cli": "^0.11.8-dev.2", "bestzip": "^2.2.0", "concurrently": "^6.2.1", "cross-env": "^7.0.3", diff --git a/ui/package.json b/ui/package.json index 136d59b..dafaa10 100644 --- a/ui/package.json +++ b/ui/package.json @@ -19,7 +19,7 @@ "@holochain-syn/core": "^0.300.0-dev.0", "@holochain-syn/text-editor": "^0.300.0-dev.0", "@holochain/client": "^0.17.0-dev.7", - "@lightningrodlabs/we-applet": "^0.16.0", + "@lightningrodlabs/we-applet": "^0.16.1", "@lit/context": "^1.0.0", "@lit/localize": "^0.12.0", "@mdi/js": "^7.2.96", diff --git a/ui/src/elements/markdown-note.ts b/ui/src/elements/markdown-note.ts index fc78ac0..3cb1e4d 100644 --- a/ui/src/elements/markdown-note.ts +++ b/ui/src/elements/markdown-note.ts @@ -57,7 +57,9 @@ import { msg } from "@lit/localize"; import { decode } from "@msgpack/msgpack"; import { Marked } from "@ts-stack/markdown"; import { mdiBookOpenOutline, mdiEye, mdiPencil } from "@mdi/js"; +import { isWeContext, WAL } from "@lightningrodlabs/we-applet"; import { NoteMeta } from "../types.js"; +import { notebooksContext, NotebooksStore } from "../store"; enum View { Edit, @@ -65,6 +67,7 @@ enum View { View } +const POCKET_ICON=`` customElements.define("markdown-renderer", MarkdownRenderer); const WORKSPACE_NOT_FOUND = "The requested workspace was not found"; @@ -75,6 +78,13 @@ export class MarkdownNote extends LitElement { @property() documentStore!: DocumentStore; + @consume({ context: notebooksContext, subscribe: true }) + @property() + notebooksStore!: NotebooksStore; + + @property() + standalone = false + _meta = new StoreSubscriber( this, () => @@ -280,6 +290,11 @@ export class MarkdownNote extends LitElement { : html``} `; } + copyWALToClipboard(documentHash: EntryHash) { + const attachment: WAL = { hrl: [this.notebooksStore.dnaHash, documentHash], context: {} } + this.notebooksStore.weClient?.walToPocket(attachment) + } + renderNoteWorkspace( sessionStore: SessionStore, state: TextEditorState @@ -294,15 +309,28 @@ export class MarkdownNote extends LitElement { style="align-items: center; background-color: white; padding: 8px; box-shadow: var(--sl-shadow-x-large); z-index: 10" > - ${this.renderTitle()} - + ${this.standalone ? this.renderTitle() :""} + { this._view = View.Edit }}> { this._view = View.Both }}> { this._view = View.View }}> + ${ isWeContext() ? html` + { + this.copyWALToClipboard(this.documentStore.documentHash); + }} + > + + `:""} - ${msg("Participants:")} { if ((import.meta as any).env.DEV) { try { @@ -157,8 +163,9 @@ export class NotebooksApp extends LitElement { console.warn("Could not initialize applet hot-reloading. This is only expected to work in a We context in dev mode.") } } + let weClient: WeClient | undefined if (isWeContext()) { - const weClient = await WeClient.connect(appletServices); + weClient = await WeClient.connect(appletServices); // Then handle all the different types of views that you offer switch (weClient.renderInfo.type) { @@ -172,6 +179,7 @@ export class NotebooksApp extends LitElement { }, profilesClient: weClient.renderInfo.profilesClient as any, client: weClient.renderInfo.appletClient, + weClient }; case "block": throw new Error("Unknown applet-view block type"); @@ -191,6 +199,7 @@ export class NotebooksApp extends LitElement { client: weClient.renderInfo.appletClient, profilesClient: weClient.renderInfo .profilesClient as any, + weClient }; default: throw new Error(`Unknown entry type: ${weClient.renderInfo.view.entryType}`); @@ -212,6 +221,7 @@ export class NotebooksApp extends LitElement { client: weClient.renderInfo.appletClient, profilesClient: weClient.renderInfo .profilesClient as any, + weClient }; default: throw new Error(`Unknown creatable type: ${weClient.renderInfo.view.name}`); } @@ -249,13 +259,20 @@ export class NotebooksApp extends LitElement { }, client, profilesClient, + weClient }; } async connectToHolochain() { - const { view, profilesClient, client } = await this.buildClient(); + const { view, profilesClient, client, weClient } = await this.buildClient(); this._synStore = new SynStore(new SynClient(client, "notebooks")); + + const appInfo = await this._synStore.client.client.appInfo(); + const dnaHash = (appInfo?.cell_info.notebooks[0] as any)[ + CellType.Provisioned + ].cell_id[0]; + this._notebooksStore = new NotebooksStore(dnaHash, weClient) this._profilesStore = new ProfilesStore(profilesClient); this._myProfile = new StoreSubscriber( @@ -338,12 +355,9 @@ export class NotebooksApp extends LitElement { try { const title = this._createTitle.value const noteHash = await createNote(this._synStore, title, undefined, `# ${title}\n\n`); - const appInfo = await this._synStore.client.client.appInfo(); - const dnaHash = (appInfo?.cell_info.notebooks[0] as any)[ - CellType.Provisioned - ].cell_id[0]; + const hrlWithContext: WAL = { - hrl: [dnaHash, noteHash], + hrl: [this._notebooksStore.dnaHash, noteHash], context: {}, } // @ts-ignore @@ -362,7 +376,7 @@ export class NotebooksApp extends LitElement { - + `; return html` diff --git a/ui/src/store.ts b/ui/src/store.ts new file mode 100644 index 0000000..a0724a0 --- /dev/null +++ b/ui/src/store.ts @@ -0,0 +1,10 @@ +import { DnaHash } from "@holochain/client"; +import { WeClient } from "@lightningrodlabs/we-applet"; +import { createContext } from "@lit/context"; + +export class NotebooksStore { + constructor(public dnaHash:DnaHash, public weClient: WeClient | undefined) { + } +} +export const notebooksContext = createContext('notebooks-context'); + diff --git a/we_dev/config.ts b/we_dev/config.ts index 9fd3384..399ff85 100644 --- a/we_dev/config.ts +++ b/we_dev/config.ts @@ -69,31 +69,31 @@ export default defineConfig({ // uiPort: 8888, }, }, - // { - // name: 'gamez', - // subtitle: 'play!', - // description: 'Real-time games based on syn', - // icon: { - // type: "https", - // url: "https://raw.githubusercontent.com/holochain-apps/gamez/main/we_dev/gamez_icon.svg" - // }, - // source: { - // type: "https", - // url: "https://github.com/holochain-apps/gamez/releases/download/v0.3.100/gamez.webhapp" - // }, - // }, - // { - // name: 'kando', - // subtitle: 'kanban boards', - // description: 'Real-time kanban based on syn', - // icon: { - // type: 'https', - // url: 'https://raw.githubusercontent.com/holochain-apps/kando/main/we_dev/kando_icon.png', - // }, - // source: { - // type: 'https', - // url: 'https://github.com/holochain-apps/kando/releases/download/v0.8.101/kando.webhapp', - // }, - // }, + { + name: 'gamez', + subtitle: 'play!', + description: 'Real-time games based on syn', + icon: { + type: "https", + url: "https://raw.githubusercontent.com/holochain-apps/gamez/main/we_dev/gamez_icon.svg" + }, + source: { + type: "https", + url: "https://github.com/holochain-apps/gamez/releases/download/v0.4.2/gamez.webhapp" + }, + }, + { + name: 'kando', + subtitle: 'kanban boards', + description: 'Real-time kanban based on syn', + icon: { + type: 'https', + url: 'https://raw.githubusercontent.com/holochain-apps/kando/main/we_dev/kando_icon.png', + }, + source: { + type: 'https', + url: 'https://github.com/holochain-apps/kando/releases/download/v0.9.5/kando.webhapp', + }, + }, ], });