@storyteller-platform/align 0.1.41 → 0.1.47

package/dist/cli/bin.cjs

@@ -359,13 +359,12 @@ async function main() {
           if (parsed.textRef === "id-fragment") {
             logger.info("Marking up EPUB...");
             startProgressBar();
-            const markedup2 = parsed.markedup ?? (0, import_node_path.join)(os.tmpdir(), `stalign-markedup-${(0, import_node_crypto.randomUUID)()}.epub`);
             if (!parsed.markedup) {
               stack.defer(() => {
-                (0, import_node_fs.rmSync)(markedup2, { recursive: true, force: true });
+                (0, import_node_fs.rmSync)(markedup, { recursive: true, force: true });
               });
             }
-            const markupTiming = await (0, import_markup.markup)(input, markedup2, {
+            const markupTiming = await (0, import_markup.markup)(input, markedup, {
               granularity: parsed.granularity,
               primaryLocale,
               logger,
@@ -376,12 +375,12 @@ async function main() {
               }
             });
             resetProgressBar();
-            logger.info(`Markup complete, marked up EPUB saved to ${markedup2}.`);
+            logger.info(`Markup complete, marked up EPUB saved to ${markedup}.`);
             if (parsed.time) {
               markupTiming.print();
             }
           } else {
-            logger.info("Skipping markup, text-range-type set to text-fragment");
+            logger.info("Skipping markup, text-ref set to text-fragment");
           }
           logger.info("Aligning EPUB with audiobook...");
           startProgressBar();

package/dist/cli/bin.js

@@ -312,13 +312,12 @@ async function main() {
           if (parsed.textRef === "id-fragment") {
             logger.info("Marking up EPUB...");
             startProgressBar();
-            const markedup2 = parsed.markedup ?? join(os.tmpdir(), `stalign-markedup-${randomUUID()}.epub`);
             if (!parsed.markedup) {
               stack.defer(() => {
-                rmSync(markedup2, { recursive: true, force: true });
+                rmSync(markedup, { recursive: true, force: true });
               });
             }
-            const markupTiming = await markup(input, markedup2, {
+            const markupTiming = await markup(input, markedup, {
               granularity: parsed.granularity,
               primaryLocale,
               logger,
@@ -329,12 +328,12 @@ async function main() {
               }
             });
             resetProgressBar();
-            logger.info(`Markup complete, marked up EPUB saved to ${markedup2}.`);
+            logger.info(`Markup complete, marked up EPUB saved to ${markedup}.`);
             if (parsed.time) {
               markupTiming.print();
             }
           } else {
-            logger.info("Skipping markup, text-range-type set to text-fragment");
+            logger.info("Skipping markup, text-ref set to text-fragment");
           }
           logger.info("Aligning EPUB with audiobook...");
           startProgressBar();

package/dist/common/ffmpeg.cjs

@@ -43,14 +43,11 @@ var import_mime = require("../process/mime.cjs");
 var import_shell = require("./shell.cjs");
 const execPromise = (0, import_node_util.promisify)(import_node_child_process.exec);
 async function execCmd(command, logger, signal) {
-  let stdout = "";
-  let stderr = "";
   try {
-    ;
-    ({ stdout, stderr } = await execPromise(command, {
+    const { stdout } = await execPromise(command, {
       maxBuffer: 50 * 1024 * 1024,
       signal: signal ?? void 0
-    }));
+    });
     return stdout;
   } catch (error) {
     if (error instanceof RangeError && error.message.includes("stdout maxBuffer length exceeded")) {
@@ -58,14 +55,16 @@ async function execCmd(command, logger, signal) {
         "stdout maxBuffer length exceeded. This likely means that youre trying to process a very large file, and the ffmpeg process is running out of memory. Maybe check the image size of your cover art."
       );
     }
+    const execErr = error;
     logger?.error(error);
-    logger?.info(stdout);
-    throw new Error(stderr);
+    if (execErr.stdout) logger?.info(execErr.stdout);
+    const errorDetail = execErr.stderr || execErr.stdout || `Command failed: ${command}`;
+    throw new Error(errorDetail);
   }
 }
 const getTrackInfo = (0, import_memoize.default)(async function getTrackInfo2(path, logger) {
   const stdout = await execCmd(
-    `ffprobe -i ${(0, import_shell.quotePath)(path)} -show_format -of json`,
+    `ffprobe -v error -i ${(0, import_shell.quotePath)(path)} -show_format -of json`,
     logger
   );
   const info = JSON.parse(stdout);

package/dist/common/ffmpeg.js

@@ -8,14 +8,11 @@ import { areSameType } from "../process/mime.js";
 import { quotePath } from "./shell.js";
 const execPromise = promisify(exec);
 async function execCmd(command, logger, signal) {
-  let stdout = "";
-  let stderr = "";
   try {
-    ;
-    ({ stdout, stderr } = await execPromise(command, {
+    const { stdout } = await execPromise(command, {
       maxBuffer: 50 * 1024 * 1024,
       signal: signal ?? void 0
-    }));
+    });
     return stdout;
   } catch (error) {
     if (error instanceof RangeError && error.message.includes("stdout maxBuffer length exceeded")) {
@@ -23,14 +20,16 @@ async function execCmd(command, logger, signal) {
         "stdout maxBuffer length exceeded. This likely means that youre trying to process a very large file, and the ffmpeg process is running out of memory. Maybe check the image size of your cover art."
       );
     }
+    const execErr = error;
     logger?.error(error);
-    logger?.info(stdout);
-    throw new Error(stderr);
+    if (execErr.stdout) logger?.info(execErr.stdout);
+    const errorDetail = execErr.stderr || execErr.stdout || `Command failed: ${command}`;
+    throw new Error(errorDetail);
   }
 }
 const getTrackInfo = memoize(async function getTrackInfo2(path, logger) {
   const stdout = await execCmd(
-    `ffprobe -i ${quotePath(path)} -show_format -of json`,
+    `ffprobe -v error -i ${quotePath(path)} -show_format -of json`,
     logger
   );
   const info = JSON.parse(stdout);

package/dist/readium/manifest.cjs

@@ -88,10 +88,19 @@ async function generateReadiumManifest(epub, options = {}) {
   const dir = await epub.getBaseDirection();
   const epubMetadata = await epub.getMetadata();
   const vocab = await epub.getPackageVocabularyPrefixes();
-  const duration = epubMetadata.find(
-    ({ properties }) => properties["property"] === "media:duration"
-  )?.value;
-  const durationMs = duration !== void 0 ? (0, import_smil_clockvalue.default)(duration) : void 0;
+  let duration = void 0;
+  const refinesDurationMap = /* @__PURE__ */ new Map();
+  for (const dur of epubMetadata) {
+    if (dur.properties["property"] !== "media:duration") continue;
+    if (!dur.properties["refines"]) {
+      duration = dur.value ? (0, import_smil_clockvalue.default)(dur.value) / 1e3 : void 0;
+      continue;
+    }
+    const value = dur.value ? (0, import_smil_clockvalue.default)(dur.value) / 1e3 : void 0;
+    if (value) {
+      refinesDurationMap.set(dur.properties["refines"], value);
+    }
+  }
   const otherMetadata = epubMetadata.filter(
     (meta) => (meta.properties["property"]?.split(":")[0] ?? "") in vocab
   ).map((meta) => {
@@ -130,8 +139,8 @@ async function generateReadiumManifest(epub, options = {}) {
     ...dir !== "auto" && {
       readingProgression: dir === "ltr" ? import_shared.ReadingProgression.ltr : import_shared.ReadingProgression.rtl
     },
-    // TODO: is this meant to be in milliseconds (as here) or seconds?
-    ...durationMs !== void 0 && { duration: durationMs },
+    // it's seconds
+    ...duration !== void 0 && { duration },
     ...numberOfPages !== void 0 && { numberOfPages },
     otherMetadata: Object.fromEntries(otherMetadata)
   });
@@ -184,16 +193,13 @@ async function generateReadiumManifest(epub, options = {}) {
       if (!item.mediaOverlay) return link;
       const mediaOverlayItem = epubManifest[item.id];
       if (!mediaOverlayItem) return link;
-      const refinedBy = epubMetadata.find(
-        ({ properties }) => properties["property"] === "media:duration" && properties["refines"] === `#${mediaOverlayItem.id}`
-      );
-      if (!refinedBy?.value) return link;
-      const itemDuration = (0, import_smil_clockvalue.default)(refinedBy.value);
+      const duration2 = refinesDurationMap.get(`#${item.mediaOverlay}`) || refinesDurationMap.get(`#${mediaOverlayItem.id}`);
+      if (!duration2) return link;
       return new import_shared.Link({
         href: link.href,
         type: link.mediaType.string,
         ...link.properties && { properties: link.properties },
-        duration: itemDuration
+        duration: duration2
       });
     })
   );

package/dist/readium/manifest.js

@@ -71,10 +71,19 @@ async function generateReadiumManifest(epub, options = {}) {
   const dir = await epub.getBaseDirection();
   const epubMetadata = await epub.getMetadata();
   const vocab = await epub.getPackageVocabularyPrefixes();
-  const duration = epubMetadata.find(
-    ({ properties }) => properties["property"] === "media:duration"
-  )?.value;
-  const durationMs = duration !== void 0 ? clockvalue(duration) : void 0;
+  let duration = void 0;
+  const refinesDurationMap = /* @__PURE__ */ new Map();
+  for (const dur of epubMetadata) {
+    if (dur.properties["property"] !== "media:duration") continue;
+    if (!dur.properties["refines"]) {
+      duration = dur.value ? clockvalue(dur.value) / 1e3 : void 0;
+      continue;
+    }
+    const value = dur.value ? clockvalue(dur.value) / 1e3 : void 0;
+    if (value) {
+      refinesDurationMap.set(dur.properties["refines"], value);
+    }
+  }
   const otherMetadata = epubMetadata.filter(
     (meta) => (meta.properties["property"]?.split(":")[0] ?? "") in vocab
   ).map((meta) => {
@@ -113,8 +122,8 @@ async function generateReadiumManifest(epub, options = {}) {
     ...dir !== "auto" && {
       readingProgression: dir === "ltr" ? ReadingProgression.ltr : ReadingProgression.rtl
     },
-    // TODO: is this meant to be in milliseconds (as here) or seconds?
-    ...durationMs !== void 0 && { duration: durationMs },
+    // it's seconds
+    ...duration !== void 0 && { duration },
     ...numberOfPages !== void 0 && { numberOfPages },
     otherMetadata: Object.fromEntries(otherMetadata)
   });
@@ -167,16 +176,13 @@ async function generateReadiumManifest(epub, options = {}) {
       if (!item.mediaOverlay) return link;
       const mediaOverlayItem = epubManifest[item.id];
       if (!mediaOverlayItem) return link;
-      const refinedBy = epubMetadata.find(
-        ({ properties }) => properties["property"] === "media:duration" && properties["refines"] === `#${mediaOverlayItem.id}`
-      );
-      if (!refinedBy?.value) return link;
-      const itemDuration = clockvalue(refinedBy.value);
+      const duration2 = refinesDurationMap.get(`#${item.mediaOverlay}`) || refinesDurationMap.get(`#${mediaOverlayItem.id}`);
+      if (!duration2) return link;
       return new Link({
         href: link.href,
         type: link.mediaType.string,
         ...link.properties && { properties: link.properties },
-        duration: itemDuration
+        duration: duration2
       });
     })
   );

package/dist/transcribe/transcribe.cjs

@@ -101,8 +101,9 @@ async function transcribe(input, output, locale, options) {
   const engine = options.engine ?? "whisper.cpp";
   const model = options.model ?? "tiny.en";
   if (engine === "whisper.cpp") {
+    const resolvedModel = getWhisperCppModelId(locale.language, model);
     await (0, import_ghost_story.ensureWhisperInstalled)({
-      model,
+      model: resolvedModel,
       printOutput: ["debug", "info"].includes(
         options.logger?.level ?? "silent"
       ),
@@ -205,8 +206,12 @@ async function transcribeFile(input, locale, options) {
       const fallbackVariant = getCpuOverrideVariant(
         options.whisperCpuOverride ?? null
       );
+      const resolvedModel = getWhisperCppModelId(
+        sharedOptions.language,
+        options.model
+      );
       const whisperOptions = await (0, import_ghost_story.ensureWhisperInstalled)({
-        model: options.model,
+        model: resolvedModel,
         variant: fallbackVariant,
         printOutput: ["debug", "info"].includes(
           options.logger?.level ?? "silent"
@@ -218,7 +223,7 @@ async function transcribeFile(input, locale, options) {
         engine: options.engine,
         options: {
           flashAttention: true,
-          model: getWhisperCppModelId(sharedOptions.language, options.model),
+          model: resolvedModel,
           processors: options.processors,
           threads: options.threads,
           onProgress: (progress) => {

package/dist/transcribe/transcribe.js

@@ -32,8 +32,9 @@ async function transcribe(input, output, locale, options) {
   const engine = options.engine ?? "whisper.cpp";
   const model = options.model ?? "tiny.en";
   if (engine === "whisper.cpp") {
+    const resolvedModel = getWhisperCppModelId(locale.language, model);
     await ensureWhisperInstalled({
-      model,
+      model: resolvedModel,
       printOutput: ["debug", "info"].includes(
         options.logger?.level ?? "silent"
       ),
@@ -136,8 +137,12 @@ async function transcribeFile(input, locale, options) {
       const fallbackVariant = getCpuOverrideVariant(
         options.whisperCpuOverride ?? null
       );
+      const resolvedModel = getWhisperCppModelId(
+        sharedOptions.language,
+        options.model
+      );
       const whisperOptions = await ensureWhisperInstalled({
-        model: options.model,
+        model: resolvedModel,
         variant: fallbackVariant,
         printOutput: ["debug", "info"].includes(
           options.logger?.level ?? "silent"
@@ -149,7 +154,7 @@ async function transcribeFile(input, locale, options) {
         engine: options.engine,
         options: {
           flashAttention: true,
-          model: getWhisperCppModelId(sharedOptions.language, options.model),
+          model: resolvedModel,
           processors: options.processors,
           threads: options.threads,
           onProgress: (progress) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storyteller-platform/align",
-  "version": "0.1.41",
+  "version": "0.1.47",
   "description": "A library and CLI for automatically aligning audiobooks and EPUBs to produce Media Overlays",
   "author": "Shane Friedman",
   "license": "MIT",
@@ -70,8 +70,8 @@
     "@optique/core": "^0.10.7",
     "@optique/run": "^0.10.7",
     "@readium/shared": "^2.2.0",
-    "@storyteller-platform/audiobook": "^0.4.0",
-    "@storyteller-platform/epub": "^0.6.0",
+    "@storyteller-platform/audiobook": "^0.4.1",
+    "@storyteller-platform/epub": "^0.6.1",
     "@storyteller-platform/ghost-story": "^0.1.11",
     "@storyteller-platform/transliteration": "^3.1.2",
     "chalk": "^5.4.1",