@warren-bank/hls-proxy 3.2.3 → 3.2.4

package/hls-proxy/expressjs_utils.js

@@ -0,0 +1,32 @@
+const get_full_req_url = function(req) {
+  return req.originalUrl || req.url
+}
+
+const has_req_param = function(req, key) {
+  return (req.params && (typeof req.params === 'object') && req.params[key])
+}
+
+const get_proxy_req_url = function(req) {
+  const key = "0"
+  return has_req_param(req, key)
+    ? `/${req.params[key]}`
+    : req.url
+}
+
+const get_base_req_url = function(req) {
+  let base_url = ''
+  const key = "0"
+
+  if (req.path && has_req_param(req, key)) {
+    base_url  = req.baseUrl || ''
+    base_url += req.path.substring(0, (req.path.length - req.params[key].length - 1))
+  }
+
+  return base_url
+}
+
+module.exports = {
+  get_full_req_url,
+  get_proxy_req_url,
+  get_base_req_url
+}

package/hls-proxy/utils.js

@@ -1,4 +1,5 @@
 const parse_url = require('@warren-bank/url').parse
+const expressjs = require('./expressjs_utils')
 
 const regexs = {
   req_url: new RegExp('^(.*?)/([a-zA-Z0-9\\+/=%]+)(?:[\\._]([^/\\?#]*))?(?:[\\?#].*)?$'),
@@ -20,10 +21,10 @@ const parse_req_url = function(params, req) {
 
   const result = {redirected_base_url: '', url_type: '', url: '', referer_url: ''}
 
-  const matches = regexs.req_url.exec(req.url)
+  const matches = regexs.req_url.exec( expressjs.get_proxy_req_url(req) )
 
   if (matches) {
-    result.redirected_base_url = `${ is_secure ? 'https' : 'http' }://${host || req.headers.host}${matches[1] || ''}`
+    result.redirected_base_url = `${ is_secure ? 'https' : 'http' }://${host || req.headers.host}${expressjs.get_base_req_url(req) || matches[1] || ''}`
 
     if (matches[3])
       result.url_type = matches[3].toLowerCase().trim()

package/package.json

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