Merge pull request #1781 from fireship-io/hugo-ext

video player updates
fireship-io · Nov 28, 2024 · 027f23c · 027f23c
2 parents 96eb582 + cc35afa
commit 027f23c
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 5 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -11,6 +11,7 @@ env:
   ALGOLIA_ADMIN_KEY: ${{secrets.ALGOLIA_ADMIN_KEY}}
   ALGOLIA_INDEX_NAME: content 
   ALGOLIA_INDEX_FILE: public/algolia.json
+  HUGO_SALT: ${{secrets.HUGO_SALT}}
 
 
 jobs:

diff --git a/app/util/player.ts b/app/util/player.ts
@@ -8,16 +8,20 @@ export class UniversalPlayer {
     constructor(public video: string | number, public el: HTMLElement, public type: 'youtube' | 'vimeo') {}
 
     private async setupPlayer() {
+
         if (this.type === 'youtube') {
             const YouTubePlayer = (await import('youtube-player')).default;
             const decoded = atob(this.video as string);
+
             this.ytPlayer = YouTubePlayer(this.el);
             this.ytPlayer.cueVideoById(decoded);
         } else {
             const VimeoPlayer = (await import('@vimeo/player')).default;
-            const decoded = parseInt(atob(this.video as string));
-            // const buildId = parseInt(document.head.dataset.build);
-            this.vimeoPlayer = new VimeoPlayer(this.el, { id: decoded });
+
+            const decoded = await this.decoded();
+            const vimeoId = parseInt(decoded)
+
+            this.vimeoPlayer = new VimeoPlayer(this.el, { id: vimeoId });
         }
 
     }
@@ -29,6 +33,18 @@ export class UniversalPlayer {
         return obj;
     }
 
+    async decoded() {
+        const path = window.location.pathname;
+        const s1 = btoa(path);
+        let p1 = (await import('./s2')).default;
+        const p2 = 'fUCB3Iv';
+        const s2 = p1+p2;
+        let withS = atob(this.video as string)
+        let encoded = withS.slice(s1.length, -s2.length);
+        const decoded = atob(encoded)
+        return decoded;
+    }
+
     play() {
         if (this.type === 'youtube') {
             this.ytPlayer.playVideo();

diff --git a/app/util/s2.ts b/app/util/s2.ts
@@ -0,0 +1,4 @@
+export default (()=>{
+    const c = [120, 105, 88, 70, 84, 116, 69, 85, 90]; 
+    return [1, 3, 4, 6, 0, 5, 7].map(i => String.fromCharCode(c[i])).join('');
+})();
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -25,12 +25,17 @@
 
   </head>
   <body>
-    {{ $vimeoEncode := .Params.vimeo | base64Encode }}
+
+
+    {{ $saltVimeo := "" }}
+    {{ if .Params.vimeo }}
+      {{ $saltVimeo = partial "funcEncodeValue" (dict "value" .Params.vimeo "path" .RelPermalink) }}
+    {{ end }}
     {{ $ytEncode := .Params.youtube | base64Encode }}
 
     <global-data 
     permalink="{{ .Permalink }}" 
-    vimeo="{{ $vimeoEncode }}"
+    vimeo="{{ $saltVimeo }}"
     youtube="{{ $ytEncode }}"
     free="{{ .Params.free }}"
     next="{{with .PrevInSection}}{{.Permalink}}{{end}}" 

diff --git a/layouts/partials/funcEncodeValue.html b/layouts/partials/funcEncodeValue.html
@@ -0,0 +1,14 @@
+
+{{/* Initialize variables */}}
+
+{{ $salt1 := .path | base64Encode }}
+
+{{ $value := .value }}
+{{ $salt2 := partial "funcGetSalt" . }}
+
+{{/* First base64 encode */}}
+{{ $encoded := $value | base64Encode }}
+
+{{/* Add different salts at start and end */}}
+{{ $withSalt := printf "%s%s%s" $salt1 $encoded $salt2 }}
+{{ return ($withSalt | base64Encode) }}
diff --git a/layouts/partials/funcGetSalt.html b/layouts/partials/funcGetSalt.html
@@ -0,0 +1,4 @@
+{{ $part1 := getenv "HUGO_SALT" }}
+{{ $part2 := "fUCB3Iv" }}
+
+{{ return (printf "%s%s" $part1 $part2) }}