@warren-bank/hls-proxy 3.1.2 → 3.2.1

package/hls-proxy/proxy.js

@@ -1,5 +1,7 @@
 const request = require('@warren-bank/node-request').request
+const cookies = require('./cookies')
 const parser  = require('./manifest_parser')
+const timers  = require('./timers')
 const utils   = require('./utils')
 
 const get_middleware = function(params) {
@@ -70,7 +72,7 @@ const get_middleware = function(params) {
     debug(1, 'proxying:', url)
     debug(3, 'm3u8:', (is_m3u8 ? 'true' : 'false'))
 
-    request(options, '', {binary: !is_m3u8, stream: !is_m3u8})
+    request(options, '', {binary: !is_m3u8, stream: !is_m3u8, cookieJar: cookies.getCookieJar()})
     .then(({redirects, response}) => {
       debug(2, 'proxied response:', {status_code: response.statusCode, headers: response.headers, redirects})
 
@@ -93,6 +95,8 @@ const get_middleware = function(params) {
     })
   }
 
+  timers.initialize_timers(params)
+
   return middleware
 }
 

package/hls-proxy/segment_cache.js

@@ -1,4 +1,5 @@
 const request = require('@warren-bank/node-request').request
+const cookies = require('./cookies')
 const utils   = require('./utils')
 
 module.exports = function(params) {
@@ -175,7 +176,7 @@ module.exports = function(params) {
       ts[index] = {key: get_privatekey_from_url(url), databuffer: false}
 
       let options = get_request_options(url, /* is_m3u8= */ false, referer_url)
-      promise = request(options, '', {binary: true, stream: false})
+      promise = request(options, '', {binary: true, stream: false, cookieJar: cookies.getCookieJar()})
       .then(({redirects, response}) => {
         debug(1, `prefetch (complete, ${response.length} bytes):`, debug_url)
         debug(2, 'prefetch response:', {status_code: response.statusCode, headers: response.headers, redirects})

package/hls-proxy/timers.js

@@ -0,0 +1,44 @@
+const request = require('@warren-bank/node-request').request
+const cookies = require('./cookies')
+const utils   = require('./utils')
+
+const initialize_timers = function(params) {
+  const {hooks} = params
+
+  if (hooks && (hooks instanceof Object) && hooks.request_intervals && (typeof hooks.request_intervals === 'function')) {
+    cookies.useCookieJar()
+
+    const get_request_options = utils.get_request_options.bind(null, params)
+
+    const request_wrapper = function(url, POST_data, user_config) {
+      const options = get_request_options(url, /* is_m3u8= */ false, /* referer_url= */ null)
+      const config  = Object.assign(
+        {},
+        (user_config || {}),
+        {
+          cookieJar: cookies.getCookieJar()
+        }
+      )
+
+      return request(options, POST_data, config)
+    }
+
+    const add_request_interval = function(delay_ms, callback) {
+      if (!delay_ms || (typeof delay_ms !== 'number') || isNaN(delay_ms) || (delay_ms < 0)) {
+        callback(request_wrapper)
+      }
+      else {
+        setInterval(
+          callback.bind(null, request_wrapper),
+          delay_ms
+        )
+      }
+    }
+
+    hooks.request_intervals(add_request_interval)
+  }
+}
+
+module.exports = {
+  initialize_timers
+}

package/hls-proxy/utils.js

@@ -1,157 +1,157 @@
-const parse_url = require('@warren-bank/url').parse
-
-const regexs = {
-  req_url: new RegExp('^(.*)/([^\\._/\\?#]+)(?:[\\._]([^/\\?#]*))?(?:[\\?#].*)?$', 'i'),
-  origin:  new RegExp('^(https?://[^/]+)(?:/.*)?$', 'i')
-}
-
-// btoa
-const base64_encode = function(str) {
-  return Buffer.from(str, 'binary').toString('base64')
-}
-
-// atob
-const base64_decode = function(str) {
-  return Buffer.from(str, 'base64').toString('binary')
-}
-
-const parse_req_url = function(params, req) {
-  const {is_secure, host} = params
-
-  const result = {redirected_base_url: '', url_type: '', url: '', referer_url: ''}
-
-  const matches = regexs.req_url.exec(req.url)
-
-  if (matches) {
-    result.redirected_base_url = `${ is_secure ? 'https' : 'http' }://${host || req.headers.host}${matches[1] || ''}`
-
-    if (matches[3])
-      result.url_type = matches[3].toLowerCase().trim()
-
-    let url, url_lc, index
-
-    url    = base64_decode( matches[2] ).trim()
-    url_lc = url.toLowerCase()
-    index  = url_lc.indexOf('http')
-
-    if (index === 0) {
-      index = url_lc.indexOf('|http')
-
-      if (index > 0) {
-        result.referer_url = url.substring(index + 1, url.length)
-
-        url = url.substring(0, index).trim()
-      }
-      result.url = url
-    }
-  }
-
-  return result
-}
-
-const get_content_type = function(url_type) {
-  let content_type
-  switch(url_type) {
-    case 'm3u8':
-      content_type = 'application/x-mpegurl'
-      break
-    case 'ts':
-      content_type = 'video/MP2T'
-      break
-    case 'json':
-      content_type = 'application/json'
-      break
-    case 'key':
-    case 'other':
-    default:
-      content_type = 'application/octet-stream'
-      break
-  }
-  return content_type
-}
-
-const add_CORS_headers = function(res) {
-  res.setHeader('Access-Control-Allow-Origin',      '*')
-  res.setHeader('Access-Control-Allow-Methods',     '*')
-  res.setHeader('Access-Control-Allow-Headers',     '*')
-  res.setHeader('Access-Control-Allow-Credentials', 'true')
-  res.setHeader('Access-Control-Max-Age',           '86400')
-}
-
-const debug = function() {
-  const args      = [...arguments]
-  const params    = args.shift()
-  const verbosity = args.shift()
-  const append_LF = true
-
-  const {debug_level} = params
-
-  if (append_LF) args.push("\n")
-
-  if (debug_level >= verbosity) {
-    console.log.apply(console.log, args)
-  }
-}
-
-const get_request_options = function(params, url, is_m3u8, referer_url) {
-  const {req_headers, req_options, hooks} = params
-
-  const additional_req_options = (hooks && (hooks instanceof Object) && hooks.add_request_options && (typeof hooks.add_request_options === 'function'))
-    ? hooks.add_request_options(url, is_m3u8)
-    : null
-
-  const additional_req_headers = (hooks && (hooks instanceof Object) && hooks.add_request_headers && (typeof hooks.add_request_headers === 'function'))
-    ? hooks.add_request_headers(url, is_m3u8)
-    : null
-
-  if (!req_options && !additional_req_options && !req_headers && !additional_req_headers && !referer_url) return url
-
-  const request_options = Object.assign(
-    {},
-    parse_url(url),
-    (req_options            || {}),
-    (additional_req_options || {})
-  )
-
-  request_options.headers = Object.assign(
-    {},
-    ((           req_options &&            req_options.headers) ?            req_options.headers : {}),
-    ((additional_req_options && additional_req_options.headers) ? additional_req_options.headers : {}),
-    (req_headers             || {}),
-    (additional_req_headers  || {}),
-    (referer_url ? {"referer": referer_url, "origin": referer_url.replace(regexs.origin, '$1')} : {})
-  )
-
-  return request_options
-}
-
-const should_prefetch_url = function(params, url, url_type) {
-  const {hooks, cache_segments} = params
-
-  let do_prefetch = !!url && !!cache_segments
-
-  if (do_prefetch) {
-    do_prefetch = (url_type === 'ts') || (url_type === 'key')
-
-    if (hooks && (hooks instanceof Object) && hooks.prefetch && (typeof hooks.prefetch === 'function')) {
-      const override_prefetch = hooks.prefetch(url, url_type)
-
-      if ((typeof override_prefetch === 'boolean') && (override_prefetch !== do_prefetch)) {
-        debug(params, 3, 'prefetch override:', (override_prefetch ? 'allow' : 'deny'), url)
-        do_prefetch = override_prefetch
-      }
-    }
-  }
-  return do_prefetch
-}
-
-module.exports = {
-  base64_encode,
-  base64_decode,
-  parse_req_url,
-  get_content_type,
-  add_CORS_headers,
-  debug,
-  get_request_options,
-  should_prefetch_url
-}
+const parse_url = require('@warren-bank/url').parse
+
+const regexs = {
+  req_url: new RegExp('^(.*?)/([a-zA-Z0-9\\+/=]+)(?:[\\._]([^/\\?#]*))?(?:[\\?#].*)?$'),
+  origin:  new RegExp('^(https?://[^/]+)(?:/.*)?$', 'i')
+}
+
+// btoa
+const base64_encode = function(str) {
+  return Buffer.from(str, 'binary').toString('base64')
+}
+
+// atob
+const base64_decode = function(str) {
+  return Buffer.from(str, 'base64').toString('binary')
+}
+
+const parse_req_url = function(params, req) {
+  const {is_secure, host} = params
+
+  const result = {redirected_base_url: '', url_type: '', url: '', referer_url: ''}
+
+  const matches = regexs.req_url.exec(req.url)
+
+  if (matches) {
+    result.redirected_base_url = `${ is_secure ? 'https' : 'http' }://${host || req.headers.host}${matches[1] || ''}`
+
+    if (matches[3])
+      result.url_type = matches[3].toLowerCase().trim()
+
+    let url, url_lc, index
+
+    url    = base64_decode( matches[2] ).trim()
+    url_lc = url.toLowerCase()
+    index  = url_lc.indexOf('http')
+
+    if (index === 0) {
+      index = url_lc.indexOf('|http')
+
+      if (index > 0) {
+        result.referer_url = url.substring(index + 1, url.length)
+
+        url = url.substring(0, index).trim()
+      }
+      result.url = url
+    }
+  }
+
+  return result
+}
+
+const get_content_type = function(url_type) {
+  let content_type
+  switch(url_type) {
+    case 'm3u8':
+      content_type = 'application/x-mpegurl'
+      break
+    case 'ts':
+      content_type = 'video/MP2T'
+      break
+    case 'json':
+      content_type = 'application/json'
+      break
+    case 'key':
+    case 'other':
+    default:
+      content_type = 'application/octet-stream'
+      break
+  }
+  return content_type
+}
+
+const add_CORS_headers = function(res) {
+  res.setHeader('Access-Control-Allow-Origin',      '*')
+  res.setHeader('Access-Control-Allow-Methods',     '*')
+  res.setHeader('Access-Control-Allow-Headers',     '*')
+  res.setHeader('Access-Control-Allow-Credentials', 'true')
+  res.setHeader('Access-Control-Max-Age',           '86400')
+}
+
+const debug = function() {
+  const args      = [...arguments]
+  const params    = args.shift()
+  const verbosity = args.shift()
+  const append_LF = true
+
+  const {debug_level} = params
+
+  if (append_LF) args.push("\n")
+
+  if (debug_level >= verbosity) {
+    console.log.apply(console.log, args)
+  }
+}
+
+const get_request_options = function(params, url, is_m3u8, referer_url) {
+  const {req_headers, req_options, hooks} = params
+
+  const additional_req_options = (hooks && (hooks instanceof Object) && hooks.add_request_options && (typeof hooks.add_request_options === 'function'))
+    ? hooks.add_request_options(url, is_m3u8)
+    : null
+
+  const additional_req_headers = (hooks && (hooks instanceof Object) && hooks.add_request_headers && (typeof hooks.add_request_headers === 'function'))
+    ? hooks.add_request_headers(url, is_m3u8)
+    : null
+
+  if (!req_options && !additional_req_options && !req_headers && !additional_req_headers && !referer_url) return url
+
+  const request_options = Object.assign(
+    {},
+    parse_url(url),
+    (req_options            || {}),
+    (additional_req_options || {})
+  )
+
+  request_options.headers = Object.assign(
+    {},
+    ((           req_options &&            req_options.headers) ?            req_options.headers : {}),
+    ((additional_req_options && additional_req_options.headers) ? additional_req_options.headers : {}),
+    (req_headers             || {}),
+    (additional_req_headers  || {}),
+    (referer_url ? {"referer": referer_url, "origin": referer_url.replace(regexs.origin, '$1')} : {})
+  )
+
+  return request_options
+}
+
+const should_prefetch_url = function(params, url, url_type) {
+  const {hooks, cache_segments} = params
+
+  let do_prefetch = !!url && !!cache_segments
+
+  if (do_prefetch) {
+    do_prefetch = (url_type === 'ts') || (url_type === 'key')
+
+    if (hooks && (hooks instanceof Object) && hooks.prefetch && (typeof hooks.prefetch === 'function')) {
+      const override_prefetch = hooks.prefetch(url, url_type)
+
+      if ((typeof override_prefetch === 'boolean') && (override_prefetch !== do_prefetch)) {
+        debug(params, 3, 'prefetch override:', (override_prefetch ? 'allow' : 'deny'), url)
+        do_prefetch = override_prefetch
+      }
+    }
+  }
+  return do_prefetch
+}
+
+module.exports = {
+  base64_encode,
+  base64_decode,
+  parse_req_url,
+  get_content_type,
+  add_CORS_headers,
+  debug,
+  get_request_options,
+  should_prefetch_url
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@warren-bank/hls-proxy",
   "description": "Node.js server to proxy HLS video streams",
-  "version":     "3.1.2",
+  "version":     "3.2.1",
   "scripts": {
     "start":     "node hls-proxy/bin/hlsd.js",
     "sudo": "sudo node hls-proxy/bin/hlsd.js"
@@ -12,7 +12,8 @@
   "dependencies": {
     "@warren-bank/node-process-argv": "^1.2.1",
     "@warren-bank/node-request": "^2.0.10",
-    "@warren-bank/url": "^3.1.0"
+    "@warren-bank/url": "^3.1.0",
+    "tough-cookie": "^3.0.1"
   },
   "license": "GPL-2.0",
   "author": {