diff --git a/meshchatx/meshchat.py b/meshchatx/meshchat.py
index aea0c07..fd188a7 100644
--- a/meshchatx/meshchat.py
+++ b/meshchatx/meshchat.py
@@ -3882,8 +3882,8 @@ class ReticulumMeshChat:
remote_destination_hash = RNS.Destination.hash(
remote_identity, "lxmf", "delivery"
).hex()
- remote_telephony_hash = (
- self.get_lxst_telephony_hash_for_identity_hash(remote_hash)
+ remote_telephony_hash = self.get_lxst_telephony_hash_for_identity_hash(
+ remote_hash
)
remote_name = None
if self.telephone_manager.get_name_for_identity_hash:
@@ -3915,7 +3915,6 @@ class ReticulumMeshChat:
"custom_image": custom_image,
"is_incoming": telephone_active_call.is_incoming,
"status": self.telephone_manager.telephone.call_status,
- "remote_destination_hash": remote_destination_hash,
"remote_telephony_hash": remote_telephony_hash,
"audio_profile_id": self.telephone_manager.telephone.transmit_codec.profile
if hasattr(
@@ -4145,11 +4144,15 @@ class ReticulumMeshChat:
status=503,
)
- # check if busy
- if (
- self.telephone_manager.telephone.busy
- or self.telephone_manager.initiation_status
- ):
+ # check if busy, but ignore stale busy when no active call
+ is_busy = self.telephone_manager.telephone.busy
+ if is_busy and not self.telephone_manager.telephone.active_call:
+ # If there's no active call and we're not currently initiating,
+ # we shouldn't be busy.
+ if not self.telephone_manager.initiation_status:
+ is_busy = False
+
+ if is_busy or self.telephone_manager.initiation_status:
return web.json_response(
{
"message": "Telephone is busy",
@@ -4713,10 +4716,16 @@ class ReticulumMeshChat:
lxmf_hash = self.get_lxmf_destination_hash_for_identity_hash(
remote_identity_hash,
)
+ tele_hash = self.get_lxst_telephony_hash_for_identity_hash(
+ remote_identity_hash
+ )
if lxmf_hash:
+ d["remote_destination_hash"] = lxmf_hash
icon = self.database.misc.get_user_icon(lxmf_hash)
if icon:
d["remote_icon"] = dict(icon)
+ if tele_hash:
+ d["remote_telephony_hash"] = tele_hash
contacts.append(d)
return web.json_response(contacts)
@@ -4844,6 +4853,7 @@ class ReticulumMeshChat:
# fetch custom display names
custom_names = {}
+ lxmf_names_for_telephony = {}
if other_user_hashes:
db_custom_names = self.database.provider.fetchall(
f"SELECT destination_hash, display_name FROM custom_destination_display_names WHERE destination_hash IN ({','.join(['?'] * len(other_user_hashes))})", # noqa: S608
@@ -4852,6 +4862,27 @@ class ReticulumMeshChat:
for row in db_custom_names:
custom_names[row["destination_hash"]] = row["display_name"]
+ # If we're looking for telephony announces, pre-fetch LXMF announces for the same identities
+ if aspect == "lxst.telephony":
+ identity_hashes = list(
+ set(
+ [
+ r["identity_hash"]
+ for r in results
+ if r.get("identity_hash")
+ ]
+ )
+ )
+ if identity_hashes:
+ lxmf_results = self.database.announces.provider.fetchall(
+ f"SELECT identity_hash, app_data FROM announces WHERE aspect = 'lxmf.delivery' AND identity_hash IN ({','.join(['?'] * len(identity_hashes))})", # noqa: S608
+ identity_hashes,
+ )
+ for row in lxmf_results:
+ lxmf_names_for_telephony[row["identity_hash"]] = (
+ parse_lxmf_display_name(row["app_data"])
+ )
+
# process all announces
all_announces = []
for announce in results:
@@ -4861,6 +4892,11 @@ class ReticulumMeshChat:
# parse display name from announce
display_name = None
+ is_local = (
+ self.current_context
+ and announce["identity_hash"] == self.current_context.identity_hash
+ )
+
if announce["aspect"] == "lxmf.delivery":
display_name = parse_lxmf_display_name(announce["app_data"])
elif announce["aspect"] == "nomadnetwork.node":
@@ -4868,7 +4904,22 @@ class ReticulumMeshChat:
announce["app_data"]
)
elif announce["aspect"] == "lxst.telephony":
- display_name = announce.get("display_name") or "Anonymous Peer"
+ display_name = parse_lxmf_display_name(announce["app_data"])
+ if not display_name or display_name == "Anonymous Peer":
+ # Try pre-fetched LXMF name
+ display_name = lxmf_names_for_telephony.get(
+ announce["identity_hash"]
+ )
+
+ if not display_name or display_name == "Anonymous Peer":
+ if is_local and self.current_context:
+ display_name = self.current_context.config.display_name.get()
+ else:
+ # try to resolve name from identity hash (checks contacts too)
+ display_name = (
+ self.get_name_for_identity_hash(announce["identity_hash"])
+ or "Anonymous Peer"
+ )
# get current hops away
hops = RNS.Transport.hops_to(
@@ -7783,6 +7834,16 @@ class ReticulumMeshChat:
else:
self.telephone_manager.stop_recording()
+ if "telephone_tone_generator_enabled" in data:
+ self.config.telephone_tone_generator_enabled.set(
+ self._parse_bool(data["telephone_tone_generator_enabled"]),
+ )
+
+ if "telephone_tone_generator_volume" in data:
+ self.config.telephone_tone_generator_volume.set(
+ int(data["telephone_tone_generator_volume"]),
+ )
+
if "telephone_audio_profile_id" in data:
profile_id = int(data["telephone_audio_profile_id"])
self.config.telephone_audio_profile_id.set(profile_id)
@@ -8609,6 +8670,8 @@ class ReticulumMeshChat:
"desktop_open_calls_in_separate_window": ctx.config.desktop_open_calls_in_separate_window.get(),
"desktop_hardware_acceleration_enabled": ctx.config.desktop_hardware_acceleration_enabled.get(),
"blackhole_integration_enabled": ctx.config.blackhole_integration_enabled.get(),
+ "telephone_tone_generator_enabled": ctx.config.telephone_tone_generator_enabled.get(),
+ "telephone_tone_generator_volume": ctx.config.telephone_tone_generator_volume.get(),
}
# try and get a name for the provided identity hash
diff --git a/meshchatx/src/backend/config_manager.py b/meshchatx/src/backend/config_manager.py
index 7163af3..8ac0122 100644
--- a/meshchatx/src/backend/config_manager.py
+++ b/meshchatx/src/backend/config_manager.py
@@ -186,6 +186,16 @@ class ConfigManager:
"call_recording_enabled",
False,
)
+ self.telephone_tone_generator_enabled = self.BoolConfig(
+ self,
+ "telephone_tone_generator_enabled",
+ True,
+ )
+ self.telephone_tone_generator_volume = self.IntConfig(
+ self,
+ "telephone_tone_generator_volume",
+ 50,
+ )
# map config
self.map_offline_enabled = self.BoolConfig(self, "map_offline_enabled", False)
diff --git a/meshchatx/src/backend/telephone_manager.py b/meshchatx/src/backend/telephone_manager.py
index 1165168..08ea766 100644
--- a/meshchatx/src/backend/telephone_manager.py
+++ b/meshchatx/src/backend/telephone_manager.py
@@ -272,6 +272,8 @@ class TelephoneManager:
# Wait for identity to appear
start_wait = time.time()
while time.time() - start_wait < timeout_seconds:
+ if not self.initiation_status: # Externally cancelled (hangup)
+ return None
await asyncio.sleep(0.5)
destination_identity = resolve_identity(destination_hash_hex)
if destination_identity:
@@ -289,6 +291,8 @@ class TelephoneManager:
# Wait up to 10s for path discovery
path_wait_start = time.time()
while time.time() - path_wait_start < min(timeout_seconds, 10):
+ if not self.initiation_status: # Externally cancelled
+ return None
if RNS.Transport.has_path(destination_hash):
break
await asyncio.sleep(0.5)
@@ -307,6 +311,8 @@ class TelephoneManager:
# LXST telephone.call usually returns on establishment or timeout.
# We wait for it, but if status becomes established or ended, we can stop waiting.
while not call_task.done():
+ if not self.initiation_status: # Externally cancelled
+ break
if self.telephone.call_status in [
6,
0,
@@ -321,9 +327,14 @@ class TelephoneManager:
# If the task finished but we're still ringing or connecting,
# wait a bit more for establishment or definitive failure
- if self.telephone.call_status in [4, 5]: # Ringing, Connecting
+ if self.initiation_status and self.telephone.call_status in [
+ 4,
+ 5,
+ ]: # Ringing, Connecting
wait_until = time.time() + timeout_seconds
while time.time() < wait_until:
+ if not self.initiation_status: # Externally cancelled
+ break
if self.telephone.call_status in [
6,
0,
diff --git a/meshchatx/src/frontend/components/App.vue b/meshchatx/src/frontend/components/App.vue
index 09f5213..68810c7 100644
--- a/meshchatx/src/frontend/components/App.vue
+++ b/meshchatx/src/frontend/components/App.vue
@@ -745,7 +745,10 @@ export default {
this.initiationTargetName = json.target_name;
if (this.initiationStatus === "Ringing...") {
- this.toneGenerator.playRingback();
+ if (this.config?.telephone_tone_generator_enabled) {
+ this.toneGenerator.setVolume(this.config.telephone_tone_generator_volume);
+ this.toneGenerator.playRingback();
+ }
} else if (this.initiationStatus === null) {
this.toneGenerator.stop();
}
@@ -768,7 +771,10 @@ export default {
case "telephone_call_ended": {
this.stopRingtone();
this.ringtonePlayer = null;
- this.toneGenerator.playBusyTone();
+ if (this.config?.telephone_tone_generator_enabled) {
+ this.toneGenerator.setVolume(this.config.telephone_tone_generator_volume);
+ this.toneGenerator.playBusyTone();
+ }
this.updateTelephoneStatus();
break;
}
@@ -850,6 +856,7 @@ export default {
const response = await window.axios.get(`/api/v1/config`);
this.config = response.data.config;
GlobalState.config = response.data.config;
+ this.displayName = response.data.config.display_name;
} catch (e) {
// do nothing if failed to load config
console.log(e);
@@ -1067,7 +1074,10 @@ export default {
const justEnded = oldCall != null && this.activeCall == null;
if (justEnded) {
this.lastCall = oldCall;
- this.toneGenerator.playBusyTone();
+ if (this.config?.telephone_tone_generator_enabled) {
+ this.toneGenerator.setVolume(this.config.telephone_tone_generator_volume);
+ this.toneGenerator.playBusyTone();
+ }
// Trigger history refresh
GlobalEmitter.emit("telephone-history-updated");
@@ -1086,7 +1096,10 @@ export default {
// Handle outgoing ringback tone
if (this.initiationStatus === "Ringing...") {
- this.toneGenerator.playRingback();
+ if (this.config?.telephone_tone_generator_enabled) {
+ this.toneGenerator.setVolume(this.config.telephone_tone_generator_volume);
+ this.toneGenerator.playRingback();
+ }
} else if (!this.initiationStatus && !this.activeCall && !this.isCallEnded) {
// Only stop if we're not ringing, in a call, or just finished a call (busy tone playing)
this.toneGenerator.stop();
diff --git a/meshchatx/src/frontend/components/call/CallPage.vue b/meshchatx/src/frontend/components/call/CallPage.vue
index 69c201e..fca70f5 100644
--- a/meshchatx/src/frontend/components/call/CallPage.vue
+++ b/meshchatx/src/frontend/components/call/CallPage.vue
@@ -661,10 +661,26 @@
- {{ formatDestinationHash(entry.remote_telephony_hash || entry.remote_destination_hash || entry.remote_identity_hash) }}
+ {{
+ formatDestinationHash(
+ entry.remote_telephony_hash ||
+ entry.remote_destination_hash ||
+ entry.remote_identity_hash
+ )
+ }}
@@ -692,8 +708,12 @@
type="button"
class="flex items-center gap-1.5 px-3 py-1 bg-blue-600 text-white rounded-lg text-[10px] font-bold hover:bg-blue-500 transition-all shadow-md shadow-blue-500/10 shrink-0"
@click="
- destinationHash = entry.remote_identity_hash;
- call(destinationHash);
+ destinationHash =
+ entry.remote_telephony_hash ||
+ entry.remote_destination_hash ||
+ entry.remote_identity_hash;
+ activeTab = 'phone';
+ $nextTick(() => call(destinationHash));
"
>
@@ -819,7 +839,7 @@
@click="
destinationHash = announce.destination_hash;
activeTab = 'phone';
- call(destinationHash);
+ $nextTick(() => call(destinationHash));
"
>
Call
@@ -1249,9 +1269,12 @@
type="button"
class="text-[10px] flex items-center gap-1 text-gray-500 hover:text-blue-500 font-bold uppercase tracking-wider transition-colors"
@click="
- destinationHash = voicemail.remote_telephony_hash || voicemail.remote_destination_hash || voicemail.remote_identity_hash;
+ destinationHash =
+ voicemail.remote_telephony_hash ||
+ voicemail.remote_destination_hash ||
+ voicemail.remote_identity_hash;
activeTab = 'phone';
- call(destinationHash);
+ $nextTick(() => call(destinationHash));
"
>
@@ -1383,9 +1406,12 @@
type="button"
class="text-[10px] bg-blue-100 text-blue-600 dark:bg-blue-900/30 dark:text-blue-400 px-3 py-1 rounded-full font-bold uppercase tracking-wider hover:bg-blue-200 dark:hover:bg-blue-900/50 transition-colors"
@click="
- destinationHash = contact.remote_identity_hash;
+ destinationHash =
+ contact.remote_telephony_hash ||
+ contact.remote_destination_hash ||
+ contact.remote_identity_hash;
activeTab = 'phone';
- call(destinationHash);
+ $nextTick(() => call(destinationHash));
"
>
Call
@@ -1478,6 +1504,73 @@
+
+
+
+
+
+ Tone Generator
+
+
+
+
+ Play audio feedback during call dialing and disconnection.
+
+
+
+
+
+
+ {{ config.telephone_tone_generator_volume }}%
+
+
+
+