@warren-bank/hls-proxy 0.20.0 → 0.20.2

package/README.md

@@ -282,6 +282,8 @@ options:
     * show technical details
   * `3`:
     * show an enhanced technical trace (useful while debugging unexpected behavior)
+  * `4`:
+    * show the content of .m3u8 files (both before and after URLs are modified)
 * _--acl-whitelist_ restricts proxy server access to clients at IP addresses in whitelist
   * ex: `"192.168.1.100,192.168.1.101,192.168.1.102"`
 * _--tls-cert_ is the filepath to a security certificate to use for HTTPS

package/hls-proxy/proxy.js

@@ -13,6 +13,10 @@ const base64_decode = function(str) {
 
 const proxy = function({server, host, is_secure, req_headers, req_options, hooks, cache_segments, max_segments, cache_timeout, cache_key, debug_level, acl_whitelist}) {
 
+  const debug_divider = (debug_level >= 4)
+    ? ('-').repeat(40)
+    : ''
+
   const debug = function() {
     let args      = [...arguments]
     let verbosity = args.shift()
@@ -95,6 +99,10 @@ const proxy = function({server, host, is_secure, req_headers, req_options, hooks
       "absolute": m3u8_url.replace(/(:\/\/[^\/]+).*$/, '$1')
     }
 
+    if (debug_level >= 4) {
+      debug(4, 'proxied response (original m3u8):', `\n${debug_divider}\n${m3u8_content}\n${debug_divider}`)
+    }
+
     if (debug_level >= 2) {
       m3u8_content = m3u8_content.replace(regexs.keys, function(match, head, key_url, tail) {
         debug(2, 'key:', key_url)
@@ -383,6 +391,10 @@ const proxy = function({server, host, is_secure, req_headers, req_options, hooks
       })
     }
 
+    if (debug_level >= 4) {
+      debug(4, 'proxied response (modified m3u8):', `\n${debug_divider}\n${m3u8_content}\n${debug_divider}`)
+    }
+
     return m3u8_content
   }
 
@@ -463,13 +475,19 @@ const proxy = function({server, host, is_secure, req_headers, req_options, hooks
     debug(3, 'm3u8:', (is_m3u8 ? 'true' : 'false'))
 
     request(options, '', {binary: !is_m3u8, stream: !is_m3u8})
-    .then(({response}) => {
+    .then(({redirects, response}) => {
+      debug(2, 'proxied response:', {status_code: response.statusCode, headers: response.headers, redirects})
+
       if (!is_m3u8) {
         response.pipe(res)
       }
       else {
+        const m3u8_url = (redirects && Array.isArray(redirects) && redirects.length)
+          ? redirects[(redirects.length - 1)]
+          : url
+
         res.writeHead(200, { "Content-Type": "application/x-mpegURL" })
-        res.end( modify_m3u8_content(response, url, referer_url) )
+        res.end( modify_m3u8_content(response.toString().trim(), m3u8_url, referer_url) )
       }
     })
     .catch((e) => {

package/package.json

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