saltfish 0.2.35 → 0.2.37

package/dist/saltfish-playlist-player.es.js

@@ -1765,33 +1765,6 @@ __publicField(ErrorHandler, "DEFAULT_OPTIONS", {
   shouldTriggerEvent: false,
   shouldDestroy: false
 });
-function detectUserLanguage() {
-  try {
-    const browserLang = navigator.language || navigator.userLanguage;
-    if (!browserLang) {
-      return void 0;
-    }
-    const normalizedLang = browserLang.split("-")[0].toLowerCase();
-    debug(`LanguageDetector: Detected browser language: ${browserLang}, normalized to: ${normalizedLang}`);
-    return normalizedLang;
-  } catch (error2) {
-    return void 0;
-  }
-}
-function normalizeLanguageCode(language) {
-  return language.split("-")[0].toLowerCase();
-}
-function processLanguageConfig(configLanguage) {
-  if (!configLanguage) {
-    return void 0;
-  }
-  if (configLanguage === "auto") {
-    const detectedLang = detectUserLanguage();
-    return detectedLang;
-  }
-  const normalizedLang = normalizeLanguageCode(configLanguage);
-  return normalizedLang;
-}
 class PlayerInitializationService {
   constructor(managers) {
     __publicField(this, "managers");
@@ -1846,10 +1819,8 @@ class PlayerInitializationService {
           }
         );
       }
-      const processedLanguage = processLanguageConfig(config.language);
       const updatedConfig = {
         ...config,
-        language: processedLanguage,
         showLogo: data.showLogo !== false
         // Default to true if not specified
       };
@@ -1909,6 +1880,7 @@ class PlayerInitializationService {
         return;
       }
       log("[PlayerInitializationService.fetchUserData] Fetching user data for userId:", userId);
