waha-shared 1.0.489 → 1.0.490

package/dist/functions/auth.d.ts

@@ -0,0 +1,17 @@
+import { AppTranslations } from '../types/languages';
+/**
+ * Maps a Firebase Auth error to a user-readable message to display in the UI.
+ */
+export declare function mapFirebaseAuthError(app: AppTranslations, e: unknown): string;
+/**
+ * Whether an auth error is a routine one we don't want reported to Sentry.
+ */
+export declare function isExpectedAuthError(e: unknown): boolean;
+/**
+ * Whether a thrown SSO error is just the user dismissing the provider's UI,
+ * rather than a real failure worth reporting. Each app passes the identifiers
+ * its own providers use: the native flows put Apple-on-Android's identifier on
+ * the error message and Apple-on-iOS's and Google's on `code`, while the web
+ * SDK reports a dismissed popup as a `code`.
+ */
+export declare function ignoreError(ignoreIds: Set<string>, e: unknown): boolean;

package/dist/functions/auth.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapFirebaseAuthError = mapFirebaseAuthError;
+exports.isExpectedAuthError = isExpectedAuthError;
+exports.ignoreError = ignoreError;
+const utils_1 = require("./utils");
+/*
+ * The Firebase Auth error codes every Waha app shows a tailored message for.
+ * Anything not listed here falls back to the generic message, so adding a code
+ * in one place adds it everywhere.
+ *
+ * Two auth messages deliberately live outside this map because they aren't
+ * driven by a Firebase error code: `popups_auth_errors_provider_error` (an SSO
+ * provider failing before Firebase is ever reached, and it interpolates the
+ * provider name) and `popups_auth_errors_link_wrong_device` (a magic link
+ * opened where its email was never entered, which throws nothing at all).
+ */
+const authErrorMessages = (app) => new Map([
+    ['auth/too-many-requests', app.popups_auth_errors_too_many_requests],
+    ['auth/user-disabled', app.popups_auth_errors_user_disabled],
+    ['auth/network-request-failed', app.connect_to_continue],
+    // Passwordless email-link (magic link) return leg. `invalid-action-code`
+    // and `expired-action-code` share a message — to the user, an expired link
+    // and an already-used one are the same story.
+    ['auth/invalid-action-code', app.popups_auth_errors_link_expired],
+    ['auth/expired-action-code', app.popups_auth_errors_link_expired],
+]);
+/**
+ * Maps a Firebase Auth error to a user-readable message to display in the UI.
+ */
+function mapFirebaseAuthError(app, e) {
+    const { code } = (0, utils_1.getErrorInfo)(e);
+    // A Map rather than an object literal: looked up on an object, an error
+    // carrying a code like `constructor` resolves up the prototype chain and
+    // hands back a function where this signature promises a string.
+    const message = code === undefined ? undefined : authErrorMessages(app).get(code);
+    return message || app.popups_auth_errors_generic;
+}
+/** Auth failures to not log to Sentry. */
+const EXPECTED_AUTH_ERROR_CODES = new Set([
+    // A magic link that was already used, or has aged out.
+    'auth/invalid-action-code',
+    'auth/expired-action-code',
+    'auth/network-request-failed',
+]);
+/**
+ * Whether an auth error is a routine one we don't want reported to Sentry.
+ */
+function isExpectedAuthError(e) {
+    const { code } = (0, utils_1.getErrorInfo)(e);
+    return code !== undefined && EXPECTED_AUTH_ERROR_CODES.has(code);
+}
+/**
+ * Whether a thrown SSO error is just the user dismissing the provider's UI,
+ * rather than a real failure worth reporting. Each app passes the identifiers
+ * its own providers use: the native flows put Apple-on-Android's identifier on
+ * the error message and Apple-on-iOS's and Google's on `code`, while the web
+ * SDK reports a dismissed popup as a `code`.
+ */
+function ignoreError(ignoreIds, e) {
+    const { code, message } = (0, utils_1.getErrorInfo)(e);
+    return ((code !== undefined && ignoreIds.has(code)) ||
+        (message !== undefined && ignoreIds.has(message)));
+}

package/dist/functions/media.d.ts

@@ -0,0 +1,2 @@
+/** The pre-computed duration of a media file, in seconds. */
+export declare const getCachedDuration: (path: string) => number | undefined;

package/dist/functions/media.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCachedDuration = void 0;
+const mediaDurations_1 = require("../data/mediaDurations");
+const utils_1 = require("./utils");
+/** The pre-computed duration of a media file, in seconds. */
+const getCachedDuration = (path) => mediaDurations_1.mediaDurations[(0, utils_1.first)(path)]?.[(0, utils_1.basename)(path)];
+exports.getCachedDuration = getCachedDuration;

package/dist/functions/scripturePassages.js

@@ -16,6 +16,7 @@ const languages_1 = require("../functions/languages");
 const sets_1 = require("../types/sets");
 const bibleBooks_1 = require("./bibleBooks");
 const bibles_1 = require("./bibles");
