From 9e479a013ddcd20576c5f495eeca53f2bf3590b1 Mon Sep 17 00:00:00 2001
From: Timo <toger5@hotmail.de>
Date: Tue, 10 Jun 2025 17:45:56 +0200
Subject: [PATCH] cleanup config.sample.json and always use non depreacted
 names

---
 config/config.sample.json   | 2 +-
 src/config/ConfigOptions.ts | 7 ++++---
 vite-embedded.config.js     | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/config/config.sample.json b/config/config.sample.json
index fbd898c7..f680c427 100644
--- a/config/config.sample.json
+++ b/config/config.sample.json
@@ -13,7 +13,7 @@
   },
   "ssla": "https://static.element.io/legal/element-software-and-services-license-agreement-uk-1.pdf",
   "matrix_rtc_session": {
-    "key_rotation_on_leave_delay": 3000,
+    "wait_for_key_rotation_ms": 3000,
     "membership_event_expiry_ms": 6000000,
     "delayed_leave_event_delay_ms": 18000,
     "delayed_leave_event_restart_ms": 5000
diff --git a/src/config/ConfigOptions.ts b/src/config/ConfigOptions.ts
index b11fb463..4b541210 100644
--- a/src/config/ConfigOptions.ts
+++ b/src/config/ConfigOptions.ts
@@ -118,15 +118,16 @@ export interface ConfigOptions {
     key_rotation_on_leave_delay?: number;
 
     /**
-     * How long (in milliseconds) after the last keep-alive the server should expire the
-     * MatrixRTC membership event.
+     * The duration (in milliseconds) after the most recent keep-alive (delayed leave event restart)
+     * that the server waits before sending the leave MatrixRTC membership event.
      */
     delayed_leave_event_delay_ms?: number;
     /** @deprecated use delayed_leave_event_delay_ms instead */
     membership_server_side_expiry_timeout?: number;
 
     /**
-     * The interval (in milliseconds) in which the client will send membership keep-alives to the server.
+     * The time interval (in milliseconds) at which the client sends membership keep-alive
+     * messages to the server by restarting the timer for the delayed leave event.
      */
     delayed_leave_event_restart_ms?: number;
     /** @deprecated use delayed_leave_event_restart_ms instead */
diff --git a/vite-embedded.config.js b/vite-embedded.config.js
index a3e031b6..9af83b38 100644
--- a/vite-embedded.config.js
+++ b/vite-embedded.config.js
@@ -18,9 +18,9 @@ export default defineConfig((env) =>
             output: "./config.json",
             data: {
               matrix_rtc_session: {
-                key_rotation_on_leave_delay: 15000,
-                membership_keep_alive_period: 5000,
-                membership_server_side_expiry_timeout: 15000,
+                wait_for_key_rotation_ms: 5000,
+                delayed_leave_event_restart_ms: 4000,
+                delayed_leave_event_delay_ms: 15000,
               },
             },
           },