Fix D-Bus signal emission

daemon/dbus-service.js

@@ -38,19 +38,19 @@ export async function serveOnSessionBus(daemon) {
     CancelModel(model) { return daemon.cancelModel(model); }
     WipeComputerTraces() { return daemon.wipeComputerTraces(); }
     ConfirmationRequired(tool, args, pattern) { this.emit('ConfirmationRequired', String(tool), String(args), String(pattern)); }
-    StateChanged(state) { this.emit('StateChanged', state); }
-    Reply(text) { this.emit('Reply', String(text)); }
-    Token(text) { this.emit('Token', String(text)); }
-    Error(code, message) { this.emit('Error', String(code), String(message)); }
-    WakeHeard(phrase) { this.emit('WakeHeard', String(phrase)); }
-    PartialTranscript(text) { this.emit('PartialTranscript', String(text)); }
-    FinalTranscript(text) { this.emit('FinalTranscript', String(text)); }
-    SpeakingLevel(rms) { this.emit('SpeakingLevel', Number(rms)); }
-    ListeningLevel(rms) { this.emit('ListeningLevel', Number(rms)); }
-    ChipOffered(id, label, payload) { this.emit('ChipOffered', String(id), String(label), String(payload)); }
-    JobProgress(id, pct, label) { this.emit('JobProgress', String(id), Number(pct), String(label)); }
-    ComputerStep(json) { this.emit('ComputerStep', String(json)); }
-    ComputerHighlight(json) { this.emit('ComputerHighlight', String(json)); }
+    StateChanged(state) { return String(state); }
+    Reply(text) { return String(text); }
+    Token(text) { return String(text); }
+    Error(code, message) { return [String(code), String(message)]; }
+    WakeHeard(phrase) { return String(phrase); }
+    PartialTranscript(text) { return String(text); }
+    FinalTranscript(text) { return String(text); }
+    SpeakingLevel(rms) { return Number(rms); }
+    ListeningLevel(rms) { return Number(rms); }
+    ChipOffered(id, label, payload) { return [String(id), String(label), String(payload)]; }
+    JobProgress(id, pct, label) { return [String(id), Number(pct), String(label)]; }
+    ComputerStep(json) { return String(json); }
+    ComputerHighlight(json) { return String(json); }
   }
   Session.configureMembers({
     methods: {
@@ -75,20 +75,20 @@ export async function serveOnSessionBus(daemon) {
     WipeComputerTraces: { inSignature: '', outSignature: 'b' },
     },
     signals: {
-    StateChanged: { signature: 's', signal: true },
-    Reply: { signature: 's', signal: true },
-    Token: { signature: 's', signal: true },
-    Error: { signature: 'ss', signal: true },
-    WakeHeard: { signature: 's', signal: true },
-    PartialTranscript: { signature: 's', signal: true },
-    FinalTranscript: { signature: 's', signal: true },
-    SpeakingLevel: { signature: 'd', signal: true },
-    ListeningLevel: { signature: 'd', signal: true },
-    ChipOffered: { signature: 'sss', signal: true },
-    JobProgress: { signature: 'sds', signal: true },
-    ComputerStep: { signature: 's', signal: true },
-    ComputerHighlight: { signature: 's', signal: true },
-    ConfirmationRequired: { signature: 'sss', signal: true },
+    StateChanged: { signature: 's' },
+    Reply: { signature: 's' },
+    Token: { signature: 's' },
+    Error: { signature: 'ss' },
+    WakeHeard: { signature: 's' },
+    PartialTranscript: { signature: 's' },
+    FinalTranscript: { signature: 's' },
+    SpeakingLevel: { signature: 'd' },
+    ListeningLevel: { signature: 'd' },
+    ChipOffered: { signature: 'sss' },
+    JobProgress: { signature: 'sds' },
+    ComputerStep: { signature: 's' },
+    ComputerHighlight: { signature: 's' },
+    ConfirmationRequired: { signature: 'sss' },
     },
   });
   const bus = dbus.sessionBus();