waha-shared 1.0.509 → 1.0.511

package/dist/functions/sets.js

@@ -75,6 +75,23 @@ function getSetTranslations({ setInfo, lessonId, languageId, t, }) {
             : undefined;
     }
 }
+/**
+ * Fills in a section's own audio duration and its FTB clip's, so nothing
+ * downstream has to look them up. A story section's own duration only exists
+ * for custom passage recordings.
+ */
+function resolveDurations(section) {
+    const [bibleId, passageId] = section.id.split(';');
+    return {
+        ...section,
+        duration: section.chapter === sets_2.Chapter.STORY
+            ? bibleStatuses_1.bibleStatuses[bibleId]?.customPassages?.[passageId]
+            : (0, media_1.getCachedDuration)(section.path),
+        ftbDuration: section.ftbPath
+            ? (0, media_1.getCachedDuration)(section.ftbPath)
+            : undefined,
+    };
+}
 /** Assembles all of the audio sections for a lesson. */
 function assembleLessonSections({ languageInfo, setInfo, lesson, t, useSpokenQuestions, }) {
     const fellowshipQuestions = languageInfo.questionSets.find((questionSet) => questionSet.questionSetId === lesson.f)?.questions ?? [];
@@ -214,18 +231,14 @@ function assembleLessonSections({ languageInfo, setInfo, lesson, t, useSpokenQue
                 ].join('.')),
         });
     });
