Updated streamType enum to change hls to livehls

src/app/channel/media/queue.js

@@ -329,7 +329,10 @@ class queue{
      */
     async goLive(socket, data){
         try{
+            //Define and/or declare required variables
             let title = "Livestream";
+            let filename;
+            let streamURL;
 
             if(data != null && data.title != null){
                 //If the title is too long
@@ -383,24 +386,26 @@ class queue{
             //Kill schedule timers to prevent items from starting during the stream
             await this.stopScheduleTimers();
 
-            //Syntatic sugar because I'm lazy :P
+            if(chanDB.settings.streamType == "livehls"){
-            const streamURL = chanDB.settings.streamURL;
+                //Syntatic sugar because I'm lazy :P
+                streamURL = chanDB.settings.streamURL;
 
-            if(streamURL == ''){
+                if(streamURL == ''){
-                throw loggerUtils.exceptionSmith('This channel\'s HLS Livestream Source has not been set!', 'queue');
+                    throw loggerUtils.exceptionSmith('This channel\'s HLS Livestream Source has not been set!', 'queue');
-            }
+                }
 
 
-            //Pull filename from streamURL
+                //Pull filename from streamURL
-            let filename = streamURL.match(/^.+\..+\/(.+)$/);
+                filename = streamURL.match(/^.+\..+\/(.+)$/);
 
-            //If we're streaming from the root of the domain
+                //If we're streaming from the root of the domain
-            if(filename == null){
+                if(filename == null){
-                //Set filename to root
+                    //Set filename to root
-                filename = '/';
+                    filename = '/';
-            }else{
+                }else{
-                //Otherwise, hand over the filename
+                    //Otherwise, hand over the filename
-                filename = filename[1];
+                    filename = filename[1];
+                }
             }
 
             //Create queued media object from stream URL and set it to nowPlaying
@@ -409,7 +414,7 @@ class queue{
                 filename,
                 streamURL,
                 streamURL,
-                "livehls",
+                chanDB.settings.streamType,
                 0,
                 streamURL,
                 new Date().getTime()

src/schemas/channel/channelSchema.js

@@ -38,7 +38,7 @@ const { exceptionHandler, errorHandler } = require('../../utils/loggerUtils');
 /**
  * "Enum" for emote type property
  */
-const streamMethodEnum = ["webrtc","hls"];
+const streamMethodEnum = ["webrtc","livehls"];
 
 /**
  * DB Schema for Documents containing de-hydrated representations of Canopy Stream/Chat Channels

src/validators/channelValidator.js

@@ -85,7 +85,7 @@ module.exports.settingsMap = function(){
                 optional: true,
                 errorMessage: "Invalid Stream Type",
                 matches: {
-                    options: [/\b(?:webrtc|hls)\b/]
+                    options: [/\b(?:webrtc|livehls)\b/]
                 }
             }
         })

src/views/partial/channelSettings/settings.ejs

@@ -42,10 +42,10 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>. %>
                         <label for="channel-preference-list-stream-type-webrtc">Peer-to-Peer (WebRTC/STUN)</label>
                     </span>
                     <span>
-                        <input type="radio" name="streamType" id="channel-preference-list-stream-type-hls" value="hls" <% if(channel.settings["streamType"] == "hls"){ %> checked <% }%>  >
+                        <input type="radio" name="streamType" id="channel-preference-list-stream-type-hls" value="livehls" <% if(channel.settings["streamType"] == "livehls"){ %> checked <% }%>  >
                         <label for="channel-preference-list-stream-type-hls">Self-Hosted (HLS)</label>
                     </span>
-                    <input  <% if(channel.settings["streamType"] != "hls"){ %> disabled <%}%> id="channel-preference-list-stream-url" placeholder="Stream URL" value="<%= channel.settings["streamURL"] %>">
+                    <input  <% if(channel.settings["streamType"] != "livehls"){ %> disabled <%}%> id="channel-preference-list-stream-url" placeholder="Stream URL" value="<%= channel.settings["streamURL"] %>">
                 </span>
 
             </span>

www/js/channelSettings.js

@@ -412,7 +412,7 @@ class livestreamPreferences{
 
     handleTypeUpdate(data){
         //If the stream type is HLS
-        if(data.streamType == "hls"){
+        if(data.streamType == "livehls"){
             //Ensure the hls button is checked
             this.hlsButton.checked = true;
             //Ensure the stream url input is enabled