+const media_1 = require("./media");
 const utils_1 = require("./utils");
 var bibleBooks_2 = require("./bibleBooks");
 Object.defineProperty(exports, "parseVerseRange", { enumerable: true, get: function () { return bibleBooks_2.parseVerseRange; } });
@@ -214,7 +215,7 @@ function verseToSuperscript(num) {
 function getFtbDuration(section, lessonInfo) {
     if (!section.ftbPath)
         return 0;
-    const ftbDuration = (0, utils_1.getCachedDuration)(section.ftbPath);
+    const ftbDuration = (0, media_1.getCachedDuration)(section.ftbPath);
     if (ftbDuration == null) {
         console.warn(`FTB duration not found for ${(0, utils_1.basename)(section.ftbPath)}`);
     }
@@ -244,7 +245,7 @@ function enrichSections(lessonInfo, scripture) {
         const ignoreTimings = isStory && priorStoryLengthUnknown ? true : undefined;
         const startTime = currentTime;
         if (!isStory) {
-            length = (0, utils_1.getCachedDuration)(section.path);
+            length = (0, media_1.getCachedDuration)(section.path);
         }
         else {
             currentTime += getFtbDuration(section, lessonInfo);
@@ -275,7 +276,7 @@ function enrichSections(lessonInfo, scripture) {
      * slightly off.
      */
     const path = lessonInfo.type === 'dbs' ? lessonInfo.fullPath : lessonInfo.videoPath;
-    const totalDuration = (0, utils_1.getCachedDuration)(path);
+    const totalDuration = (0, media_1.getCachedDuration)(path);
     if (totalDuration) {
         let timeFromEnd = totalDuration;
         const applicationSections = enriched.filter((s) => s.chapter === sets_1.Chapter.APPLICATION);

package/dist/functions/sets.js

@@ -12,6 +12,7 @@ const youtubeVideos_1 = require("../data/youtubeVideos");
 const scripturePassages_1 = require("../functions/scripturePassages");
 const sets_2 = require("../types/sets");
 const bibles_1 = require("./bibles");
+const media_1 = require("./media");
 const utils_1 = require("./utils");
 function getSetInfo({ setId, languageId, setIds, t, }) {
     const idComponents = setId.split('.');
@@ -219,12 +220,12 @@ function assembleLessonSections({ languageInfo, setInfo, lesson, t, useSpokenQue
             .filter((s) => s.chapter === sets_2.Chapter.FELLOWSHIP)
             .reduce((sum, section) => sum +
             (section.pauseBefore ?? 0) +
-            ((0, utils_1.getCachedDuration)(section.path) ?? 0), 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, utils_1.getCachedDuration)(section.path) ?? 0), 0),
+            ((0, media_1.getCachedDuration)(section.path) ?? 0), 0),
     };
 }
 function getTrainingVideoPaths({ languageInfo, lessonId, }) {
@@ -362,18 +363,18 @@ function shouldShowLesson(lessonInfo) {
         return false;
     }
     else if (lessonInfo.type === 'eq' &&
-        (0, utils_1.getCachedDuration)(lessonInfo.eqPath) === undefined) {
+        (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, utils_1.getCachedDuration)(lessonInfo.fullPath) === undefined) {
+        (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, utils_1.getCachedDuration)(lessonInfo.videoPath) === undefined) {
+        (0, media_1.getCachedDuration)(lessonInfo.videoPath) === undefined) {
         console.log('Missing remote video for lesson:', lessonInfo.lessonId);
         return false;
     }

package/dist/functions/utils.d.ts

@@ -4,4 +4,8 @@ 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;
-export declare const getCachedDuration: (path: string) => number | undefined;
+/** Safely read `code`/`message` off an unknown thrown value. */
+export declare function getErrorInfo(e: unknown): {
+    code?: string;
+    message?: string;
+};

package/dist/functions/utils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCachedDuration = exports.basenamenoext = exports.extname = exports.dirname = exports.first = exports.basename = exports.join = void 0;
-const mediaDurations_1 = require("../data/mediaDurations");
+exports.basenamenoext = exports.extname = exports.dirname = exports.first = exports.basename = exports.join = void 0;
+exports.getErrorInfo = getErrorInfo;
 const join = (...parts) => parts.join('/').replace(/\/+/g, '/');
 exports.join = join;
 const basename = (p) => p.split('/').pop();
@@ -18,5 +18,14 @@ const basenamenoext = (p) => {
     return dotIndex !== -1 ? base.slice(0, dotIndex) : base;
 };
 exports.basenamenoext = basenamenoext;
-const getCachedDuration = (path) => mediaDurations_1.mediaDurations[(0, exports.first)(path)]?.[(0, exports.basename)(path)];
-exports.getCachedDuration = getCachedDuration;
+/** Safely read `code`/`message` off an unknown thrown value. */
+function getErrorInfo(e) {
+    const code = typeof e === 'object' &&
+        e !== null &&
+        'code' in e &&
+        typeof e.code === 'string'
+        ? e.code
+        : undefined;
+    const message = e instanceof Error ? e.message : undefined;
+    return { code, message };
+}

package/package.json

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