@saooti/octopus-sdk 34.0.4 → 34.0.5

package/package.json

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

package/src/components/mixins/player/playerDisplay.ts

@@ -3,7 +3,7 @@ import DurationHelper from '../../../helper/duration';
 import { state } from '../../../store/paramStore';
 import { defineComponent } from 'vue';
 import { RouteLocationRaw } from 'vue-router';
-import { MediaRadio, Radio } from '@/store/class/general/player';
+import { MediaRadio, MetadataRadio, Radio } from '@/store/class/general/player';
 import octopusApi from '@saooti/octopus-api';
 export const playerDisplay = defineComponent({
 	props: {
@@ -59,7 +59,7 @@ export const playerDisplay = defineComponent({
     },
 		podcastTitle(): string {
       if(this.$store.state.player.radio){
-        return this.$store.state.player.radio.metadata.title + " - " + this.$store.state.player.radio.metadata.artist;
+        return this.$store.state.player.radio.metadata.title + " " + this.$store.state.player.radio.metadata.artist;
       }
       if (this.$store.state.player.podcast) {
         if (this.isEmissionName)
@@ -109,8 +109,8 @@ export const playerDisplay = defineComponent({
   },
   methods: {
     async fetchRadioMetadata(): Promise<void>{
-      const metadata = await octopusApi.fetchData<MediaRadio>(14, 'player/playing/'+this.$store.state.player.radio.canalId);
-      this.$store.commit('player/radioMetadata', metadata);
+      const metadata = await octopusApi.fetchData<MetadataRadio>(14, 'player/playing/'+this.$store.state.player.radio.canalId);
+      this.$store.commit('player/radioMetadata', metadata.currently);
     },
     addKeyboardControl(event: KeyboardEvent): void{
       if(!event || null ===event){return;}

package/src/components/mixins/player/playerLive.ts

@@ -14,7 +14,8 @@ export const playerLive = defineComponent({
       lastSend: 0 as number,
       hlsReady: false as boolean,
       downloadId: null as string|null,
-      audioElement: null as HTMLAudioElement|null
+      audioElement: null as HTMLAudioElement|null,
+      hls: null as any,
     };
   },
   computed: {
@@ -84,18 +85,18 @@ export const playerLive = defineComponent({
         if (!Hls.isSupported()) {
           reject('Hls is not supported ! ');
         }
-        const hls = new Hls();
-        hls.on(Hls.Events.MANIFEST_PARSED, async () => {
+        this.hls = new Hls();
+        this.hls.on(Hls.Events.MANIFEST_PARSED, async () => {
           await this.initLiveDownloadId();
-          hls.attachMedia((this.audioElement as HTMLAudioElement));
+          this.hls.attachMedia((this.audioElement as HTMLAudioElement));
           await (this.audioElement as HTMLAudioElement).play();
           this.onPlay();
           resolve();
         });
-        hls.on(Hls.Events.ERROR, async() => {
+        this.hls.on(Hls.Events.ERROR, async() => {
           reject('There is an error while reading media content');
         });
-        hls.loadSource(hlsStreamUrl);
+        this.hls.loadSource(hlsStreamUrl);
       });
     },
     setDownloadId(newValue: string|null): void {
@@ -114,5 +115,13 @@ export const playerLive = defineComponent({
       this.lastSend = 0;
       this.listenTime = 0;
     },
+    endingLive():void{
+      const audio: HTMLElement|null = document.getElementById('audio-player');
+      if(audio && this.hls){
+        this.hls.destroy();
+        (audio as HTMLAudioElement).src = '';
+        this.hls = null;
+      }
+    }
   },
 })

package/src/components/mixins/player/playerLogic.ts

@@ -113,7 +113,11 @@ export const playerLogic = defineComponent({
       }else if('PAUSED' === this.status){
         audioPlayer.pause();
       }else if ('PLAYING' === this.status && this.radio){
-        this.playRadio();
+        if(this.radio.isInit){
+          this.playRadio();
+        }else{
+          this.radio.isInit = true;
+        }
       }else if('PLAYING' === this.status){
         audioPlayer.play();
       }
@@ -163,6 +167,9 @@ export const playerLogic = defineComponent({
       this.setDownloadId(null);
       this.listenError = false;
       this.initComments();
+      if (this.live || this.radio) {
+        this.endingLive();
+      }
     },
     stopPlayer(): void {
       this.$store.commit('player/playPodcast');
@@ -260,11 +267,5 @@ export const playerLogic = defineComponent({
       }
       this.forceHide = true;
     },
-    endingLive():void{
-      const audio: HTMLElement|null = document.getElementById('audio-player');
-      if(audio){
-        (audio as HTMLAudioElement).src = '';
-      }
-    }
   },
 })

package/src/components/pages/Home.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="page-box">
     <button @click="playRadio">Radio</button>
+    <button @click="playRadioBis">RadioBis</button>
     <template v-if="0 === rubriquageFilter.length">
       <PodcastInlineList
         v-for="c in categories"
@@ -96,6 +97,14 @@ export default defineComponent({
         metadata : ""
       });
 
+    },
+    playRadioBis(){
+      this.$store.commit('player/playPodcast', {
+        canalId: 1,
+        url: "https://79a52b6b-8475-42f9-9c48-7f7460202649.stream.dev2.saooti.org/live.m3u8",
+        metadata : ""
+      });
+
     }
   }
 })

package/src/store/PlayerStore.ts

@@ -40,7 +40,7 @@ const mutations = <MutationTree<Player>>{
     } else if (podcast.mediaId) {
       state.media = podcast;
     }else if(podcast.canalId){
-      state.radio = podcast;
+      state.radio = {...podcast,...{isInit: false}};
     }
   },
 

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

@@ -5,6 +5,7 @@ export interface Radio{
   canalId: number;
   url: string;
   metadata: MediaRadio;
+  isInit: boolean,
 }
 export interface MediaRadio{
   artist:string;
@@ -18,6 +19,13 @@ export interface MediaRadio{
   uri:string;
 }
 
+export interface MetadataRadio{
+  channelId:number;
+  currently:MediaRadio;
+  previously:Array<MediaRadio>;
+}
+
+
 
 export interface Player{
     status: string; //STOPPED, LOADING, PLAYING, PAUSED