@warren-bank/hls-proxy 3.4.5 → 3.4.7

package/hls-proxy/manifest_parser.js

@@ -13,6 +13,7 @@ const url_location_landmarks = {
     same_line: [
       '#EXT-X-MEDIA:',
       '#EXT-X-I-FRAME-STREAM-INF:',
+      '#EXT-X-IMAGE-STREAM-INF:',
       '#EXT-X-RENDITION-REPORT:',
       '#EXT-X-DATERANGE:',
       '#EXT-X-CONTENT-STEERING:'

package/hls-proxy/proxy.js

@@ -50,19 +50,22 @@ const get_middleware = function(params) {
 
     const is_m3u8 = (url_type === 'm3u8')
 
-    const send_cache_segment = function(segment) {
-      res.writeHead(200, { "Content-Type": utils.get_content_type(url_type) })
+    const send_cache_segment = function(segment, type) {
+      if (!type)
+        type = utils.get_content_type(url_type)
+
+      res.writeHead(200, {"Content-Type": type})
       res.end(segment)
     }
 
     if (cache_segments && !is_m3u8) {
-      let segment = await get_segment(url, url_type)  // Buffer (cached segment data), false (prefetch is pending: add callback), undefined (no prefetch is pending)
+      let {segment, type} = await get_segment(url, url_type)  // possible datatypes of segment value: Buffer (cached segment data), false (prefetch is pending: add callback), null (no prefetch is pending)
 
-      if (segment && segment.length) {                // Buffer (cached segment data)
-        send_cache_segment(segment)
+      if (segment && segment.length) {                        // Buffer (cached segment data)
+        send_cache_segment(segment, type)
         return
       }
-      else if (segment === false) {                   // false (prefetch is pending: add callback)
+      else if (segment === false) {                           // false (prefetch is pending: add callback)
         add_listener(url, url_type, send_cache_segment)
         return
       }

package/hls-proxy/segment_cache.js

@@ -89,8 +89,9 @@ module.exports = function(params) {
       if (segment.has)
         cache_storage_adapter.remove(segment.state)
 
-      segment.has = false
-      segment.cb  = []
+      segment.has  = false
+      segment.cb   = []
+      segment.type = null
     }
 
     ts.splice(start, count)
@@ -140,7 +141,7 @@ module.exports = function(params) {
     let i, segment
 
     for (i=(ts.length - 1); i>=0; i--) {
-      segment = ts[i]  // {key, has, cb, state}
+      segment = ts[i]  // {key, has, cb, type, state}
       if (segment && (segment.key === key)) {
         index = i
         break
@@ -181,7 +182,7 @@ module.exports = function(params) {
 
       // placeholder to prevent multiple download requests
       index = ts.length
-      ts[index] = {key: get_privatekey_from_url(url), has: false, cb: [], state: {}}
+      ts[index] = {key: get_privatekey_from_url(url), has: false, cb: [], type: null, state: {}}
 
       let options = get_request_options(url, /* is_m3u8= */ false, referer_url)
       promise = request(options, '', {binary: true, stream: false, cookieJar: cookies.getCookieJar()})
@@ -197,11 +198,12 @@ module.exports = function(params) {
           touch_access(m3u8_url)
 
         const segment = ts[index]
-        segment.has = true
+        segment.has  = true
+        segment.type = utils.get_content_type(response.headers)
         cache_storage_adapter.set(segment.state, response)
         if (segment.cb.length) {
           segment.cb.forEach((cb) => {
-            cb(response)
+            cb(response, segment.type)
 
             debug(1, 'cache (callback complete):', debug_url)
           })
@@ -228,10 +230,12 @@ module.exports = function(params) {
   }
 
   const get_segment = async function(url, url_type) {
-    if (! should_prefetch_url(url, url_type)) return undefined
+    if (! should_prefetch_url(url, url_type))
+      return {segment: null, type: null}
 
     let debug_url = (debug_level >= 3) ? url : get_publickey_from_url(url)
     let segment   = find_segment(url)
+    let type      = null
 
     if (segment !== undefined) {
       const {m3u8_url, index} = segment
@@ -243,6 +247,7 @@ module.exports = function(params) {
       if (segment.has) {
         debug(1, 'cache (hit):', debug_url)
 
+        type    = segment.type
         segment = await cache_storage_adapter.get(segment.state)
 
         // cleanup: remove all previous segments
@@ -262,11 +267,13 @@ module.exports = function(params) {
     }
     else {
       debug(1, 'cache (miss):', debug_url)
+
+      segment = null
     }
-    return segment
+    return {segment, type}
   }
 
-  const add_listener = function(url, url_type, cb) {
+  const add_listener = async function(url, url_type, cb) {
     if (! should_prefetch_url(url, url_type)) return false
 
     let debug_url = (debug_level >= 3) ? url : get_publickey_from_url(url)
@@ -280,7 +287,10 @@ module.exports = function(params) {
       segment = ts[index]
 
       if (segment.has) {
-        cb(segment)
+        const type = segment.type
+        segment    = await cache_storage_adapter.get(segment.state)
+
+        cb(segment, type)
 
         debug(1, 'cache (callback complete):', debug_url)        
       }

package/hls-proxy/utils.js

@@ -61,8 +61,21 @@ const parse_req_url = function(params, req) {
   return result
 }
 
-const get_content_type = function(url_type) {
+const get_content_type = function(data) {
   let content_type
+
+  if (!content_type && data && (typeof data === 'object') && data['content-type'])
+    content_type = data['content-type']
+
+  if (!content_type && data && (typeof data === 'string'))
+    content_type = get_content_type_from_url_type(data)
+
+  return content_type
+}
+
+const get_content_type_from_url_type = function(url_type) {
+  let content_type
+
   switch(url_type) {
     case 'm3u8':
       content_type = 'application/x-mpegurl'

package/package.json

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