temporarily replace logging with print

optimize logs
feat(peer_channels): call update_endpoints
2026-06-30 03:26:36 +03:00 · 2024-05-25 05:52:07 +00:00 · 2024-05-25 05:52:07 +00:00 · 2024-05-25 05:52:07 +00:00 · 2024-05-25 05:51:37 +00:00 · 2024-05-25 05:46:55 +00:00
35 changed files with 712 additions and 273 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Changelog

+## [1.139.5] - 2024-05-23
+
+### API-Changes
+
+- deltachat-ffi: Make WebXdcRealtimeData data usable in CFFI.
+- Add event channel overflow event.
+- deltachat-rpc-client: Add EventType.WEBXDC_REALTIME_DATA constant.
+- deltachat-rpc-client: Add Message.send_webxdc_realtime_advertisement().
+- deltachat-rpc-client: Add Message.send_webxdc_realtime_data().
+
+### Features / Changes
+
+- deltachat-repl: Add start-realtime and send-realtime commands.
+
+### Fixes
+
+- peer_channels: Connect to peers that advertise to you.
+- Don't recode images in `Viewtype::File` messages ([#5617](https://github.com/deltachat/deltachat-core-rust/pull/5617)).
+
+### Tests
+
+- peer_channels: Add test_parallel_connect().
+- "SecureJoin wait" state and info messages.
+
 ## [1.139.4] - 2024-05-21

 ### Features / Changes
@@ -4275,3 +4299,4 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
 [1.139.2]: https://github.com/deltachat/deltachat-core-rust/compare/v1.139.1...v1.139.2
 [1.139.3]: https://github.com/deltachat/deltachat-core-rust/compare/v1.139.2...v1.139.3
 [1.139.4]: https://github.com/deltachat/deltachat-core-rust/compare/v1.139.3...v1.139.4
+[1.139.5]: https://github.com/deltachat/deltachat-core-rust/compare/v1.139.4...v1.139.5
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -512,23 +512,6 @@ dependencies = [
 "rustc-demangle",
 ]

-[[package]]
-name = "bao-tree"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1f7a89a8ee5889d2593ae422ce6e1bb03e48a0e8a16e4fa0882dfcbe7e182ef"
-dependencies = [
- "bytes",
- "futures-lite 2.3.0",
- "genawaiter",
- "iroh-blake3",
- "iroh-io",
- "positioned-io",
- "range-collections",
- "self_cell",
- "smallvec",
-]
-
 [[package]]
 name = "base16ct"
 version = "0.1.1"
@@ -577,12 +560,6 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"

