@warren-bank/hls-proxy 3.4.8 → 3.5.1

package/README.md

@@ -612,8 +612,8 @@ curl --silent --insecure "$URL"
   - system requirements:
     * Node.js version: v8.6.0 (and higher)
       - transitive [dependency](https://github.com/warren-bank/HLS-Proxy/blob/v1.0.1/package.json#L13-L14) requirements:
-        * v8.06.00+: [`@warren-bank/node-process-argv`](https://github.com/warren-bank/node-process-argv#requirements)
-        * v8.06.00+: [`@warren-bank/node-request`](https://github.com/warren-bank/node-request#requirements)
+        * v08.06.00+: [`@warren-bank/node-process-argv`](https://github.com/warren-bank/node-process-argv#requirements)
+        * v08.06.00+: [`@warren-bank/node-request`](https://github.com/warren-bank/node-request#requirements)
 * `v2.x`
   - commit history is in branch: [`v02`](https://github.com/warren-bank/HLS-Proxy/commits/v02)
   - summary:
@@ -625,8 +625,8 @@ curl --silent --insecure "$URL"
   - system requirements:
     * Node.js version: v8.6.0 (and higher)
       - transitive [dependency](https://github.com/warren-bank/HLS-Proxy/blob/v2.0.3/package.json#L13-L14) requirements:
-        * v8.06.00+: [`@warren-bank/node-process-argv`](https://github.com/warren-bank/node-process-argv#requirements)
-        * v8.06.00+: [`@warren-bank/node-request`](https://github.com/warren-bank/node-request#requirements)
+        * v08.06.00+: [`@warren-bank/node-process-argv`](https://github.com/warren-bank/node-process-argv#requirements)
+        * v08.06.00+: [`@warren-bank/node-request`](https://github.com/warren-bank/node-request#requirements)
 * `v3.x`
   - commit history is in branch: [`v03`](https://github.com/warren-bank/HLS-Proxy/commits/v03)
   - summary:
@@ -637,12 +637,10 @@ curl --silent --insecure "$URL"
         * important requirement: the path for a custom route needs to include exactly one unnamed [parameter](https://expressjs.com/en/guide/routing.html#route-parameters) that matches the base64 encoded URL and (optionally) a file extension (ex: `'/proxy/*'`)
         * the use of nested routers is supported
   - system requirements:
-    * Node.js version: v16.0.0 (and higher)
-      - transitive [dependency](https://github.com/warren-bank/HLS-Proxy/blob/v3.4.0/package.json#L13-L14) requirements:
-        * v8.06.00+: [`@warren-bank/node-process-argv`](https://github.com/warren-bank/node-process-argv#requirements)
-        * v8.06.00+: [`@warren-bank/node-request`](https://github.com/warren-bank/node-request#requirements)
-      - [ES6 support](http://node.green/)
-        * v16.00.00+: [`RegExp` 'd' flag](https://node.green/#ES2022-features-RegExp-Match-Indices---hasIndices-----d--flag-)
+    * Node.js version: v8.6.0 (and higher)
+      - transitive [dependency](https://github.com/warren-bank/HLS-Proxy/blob/v3.5.1/package.json#L13-L14) requirements:
+        * v08.06.00+: [`@warren-bank/node-process-argv`](https://github.com/warren-bank/node-process-argv#requirements)
+        * v08.06.00+: [`@warren-bank/node-request`](https://github.com/warren-bank/node-request#requirements)
 
 - - - -
 

package/hls-proxy/manifest_parser.js

@@ -1,11 +1,12 @@
-const {URL} = require('@warren-bank/url')
-const utils = require('./utils')
+const regexp_indices = require('./regexp_indices')
+const {URL}          = require('./url')
+const utils          = require('./utils')
 
 const regexs = {
   vod_start_at:        /#vod_start(?:_prefetch_at)?=((?:\d+:)?(?:\d+:)?\d+)$/i,
   m3u8_line_separator: /\s*[\r\n]+\s*/,
   m3u8_line_landmark:  /^(#[^:]+[:]?)/,
-  m3u8_line_url:       /URI=["']([^"']+)["']/id
+  m3u8_line_url:       regexp_indices.updateRegExp(/URI=["']([^"']+)["']/i)
 }
 
 const url_location_landmarks = {
@@ -170,7 +171,7 @@ const extract_embedded_urls = function(m3u8_lines, m3u8_url, referer_url, meta_d
       if (meta_data !== null)
         extract_meta_data(meta_data, m3u8_line, matching_landmark)
 
-      matches = regexs.m3u8_line_url.exec(m3u8_line)
+      matches = regexp_indices.exec(regexs.m3u8_line_url, m3u8_line)
       if (!matches) continue
       matching_url = matches[1]
 

package/hls-proxy/regexp_indices.js

@@ -0,0 +1,50 @@
+require('regexp-match-indices/config').mode = 'spec-compliant'
+
+const state = {
+  'native':   require('regexp-match-indices/native'),
+  'polyfill': require('regexp-match-indices/implementation')
+}
+
+const setExecImplementation = function() {
+  try {
+    const str = 'foo_bar_baz'
+
+    const regex = new RegExp(str, 'd')
+    if (!regex.hasIndices) throw ''
+
+    const match = regex.exec(str)
+    if (!(match.indices && (match.indices.length === 1) && (match.indices[0][0] === 0) && (match.indices[0][1] === str.length))) throw ''
+
+    state.implementation = state['native']
+    state.isNative   = true
+    state.isPolyfill = false
+  }
+  catch(e) {
+    state.implementation = state['polyfill']
+    state.isNative   = false
+    state.isPolyfill = true
+  }
+}
+
+setExecImplementation()
+
+const exec = function(regex, string) {
+  if (state.isNative)
+    regex = updateRegExp(regex)
+
+  return state.implementation.call(regex, string)
+}
+
+const updateRegExp = function(regex) {
+  return (state.isPolyfill || !state.isNative || regex.hasIndices)
+    ? regex
+    : new RegExp(
+        regex.source,
+        ((regex.flags || '') + 'd')
+      )
+}
+
+module.exports = {
+  exec,
+  updateRegExp
+}

package/hls-proxy/url.js

@@ -0,0 +1,31 @@
+let parse, URL
+
+if (!parse || !URL) {
+  try {
+    ({parse, URL} = require('@warren-bank/url/es6-node/jsURL'));
+  }
+  catch(e){}
+}
+
+if (!parse || !URL) {
+  try {
+    ({parse, URL} = require('@warren-bank/url/es5-browser/jsURL'));
+  }
+  catch(e){}
+}
+
+if (!parse || !URL) {
+  try {
+    ({parse, URL} = require('url'));
+  }
+  catch(e){}
+}
+
+if (!parse || !URL) {
+  throw new Error('URL class is not supported')
+}
+
+module.exports = {
+  parse,
+  URL
+}

package/hls-proxy/utils.js

@@ -1,5 +1,5 @@
-const parse_url = require('@warren-bank/url').parse
 const expressjs = require('./expressjs_utils')
+const parse_url = require('./url').parse
 
 const regexs = {
   req_url: new RegExp('^(.*?)/([a-zA-Z0-9\\+/=%]+)(?:[\\._]([^/\\?#]*))?(?:[\\?#].*)?$'),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@warren-bank/hls-proxy",
   "description": "Node.js server to proxy HLS video streams",
-  "version":     "3.4.8",
+  "version":     "3.5.1",
   "scripts": {
     "start":     "node hls-proxy/bin/hlsd.js",
     "sudo": "sudo node hls-proxy/bin/hlsd.js"
@@ -14,6 +14,7 @@
     "@warren-bank/node-request": "^2.0.12",
     "@warren-bank/url": "^3.1.2",
     "hpagent": "^1.2.0",
+    "regexp-match-indices": "^1.0.2",
     "tough-cookie": "^3.0.1"
   },
   "license": "GPL-2.0",