+    const resolved = sections.map(resolveDurations);
+    const chapterDuration = (chapter) => resolved
+        .filter((s) => s.chapter === chapter)
+        .reduce((sum, section) => sum + (section.pauseBefore ?? 0) + (section.duration ?? 0), 0);
     return {
-        sections,
-        fellowshipDuration: sections
-            .filter((s) => s.chapter === sets_2.Chapter.FELLOWSHIP)
-            .reduce((sum, section) => sum +
-            (section.pauseBefore ?? 0) +
-            ((0, media_1.getCachedDuration)(section.path) ?? 0), 0),
-        applicationDuration: sections
-            .filter((s) => s.chapter === sets_2.Chapter.APPLICATION)
-            .reduce((sum, section) => sum +
-            (section.pauseBefore ?? 0) +
-            ((0, media_1.getCachedDuration)(section.path) ?? 0), 0),
+        sections: resolved,
+        fellowshipDuration: chapterDuration(sets_2.Chapter.FELLOWSHIP),
+        applicationDuration: chapterDuration(sets_2.Chapter.APPLICATION),
     };
 }
 function getTrainingVideoPaths({ languageInfo, lessonId, }) {
@@ -296,10 +309,12 @@ function getLessonInfo({ lessonId, languageInfo, setInfo, t, useSpokenQuestions,
         ...languageInfo,
     };
     if (specialIds_1.specialIds.evaluationQuestionLessonIds.includes(lesson.lessonId)) {
+        const eqPath = (0, utils_1.join)(languageInfo.contentLanguages.intros, 'introductions', `${languageInfo.contentLanguages.intros}.eq.mp3`);
         return {
             type: 'eq',
             ...baseInfo,
-            eqPath: (0, utils_1.join)(languageInfo.contentLanguages.intros, 'introductions', `${languageInfo.contentLanguages.intros}.eq.mp3`),
+            eqPath,
+            mediaDuration: (0, media_1.getCachedDuration)(eqPath),
         };
     }
     if (setInfo.setId === specialIds_1.specialIds.dmCourseSetId || languageId === 'ase') {
@@ -333,6 +348,7 @@ function getLessonInfo({ lessonId, languageInfo, setInfo, t, useSpokenQuestions,
             lessonSectionHeader: thisSetTranslations?.sectionHeaders?.[lessonId],
             lessonSectionBody: thisSetTranslations?.sectionBodies?.[lessonId],
             videoPath,
+            mediaDuration: (0, media_1.getCachedDuration)(videoPath),
             fullPath: lesson.s.length > 0 && languageId !== 'ase'
                 ? videoFullAudioPath
                 : undefined,
@@ -352,6 +368,7 @@ function getLessonInfo({ lessonId, languageInfo, setInfo, t, useSpokenQuestions,
             passagesString,
             fullPath,
             storyPath,
+            mediaDuration: (0, media_1.getCachedDuration)(fullPath),
             dbsCastPath: (0, utils_1.join)(languageId, `full_lessons${languageInfo.assetVersions?.cast ?? ''}`, setInfo.setId, [languageId, lessonId, '1080', 'mp4'].join('.')),
         };
     }
@@ -362,24 +379,13 @@ function shouldShowLesson(lessonInfo) {
         console.log('Missing lesson info or lessonTitle lesson:', lessonInfo?.lessonId);
         return false;
     }
-    else if (lessonInfo.type === 'eq' &&
-        (0, media_1.getCachedDuration)(lessonInfo.eqPath) === undefined) {
-        console.log('Missing remote eq file for lesson:', lessonInfo.lessonId);
-        return false;
-    }
-    else if (lessonInfo.type === 'dbs' &&
-        (0, media_1.getCachedDuration)(lessonInfo.fullPath) === undefined) {
-        console.log('Missing remote dbs file for lesson:', lessonInfo.lessonId);
-        return false;
-    }
-    else if (lessonInfo.type === 'video' &&
-        lessonInfo.videoPath &&
-        (0, media_1.getCachedDuration)(lessonInfo.videoPath) === undefined) {
-        console.log('Missing remote video for lesson:', lessonInfo.lessonId);
+    // Video-only lessons without a video file have nothing to check.
+    const hasMedia = lessonInfo.type !== 'video' || Boolean(lessonInfo.videoPath);
+    if (hasMedia && lessonInfo.mediaDuration === undefined) {
+        console.log(`Missing remote ${lessonInfo.type} file for lesson:`, lessonInfo.lessonId);
         return false;
     }
-    else
-        return true;
+    return true;
 }
 /**
  * Validates that the computed lesson duration (from section lengths) matches

package/dist/functions/upload.d.ts

@@ -17,6 +17,21 @@ export interface UploadBucket {
     }): Promise<unknown>;
 }
 export type UploadResult = 'uploaded' | 'skipped';
+/** The content type to upload a file with, from its extension. */
+export declare function contentTypeFor(path: string): string;
+export interface UploadFileParams {
+    bucket: UploadBucket;
+    localPath: string;
+    remotePath: string;
+    overwrite?: boolean;
+}
+/**
+ * The metadata recording a file's duration, or undefined when the probe didn't
+ * return a usable one.
+ */
+export declare function durationMetadata(duration: number): {
+    duration: string;
+} | undefined;
 /**
  * Upload a local file to a Cloud Storage bucket. The content type is inferred
  * from the file extension via {@link CONTENT_TYPE_BY_EXTENSION}. Returns
@@ -26,9 +41,4 @@ export type UploadResult = 'uploaded' | 'skipped';
  * Sets a `duration` metadata field (in seconds) from ffprobe when probing
  * succeeds; metadata failures are swallowed since they're non-fatal.
  */
-export declare function uploadFile({ bucket, localPath, overwrite, remotePath, }: {
-    bucket: UploadBucket;
-    localPath: string;
-    remotePath: string;
-    overwrite?: boolean;
-}): Promise<UploadResult>;
+export declare function uploadFile({ bucket, localPath, overwrite, remotePath, }: UploadFileParams): Promise<UploadResult>;

package/dist/functions/upload.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.contentTypeFor = contentTypeFor;
+exports.durationMetadata = durationMetadata;
 exports.uploadFile = uploadFile;
 const path_1 = require("path");
 const ffmpeg_1 = require("./ffmpeg");
@@ -7,6 +9,7 @@ const CONTENT_TYPE_BY_EXTENSION = {
     '.mp3': 'audio/mpeg',
     '.mp4': 'video/mp4',
 };
+/** The content type to upload a file with, from its extension. */
 function contentTypeFor(path) {
     const ext = (0, path_1.extname)(path).toLowerCase();
     const contentType = CONTENT_TYPE_BY_EXTENSION[ext];
@@ -15,6 +18,15 @@ function contentTypeFor(path) {
             `Add it to CONTENT_TYPE_BY_EXTENSION in shared/functions/upload.ts.`);
     return contentType;
 }
+/**
+ * The metadata recording a file's duration, or undefined when the probe didn't
+ * return a usable one.
+ */
+function durationMetadata(duration) {
+    if (isNaN(duration) || duration <= 0)
+        return;
+    return { duration: duration.toString() };
+}
 /**
  * Upload a local file to a Cloud Storage bucket. The content type is inferred
  * from the file extension via {@link CONTENT_TYPE_BY_EXTENSION}. Returns
@@ -35,12 +47,9 @@ async function uploadFile({ bucket, localPath, overwrite, remotePath, }) {
         public: true,
     });
     try {
-        const duration = await (0, ffmpeg_1.getDurationFromFile)(localPath);
-        if (!isNaN(duration) && duration > 0) {
-            await bucket.file(remotePath).setMetadata({
-                metadata: { duration: duration.toString() },
-            });
-        }
+        const metadata = durationMetadata(await (0, ffmpeg_1.getDurationFromFile)(localPath));
+        if (metadata)
+            await bucket.file(remotePath).setMetadata({ metadata });
     }
     catch {
         // Non-fatal — proceed even if setting duration metadata fails.

package/dist/functions/utils.d.ts

@@ -2,8 +2,6 @@ export declare const join: (...parts: string[]) => string;
 export declare const basename: (p: string) => string;
 export declare const first: (p: string) => string;
 export declare const dirname: (p: string) => string;
-export declare const extname: (p: string) => string;
-export declare const basenamenoext: (p: string) => string;
 /** Safely read `code`/`message` off an unknown thrown value. */
 export declare function getErrorInfo(e: unknown): {
     code?: string;

package/dist/functions/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.basenamenoext = exports.extname = exports.dirname = exports.first = exports.basename = exports.join = void 0;
+exports.dirname = exports.first = exports.basename = exports.join = void 0;
 exports.getErrorInfo = getErrorInfo;
 const join = (...parts) => parts.join('/').replace(/\/+/g, '/');
 exports.join = join;
@@ -10,14 +10,6 @@ const first = (p) => p.split('/')[0];
 exports.first = first;
 const dirname = (p) => p.substring(0, p.lastIndexOf('/'));
 exports.dirname = dirname;
-const extname = (p) => p.slice(p.lastIndexOf('.'));
-exports.extname = extname;
-const basenamenoext = (p) => {
-    const base = (0, exports.basename)(p);
-    const dotIndex = base.lastIndexOf('.');
-    return dotIndex !== -1 ? base.slice(0, dotIndex) : base;
-};
-exports.basenamenoext = basenamenoext;
 /** Safely read `code`/`message` off an unknown thrown value. */
 function getErrorInfo(e) {
     const code = typeof e === 'object' &&

package/dist/types/logs.d.ts

@@ -2,8 +2,8 @@ import z from 'zod';
 export declare const WahaShareContent: z.ZodEnum<{
     lesson: "lesson";
     note: "note";
-    setLink: "setLink";
     lessonLink: "lessonLink";
+    setLink: "setLink";
     app: "app";
     passcode: "passcode";
     lessonAudio: "lessonAudio";
@@ -30,8 +30,8 @@ export declare const ShareLogEvent: z.ZodObject<{
     content: z.ZodEnum<{
         lesson: "lesson";
         note: "note";
-        setLink: "setLink";
         lessonLink: "lessonLink";
+        setLink: "setLink";
         app: "app";
         passcode: "passcode";
         lessonAudio: "lessonAudio";

package/dist/types/notifications.d.ts

@@ -19,13 +19,13 @@ export declare const PushNotificationRecord: z.ZodObject<{
         actionUrl: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
         countriesToNotSendTo: z.ZodOptional<z.ZodArray<z.ZodString>>;
         countriesToSendTo: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        faithJourney: z.ZodOptional<z.ZodEnum<{
+        faithJourney: z.ZodEnum<{
             all: "all";
             seekers: "seekers";
             believers: "believers";
-        }>>;
+        }>;
         imageUrl: z.ZodOptional<z.ZodString>;
-        meetLanguages: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"all">, z.ZodArray<z.ZodString>]>>;
+        meetLanguages: z.ZodUnion<readonly [z.ZodLiteral<"all">, z.ZodArray<z.ZodString>]>;
         minCompletions: z.ZodOptional<z.ZodNumber>;
         pushBody: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
         pushTitle: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;

package/dist/types/sets.d.ts

@@ -22,6 +22,12 @@ export interface BaseInfo extends LanguageInfo {
     fellowshipDuration: number;
     /** Full duration in seconds of all of the lesson's application questions. */
     applicationDuration: number;
+    /**
+     * Duration in seconds of the lesson's main media file (`fullPath` for DBS,
+     * `videoPath` for video, `eqPath` for EQ). Undefined when the file isn't in
+     * `mediaDurations`, i.e. it hasn't been uploaded.
+     */
+    mediaDuration: number | undefined;
 }
 export interface Section {
     id: string;
@@ -38,6 +44,14 @@ export interface Section {
      */
     ftbPath?: string;
     path: string;
+    /**
+     * Duration in seconds of this section's own audio, resolved when the lesson
+     * is assembled. Story sections only have one when they're a custom passage
+     * recording; otherwise their length comes from verse timings.
+     */
+    duration?: number;
+    /** Duration in seconds of the `ftbPath` clip, when there is one. */
+    ftbDuration?: number;
 }
 export interface EnrichedSection extends Section {
     startTime: number;

package/dist/types/users.d.ts

@@ -245,8 +245,8 @@ export declare const LegacyWahaUser: z.ZodObject<{
         content: z.ZodEnum<{
             lesson: "lesson";
             note: "note";
-            setLink: "setLink";
             lessonLink: "lessonLink";
+            setLink: "setLink";
             app: "app";
             passcode: "passcode";
             lessonAudio: "lessonAudio";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waha-shared",
-  "version": "1.0.509",
+  "version": "1.0.511",
   "author": "Waha",
   "dependencies": {
     "@types/signale": "^1.4.7",
@@ -13,7 +13,7 @@
   },
   "description": "Shared assets for Waha's various apps",
   "devDependencies": {
-    "@crowdin/crowdin-api-client": "^1.59.0",
+    "@crowdin/crowdin-api-client": "^1.59.1",
     "@types/react": "^19.3.0",
     "copyfiles": "^2.4.1",
     "react": "^19.3.0",
@@ -28,7 +28,7 @@
   "license": "MIT",
   "scripts": {
     "build": "npx tsc && npx copyfiles \"data/**/*.json\" dist",
-    "update": "yarn build && REGISTRY_VERSION=$(npm view waha-shared version) && npm version $REGISTRY_VERSION --no-git-tag-version --allow-same-version && npm version patch --no-git-tag-version && git add . && (git commit -m 'chore: build waha-shared' || true) && bash -c 'npm publish --access public --registry https://registry.npmjs.org --//registry.npmjs.org/:_authToken=$(grep NPM_TOKEN= ../.env | cut -d \"=\" -f2-)'",
-    "updateManual": "(npm whoami || npm login) && yarn build && REGISTRY_VERSION=$(npm view waha-shared version) && npm version $REGISTRY_VERSION --no-git-tag-version --allow-same-version && npm version patch --no-git-tag-version && git add dist package.json && (git commit -m 'chore: build waha-shared' || true) && npm publish"
+    "update": "npm run build && REGISTRY_VERSION=$(npm view waha-shared version) && npm version $REGISTRY_VERSION --no-git-tag-version --allow-same-version && npm version patch --no-git-tag-version && git add . && (git commit -m 'chore: build waha-shared' || true) && bash -c 'npm publish --access public --registry https://registry.npmjs.org --//registry.npmjs.org/:_authToken=$(grep NPM_TOKEN= ../.env | cut -d \"=\" -f2-)'",
+    "updateManual": "(npm whoami || npm login) && npm run build && REGISTRY_VERSION=$(npm view waha-shared version) && npm version $REGISTRY_VERSION --no-git-tag-version --allow-same-version && npm version patch --no-git-tag-version && git add dist package.json && (git commit -m 'chore: build waha-shared' || true) && npm publish"
   }
 }