@saooti/octopus-sdk 32.0.30 → 32.0.31

package/README.md

@@ -643,6 +643,12 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 31.0.50 Améliorations responsive
  * 31.0.51 Newest
  * 31.0.52 Locale
+ * 31.0.53 Correction playerLogic
+ * 31.0.54 Test live ios
+ * 31.0.55 Test live ios
+ * 31.0.56 Test live ios
+ * 31.0.57 Test live ios
+
 
  * 32.0.0 Passage en 32
  * 32.0.1 Navigation clavier
@@ -674,4 +680,5 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 32.0.27 Image Proxy -> webp
  * 32.0.28 Image Proxy
  * 32.0.29 SpeechToText
- * 32.0.30 SpeechToText
+ * 32.0.30 SpeechToText
+ * 32.0.31 Merge live IOS

package/package.json

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

package/src/api/classicCrud.ts

@@ -16,8 +16,8 @@ enum ModuleApi {
   }
 /* eslint-disable */
 export default {
-    async fetchData<Type>(state: StoreState,moduleName: ModuleApi,wsPath:string): Promise<Type>{
-        console.log(state,moduleName,wsPath);
+    async fetchData<Type>(state: StoreState,moduleName: ModuleApi,wsPath:string, forceRefresh?:boolean): Promise<Type>{
+        console.log(state,moduleName,wsPath,forceRefresh);
         const response = await axios.get('/mock');
         return response.data;
     },

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

@@ -14,6 +14,7 @@ export const playerLive = defineComponent({
       lastSend: 0 as number,
       hlsReady: false as boolean,
       downloadId: null as string|null,
+      audioElement: null as HTMLAudioElement|null
     };
   },
   computed: {
@@ -33,14 +34,43 @@ export const playerLive = defineComponent({
         this.live.conferenceId +
         '/index.m3u8';
       try {
-        await this.initHls(hlsStreamUrl);
+        this.audioElement = (document.getElementById('audio-player') as HTMLAudioElement);
+        if(null===this.audioElement){
+          setTimeout(() => {
+            this.playLive();
+          }, 1000);
+          return;
+        }
+        if (this.audioElement.canPlayType('application/vnd.apple.mpegurl')) {
+          this.audioElement.src = hlsStreamUrl;
+          await this.initLiveDownloadId();
+          await (this.audioElement as HTMLAudioElement).play();
+          this.onPlay();
+        }else{
+          await this.initHls(hlsStreamUrl);
+        }
       } catch (error) {
-        console.log(error);
         setTimeout(() => {
           this.playLive();
         }, 1000);
       }
     },
+    async initLiveDownloadId(){
+      if(!this.live){ return;}
+      let downloadId = null;
+      try {
+        downloadId = await octopusApi.putDataPublic<string | null>(0, 'podcast/prepare/live/'+this.live.livePodcastId, undefined);
+        await octopusApi.fetchDataPublicWithParams<string | null>(0,'podcast/download/live/' + this.live.livePodcastId+".m3u8",{
+          'downloadId': null!==downloadId ? downloadId : undefined,
+          'origin':'octopus',
+          'distributorId':this.$store.state.authentication.organisationId
+        });
+        this.setDownloadId(downloadId);
+      } catch (error) {
+        console.log('ERROR downloadId');
+      }
+      this.hlsReady = true;
+    },
     async initHls(hlsStreamUrl: string): Promise<void> {
       return new Promise<void>(async(resolve, reject) => {
         if(null === Hls){
@@ -65,23 +95,9 @@ export const playerLive = defineComponent({
           );
         } */
         hls.on(Hls.Events.MANIFEST_PARSED, async () => {
-          if(!this.live){ return; }
-          let downloadId = null;
-          try {
-            downloadId = await octopusApi.putDataPublic<string | null>(0, 'podcast/prepare/live/'+this.live.livePodcastId, undefined);
-            await octopusApi.fetchDataPublicWithParams<string | null>(0,'podcast/download/live/' + this.live.livePodcastId+".m3u8",{
-              'downloadId': null!==downloadId ? downloadId : undefined,
-              'origin':'octopus',
-              'distributorId':this.$store.state.authentication.organisationId
-            });
-            this.setDownloadId(downloadId);
-          } catch (error) {
-            console.log('ERROR downloadId');
-          }
-          this.hlsReady = true;
-          const audio: HTMLElement|null = document.getElementById('audio-player');
-          hls.attachMedia((audio as HTMLAudioElement));
-          await (audio as HTMLAudioElement).play();
+          await this.initLiveDownloadId();
+          hls.attachMedia((this.audioElement as HTMLAudioElement));
+          await (this.audioElement as HTMLAudioElement).play();
           this.onPlay();
           resolve();
         });

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

@@ -63,10 +63,12 @@ export const playerLogic = defineComponent({
     },
     live: {
       deep: true,
-      async handler(){
-        this.hlsReady = false;
-        this.reInitPlayer();
-        await this.playLive();
+      handler(){
+        this.$nextTick(async () => {
+          this.hlsReady = false;
+          this.reInitPlayer();
+          await this.playLive();
+        });
       }
     },
     async listenTime(newVal): Promise<void> {
@@ -188,7 +190,15 @@ export const playerLogic = defineComponent({
             mediaTarget.currentTime - this.notListenTime;
         }
       }
-      const streamDuration = mediaTarget.duration;
+      let streamDuration = mediaTarget.duration;
+      if(Infinity===streamDuration){
+        const seekable = mediaTarget.seekable;
+        if(seekable){
+          streamDuration = seekable.end(seekable.length - 1);
+        }else{
+          streamDuration = mediaTarget.currentTime;
+        }
+      }
       if (!streamDuration) return;
       if (!mediaTarget.currentTime) return;
       if (!this.live) {