From e914c0ca14ac04b7e6bf34408267320780ccfc1b Mon Sep 17 00:00:00 2001 From: riqo Date: Sat, 13 Feb 2021 17:16:36 -0600 Subject: [PATCH] add async audio send --- src/background/audio.ts | 4 +-- src/background/session.ts | 27 +++++++++++-------- .../home/messageVisualizer/index.vue | 2 -- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/background/audio.ts b/src/background/audio.ts index c44def2..78fcff5 100644 --- a/src/background/audio.ts +++ b/src/background/audio.ts @@ -1,6 +1,6 @@ "use strict"; /* eslint @typescript-eslint/no-var-requires: "off" */ -import { sendMessage } from './session' +import { sendAudio } from './session' const portAudio = require('naudiodon'); let ia: typeof portAudio.AudioIO; @@ -18,7 +18,7 @@ export const updateRecorder = (_event, record: boolean): void => { } else { ia.pause(); const audio = processAudio(audioInput); - sendMessage(audio); + sendAudio(audio); audioInput = []; } } diff --git a/src/background/session.ts b/src/background/session.ts index 6c43418..36108c0 100644 --- a/src/background/session.ts +++ b/src/background/session.ts @@ -66,11 +66,9 @@ const receiveMessage = (message: string): void => { } const parsed: RenderMessage = JSON.parse(message); - console.log('received message', parsed); if (parsed.modifier === "sf") { backgroundMitt.emit('message-res', parsed); } else if (parsed.modifier === "ai"){ - console.log('ai message') backgroundMitt.emit('ipc-renderer', { endpoint: 'render-message', message: parsed @@ -79,15 +77,17 @@ const receiveMessage = (message: string): void => { }; -export const sendMessage = (content: TextMessage | Buffer) => { - if (content instanceof Buffer) { - socket.send(content); - } else if (content) { - socket.send(JSON.stringify(content)); - } +export const sendAudio = async (content: Buffer) => { + + const res = await asyncSend(null, content); + + backgroundMitt.emit('ipc-renderer', { + endpoint: 'render-message', + message: res + }); } -const asyncSend = (_event, payload: any): Promise => { +const asyncSend = (_event?, payload: TextMessage | Buffer): Promise => { return new Promise((resolve, reject) => { backgroundMitt.once('message-res', (res: RenderMessage) => { @@ -95,11 +95,16 @@ const asyncSend = (_event, payload: any): Promise => { if (res.content) { resolve(res); } else { - reject() + reject('ERROR: NO MESSAGE'); } }); - socket.send(JSON.stringify(payload)); + + if (payload instanceof Buffer) { + socket.send(payload); + } else if (payload) { + socket.send(JSON.stringify(payload)); + } }); } diff --git a/src/components/home/messageVisualizer/index.vue b/src/components/home/messageVisualizer/index.vue index ba63934..57657eb 100644 --- a/src/components/home/messageVisualizer/index.vue +++ b/src/components/home/messageVisualizer/index.vue @@ -47,12 +47,10 @@ export default defineComponent({ onMounted(() => { emitter.on("renderMessage", (payload: Message | undefined) => { - console.log('render ai message', payload) if (payload) renderArr.push(payload); }); emitter.on("animateSend", async (message) => { - console.log('caught message to send', message); rendering.value = true; try { await invoke(message); -- 2.43.0