Fix user stats heatmap caption text to be accurate

Experimental proxy support by manually following redirects

client/components/app/MediaPlayerContainer.vue

@@ -374,19 +374,27 @@ export default {
         return
       }
 
+      // https://developer.mozilla.org/en-US/docs/Web/API/Media_Session_API
       if ('mediaSession' in navigator) {
-        var coverImageSrc = this.$store.getters['globals/getLibraryItemCoverSrc'](this.streamLibraryItem, '/Logo.png', true)
-        const artwork = [
-          {
-            src: coverImageSrc
-          }
-        ]
+        const chapterInfo = []
+        if (this.chapters.length) {
+          this.chapters.forEach((chapter) => {
+            chapterInfo.push({
+              title: chapter.title,
+              startTime: chapter.start
+            })
+          })
+        }
 
         navigator.mediaSession.metadata = new MediaMetadata({
           title: this.title,
           artist: this.playerHandler.displayAuthor || this.mediaMetadata.authorName || 'Unknown',
           album: this.mediaMetadata.seriesName || '',
-          artwork
+          artwork: [
+            {
+              src: this.$store.getters['globals/getLibraryItemCoverSrc'](this.streamLibraryItem, '/Logo.png', true)
+            }
+          ]
         })
         console.log('Set media session metadata', navigator.mediaSession.metadata)
 

client/components/stats/Heatmap.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="heatmap" class="w-full">
     <div class="mx-auto" :style="{ height: innerHeight + 160 + 'px', width: innerWidth + 52 + 'px' }" style="background-color: rgba(13, 17, 23, 0)">
-      <p class="mb-2 px-1 text-sm text-gray-200">{{ $getString('MessageListeningSessionsInTheLastYear', [Object.values(daysListening).length]) }}</p>
+      <p class="mb-2 px-1 text-sm text-gray-200">{{ $getString('MessageDaysListenedInTheLastYear', [daysListenedInTheLastYear]) }}</p>
       <div class="border border-white border-opacity-25 rounded py-2 w-full" style="background-color: #232323" :style="{ height: innerHeight + 80 + 'px' }">
         <div :style="{ width: innerWidth + 'px', height: innerHeight + 'px' }" class="ml-10 mt-5 absolute" @mouseover="mouseover" @mouseout="mouseout">
           <div v-for="dayLabel in dayLabels" :key="dayLabel.label" :style="dayLabel.style" class="absolute top-0 left-0 text-gray-300">{{ dayLabel.label }}</div>
@@ -37,6 +37,7 @@ export default {
       innerHeight: 13 * 7,
       blockWidth: 13,
       data: [],
+      daysListenedInTheLastYear: 0,
       monthLabels: [],
       tooltipEl: null,
       tooltipTextEl: null,
@@ -193,46 +194,47 @@ export default {
     buildData() {
       this.data = []
 
-      var maxValue = 0
-      var minValue = 0
-      Object.values(this.daysListening).forEach((val) => {
-        if (val > maxValue) maxValue = val
-        if (!minValue || val < minValue) minValue = val
-      })
-      const range = maxValue - minValue + 0.01
+      let maxValue = 0
+      let minValue = 0
 
+      const dates = []
       for (let i = 0; i < this.daysToShow + 1; i++) {
-        const col = Math.floor(i / 7)
-        const row = i % 7
-
         const date = i === 0 ? this.firstWeekStart : this.$addDaysToDate(this.firstWeekStart, i)
         const dateString = this.$formatJsDate(date, 'yyyy-MM-dd')
-        const datePretty = this.$formatJsDate(date, 'MMM d, yyyy')
-        const monthString = this.$formatJsDate(date, 'MMM')
-        const value = this.daysListening[dateString] || 0
-        const x = col * 13
-        const y = row * 13
+        const dateObj = {
+          col: Math.floor(i / 7),
+          row: i % 7,
+          date,
+          dateString,
+          datePretty: this.$formatJsDate(date, 'MMM d, yyyy'),
+          monthString: this.$formatJsDate(date, 'MMM'),
+          dayOfMonth: Number(dateString.split('-').pop()),
+          yearString: dateString.split('-').shift(),
+          value: this.daysListening[dateString] || 0
+        }
+        dates.push(dateObj)
 
-        var bgColor = this.bgColors[0]
-        var outlineColor = this.outlineColors[0]
-        if (value) {
+        if (dateObj.value > 0) {
+          this.daysListenedInTheLastYear++
+          if (dateObj.value > maxValue) maxValue = dateObj.value
+          if (!minValue || dateObj.value < minValue) minValue = dateObj.value
+        }
+      }
+      const range = maxValue - minValue + 0.01
+
+      for (const dateObj of dates) {
+        let bgColor = this.bgColors[0]
+        let outlineColor = this.outlineColors[0]
+        if (dateObj.value) {
           outlineColor = this.outlineColors[1]
-          var percentOfAvg = (value - minValue) / range
-          var bgIndex = Math.floor(percentOfAvg * 4) + 1
+          const percentOfAvg = (dateObj.value - minValue) / range
+          const bgIndex = Math.floor(percentOfAvg * 4) + 1
           bgColor = this.bgColors[bgIndex] || 'red'
         }
 
         this.data.push({
-          date,
-          dateString,
-          datePretty,
-          monthString,
-          dayOfMonth: Number(dateString.split('-').pop()),
-          yearString: dateString.split('-').shift(),
-          value,
-          col,
-          row,
-          style: `transform:translate(${x}px,${y}px);background-color:${bgColor};outline:1px solid ${outlineColor};outline-offset:-1px;`
+          ...dateObj,
+          style: `transform:translate(${dateObj.col * 13}px,${dateObj.row * 13}px);background-color:${bgColor};outline:1px solid ${outlineColor};outline-offset:-1px;`
         })
       }
 
@@ -260,6 +262,7 @@ export default {
       const heatmapEl = document.getElementById('heatmap')
       this.contentWidth = heatmapEl.clientWidth
       this.maxInnerWidth = this.contentWidth - 52
+      this.daysListenedInTheLastYear = 0
       this.buildData()
     }
   },

client/pages/share/_slug.vue

@@ -110,6 +110,84 @@ export default {
     }
   },
   methods: {
+    mediaSessionPlay() {
+      console.log('Media session play')
+      this.play()
+    },
+    mediaSessionPause() {
+      console.log('Media session pause')
+      this.pause()
+    },
+    mediaSessionStop() {
+      console.log('Media session stop')
+      this.pause()
+    },
+    mediaSessionSeekBackward() {
+      console.log('Media session seek backward')
+      this.jumpBackward()
+    },
+    mediaSessionSeekForward() {
+      console.log('Media session seek forward')
+      this.jumpForward()
+    },
+    mediaSessionSeekTo(e) {
+      console.log('Media session seek to', e)
+      if (e.seekTime !== null && !isNaN(e.seekTime)) {
+        this.seek(e.seekTime)
+      }
+    },
+    mediaSessionPreviousTrack() {
+      if (this.$refs.audioPlayer) {
+        this.$refs.audioPlayer.prevChapter()
+      }
+    },
+    mediaSessionNextTrack() {
+      if (this.$refs.audioPlayer) {
+        this.$refs.audioPlayer.nextChapter()
+      }
+    },
+    updateMediaSessionPlaybackState() {
+      if ('mediaSession' in navigator) {
+        navigator.mediaSession.playbackState = this.isPlaying ? 'playing' : 'paused'
+      }
+    },
+    setMediaSession() {
+      // https://developer.mozilla.org/en-US/docs/Web/API/Media_Session_API
+      if ('mediaSession' in navigator) {
+        const chapterInfo = []
+        if (this.chapters.length > 0) {
+          this.chapters.forEach((chapter) => {
+            chapterInfo.push({
+              title: chapter.title,
+              startTime: chapter.start
+            })
+          })
+        }
+
+        navigator.mediaSession.metadata = new MediaMetadata({
+          title: this.mediaItemShare.playbackSession.displayTitle || 'No title',
+          artist: this.mediaItemShare.playbackSession.displayAuthor || 'Unknown',
+          artwork: [
+            {
+              src: this.coverUrl
+            }
+          ],
+          chapterInfo
+        })
+        console.log('Set media session metadata', navigator.mediaSession.metadata)
+
+        navigator.mediaSession.setActionHandler('play', this.mediaSessionPlay)
+        navigator.mediaSession.setActionHandler('pause', this.mediaSessionPause)
+        navigator.mediaSession.setActionHandler('stop', this.mediaSessionStop)
+        navigator.mediaSession.setActionHandler('seekbackward', this.mediaSessionSeekBackward)
+        navigator.mediaSession.setActionHandler('seekforward', this.mediaSessionSeekForward)
+        navigator.mediaSession.setActionHandler('seekto', this.mediaSessionSeekTo)
+        navigator.mediaSession.setActionHandler('previoustrack', this.mediaSessionSeekBackward)
+        navigator.mediaSession.setActionHandler('nexttrack', this.mediaSessionSeekForward)
+      } else {
+        console.warn('Media session not available')
+      }
+    },
     async coverImageLoaded(e) {
       if (!this.playbackSession.coverPath) return
       const fac = new FastAverageColor()
@@ -126,8 +204,19 @@ export default {
         })
     },
     playPause() {
+      if (this.isPlaying) {
+        this.pause()
+      } else {
+        this.play()
+      }
+    },
+    play() {
       if (!this.localAudioPlayer || !this.hasLoaded) return
-      this.localAudioPlayer.playPause()
+      this.localAudioPlayer.play()
+    },
+    pause() {
+      if (!this.localAudioPlayer || !this.hasLoaded) return
+      this.localAudioPlayer.pause()
     },
     jumpForward() {
       if (!this.localAudioPlayer || !this.hasLoaded) return
@@ -213,6 +302,7 @@ export default {
       } else {
         this.stopPlayInterval()
       }
+      this.updateMediaSessionPlaybackState()
     },
     playerTimeUpdate(time) {
       this.setCurrentTime(time)
@@ -276,6 +366,8 @@ export default {
     this.localAudioPlayer.on('timeupdate', this.playerTimeUpdate.bind(this))
     this.localAudioPlayer.on('error', this.playerError.bind(this))
     this.localAudioPlayer.on('finished', this.playerFinished.bind(this))
+
+    this.setMediaSession()
   },
   beforeDestroy() {
     window.removeEventListener('resize', this.resize)

client/strings/bg.json

@@ -629,7 +629,6 @@
   "MessageItemsSelected": "{0} избрани",
   "MessageItemsUpdated": "{0} елемента обновени",
   "MessageJoinUsOn": "Присъединете се към нас",
-  "MessageListeningSessionsInTheLastYear": "{0} слушателски сесии през последната година",
   "MessageLoading": "Зареждане...",
   "MessageLoadingFolders": "Зареждане на Папки...",
   "MessageM4BFailed": "M4B Провалено!",

client/strings/bn.json

@@ -763,7 +763,6 @@
   "MessageItemsSelected": "{0}টি আইটেম নির্বাচিত",
   "MessageItemsUpdated": "{0}টি আইটেম আপডেট করা হয়েছে",
   "MessageJoinUsOn": "আমাদের সাথে যোগ দিন",
-  "MessageListeningSessionsInTheLastYear": "গত বছরে {0}টি শোনার সেশন",
   "MessageLoading": "লোড হচ্ছে.।",
   "MessageLoadingFolders": "ফোল্ডার লোড হচ্ছে...",
   "MessageLogsDescription": "লগগুলি JSON ফাইল হিসাবে <code>/metadata/logs</code>-এ সংরক্ষণ করা হয়। ক্র্যাশ লগগুলি <code>/metadata/logs/crash_logs.txt</code>-এ সংরক্ষণ করা হয়।",

client/strings/cs.json

@@ -771,7 +771,6 @@
   "MessageItemsSelected": "{0} vybraných položek",
   "MessageItemsUpdated": "{0} položky byly aktualizovány",
   "MessageJoinUsOn": "Přidejte se k nám",
-  "MessageListeningSessionsInTheLastYear": "{0} poslechových relací za poslední rok",
   "MessageLoading": "Načítá se...",
   "MessageLoadingFolders": "Načítám složky...",
   "MessageLogsDescription": "Protokoly se ukládají do souborů JSON v <code>/metadata/logs</code>. Protokoly o pádech jsou uloženy v <code>/metadata/logs/crash_logs.txt</code>.",

client/strings/da.json

@@ -539,7 +539,6 @@
   "MessageItemsSelected": "{0} elementer valgt",
   "MessageItemsUpdated": "{0} elementer opdateret",
   "MessageJoinUsOn": "Deltag i os på",
-  "MessageListeningSessionsInTheLastYear": "{0} lyttesessioner i det sidste år",
   "MessageLoading": "Indlæser...",
   "MessageLoadingFolders": "Indlæser mapper...",
   "MessageM4BFailed": "M4B mislykkedes!",

client/strings/de.json

@@ -771,7 +771,6 @@
   "MessageItemsSelected": "{0} ausgewählte Medien",
   "MessageItemsUpdated": "{0} Medien aktualisiert",
   "MessageJoinUsOn": "Besuche uns auf",
-  "MessageListeningSessionsInTheLastYear": "{0} Ereignisse im letzten Jahr",
   "MessageLoading": "Wird geladen …",
   "MessageLoadingFolders": "Lade Ordner...",
   "MessageLogsDescription": "Die Logs werdern in <code>/metadata/logs</code> als JSON Dateien gespeichert. Crash logs werden in <code>/metadata/logs/crash_logs.txt</code> gespeichert.",

client/strings/en-us.json

@@ -758,6 +758,7 @@
   "MessageConfirmResetProgress": "Are you sure you want to reset your progress?",
   "MessageConfirmSendEbookToDevice": "Are you sure you want to send {0} ebook \"{1}\" to device \"{2}\"?",
   "MessageConfirmUnlinkOpenId": "Are you sure you want to unlink this user from OpenID?",
+  "MessageDaysListenedInTheLastYear": "{0} days listened in the last year",
   "MessageDownloadingEpisode": "Downloading episode",
   "MessageDragFilesIntoTrackOrder": "Drag files into correct track order",
   "MessageEmbedFailed": "Embed Failed!",
@@ -773,7 +774,6 @@
   "MessageItemsSelected": "{0} Items Selected",
   "MessageItemsUpdated": "{0} Items Updated",
   "MessageJoinUsOn": "Join us on",
-  "MessageListeningSessionsInTheLastYear": "{0} listening sessions in the last year",
   "MessageLoading": "Loading...",
   "MessageLoadingFolders": "Loading folders...",
   "MessageLogsDescription": "Logs are stored in <code>/metadata/logs</code> as JSON files. Crash logs are stored in <code>/metadata/logs/crash_logs.txt</code>.",

client/strings/es.json

@@ -771,7 +771,6 @@
   "MessageItemsSelected": "{0} Elementos Seleccionados",
   "MessageItemsUpdated": "{0} Elementos Actualizados",
   "MessageJoinUsOn": "Únetenos en",
-  "MessageListeningSessionsInTheLastYear": "{0} sesiones de escucha en el último año",
   "MessageLoading": "Cargando...",
   "MessageLoadingFolders": "Cargando archivos...",
   "MessageLogsDescription": "Logs son almacenados en <code>/metadata/logs</code> en archivos bajo formato JSON. Logs de fallos son almacenados en <code>/metadata/logs/crash_logs.txt</code>.",

client/strings/et.json

@@ -611,7 +611,6 @@
   "MessageItemsSelected": "{0} Valitud üksust",
   "MessageItemsUpdated": "{0} Üksust on uuendatud",
   "MessageJoinUsOn": "Liitu meiega",
-  "MessageListeningSessionsInTheLastYear": "Kuulamissessioone viimase aasta jooksul: {0}",
   "MessageLoading": "Laadimine...",
   "MessageLoadingFolders": "Kaustade laadimine...",
   "MessageM4BFailed": "M4B ebaõnnestus!",

client/strings/fr.json

@@ -765,7 +765,6 @@
   "MessageItemsSelected": "{0} éléments sélectionnés",
   "MessageItemsUpdated": "{0} éléments mis à jour",
   "MessageJoinUsOn": "Rejoignez-nous sur",
-  "MessageListeningSessionsInTheLastYear": "{0} sessions d’écoute l’an dernier",
   "MessageLoading": "Chargement…",
   "MessageLoadingFolders": "Chargement des dossiers…",
   "MessageLogsDescription": "Les journaux sont stockés dans <code>/metadata/logs</code> sous forme de fichiers JSON. Les journaux d’incidents sont stockés dans <code>/metadata/logs/crash_logs.txt</code>.",

client/strings/he.json

@@ -642,7 +642,6 @@
   "MessageItemsSelected": "{0} פריטים נבחרו",
   "MessageItemsUpdated": "{0} פריטים עודכנו",
   "MessageJoinUsOn": "הצטרף אלינו ב-",
-  "MessageListeningSessionsInTheLastYear": "{0} מפגשי האזנה בשנה האחרונה",
   "MessageLoading": "טוען...",
   "MessageLoadingFolders": "טוען תיקיות...",
   "MessageM4BFailed": "M4B נכשל!",

client/strings/hr.json

@@ -771,7 +771,6 @@
   "MessageItemsSelected": "{0} odabranih stavki",
   "MessageItemsUpdated": "{0} stavki ažurirano",
   "MessageJoinUsOn": "Pridruži nam se na",
-  "MessageListeningSessionsInTheLastYear": "{0} slušanja u prošloj godini",
   "MessageLoading": "Učitavam...",
   "MessageLoadingFolders": "Učitavam mape...",
   "MessageLogsDescription": "Zapisnici se čuvaju u <code>/metadata/logs</code> u obliku JSON datoteka. Zapisnici pada sustava čuvaju se u datoteci <code>/metadata/logs/crash_logs.txt</code>.",

client/strings/hu.json

@@ -764,7 +764,6 @@
   "MessageItemsSelected": "{0} kiválasztott elem",
   "MessageItemsUpdated": "{0} frissített elem",
   "MessageJoinUsOn": "Csatlakozzon hozzánk a",
-  "MessageListeningSessionsInTheLastYear": "{0} hallgatási munkamenet az elmúlt évben",
   "MessageLoading": "Betöltés...",
   "MessageLoadingFolders": "Mappák betöltése...",
   "MessageLogsDescription": "A naplók a <code>/metadata/logs</code> mappában JSON-fájlokként tárolódnak. Az összeomlási naplók a <code>/metadata/logs/crash_logs.txt</code> fájlban tárolódnak.",

client/strings/it.json

@@ -762,7 +762,6 @@
   "MessageItemsSelected": "{0} oggetti Selezionati",
   "MessageItemsUpdated": "{0} Oggetti aggiornati",
   "MessageJoinUsOn": "Unisciti a noi su",
-  "MessageListeningSessionsInTheLastYear": "{0} sessioni di ascolto nell'ultimo anno",
   "MessageLoading": "Caricamento…",
   "MessageLoadingFolders": "Caricamento Cartelle...",
   "MessageLogsDescription": "I log vengono archiviati nel percorso <code>/metadata/logs</code> as JSON files. I registri degli arresti anomali vengono archiviati nel percorso <code>/metadata/logs/crash_logs.txt</code>.",

client/strings/lt.json

@@ -563,7 +563,6 @@
   "MessageItemsSelected": "Pasirinkti {0} elementai (-ų)",
   "MessageItemsUpdated": "Atnaujinti {0} elementai (-ų)",
   "MessageJoinUsOn": "Prisijunkite prie mūsų",
-  "MessageListeningSessionsInTheLastYear": "{0} klausymo sesijų per paskutinius metus",
   "MessageLoading": "Kraunama...",
   "MessageLoadingFolders": "Kraunami aplankai...",
   "MessageM4BFailed": "M4B Nepavyko!",

client/strings/nl.json

@@ -758,7 +758,6 @@
   "MessageItemsSelected": "{0} onderdelen geselecteerd",
   "MessageItemsUpdated": "{0} onderdelen bijgewerkt",
   "MessageJoinUsOn": "Doe mee op",
-  "MessageListeningSessionsInTheLastYear": "{0} luistersessies in het laatste jaar",
   "MessageLoading": "Aan het laden...",
   "MessageLoadingFolders": "Mappen aan het laden...",
   "MessageLogsDescription": "Logs worden opgeslagen in <code>/metadata/logs</code> als JSON-bestanden. Crashlogs worden opgeslagen in <code>/metadata/logs/crash_logs.txt</code>.",

client/strings/no.json

@@ -769,7 +769,6 @@
   "MessageItemsSelected": "{0} Gjenstander valgt",
   "MessageItemsUpdated": "{0} Gjenstander oppdatert",
   "MessageJoinUsOn": "Følg oss nå",
-  "MessageListeningSessionsInTheLastYear": "{0} Lyttesesjoner iløpet av siste året",
   "MessageLoading": "Laster...",
   "MessageLoadingFolders": "Laster mapper...",
   "MessageM4BFailed": "M4B mislykkes!",

client/strings/pl.json

@@ -657,7 +657,6 @@
   "MessageInsertChapterBelow": "Wstaw rozdział poniżej",
   "MessageItemsSelected": "{0} zaznaczone elementy",
   "MessageJoinUsOn": "Dołącz do nas na",
-  "MessageListeningSessionsInTheLastYear": "Sesje słuchania w ostatnim roku: {0}",
   "MessageLoading": "Ładowanie...",
   "MessageLoadingFolders": "Ładowanie folderów...",
   "MessageLogsDescription": "Logi zapisane są w <code>/metadata/logs</code> jako pliki JSON. Logi awaryjne są zapisane w <code>/metadata/logs/crash_logs.txt</code>.",

client/strings/pt-br.json

@@ -630,7 +630,6 @@
   "MessageItemsSelected": "{0} Itens Selecionados",
   "MessageItemsUpdated": "{0} Itens Atualizados",
   "MessageJoinUsOn": "Junte-se a nós",
-  "MessageListeningSessionsInTheLastYear": "{0} sessões de escuta no ano anterior",
   "MessageLoading": "Carregando...",
   "MessageLoadingFolders": "Carregando pastas...",
   "MessageLogsDescription": "Os logs estão armazenados em <code>/metadata/logs</code> como arquivos JSON. Logs de crash estão armazenados em <code>/metadata/logs/crash_logs.txt</code>.",

client/strings/ru.json

@@ -771,7 +771,6 @@
   "MessageItemsSelected": "{0} Элементов выделено",
   "MessageItemsUpdated": "{0} Элементов обновлено",
   "MessageJoinUsOn": "Присоединяйтесь к нам в",
-  "MessageListeningSessionsInTheLastYear": "{0} сеансов прослушивания в прошлом году",
   "MessageLoading": "Загрузка...",
   "MessageLoadingFolders": "Загрузка каталогов...",
   "MessageLogsDescription": "Журналы хранятся в <code>/metadata/logs</code> в виде JSON-файлов. Журналы сбоев хранятся в <code>/metadata/logs/crash_logs.txt</code>.",

client/strings/sl.json

@@ -771,7 +771,6 @@
   "MessageItemsSelected": "{0} izbranih elementov",
   "MessageItemsUpdated": "Št. posodobljenih elementov: {0}",
   "MessageJoinUsOn": "Pridružite se nam",
-  "MessageListeningSessionsInTheLastYear": "{0} sej poslušanja v zadnjem letu",
   "MessageLoading": "Nalagam...",
   "MessageLoadingFolders": "Nalagam mape...",
   "MessageLogsDescription": "Dnevniki so shranjeni v <code>/metadata/logs</code> kot datoteke JSON. Dnevniki zrušitev so shranjeni v <code>/metadata/logs/crash_logs.txt</code>.",

client/strings/sv.json

@@ -590,7 +590,6 @@
   "MessageItemsSelected": "{0} Objekt markerade",
   "MessageItemsUpdated": "{0} Objekt uppdaterade",
   "MessageJoinUsOn": "Anslut dig till oss på",
-  "MessageListeningSessionsInTheLastYear": "{0} lyssningssessioner det senaste året",
   "MessageLoading": "Laddar...",
   "MessageLoadingFolders": "Laddar mappar...",
   "MessageM4BFailed": "M4B misslyckades!",

client/strings/uk.json

@@ -771,7 +771,6 @@
   "MessageItemsSelected": "Обрано елементів: {0}",
   "MessageItemsUpdated": "Оновлено елементів: {0}",
   "MessageJoinUsOn": "Приєднуйтесь до",
-  "MessageListeningSessionsInTheLastYear": "Сесій прослуховування минулого року: {0}",
   "MessageLoading": "Завантаження...",
   "MessageLoadingFolders": "Завантаження тек...",
   "MessageLogsDescription": "Журнали зберігаються у <code>/metadata/logs</code> як JSON-файли. Журнали збоїв зберігаються у <code>/metadata/logs/crash_logs.txt</code>.",

client/strings/vi-vn.json

@@ -581,7 +581,6 @@
   "MessageItemsSelected": "{0} Mục Đã Chọn",
   "MessageItemsUpdated": "{0} Mục Đã Cập Nhật",
   "MessageJoinUsOn": "Tham gia cùng chúng tôi trên",
-  "MessageListeningSessionsInTheLastYear": "{0} phiên nghe trong năm qua",
   "MessageLoading": "Đang tải...",
   "MessageLoadingFolders": "Đang tải các thư mục...",
   "MessageM4BFailed": "M4B thất bại!",

client/strings/zh-cn.json

@@ -771,7 +771,6 @@
   "MessageItemsSelected": "已选定 {0} 个项目",
   "MessageItemsUpdated": "已更新 {0} 个项目",
   "MessageJoinUsOn": "加入我们",
-  "MessageListeningSessionsInTheLastYear": "去年收听 {0} 个会话",
   "MessageLoading": "正在加载...",
   "MessageLoadingFolders": "加载文件夹...",
   "MessageLogsDescription": "日志以 JSON 文件形式存储在 <code>/metadata/logs</code> 目录中. 崩溃日志存储在 <code>/metadata/logs/crash_logs.txt</code> 目录中.",

client/strings/zh-tw.json

@@ -625,7 +625,6 @@
   "MessageItemsSelected": "已選定 {0} 個項目",
   "MessageItemsUpdated": "已更新 {0} 個項目",
   "MessageJoinUsOn": "加入我們",
-  "MessageListeningSessionsInTheLastYear": "去年收聽 {0} 個會話",
   "MessageLoading": "讀取...",
   "MessageLoadingFolders": "讀取資料夾...",
   "MessageM4BFailed": "M4B 失敗!",

server/Server.js

@@ -6,6 +6,7 @@ const util = require('util')
 const fs = require('./libs/fsExtra')
 const fileUpload = require('./libs/expressFileupload')
 const cookieParser = require('cookie-parser')
+const axios = require('axios')
 
 const { version } = require('../package.json')
 
@@ -54,7 +55,26 @@ class Server {
     global.XAccel = process.env.USE_X_ACCEL
     global.AllowCors = process.env.ALLOW_CORS === '1'
 
-    if (process.env.DISABLE_SSRF_REQUEST_FILTER === '1') {
+    if (process.env.EXP_PROXY_SUPPORT === '1') {
+      // https://github.com/advplyr/audiobookshelf/pull/3754
+      Logger.info(`[Server] Experimental Proxy Support Enabled, SSRF Request Filter was Disabled`)
+      global.DisableSsrfRequestFilter = () => true
+
+      axios.defaults.maxRedirects = 0
+      axios.interceptors.response.use(
+        (response) => response,
+        (error) => {
+          if ([301, 302].includes(error.response?.status)) {
+            return axios({
+              ...error.config,
+              url: error.response.headers.location
+            })
+          }
+
+          return Promise.reject(error)
+        }
+      )
+    } else if (process.env.DISABLE_SSRF_REQUEST_FILTER === '1') {
       Logger.info(`[Server] SSRF Request Filter Disabled`)
       global.DisableSsrfRequestFilter = () => true
     } else if (process.env.SSRF_REQUEST_FILTER_WHITELIST?.length) {

server/managers/RssFeedManager.js

@@ -98,11 +98,22 @@ class RssFeedManager {
             podcastId: feed.entity.mediaId
           },
           attributes: ['id', 'updatedAt'],
-          order: [['createdAt', 'DESC']]
+          order: [['updatedAt', 'DESC']]
         })
+
         if (mostRecentPodcastEpisode && mostRecentPodcastEpisode.updatedAt > newEntityUpdatedAt) {
           newEntityUpdatedAt = mostRecentPodcastEpisode.updatedAt
         }
+      } else {
+        const book = await Database.bookModel.findOne({
+          where: {
+            id: feed.entity.mediaId
+          },
+          attributes: ['id', 'updatedAt']
+        })
+        if (book && book.updatedAt > newEntityUpdatedAt) {
+          newEntityUpdatedAt = book.updatedAt
+        }
       }
 
       return newEntityUpdatedAt > feed.entityUpdatedAt
@@ -111,7 +122,7 @@ class RssFeedManager {
         attributes: ['id', 'updatedAt'],
         include: {
           model: Database.bookModel,
-          attributes: ['id'],
+          attributes: ['id', 'audioFiles', 'updatedAt'],
           through: {
             attributes: []
           },
@@ -122,13 +133,16 @@ class RssFeedManager {
         }
       })
 
+      const totalBookTracks = feed.entity.books.reduce((total, book) => total + book.includedAudioFiles.length, 0)
+      if (feed.feedEpisodes.length !== totalBookTracks) {
+        return true
+      }
+
       let newEntityUpdatedAt = feed.entity.updatedAt
 
       const mostRecentItemUpdatedAt = feed.entity.books.reduce((mostRecent, book) => {
-        if (book.libraryItem.updatedAt > mostRecent) {
-          return book.libraryItem.updatedAt
-        }
-        return mostRecent
+        let updatedAt = book.libraryItem.updatedAt > book.updatedAt ? book.libraryItem.updatedAt : book.updatedAt
+        return updatedAt > mostRecent ? updatedAt : mostRecent
       }, 0)
 
       if (mostRecentItemUpdatedAt > newEntityUpdatedAt) {
@@ -151,6 +165,9 @@ class RssFeedManager {
     let feed = await Database.feedModel.findOne({
       where: {
         slug: req.params.slug
+      },
+      include: {
+        model: Database.feedEpisodeModel
       }
     })
     if (!feed) {
@@ -163,8 +180,6 @@ class RssFeedManager {
     if (feedRequiresUpdate) {
       Logger.info(`[RssFeedManager] Feed "${feed.title}" requires update - updating feed`)
       feed = await feed.updateFeedForEntity()
-    } else {
-      feed.feedEpisodes = await feed.getFeedEpisodes()
     }
 
     const xml = feed.buildXml(req.originalHostPrefix)

server/migrations/changelog.md

@@ -12,3 +12,4 @@ Please add a record of every database migration that you create to this file. Th
 | v2.17.4        | v2.17.4-use-subfolder-for-oidc-redirect-uris | Save subfolder to OIDC redirect URIs to support existing installations                                        |
 | v2.17.5        | v2.17.5-remove-host-from-feed-urls           | removes the host (serverAddress) from URL columns in the feeds and feedEpisodes tables                        |
 | v2.17.6        | v2.17.6-share-add-isdownloadable             | Adds the isDownloadable column to the mediaItemShares table                                                   |
+| v2.17.7        | v2.17.7-add-indices                          | Adds indices to the libraryItems and books tables to reduce query times                                       |

server/migrations/v2.17.7-add-indices.js

@@ -0,0 +1,83 @@
+/**
+ * @typedef MigrationContext
+ * @property {import('sequelize').QueryInterface} queryInterface - a suquelize QueryInterface object.
+ * @property {import('../Logger')} logger - a Logger object.
+ *
+ * @typedef MigrationOptions
+ * @property {MigrationContext} context - an object containing the migration context.
+ */
+
+const migrationVersion = '2.17.7'
+const migrationName = `${migrationVersion}-add-indices`
+const loggerPrefix = `[${migrationVersion} migration]`
+
+/**
+ * This upward migration adds some indices to the libraryItems and books tables to improve query performance
+ *
+ * @param {MigrationOptions} options - an object containing the migration context.
+ * @returns {Promise<void>} - A promise that resolves when the migration is complete.
+ */
+async function up({ context: { queryInterface, logger } }) {
+  // Upwards migration script
+  logger.info(`${loggerPrefix} UPGRADE BEGIN: ${migrationName}`)
+
+  await addIndex(queryInterface, logger, 'libraryItems', ['libraryId', 'mediaType', 'size'])
+  await addIndex(queryInterface, logger, 'books', ['duration'])
+
+  logger.info(`${loggerPrefix} UPGRADE END: ${migrationName}`)
+}
+
+/**
+ * This downward migration script removes the indices added in the upward migration script
+ *
+ * @param {MigrationOptions} options - an object containing the migration context.
+ * @returns {Promise<void>} - A promise that resolves when the migration is complete.
+ */
+async function down({ context: { queryInterface, logger } }) {
+  // Downward migration script
+  logger.info(`${loggerPrefix} DOWNGRADE BEGIN: ${migrationName}`)
+
+  await removeIndex(queryInterface, logger, 'libraryItems', ['libraryId', 'mediaType', 'size'])
+  await removeIndex(queryInterface, logger, 'books', ['duration'])
+
+  logger.info(`${loggerPrefix} DOWNGRADE END: ${migrationName}`)
+}
+
+/**
+ * Utility function to add an index to a table. If the index already exists, it logs a message and continues.
+ *
+ * @param {import('sequelize').QueryInterface} queryInterface
+ * @param {import ('../Logger')} logger
+ * @param {string} tableName
+ * @param {string[]} columns
+ */
+async function addIndex(queryInterface, logger, tableName, columns) {
+  try {
+    logger.info(`${loggerPrefix} adding index [${columns.join(', ')}] to table "${tableName}"`)
+    await queryInterface.addIndex(tableName, columns)
+    logger.info(`${loggerPrefix} added index [${columns.join(', ')}] to table "${tableName}"`)
+  } catch (error) {
+    if (error.name === 'SequelizeDatabaseError' && error.message.includes('already exists')) {
+      logger.info(`${loggerPrefix} index [${columns.join(', ')}] for table "${tableName}" already exists`)
+    } else {
+      throw error
+    }
+  }
+}
+
+/**
+ * Utility function to remove an index from a table.
+ * Sequelize implemets it using DROP INDEX IF EXISTS, so it won't throw an error if the index doesn't exist.
+ *
+ * @param {import('sequelize').QueryInterface} queryInterface
+ * @param {import ('../Logger')} logger
+ * @param {string} tableName
+ * @param {string[]} columns
+ */
+async function removeIndex(queryInterface, logger, tableName, columns) {
+  logger.info(`${loggerPrefix} removing index [${columns.join(', ')}] from table "${tableName}"`)
+  await queryInterface.removeIndex(tableName, columns)
+  logger.info(`${loggerPrefix} removed index [${columns.join(', ')}] from table "${tableName}"`)
+}
+
+module.exports = { up, down }

server/models/Book.js

@@ -321,10 +321,10 @@ class Book extends Model {
           // },
           {
             fields: ['publishedYear']
+          },
+          {
+            fields: ['duration']
           }
-          // {
-          //   fields: ['duration']
-          // }
         ]
       }
     )

server/models/Feed.js

@@ -107,6 +107,9 @@ class Feed extends Model {
       entityUpdatedAt = libraryItem.media.podcastEpisodes.reduce((mostRecent, episode) => {
         return episode.updatedAt > mostRecent ? episode.updatedAt : mostRecent
       }, entityUpdatedAt)
+    } else if (libraryItem.media.updatedAt > entityUpdatedAt) {
+      // Book feeds will use Book.updatedAt if more recent
+      entityUpdatedAt = libraryItem.media.updatedAt
     }
 
     const feedObj = {
@@ -187,7 +190,8 @@ class Feed extends Model {
     const booksWithTracks = collectionExpanded.books.filter((book) => book.includedAudioFiles.length)
 
     const entityUpdatedAt = booksWithTracks.reduce((mostRecent, book) => {
-      return book.libraryItem.updatedAt > mostRecent ? book.libraryItem.updatedAt : mostRecent
+      const updatedAt = book.libraryItem.updatedAt > book.updatedAt ? book.libraryItem.updatedAt : book.updatedAt
+      return updatedAt > mostRecent ? updatedAt : mostRecent
     }, collectionExpanded.updatedAt)
 
     const firstBookWithCover = booksWithTracks.find((book) => book.coverPath)
@@ -275,7 +279,8 @@ class Feed extends Model {
   static getFeedObjForSeries(userId, seriesExpanded, slug, serverAddress, feedOptions = null) {
     const booksWithTracks = seriesExpanded.books.filter((book) => book.includedAudioFiles.length)
     const entityUpdatedAt = booksWithTracks.reduce((mostRecent, book) => {
-      return book.libraryItem.updatedAt > mostRecent ? book.libraryItem.updatedAt : mostRecent
+      const updatedAt = book.libraryItem.updatedAt > book.updatedAt ? book.libraryItem.updatedAt : book.updatedAt
+      return updatedAt > mostRecent ? updatedAt : mostRecent
     }, seriesExpanded.updatedAt)
 
     const firstBookWithCover = booksWithTracks.find((book) => book.coverPath)
@@ -516,17 +521,24 @@ class Feed extends Model {
     try {
       const updatedFeed = await this.update(feedObj, { transaction })
 
-      // Remove existing feed episodes
-      await feedEpisodeModel.destroy({
-        where: {
-          feedId: this.id
-        },
-        transaction
-      })
+      const existingFeedEpisodeIds = this.feedEpisodes.map((ep) => ep.id)
 
       // Create new feed episodes
       updatedFeed.feedEpisodes = await feedEpisodeCreateFunc(feedEpisodeCreateFuncEntity, updatedFeed, this.slug, transaction)
 
+      const newFeedEpisodeIds = updatedFeed.feedEpisodes.map((ep) => ep.id)
+      const feedEpisodeIdsToRemove = existingFeedEpisodeIds.filter((epid) => !newFeedEpisodeIds.includes(epid))
+
+      if (feedEpisodeIdsToRemove.length) {
+        Logger.info(`[Feed] Removing ${feedEpisodeIdsToRemove.length} episodes from feed ${this.id}`)
+        await feedEpisodeModel.destroy({
+          where: {
+            id: feedEpisodeIdsToRemove
+          },
+          transaction
+        })
+      }
+
       await transaction.commit()
 
       return updatedFeed

server/models/FeedEpisode.js

@@ -53,9 +53,10 @@ class FeedEpisode extends Model {
    * @param {import('./Feed')} feed
    * @param {string} slug
    * @param {import('./PodcastEpisode')} episode
+   * @param {string} [existingEpisodeId]
    */
-  static getFeedEpisodeObjFromPodcastEpisode(libraryItemExpanded, feed, slug, episode) {
-    const episodeId = uuidv4()
+  static getFeedEpisodeObjFromPodcastEpisode(libraryItemExpanded, feed, slug, episode, existingEpisodeId = null) {
+    const episodeId = existingEpisodeId || uuidv4()
     return {
       id: episodeId,
       title: episode.title,
@@ -94,11 +95,18 @@ class FeedEpisode extends Model {
       libraryItemExpanded.media.podcastEpisodes.sort((a, b) => new Date(a.pubDate) - new Date(b.pubDate))
     }
 
+    let numExisting = 0
     for (const episode of libraryItemExpanded.media.podcastEpisodes) {
-      feedEpisodeObjs.push(this.getFeedEpisodeObjFromPodcastEpisode(libraryItemExpanded, feed, slug, episode))
+      // Check for existing episode by filepath
+      const existingEpisode = feed.feedEpisodes?.find((feedEpisode) => {
+        return feedEpisode.filePath === episode.audioFile.metadata.path
+      })
+      numExisting = existingEpisode ? numExisting + 1 : numExisting
+
+      feedEpisodeObjs.push(this.getFeedEpisodeObjFromPodcastEpisode(libraryItemExpanded, feed, slug, episode, existingEpisode?.id))
     }
-    Logger.info(`[FeedEpisode] Creating ${feedEpisodeObjs.length} episodes for feed ${feed.id}`)
-    return this.bulkCreate(feedEpisodeObjs, { transaction })
+    Logger.info(`[FeedEpisode] Upserting ${feedEpisodeObjs.length} episodes for feed ${feed.id} (${numExisting} existing)`)
+    return this.bulkCreate(feedEpisodeObjs, { transaction, updateOnDuplicate: ['title', 'author', 'description', 'siteURL', 'enclosureURL', 'enclosureType', 'enclosureSize', 'pubDate', 'season', 'episode', 'episodeType', 'duration', 'filePath', 'explicit'] })
   }
 
   /**
@@ -127,11 +135,12 @@ class FeedEpisode extends Model {
    * @param {string} slug
    * @param {import('./Book').AudioFileObject} audioTrack
    * @param {boolean} useChapterTitles
+   * @param {string} [existingEpisodeId]
    */
-  static getFeedEpisodeObjFromAudiobookTrack(book, pubDateStart, feed, slug, audioTrack, useChapterTitles) {
+  static getFeedEpisodeObjFromAudiobookTrack(book, pubDateStart, feed, slug, audioTrack, useChapterTitles, existingEpisodeId = null) {
     // Example: <pubDate>Fri, 04 Feb 2015 00:00:00 GMT</pubDate>
     let timeOffset = isNaN(audioTrack.index) ? 0 : Number(audioTrack.index) * 1000 // Offset pubdate to ensure correct order
-    let episodeId = uuidv4()
+    let episodeId = existingEpisodeId || uuidv4()
 
     // e.g. Track 1 will have a pub date before Track 2
     const audiobookPubDate = date.format(new Date(pubDateStart.valueOf() + timeOffset), 'ddd, DD MMM YYYY HH:mm:ss [GMT]')
@@ -179,11 +188,18 @@ class FeedEpisode extends Model {
     const useChapterTitles = this.checkUseChapterTitlesForEpisodes(libraryItemExpanded.media)
 
     const feedEpisodeObjs = []
+    let numExisting = 0
     for (const track of libraryItemExpanded.media.trackList) {
-      feedEpisodeObjs.push(this.getFeedEpisodeObjFromAudiobookTrack(libraryItemExpanded.media, libraryItemExpanded.createdAt, feed, slug, track, useChapterTitles))
+      // Check for existing episode by filepath
+      const existingEpisode = feed.feedEpisodes?.find((episode) => {
+        return episode.filePath === track.metadata.path
+      })
+      numExisting = existingEpisode ? numExisting + 1 : numExisting
+
+      feedEpisodeObjs.push(this.getFeedEpisodeObjFromAudiobookTrack(libraryItemExpanded.media, libraryItemExpanded.createdAt, feed, slug, track, useChapterTitles, existingEpisode?.id))
     }
-    Logger.info(`[FeedEpisode] Creating ${feedEpisodeObjs.length} episodes for feed ${feed.id}`)
-    return this.bulkCreate(feedEpisodeObjs, { transaction })
+    Logger.info(`[FeedEpisode] Upserting ${feedEpisodeObjs.length} episodes for feed ${feed.id} (${numExisting} existing)`)
+    return this.bulkCreate(feedEpisodeObjs, { transaction, updateOnDuplicate: ['title', 'author', 'description', 'siteURL', 'enclosureURL', 'enclosureType', 'enclosureSize', 'pubDate', 'season', 'episode', 'episodeType', 'duration', 'filePath', 'explicit'] })
   }
 
   /**
@@ -200,14 +216,21 @@ class FeedEpisode extends Model {
     }).libraryItem.createdAt
 
     const feedEpisodeObjs = []
+    let numExisting = 0
     for (const book of books) {
       const useChapterTitles = this.checkUseChapterTitlesForEpisodes(book)
       for (const track of book.trackList) {
-        feedEpisodeObjs.push(this.getFeedEpisodeObjFromAudiobookTrack(book, earliestLibraryItemCreatedAt, feed, slug, track, useChapterTitles))
+        // Check for existing episode by filepath
+        const existingEpisode = feed.feedEpisodes?.find((episode) => {
+          return episode.filePath === track.metadata.path
+        })
+        numExisting = existingEpisode ? numExisting + 1 : numExisting
+
+        feedEpisodeObjs.push(this.getFeedEpisodeObjFromAudiobookTrack(book, earliestLibraryItemCreatedAt, feed, slug, track, useChapterTitles, existingEpisode?.id))
       }
     }
-    Logger.info(`[FeedEpisode] Creating ${feedEpisodeObjs.length} episodes for feed ${feed.id}`)
-    return this.bulkCreate(feedEpisodeObjs, { transaction })
+    Logger.info(`[FeedEpisode] Upserting ${feedEpisodeObjs.length} episodes for feed ${feed.id} (${numExisting} existing)`)
+    return this.bulkCreate(feedEpisodeObjs, { transaction, updateOnDuplicate: ['title', 'author', 'description', 'siteURL', 'enclosureURL', 'enclosureType', 'enclosureSize', 'pubDate', 'season', 'episode', 'episodeType', 'duration', 'filePath', 'explicit'] })
   }
 
   /**

server/models/LibraryItem.js

@@ -1061,6 +1061,9 @@ class LibraryItem extends Model {
           {
             fields: ['libraryId', 'mediaType']
           },
+          {
+            fields: ['libraryId', 'mediaType', 'size']
+          },
           {
             fields: ['libraryId', 'mediaId', 'mediaType']
           },