@saooti/octopus-sdk 41.0.8 → 41.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saooti/octopus-sdk",
-  "version": "41.0.8",
+  "version": "41.0.9",
   "private": false,
   "description": "Javascript SDK for using octopus",
   "author": "Saooti",

package/src/components/composable/radio/usefetchRadioData.ts

@@ -2,17 +2,19 @@ import classicApi from "../../../api/classicApi";
 import { MediaRadio, MetadataRadio, NextAdvertising } from '@/stores/class/general/player';
 import { Podcast } from '@/stores/class/general/podcast';
 import dayjs from 'dayjs';
-import radioHelper from "../../../helper/radio/radioHelper";
 import {onBeforeUnmount, Ref, ref} from 'vue';
+import { useI18n } from "vue-i18n";
 export const useFetchRadio = ()=>{
 
   const radioInterval : Ref<ReturnType<typeof setTimeout> | undefined> = ref(undefined);
+
+  const {t} = useI18n();
   
   async function fetchRadioMetadata(
     canalId: number,
     previousTitle: string,
     callbackMetadata: (
-      metadata: MediaRadio,
+      metadata: MediaRadio|undefined,
       podcast: Podcast | undefined,
       history: Array<MediaRadio>
     ) => void,
@@ -33,15 +35,19 @@ export const useFetchRadio = ()=>{
       callbackAdvertising(metadata.nextAdvertising);
     }
     const arrayMetadata = metadata.previously;
-    arrayMetadata.unshift(metadata.currently);
-    for (let index = 0, len = arrayMetadata.length; index < len; index++) {
-      if (
-        dayjs().valueOf() - 18000 >
-        dayjs(arrayMetadata[index].startDate).valueOf()
-      ) {
-        await useCallbackIfNewMetadata(previousTitle, arrayMetadata, index, len,callbackMetadata);
-        return;
+    if(null!==metadata.currently){
+      arrayMetadata.unshift(metadata.currently);
+      for (let index = 0, len = arrayMetadata.length; index < len; index++) {
+        if (
+          dayjs().valueOf() - 18000 >
+          dayjs(arrayMetadata[index].startDate).valueOf()
+        ) {
+          await useCallbackIfNewMetadata(previousTitle, arrayMetadata, index, len,callbackMetadata);
+          return;
+        }
       }
+    }else{
+      callbackMetadata(undefined, undefined, arrayMetadata);
     }
   }
   async function useCallbackIfNewMetadata(previousTitle: string, arrayMetadata: Array<MediaRadio>, index:number, len: number, callbackMetadata: (
@@ -63,11 +69,22 @@ export const useFetchRadio = ()=>{
       }
     }
   }
-  function displayTitle(metadata: MediaRadio): string {
-    return radioHelper.displayTitle(metadata);
+  function displayTitle(metadata: MediaRadio|undefined): string {
+    if(!metadata){
+      return t("Silent stream");
+    }
+    let title = "";
+    if (metadata?.title) {
+      title += metadata.title;
+    }
+    if (metadata?.artist) {
+      title += " - " + metadata.artist;
+    }
+    return title;
   }
 
 
+
   onBeforeUnmount(() => {
     clearInterval(radioInterval.value as unknown as number);
   })

package/src/components/display/live/RadioCurrently.vue

@@ -72,10 +72,7 @@ const currentlyPlayingString = computed(() => {
   if (playingRadio.value && playerStore.playerRadio) {
     return displayTitle(playerStore.playerRadio.metadata);
   }
-  if (currentMetadata.value) {
-    return displayTitle(currentMetadata.value);
-  }
-  return "";
+  return displayTitle(currentMetadata.value);
 });
 
 onMounted(()=>{
@@ -102,7 +99,7 @@ async function fetchCurrentlyPlaying(): Promise<void> {
     updateMetadata,
   );
 }
-function updateMetadata(metadata: MediaRadio, podcast?: Podcast): void {
+function updateMetadata(metadata: MediaRadio|undefined, podcast?: Podcast): void {
   currentMetadata.value = metadata;
   currentPodcast.value = podcast;
 }

package/src/components/display/sharing/PlayerParameters.vue

@@ -36,12 +36,6 @@
         </div>
       </div>
       <ChooseEpisodesNumber v-else :episodes-number="episodesNumber" @update-number="emit('update:episodesNumber', $event)"/>
-      <ClassicCheckbox
-        :text-init="proceedReading"
-        id-checkbox="proceed-reading-checkbox"
-        :label="t('Proceed reading')"
-        @update:text-init="emit('update:proceedReading', $event)"
-      />
     </template>
     <ClassicCheckbox
       v-if="displayIsVisible"
@@ -104,7 +98,6 @@ const props = defineProps({
   displayArticleParam: { default: false, type: Boolean },
   displayIsVisible: { default: false, type: Boolean },
   displayInsertCode: { default: false, type: Boolean },
-  proceedReading: { default: true, type: Boolean },
   displayArticle: { default: true, type: Boolean },
   displayTranscript: { default: true, type: Boolean },
   displayWave: { default: true, type: Boolean },
@@ -118,7 +111,6 @@ const props = defineProps({
 //Emits
 const emit = defineEmits([
   "episodeChoiceDisplay",
-  "update:proceedReading",
   "update:isVisible",
   "update:episodesNumber",
   "update:displayArticle",

package/src/components/display/sharing/SharePlayer.vue

@@ -44,7 +44,6 @@
             v-model:display-article="displayArticle"
             v-model:display-transcript="displayTranscript"
             v-model:display-wave="displayWave"
-            v-model:proceed-reading="proceedReading"
             v-model:is-visible="isVisible"
             v-model:player-auto-play="playerAutoPlay"
             v-model:episodes-number="episodesNumber"
@@ -125,7 +124,6 @@ const iFrameModel = ref("default");
 const isShareModal = ref(false);
 const color = ref("#40a372");
 const theme = ref("#000000");
-const proceedReading = ref(true);
 const episodeChoiceDisplay = ref("number");
 const episodesNumber = ref(3);
 const isVisible = ref(false);
@@ -341,9 +339,6 @@ function addUrlParameters(url: Array<string>) {
   url.push(
     `&color=${color.value.substring(1)}&theme=${theme.value.substring(1)}`,
   );
-  if (!proceedReading.value) {
-    url.push("&proceed=false");
-  }
   if (!displayArticle.value && displayArticleParam.value) {
     url.push("&article=false");
   }

package/src/components/misc/player/elements/PlayerTitle.vue

@@ -89,7 +89,7 @@ onUnmounted(()=>{
 async function fetchCurrentlyPlaying(): Promise<void> {
   fetchRadioMetadata(
     playerStore.playerRadio?.canalId ?? 0,
-    playerStore.playerRadio?.metadata.title ?? "",
+    playerStore.playerRadio?.metadata?.title ?? "",
     updateMetadata,
     updateAdvertising,
   );
@@ -98,11 +98,11 @@ function updateAdvertising(nextAdvertising: NextAdvertising): void {
   playerStore.playerRadioUpdateNextAdvertising(nextAdvertising);
 }
 function updateMetadata(
-  metadata: MediaRadio,
+  metadata: MediaRadio|undefined,
   podcast: Podcast | undefined,
   history: Array<MediaRadio>,
 ): void {
-  playerStore.playerMetadata(metadata, history);
+  playerStore.playerMetadata(metadata, history); //TODO
   playerStore.playerRadioPodcast(podcast);
 }
 </script>

package/src/components/misc/player/radio/RadioHistory.vue

@@ -40,10 +40,10 @@ import ChevronLeftIcon from "vue-material-design-icons/ChevronLeft.vue";
 import ChevronRightIcon from "vue-material-design-icons/ChevronRight.vue";
 import { usePlayerStore } from "../../../../stores/PlayerStore";
 import dayjs from "dayjs";
-import radioHelper from "../../../../helper/radio/radioHelper";
 import { computed, nextTick, onMounted, onUnmounted, ref, useTemplateRef, watch } from "vue";
 import { MediaRadio } from "@/stores/class/general/player";
 import { useI18n } from "vue-i18n";
+import { useFetchRadio } from "../../../composable/radio/usefetchRadioData";
 
 
 //Data 
@@ -54,6 +54,7 @@ const historyListContainerRef = useTemplateRef('historyListContainer');
 //Composables
 const { t } = useI18n();
 const playerStore = usePlayerStore();
+const {displayTitle} = useFetchRadio();
 
 
 //Computed
@@ -119,7 +120,7 @@ function displayPreviousItem(item: MediaRadio): string {
   if (item.podcastId) {
     return item.title;
   }
-  return radioHelper.displayTitle(item);
+  return displayTitle(item);
 }
 </script>
 <style lang="scss">

package/src/locale/de.ts

@@ -167,7 +167,6 @@ export default {
   "open left Menu": "Menü öffnen/schließen",
   Participant: "Sprecher",
   "Number of player podcasts": "Anzahl der Podcasts im Player",
-  "Proceed reading": "Weiterhören",
   "Without topic": "Ohne Thema",
   "Without rubric": "Ohne Rubrik",
   "Consider podcasts no visible":
@@ -414,4 +413,5 @@ export default {
   "Code copied!":"Code kopiert!",
   "Copied!":"Kopiert!",
   "Color of the QR Code": "Farbe des QR-Codes",
+  "Silent stream":"Stiller Fluss",
 }

package/src/locale/en.ts

@@ -166,7 +166,6 @@ export default {
   "open left Menu": "Open/Close Menu",
   Participant: "Speaker",
   "Number of player podcasts": "Number of podcasts in the player ",
-  "Proceed reading": "Continue Listening",
   "Without topic": "Without a topic",
   "Without rubric": "Without a rubric",
   "Consider podcasts no visible":
@@ -417,4 +416,5 @@ export default {
   "Code copied!":"Code copied!",
   "Copied!":"Copied!",
   "Color of the QR Code": "Color of the QR Code",
+  "Silent stream":"Silent stream",
 };

package/src/locale/es.ts

@@ -167,7 +167,6 @@ export default {
   "open left Menu": "Abrir/Cerrar menú",
   Participant: "Participante",
   "Number of player podcasts": "Número de pódcast en el reproductor",
-  "Proceed reading": "Seguir escuchando",
   "Without topic": "Sin tema",
   "Without rubric": "Sin sección",
   "Consider podcasts no visible":
@@ -415,4 +414,5 @@ export default {
   "Code copied!":"¡Código copiado!",
   "Copied!":"¡Copiado!",
   "Color of the QR Code": "Color del código QR",
+  "Silent stream":"Flujo silencioso",
 }

package/src/locale/fr.ts

@@ -168,7 +168,6 @@ export default {
   "open left Menu": "Ouvrir/Fermer le menu",
   Participant: "Intervenant",
   "Number of player podcasts": "Nombre d'épisodes dans le miniplayer",
-  "Proceed reading": "Poursuivre la lecture",
   "Without topic": "Sans rubriquage",
   "Without rubric": "Non rubriqué",
   "Consider podcasts no visible":
@@ -424,4 +423,5 @@ export default {
   "Code copied!":"Code copié !",
   "Copied!":"Copié !",
   "Color of the QR Code": "Couleur du Qr Code",
+  "Silent stream":"Flux silencieux",
 };

package/src/locale/it.ts

@@ -163,7 +163,6 @@ export default{
     'open left Menu': 'Apri/Chiudi Menu',
     Participant: 'Speaker',
     'Number of player podcasts': "Numero di podcast nel lettore",
-    'Proceed reading': 'Continua ad ascoltare',
     'Without topic': 'Senza un tema',
     'Without rubric': 'Senza una rubrica',
     'Consider podcasts no visible':
@@ -411,4 +410,5 @@ export default{
   "Code copied!":"Codice copiato!",
   "Copied!":"Copiato!",
   "Color of the QR Code": "Colore del codice QR",
+  "Silent stream":"Flusso silenzioso",
 };

package/src/locale/sl.ts

@@ -163,7 +163,6 @@ export default {
   "open left Menu": "Meni odpri/zapri",
   Participant: "Sodelujoči",
   "Number of player podcasts": "Število podkastov v predvajalniku",
-  "Proceed reading": "Nadaljuj s poslušanjem",
   "Without topic": "Brez teme",
   "Without rubric": "Brez rubrike",
   "Consider podcasts no visible": "Občinstvu skriti podkasti",
@@ -406,4 +405,5 @@ export default {
   "Code copied!":"Koda kopirana!",
   "Copied!":"Kopirano!",
   "Color of the QR Code": "Barva kode QR",
+  "Silent stream":"Tihi tok",
 }

package/src/stores/PlayerStore.ts

@@ -215,7 +215,7 @@ export const usePlayerStore = defineStore("PlayerStore", {
     playerUpdateSeekTime(seekTime: number) {
       this.playerSeekTime = seekTime;
     },
-    playerMetadata(metadata: MediaRadio, history: Array<MediaRadio>) {
+    playerMetadata(metadata: MediaRadio|undefined, history: Array<MediaRadio>) {
       if (!this.playerRadio) {
         return;
       }

package/src/stores/class/conference/conference.ts

@@ -8,7 +8,7 @@ export interface Conference {
   deletionAttempts?: number;
   directCode?: string;
   externalRtmpUrl?: ExternalRtmpUrl;
-  hlsIdentifier: string;
+  hlsIdentifier?: string;
   hostname?: string;
   jingleDuration?: number;
   jingleFilePath?: string;

package/src/stores/class/general/player.ts

@@ -4,7 +4,7 @@ import { Podcast } from "./podcast";
 export interface Radio {
   canalId: number;
   url: string;
-  metadata: MediaRadio;
+  metadata?: MediaRadio;
   history: Array<MediaRadio>;
   nextAdvertising: NextAdvertising;
   isInit: boolean;
@@ -30,7 +30,7 @@ export interface NextAdvertising {
 
 export interface MetadataRadio {
   channelId: number;
-  currently: MediaRadio;
+  currently: MediaRadio|null;
   previously: Array<MediaRadio>;
   nextAdvertising: NextAdvertising;
 }

package/src/helper/radio/radioHelper.ts

@@ -1,15 +0,0 @@
-import { MediaRadio } from "@/stores/class/general/player";
-
-export default {
-    displayTitle(metadata: MediaRadio): string {
-        let title = "";
-        if (metadata.title) {
-          title += metadata.title;
-        }
-        if (metadata.artist) {
-          title += " - " + metadata.artist;
-        }
-        return title;
-      }
-};
-