Compare commits

..

2 Commits

Author SHA1 Message Date
timedout 0f5ffd8676 fix: Helps when you refer to variables that exist 2026-03-09 16:43:09 +00:00
timedout dbe024f645 feat: Add debug logs to pusher service 2026-03-09 16:37:51 +00:00
14 changed files with 53 additions and 37 deletions
Generated
+11 -11
View File
@@ -905,7 +905,7 @@ dependencies = [
[[package]]
name = "conduwuit"
version = "0.5.7-alpha.1"
version = "0.5.6"
dependencies = [
"clap",
"conduwuit_admin",
@@ -937,7 +937,7 @@ dependencies = [
[[package]]
name = "conduwuit_admin"
version = "0.5.7-alpha.1"
version = "0.5.6"
dependencies = [
"clap",
"conduwuit_api",
@@ -958,7 +958,7 @@ dependencies = [
[[package]]
name = "conduwuit_api"
version = "0.5.7-alpha.1"
version = "0.5.6"
dependencies = [
"async-trait",
"axum",
@@ -990,14 +990,14 @@ dependencies = [
[[package]]
name = "conduwuit_build_metadata"
version = "0.5.7-alpha.1"
version = "0.5.6"
dependencies = [
"built",
]
[[package]]
name = "conduwuit_core"
version = "0.5.7-alpha.1"
version = "0.5.6"
dependencies = [
"argon2",
"arrayvec",
@@ -1059,7 +1059,7 @@ dependencies = [
[[package]]
name = "conduwuit_database"
version = "0.5.7-alpha.1"
version = "0.5.6"
dependencies = [
"async-channel",
"conduwuit_core",
@@ -1077,7 +1077,7 @@ dependencies = [
[[package]]
name = "conduwuit_macros"
version = "0.5.7-alpha.1"
version = "0.5.6"
dependencies = [
"itertools 0.14.0",
"proc-macro2",
@@ -1087,7 +1087,7 @@ dependencies = [
[[package]]
name = "conduwuit_router"
version = "0.5.7-alpha.1"
version = "0.5.6"
dependencies = [
"axum",
"axum-client-ip",
@@ -1121,7 +1121,7 @@ dependencies = [
[[package]]
name = "conduwuit_service"
version = "0.5.7-alpha.1"
version = "0.5.6"
dependencies = [
"askama",
"async-trait",
@@ -1163,7 +1163,7 @@ dependencies = [
[[package]]
name = "conduwuit_web"
version = "0.5.7-alpha.1"
version = "0.5.6"
dependencies = [
"askama",
"axum",
@@ -6538,7 +6538,7 @@ dependencies = [
[[package]]
name = "xtask"
version = "0.5.7-alpha.1"
version = "0.5.6"
dependencies = [
"askama",
"cargo_metadata",
+1 -1
View File
@@ -12,7 +12,7 @@ license = "Apache-2.0"
# See also `rust-toolchain.toml`
readme = "README.md"
repository = "https://forgejo.ellis.link/continuwuation/continuwuity"
version = "0.5.7-alpha.1"
version = "0.5.6"
[workspace.metadata.crane]
name = "conduwuit"
+3
View File
@@ -109,6 +109,9 @@ Restart Continuwuity and your reverse proxy. Once that's done, visit these route
{
"m.homeserver": {
"base_url": "https://matrix.example.com/"
},
"org.matrix.msc3575.proxy": {
"url": "https://matrix.example.com/"
}
}
```
@@ -6,7 +6,6 @@ services:
### then you are ready to go.
image: forgejo.ellis.link/continuwuation/continuwuity:latest
restart: unless-stopped
command: /sbin/conduwuit
volumes:
- db:/var/lib/continuwuity
#- ./continuwuity.toml:/etc/continuwuity.toml
@@ -23,7 +23,6 @@ services:
### then you are ready to go.
image: forgejo.ellis.link/continuwuation/continuwuity:latest
restart: unless-stopped
command: /sbin/conduwuit
volumes:
- db:/var/lib/continuwuity
- /etc/resolv.conf:/etc/resolv.conf:ro # Use the host's DNS resolver rather than Docker's.
@@ -6,7 +6,6 @@ services:
### then you are ready to go.
image: forgejo.ellis.link/continuwuation/continuwuity:latest
restart: unless-stopped
command: /sbin/conduwuit
volumes:
- db:/var/lib/continuwuity
- /etc/resolv.conf:/etc/resolv.conf:ro # Use the host's DNS resolver rather than Docker's.
-1
View File
@@ -6,7 +6,6 @@ services:
### then you are ready to go.
image: forgejo.ellis.link/continuwuation/continuwuity:latest
restart: unless-stopped
command: /sbin/conduwuit
ports:
- 8448:6167
volumes:
+2 -2
View File
@@ -78,7 +78,7 @@ docker run -d \
-e CONTINUWUITY_ALLOW_REGISTRATION="false" \
--name continuwuity \
forgejo.ellis.link/continuwuation/continuwuity:latest \
/sbin/conduwuit --execute "users create-user admin"
--execute "users create-user admin"
```
Replace `matrix.example.com` with your actual server name and `admin` with
@@ -141,7 +141,7 @@ compose file, add under the `continuwuity` service:
services:
continuwuity:
image: forgejo.ellis.link/continuwuation/continuwuity:latest
command: /sbin/conduwuit --execute "users create-user admin"
command: --execute "users create-user admin"
# ... rest of configuration
```
-1
View File
@@ -39,7 +39,6 @@ spec:
- name: continuwuity
# use a sha hash <3
image: forgejo.ellis.link/continuwuation/continuwuity:latest
command: ["/sbin/conduwuit"]
imagePullPolicy: IfNotPresent
ports:
- name: http
+1 -1
View File
@@ -1 +1 @@
{"m.homeserver":{"base_url": "https://matrix.continuwuity.org"},"org.matrix.msc4143.rtc_foci":[{"type":"livekit","livekit_service_url":"https://livekit.ellis.link"}]}
{"m.homeserver":{"base_url": "https://matrix.continuwuity.org"},"org.matrix.msc3575.proxy":{"url": "https://matrix.continuwuity.org"},"org.matrix.msc4143.rtc_foci":[{"type":"livekit","livekit_service_url":"https://livekit.ellis.link"}]}
+3 -11
View File
@@ -1,6 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:recommended", "replacements:all", ":semanticCommitTypeAll(chore)"],
"extends": ["config:recommended", "replacements:all"],
"dependencyDashboard": true,
"osvVulnerabilityAlerts": true,
"lockFileMaintenance": {
@@ -36,18 +36,10 @@
},
"packageRules": [
{
"description": "Batch minor and patch Rust dependency updates",
"matchManagers": ["cargo"],
"matchUpdateTypes": ["minor", "patch"],
"matchCurrentVersion": ">=1.0.0",
"groupName": "rust-non-major"
},
{
"description": "Batch patch-level zerover Rust dependency updates",
"description": "Batch patch-level Rust dependency updates",
"matchManagers": ["cargo"],
"matchUpdateTypes": ["patch"],
"matchCurrentVersion": ">=0.1.0,<1.0.0",
"groupName": "rust-zerover-patch-updates"
"groupName": "rust-patch-updates"
},
{
"description": "Limit concurrent Cargo PRs",
+2 -1
View File
@@ -1,4 +1,5 @@
use std::{
env::args,
iter::once,
sync::{
Arc, OnceLock,
@@ -18,7 +19,7 @@ use tokio::runtime::Builder;
use crate::{clap::Args, server::Server};
const WORKER_NAME: &str = "conduwuit:worker";
const WORKER_NAME: &str = "c10y:worker";
const WORKER_MIN: usize = 2;
const WORKER_KEEPALIVE: u64 = 36;
const MAX_BLOCKING_THREADS: usize = 1024;
+29 -4
View File
@@ -1,7 +1,7 @@
use std::{fmt::Debug, mem, sync::Arc};
use bytes::BytesMut;
use conduwuit::utils::response::LimitReadExt;
use conduwuit::{debug, debug_info, utils::response::LimitReadExt};
use conduwuit_core::{
Err, Event, Result, debug_warn, err, trace,
utils::{stream::TryIgnore, string_from_bytes},
@@ -220,7 +220,13 @@ impl Service {
}
}
let response = self.services.client.pusher.execute(reqwest_request).await;
let response = self
.services
.client
.pusher
.execute(reqwest_request)
.await
.inspect(|r| debug!("Received response from push gateway {dest}: {r:?}"));
match response {
| Ok(mut response) => {
@@ -490,9 +496,28 @@ impl Service {
.await
.ok();
}
debug_info!(
%url,
?notify,
?event,
"Sending notification to push gateway for {} in {}",
event.event_id(),
event.room_id_or_hash(),
);
self.send_request(&http.url, send_event_notification::v1::Request::new(notify))
.await?;
.await
.inspect(|_| {
debug_info!(
"Successfully sent push notification for {}",
event.event_id()
)
})
.inspect_err(|e| {
debug_warn!(
"Failed to send push notification for {}: {e}",
event.event_id()
)
})?;
Ok(())
},
+1 -1
View File
@@ -228,7 +228,7 @@ async fn acquire_notary_result(&self, missing: &mut Batch, server_keys: ServerSi
self.add_signing_keys(server_keys.clone()).await;
if let Some(key_ids) = missing.get_mut(server) {
key_ids.retain(|key_id| !key_exists(&server_keys, key_id));
key_ids.retain(|key_id| key_exists(&server_keys, key_id));
if key_ids.is_empty() {
missing.remove(server);
}