Merge pull request #22 from hankthetank27/s3-dump

S3 dump

package.json

@@ -8,10 +8,14 @@
     "start": "NODE_ENV=production ts-node ./src/server/index.ts",
     "test-start": "ts-node ./src/server/index.ts",
     "trace-dev": "NODE_OPTIONS='--trace-warnings --stack-trace-limit=50' nodemon src/server/index.ts -w src/server",
-    "heap-prof": "node --stack-trace-limit=50 --heap-prof --trace-warnings -r ts-node/register ./src/server/index.ts"
+    "heap-prof": "node --stack-trace-limit=50 --heap-prof --trace-warnings -r ts-node/register ./src/server/index.ts",
+    "download-audio": "NODE_ENV=production npx ts-node ./src/server/livestream/DownLoadScripts.ts",
+    "revalidate": "NODE_ENV=production npx ts-node ./src/server/livestream/RevalidateTags.ts"
   },
   "dependencies": {
-    "@distube/ytdl-core": "^4.14.3",
+    "@aws-sdk/client-s3": "^3.682.0",
+    "@aws-sdk/lib-storage": "^3.679.0",
+    "@distube/ytdl-core": "^4.15.1",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@ffmpeg-installer/ffmpeg": "^1.1.0",

src/@types.ts

@@ -1,4 +1,3 @@
-
 export interface songInfo{
   post_id: string;
   title: string;
@@ -18,8 +17,6 @@ export interface streamProcessTracker {
   downloaded: number;
   processed: number;
   passThroughFlowing: boolean;
-  ytdlDone: boolean;
-  transcodeAudioDone: boolean;
   passToDestinationDone: boolean;
 };
 
@@ -48,11 +45,26 @@ export interface dbQueryFilters {
 
 export interface post{
   user_name?: string; 
-  track_title?: string;
+  track_title?: string; // We need to update this on DB documents with s3_file_data from ytdl 'getSongInfo'
   text?: string;
   link?: string;
   link_source?: string;
-  date_posted: string;
+  date_posted: Date;
   reacts?: string;
   has_been_played?: boolean;
+  date_aired?: Date;
+};
+
+export interface SongDocument extends post {
+  _id: any;
+  s3_file_data?: {
+    bucket: string;
+    key: string;
+    etag: string;
+    location: string;
+    duration: string;
+    channel: string;
+    itag: number;
+    length: number;
+  }
 };

src/client/components/CurrentSongDisplay.tsx

@@ -2,15 +2,15 @@ import Hls from "hls.js";
 import { useState, useEffect, useContext, Dispatch, SetStateAction } from "react";
 import { SocketContext } from "../context/socket";
 import { v4 as uuid } from 'uuid'
-import { songInfo } from "../../@types";
+import { SongDocument } from "../../@types";
 import styles from '@/styles/CurrentSongDisplay.module.css'
 import { serverEmiters, clientEmiters } from "../../socketEvents";
 
 
 interface currentSongDisplayProps{
   hlsAudio: Hls | null
-  currentlyPlaying: songInfo | null
-  setCurrentlyPlaying: Dispatch<SetStateAction<songInfo | null>>
+  currentlyPlaying: SongDocument | null
+  setCurrentlyPlaying: Dispatch<SetStateAction<SongDocument | null>>
 };
 
 export function CurrentSongDisplay({
@@ -67,27 +67,27 @@ export function CurrentSongDisplay({
 
 
 interface displaySongInfoProps{
-  currentlyPlaying: songInfo
+  currentlyPlaying: SongDocument
 };
 
 function DisplaySongInfo({
   currentlyPlaying,
 }: displaySongInfoProps): JSX.Element{
 
   const {
-    memberPosted,
-    datePosted,
-    postText,
+    user_name,
+    date_posted,
+    text,
   } = currentlyPlaying
 
   return (
     <div className={styles.currentlyPlaying}>
       <ul key={uuid()} className={ styles.currentlyPlayingList }>
         <li className={ styles.listItem }>
-          {memberPosted}
-          {datePosted
+          {user_name}
+          {date_posted
             ? <span>
-              {(memberPosted ? ", " : "") + new Date(datePosted)
+              {(user_name ? ", " : "") + new Date(date_posted)
                 .toDateString()
                 .split(' ')
                 .slice(1)
@@ -98,8 +98,8 @@ function DisplaySongInfo({
           }
         </li>
         <li className={ styles.listItem }>
-          {postText
-            ? <span>"{postText}"</span>
+          {text
+            ? <span>"{text}"</span>
             : null
           }
         </li>

src/client/components/StreamPlayer.tsx

@@ -2,7 +2,7 @@ import Hls from "hls.js";
 import { useEffect, useState, createRef, RefObject } from "react";
 import { v4 as uuid } from 'uuid'
 import { CurrentSongDisplay } from "./CurrentSongDisplay";
-import { songInfo } from "../../@types";
+import { SongDocument } from "../../@types";
 import styles from '@/styles/StreamPlayer.module.css';
 
 
@@ -16,7 +16,7 @@ export function StreamPlayer({
 
   const audioElement = createRef<HTMLAudioElement>();
   const [ hlsAudio, setHlsAudio ] = useState<Hls | null>(null);
-  const [ currentlyPlaying, setCurrentlyPlaying ] = useState<songInfo | null>(null);
+  const [ currentlyPlaying, setCurrentlyPlaying ] = useState<SongDocument | null>(null);
 
   useEffect(() => {
     if (Hls.isSupported()) {
@@ -104,9 +104,9 @@ export function StreamPlayer({
         <h4 className={styles.songTitle}>
           <a
             target="_blank"
-            href={currentlyPlaying?.src}
+            href={currentlyPlaying?.link}
           >
-            {currentlyPlaying?.title}
+            {currentlyPlaying?.track_title}
           </a>
         </h4>
       </div>

src/server/@types.ts

@@ -94,3 +94,4 @@ interface FissionTaskModel {
     vs: string;
     vf: string;
 }
+