waha-shared 1.0.281 → 1.0.283

package/dist/functions/scripturePassages.js

@@ -7,7 +7,12 @@ exports.getScripturePassage = getScripturePassage;
 exports.getLessonScripture = getLessonScripture;
 exports.parseBibleSnapshot = parseBibleSnapshot;
 exports.verseToSuperscript = verseToSuperscript;
+exports.getLessonPauses = getLessonPauses;
+exports.normalizeVerseTimings = normalizeVerseTimings;
 const bibleStatuses_1 = require("../data/bibleStatuses");
+const lessonPauses_1 = require("../data/lessonPauses");
+const mediaDurations_1 = require("../data/mediaDurations");
+const specialIds_1 = require("../data/specialIds");
 const languages_1 = require("../functions/languages");
 const bibleChapters_1 = require("../types/bibleChapters");
 const sets_1 = require("./sets");
@@ -90,7 +95,7 @@ function getPassagesString(passageIds, language) {
         let bookName = 
         // American sign language should use English book names.
         language.languageId === 'ase'
-            ? bibleStatuses_1.bibleStatuses.BSB.bookNames[startBook]
+            ? bibleStatuses_1.bibleStatuses.NLT.bookNames[startBook]
             : language.bible.bookNames[startBook];
         if (!bookName) {
             bookName = language.bibleFallback?.bookNames[startBook];
@@ -132,10 +137,7 @@ function getPassagesString(passageIds, language) {
     }
     return (0, languages_1.numerals)(parts.join(', '), language.script.name);
 }
-/**
- * Gets a scripture passage by extracting verses from chapters This is the core
- * parsing logic, independent of the data source
- */
+/** Gets a scripture passage by extracting verses from chapters documents. */
 async function getScripturePassage({ bibleId, bibleFallbackId, passageId, getChapter, languageInfo, }) {
     try {
         const { startBook, startChapter, startVerse, endBook, endChapter, endVerse, } = parseVerseRange(passageId);
@@ -282,3 +284,132 @@ function verseToSuperscript(num) {
     })
         .join('');
 }
+/**
+ * Splits a passage's verses into per-chapter chunks. Single-chapter passages
+ * produce one chunk. Multi-chapter passages (rare, e.g. GEN.1.26-GEN.2.3)
+ * produce one chunk per chapter, with isPartOfPrevious=true on the 2nd+ chunks.
+ * This mirrors leviathan's passage_ids_by_chapter splitting logic.
+ */
+function splitPassageIntoChunks(verses) {
+    if (verses.length === 0)
+        return [];
+    const chunks = [];
+    let currentChapterId = null;
+    for (const verse of verses) {
+        const parts = verse.verseId.split('.');
+        const chapterId = `${parts[0]}.${parts[1]}`;
+        if (chapterId !== currentChapterId) {
+            chunks.push({
+                verses: [verse],
+                bookId: parts[0],
+                isPartOfPrevious: currentChapterId !== null,
+            });
+            currentChapterId = chapterId;
+        }
+        else {
+            chunks[chunks.length - 1].verses.push(verse);
+        }
+    }
+    return chunks;
+}
+/**
+ * Some lessons were built using a system that used slightly different pause
+ * values.
+ */
+const alternativeLessonPauses = {
+    beforeStory: 1,
+    afterStory: 1,
+    betweenPassages: 0.5,
+    beforeFtb: 1,
+    afterFtb: 0.5,
+};
+/**
+ * List of languages whose lessons were built using slightly different pause
+ * values.
+ */
+const usesAlternativeLessonPauses = ['tel', 'som', 'kmr', 'swz', 'vie'];
+/** Returns the correct lesson pauses for a given language. */
+function getLessonPauses(languageId) {
+    return usesAlternativeLessonPauses.includes(languageId)
+        ? alternativeLessonPauses
+        : lessonPauses_1.lessonPauses;
+}
+/**
+ * Converts verse timings within each scripture passage from chapter-relative to
+ * full-lesson relative. This includes accounting for question durations,
+ * pauses, and from-the-book durations.
+ *
+ * Multi-chapter passages are split into per-chapter chunks internally, since
+ * the audio is clipped from individual chapter files.
+ */
+function normalizeVerseTimings({ lessonInfo, scripture, }) {
+    const languageInfo = (0, languages_1.getLanguageInfo)(lessonInfo.meetLanguageId);
+    const pauses = getLessonPauses(lessonInfo.meetLanguageId);
+    let cumulativeTime = lessonInfo.fellowshipDuration + pauses.beforeStory;
+    if (specialIds_1.specialIds.introductionLessonIds.includes(lessonInfo.lessonId) &&
+        lessonInfo.type === 'dbs' &&
+        lessonInfo.introLength)
+        cumulativeTime += lessonInfo.introLength;
+    let lastBook = null;
+    /** Tracks the overall passage index (not chunk index) for FTB/pause logic. */
+    let globalChunkIndex = 0;
+    return scripture?.map((passage) => {
+        if (!passage)
+            return undefined;
+        const chunks = splitPassageIntoChunks(passage.verses);
+        if (chunks.length === 0)
+            return passage;
+        const adjustedVerses = [];
+        for (const chunk of chunks) {
+            const firstTimedVerse = chunk.verses.find((v) => v.timings);
+            if (!firstTimedVerse?.timings) {
+                // No timing data — pass through unadjusted
+                adjustedVerses.push(...chunk.verses);
+                if (!chunk.isPartOfPrevious)
+                    globalChunkIndex++;
+                continue;
+            }
+            const chunkAudioStart = firstTimedVerse.timings[0];
+            // Add FTB + pauses. Chunks that are continuations of a multi-chapter
+            // passage (isPartOfPrevious) get no pause — they are concatenated directly.
+            if (!chunk.isPartOfPrevious) {
+                if (lastBook !== chunk.bookId) {
+                    if (globalChunkIndex !== 0) {
+                        cumulativeTime += pauses.beforeFtb;
+                    }
+                    const ftbLanguage = languageInfo.titles ?? languageInfo.languageId;
+                    const ftbKey = `${ftbLanguage}.${chunk.bookId}.mp3`;
+                    const ftbDuration = mediaDurations_1.mediaDurations[ftbLanguage]?.[ftbKey];
+                    if (ftbDuration != null)
+                        cumulativeTime += ftbDuration;
+                    else {
+                        console.error(`FTB duration not found for ${ftbKey}`);
+                        return passage;
+                    }
+                    cumulativeTime += pauses.afterFtb;
+                    lastBook = chunk.bookId;
+                }
+                else if (globalChunkIndex !== 0) {
+                    cumulativeTime += pauses.betweenPassages;
+                }
+                globalChunkIndex++;
+            }
+            const offset = cumulativeTime - chunkAudioStart;
+            for (const verse of chunk.verses) {
+                if (!verse.timings)
+                    adjustedVerses.push(verse);
+                else
+                    adjustedVerses.push({
+                        ...verse,
+                        timings: [verse.timings[0] + offset, verse.timings[1] + offset],
+                    });
+            }
+            // Advance cumulative time by this chunk's audio duration
+            const lastTimedVerse = [...chunk.verses].reverse().find((v) => v.timings);
+            if (lastTimedVerse?.timings) {
+                cumulativeTime += lastTimedVerse.timings[1] - chunkAudioStart;
+            }
+        }
+        return { ...passage, verses: adjustedVerses };
+    });
+}

package/dist/functions/sets.d.ts

@@ -1,5 +1,6 @@
 import { TranslationsApp } from '../data/translationsApp/translationsApp.zod';
 import type { LanguageInfo, MeetTranslations } from '../types/languages';
+import { ScripturePassage } from '../types/scripturePassages';
 import { DbsInfo, Lesson, LessonInfo, SetInfo, VideoInfo } from '../types/sets';
 export declare const firebaseUrl = "https://firebasestorage.googleapis.com/v0/b/waha-app-db.appspot.com/o/";
 export declare function getSetInfo({ setId, meetLanguageId, setIds, t, }: {
@@ -22,10 +23,47 @@ export declare function shouldShowLesson(lessonInfo: LessonInfo | undefined, lan
  * Calculate start times for each section based on question durations and total
  * audio duration. Must be called after audio is loaded to get accurate total
  * duration.
- *
- * @param thisLesson - The lesson to calculate timings for
- * @param totalDuration - Total duration of the lesson audio in seconds
- * @param languageInfo - The language information to look up question durations
- * @returns Map of section ID to start time in seconds
  */
-export declare function calculateSectionTimings(thisLesson: DbsInfo | VideoInfo, totalDuration: number, languageInfo: LanguageInfo): Map<string, number>;
+export declare function calculateSectionTimings({ languageInfo, thisLesson, totalDuration, normalizedScripture, supportsVerseHighlight, }: {
+    thisLesson: DbsInfo | VideoInfo;
+    totalDuration: number;
+    languageInfo: LanguageInfo;
+    normalizedScripture: Array<ScripturePassage | undefined>;
+    /**
+     * Determine if the timings are valid to be used for section timings.
+     *
+     * Supports verse highlight example:
+     *
+     * - GEN.1.1-GEN.1.10 -> 83
+     * - GEN.2.1-GEN.2.4 -> 100
+     * - GEN.2.7-GEN.2.10 -> 120
+     *
+     * Doesn't support verse highlight example:
+     *
+     * - GEN.1.1-GEN.1.10 -> 83
+     * - GEN.2.1-GEN.2.4 -> undefined
+     * - GEN.2.7-GEN.2.10 -> undefined
+     *
+     * First passage is always valid because its start time is simply the length
+     * of the previous audio. Subsequent passages require good verse timing data.
+     */
+    supportsVerseHighlight: boolean;
+}): Map<string, number>;
+/**
+ * Checks if pre-normalized verse timings for given scripture are valid. Does
+ * this by comparing the real duration of the full lesson mp3 file with the
+ * calculated duration based on individual question durations and verse timing
+ * data from bible chapter documents. For lessons generated programmatically
+ * with recent systems, they should be nearly identical. For older lessons that
+ * were made by hand, they may be off. If they're too off, they will be flagged
+ * as invalid and the lesson will default to not using verse timings.
+ */
+export declare function getSupportsVerseHighlight({ lessonInfo, scripture, totalDuration, }: {
+    lessonInfo: DbsInfo | VideoInfo;
+    scripture: Array<ScripturePassage | undefined>;
+    totalDuration: number | undefined;
+}): {
+    computedLength: number;
+    diff: number;
+    passed: boolean;
+};

package/dist/functions/sets.js

@@ -6,6 +6,7 @@ exports.getLessonInfo = getLessonInfo;
 exports.convertSToString = convertSToString;
 exports.shouldShowLesson = shouldShowLesson;
 exports.calculateSectionTimings = calculateSectionTimings;
+exports.getSupportsVerseHighlight = getSupportsVerseHighlight;
 const languageAssets_1 = require("../data/languageAssets");
 const mediaDurations_1 = require("../data/mediaDurations");
 const questions_1 = require("../data/questions");
@@ -118,6 +119,7 @@ function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, useSpokenQuesti
             hasBeep,
         });
     });
