@saooti/octopus-sdk 31.0.53 → 31.0.55

package/README.md

@@ -644,3 +644,5 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 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

package/package.json

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

package/src/api/classicCrud.ts

@@ -14,6 +14,11 @@ enum ModuleApi {
   }
 /* eslint-disable */
 export default {
+    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;
+    },
     async postData<Type>(state: StoreState,moduleName: ModuleApi,wsPath:string, elementToCreate: unknown): Promise<Type>{
         console.log(state,moduleName,wsPath);
         const response = await axios.post('/mock', elementToCreate, {

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

@@ -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> {

package/src/store/paramStore.ts

@@ -3,7 +3,7 @@ import { Category } from './class/general/category';
 
 const state:paramStore = {
   generalParameters: {
-    organisationId:'ecbd98d9-79bd-4312-ad5e-fc7c1c4a191c',
+    organisationId:'0c599ef4-7bf3-4a76-b7ef-4ed7e4d5cd89',
     authenticated: true,
     isAdmin: true,
     isRoleLive: true,
@@ -12,7 +12,7 @@ const state:paramStore = {
     isPlaylist: false,
     isProduction: true,
     isContribution: true,
-    ApiUri: 'https://api.dev2.saooti.org/',
+    ApiUri: 'https://api.preprod.saooti.org/',
     podcastmaker: false,
     buttonPlus: true,
     allCategories: [],
@@ -26,9 +26,9 @@ const state:paramStore = {
     SharePlayer: true,
     ShareButtons: true,
     ShareDistribution: true,
-    MiniplayerUri: 'https://playerbeta.dev2.saooti.org/',
+    MiniplayerUri: 'https://playerbeta.preprod.saooti.org/',
     downloadButton: false,
-    hlsUri: 'https://hls.dev2.saooti.org/',
+    hlsUri: 'https://hls.preprod.saooti.org/',
     mainRubrique: 0,
     resourceUrl: undefined,
     podcastItemShowEmission: false,
@@ -83,10 +83,10 @@ const state:paramStore = {
     userName: '',
   },
   octopusApi: {
-    url: 'http://api.dev2.saooti.org/',
-    commentsUrl: 'http://comments.dev2.saooti.org/',
-    studioUrl: 'http://studio.dev2.saooti.org/',
-    playerUrl: 'https://playerbeta.dev2.saooti.org/',
+    url: 'http://api.preprod.saooti.org/',
+    commentsUrl: 'http://comments.preprod.saooti.org/',
+    studioUrl: 'http://studio.preprod.saooti.org/',
+    playerUrl: 'https://playerbeta.preprod.saooti.org/',
     organisationId: undefined,
     rubriqueIdFilter: undefined,
   },