@saooti/octopus-sdk 34.0.3 → 34.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saooti/octopus-sdk",
-  "version": "34.0.3",
+  "version": "34.0.5",
   "private": false,
   "description": "Javascript SDK for using octopus",
   "author": "Saooti",
@@ -32,7 +32,7 @@
     "sonarqube-scanner": "^2.9.1",
     "swiper": "^8.4.5",
     "v-calendar": "^3.0.0-alpha.8",
-    "vite": "^4.0.1",
+    "vite": "^3.2.5",
     "vue": "^3.2.45",
     "vue-i18n": "^9.2.2",
     "vue-multiselect": "^3.0.0-alpha.2",
@@ -46,7 +46,7 @@
     "@types/jquery": "^3.5.14",
     "@typescript-eslint/eslint-plugin": "^5.46.1",
     "@typescript-eslint/parser": "^5.46.1",
-    "@vitejs/plugin-vue": "^4.0.0",
+    "@vitejs/plugin-vue": "^3.2.0",
     "@vue/compiler-sfc": "^3.2.45",
     "@vue/eslint-config-typescript": "^11.0.2",
     "eslint": "^8.29.0",

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 { 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;
+        return this.$store.state.player.radio.metadata.title + " " + this.$store.state.player.radio.metadata.artist;
       }
       if (this.$store.state.player.podcast) {
         if (this.isEmissionName)
@@ -82,7 +82,7 @@ export const playerDisplay = defineComponent({
       return this.$store.state.player.transcript?.actualText ?? "";
     },
     radio(): Radio{
-      return this.$store.state.player.radio;
+      return this.$store.state.player.radio?.url;
     }
 	},
   watch:{
@@ -109,8 +109,8 @@ export const playerDisplay = defineComponent({
   },
   methods: {
     async fetchRadioMetadata(): Promise<void>{
-      const metadata = await octopusApi.fetchData<string>(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: {
@@ -77,28 +78,25 @@ export const playerLive = defineComponent({
     async initHls(hlsStreamUrl: string): Promise<void> {
       return new Promise<void>(async(resolve, reject) => {
         if(null === Hls){
-          await import('hls.js/dist/hls.js').then((hlsLibrary) => {
-            Hls = hlsLibrary.default;
-          })
-            await import('hls.js').then((hlsLibrary) => {
+          await import('hls.js').then((hlsLibrary) => {
             Hls = hlsLibrary.default;
           })
         }
         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 {
@@ -117,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,5 +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"
@@ -88,6 +90,22 @@ export default defineComponent({
       }
       this.rubriqueId = rubriqueId;
     },
+    playRadio(){
+      this.$store.commit('player/playPodcast', {
+        canalId: 3,
+        url: "https://c6884219-e191-45ec-a931-6f34683c6ac7.stream.dev2.saooti.org/live.m3u8",
+        metadata : ""
+      });
+
+    },
+    playRadioBis(){
+      this.$store.commit('player/playPodcast', {
+        canalId: 1,
+        url: "https://79a52b6b-8475-42f9-9c48-7f7460202649.stream.dev2.saooti.org/live.m3u8",
+        metadata : ""
+      });
+
+    }
   }
 })
 </script>

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/classicSelectType.ts

@@ -0,0 +1,5 @@
+export interface ClassicSelectType {
+    title: string;
+    value: string;
+}
+  

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

@@ -0,0 +1,16 @@
+import { Pageable } from "./pageable";
+import { SortPageable } from "./sortPageable";
+
+export interface ListReturn<T> {
+    content: T;
+    empty: boolean;
+    first: boolean;
+    last: boolean;
+    number: number;
+    numberOfElements: number;
+    pageable: Pageable;
+    size: number;
+    sort: SortPageable;
+    totalElements: number;
+    totalPages: number;
+}

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

@@ -4,8 +4,27 @@ import { Podcast } from "./podcast";
 export interface Radio{
   canalId: number;
   url: string;
-  metadata: string;
+  metadata: MediaRadio;
+  isInit: boolean,
 }
+export interface MediaRadio{
+  artist:string;
+  duration:number;
+  kind:string;
+  mediaId:number;
+  mediaType:string|null;
+  playlistId:number;
+  startDate:string;
+  title:string;
+  uri:string;
+}
+
+export interface MetadataRadio{
+  channelId:number;
+  currently:MediaRadio;
+  previously:Array<MediaRadio>;
+}
+
 
 
 export interface Player{