utilitas 1999.1.46 → 1999.1.48

package/lib/alan.mjs

@@ -44,13 +44,14 @@ const _NEED = [
 
 const [
     png, jpeg, mov, mpeg, mp4, mpg, avi, wmv, mpegps, flv, gif, webp, pdf, aac,
-    flac, mp3, m4a, mpga, opus, pcm, wav, webm, tgpp, pcm16, ogg,
+    flac, mp3, mpega, m4a, mpga, opus, pcm, wav, webm, tgpp, pcm16, ogg,
 ] = [
         'image/png', 'image/jpeg', 'video/mov', 'video/mpeg', 'video/mp4',
         'video/mpg', 'video/avi', 'video/wmv', 'video/mpegps', 'video/x-flv',
         'image/gif', 'image/webp', 'application/pdf', 'audio/aac', 'audio/flac',
-        'audio/mp3', 'audio/m4a', 'audio/mpga', 'audio/opus', 'audio/pcm',
-        'audio/wav', 'audio/webm', 'video/3gpp', 'audio/x-wav', 'audio/ogg',
+        'audio/mp3', 'audio/mpeg', 'audio/m4a', 'audio/mpga', 'audio/opus',
+        'audio/pcm', 'audio/wav', 'audio/webm', 'video/3gpp', 'audio/x-wav',
+        'audio/ogg',
     ];
 
 const [
@@ -124,7 +125,7 @@ const GEMINI_RULES = {
     maxImageSize: Infinity, maxUrlSize: gb(2), maxVideoLength: minute(45),
     maxVideoPerPrompt: 10, vision: true, supportedMimeTypes: [
         png, jpeg, mov, mpeg, mp4, mpg, avi, wmv, mpegps, flv, pdf, aac,
-        flac, mp3, m4a, mpga, opus, pcm, wav, webm, tgpp,
+        flac, mp3, mpega, m4a, mpga, opus, pcm, wav, webm, tgpp,
     ], defaultProvider: GEMINI,
 };
 
@@ -1565,6 +1566,12 @@ export {
     listGptFineTuningEvents,
     listGptFineTuningJobs,
     listOpenAIModels,
+    m4a,
+    mp3,
+    mp4,
+    mpeg,
+    mpega,
+    mpga,
     ogg,
     prompt,
     promptAnthropic,
@@ -1577,5 +1584,6 @@ export {
     trimPrompt,
     uploadFile,
     uploadFileForFineTuning,
-    wav
+    wav,
+    webm,
 };

package/lib/bot.mjs

@@ -7,10 +7,13 @@ import {
     throwError, timeout, trim, which,
 } from './utilitas.mjs';
 
+import {
+    jpeg, ogg, wav, mp3, mpega, mp4, mpeg, mpga, m4a, webm,
+} from './alan.mjs';
+
 import { readdirSync } from 'fs';
 import { parseArgs as _parseArgs } from 'node:util';
 import { basename, join } from 'path';
-import { jpeg, ogg, wav } from './alan.mjs';
 import { isPrimary, on, report } from './callosum.mjs';
 import { cleanSql, encodeVector, MYSQL, POSTGRESQL } from './dbio.mjs';
 import { convertAudioTo16kNanoPcmWave } from './media.mjs';
@@ -511,8 +514,10 @@ const subconscious = [{
             && (ctx.chatType = MENTION);
         (((ctx.txt || ctx.m.voice || ctx.m.poll || ctx.m.data || ctx.m.document
             || ctx.m.photo || ctx.m.sticker || ctx.m.video_note || ctx.m.video
-            || ctx.m.location || ctx.m.venue || ctx.m.contact) && ctx.messageId)
-            || (ctx.m.new_chat_member || ctx.m.left_chat_member)) && await next();
+            || ctx.m.audio || ctx.m.location || ctx.m.venue || ctx.m.contact
+        ) && ctx.messageId)
+            || (ctx.m.new_chat_member || ctx.m.left_chat_member))
+            && await next();
         await sessionSet(ctx.chatId);
     },
 }, {
@@ -647,15 +652,23 @@ const subconscious = [{
     },
 }, {
     run: true, priority: -8910, name: 'speech-to-text', func: async (ctx, next) => {
-        if (ctx._.speech?.stt && ctx.m.voice?.mime_type === ogg) {
+        const audio = ctx.m.voice || ctx.m.audio;
+        if (ctx._.speech?.stt && audio) {
             await ctx.ok(EMOJI_SPEECH);
             try {
-                const url = await getFileUrl(ctx.m.voice.file_id);
-                const file = await getFile(ctx.m.voice.file_id, BUFFER_ENCODE);
+                const url = await getFileUrl(audio.file_id);
+                let file = await getFile(audio.file_id, BUFFER_ENCODE);
                 const analyze = async () => {
-                    const resp = await ignoreErrFunc(
-                        async () => await ctx._.speech?.stt(file), logOptions
-                    ) || ' ';
+                    const resp = await ignoreErrFunc(async () => {
+                        [
+                            mp3, mpega, mp4, mpeg, mpga, m4a, wav, webm, ogg
+                        ].includes(audio.mime_type) || (
+                                file = await convertAudioTo16kNanoPcmWave(
+                                    file, { input: BUFFER, expected: BUFFER }
+                                )
+                            );
+                        return await ctx._.speech?.stt(file);
+                    }, logOptions) || ' ';
                     log(`STT: '${resp}'`);
                     ctx.collect(resp);
                 };

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1999.1.46",
+    "version": "1999.1.48",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1999.1.46",
+    "version": "1999.1.48",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",