@saooti/octopus-sdk 31.0.52 → 31.0.54

package/README.md

@@ -643,3 +643,5 @@ 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

package/package.json

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

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,36 @@ export const playerLive = defineComponent({
         this.live.conferenceId +
         '/index.m3u8';
       try {
-        await this.initHls(hlsStreamUrl);
+        this.audioElement = (document.getElementById('audio-player') as HTMLAudioElement);
+        if (this.audioElement && 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');
+      }
+    },
     async initHls(hlsStreamUrl: string): Promise<void> {
       return new Promise<void>(async(resolve, reject) => {
         if(null === Hls){
@@ -55,7 +78,7 @@ export const playerLive = defineComponent({
         if (!Hls.isSupported()) {
           reject('Hls is not supported ! ');
         }
-        let hls = new Hls();
+        const hls = new Hls();
         /* if(this.$store.state.authentication.isAuthenticated && this.$store.state.oAuthParam.accessToken){
           hls = new Hls({xhrSetup:
             (xhr: XMLHttpRequest) => {
@@ -65,23 +88,10 @@ 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');
-          }
+          await this.initLiveDownloadId();
           this.hlsReady = true;
-          const audio: HTMLElement|null = document.getElementById('audio-player');
-          hls.attachMedia((audio as HTMLAudioElement));
-          await (audio as HTMLAudioElement).play();
+          hls.attachMedia((this.audioElement as HTMLAudioElement));
+          await (this.audioElement as HTMLAudioElement).play();
           this.onPlay();
           resolve();
         });

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

@@ -50,8 +50,8 @@ export const playerLogic = defineComponent({
       if(this.media || !this.podcast || !this.podcast.availability.visibility ||this.listenError){
         this.audioUrlToPlay = this.audioUrl;
       }
-      if(!this.podcast){return;}
-      const response = await octopusApi.fetchDataPublic<{location:string, downloadId: number}>(0,"podcast/download/register/"+ this.audioUrl);
+      if(!this.podcast || !this.podcast.availability.visibility ||this.listenError){return;}
+      const response = await octopusApi.fetchDataPublic<{location:string, downloadId: number}>(0,"podcast/download/register/"+ this.getAudioUrlParameters());
       this.setDownloadId(response.downloadId.toString());
       this.audioUrlToPlay = response.location;
     },
@@ -101,12 +101,8 @@ export const playerLogic = defineComponent({
       }
       return domain;
     },
-    getAudioUrl(): string{
-      if (this.media) return this.media.audioUrl? this.media.audioUrl:"";
+    getAudioUrlParameters(): string{
       if (!this.podcast) return '';
-      if (!this.podcast.availability.visibility)
-        return this.podcast.audioStorageUrl;
-      if (this.listenError) return this.podcast.audioStorageUrl;
       const parameters = [];
       parameters.push('origin=octopus');
       parameters.push('listenerId='+this.getListenerId());
@@ -123,6 +119,14 @@ export const playerLogic = defineComponent({
       }
       return this.podcast.podcastId + '.mp3?' + parameters.join('&');
     },
+    getAudioUrl(): string{
+      if (this.media) return this.media.audioUrl? this.media.audioUrl:"";
+      if (!this.podcast) return '';
+      if (!this.podcast.availability.visibility)
+        return this.podcast.audioStorageUrl;
+      if (this.listenError) return this.podcast.audioStorageUrl;
+      return this.getAudioUrlParameters();
+    },
     reInitPlayer():void{
       this.setDownloadId(null);
       this.listenError = false;