文字起こしの精度向上・ワーカー上でゴミファイルが残り続けてしまう不具合を修正

tissueMO · Nov 5, 2024 · 23e5a79 · 23e5a79
1 parent ad17127
commit 23e5a79
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/extensions/discord/addon/RecordAddon.js b/extensions/discord/addon/RecordAddon.js
@@ -192,7 +192,11 @@ class RecordAddon extends Addon {
                 userName: guild.members.cache.get(userId).displayName,
                 start: dayjs().tz().format(),
               }))
-              .then(context => this.#enqueueConvertWorker(context));
+              .then(context => {
+                if (context) {
+                  this.#enqueueConvertWorker(context);
+                }
+              });
           }
         });
 
@@ -309,25 +313,35 @@ class RecordAddon extends Addon {
         createWriteStream(pcmFile)
       );
 
+      context['end'] = dayjs().tz().format();
+
+      // ※相槌やノイズのような短い音声は除外
+      const start = dayjs(context.start);
+      const end = dayjs(context.end);
+
+      if (end.diff(start, 'second') <= 3) {
+        console.info(`[RecordAddon] キャプチャーキャンセル: User<${userId}> Session<${contextId}>`);
+        return null;
+      }
+
       await s3Client.send(new PutObjectCommand({
         Bucket: process.env.S3_BUCKET,
         Key: `${process.env.S3_PREFIX}${baseName}`,
         Body: createReadStream(pcmFile),
       }));
 
-      await fs.unlink(pcmFile);
-
       console.info(`[RecordAddon] キャプチャー終了: User<${userId}> Session<${contextId}> --> ${pcmFile}`);
+      return context;
 
     } catch (err) {
       console.error(`[RecordAddon] キャプチャー失敗: User<${userId}> Session<${contextId}>`, err);
       return null;
 
     } finally {
+      await fs.unlink(pcmFile);
       delete this.#contexts[userId];
     }
 
-    return context;
   }
 
   /**
@@ -351,7 +365,7 @@ class RecordAddon extends Addon {
    * @param {VoiceChannel} channel
    * @param {dayjs.Dayjs} start
    * @param {dayjs.Dayjs} end
-   * @returns {string|null}
+   * @returns {Promise<string|null>}
    */
   async #fetchTranscription(channel, start, end) {
     const contextIds = await this.#redisClient.zRangeByScore(`${process.env.REDIS_NAMESPACE}:contexts`, start.valueOf(), end.valueOf());

diff --git a/extensions/discord/worker/ConvertWorker.js b/extensions/discord/worker/ConvertWorker.js
@@ -63,6 +63,7 @@ class ConvertWorker extends Worker {
 
     // 後片付け
     await fs.unlink(srcFile);
+    await fs.unlink(destFile);
 
     await s3Client.send(new DeleteObjectCommand({
       Bucket: process.env.S3_BUCKET,

diff --git a/extensions/discord/worker/TranscribeWorker.js b/extensions/discord/worker/TranscribeWorker.js
@@ -1,3 +1,4 @@
+const fs = require('fs').promises;
 const { default: axios } = require('axios');
 const { createWriteStream, createReadStream } = require('fs');
 const path = require('path');
@@ -52,6 +53,7 @@ class TranscribeWorker extends Worker {
     });
 
     // 後片付け
+    await fs.unlink(srcFile);
     await s3Client.send(new DeleteObjectCommand({
       Bucket: process.env.S3_BUCKET,
       Key: `${process.env.S3_PREFIX}${baseName}`,