-[[package]]
-name = "binary-merge"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597bb81c80a54b6a4381b23faba8d7774b144c94cbd1d6fe3f1329bd776554ab"
-
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -1347,7 +1324,7 @@ dependencies = [

 [[package]]
 name = "deltachat"
-version = "1.139.4"
+version = "1.139.5"
 dependencies = [
 "ansi_term",
 "anyhow",
@@ -1403,7 +1380,7 @@ dependencies = [
 "rand 0.8.5",
 "ratelimit",
 "regex",
- "reqwest",
+ "reqwest 0.11.27",
 "rusqlite",
 "rust-hsluv",
 "sanitize-filename",
@@ -1442,7 +1419,7 @@ dependencies = [

 [[package]]
 name = "deltachat-jsonrpc"
-version = "1.139.4"
+version = "1.139.5"
 dependencies = [
 "anyhow",
 "async-channel 2.2.1",
@@ -1467,7 +1444,7 @@ dependencies = [

 [[package]]
 name = "deltachat-repl"
-version = "1.139.4"
+version = "1.139.5"
 dependencies = [
 "ansi_term",
 "anyhow",
@@ -1482,7 +1459,7 @@ dependencies = [

 [[package]]
 name = "deltachat-rpc-server"
-version = "1.139.4"
+version = "1.139.5"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1511,7 +1488,7 @@ dependencies = [

 [[package]]
 name = "deltachat_ffi"
-version = "1.139.4"
+version = "1.139.5"
 dependencies = [
 "anyhow",
 "deltachat",
@@ -1585,7 +1562,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ef71ddb5b3a1f53dee24817c8f70dfa1cb29e804c18d88c228d4bc9c86ee3b9"
 dependencies = [
- "proc-macro-error 1.0.4",
+ "proc-macro-error",
 "proc-macro2",
 "quote",
 "syn 1.0.109",
@@ -2572,8 +2549,6 @@ checksum = "c86bd0361bcbde39b13475e6e36cb24c329964aa2611be285289d1e4b751c1a0"
 dependencies = [
 "futures-core",
 "genawaiter-macro",
- "genawaiter-proc-macro",
- "proc-macro-hack",
 ]

 [[package]]
@@ -2582,19 +2557,6 @@ version = "0.99.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b32dfe1fdfc0bbde1f22a5da25355514b5e450c33a6af6770884c8750aedfbc"

-[[package]]
-name = "genawaiter-proc-macro"
-version = "0.99.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784f84eebc366e15251c4a8c3acee82a6a6f427949776ecb88377362a9621738"
-dependencies = [
- "proc-macro-error 0.4.12",
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "generic-array"
 version = "0.14.7"
@@ -3015,9 +2977,26 @@ dependencies = [
 "futures-util",
 "http 0.2.12",
 "hyper 0.14.28",
- "rustls",
+ "rustls 0.21.11",
 "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.24.1",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
+dependencies = [
+ "futures-util",
+ "http 1.1.0",
+ "hyper 1.2.0",
+ "hyper-util",
+ "rustls 0.22.4",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls 0.25.0",
+ "tower-service",
 ]

 [[package]]
@@ -3040,6 +3019,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
 dependencies = [
 "bytes",
+ "futures-channel",
 "futures-util",
 "http 1.1.0",
 "http-body 1.0.0",
@@ -3047,6 +3027,9 @@ dependencies = [
 "pin-project-lite",
 "socket2",
 "tokio",
+ "tower",
+ "tower-service",
+ "tracing",
 ]

 [[package]]
@@ -3181,15 +3164,6 @@ dependencies = [
 "generic-array",
 ]

-[[package]]
-name = "inplace-vec-builder"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf64c2edc8226891a71f127587a2861b132d2b942310843814d5001d99a1d307"
-dependencies = [
- "smallvec",
-]
-
 [[package]]
 name = "instant"
 version = "0.1.12"
@@ -3208,7 +3182,7 @@ dependencies = [
 "socket2",
 "widestring",
 "windows-sys 0.48.0",
- "winreg",
+ "winreg 0.50.0",
 ]

 [[package]]
@@ -3243,8 +3217,8 @@ dependencies = [
 "rand 0.7.3",
 "rcgen 0.10.0",
 "ring 0.16.20",
- "rustls",
- "rustls-webpki",
+ "rustls 0.21.11",
+ "rustls-webpki 0.101.7",
 "serde",
 "serde-error",
 "ssh-key 0.5.1",
@@ -3263,18 +3237,18 @@ dependencies = [

 [[package]]
 name = "iroh-base"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02a1a5323b25a181b1434a44f9f59ebc478d21156cf9bf91aa850ad0d626f833"
+version = "0.16.0"
+source = "git+https://github.com/n0-computer/iroh?rev=c8690a2c6eb5753c4ec6b7e44db72abf09df3c6e#c8690a2c6eb5753c4ec6b7e44db72abf09df3c6e"
 dependencies = [
 "aead",
 "anyhow",
- "bao-tree",
 "crypto_box",
 "data-encoding",
 "derive_more 1.0.0-beta.6",
 "ed25519-dalek 2.1.1",
+ "getrandom 0.2.12",
 "hex",
+ "iroh-blake3",
 "once_cell",
 "postcard",
 "rand 0.8.5",
@@ -3303,9 +3277,8 @@ dependencies = [

 [[package]]
 name = "iroh-gossip"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11daf47e11d00016eeac662b8b13343d40233764fe4b971e0d6cf15b1c98f0a1"
+version = "0.16.0"
+source = "git+https://github.com/n0-computer/iroh?rev=c8690a2c6eb5753c4ec6b7e44db72abf09df3c6e#c8690a2c6eb5753c4ec6b7e44db72abf09df3c6e"
 dependencies = [
 "anyhow",
 "bytes",
@@ -3327,22 +3300,10 @@ dependencies = [
 "tracing",
 ]

-[[package]]
-name = "iroh-io"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d1047ad5ca29ab4ff316b6830d86e7ea52cea54325e4d4a849692e1274b498"
-dependencies = [
- "bytes",
- "futures-lite 2.3.0",
- "pin-project",
-]
-
 [[package]]
 name = "iroh-metrics"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0b4f668653628979461eabe56853a694b1eb4713e87ed25f2224618165c0e67"
+version = "0.16.0"
+source = "git+https://github.com/n0-computer/iroh?rev=c8690a2c6eb5753c4ec6b7e44db72abf09df3c6e#c8690a2c6eb5753c4ec6b7e44db72abf09df3c6e"
 dependencies = [
 "anyhow",
 "erased_set",
@@ -3351,7 +3312,7 @@ dependencies = [
 "hyper-util",
 "once_cell",
 "prometheus-client",
- "reqwest",
+ "reqwest 0.12.4",
 "serde",
 "struct_iterable",
 "time 0.3.34",
@@ -3361,13 +3322,14 @@ dependencies = [

 [[package]]
 name = "iroh-net"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bea6e221dfbe6301965a5ec9b6bae2c156375a4baafdbdbad7a93c3dcf950d6"
+version = "0.16.0"
+source = "git+https://github.com/n0-computer/iroh?rev=c8690a2c6eb5753c4ec6b7e44db72abf09df3c6e#c8690a2c6eb5753c4ec6b7e44db72abf09df3c6e"
 dependencies = [
 "aead",
 "anyhow",
+ "axum",
 "backoff",
+ "base64 0.22.1",
 "bytes",
 "der 0.7.8",
 "derive_more 1.0.0-beta.6",
@@ -3407,11 +3369,11 @@ dependencies = [
 "rand 0.8.5",
 "rand_core 0.6.4",
 "rcgen 0.11.3",
- "reqwest",
+ "reqwest 0.12.4",
 "ring 0.17.8",
 "rtnetlink",
- "rustls",
- "rustls-webpki",
+ "rustls 0.21.11",
+ "rustls-webpki 0.101.7",
 "serde",
 "smallvec",
 "socket2",
@@ -3421,13 +3383,13 @@ dependencies = [
 "thiserror",
 "time 0.3.34",
 "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.24.1",
 "tokio-rustls-acme",
 "tokio-util",
 "tracing",
 "url",
 "watchable",
- "webpki-roots",
+ "webpki-roots 0.25.4",
 "windows 0.51.1",
 "wmi",
 "x509-parser 0.15.1",
@@ -3445,7 +3407,7 @@ dependencies = [
 "iroh-quinn-udp",
 "pin-project-lite",
 "rustc-hash",
- "rustls",
+ "rustls 0.21.11",
 "thiserror",
 "tokio",
 "tracing",
@@ -3461,7 +3423,7 @@ dependencies = [
 "rand 0.8.5",
 "ring 0.16.20",
 "rustc-hash",
- "rustls",
+ "rustls 0.21.11",
 "rustls-native-certs",
 "slab",
 "thiserror",
@@ -4492,7 +4454,7 @@ dependencies = [
 "bytes",
 "ed25519-dalek 2.1.1",
 "rand 0.8.5",
- "reqwest",
+ "reqwest 0.11.27",
 "self_cell",
 "simple-dns",
 "thiserror",
@@ -4655,16 +4617,6 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"

-[[package]]
-name = "positioned-io"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccabfeeb89c73adf4081f0dca7f8e28dbda90981a222ceea37f619e93ea6afe9"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "postcard"
 version = "1.0.8"
@@ -4763,45 +4715,19 @@ dependencies = [
 "toml_edit 0.21.1",
 ]

-[[package]]
-name = "proc-macro-error"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7"
-dependencies = [
- "proc-macro-error-attr 0.4.12",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
- "proc-macro-error-attr 1.0.4",
+ "proc-macro-error-attr",
 "proc-macro2",
 "quote",
 "syn 1.0.109",
 "version_check",
 ]

-[[package]]
-name = "proc-macro-error-attr"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "syn-mid",
- "version_check",
-]
-
 [[package]]
 name = "proc-macro-error-attr"
 version = "1.0.4"
@@ -4813,12 +4739,6 @@ dependencies = [
 "version_check",
 ]

-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.81"
@@ -4933,7 +4853,7 @@ dependencies = [
 "quinn-proto",
 "quinn-udp",
 "rustc-hash",
- "rustls",
+ "rustls 0.21.11",
 "thiserror",
 "tokio",
 "tracing",
@@ -4949,7 +4869,7 @@ dependencies = [
 "rand 0.8.5",
 "ring 0.16.20",
 "rustc-hash",
- "rustls",
+ "rustls 0.21.11",
 "rustls-native-certs",
 "slab",
 "thiserror",
@@ -5091,18 +5011,6 @@ dependencies = [
 "rand_core 0.6.4",
 ]

-[[package]]
-name = "range-collections"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca9edd21e2db51000ac63eccddabba622f826e631a60be7bade9bd6a76b69537"
-dependencies = [
- "binary-merge",
- "inplace-vec-builder",
- "ref-cast",
- "smallvec",
-]
-
 [[package]]
 name = "ratelimit"
 version = "1.0.0"
@@ -5201,26 +5109,6 @@ dependencies = [
 "thiserror",
 ]

-[[package]]
-name = "ref-cast"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931"
-dependencies = [
- "ref-cast-impl",
-]
-
-[[package]]
-name = "ref-cast-impl"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.60",
-]
-
 [[package]]
 name = "regex"
 version = "1.10.4"
@@ -5286,7 +5174,7 @@ dependencies = [
 "http 0.2.12",
 "http-body 0.4.6",
 "hyper 0.14.28",
- "hyper-rustls",
+ "hyper-rustls 0.24.2",
 "hyper-tls",
 "ipnet",
 "js-sys",
@@ -5296,8 +5184,8 @@ dependencies = [
 "once_cell",
 "percent-encoding",
 "pin-project-lite",
- "rustls",
- "rustls-pemfile",
+ "rustls 0.21.11",
+ "rustls-pemfile 1.0.4",
 "serde",
 "serde_json",
 "serde_urlencoded",
@@ -5305,14 +5193,55 @@ dependencies = [
 "system-configuration 0.5.1",
 "tokio",
 "tokio-native-tls",
- "tokio-rustls",
+ "tokio-rustls 0.24.1",
 "tower-service",
 "url",
 "wasm-bindgen",
 "wasm-bindgen-futures",
 "web-sys",
- "webpki-roots",
- "winreg",
+ "webpki-roots 0.25.4",
+ "winreg 0.50.0",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.2.0",
+ "hyper-rustls 0.26.0",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls 0.22.4",
+ "rustls-pemfile 2.1.2",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper 0.1.2",
+ "tokio",
+ "tokio-rustls 0.25.0",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "webpki-roots 0.26.1",
+ "winreg 0.52.0",
 ]

 [[package]]
@@ -5516,10 +5445,24 @@ checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4"
 dependencies = [
 "log",
 "ring 0.17.8",
- "rustls-webpki",
+ "rustls-webpki 0.101.7",
 "sct",
 ]

+[[package]]
+name = "rustls"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
+dependencies = [
+ "log",
+ "ring 0.17.8",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.4",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-native-certs"
 version = "0.6.3"
@@ -5527,7 +5470,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
 dependencies = [
 "openssl-probe",
- "rustls-pemfile",
+ "rustls-pemfile 1.0.4",
 "schannel",
 "security-framework",
 ]
@@ -5541,6 +5484,22 @@ dependencies = [
 "base64 0.21.7",
 ]

+[[package]]
+name = "rustls-pemfile"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
+dependencies = [
+ "base64 0.22.1",
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
+
 [[package]]
 name = "rustls-webpki"
 version = "0.101.7"
@@ -5551,6 +5510,17 @@ dependencies = [
 "untrusted 0.9.0",
 ]

+[[package]]
+name = "rustls-webpki"
+version = "0.102.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
+dependencies = [
+ "ring 0.17.8",
+ "rustls-pki-types",
+ "untrusted 0.9.0",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.14"
@@ -6231,17 +6201,6 @@ dependencies = [
 "unicode-ident",
 ]

-[[package]]
-name = "syn-mid"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea305d57546cc8cd04feb14b62ec84bf17f50e3f7b12560d7bfa9265f39d9ed"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "sync_wrapper"
 version = "0.1.2"
@@ -6535,7 +6494,18 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
- "rustls",
+ "rustls 0.21.11",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
+dependencies = [
+ "rustls 0.22.4",
+ "rustls-pki-types",
 "tokio",
 ]

@@ -6554,16 +6524,16 @@ dependencies = [
 "pem 3.0.4",
 "proc-macro2",
 "rcgen 0.12.1",
- "reqwest",
+ "reqwest 0.11.27",
 "ring 0.17.8",
- "rustls",
+ "rustls 0.21.11",
 "serde",
 "serde_json",
 "thiserror",
 "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.24.1",
 "url",
- "webpki-roots",
+ "webpki-roots 0.25.4",
 "x509-parser 0.16.0",
 ]

@@ -6846,7 +6816,7 @@ checksum = "2835fe6badda3e20a012d19d6593ded0fc11f659d5d5152394061ffbb03b4b04"
 dependencies = [
 "darling 0.13.4",
 "ident_case",
- "proc-macro-error 1.0.4",
+ "proc-macro-error",
 "proc-macro2",
 "quote",
 "syn 1.0.109",
@@ -7135,6 +7105,15 @@ version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"

+[[package]]
+name = "webpki-roots"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "weezl"
 version = "0.1.8"
@@ -7490,6 +7469,16 @@ dependencies = [
 "windows-sys 0.48.0",
 ]

+[[package]]
+name = "winreg"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "wmi"
 version = "0.13.3"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.139.4"
+version = "1.139.5"
 edition = "2021"
 license = "MPL-2.0"
 rust-version = "1.77"
@@ -61,8 +61,8 @@ hickory-resolver = "0.24"
 humansize = "2"
 image = { version = "0.25.1", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
 iroh_old = { version = "0.4.2", default-features = false, package = "iroh"}
-iroh-net = "0.16.2"
-iroh-gossip = { version = "0.16.2", features = ["net"] }
+iroh-net = { git = "https://github.com/n0-computer/iroh", rev="c8690a2c6eb5753c4ec6b7e44db72abf09df3c6e" }
+iroh-gossip = { git = "https://github.com/n0-computer/iroh", rev="c8690a2c6eb5753c4ec6b7e44db72abf09df3c6e", features = ["net"] }
 quinn = "0.10.0"
 kamadak-exif = "0.5.3"
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.139.4"
+version = "1.139.5"
 description = "Deltachat FFI"
 edition = "2018"
 readme = "README.md"
--- a/deltachat-ffi/deltachat.h
+++ b/deltachat-ffi/deltachat.h
@@ -6284,6 +6284,18 @@ void dc_event_unref(dc_event_t* event);

 #define DC_EVENT_WEBXDC_INSTANCE_DELETED          2121

+/**
+ * Data received over an ephemeral peer channel.
+ *
+ * @param data1 (int) msg_id
+ * @param data2 (int) + (char*) binary data.
+ *     length is returned as integer with dc_event_get_data2_int()
+ *     and binary data is returned as dc_event_get_data2_str().
+ *     Binary data must be passed to dc_str_unref() afterwards.
+ */
+
+#define DC_EVENT_WEBXDC_REALTIME_DATA             2150
+
 /**
 * Tells that the Background fetch was completed (or timed out).
 *
@@ -6312,6 +6324,14 @@ void dc_event_unref(dc_event_t* event);

 #define DC_EVENT_CHATLIST_ITEM_CHANGED         2301

+
+/**
+ * Inform that some events have been skipped due to event channel overflow.
+ *
+ * @param data1 (int) number of events that have been skipped
+ */
+#define DC_EVENT_CHANNEL_OVERFLOW              2400
+
 /**
 * @}
 */
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -566,6 +566,7 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
        EventType::AccountsBackgroundFetchDone => 2200,
        EventType::ChatlistChanged => 2300,
        EventType::ChatlistItemChanged { .. } => 2301,
+        EventType::EventChannelOverflow { .. } => 2400,
    }
 }

@@ -624,6 +625,7 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
        EventType::ChatlistItemChanged { chat_id } => {
            chat_id.unwrap_or_default().to_u32() as libc::c_int
        }
+        EventType::EventChannelOverflow { n } => *n as libc::c_int,
    }
 }

@@ -658,13 +660,13 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
        | EventType::ConnectivityChanged
        | EventType::WebxdcInstanceDeleted { .. }
        | EventType::IncomingMsgBunch { .. }
-        | EventType::WebxdcRealtimeData { .. }
        | EventType::SelfavatarChanged
        | EventType::AccountsBackgroundFetchDone
        | EventType::ChatlistChanged
        | EventType::ChatlistItemChanged { .. }
-        | EventType::ConfigSynced { .. } => 0,
-        EventType::ChatModified(_) => 0,
+        | EventType::ConfigSynced { .. }
+        | EventType::ChatModified(_)
+        | EventType::EventChannelOverflow { .. } => 0,
        EventType::MsgsChanged { msg_id, .. }
        | EventType::ReactionsChanged { msg_id, .. }
        | EventType::IncomingMsg { msg_id, .. }
@@ -679,6 +681,7 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
            status_update_serial,
            ..
        } => status_update_serial.to_u32() as libc::c_int,
+        EventType::WebxdcRealtimeData { data, .. } => data.len() as libc::c_int,
    }
 }

@@ -725,12 +728,12 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
        | EventType::SelfavatarChanged
        | EventType::WebxdcStatusUpdate { .. }
        | EventType::WebxdcInstanceDeleted { .. }
-        | EventType::WebxdcRealtimeData { .. }
        | EventType::AccountsBackgroundFetchDone
        | EventType::ChatEphemeralTimerModified { .. }
        | EventType::IncomingMsgBunch { .. }
        | EventType::ChatlistItemChanged { .. }
-        | EventType::ChatlistChanged => ptr::null_mut(),
+        | EventType::ChatlistChanged
+        | EventType::EventChannelOverflow { .. } => ptr::null_mut(),
        EventType::ConfigureProgress { comment, .. } => {
            if let Some(comment) = comment {
                comment.to_c_string().unwrap_or_default().into_raw()
@@ -746,6 +749,11 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
            let data2 = key.to_string().to_c_string().unwrap_or_default();
            data2.into_raw()
        }
+        EventType::WebxdcRealtimeData { data, .. } => {
+            let ptr = libc::malloc(data.len());
+            libc::memcpy(ptr, data.as_ptr() as *mut libc::c_void, data.len());
+            ptr as *mut libc::c_char
+        }
    }
 }

--- a/deltachat-jsonrpc/Cargo.toml
+++ b/deltachat-jsonrpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.139.4"
+version = "1.139.5"
 description = "DeltaChat JSON-RPC API"
 edition = "2021"
 default-run = "deltachat-jsonrpc-server"
--- a/deltachat-jsonrpc/src/api/types/events.rs
+++ b/deltachat-jsonrpc/src/api/types/events.rs
@@ -263,6 +263,9 @@ pub enum EventType {
    /// If `chat_id` is set to None, then all currently visible chats need to be rerendered, and all not-visible items need to be cleared from cache if the UI has a cache.
    #[serde(rename_all = "camelCase")]
    ChatlistItemChanged { chat_id: Option<u32> },
+
+    /// Inform than some events have been skipped due to event channel overflow.
+    EventChannelOverflow { n: u64 },
 }

 impl From<CoreEventType> for EventType {
@@ -378,6 +381,7 @@ impl From<CoreEventType> for EventType {
                chat_id: chat_id.map(|id| id.to_u32()),
            },
            CoreEventType::ChatlistChanged => ChatlistChanged,
+            CoreEventType::EventChannelOverflow { n } => EventChannelOverflow { n },
        }
    }
 }
--- a/deltachat-jsonrpc/typescript/package.json
+++ b/deltachat-jsonrpc/typescript/package.json
@@ -58,5 +58,5 @@
  },
  "type": "module",
  "types": "dist/deltachat.d.ts",
-  "version": "1.139.4"
+  "version": "1.139.5"
 }
--- a/deltachat-repl/Cargo.toml
+++ b/deltachat-repl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-repl"
-version = "1.139.4"
+version = "1.139.5"
 license = "MPL-2.0"
 edition = "2021"
 repository = "https://github.com/deltachat/deltachat-core-rust"
--- a/deltachat-repl/src/cmdline.rs
+++ b/deltachat-repl/src/cmdline.rs
@@ -19,6 +19,7 @@ use deltachat::location;
 use deltachat::log::LogExt;
 use deltachat::message::{self, Message, MessageState, MsgId, Viewtype};
 use deltachat::mimeparser::SystemMessage;
+use deltachat::peer_channels::{send_webxdc_realtime_advertisement, send_webxdc_realtime_data};
 use deltachat::peerstate::*;
 use deltachat::qr::*;
 use deltachat::reaction::send_reaction;
@@ -642,6 +643,30 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
            println!("{cnt} chats");
            println!("{time_needed:?} to create this list");
        }
+        "start-realtime" => {
+            if arg1.is_empty() {
+                bail!("missing msgid");
+            }
+            let msg_id = MsgId::new(arg1.parse()?);
+            let res = send_webxdc_realtime_advertisement(&context, msg_id).await?;
+
+            if let Some(res) = res {
+                println!("waiting for peer channel join");
+                res.await?;
+            }
+            println!("joined peer channel");
+        }
+        "send-realtime" => {
+            if arg1.is_empty() {
+                bail!("missing msgid");
+            }
+            if arg2.is_empty() {
+                bail!("no message");
+            }
+            let msg_id = MsgId::new(arg1.parse()?);
+            send_webxdc_realtime_data(&context, msg_id, arg2.as_bytes().to_vec()).await?;
+            println!("sent realtime message");
+        }
        "chat" => {
            if sel_chat.is_none() && arg1.is_empty() {
                bail!("Argument [chat-id] is missing.");
--- a/deltachat-rpc-client/pyproject.toml
+++ b/deltachat-rpc-client/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat-rpc-client"
-version = "1.139.4"
+version = "1.139.5"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
    "Development Status :: 5 - Production/Stable",
--- a/deltachat-rpc-client/src/deltachat_rpc_client/const.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/const.py
@@ -62,6 +62,7 @@ class EventType(str, Enum):
    CHATLIST_CHANGED = "ChatlistChanged"
    CHATLIST_ITEM_CHANGED = "ChatlistItemChanged"
    CONFIG_SYNCED = "ConfigSynced"
+    WEBXDC_REALTIME_DATA = "WebxdcRealtimeData"


 class ChatId(IntEnum):
--- a/deltachat-rpc-client/src/deltachat_rpc_client/message.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/message.py
@@ -2,7 +2,7 @@ import json
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Optional, Union

-from ._utils import AttrDict
+from ._utils import AttrDict, futuremethod
 from .const import EventType
 from .contact import Contact

@@ -70,3 +70,11 @@ class Message:
            event = self.account.wait_for_event()
            if event.kind == EventType.MSG_DELIVERED and event.msg_id == self.id:
                break
+
+    @futuremethod
+    def send_webxdc_realtime_advertisement(self):
+        yield self._rpc.send_webxdc_realtime_advertisement.future(self.account.id, self.id)
+
+    @futuremethod
+    def send_webxdc_realtime_data(self, data) -> None:
+        yield self._rpc.send_webxdc_realtime_data.future(self.account.id, self.id, list(data))
--- a/deltachat-rpc-client/src/deltachat_rpc_client/rpc.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/rpc.py
@@ -177,7 +177,8 @@ class Rpc:
                account_id = event["contextId"]
                queue = self.get_queue(account_id)
                event = event["event"]
-                logging.debug("account_id=%d got an event %s", account_id, event)
+                # logging.debug("account_id=%d got an event %s", account_id, event)
+                print("account_id=%d got an event %s" % (account_id, event))
                queue.put(event)
        except Exception:
            # Log an exception if the event loop dies.
--- a/deltachat-rpc-client/tests/test_iroh_webxdc.py
+++ b/deltachat-rpc-client/tests/test_iroh_webxdc.py
@@ -0,0 +1,176 @@
+#!/usr/bin/env python3
+"""
+Testing webxdc iroh connectivity
+
+If you want to debug iroh at rust-trace/log level set
+
+    RUST_LOG=iroh_net=trace,iroh_gossip=trace
+"""
+
+import sys
+import threading
+import time
+
+import pytest
+from deltachat_rpc_client import EventType
+
+
+@pytest.fixture()
+def path_to_webxdc(request):
+    p = request.path.parent.parent.parent.joinpath("test-data/webxdc/chess.xdc")
+    assert p.exists()
+    return str(p)
+
+
+def log(msg):
+    print()
+    print("*" * 80 + "\n" + msg + "\n", file=sys.stderr)
+    print()
+
+
+def setup_realtime_webxdc(ac1, ac2, path_to_webxdc):
+    ac1_ac2_chat = ac1.create_chat(ac2)
+    ac2.create_chat(ac1)
+
+    # share a webxdc app between ac1 and ac2
+    ac1_webxdc_msg = ac1_ac2_chat.send_message(text="play", file=path_to_webxdc)
+    ac2_webxdc_msg = ac2.wait_for_incoming_msg()
+    assert ac2_webxdc_msg.get_snapshot().text == "play"
+
+    # send iroh announcements simultaneously
+    log("sending ac1 -> ac2 realtime advertisement and additional message")
+    ac1_webxdc_msg.send_webxdc_realtime_advertisement()
+
+    log("sending ac2 -> ac1 realtime advertisement and additional message")
+    ac2_webxdc_msg.send_webxdc_realtime_advertisement()
+
+    return ac1_webxdc_msg, ac2_webxdc_msg
+
+
+def setup_thread_send_realtime_data(msg, data):
+    def thread_run():
+        for _i in range(10):
+            msg.send_webxdc_realtime_data(data)
+            time.sleep(1)
+
+    threading.Thread(target=thread_run, daemon=True).start()
+
+
+def wait_receive_realtime_data(msg_data_list):
+    account = msg_data_list[0][0].account
+    msg_data_list = msg_data_list[:]
+
+    log(f"account {account.id}: waiting for realtime data {msg_data_list}")
+    while msg_data_list:
+        event = account.wait_for_event()
+        if event.kind == EventType.WEBXDC_REALTIME_DATA:
+            for i, (msg, data) in enumerate(msg_data_list):
+                if msg.id == event.msg_id:
+                    assert data == event.data
+                    log(f"msg {msg.id}: got correct realtime data {data}")
+                    del msg_data_list[i]
+                    break
+
+
+def test_realtime_sequentially(acfactory, path_to_webxdc):
+    """Test two peers trying to establish connection sequentially."""
+    ac1, ac2 = acfactory.get_online_accounts(2)
+    ac1.create_chat(ac2)
+    ac2.create_chat(ac1)
+
+    # share a webxdc app between ac1 and ac2
+    ac1_webxdc_msg = acfactory.send_message(from_account=ac1, to_account=ac2, text="play", file=path_to_webxdc)
+    ac2_webxdc_msg = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id)
+    snapshot = ac2_webxdc_msg.get_snapshot()
+    assert snapshot.text == "play"
+
+    # send iroh announcements sequentially
+    log("sending ac1 -> ac2 realtime advertisement and additional message")
+    ac1_webxdc_msg.send_webxdc_realtime_advertisement()
+    acfactory.send_message(from_account=ac1, to_account=ac2, text="ping1")
+
+    log("waiting for incoming message on ac2")
+    snapshot = ac2.get_message_by_id(ac2.wait_for_incoming_msg_event().msg_id).get_snapshot()
+    assert snapshot.text == "ping1"
+
+    log("sending ac2 -> ac1 realtime advertisement and additional message")
+    ac2_webxdc_msg.send_webxdc_realtime_advertisement()
+    acfactory.send_message(from_account=ac2, to_account=ac1, text="ping2")
+
+    log("waiting for incoming message on ac1")
+    snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
+    assert snapshot.text == "ping2"
+
+    log("sending realtime data ac1 -> ac2")
+    ac1_webxdc_msg.send_webxdc_realtime_data(b"foo")
+
+    log("ac2: waiting for realtime data")
+    while 1:
+        event = ac2.wait_for_event()
+        if event.kind == EventType.WEBXDC_REALTIME_DATA:
+            assert event.data == list(b"foo")
+            break
+
+
+def test_realtime_simultaneously(acfactory, path_to_webxdc):
+    """Test two peers trying to establish connection simultaneously."""
+    ac1, ac2 = acfactory.get_online_accounts(2)
+
+    ac1_webxdc_msg, ac2_webxdc_msg = setup_realtime_webxdc(ac1, ac2, path_to_webxdc)
+
+    setup_thread_send_realtime_data(ac1_webxdc_msg, [10])
+    wait_receive_realtime_data([(ac2_webxdc_msg, [10])])
+
+
+def test_two_parallel_realtime_simultaneously(acfactory, path_to_webxdc):
+    """Test two peers trying to establish connection simultaneously."""
+    ac1, ac2 = acfactory.get_online_accounts(2)
+
+    ac1_webxdc_msg, ac2_webxdc_msg = setup_realtime_webxdc(ac1, ac2, path_to_webxdc)
+    ac1_webxdc_msg2, ac2_webxdc_msg2 = setup_realtime_webxdc(ac1, ac2, path_to_webxdc)
+
+    setup_thread_send_realtime_data(ac1_webxdc_msg, [10])
+    setup_thread_send_realtime_data(ac1_webxdc_msg2, [20])
+    setup_thread_send_realtime_data(ac2_webxdc_msg, [30])
+    setup_thread_send_realtime_data(ac2_webxdc_msg2, [40])
+
+    wait_receive_realtime_data([(ac1_webxdc_msg, [30]), (ac1_webxdc_msg2, [40])])
+    wait_receive_realtime_data([(ac2_webxdc_msg, [10]), (ac2_webxdc_msg2, [20])])
+
+
+def test_no_duplicate_messages(acfactory, path_to_webxdc):
+    """Test that messages are received only once."""
+    ac1, ac2 = acfactory.get_online_accounts(2)
+
+    ac1_ac2_chat = ac1.create_chat(ac2)
+
+    ac1_webxdc_msg = ac1_ac2_chat.send_message(text="webxdc", file=path_to_webxdc)
+
+    ac2_webxdc_msg = ac2.wait_for_incoming_msg()
+    ac2_webxdc_msg.get_snapshot().chat.accept()
+    assert ac2_webxdc_msg.get_snapshot().text == "webxdc"
+
+    # Issue a "send" call in parallel with sending advertisement.
+    # Previously due to a bug this caused subscribing to the channel twice.
+    ac2_webxdc_msg.send_webxdc_realtime_data.future(b"foobar")
+    ac2_webxdc_msg.send_webxdc_realtime_advertisement()
+
+    def thread_run():
+        for i in range(10):
+            data = str(i).encode()
+            ac1_webxdc_msg.send_webxdc_realtime_data(data)
+            time.sleep(1)
+
+    threading.Thread(target=thread_run, daemon=True).start()
+
+    while 1:
+        event = ac2.wait_for_event()
+        if event.kind == EventType.WEBXDC_REALTIME_DATA:
+            n = int(bytes(event.data).decode())
+            break
+
+    while 1:
+        event = ac2.wait_for_event()
+        if event.kind == EventType.WEBXDC_REALTIME_DATA:
+            assert int(bytes(event.data).decode()) > n
+            break
--- a/deltachat-rpc-client/tox.ini
+++ b/deltachat-rpc-client/tox.ini
@@ -28,5 +28,5 @@ commands =

 [pytest]
 timeout = 300
-log_cli = true
+#log_cli = true
 log_level = debug
--- a/deltachat-rpc-server/Cargo.toml
+++ b/deltachat-rpc-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.139.4"
+version = "1.139.5"
 description = "DeltaChat JSON-RPC server"
 edition = "2021"
 readme = "README.md"
--- a/deltachat-rpc-server/npm-package/index.js
+++ b/deltachat-rpc-server/npm-package/index.js
@@ -70,7 +70,7 @@ export async function startDeltaChat(directory, options = {}) {
  const pathToServerBinary = await getRPCServerPath(options);
  const server = spawn(pathToServerBinary, {
    env: {
-      RUST_LOG: process.env.RUST_LOG || "info",
+      RUST_LOG: process.env.RUST_LOG,
      DC_ACCOUNTS_PATH: directory,
    },
    stdio: ["pipe", "pipe", options.muteStdErr ? "ignore" : "inherit"],
--- a/deltachat-rpc-server/npm-package/package.json
+++ b/deltachat-rpc-server/npm-package/package.json
@@ -15,5 +15,5 @@
  },
  "type": "module",
  "types": "index.d.ts",
-  "version": "1.139.4"
+  "version": "1.139.5"
 }
--- a/deny.toml
+++ b/deny.toml
@@ -52,6 +52,7 @@ skip = [
     { name = "getrandom", version = "<0.2" },
     { name = "http-body", version = "0.4.6" },
     { name = "http", version = "0.2.12" },
+     { name = "hyper-rustls", version = "0.24.2" },
     { name = "hyper", version = "0.14.28" },
     { name = "idna", version = "0.4.0" },
     { name = "netlink-packet-core", version = "0.5.0" },
@@ -61,8 +62,6 @@ skip = [
     { name = "pem-rfc7468", version = "0.6.0" },
     { name = "pem", version = "1.1.1" },
     { name = "pkcs8", version = "0.9.0" },
-     { name = "proc-macro-error-attr", version = "0.4.12" },
-     { name = "proc-macro-error", version = "0.4.12" },
     { name = "quick-error", version = "<2.0" },
     { name = "rand_chacha", version = "<0.3" },
     { name = "rand_core", version = "<0.6" },
@@ -71,7 +70,11 @@ skip = [
     { name = "redox_syscall", version = "0.3.5" },
     { name = "regex-automata", version = "0.1.10" },
     { name = "regex-syntax", version = "0.6.29" },
+     { name = "reqwest", version = "0.11.27" },
     { name = "ring", version = "0.16.20" },
+     { name = "rustls-pemfile", version = "1.0.4" },
+     { name = "rustls", version = "0.21.11" },
+     { name = "rustls-webpki", version = "0.101.7" },
     { name = "sec1", version = "0.3.0" },
     { name = "sha2", version = "<0.10" },
     { name = "signature", version = "1.6.4" },
@@ -85,9 +88,11 @@ skip = [
     { name = "system-configuration-sys", version = "0.5.0" },
     { name = "system-configuration", version = "0.5.1" },
     { name = "time", version = "<0.3" },
+     { name = "tokio-rustls", version = "0.24.1" },
     { name = "toml_edit", version = "0.21.1" },
     { name = "untrusted", version = "0.7.1" },
     { name = "wasi", version = "<0.11" },
+     { name = "webpki-roots", version ="0.25.4" },
     { name = "windows_aarch64_gnullvm", version = "<0.52" },
     { name = "windows_aarch64_msvc", version = "<0.52" },
     { name = "windows-core", version = "<0.54.0" },
@@ -101,6 +106,7 @@ skip = [
     { name = "windows_x86_64_gnu", version = "<0.52" },
     { name = "windows_x86_64_msvc", version = "<0.52" },
     { name = "winnow", version = "0.5.40" },
+     { name = "winreg", version = "0.50.0" },
     { name = "x509-parser", version = "<0.16.0" },
 ]

@@ -133,4 +139,5 @@ license-files = [
 github = [
       "async-email",
       "deltachat",
+       "n0-computer",
 ]
--- a/node/constants.js
+++ b/node/constants.js
@@ -30,6 +30,7 @@ module.exports = {
  DC_DOWNLOAD_IN_PROGRESS: 1000,
  DC_DOWNLOAD_UNDECIPHERABLE: 30,
  DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE: 2200,
+  DC_EVENT_CHANNEL_OVERFLOW: 2400,
  DC_EVENT_CHATLIST_CHANGED: 2300,
  DC_EVENT_CHATLIST_ITEM_CHANGED: 2301,
  DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED: 2021,
@@ -66,6 +67,7 @@ module.exports = {
  DC_EVENT_SMTP_MESSAGE_SENT: 103,
  DC_EVENT_WARNING: 300,
  DC_EVENT_WEBXDC_INSTANCE_DELETED: 2121,
+  DC_EVENT_WEBXDC_REALTIME_DATA: 2150,
  DC_EVENT_WEBXDC_STATUS_UPDATE: 2120,
  DC_GCL_ADD_ALLDONE_HINT: 4,
  DC_GCL_ADD_SELF: 2,
--- a/node/events.js
+++ b/node/events.js
@@ -37,7 +37,9 @@ module.exports = {
  2111: 'DC_EVENT_CONFIG_SYNCED',
  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
  2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED',
+  2150: 'DC_EVENT_WEBXDC_REALTIME_DATA',
  2200: 'DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE',
  2300: 'DC_EVENT_CHATLIST_CHANGED',
-  2301: 'DC_EVENT_CHATLIST_ITEM_CHANGED'
+  2301: 'DC_EVENT_CHATLIST_ITEM_CHANGED',
+  2400: 'DC_EVENT_CHANNEL_OVERFLOW'
 }
--- a/node/lib/constants.ts
+++ b/node/lib/constants.ts
@@ -30,6 +30,7 @@ export enum C {
  DC_DOWNLOAD_IN_PROGRESS = 1000,
  DC_DOWNLOAD_UNDECIPHERABLE = 30,
  DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE = 2200,
+  DC_EVENT_CHANNEL_OVERFLOW = 2400,
  DC_EVENT_CHATLIST_CHANGED = 2300,
  DC_EVENT_CHATLIST_ITEM_CHANGED = 2301,
  DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED = 2021,
@@ -66,6 +67,7 @@ export enum C {
  DC_EVENT_SMTP_MESSAGE_SENT = 103,
  DC_EVENT_WARNING = 300,
  DC_EVENT_WEBXDC_INSTANCE_DELETED = 2121,
+  DC_EVENT_WEBXDC_REALTIME_DATA = 2150,
  DC_EVENT_WEBXDC_STATUS_UPDATE = 2120,
  DC_GCL_ADD_ALLDONE_HINT = 4,
  DC_GCL_ADD_SELF = 2,
@@ -338,7 +340,9 @@ export const EventId2EventName: { [key: number]: string } = {
  2111: 'DC_EVENT_CONFIG_SYNCED',
  2120: 'DC_EVENT_WEBXDC_STATUS_UPDATE',
  2121: 'DC_EVENT_WEBXDC_INSTANCE_DELETED',
+  2150: 'DC_EVENT_WEBXDC_REALTIME_DATA',
  2200: 'DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE',
  2300: 'DC_EVENT_CHATLIST_CHANGED',
  2301: 'DC_EVENT_CHATLIST_ITEM_CHANGED',
+  2400: 'DC_EVENT_CHANNEL_OVERFLOW',
 }
--- a/package.json
+++ b/package.json
@@ -55,5 +55,5 @@
    "test:mocha": "mocha node/test/test.mjs --growl --reporter=spec --bail --exit"
  },
  "types": "node/dist/index.d.ts",
-  "version": "1.139.4"
+  "version": "1.139.5"
 }
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "deltachat"
-version = "1.139.4"
+version = "1.139.5"
 description = "Python bindings for the Delta Chat Core library using CFFI against the Rust-implemented libdeltachat"
 readme = "README.rst"
 requires-python = ">=3.7"
--- a/release-date.in
+++ b/release-date.in
@@ -1 +1 @@
-2024-05-21
+2024-05-23
--- a/src/blob.rs
+++ b/src/blob.rs
@@ -1191,6 +1191,21 @@ mod tests {
        .await
        .unwrap();

+        send_image_check_mediaquality(
+            Viewtype::File,
+            Some("1"),
+            bytes,
+            "png",
+            false, // no Exif
+            1920,
+            1080,
+            0,
+            1920,
+            1080,
+        )
+        .await
+        .unwrap();
+
        // This will be sent as Image, see [`BlobObject::maybe_sticker`] for explanation.
        send_image_check_mediaquality(
            Viewtype::Sticker,
@@ -1321,6 +1336,11 @@ mod tests {
            .get_blobdir()
            .join("saved-".to_string() + &bob_msg.get_filename().unwrap());
        bob_msg.save_file(&bob, &file_saved).await?;
+        if viewtype == Viewtype::File {
+            assert_eq!(file_saved.extension().unwrap(), extension);
+            let bytes1 = fs::read(&file_saved).await?;
+            assert_eq!(&bytes1, bytes);
+        }

        let blob = BlobObject::new_from_path(&bob, &file_saved).await?;
        let (_, exif) = blob.metadata()?;
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -2619,6 +2619,7 @@ async fn prepare_msg_blob(context: &Context, msg: &mut Message) -> Result<()> {
            .get_blob(Param::File, context, !msg.is_increation())
            .await?
            .with_context(|| format!("attachment missing for message of type #{}", msg.viewtype))?;
+        let send_as_is = msg.viewtype == Viewtype::File;

        if msg.viewtype == Viewtype::File || msg.viewtype == Viewtype::Image {
            // Correct the type, take care not to correct already very special
@@ -2645,8 +2646,9 @@ async fn prepare_msg_blob(context: &Context, msg: &mut Message) -> Result<()> {
        }

        let mut maybe_sticker = msg.viewtype == Viewtype::Sticker;
-        if msg.viewtype == Viewtype::Image
-            || maybe_sticker && !msg.param.exists(Param::ForceSticker)
+        if !send_as_is
+            && (msg.viewtype == Viewtype::Image
+                || maybe_sticker && !msg.param.exists(Param::ForceSticker))
        {
            blob.recode_to_image_size(context, &mut maybe_sticker)
                .await?;
--- a/src/events.rs
+++ b/src/events.rs
@@ -71,16 +71,13 @@ impl EventEmitter {
    /// [`try_recv`]: Self::try_recv
    pub async fn recv(&self) -> Option<Event> {
        let mut lock = self.0.lock().await;
-        loop {
-            match lock.recv().await {
-                Err(async_broadcast::RecvError::Overflowed(_)) => {
-                    // Some events have been lost,
-                    // but the channel is not closed.
-                    continue;
-                }
-                Err(async_broadcast::RecvError::Closed) => return None,
-                Ok(event) => return Some(event),
-            }
+        match lock.recv().await {
+            Err(async_broadcast::RecvError::Overflowed(n)) => Some(Event {
+                id: 0,
+                typ: EventType::EventChannelOverflow { n },
+            }),
+            Err(async_broadcast::RecvError::Closed) => None,
+            Ok(event) => Some(event),
        }
    }

@@ -96,17 +93,18 @@ impl EventEmitter {
        // to avoid blocking
        // in case there is a concurrent call to `recv`.
        let mut lock = self.0.try_lock()?;
-        loop {
-            match lock.try_recv() {
-                Err(async_broadcast::TryRecvError::Overflowed(_)) => {
-                    // Some events have been lost,
-                    // but the channel is not closed.
-                    continue;
-                }
-                res @ (Err(async_broadcast::TryRecvError::Empty)
-                | Err(async_broadcast::TryRecvError::Closed)
-                | Ok(_)) => return Ok(res?),
+        match lock.try_recv() {
+            Err(async_broadcast::TryRecvError::Overflowed(n)) => {
+                // Some events have been lost,
+                // but the channel is not closed.
+                Ok(Event {
+                    id: 0,
+                    typ: EventType::EventChannelOverflow { n },
+                })
            }
+            res @ (Err(async_broadcast::TryRecvError::Empty)
+            | Err(async_broadcast::TryRecvError::Closed)
+            | Ok(_)) => Ok(res?),
        }
    }
 }
--- a/src/events/payload.rs
+++ b/src/events/payload.rs
@@ -315,4 +315,10 @@ pub enum EventType {
    /// Event for using in tests, e.g. as a fence between normally generated events.
    #[cfg(test)]
    Test,
+
+    /// Inform than some events have been skipped due to event channel overflow.
+    EventChannelOverflow {
+        /// Number of events skipped.
+        n: u64,
+    },
 }
--- a/src/peer_channels.rs
+++ b/src/peer_channels.rs
@@ -25,10 +25,11 @@

 use anyhow::{anyhow, Context as _, Result};
 use email::Header;
+use futures_lite::StreamExt;
 use iroh_gossip::net::{Gossip, JoinTopicFut, GOSSIP_ALPN};
 use iroh_gossip::proto::{Event as IrohEvent, TopicId};
 use iroh_net::relay::{RelayMap, RelayUrl};
-use iroh_net::{key::SecretKey, relay::RelayMode, MagicEndpoint};
+use iroh_net::{key::SecretKey, relay::RelayMode, Endpoint};
 use iroh_net::{NodeAddr, NodeId};
 use std::collections::{BTreeSet, HashMap};
 use std::env;
@@ -50,8 +51,8 @@ const PUBLIC_KEY_STUB: &[u8] = "static_string".as_bytes();
 /// Store iroh peer channels for the context.
 #[derive(Debug)]
 pub struct Iroh {
-    /// [MagicEndpoint] needed for iroh peer channels.
-    pub(crate) endpoint: MagicEndpoint,
+    /// [Endpoint] needed for iroh peer channels.
+    pub(crate) endpoint: Endpoint,

    /// [Gossip] needed for iroh peer channels.
    pub(crate) gossip: Gossip,
@@ -80,7 +81,14 @@ impl Iroh {
        msg_id: MsgId,
    ) -> Result<Option<JoinTopicFut>> {
        let topic = get_iroh_topic_for_msg(ctx, msg_id).await?;
-        let seq = if let Some(channel_state) = self.iroh_channels.read().await.get(&topic) {
+
+        // Take exclusive lock to make sure
+        // no other thread can create a second gossip subscription
+        // after we check that it does not exist and before we create a new one.
+        // Otherwise we would receive every message twice or more times.
+        let mut iroh_channels = self.iroh_channels.write().await;
+
+        let seq = if let Some(channel_state) = iroh_channels.get(&topic) {
            if channel_state.subscribe_loop.is_some() {
                return Ok(None);
            }
@@ -114,14 +122,26 @@ impl Iroh {
            }
        });

-        self.iroh_channels
-            .write()
-            .await
-            .insert(topic, ChannelState::new(seq, subscribe_loop));
+        iroh_channels.insert(topic, ChannelState::new(seq, subscribe_loop));

        Ok(Some(connect_future))
    }

+    /// Add gossip peers to realtime channel if it is already active.
+    pub async fn maybe_add_gossip_peers(&self, topic: TopicId, peers: Vec<NodeAddr>) -> Result<()> {
+        if let Some(state) = self.iroh_channels.read().await.get(&topic) {
+            if state.subscribe_loop.is_some() {
+                for peer in &peers {
+                    self.endpoint.add_node_addr(peer.clone())?;
+                }
+                self.gossip
+                    .join(topic, peers.into_iter().map(|peer| peer.node_id).collect())
+                    .await?;
+            }
+        }
+        Ok(())
+    }
+
    /// Send realtime data to the gossip swarm.
    pub async fn send_webxdc_realtime_data(
        &self,
@@ -138,10 +158,6 @@ impl Iroh {

        self.gossip.broadcast(topic, data.into()).await?;

-        if env::var("REALTIME_DEBUG").is_ok() {
-            info!(ctx, "Sent realtime data");
-        }
-
        Ok(())
    }

@@ -210,7 +226,7 @@ impl Context {
            RelayMode::Default
        };

-        let endpoint = MagicEndpoint::builder()
+        let endpoint = Endpoint::builder()
            .secret_key(secret_key.clone())
            .alpns(vec![GOSSIP_ALPN.to_vec()])
            .relay_mode(relay_mode)
@@ -227,6 +243,15 @@ impl Context {
        // Shuts down on deltachat shutdown
        tokio::spawn(endpoint_loop(context, endpoint.clone(), gossip.clone()));

+        let endp = endpoint.clone();
+        let gsp = gossip.clone();
+        tokio::spawn(async move {
+            let mut stream = endp.local_endpoints();
+            while let Some(endpoints) = stream.next().await {
+                gsp.update_endpoints(&endpoints)?;
+            }
+            anyhow::Ok(())
+        });
        Ok(Iroh {
            endpoint,
            gossip,
@@ -328,7 +353,9 @@ pub async fn send_webxdc_realtime_advertisement(
    msg.param.set_cmd(SystemMessage::IrohNodeAddr);
    msg.in_reply_to = Some(webxdc.rfc724_mid.clone());
    send_msg(ctx, webxdc.chat_id, &mut msg).await?;
-    info!(ctx, "IROH_REALTIME: Sent realtime advertisement");
+    if env::var("REALTIME_DEBUG").is_ok() {
+        info!(ctx, "IROH_REALTIME: Sent realtime advertisement");
+    }
    Ok(conn)
 }

@@ -344,6 +371,7 @@ pub async fn leave_webxdc_realtime(ctx: &Context, msg_id: MsgId) -> Result<()> {
    let iroh = ctx.get_or_try_init_peer_channel().await?;
    iroh.leave_realtime(get_iroh_topic_for_msg(ctx, msg_id).await?)
        .await?;
+
    info!(ctx, "IROH_REALTIME: Left gossip for message {msg_id}");

    Ok(())
@@ -365,7 +393,7 @@ pub(crate) async fn create_iroh_header(
    ))
 }

-async fn endpoint_loop(context: Context, endpoint: MagicEndpoint, gossip: Gossip) {
+async fn endpoint_loop(context: Context, endpoint: Endpoint, gossip: Gossip) {
    while let Some(conn) = endpoint.accept().await {
        info!(context, "IROH_REALTIME: accepting iroh connection");
        let gossip = gossip.clone();
@@ -380,12 +408,12 @@ async fn endpoint_loop(context: Context, endpoint: MagicEndpoint, gossip: Gossip

 async fn handle_connection(
    context: &Context,
-    mut conn: iroh_net::magic_endpoint::Connecting,
+    mut conn: iroh_net::endpoint::Connecting,
    gossip: Gossip,
 ) -> anyhow::Result<()> {
    let alpn = conn.alpn().await?;
    let conn = conn.await?;
-    let peer_id = iroh_net::magic_endpoint::get_remote_node_id(&conn)?;
+    let peer_id = iroh_net::endpoint::get_remote_node_id(&conn)?;

    match alpn.as_bytes() {
        GOSSIP_ALPN => gossip
@@ -411,11 +439,12 @@ async fn subscribe_loop(
        let event = stream.recv().await?;
        match event {
            IrohEvent::NeighborUp(node) => {
-                info!(context, "IROH_REALTIME: NeighborUp: {}", node.to_string());
                iroh_add_peer_for_topic(context, msg_id, topic, node, None).await?;
            }
            IrohEvent::Received(event) => {
-                info!(context, "IROH_REALTIME: Received realtime data");
+                if env::var("REALTIME_DEBUG").is_ok() {
+                    info!(context, "IROH_REALTIME: Received realtime data");
+                }
                context.emit_event(EventType::WebxdcRealtimeData {
                    msg_id,
                    data: event
@@ -432,13 +461,10 @@ async fn subscribe_loop(

 #[cfg(test)]
 mod tests {
+    use super::*;
    use crate::{
        chat::send_msg,
        message::{Message, Viewtype},
-        peer_channels::{
-            get_iroh_gossip_peers, get_iroh_topic_for_msg, leave_webxdc_realtime,
-            send_webxdc_realtime_advertisement,
-        },
        test_utils::TestContextManager,
        EventType,
    };
@@ -708,4 +734,73 @@ mod tests {
            false
        });
    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_parallel_connect() {
+        let mut tcm = TestContextManager::new();
+        let alice = &mut tcm.alice().await;
+        let bob = &mut tcm.bob().await;
+
+        // Alice sends webxdc to bob
+        let alice_chat = alice.create_chat(bob).await;
+        let mut instance = Message::new(Viewtype::File);
+        instance
+            .set_file_from_bytes(
+                alice,
+                "minimal.xdc",
+                include_bytes!("../test-data/webxdc/minimal.xdc"),
+                None,
+            )
+            .await
+            .unwrap();
+        send_msg(alice, alice_chat.id, &mut instance).await.unwrap();
+        let alice_webxdc = alice.get_last_msg().await;
+
+        let webxdc = alice.pop_sent_msg().await;
+        let bob_webxdc = bob.recv_msg(&webxdc).await;
+        assert_eq!(bob_webxdc.get_viewtype(), Viewtype::Webxdc);
+
+        bob_webxdc.chat_id.accept(bob).await.unwrap();
+
+        eprintln!("Sending advertisements");
+        // Alice advertises herself.
+        let alice_advertisement_future = send_webxdc_realtime_advertisement(alice, alice_webxdc.id)
+            .await
+            .unwrap()
+            .unwrap();
+        let alice_advertisement = alice.pop_sent_msg().await;
+
+        send_webxdc_realtime_advertisement(bob, bob_webxdc.id)
+            .await
+            .unwrap();
+        let bob_advertisement = bob.pop_sent_msg().await;
+
+        eprintln!("Receiving advertisements");
+        bob.recv_msg_trash(&alice_advertisement).await;
+        alice.recv_msg_trash(&bob_advertisement).await;
+
+        eprintln!("Alice waits for connection");
+        alice_advertisement_future.await.unwrap();
+
+        // Alice sends ephemeral message
+        eprintln!("Sending ephemeral message");
+        send_webxdc_realtime_data(alice, alice_webxdc.id, b"alice -> bob".into())
+            .await
+            .unwrap();
+
+        eprintln!("Waiting for ephemeral message");
+        loop {
+            let event = bob.evtracker.recv().await.unwrap();
+            if let EventType::WebxdcRealtimeData { data, .. } = event.typ {
+                if data == b"alice -> bob" {
+                    break;
+                } else {
+                    panic!(
+                        "Unexpected status update: {}",
+                        String::from_utf8_lossy(&data)
+                    );
+                }
+            }
+        }
+    }
 }
--- a/src/receive_imf.rs
+++ b/src/receive_imf.rs
@@ -1433,7 +1433,8 @@ async fn add_parts(
                let relay_server = node_addr.relay_url().map(|relay| relay.as_str());
                let topic = get_iroh_topic_for_msg(context, instance_id).await?;
                iroh_add_peer_for_topic(context, instance_id, topic, node_id, relay_server).await?;
-
+                let iroh = context.get_or_try_init_peer_channel().await?;
+                iroh.maybe_add_gossip_peers(topic, vec![node_addr]).await?;
                chat_id = DC_CHAT_ID_TRASH;
            }
            Err(err) => {
--- a/src/scheduler.rs
+++ b/src/scheduler.rs
@@ -407,7 +407,7 @@ async fn inbox_loop(
            } else {
                match connection.prepare(&ctx).await {
                    Err(err) => {
-                        warn!(ctx, "Failed to prepare connection: {:#}.", err);
+                        warn!(ctx, "Failed to prepare INBOX connection: {:#}.", err);
                        continue;
                    }
                    Ok(session) => session,
@@ -714,7 +714,10 @@ async fn simple_imap_loop(
            } else {
                match connection.prepare(&ctx).await {
                    Err(err) => {
-                        warn!(ctx, "Failed to prepare connection: {:#}.", err);
+                        warn!(
+                            ctx,
+                            "Failed to prepare {folder_meaning} connection: {err:#}."
+                        );
                        continue;
                    }
                    Ok(session) => session,
--- a/src/securejoin.rs
+++ b/src/securejoin.rs
@@ -757,9 +757,9 @@ mod tests {
    use deltachat_contact_tools::{ContactAddress, EmailAddress};

    use super::*;
-    use crate::chat::remove_contact_from_chat;
+    use crate::chat::{remove_contact_from_chat, CantSendReason};
    use crate::chatlist::Chatlist;
-    use crate::constants::Chattype;
+    use crate::constants::{self, Chattype};
    use crate::imex::{imex, ImexMode};
    use crate::receive_imf::receive_imf;
    use crate::stock_str::{self, chat_protection_enabled};
@@ -774,6 +774,7 @@ mod tests {
        Normal,
        CheckProtectionTimestamp,
        WrongAliceGossip,
+        SecurejoinWaitTimeout,
    }

    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
@@ -791,6 +792,11 @@ mod tests {
        test_setup_contact_ex(SetupContactCase::WrongAliceGossip).await
    }

+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_setup_contact_wait_timeout() {
+        test_setup_contact_ex(SetupContactCase::SecurejoinWaitTimeout).await
+    }
+
    async fn test_setup_contact_ex(case: SetupContactCase) {
        let mut tcm = TestContextManager::new();
        let alice = tcm.alice().await;
@@ -850,9 +856,21 @@ mod tests {
            msg.get_header(HeaderDef::SecureJoin).unwrap(),
            "vc-auth-required"
        );
+        let bob_chat = bob.create_chat(&alice).await;
+        assert_eq!(bob_chat.can_send(&bob).await.unwrap(), false);
+        assert_eq!(
+            bob_chat.why_cant_send(&bob).await.unwrap(),
+            Some(CantSendReason::SecurejoinWait)
+        );
+        if case == SetupContactCase::SecurejoinWaitTimeout {
+            SystemTime::shift(Duration::from_secs(constants::SECUREJOIN_WAIT_TIMEOUT));
+            assert_eq!(bob_chat.can_send(&bob).await.unwrap(), true);
+        }

        // Step 4: Bob receives vc-auth-required, sends vc-request-with-auth
        bob.recv_msg_trash(&sent).await;
+        let bob_chat = bob.create_chat(&alice).await;
+        assert_eq!(bob_chat.can_send(&bob).await.unwrap(), true);

        // Check Bob emitted the JoinerProgress event.
        let event = bob
@@ -986,12 +1004,36 @@ mod tests {
        bob.recv_msg_trash(&sent).await;
        assert_eq!(contact_alice.is_verified(&bob.ctx).await.unwrap(), true);

-        // Check Bob got the verified message in his 1:1 chat.
-        let chat = bob.create_chat(&alice).await;
-        let msg = get_chat_msg(&bob, chat.get_id(), 0, 2).await;
+        if case != SetupContactCase::SecurejoinWaitTimeout {
+            // Later we check that the timeout message isn't added to the already protected chat.
+            SystemTime::shift(Duration::from_secs(constants::SECUREJOIN_WAIT_TIMEOUT + 1));
+            assert_eq!(
+                bob_chat
+                    .check_securejoin_wait(&bob, constants::SECUREJOIN_WAIT_TIMEOUT)
+                    .await
+                    .unwrap(),
+                0
+            );
+        }
+
+        // Check Bob got expected info messages in his 1:1 chat.
+        let msg_cnt: usize = match case {
+            SetupContactCase::SecurejoinWaitTimeout => 3,
+            _ => 2,
+        };
+        let mut i = 0..msg_cnt;
+        let msg = get_chat_msg(&bob, bob_chat.get_id(), i.next().unwrap(), msg_cnt).await;
        assert!(msg.is_info());
        assert_eq!(msg.get_text(), stock_str::securejoin_wait(&bob).await);
-        let msg = get_chat_msg(&bob, chat.get_id(), 1, 2).await;
+        if case == SetupContactCase::SecurejoinWaitTimeout {
+            let msg = get_chat_msg(&bob, bob_chat.get_id(), i.next().unwrap(), msg_cnt).await;
+            assert!(msg.is_info());
+            assert_eq!(
+                msg.get_text(),
+                stock_str::securejoin_wait_timeout(&bob).await
+            );
+        }
+        let msg = get_chat_msg(&bob, bob_chat.get_id(), i.next().unwrap(), msg_cnt).await;
        assert!(msg.is_info());
        assert_eq!(msg.get_text(), chat_protection_enabled(&bob).await);
    }
Author	SHA1	Message	Date
link2xt	37c771d342	temporarily replace logging with print	2024-05-25 05:52:07 +00:00
Septias	72df9504ad	optimize logs	2024-05-25 05:52:07 +00:00
Sebastian Klähn	c68008aa04	feat(peer_channels): call update_endpoints	2024-05-25 05:52:07 +00:00
link2xt	d8f3368b3c	chore: fix python lint	2024-05-25 05:51:37 +00:00
link2xt	5755fe7bef	test(deltachat-rpc-client): regression test for double gossip subscription	2024-05-25 05:46:55 +00:00
link2xt	4f071e3b31	fix: acquire write lock on iroh_channels before checking for subscribe_loop	2024-05-25 05:46:55 +00:00
holger krekel	f4dfc79808	test(deltachat-rpc-client): add realtime channel tests Co-authored-by: link2xt <link2xt@testrun.org>	2024-05-25 05:46:55 +00:00
link2xt	518d5bc4c7	refactor: log IMAP connection type on connection failure Otherwise it is impossible to distinguish between failure to establish INBOX and DeltaChat folder connections in the logs.	2024-05-24 00:13:56 +00:00
link2xt	0e1f62a38d	build: update `iroh` to the git version This fixes the problem with simultaneous connections in iroh-gossip: <https://github.com/n0-computer/iroh/pull/2318>	2024-05-23 22:58:45 +00:00
iequidoo	af4b59fe0a	test: Viewtype::File attachments are sent unchanged and preserve extensions	2024-05-23 17:10:52 -03:00
link2xt	8c3c0484ed	fix(@deltachat/stdio-rpc-server): do not set RUST_LOG to "info" by default `info` enables info level logging for all libraries, e.g. iroh starts printing very verbose logs to stderr this way.	2024-05-23 15:50:29 +00:00
link2xt	97828234dd	chore(release): prepare for 1.139.5	2024-05-23 13:15:08 +00:00
iequidoo	20e64c71f8	test: "SecureJoin wait" state and info messages	2024-05-23 14:36:13 +02:00
iequidoo	2214d140c3	fix: Don't recode images in `Viewtype::File` messages (#5617 )	2024-05-23 14:35:38 +02:00
link2xt	907d3efcd0	api(deltachat-rpc-client): add Message.send_webxdc_realtime_data()	2024-05-21 22:15:49 +00:00
link2xt	9573e02c32	api(deltachat-rpc-client): add Message.send_webxdc_realtime_advertisement()	2024-05-21 22:15:49 +00:00
Sebastian Klähn	8cb699290a	fix: connect to peers that advertise to you	2024-05-21 22:12:23 +00:00
Friedel Ziegelmayer	31d7b4f9ce	feat(deltachat-repl): add start-realtime and send-realtime commands	2024-05-21 22:11:22 +00:00
link2xt	2e5ad3f3a0	test(peer_channels): add test_parallel_connect()	2024-05-21 22:10:15 +00:00
holger krekel	5d3d5d23a1	api(deltachat-rpc-client): add EventType.WEBXDC_REALTIME_DATA constant	2024-05-21 22:10:15 +00:00
link2xt	469ff799ad	api: add event channel overflow event	2024-05-21 22:05:48 +00:00
link2xt	18f2a09b35	api(deltachat-ffi): make WebXdcRealtimeData data usable in CFFI Previously only msg_id was returned to CFFI without any way to get to the actual received data.	2024-05-21 22:05:34 +00:00
@@ -1 +1 @@
 -05-21
 -05-23