@warren-bank/hls-proxy 3.4.1 → 3.4.2

package/README.md

@@ -136,6 +136,8 @@ options:
 --tls-cert <filepath>
 --tls-key <filepath>
 --tls-pass <filepath>
+--manifest-extension <ext>
+--segment-extension <ext>
 ```
 
 #### Options:
@@ -365,6 +367,10 @@ options:
 * _--tls-key_ is the filepath to the private key for the _--tls-cert_ security certificate
 * _--tls-pass_ is the filepath to a text file containing the security passphrase for the _--tls-key_ private key
   * optional, not required when the _--tls-key_ private key was created without a security passphrase
+* _--manifest-extension_ is the file extension associated with HLS manifests
+  * default value: `m3u8`
+* _--segment-extension_ is the file extension associated with media segments
+  * default value: `ts`
 
 #### Examples:
 

package/hls-proxy/bin/hlsd.js

@@ -45,7 +45,9 @@ const middleware = require('../proxy')({
   cache_storage_fs_dirpath:             argv_vals["--cache-storage-fs-dirpath"],
   debug_level:                          argv_vals["-v"],
   acl_whitelist:                        argv_vals["--acl-whitelist"],
-  http_proxy:                           argv_vals["--http-proxy"]
+  http_proxy:                           argv_vals["--http-proxy"],
+  manifest_extension:                   argv_vals["--manifest-extension"],
+  segment_extension:                    argv_vals["--segment-extension"]
 })
 
 if (middleware.connection)

package/hls-proxy/bin/lib/help.js

@@ -32,6 +32,8 @@ options:
 --tls-cert <filepath>
 --tls-key <filepath>
 --tls-pass <filepath>
+--manifest-extension <ext>
+--segment-extension <ext>
 `
 
 module.exports = help

package/hls-proxy/bin/lib/process_argv.js

