Routage complexe #4

Merged
benoit merged 2 commits from Routage-complexe into desktop-app 2026-07-03 17:29:08 +02:00
6 changed files with 114 additions and 23 deletions
Showing only changes of commit b0f7d294d8 - Show all commits
+18 -4
View File
@@ -447,14 +447,21 @@ app.whenReady().then(async () => {
} }
}); });
ipcMain.handle('server-audio-users:create', (event, { name, group, input_channel, output_channel }) => { ipcMain.handle('server-audio-users:create', (event, { name, group, input_channel, output_channel, publish }) => {
try { try {
const config = readConfig(); const config = readConfig();
const users = config.server_audio_users || []; const users = config.server_audio_users || [];
if (users.find(u => u.name === name)) { if (users.find(u => u.name === name)) {
return { success: false, error: `Un utilisateur "${name}" existe déjà` }; return { success: false, error: `Un utilisateur "${name}" existe déjà` };
} }
const user = { name, group, input_channel: parseInt(input_channel), output_channel: output_channel !== null && output_channel !== '' ? parseInt(output_channel) : null }; const isPublish = publish !== false;
const user = {
name,
group,
publish: isPublish,
input_channel: isPublish && input_channel !== null && input_channel !== undefined ? parseInt(input_channel) : null,
output_channel: output_channel !== null && output_channel !== '' ? parseInt(output_channel) : null
};
config.server_audio_users = [...users, user]; config.server_audio_users = [...users, user];
writeConfig(config); writeConfig(config);
return { success: true, user }; return { success: true, user };
@@ -463,13 +470,20 @@ app.whenReady().then(async () => {
} }
}); });
ipcMain.handle('server-audio-users:update', (event, { name, group, input_channel, output_channel }) => { ipcMain.handle('server-audio-users:update', (event, { name, group, input_channel, output_channel, publish }) => {
try { try {
const config = readConfig(); const config = readConfig();
const users = config.server_audio_users || []; const users = config.server_audio_users || [];
const idx = users.findIndex(u => u.name === name); const idx = users.findIndex(u => u.name === name);
if (idx === -1) return { success: false, error: `Utilisateur "${name}" introuvable` }; if (idx === -1) return { success: false, error: `Utilisateur "${name}" introuvable` };
config.server_audio_users[idx] = { name, group, input_channel: parseInt(input_channel), output_channel: output_channel !== null && output_channel !== '' ? parseInt(output_channel) : null }; const isPublish = publish !== false;
config.server_audio_users[idx] = {
name,
group,
publish: isPublish,
input_channel: isPublish && input_channel !== null && input_channel !== undefined ? parseInt(input_channel) : null,
output_channel: output_channel !== null && output_channel !== '' ? parseInt(output_channel) : null
};
writeConfig(config); writeConfig(config);
return { success: true }; return { success: true };
} catch (error) { } catch (error) {
+37 -13
View File
@@ -803,7 +803,7 @@ document.addEventListener('DOMContentLoaded', () => {
const action = btn.dataset.sauAction; const action = btn.dataset.sauAction;
const name = btn.dataset.sauName; const name = btn.dataset.sauName;
if (action === 'edit') { if (action === 'edit') {
await editServerAudioUser(name, btn.dataset.sauGroup, parseInt(btn.dataset.sauInput), parseInt(btn.dataset.sauOutput)); await editServerAudioUser(name, btn.dataset.sauGroup, btn.dataset.sauInput, btn.dataset.sauOutput, btn.dataset.sauPublish !== 'false');
} else if (action === 'delete') { } else if (action === 'delete') {
await deleteServerAudioUser(name); await deleteServerAudioUser(name);
} }
@@ -834,14 +834,19 @@ function renderServerAudioUsers() {
container.innerHTML = ` container.innerHTML = `
<table class="sau-table"> <table class="sau-table">
<thead> <thead>
<tr><th>Nom</th><th>Groupe</th><th>Entrée</th><th>Sortie</th><th></th></tr> <tr><th>Nom</th><th>Groupe</th><th>Mode</th><th>Entrée</th><th>Sortie</th><th></th></tr>
</thead> </thead>
<tbody> <tbody>
${users.map(u => ` ${users.map(u => {
const isListenOnly = u.publish === false;
const modeLabel = isListenOnly ? '<span class="ch-badge ch-badge-listen">👂 Écoute</span>' : '<span class="ch-badge ch-badge-active">🎤 Actif</span>';
const inputLabel = isListenOnly ? '<span class="ch-badge ch-badge-muted">—</span>' : `<span class="ch-badge">${chLabel(u.input_channel, 'input')}</span>`;
return `
<tr> <tr>
<td class="sau-name">${escapeHtml(u.name)}</td> <td class="sau-name">${escapeHtml(u.name)}</td>
<td><span class="ch-badge ch-badge-group">${escapeHtml(u.group)}</span></td> <td><span class="ch-badge ch-badge-group">${escapeHtml(u.group)}</span></td>
<td><span class="ch-badge">${chLabel(u.input_channel, 'input')}</span></td> <td>${modeLabel}</td>
<td>${inputLabel}</td>
<td><span class="ch-badge">${chLabel(u.output_channel, 'output')}</span></td> <td><span class="ch-badge">${chLabel(u.output_channel, 'output')}</span></td>
<td class="sau-actions"> <td class="sau-actions">
<button class="btn btn-small btn-secondary" <button class="btn btn-small btn-secondary"
@@ -849,12 +854,14 @@ function renderServerAudioUsers() {
data-sau-name="${escapeHtml(u.name)}" data-sau-name="${escapeHtml(u.name)}"
data-sau-group="${escapeHtml(u.group)}" data-sau-group="${escapeHtml(u.group)}"
data-sau-input="${u.input_channel}" data-sau-input="${u.input_channel}"
data-sau-output="${u.output_channel}">Éditer</button> data-sau-output="${u.output_channel}"
data-sau-publish="${u.publish !== false}">Éditer</button>
<button class="btn btn-small btn-danger" <button class="btn btn-small btn-danger"
data-sau-action="delete" data-sau-action="delete"
data-sau-name="${escapeHtml(u.name)}">✕</button> data-sau-name="${escapeHtml(u.name)}">✕</button>
</td> </td>
</tr>`).join('')} </tr>`;
}).join('')}
</tbody> </tbody>
</table>`; </table>`;
} }
@@ -901,6 +908,7 @@ async function addServerAudioUser() {
fields: [ fields: [
{ name: 'name', label: 'Nom (identifiant unique, ex: foh)' }, { name: 'name', label: 'Nom (identifiant unique, ex: foh)' },
{ name: 'group', label: 'Groupe', type: 'select', options: groupOptions, default: defaultGroup }, { name: 'group', label: 'Groupe', type: 'select', options: groupOptions, default: defaultGroup },
{ name: 'publish', label: 'Publier audio vers le groupe (décocher = écoute seule)', type: 'checkbox', default: true },
inputField, inputField,
outputField outputField
], ],
@@ -909,10 +917,12 @@ async function addServerAudioUser() {
if (!result || !result.name.trim()) return; if (!result || !result.name.trim()) return;
const publish = result.publish !== false && result.publish !== 'false';
const res = await window.electronAPI.serverAudioUsers.create({ const res = await window.electronAPI.serverAudioUsers.create({
name: result.name.trim(), name: result.name.trim(),
group: result.group, group: result.group,
input_channel: parseInt(result.input_channel), publish,
input_channel: publish ? (result.input_channel !== '' ? parseInt(result.input_channel) : null) : null,
output_channel: result.output_channel !== '' ? parseInt(result.output_channel) : null output_channel: result.output_channel !== '' ? parseInt(result.output_channel) : null
}); });
@@ -924,17 +934,18 @@ async function addServerAudioUser() {
} }
} }
async function editServerAudioUser(name, group, input_channel, output_channel) { async function editServerAudioUser(name, group, input_channel, output_channel, publish = true) {
const groupsData = await window.electronAPI.groups.list(); const groupsData = await window.electronAPI.groups.list();
const groupOptions = (groupsData.groups || []).map(g => ({ value: slugify(g.name), label: g.name })); const groupOptions = (groupsData.groups || []).map(g => ({ value: slugify(g.name), label: g.name }));
const inOpts = buildChannelOptions('input'); const inOpts = buildChannelOptions('input');
const outOpts = buildChannelOptions('output'); const outOpts = buildChannelOptions('output');
const inputDefault = input_channel !== null && input_channel !== undefined && input_channel !== 'null' ? String(input_channel) : '0';
const inputField = inOpts const inputField = inOpts
? { name: 'input_channel', label: 'Canal d\'entrée', type: 'select', options: inOpts, default: String(input_channel) } ? { name: 'input_channel', label: 'Canal d\'entrée', type: 'select', options: inOpts, default: inputDefault }
: { name: 'input_channel', label: 'Canal entrée (index)', type: 'number', default: input_channel, min: 0, max: 63 }; : { name: 'input_channel', label: 'Canal entrée (index)', type: 'number', default: inputDefault, min: 0, max: 63 };
const outputDefault = output_channel !== null && output_channel !== undefined ? String(output_channel) : ''; const outputDefault = output_channel !== null && output_channel !== undefined && output_channel !== 'null' ? String(output_channel) : '';
const outputField = outOpts const outputField = outOpts
? { name: 'output_channel', label: 'Canal de sortie', type: 'select', options: outOpts, default: outputDefault } ? { name: 'output_channel', label: 'Canal de sortie', type: 'select', options: outOpts, default: outputDefault }
: { name: 'output_channel', label: 'Canal sortie (index, vide = aucune)', type: 'number', default: outputDefault, min: 0, max: 63 }; : { name: 'output_channel', label: 'Canal sortie (index, vide = aucune)', type: 'number', default: outputDefault, min: 0, max: 63 };
@@ -943,6 +954,7 @@ async function editServerAudioUser(name, group, input_channel, output_channel) {
title: `Modifier "${name}"`, title: `Modifier "${name}"`,
fields: [ fields: [
{ name: 'group', label: 'Groupe', type: 'select', options: groupOptions, default: group }, { name: 'group', label: 'Groupe', type: 'select', options: groupOptions, default: group },
{ name: 'publish', label: 'Publier audio vers le groupe (décocher = écoute seule)', type: 'checkbox', default: publish },
inputField, inputField,
outputField outputField
], ],
@@ -951,10 +963,12 @@ async function editServerAudioUser(name, group, input_channel, output_channel) {
if (!result) return; if (!result) return;
const newPublish = result.publish !== false && result.publish !== 'false';
const res = await window.electronAPI.serverAudioUsers.update({ const res = await window.electronAPI.serverAudioUsers.update({
name, name,
group: result.group, group: result.group,
input_channel: parseInt(result.input_channel), publish: newPublish,
input_channel: newPublish ? (result.input_channel !== '' ? parseInt(result.input_channel) : null) : null,
output_channel: result.output_channel !== '' ? parseInt(result.output_channel) : null output_channel: result.output_channel !== '' ? parseInt(result.output_channel) : null
}); });
@@ -1118,6 +1132,15 @@ function showModal({ title, fields = [], confirmLabel = 'Confirmer', confirmClas
<select id="modal-field-${field.name}" class="form-control">${optionsHtml}</select> <select id="modal-field-${field.name}" class="form-control">${optionsHtml}</select>
</div>`; </div>`;
} }
if (field.type === 'checkbox') {
return `
<div class="form-group form-group-check">
<label class="check-label">
<input type="checkbox" id="modal-field-${field.name}" ${field.default !== false ? 'checked' : ''}>
${escapeHtml(field.label)}
</label>
</div>`;
}
return ` return `
<div class="form-group"> <div class="form-group">
<label>${escapeHtml(field.label)}</label> <label>${escapeHtml(field.label)}</label>
@@ -1155,7 +1178,8 @@ function showModal({ title, fields = [], confirmLabel = 'Confirmer', confirmClas
const result = {}; const result = {};
fields.forEach(f => { fields.forEach(f => {
const input = document.getElementById(`modal-field-${f.name}`); const input = document.getElementById(`modal-field-${f.name}`);
result[f.name] = input ? input.value : ''; if (!input) { result[f.name] = ''; return; }
result[f.name] = f.type === 'checkbox' ? input.checked : input.value;
}); });
cleanup(); resolve(result); cleanup(); resolve(result);
} }
+41
View File
@@ -1044,6 +1044,47 @@ body {
font-family: inherit; font-family: inherit;
} }
.ch-badge-active {
background: rgba(76, 175, 80, 0.12);
border-color: rgba(76, 175, 80, 0.3);
color: #4caf50;
font-family: inherit;
}
.ch-badge-listen {
background: rgba(255, 152, 0, 0.12);
border-color: rgba(255, 152, 0, 0.3);
color: #ff9800;
font-family: inherit;
}
.ch-badge-muted {
color: var(--text-secondary);
opacity: 0.5;
}
.form-group-check {
display: flex;
align-items: center;
gap: 0.5rem;
}
.check-label {
display: flex;
align-items: center;
gap: 0.5rem;
cursor: pointer;
font-size: 0.9rem;
color: var(--text-primary);
}
.check-label input[type="checkbox"] {
width: 1rem;
height: 1rem;
cursor: pointer;
accent-color: var(--accent-primary);
}
/* Routing actions bar */ /* Routing actions bar */
.routing-actions { .routing-actions {
+5 -1
View File
@@ -309,6 +309,7 @@ export class AudioBridge extends EventEmitter {
groupId: userConfig.groupId, groupId: userConfig.groupId,
inputChannel: userConfig.inputChannel, inputChannel: userConfig.inputChannel,
outputChannel: userConfig.outputChannel, outputChannel: userConfig.outputChannel,
publish: userConfig.publish !== false,
liveKitUrl: this.options.liveKitUrl, liveKitUrl: this.options.liveKitUrl,
token: userConfig.token, token: userConfig.token,
sampleRate: this.options.sampleRate, sampleRate: this.options.sampleRate,
@@ -338,7 +339,10 @@ export class AudioBridge extends EventEmitter {
await user.start(); await user.start();
this.serverAudioUsers.set(userConfig.name, user); this.serverAudioUsers.set(userConfig.name, user);
console.log(`✓ Server audio user "${userConfig.name}" démarré (entrée canal ${userConfig.inputChannel} → sortie canal ${userConfig.outputChannel}, room: ${userConfig.groupId})`); const modeStr = userConfig.publish !== false
? `canal ${userConfig.inputChannel} → sortie canal ${userConfig.outputChannel ?? 'aucune'}`
: `écoute seule → sortie canal ${userConfig.outputChannel ?? 'aucune'}`;
console.log(`✓ Server audio user "${userConfig.name}" démarré (${modeStr}, room: ${userConfig.groupId})`);
} }
console.log(`${this.serverAudioUsers.size} server audio user(s) initialisés`); console.log(`${this.serverAudioUsers.size} server audio user(s) initialisés`);
+6 -2
View File
@@ -66,10 +66,12 @@ class AudioBridgeManager extends EventEmitter {
} }
); );
const publish = user.publish !== false;
token.addGrant({ token.addGrant({
room: groupId, room: groupId,
roomJoin: true, roomJoin: true,
canPublish: true, canPublish: publish,
canSubscribe: true, canSubscribe: true,
canPublishData: true canPublishData: true
}); });
@@ -77,12 +79,14 @@ class AudioBridgeManager extends EventEmitter {
const jwt = await token.toJwt(); const jwt = await token.toJwt();
const outputChannel = user.output_channel ?? user.outputChannel; const outputChannel = user.output_channel ?? user.outputChannel;
const rawInputChannel = user.input_channel ?? user.inputChannel;
serverAudioUsers.push({ serverAudioUsers.push({
name: user.name, name: user.name,
groupId, groupId,
inputChannel: user.input_channel ?? user.inputChannel ?? 0, inputChannel: rawInputChannel !== null && rawInputChannel !== undefined ? rawInputChannel : null,
outputChannel: outputChannel !== null && outputChannel !== undefined ? outputChannel : null, outputChannel: outputChannel !== null && outputChannel !== undefined ? outputChannel : null,
publish,
token: jwt token: jwt
}); });
+7 -3
View File
@@ -17,10 +17,13 @@ class ServerAudioUser extends EventEmitter {
super(); super();
this.name = options.name; this.name = options.name;
this.inputChannel = parseInt(options.inputChannel, 10); this.inputChannel = (options.inputChannel !== null && options.inputChannel !== undefined)
? parseInt(options.inputChannel, 10)
: null;
this.outputChannel = (options.outputChannel !== null && options.outputChannel !== undefined) this.outputChannel = (options.outputChannel !== null && options.outputChannel !== undefined)
? parseInt(options.outputChannel, 10) ? parseInt(options.outputChannel, 10)
: null; : null;
this.publish = options.publish !== false; // false = écoute seule
this.groupId = options.groupId; this.groupId = options.groupId;
this.frameSize = options.frameSize || 960; this.frameSize = options.frameSize || 960;
this.sampleRate = options.sampleRate || 48000; this.sampleRate = options.sampleRate || 48000;
@@ -45,7 +48,8 @@ class ServerAudioUser extends EventEmitter {
_setupClientEvents() { _setupClientEvents() {
this.client.on('connected', () => { this.client.on('connected', () => {
console.log(`[ServerAudioUser:${this.name}] Connecté à room "${this.groupId}" (in:${this.inputChannel} → out:${this.outputChannel ?? 'aucune'})`); const mode = this.publish ? `in:${this.inputChannel} → out:${this.outputChannel ?? 'aucune'}` : `écoute → out:${this.outputChannel ?? 'aucune'}`;
console.log(`[ServerAudioUser:${this.name}] Connecté à room "${this.groupId}" (${mode})`);
this.emit('connected'); this.emit('connected');
}); });
@@ -78,7 +82,7 @@ class ServerAudioUser extends EventEmitter {
* @param {Float32Array} float32Data - Données PCM normalisées [-1.0, 1.0] * @param {Float32Array} float32Data - Données PCM normalisées [-1.0, 1.0]
*/ */
sendAudio(float32Data) { sendAudio(float32Data) {
if (!this.client.isConnected) return; if (!this.publish || !this.client.isConnected) return;
const pcmBuffer = this._float32ToBuffer(float32Data); const pcmBuffer = this._float32ToBuffer(float32Data);
this.client.sendAudioData(pcmBuffer); this.client.sendAudioData(pcmBuffer);