+    let introLength = undefined;
     if (specialIds_1.specialIds.evaluationQuestionLessonIds.includes(lesson.lessonId)) {
         sections.push({
             id: 'eq',
@@ -141,6 +143,9 @@ function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, useSpokenQuesti
             text: t.introductions.introductions[lessonId],
             hasBeep: false,
         });
+        const introLanguageId = meetLanguageInfo.introBridge ?? meetLanguageId;
+        introLength =
+            mediaDurations_1.mediaDurations[introLanguageId]?.[`${introLanguageId}.${lessonId}.mp3`];
     }
     lesson.s?.forEach((passageId, index) => {
         sections.push({
@@ -171,7 +176,6 @@ function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, useSpokenQuesti
         });
     });
     const baseInfo = {
-        lessonIntroduction: t.introductions.introduction,
         lessonLink: `https://web.waha.app/lesson?lesson-id=${lessonId}&meet-language=${meetLanguageId}`,
         lessonNumber,
         lessonTitle,
@@ -179,6 +183,15 @@ function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, useSpokenQuesti
         ...setInfo,
         ...lesson,
     };
+    const fellowshipDuration = fellowshipQuestions.reduce((sum, questionId) => {
+        const key = `${meetLanguageId}.${questionId}.mp3`;
+        return sum + (mediaDurations_1.mediaDurations[meetLanguageId]?.[key] ?? 0);
+    }, 0);
+    let applicationDuration = applicationQuestions.reduce((sum, questionId) => {
+        return (sum +
+            (mediaDurations_1.mediaDurations[meetLanguageId]?.[`${meetLanguageId}.${questionId}.mp3`] ??
+                0));
+    }, 0);
     if (specialIds_1.specialIds.evaluationQuestionLessonIds.includes(lesson.lessonId)) {
         const languageId = meetLanguageInfo.introBridge ?? meetLanguageId;
         const id = `${languageId}.eq`;
@@ -187,6 +200,8 @@ function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, useSpokenQuesti
         return {
             type: 'eq',
             ...baseInfo,
+            fellowshipDuration,
+            applicationDuration,
             eq: {
                 id,
                 languageId,
@@ -228,6 +243,9 @@ function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, useSpokenQuesti
             };
             const trainingVideoId = `${meetLanguageInfo.trainingVideoLanguage}.${lessonId}`;
             const trainingVideoFileName = `${trainingVideoId}.mp4`;
+            // Add the length of the training video to the application duration.
+            applicationDuration +=
+                mediaDurations_1.mediaDurations[meetLanguageInfo.trainingVideoLanguage]?.[trainingVideoFileName] ?? 0;
             const trainingVideoPath = `${meetLanguageInfo.trainingVideoLanguage}/course/videos_compressed/${trainingVideoFileName}`;
             trainingVideo = {
                 id: trainingVideoId,
@@ -246,6 +264,8 @@ function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, useSpokenQuesti
         return {
             type: 'video',
             ...baseInfo,
+            fellowshipDuration,
+            applicationDuration,
             lessonSectionHeader: thisSetTranslations?.sectionHeaders?.[lessonId],
             lessonSectionBody: thisSetTranslations?.sectionBodies?.[lessonId],
             video,
@@ -258,14 +278,17 @@ function getLessonInfo({ lessonId, meetLanguageInfo, setInfo, t, useSpokenQuesti
         return {
             type: 'dbs',
             ...baseInfo,
+            fellowshipDuration,
+            applicationDuration,
+            introLength,
             full: {
                 id: `${meetLanguageId}.${lessonId}`,
                 localFileName: `${meetLanguageId}.${lessonId}.mp3`,
                 remoteFileName: `${meetLanguageId}.${lessonId}.mp3`,
                 languageId: meetLanguageId,
-                path: `${meetLanguageId}/full_lessons/${setInfo.setId}/${meetLanguageId}.${lessonId}.mp3`,
+                path: `${meetLanguageId}/full_lessons${meetLanguageInfo.audioAssetVersion ?? ''}/${setInfo.setId}/${meetLanguageId}.${lessonId}.mp3`,
                 url: exports.firebaseUrl +
-                    encodeURIComponent(`${meetLanguageId}/full_lessons/${setInfo.setId}/${meetLanguageId}.${lessonId}.mp3`) +
+                    encodeURIComponent(`${meetLanguageId}/full_lessons${meetLanguageInfo.audioAssetVersion ?? ''}/${setInfo.setId}/${meetLanguageId}.${lessonId}.mp3`) +
                     `?alt=media`,
             },
             dbsCast: {
@@ -324,12 +347,6 @@ function shouldShowLesson(lessonInfo, languageInfo) {
         console.log('Missing lesson info or lessonTitle lesson:', lessonInfo?.lessonId);
         return false;
     }
-    else if (specialIds_1.specialIds.growingAsDmcSetIds.includes(lessonInfo.setId) &&
-        (lessonInfo.lessonIntroduction === undefined ||
-            lessonInfo.lessonIntroduction === '')) {
-        console.log('Missing intro for lesson:', lessonInfo.lessonId);
-        return false;
-    }
     else if (lessonInfo.type === 'eq' &&
         !languageAssets_1.languageAssets[languageInfo.introBridge ?? languageInfo.languageId].find((f) => f === lessonInfo.eq.remoteFileName)) {
         console.log('Missing remote eq file for lesson:', lessonInfo.lessonId);
@@ -353,14 +370,10 @@ function shouldShowLesson(lessonInfo, languageInfo) {
  * Calculate start times for each section based on question durations and total
  * audio duration. Must be called after audio is loaded to get accurate total
  * duration.
- *
- * @param thisLesson - The lesson to calculate timings for
- * @param totalDuration - Total duration of the lesson audio in seconds
- * @param languageInfo - The language information to look up question durations
- * @returns Map of section ID to start time in seconds
  */
-function calculateSectionTimings(thisLesson, totalDuration, languageInfo) {
+function calculateSectionTimings({ languageInfo, thisLesson, totalDuration, normalizedScripture, supportsVerseHighlight, }) {
     const languageDurations = mediaDurations_1.mediaDurations[languageInfo.languageId];
+    const pauses = (0, scripturePassages_1.getLessonPauses)(thisLesson.meetLanguageId);
     const getQuestionDuration = (questionId) => {
         const fileName = `${languageInfo.languageId}.${questionId}.mp3`;
         return languageDurations?.[fileName] ?? 0;
@@ -370,42 +383,85 @@ function calculateSectionTimings(thisLesson, totalDuration, languageInfo) {
     timings.set('title', 0);
     // Calculate fellowship question timings from the start
     let currentTime = 0;
-    const fellowshipSections = thisLesson.sections.filter((s) => s.chapter === sets_2.Chapter.FELLOWSHIP);
-    fellowshipSections.forEach((section) => {
+    /** Add timings for each fellowship question. */
+    thisLesson.sections
+        .filter((s) => s.chapter === sets_2.Chapter.FELLOWSHIP)
+        .forEach((section) => {
         timings.set(section.id, currentTime);
         currentTime += getQuestionDuration(section.id);
     });
-    // Story/Scripture section starts after fellowship
-    const storySections = thisLesson.sections.filter((s) => s.chapter === sets_2.Chapter.STORY || s.chapter === sets_2.Chapter.INTRODUCTION);
-    const storyStartTime = currentTime;
-    storySections.forEach((section) => {
-        timings.set(section.id, storyStartTime);
-    });
-    // Calculate application question timings by working backwards from total duration
-    const applicationSections = thisLesson.sections.filter((s) => s.chapter === sets_2.Chapter.APPLICATION);
-    // Calculate total duration of all application questions
-    const totalApplicationDuration = applicationSections.reduce((sum, section) => {
-        if (section.id.includes('video') &&
-            thisLesson.type === 'video' &&
-            thisLesson.trainingVideo)
-            return (sum +
-                mediaDurations_1.mediaDurations[thisLesson.trainingVideo.languageId][thisLesson.trainingVideo.localFileName]);
-        else
-            return sum + getQuestionDuration(section.id);
-    }, 0);
-    // Application section starts after story ends
-    // Story duration = totalDuration - fellowship duration - application duration
-    const applicationStartTime = totalDuration - totalApplicationDuration;
-    let applicationTime = applicationStartTime;
-    applicationSections.forEach((section) => {
-        timings.set(section.id, applicationTime);
+    /** Add the pause before the story chapter starts. */
+    currentTime += pauses.beforeStory;
+    /** Add the intro timing and pause if we have one. */
+    const introSection = thisLesson.sections.find((s) => s.chapter === sets_2.Chapter.INTRODUCTION);
+    if (introSection && thisLesson.type === 'dbs' && thisLesson.introLength) {
+        timings.set(introSection.id, currentTime);
+        currentTime += thisLesson.introLength;
+    }
+    const storySections = thisLesson.sections.filter((s) => s.chapter === sets_2.Chapter.STORY);
+    if (storySections.length > 0) {
+        /** First passage will always start right after all previous sections. */
+        timings.set(storySections[0].id, currentTime);
+        /** Subsequent passages require normalized scripture data to get timings for. */
+        if (storySections.length > 1 && supportsVerseHighlight)
+            storySections.slice(1).forEach((section) => {
+                const passageStartTime = normalizedScripture[section.indexWithinChapter]?.verses?.[0]
+                    ?.timings?.[0];
+                if (passageStartTime != null)
+                    timings.set(section.id, passageStartTime);
+            });
+    }
+    /**
+     * Application section starts after story ends, but we can work backwards and
+     * calculate its start time by subtracting its duration from the total
+     * duration. This way, if we don't have verse timings data, we can still have
+     * timings for the application section.
+     */
+    const applicationStartTime = totalDuration - thisLesson.applicationDuration;
+    currentTime = applicationStartTime;
+    thisLesson.sections
+        .filter((s) => s.chapter === sets_2.Chapter.APPLICATION)
+        .forEach((section) => {
+        timings.set(section.id, currentTime);
         if (section.id.includes('video') &&
             thisLesson.type === 'video' &&
             thisLesson.trainingVideo)
-            applicationTime +=
-                mediaDurations_1.mediaDurations[thisLesson.trainingVideo.languageId][thisLesson.trainingVideo.localFileName];
+            currentTime +=
+                mediaDurations_1.mediaDurations[thisLesson.trainingVideo.languageId]?.[thisLesson.trainingVideo.localFileName] ?? 0;
         else
-            applicationTime += getQuestionDuration(section.id);
+            currentTime += getQuestionDuration(section.id);
     });
     return timings;
 }
+/**
+ * Checks if pre-normalized verse timings for given scripture are valid. Does
+ * this by comparing the real duration of the full lesson mp3 file with the
+ * calculated duration based on individual question durations and verse timing
+ * data from bible chapter documents. For lessons generated programmatically
+ * with recent systems, they should be nearly identical. For older lessons that
+ * were made by hand, they may be off. If they're too off, they will be flagged
+ * as invalid and the lesson will default to not using verse timings.
+ */
+function getSupportsVerseHighlight({ lessonInfo, scripture, totalDuration, }) {
+    if (!totalDuration)
+        return { computedLength: 0, diff: 0, passed: false };
+    let lastEnd;
+    for (const passage of scripture) {
+        if (!passage)
+            continue;
+        for (const verse of passage.verses) {
+            if (verse.timings) {
+                if (lastEnd === undefined || verse.timings[1] > lastEnd) {
+                    lastEnd = verse.timings[1];
+                }
+            }
+        }
+    }
+    if (lastEnd === undefined)
+        return { computedLength: 0, diff: 0, passed: false };
+    const computedLength = lastEnd +
+        (0, scripturePassages_1.getLessonPauses)(lessonInfo.meetLanguageId).afterStory +
+        lessonInfo.applicationDuration;
+    const diff = Math.abs(computedLength - totalDuration);
+    return { computedLength, diff, passed: diff < 3 };
+}

package/dist/types/analytics.d.ts

@@ -30,8 +30,8 @@ type Meeting = {
     payload: {
         timeToCompletion: number;
         isAudioFacilitator: boolean;
-        howManyShared?: StoplightOption;
-        howManyObeyed?: StoplightOption;
+        howManyShared: StoplightOption | undefined;
+        howManyObeyed: StoplightOption | undefined;
     };
 } | {
     name: 'ScheduleNextMeeting';

package/dist/types/sets.d.ts

@@ -24,9 +24,12 @@ export interface Content {
 export interface BaseInfo {
     lessonNumber: string;
     lessonTitle: string | undefined;
-    lessonIntroduction: string | undefined;
     lessonLink: string;
     sections: Section[];
+    /** Full duration in seconds of all of the lesson's fellowship questions. */
+    fellowshipDuration: number;
+    /** Full duration in seconds of all of the lesson's application questions. */
+    applicationDuration: number;
 }
 export interface Section {
     id: string;
@@ -45,7 +48,7 @@ export interface DbsInfo extends BaseInfo, SetInfo, Lesson {
         remoteFileName: string;
         url: string;
     };
-    lessonIntroduction: string | undefined;
+    introLength: number | undefined;
     passagesString: string;
 }
 export interface VideoInfo extends BaseInfo, SetInfo, Lesson {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waha-shared",
-  "version": "1.0.281",
+  "version": "1.0.283",
   "author": "Waha",
   "dependencies": {
     "@types/signale": "^1.4.7",