From 6e8c689639434baa15644878fecb039abc2281fc Mon Sep 17 00:00:00 2001 From: Apher Date: Fri, 17 Jul 2026 00:36:25 +0000 Subject: [PATCH] Use mtf-module-redis --- .gitmodules | 3 +++ src/models/index.js | 41 ----------------------------------------- src/modules/redis | 1 + src/server.js | 5 ++--- 4 files changed, 6 insertions(+), 44 deletions(-) create mode 100644 .gitmodules delete mode 100644 src/models/index.js create mode 160000 src/modules/redis diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..865507c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src/modules/redis"] + path = src/modules/redis + url = https://gitea.spilum.net/Spilum.Net/mtf-module-redis diff --git a/src/models/index.js b/src/models/index.js deleted file mode 100644 index 605d2f2..0000000 --- a/src/models/index.js +++ /dev/null @@ -1,41 +0,0 @@ -const config = require("../config"); -const redisConfig = require("../config/redis.config"); - -// Redis Connection -const Redis = require('redis'); -const redis = {}; - -redis.client = Redis.createClient({ - url: `redis://default@${redisConfig.HOST}:${redisConfig.PORT}` -}); - -redis.ensureGroup = async (stream, group) => { - try { - await redis.client.xGroupCreate(stream, group, "0", {MKSTREAM: true}); - - console.log(`Created consumer group: ${group} (${stream})`); - } catch (err) { - if (err.message.includes('BUSYGROUP')) { - console.log(`Consumer group already exists: ${group} (${stream})`); - } else { - console.error(err); - } - } -} - -redis.sendTranscriptEvent = async (streamKey, device_id, text) => { - try { - await redis.client.xAdd(streamKey, "*", { - text, - device_id: device_id, - }); - - console.log("Transcript added to stream"); - } catch (err) { - console.error(err); - } -} - -module.exports = { - redis -}; \ No newline at end of file diff --git a/src/modules/redis b/src/modules/redis new file mode 160000 index 0000000..e41a75e --- /dev/null +++ b/src/modules/redis @@ -0,0 +1 @@ +Subproject commit e41a75e7436a059ab963c5db7b62ca524cacc4e5 diff --git a/src/server.js b/src/server.js index cda133d..fd9bf78 100644 --- a/src/server.js +++ b/src/server.js @@ -13,8 +13,7 @@ const wav = require("wav-decoder"); const Speaker = require("speaker"); const { spawn } = require("child_process"); -const models = require("./models"); -const redis = models.redis; +const {redis} = require('./modules/redis'); const config = require("./config"); const transConfig = require("./config/transcribe.config"); @@ -148,7 +147,7 @@ async function processor(group, consumer, streamKey) { } async function main() { - await redis.client.connect().catch(console.error); + await redis.connect(); await redis.ensureGroup("commands", "assistant"); await playAudio("Assistant, online.");