@storyteller-platform/align 0.1.57 → 0.1.58

package/dist/process/processAudiobook.cjs

@@ -72,6 +72,7 @@ var import_node_path = require("node:path");
 var import_async_semaphore = require("@esfx/async-semaphore");
 var import_audiobook = require("@storyteller-platform/audiobook");
 var import_ghost_story = require("@storyteller-platform/ghost-story");
+var import_media_types = require("@storyteller-platform/media-types");
 var import_ffmpeg = require("../common/ffmpeg.cjs");
 var import_ranges = require("./ranges.cjs");
 async function processAudiobook(input, output, options) {
@@ -81,7 +82,10 @@ async function processAudiobook(input, output, options) {
   timing.setMetadata("max-length", `${(options.maxLength ?? 2) * 60} minutes`);
   await (0, import_promises.mkdir)(output, { recursive: true });
   const allFiles = await (0, import_promises.readdir)(input, { recursive: true });
-  const filenames = allFiles.filter((f) => (0, import_audiobook.isAudioFile)(f) || (0, import_audiobook.isZipArchive)(f));
+  const filenames = allFiles.filter((f) => {
+    const kind = import_media_types.MediaType.fromPath(f)?.kind;
+    return kind === "audio" || kind === "archive";
+  });
   options.logger?.debug(`Found ${filenames.length} files to process`);
   const outputFiles = [];
   const controller = new AbortController();
@@ -127,10 +131,10 @@ async function processAudiobook(input, output, options) {
   return timing;
 }
 async function resolveVbrEncoding(filepath, userEncoding, logger) {
-  if (userEncoding?.codec && userEncoding.codec !== "libmp3lame") {
+  if (userEncoding?.codec && userEncoding.codec !== import_audiobook.AUDIO_ENCODERS.mp3) {
     return userEncoding;
   }
-  const sourceIsMp3 = (0, import_node_path.extname)(filepath).toLowerCase() === ".mp3";
+  const sourceIsMp3 = import_media_types.MediaType.fromPath(filepath) === import_media_types.MediaType.MPEG_AUDIO;
   if (!userEncoding?.codec && !sourceIsMp3) {
     return userEncoding;
   }
@@ -143,7 +147,7 @@ async function resolveVbrEncoding(filepath, userEncoding, logger) {
     `Forcing CBR MP3 for ${filepath} (avg ${trackInfo.bitRate}bps) at ${targetBitrate / 1e3}k`
   );
   return {
-    codec: "libmp3lame",
+    codec: import_audiobook.AUDIO_ENCODERS.mp3,
     bitrate: `${targetBitrate / 1e3}k`
   };
 }
@@ -182,10 +186,10 @@ async function processFile(input, output, prefix, options) {
         var _stack2 = [];
         try {
           const effectiveEncoding = vbrEncodings.has(range.filepath) ? vbrEncodings.get(range.filepath) : options.encoding;
-          const outputExtension = determineExtension(
-            range.filepath,
-            effectiveEncoding?.codec
-          );
+          const outputExtension = (0, import_audiobook.outputContainer)(
+            effectiveEncoding?.codec,
+            import_media_types.MediaType.fromPath(range.filepath)
+          )?.extension ?? (0, import_node_path.extname)(range.filepath);
           const outputFilename = `${prefix}${(index + 1).toString().padStart(5, "0")}${outputExtension}`;
           const outputFilepath = (0, import_node_path.join)(output, outputFilename);
           const stack = __using(_stack2, new DisposableStack());
@@ -226,21 +230,6 @@ async function processFile(input, output, prefix, options) {
     __callDispose(_stack, _error, _hasError);
   }
 }
-function determineExtension(input, codec) {
-  if (codec === "libmp3lame") {
-    return ".mp3";
-  }
-  if (codec === "aac" || codec === "libopus") {
-    return ".mp4";
-  }
-  if (import_audiobook.MP3_FILE_EXTENSIONS.some((ext) => input.endsWith(ext))) {
-    return ".mp3";
-  }
-  if (import_audiobook.MPEG4_FILE_EXTENSIONS.some((ext) => input.endsWith(ext)) || import_audiobook.OGG_FILE_EXTENSIONS.some((ext) => input.endsWith(ext)) || import_audiobook.OPUS_FILE_EXTENSIONS.some((ext) => input.endsWith(ext)) || import_audiobook.AAC_FILE_EXTENSIONS.some((ext) => input.endsWith(ext))) {
-    return ".mp4";
-  }
-  return (0, import_node_path.extname)(input);
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   processAudiobook,

package/dist/process/processAudiobook.js

@@ -6,19 +6,15 @@ import { mkdir, readdir } from "node:fs/promises";
 import { extname, join } from "node:path";
 import { AsyncSemaphore } from "@esfx/async-semaphore";
 import {
-  AAC_FILE_EXTENSIONS,
+  AUDIO_ENCODERS,
   Audiobook,
-  MP3_FILE_EXTENSIONS,
-  MPEG4_FILE_EXTENSIONS,
-  OGG_FILE_EXTENSIONS,
-  OPUS_FILE_EXTENSIONS,
-  isAudioFile,
-  isZipArchive
+  outputContainer
 } from "@storyteller-platform/audiobook";
 import {
   createAggregator,
   createTiming
 } from "@storyteller-platform/ghost-story";
+import { MediaType } from "@storyteller-platform/media-types";
 import {
   getTrackInfo,
   isVbrMp3,
@@ -33,7 +29,10 @@ async function processAudiobook(input, output, options) {
   timing.setMetadata("max-length", `${(options.maxLength ?? 2) * 60} minutes`);
   await mkdir(output, { recursive: true });
   const allFiles = await readdir(input, { recursive: true });
-  const filenames = allFiles.filter((f) => isAudioFile(f) || isZipArchive(f));
+  const filenames = allFiles.filter((f) => {
+    const kind = MediaType.fromPath(f)?.kind;
+    return kind === "audio" || kind === "archive";
+  });
   options.logger?.debug(`Found ${filenames.length} files to process`);
   const outputFiles = [];
   const controller = new AbortController();
@@ -79,10 +78,10 @@ async function processAudiobook(input, output, options) {
   return timing;
 }
 async function resolveVbrEncoding(filepath, userEncoding, logger) {
-  if (userEncoding?.codec && userEncoding.codec !== "libmp3lame") {
+  if (userEncoding?.codec && userEncoding.codec !== AUDIO_ENCODERS.mp3) {
     return userEncoding;
   }
-  const sourceIsMp3 = extname(filepath).toLowerCase() === ".mp3";
+  const sourceIsMp3 = MediaType.fromPath(filepath) === MediaType.MPEG_AUDIO;
   if (!userEncoding?.codec && !sourceIsMp3) {
     return userEncoding;
   }
@@ -95,7 +94,7 @@ async function resolveVbrEncoding(filepath, userEncoding, logger) {
     `Forcing CBR MP3 for ${filepath} (avg ${trackInfo.bitRate}bps) at ${targetBitrate / 1e3}k`
   );
   return {
-    codec: "libmp3lame",
+    codec: AUDIO_ENCODERS.mp3,
     bitrate: `${targetBitrate / 1e3}k`
   };
 }
@@ -134,10 +133,10 @@ async function processFile(input, output, prefix, options) {
         var _stack2 = [];
         try {
           const effectiveEncoding = vbrEncodings.has(range.filepath) ? vbrEncodings.get(range.filepath) : options.encoding;
-          const outputExtension = determineExtension(
-            range.filepath,
-            effectiveEncoding?.codec
-          );
+          const outputExtension = outputContainer(
+            effectiveEncoding?.codec,
+            MediaType.fromPath(range.filepath)
+          )?.extension ?? extname(range.filepath);
           const outputFilename = `${prefix}${(index + 1).toString().padStart(5, "0")}${outputExtension}`;
           const outputFilepath = join(output, outputFilename);
           const stack = __using(_stack2, new DisposableStack());
@@ -178,21 +177,6 @@ async function processFile(input, output, prefix, options) {
     __callDispose(_stack, _error, _hasError);
   }
 }
-function determineExtension(input, codec) {
-  if (codec === "libmp3lame") {
-    return ".mp3";
-  }
-  if (codec === "aac" || codec === "libopus") {
-    return ".mp4";
-  }
-  if (MP3_FILE_EXTENSIONS.some((ext) => input.endsWith(ext))) {
-    return ".mp3";
-  }
-  if (MPEG4_FILE_EXTENSIONS.some((ext) => input.endsWith(ext)) || OGG_FILE_EXTENSIONS.some((ext) => input.endsWith(ext)) || OPUS_FILE_EXTENSIONS.some((ext) => input.endsWith(ext)) || AAC_FILE_EXTENSIONS.some((ext) => input.endsWith(ext))) {
-    return ".mp4";
-  }
-  return extname(input);
-}
 export {
   processAudiobook,
   processFile

package/dist/process/ranges.cjs

@@ -69,8 +69,8 @@ __export(ranges_exports, {
 module.exports = __toCommonJS(ranges_exports);
 var import_node_crypto = require("node:crypto");
 var import_promises = require("node:fs/promises");
-var import_node_os = require("node:os");
 var import_node_path = require("node:path");
+var import_fs = require("@storyteller-platform/fs");
 var import_vad = require("@storyteller-platform/ghost-story/vad");
 var import_ffmpeg = require("../common/ffmpeg.cjs");
 async function getSafeChapterRanges(input, duration, chapters, maxSeconds, signal, logger) {
@@ -125,7 +125,7 @@ async function getSafeRanges(input, duration, maxSeconds, start = 0, signal, log
   try {
     const ext = (0, import_node_path.extname)(input);
     const rawFilename = (0, import_node_path.basename)(input, ext);
-    const tmpDir = (0, import_node_path.join)((0, import_node_os.tmpdir)(), `storyteller-align-silence-${(0, import_node_crypto.randomUUID)()}`);
+    const tmpDir = (0, import_fs.scratchPath)(`storyteller-align-silence-${(0, import_node_crypto.randomUUID)()}`);
     const stack = __using(_stack, new AsyncDisposableStack(), true);
     stack.defer(async () => {
       await (0, import_promises.rm)(tmpDir, { recursive: true, force: true });

package/dist/process/ranges.js

@@ -4,8 +4,8 @@ import {
 } from "../chunk-BIEQXUOY.js";
 import { randomUUID } from "node:crypto";
 import { mkdir, rm } from "node:fs/promises";
-import { tmpdir } from "node:os";
 import { basename, dirname, extname, join } from "node:path";
+import { scratchPath } from "@storyteller-platform/fs";
 import { detectVoiceActivity } from "@storyteller-platform/ghost-story/vad";
 import { splitFile } from "../common/ffmpeg.js";
 async function getSafeChapterRanges(input, duration, chapters, maxSeconds, signal, logger) {
@@ -60,7 +60,7 @@ async function getSafeRanges(input, duration, maxSeconds, start = 0, signal, log
   try {
     const ext = extname(input);
     const rawFilename = basename(input, ext);
-    const tmpDir = join(tmpdir(), `storyteller-align-silence-${randomUUID()}`);
+    const tmpDir = scratchPath(`storyteller-align-silence-${randomUUID()}`);
     const stack = __using(_stack, new AsyncDisposableStack(), true);
     stack.defer(async () => {
       await rm(tmpDir, { recursive: true, force: true });

package/dist/readium/guidedNavigation.cjs

@@ -36,8 +36,8 @@ var import_shared = require("@readium/shared");
 var import_change_case = require("change-case");
 var import_itertools = require("itertools");
 var import_smil_clockvalue = __toESM(require("smil-clockvalue"), 1);
-var import_audiobook = require("@storyteller-platform/audiobook");
 var import_epub = require("@storyteller-platform/epub");
+var import_media_types = require("@storyteller-platform/media-types");
 function generateGuidedNavigationManifest(title, guidedNavDocs) {
   const readingOrder = [];
   for (const doc of guidedNavDocs) {
@@ -67,18 +67,18 @@ function generateGuidedNavigationManifest(title, guidedNavDocs) {
     const audioReferences = Object.entries(referencedAudioFiles).map(
       ([audioFile, { start, end }]) => ({
         href: `${audioFile}#t=${start},${end}`,
-        type: (0, import_audiobook.lookupAudioMime)(audioFile)
+        type: import_media_types.MediaType.fromPath(audioFile)?.mime ?? null
       })
     );
     readingOrder.push(
       new import_shared.Link({
         href,
-        type: "application/guided-navigation+json",
+        type: import_media_types.MediaType.GUIDED_NAVIGATION.mime,
         properties: new import_shared.Properties({
           references: [
             {
               href: textref,
-              type: "application/xhtml+xml"
+              type: import_media_types.MediaType.XHTML.mime
             },
             ...audioReferences
           ]
@@ -96,7 +96,7 @@ function generateGuidedNavigationManifest(title, guidedNavDocs) {
     links: new import_shared.Links([
       new import_shared.Link({
         href: "manifest.json",
-        type: "application/webpub+json",
+        type: import_media_types.MediaType.WEBPUB_MANIFEST.mime,
         rels: /* @__PURE__ */ new Set(["self"])
       })
     ]),
@@ -126,7 +126,7 @@ async function generateGuidedNavigationDocuments(epub) {
         new import_shared.Link({
           rels: /* @__PURE__ */ new Set(["prev"]),
           href: `GND/${prevOverlay.id}.json`,
-          type: "application/guided-navigation+json"
+          type: import_media_types.MediaType.GUIDED_NAVIGATION.mime
         })
       );
     }
@@ -134,7 +134,7 @@ async function generateGuidedNavigationDocuments(epub) {
       new import_shared.Link({
         rels: /* @__PURE__ */ new Set(["self"]),
         href: `GND/${overlay.id}.json`,
-        type: "application/guided-navigation+json"
+        type: import_media_types.MediaType.GUIDED_NAVIGATION.mime
       })
     );
     const nextOverlay = mediaOverlays[i + 1];
@@ -143,7 +143,7 @@ async function generateGuidedNavigationDocuments(epub) {
         new import_shared.Link({
           rels: /* @__PURE__ */ new Set(["next"]),
           href: `GND/${nextOverlay.id}.json`,
-          type: "application/guided-navigation+json"
+          type: import_media_types.MediaType.GUIDED_NAVIGATION.mime
         })
       );
     }

package/dist/readium/guidedNavigation.js

@@ -11,10 +11,10 @@ import {
 import { camelCase } from "change-case";
 import { enumerate } from "itertools";
 import clockvalue from "smil-clockvalue";
-import { lookupAudioMime } from "@storyteller-platform/audiobook";
 import {
   Epub
 } from "@storyteller-platform/epub";
+import { MediaType } from "@storyteller-platform/media-types";
 function generateGuidedNavigationManifest(title, guidedNavDocs) {
   const readingOrder = [];
   for (const doc of guidedNavDocs) {
@@ -44,18 +44,18 @@ function generateGuidedNavigationManifest(title, guidedNavDocs) {
     const audioReferences = Object.entries(referencedAudioFiles).map(
       ([audioFile, { start, end }]) => ({
         href: `${audioFile}#t=${start},${end}`,
-        type: lookupAudioMime(audioFile)
+        type: MediaType.fromPath(audioFile)?.mime ?? null
       })
     );
     readingOrder.push(
       new Link({
         href,
-        type: "application/guided-navigation+json",
+        type: MediaType.GUIDED_NAVIGATION.mime,
         properties: new Properties({
           references: [
             {
               href: textref,
-              type: "application/xhtml+xml"
+              type: MediaType.XHTML.mime
             },
             ...audioReferences
           ]
@@ -73,7 +73,7 @@ function generateGuidedNavigationManifest(title, guidedNavDocs) {
     links: new Links([
       new Link({
         href: "manifest.json",
-        type: "application/webpub+json",
+        type: MediaType.WEBPUB_MANIFEST.mime,
         rels: /* @__PURE__ */ new Set(["self"])
       })
     ]),
@@ -103,7 +103,7 @@ async function generateGuidedNavigationDocuments(epub) {
         new Link({
           rels: /* @__PURE__ */ new Set(["prev"]),
           href: `GND/${prevOverlay.id}.json`,
-          type: "application/guided-navigation+json"
+          type: MediaType.GUIDED_NAVIGATION.mime
         })
       );
     }
@@ -111,7 +111,7 @@ async function generateGuidedNavigationDocuments(epub) {
       new Link({
         rels: /* @__PURE__ */ new Set(["self"]),
         href: `GND/${overlay.id}.json`,
-        type: "application/guided-navigation+json"
+        type: MediaType.GUIDED_NAVIGATION.mime
       })
     );
     const nextOverlay = mediaOverlays[i + 1];
@@ -120,7 +120,7 @@ async function generateGuidedNavigationDocuments(epub) {
         new Link({
           rels: /* @__PURE__ */ new Set(["next"]),
           href: `GND/${nextOverlay.id}.json`,
-          type: "application/guided-navigation+json"
+          type: MediaType.GUIDED_NAVIGATION.mime
         })
       );
     }

package/dist/readium/manifest.cjs

@@ -33,6 +33,7 @@ __export(manifest_exports, {
 module.exports = __toCommonJS(manifest_exports);
 var import_shared = require("@readium/shared");
 var import_smil_clockvalue = __toESM(require("smil-clockvalue"), 1);
+var import_media_types = require("@storyteller-platform/media-types");
 const BYTES_PER_PAGE = 1024;
 async function generateReadiumManifest(epub, options = {}) {
   const primaryLocale = await epub.getLanguage() ?? new Intl.Locale("en-US");
@@ -161,7 +162,7 @@ async function generateReadiumManifest(epub, options = {}) {
         alternates: new import_shared.Links([
           new import_shared.Link({
             href: `GND/${mediaOverlayItem.id}.json`,
-            type: "application/guided-navigation+json"
+            type: import_media_types.MediaType.GUIDED_NAVIGATION.mime
           })
         ])
       });
@@ -174,7 +175,7 @@ async function generateReadiumManifest(epub, options = {}) {
       if (item.id === coverItem?.id) {
         rels.add("cover");
       }
-      if (item.mediaType === "application/xhtml+xml") {
+      if (item.mediaType === import_media_types.MediaType.XHTML.mime) {
         rels.add("contents");
       }
       const otherResourceMetadata = epubMetadata.filter((meta) => meta.properties["refines"] === `#${item.id}`).filter(
@@ -232,7 +233,7 @@ async function generateReadiumManifest(epub, options = {}) {
     links: new import_shared.Links([
       new import_shared.Link({
         href: "manifest.json",
-        type: "application/webpub+json",
+        type: import_media_types.MediaType.WEBPUB_MANIFEST.mime,
         rels: /* @__PURE__ */ new Set(["self"])
       })
     ]),
@@ -249,7 +250,7 @@ async function inferPageCount(epub, spine, signal) {
         signal.reason instanceof Error ? signal.reason.message : "Aborted while inferring page count"
       );
     }
-    if (item.mediaType !== "application/xhtml+xml") continue;
+    if (item.mediaType !== import_media_types.MediaType.XHTML.mime) continue;
     try {
       const length = await epub.getItemArchiveLength(item.id);
       total += Math.max(1, Math.ceil(length / BYTES_PER_PAGE));

package/dist/readium/manifest.js

@@ -16,6 +16,7 @@ import {
   Subjects
 } from "@readium/shared";
 import clockvalue from "smil-clockvalue";
+import { MediaType } from "@storyteller-platform/media-types";
 const BYTES_PER_PAGE = 1024;
 async function generateReadiumManifest(epub, options = {}) {
   const primaryLocale = await epub.getLanguage() ?? new Intl.Locale("en-US");
@@ -144,7 +145,7 @@ async function generateReadiumManifest(epub, options = {}) {
         alternates: new Links([
           new Link({
             href: `GND/${mediaOverlayItem.id}.json`,
-            type: "application/guided-navigation+json"
+            type: MediaType.GUIDED_NAVIGATION.mime
           })
         ])
       });
@@ -157,7 +158,7 @@ async function generateReadiumManifest(epub, options = {}) {
       if (item.id === coverItem?.id) {
         rels.add("cover");
       }
-      if (item.mediaType === "application/xhtml+xml") {
+      if (item.mediaType === MediaType.XHTML.mime) {
         rels.add("contents");
       }
       const otherResourceMetadata = epubMetadata.filter((meta) => meta.properties["refines"] === `#${item.id}`).filter(
@@ -215,7 +216,7 @@ async function generateReadiumManifest(epub, options = {}) {
     links: new Links([
       new Link({
         href: "manifest.json",
-        type: "application/webpub+json",
+        type: MediaType.WEBPUB_MANIFEST.mime,
         rels: /* @__PURE__ */ new Set(["self"])
       })
     ]),
@@ -232,7 +233,7 @@ async function inferPageCount(epub, spine, signal) {
         signal.reason instanceof Error ? signal.reason.message : "Aborted while inferring page count"
       );
     }
-    if (item.mediaType !== "application/xhtml+xml") continue;
+    if (item.mediaType !== MediaType.XHTML.mime) continue;
     try {
       const length = await epub.getItemArchiveLength(item.id);
       total += Math.max(1, Math.ceil(length / BYTES_PER_PAGE));