+      log("[PlayerInitializationService.fetchUserData] userData being sent to backend:", userData);
       const response = await fetch(`https://player.saltfish.ai/clients/${store.config.token}/users/${userId}`, {
         method: "POST",
         headers: {
@@ -1929,7 +1901,9 @@ class PlayerInitializationService {
       log("[PlayerInitializationService.fetchUserData] User data fetched successfully:", data);
       if (data.success) {
         store.setUserData({
-          watchedPlaylists: data.watchedPlaylists || {}
+          watchedPlaylists: data.watchedPlaylists || {},
+          language: data.language
+          // Store language from backend if available
         });
         const userListAssignments = data.userListAssignments || {};
         const existingAssignments = data.abTestAssignments || {};
@@ -2004,7 +1978,9 @@ class PlayerInitializationService {
       this.managers.storageManager.setAnonymousUserData(anonymousUserData);
       const store = useSaltfishStore.getState();
       store.setUserData({
-        watchedPlaylists: anonymousUserData.watchedPlaylists || {}
+        watchedPlaylists: anonymousUserData.watchedPlaylists || {},
+        language: userData == null ? void 0 : userData.language
+        // Store language from userData
       });
       this.managers.eventManager.trigger("userDataLoaded", {
         timestamp: Date.now(),
@@ -2103,6 +2079,33 @@ class PlayerInitializationService {
     this.lastConfig = null;
   }
 }
+function detectUserLanguage() {
+  try {
+    const browserLang = navigator.language || navigator.userLanguage;
+    if (!browserLang) {
+      return void 0;
+    }
+    const normalizedLang = browserLang.split("-")[0].toLowerCase();
+    debug(`LanguageDetector: Detected browser language: ${browserLang}, normalized to: ${normalizedLang}`);
+    return normalizedLang;
+  } catch (error2) {
+    return void 0;
+  }
+}
+function normalizeLanguageCode(language) {
+  return language.split("-")[0].toLowerCase();
+}
+function processLanguageConfig(configLanguage) {
+  if (!configLanguage) {
+    return void 0;
+  }
+  if (configLanguage === "auto") {
+    const detectedLang = detectUserLanguage();
+    return detectedLang;
+  }
+  const normalizedLang = normalizeLanguageCode(configLanguage);
+  return normalizedLang;
+}
 class UserManagementService {
   constructor(managers) {
     __publicField(this, "managers");
@@ -2137,12 +2140,21 @@ class UserManagementService {
    * Identify a user with ID and optional data
    */
   identifyUser(userId, userData) {
-    this.lastUserIdentification = { userId, userData };
+    let processedUserData = userData;
+    if (userData && typeof userData.language === "string") {
+      const processedLanguage = processLanguageConfig(userData.language);
+      processedUserData = {
+        ...userData,
+        language: processedLanguage
+      };
+      log(`UserManagementService: Processed language from userData: ${userData.language} -> ${processedLanguage}`);
+    }
+    this.lastUserIdentification = { userId, userData: processedUserData };
     const store = useSaltfishStore.getState();
-    store.identifyUser(userId, userData);
+    store.identifyUser(userId, processedUserData);
     this.managers.analyticsManager.setUser({
       id: userId,
-      ...userData
+      ...processedUserData
     });
     const abTests = store.abTests || [];
     const hasABTests = abTests.length > 0;
@@ -2152,7 +2164,7 @@ class UserManagementService {
       });
     }
     if (this.playerInitializationService) {
-      this.playerInitializationService.fetchUserData(userId, userData);
+      this.playerInitializationService.fetchUserData(userId, processedUserData);
     }
   }
   /**
@@ -2162,15 +2174,24 @@ class UserManagementService {
     if (!this.playerInitializationService) {
       throw new Error("PlayerInitializationService not set");
     }
+    let processedUserData = userData;
+    if (userData && typeof userData.language === "string") {
+      const processedLanguage = processLanguageConfig(userData.language);
+      processedUserData = {
+        ...userData,
+        language: processedLanguage
+      };
+      log(`UserManagementService: Processed language from userData (anonymous): ${userData.language} -> ${processedLanguage}`);
+    }
     const userId = this.playerInitializationService.getOrCreateAnonymousUserId();
-    this.lastUserIdentification = { userId, userData };
+    this.lastUserIdentification = { userId, userData: processedUserData };
     const store = useSaltfishStore.getState();
-    store.identifyUser(userId, { ...userData, __isAnonymous: true });
+    store.identifyUser(userId, { ...processedUserData, __isAnonymous: true });
     this.managers.analyticsManager.setUser({
       id: userId,
-      ...userData
+      ...processedUserData
     });
-    await this.playerInitializationService.loadAnonymousUserData(userId, userData);
+    await this.playerInitializationService.loadAnonymousUserData(userId, processedUserData);
   }
   /**
    * Record A/B test attempt for analytics
@@ -2798,7 +2819,7 @@ class StateMachineActionHandler {
   getVideoUrl(step) {
     var _a;
     const store = useSaltfishStore.getState();
-    const language = (_a = store.config) == null ? void 0 : _a.language;
+    const language = (_a = store.userData) == null ? void 0 : _a.language;
     if (language && step.translations && step.translations[language]) {
       const translation = step.translations[language];
       return translation.videoUrl;
@@ -2935,12 +2956,10 @@ class StateMachineActionHandler {
       });
       log("StateMachineActionHandler: Starting async video load");
       const loadTranscriptForStep = () => {
-        var _a, _b, _c;
+        var _a, _b;
         const store = useSaltfishStore.getState();
-        const currentPlaylistId = (_a = store.manifest) == null ? void 0 : _a.id;
-        const currentPlaylist = (_b = store.backendPlaylists) == null ? void 0 : _b.find((p) => p.id === currentPlaylistId);
-        const captionsEnabled = (currentPlaylist == null ? void 0 : currentPlaylist.captions) === true;
-        const language = (_c = store.config) == null ? void 0 : _c.language;
+        const captionsEnabled = ((_a = store.manifest) == null ? void 0 : _a.captions) ?? true;
+        const language = (_b = store.userData) == null ? void 0 : _b.language;
         let transcript = currentStep.transcript;
         if (language && currentStep.translations && currentStep.translations[language]) {
           const translatedTranscript = currentStep.translations[language].transcript;
@@ -3044,7 +3063,7 @@ class StateMachineActionHandler {
       });
       log("StateMachineActionHandler: Starting async idle mode video load");
       this.managers.videoManager.loadVideo(videoUrl).then(() => {
-        var _a, _b, _c;
+        var _a, _b;
         log("StateMachineActionHandler: Idle mode video loaded successfully, configuring for ambient playback");
         const videoElement = this.managers.videoManager.getVideoElement();
         if (videoElement) {
@@ -3055,10 +3074,8 @@ class StateMachineActionHandler {
           });
         }
         const store = useSaltfishStore.getState();
-        const currentPlaylistId = (_a = store.manifest) == null ? void 0 : _a.id;
-        const currentPlaylist = (_b = store.backendPlaylists) == null ? void 0 : _b.find((p) => p.id === currentPlaylistId);
-        const captionsEnabled = (currentPlaylist == null ? void 0 : currentPlaylist.captions) === true;
-        const language = (_c = store.config) == null ? void 0 : _c.language;
+        const captionsEnabled = ((_a = store.manifest) == null ? void 0 : _a.captions) ?? true;
+        const language = (_b = store.userData) == null ? void 0 : _b.language;
         let transcript = currentStep.transcript;
         if (language && currentStep.translations && currentStep.translations[language]) {
           const translation = currentStep.translations[language];
@@ -3973,7 +3990,6 @@ const _TranscriptManager = class _TranscriptManager {
     }
     this.currentTranscript = transcript;
     if (transcript) {
-      this.updateCCButtonState(true);
       this.createTranscriptUI();
       this.chunks = transcript.chunks || [];
       this.isNewVideo = true;
@@ -3984,8 +4000,9 @@ const _TranscriptManager = class _TranscriptManager {
         log(`TranscriptManager: Using user preference for captions: ${this.isVisible}`);
       } else {
         this.isVisible = initiallyVisible;
-        log(`TranscriptManager: Using backend setting for captions: ${this.isVisible}`);
+        log(`TranscriptManager: Using manifest setting for captions: ${this.isVisible}`);
       }
+      this.updateCCButtonState(true);
       if (this.isVisible) {
         this.showTranscript();
       } else {
@@ -10283,7 +10300,7 @@ const SaltfishPlayer$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.de
   __proto__: null,
   SaltfishPlayer
 }, Symbol.toStringTag, { value: "Module" }));
-const version = "0.2.35";
+const version = "0.2.37";
 const packageJson = {
   version
 };
@@ -10323,7 +10340,7 @@ function createAPI() {
         // Default to true
         ...config
       };
-      info(`Saltfish initialized: analytics=${fullConfig.enableAnalytics}, language=${fullConfig.language || "default"}`);
+      info(`Saltfish initialized: analytics=${fullConfig.enableAnalytics}`);
       isInitializing = true;
       initPromise = player.initialize(fullConfig).then(() => {
         isInitialized = true;