@@ -38,7 +38,10 @@ const argv_flags = {
 
   "--tls-cert":                             {file: "path-exists"},
   "--tls-key":                              {file: "path-exists"},
-  "--tls-pass":                             {file: "path-exists"}
+  "--tls-pass":                             {file: "path-exists"},
+
+  "--manifest-extension":                   {},
+  "--segment-extension":                    {}
 }
 
 const argv_flag_aliases = {

package/hls-proxy/manifest_parser.js

@@ -110,7 +110,7 @@ const parse_HHMMSS_to_seconds = function(str) {
 //   prefetch_urls: [],
 //   modified_m3u8: ''
 // }
-const parse_manifest = function(m3u8_content, m3u8_url, referer_url, hooks, cache_segments, debug, vod_start_at_ms, redirected_base_url, should_prefetch_url) {
+const parse_manifest = function(m3u8_content, m3u8_url, referer_url, hooks, cache_segments, debug, vod_start_at_ms, redirected_base_url, should_prefetch_url, manifest_extension, segment_extension) {
   const m3u8_lines = m3u8_content.split(regexs.m3u8_line_separator)
   m3u8_content = null
 
@@ -123,7 +123,7 @@ const parse_manifest = function(m3u8_content, m3u8_url, referer_url, hooks, cach
       redirect_embedded_url(embedded_url, hooks, m3u8_url, debug)
       if (validate_embedded_url(embedded_url)) {
         finalize_embedded_url(embedded_url, vod_start_at_ms, debug)
-        encode_embedded_url(embedded_url, redirected_base_url, debug)
+        encode_embedded_url(embedded_url, redirected_base_url, debug, manifest_extension, segment_extension)
         get_prefetch_url(embedded_url, should_prefetch_url, prefetch_urls)
         modify_m3u8_line(embedded_url, m3u8_lines)
       }
@@ -330,13 +330,23 @@ const finalize_embedded_url = function(embedded_url, vod_start_at_ms, debug) {
   }
 }
 
-const encode_embedded_url = function(embedded_url, redirected_base_url, debug) {
-  embedded_url.encoded_url = (embedded_url.unencoded_url)
-    ? `${redirected_base_url}/${ utils.base64_encode(embedded_url.unencoded_url) }.${embedded_url.url_type || 'other'}`
-    : ''
+const encode_embedded_url = function(embedded_url, redirected_base_url, debug, manifest_extension, segment_extension) {
+  if (embedded_url.unencoded_url) {
+    let file_extension = embedded_url.url_type
+    if (file_extension) {
+      if (manifest_extension && (file_extension === 'm3u8'))
+        file_extension = manifest_extension
+      if (segment_extension && (file_extension === 'ts'))
+        file_extension = segment_extension
+    }
+
+    embedded_url.encoded_url = `${redirected_base_url}/${ utils.base64_encode(embedded_url.unencoded_url) }.${file_extension || 'other'}`
 
-  if (embedded_url.encoded_url)
     debug(3, 'redirecting (proxied):', embedded_url.encoded_url)
+  }
+  else {
+    embedded_url.encoded_url = ''
+  }
 }
 
 const get_prefetch_url = function(embedded_url, should_prefetch_url, prefetch_urls = []) {
@@ -362,7 +372,7 @@ const modify_m3u8_line = function(embedded_url, m3u8_lines) {
 }
 
 const modify_m3u8_content = function(params, segment_cache, m3u8_content, m3u8_url, referer_url, redirected_base_url) {
-  const {hooks, cache_segments, max_segments, debug_level} = params
+  const {hooks, cache_segments, max_segments, debug_level, manifest_extension, segment_extension} = params
 
   const {has_cache, get_time_since_last_access, is_expired, prefetch_segment} = segment_cache
 
@@ -419,7 +429,7 @@ const modify_m3u8_content = function(params, segment_cache, m3u8_content, m3u8_u
     : null
 
   {
-    const parsed_manifest = parse_manifest(m3u8_content, m3u8_url, referer_url, hooks, cache_segments, debug, vod_start_at_ms, redirected_base_url, should_prefetch_url)
+    const parsed_manifest = parse_manifest(m3u8_content, m3u8_url, referer_url, hooks, cache_segments, debug, vod_start_at_ms, redirected_base_url, should_prefetch_url, manifest_extension, segment_extension)
     is_vod          = !!parsed_manifest.meta_data.is_vod                  // default: false => hls live stream
     seg_duration_ms = parsed_manifest.meta_data.seg_duration_ms || 10000  // default: 10 seconds in ms
     prefetch_urls   = parsed_manifest.prefetch_urls

package/hls-proxy/utils.js

@@ -17,7 +17,7 @@ const base64_decode = function(str) {
 }
 
 const parse_req_url = function(params, req) {
-  const {is_secure, host} = params
+  const {is_secure, host, manifest_extension, segment_extension} = params
 
   const result = {redirected_base_url: '', url_type: '', url: '', referer_url: ''}
 
@@ -26,9 +26,16 @@ const parse_req_url = function(params, req) {
   if (matches) {
     result.redirected_base_url = `${ (is_secure || (host && host.endsWith(':443'))) ? 'https' : 'http' }://${host || req.headers.host}${expressjs.get_base_req_url(req) || matches[1] || ''}`
 
-    if (matches[3])
+    if (matches[3]) {
       result.url_type = matches[3].toLowerCase().trim()
 
+      if (manifest_extension && (result.url_type === manifest_extension))
+        result.url_type = 'm3u8'
+
+      if (segment_extension && (result.url_type === segment_extension))
+        result.url_type = 'ts'
+    }
+
     let url, url_lc, index
 
     url    = base64_decode( decodeURIComponent( matches[2] ) ).trim()

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@warren-bank/hls-proxy",
   "description": "Node.js server to proxy HLS video streams",
-  "version":     "3.4.1",
+  "version":     "3.4.2",
   "scripts": {
     "start":     "node hls-proxy/bin/hlsd.js",
     "sudo": "sudo node hls-proxy/bin/hlsd.js"