@makefully/dutifully 1.13.0 → 1.13.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.13.1
+
+- Harden `say` / ElevenLabs export when the result zip has no MP3 (clearer error, no unhandled ENOENT from ID3 metadata).
+
 ## 1.13.0
 
 - Add `packfully` service client for packing images into texture atlases.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@makefully/dutifully",
-    "version": "1.13.0",
+    "version": "1.13.1",
     "description": "Client tools for Cheerfully service.",
     "main": "./src/index.js",
     "bin": {

package/src/classes/TextToSpeech.js

@@ -82,8 +82,12 @@ const
             await ensureDir(output);
         }
 
-        Object.keys(captions).forEach(async (id) => {
+        const
+            ids = Object.keys(captions);
+
+        for (let i = 0; i < ids.length; i++) {
             const
+                id = ids[i],
                 text = captionText(captions[id]),
                 tags = {
                     album,
@@ -95,13 +99,13 @@ const
                 };
 
             await id3.update(tags, `${output}${id}.mp3`);
-            
+
             if (generated) {
                 console.log(`Voice generated for "${id}".`);
             } else {
                 console.log(`Voice meta data updated for "${id}".`);
             }
-        });
+        }
     },
     mapReduction = (map, list) => list.reduce((obj, file) => {
         const
@@ -167,7 +171,7 @@ const
             }
     
             if (updateAllMetaData && present.length) {
-                appendMP3Meta({
+                await appendMP3Meta({
                     album,
                     captions: mapReduction(files, present),
                     language,
@@ -186,9 +190,39 @@ const
             const
                 {album, encodedBy, config, transcripts, updateList} = this,
                 {files, output, language, voice} = config,
-                list = updateList ?? Object.keys(files).map((id) => `${id}.mp3`);
+                list = updateList ?? Object.keys(files).map((id) => `${id}.mp3`),
+                missing = [];
+
+            for (let i = 0; i < list.length; i++) {
+                const
+                    filename = list[i],
+                    fullPath = `${output}${filename}`;
+
+                try {
+                    await fs.access(fullPath);
+                } catch (e) {
+                    missing.push(filename);
+                }
+            }
+
+            if (missing.length) {
+                let detail = '';
+
+                try {
+                    const
+                        log = JSON.parse(await fs.readFile(`${output}log.json`, 'utf8'));
+
+                    if (log?.errors?.length) {
+                        detail = ` Server errors: ${log.errors.join('; ')}`;
+                    }
+                } catch (e) { /* no log.json */ }
+
+                throw new Error(
+                    `Voice export missing ${missing.length === 1 ? `"${missing[0]}"` : `${missing.length} files (${missing.join(', ')})`}.${detail}`
+                );
+            }
 
-            appendMP3Meta({
+            await appendMP3Meta({
                 album,
                 captions: files,
                 generated: true,

package/src/say.js

@@ -59,17 +59,20 @@ const
                 },
                 path: '',
                 voice,
-                output
+                output,
+                extract: true
             },
             handler = new ElevenLabs({
                 config,
                 contents: {
                     ...contents,
-                    service: 'elevenlabs'
+                    service: 'elevenlabs',
+                    extract: true
                 }
             });
 
         delete config.script;
+        delete config.src;
 
         await handler.prepare({
             difference: false,
@@ -79,7 +82,30 @@ const
             instanceId: `${contents.id}-say`
         });
 
-        return path.join(CACHE_DIR, `${key}.mp3`);
+        const
+            mp3File = path.join(CACHE_DIR, `${key}.mp3`);
+
+        try {
+            await fsp.access(mp3File);
+        } catch (e) {
+            let detail = '';
+
+            try {
+                const
+                    log = JSON.parse(await fsp.readFile(path.join(CACHE_DIR, 'log.json'), 'utf8'));
+
+                if (log?.errors?.length) {
+                    detail = ` ${log.errors.join('; ')}`;
+                }
+            } catch (err) { /* ignore */ }
+
+            throw new Error(
+                `Speech generation finished but "${mp3File}" was not created.${detail} ` +
+                'Check that the Cheerfully worker is running and picking up elevenlabs chores.'
+            );
+        }
+
+        return mp3File;
     };
 
 module.exports = async (textOrArgs = {}) => {