@saooti/octopus-sdk 30.0.77 → 30.0.80

package/README.md

@@ -573,4 +573,7 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 30.0.74 Error locales en allemand (je sens que ça va être fun cette histoire)
  * 30.0.75 Parlement
  * 30.0.76 Space
- * 30.0.77 V-Calendar bloque version
+ * 30.0.77 V-Calendar bloque version
+ * 30.0.78 a -> word-break
+ * 30.0.79 DownloadId player
+ * 30.0.80 DownloadId player

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saooti/octopus-sdk",
-  "version": "30.0.77",
+  "version": "30.0.80",
   "private": false,
   "description": "Javascript SDK for using octopus",
   "author": "Saooti",
@@ -15,7 +15,7 @@
   "main": "./dist/octopus.common.js",
   "dependencies": {
     "@popperjs/core": "^2.11.0",
-    "@saooti/octopus-api": "^0.30.4",
+    "@saooti/octopus-api": "^0.30.5",
     "@vue/cli": "^5.0.0-rc.1",
     "@vue/compat": "^3.2.26",
     "axios": "^0.24.0",

package/src/assets/general.scss

@@ -13,6 +13,9 @@ body{
   overscroll-behavior-y: contain;
 }
 .octopus-app{
+  a{
+    word-break: break-word;
+  }
   h1{
     margin-bottom: 2rem;
   }

package/src/components/misc/Player.vue

@@ -29,7 +29,7 @@
       >
         <audio
           id="audio-player"
-          :src="!live? audioUrl: undefined"
+          :src="!live? audioUrlToPlay: undefined"
           autoplay
           @timeupdate="onTimeUpdate"
           @ended="onFinished"
@@ -108,6 +108,7 @@ export default defineComponent({
       hlsReady: false as boolean,
       comments: [] as Array<CommentPodcast>,
       showTimeline: false as boolean,
+      audioUrlToPlay: "" as string
     };
   },
   computed: {
@@ -141,7 +142,6 @@ export default defineComponent({
       if (this.listenError) return this.podcast.audioStorageUrl;
       const parameters = [];
       parameters.push('origin=octopus');
-      parameters.push('cookieName=player_' + this.podcast.podcastId);
       parameters.push('listenerId='+this.getListenerId());
       if (
         this.$store.state.authentication &&
@@ -151,7 +151,7 @@ export default defineComponent({
           'distributorId=' + this.$store.state.authentication.organisationId
         );
       }
-      return this.podcast.audioUrl + '?' + parameters.join('&');
+      return this.podcast.podcastId+'.mp3?' + parameters.join('&');
     },
     organisationId(): string|undefined {
       return state.generalParameters.organisationId;
@@ -190,6 +190,7 @@ export default defineComponent({
       }
     },
     async listenTime(newVal): Promise<void> {
+      console.log(this.lastSend, newVal);
       if ((!this.podcast && !this.live)||(!this.getDownloadId())||(newVal - this.lastSend < 10)) {
         return;
       }
@@ -202,8 +203,15 @@ export default defineComponent({
     commentsLoaded(): void {
       this.initComments(true);
     },
-    audioUrl(): void{
+    async audioUrl(): Promise<void>{
       this.playerError = false;
+      if(this.media || !this.podcast || !this.podcast.availability.visibility ||this.listenError){
+        this.audioUrlToPlay = this.audioUrl;
+      }
+      if(!this.podcast){return;}
+      const response = await octopusApi.fetchPodcastDownloadUrl("podcast/download/register/"+ this.audioUrl);
+      this.setDownloadId(response.downloadId.toString());
+      this.audioUrlToPlay = response.location;
     }
   },
 
@@ -216,16 +224,19 @@ export default defineComponent({
     stopPlayer(): void {
       this.$store.commit('playerPlayPodcast');
     },
+    getDomain(): string{
+      let domain = "";
+      const domainArray: RegExpExecArray | null = /\.(.+)/.exec(window.location.host);
+      if(domainArray &&  null !== domainArray){
+        domain = domainArray[1];
+      }
+      return domain;
+    },
     getListenerId(): string{
       let listenerId = this.getCookie("octopus_listenerId");
       if(!listenerId){
         listenerId = new Date().valueOf().toString() + Math.random();
-        let domain = "";
-        const domainArray: RegExpExecArray | null = /\.(.+)/.exec(window.location.host);
-        if(domainArray &&  null !== domainArray){
-          domain = domainArray[1];
-        }
-        this.setCookie("octopus_listenerId", listenerId, ';domain='+domain);
+        this.setCookie("octopus_listenerId", listenerId, ';domain='+this.getDomain());
       }
       return listenerId;
     },
@@ -257,9 +268,9 @@ export default defineComponent({
       this.downloadId = newValue;
     },
     onError(): void {
-      if (this.podcast && !this.listenError) {
+      if (this.podcast && ""!==this.audioUrlToPlay && !this.listenError) {
         this.listenError = true;
-      } else if (this.podcast || this.media) {
+      } else if ((this.podcast && ""!==this.audioUrlToPlay ) || this.media) {
         this.playerError = true;
       }
     },
@@ -267,7 +278,7 @@ export default defineComponent({
       const mediaTarget = (event.currentTarget as HTMLMediaElement);
       if (this.podcast || this.live) {
         if (!this.getDownloadId()) {
-          this.loadDownloadId();
+          return;
         }
         if (
           this.live &&
@@ -328,29 +339,17 @@ export default defineComponent({
         this.forceHide = false;
       }
     },
-    loadDownloadId(): void {
-      if (!this.podcast) return;
-      const matching_cookies = document.cookie
-        .split(';')
-        .map(item => {
-          const _return = item.trim().split('=');
-          return _return.map(item => item.trim());
-        })
-        .filter(item => {
-          if(!this.podcast){return '';}
-          return 'player_' + this.podcast.podcastId === item[0];
-        });
-      if (1 === matching_cookies.length) {
-        this.setDownloadId(matching_cookies[0][1]);
-      }
-    },
     async endListeningProgress(): Promise<void> {
       if (!this.getDownloadId()) return;
-      await octopusApi.updatePlayerTime(
-        this.getDownloadId(),
-        Math.round(this.listenTime)
-      );
-      this.setDownloadId(null);
+      try {
+        await octopusApi.updatePlayerTime(
+          this.getDownloadId(),
+          Math.round(this.listenTime)
+        );
+      } catch{
+        //Do nothing
+      }
+      this.downloadId = null;
       this.notListenTime = 0;
       this.lastSend = 0;
       this.listenTime = 0;

package/src/store/paramStore.ts

@@ -12,7 +12,7 @@ const state:paramStore = {
     isPlaylist: false,
     isProduction: true,
     isContribution: true,
-    ApiUri: 'https://api.staging.saooti.org/',
+    ApiUri: 'https://api.preprod.saooti.org/',
     podcastmaker: false,
     buttonPlus: true,
     allCategories: [],
@@ -26,10 +26,10 @@ const state:paramStore = {
     SharePlayer: true,
     ShareButtons: true,
     ShareDistribution: true,
-    MiniplayerUri: 'https://playerbeta.staging.saooti.org/',
+    MiniplayerUri: 'https://playerbeta.preprod.saooti.org/',
     ouestFranceStyle: false,
     downloadButton: false,
-    hlsUri: 'https://hls.staging.saooti.org/',
+    hlsUri: 'https://hls.preprod.saooti.org/',
     mainRubrique: 0,
     resourceUrl: undefined
   },
@@ -85,10 +85,10 @@ const state:paramStore = {
     userName: '',
   },
   octopusApi: {
-    url: 'http://api.staging.saooti.org/',
-    commentsUrl: 'http://comments.staging.saooti.org/',
-    studioUrl: 'http://studio.staging.saooti.org/',
-    playerUrl: 'https://playerbeta.staging.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,
   },