@warren-bank/hls-proxy 0.18.1 → 0.19.0

package/README.md

@@ -1,4 +1,4 @@
-### [HTTP Live Streaming Proxy](https://github.com/warren-bank/HLS-Proxy)
+### [_HLS Proxy_](https://github.com/warren-bank/HLS-Proxy) : HTTP Live Streaming Proxy
 
 #### Basic Functionality:
 
@@ -33,6 +33,58 @@
 
 - - - -
 
+#### URL Format:
+
+* [example Javascript]: construction of URL to _HLS Proxy_ for video stream
+  ```javascript
+    {
+      const proxy_url      = 'http://127.0.0.1:8080'
+      const video_url      = 'https://example.com/video/master.m3u8'
+      const file_extension = '.m3u8'
+
+      const hls_proxy_url  = `${proxy_url}/${ btoa(video_url) }${file_extension}`
+    }
+  ```
+* [example Javascript]: construction of URL to _HLS Proxy_ for video stream w/ "Referer" request header
+  ```javascript
+    {
+      const proxy_url      = 'http://127.0.0.1:8080'
+      const video_url      = 'https://example.com/video/master.m3u8'
+      const referer_url    = 'https://example.com/videos.html'
+      const file_extension = '.m3u8'
+
+      const hls_proxy_url  = `${proxy_url}/${ btoa(`${video_url}|${referer_url}`) }${file_extension}`
+    }
+  ```
+* [example Bash]: construction of URL to _HLS Proxy_ for video stream
+  ```bash
+    proxy_url='http://127.0.0.1:8080'
+    video_url='https://example.com/video/master.m3u8'
+    file_extension='.m3u8'
+
+    hls_proxy_url="${proxy_url}/"$(echo -n "$video_url" | base64 --wrap=0)"$file_extension"
+  ```
+* [example Bash]: construction of URL to _HLS Proxy_ for video stream w/ "Referer" request header
+  ```bash
+    proxy_url='http://127.0.0.1:8080'
+    video_url='https://example.com/video/master.m3u8'
+    referer_url='https://example.com/videos.html'
+    file_extension='.m3u8'
+
+    hls_proxy_url="${proxy_url}/"$(echo -n "${video_url}|${referer_url}" | base64 --wrap=0)"$file_extension"
+  ```
+
+##### notes:
+
+* adding a file extension to the base64 encoded video URL is optional
+  - doing so allows video clients to recognize that the URL being requested from _HLS Proxy_ is an HLS video stream
+
+##### high-level tools that automate this task:
+
+* refer to the section: [Other Projects](#other-projects)
+
+- - - -
+
 ### Installation and Usage: Globally
 
 #### How to: Install:
@@ -71,11 +123,20 @@ options:
 --cache-key <number>
 -v <number>
 --acl-whitelist <ip_address_list>
+--tls-cert <filepath>
+--tls-key <filepath>
+--tls-pass <filepath>
 ```
 
 #### Options:
 
 * _--tls_ is a flag to start HTTP**S** proxy, rather than HTTP
+  * used as shorthand to automatically configure the following options:
+    * _--tls-cert_
+    * _--tls-key_
+    * _--tls-pass_
+  * the values assigned to these options enable the use of a self-signed security certificate that is included in both the git repo and npm package, within the directory:
+    * [`./hls-proxy/servers/cert`](https://github.com/warren-bank/HLS-Proxy/tree/master/hls-proxy/servers/cert)
 * _--host_ must be an IP address of the server on the LAN (so Chromecast can proxy requests through it)
   * ex: `192.168.0.100`
   * used to modify URLs in .m3u8 files
@@ -223,6 +284,10 @@ options:
     * show an enhanced technical trace (useful while debugging unexpected behavior)
 * _--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
+* _--tls-key_ is the filepath to the private key for the _--tls-cert_ security certificate
+* _--tls-pass_ is the filepath to a text file containing the security passphrase for the _--tls-key_ private key
+  * optional, not required when the _--tls-key_ private key was created without a security passphrase
 
 #### Examples:
 
@@ -253,6 +318,9 @@ options:
 9. start HTTPS proxy at default host:port and enable prefetch of 10 video segments<br>
   `hlsd --tls --prefetch --max-segments 10`
 
+10. start HTTPS proxy using a non-generic security certificate<br>
+  `hlsd --tls-cert "/path/to/cert.pem" --tls-key "/path/to/key.pem" --tls-pass "/path/to/pass.phrase"`
+
 - - - -
 
 ### Installation and Usage: Working with a Local `git` Repo
@@ -304,29 +372,44 @@ npm run sudo [-- <options>]
 5. start HTTPS proxy at default host:port with escalated privilege<br>
   `npm run sudo -- --port "443" --tls`
 
-6. start HTTP proxy at specific port and send custom request headers<br>
+6. start HTTP proxy at specific port and send custom "Referer" request header for specific video stream<br>
+  ```bash
+npm start -- --port "8080"
+
+h_referer='http://XXX:80/page.html'
+
+URL='https://httpbin.org/headers'
+URL="${URL}|${h_referer}"
+URL=$(echo -n "$URL" | base64 --wrap=0)
+URL="http://127.0.0.1:8080/${URL}.json"
+# URL='http://127.0.0.1:8080/aHR0cHM6Ly9odHRwYmluLm9yZy9oZWFkZXJzfGh0dHA6Ly9YWFg6ODAvcGFnZS5odG1s.json'
+curl --silent "$URL"
+```
+
+7. start HTTP proxy at specific port and send custom request headers<br>
   ```bash
 headers_file="${TMPDIR}/headers.json"
 echo '{"Origin" : "http://XXX:80", "Referer": "http://XXX:80/page.html"}' > "$headers_file"
 npm start -- --port "8080" --req-headers "$headers_file"
 
 URL='https://httpbin.org/headers'
-URL=$(echo "$URL" | base64)
+URL=$(echo -n "$URL" | base64 --wrap=0)
 URL="http://127.0.0.1:8080/${URL}.json"
+# URL='http://127.0.0.1:8080/aHR0cHM6Ly9odHRwYmluLm9yZy9oZWFkZXJz.json'
 curl --silent "$URL"
 ```
 
-7. start HTTPS proxy at specific port and send custom request headers<br>
+8. start HTTPS proxy at specific port and send custom request headers<br>
   ```bash
 headers_file="${TMPDIR}/headers.json"
 echo '{"Origin" : "http://XXX:80", "Referer": "http://XXX:80/page.html"}' > "$headers_file"
 npm start -- --port "8081" --req-headers "$headers_file" --tls -v 1
 
-URL='https://127.0.0.1:8081/aHR0cHM6Ly9odHRwYmluLm9yZy9oZWFkZXJzCg==.json'
+URL='https://127.0.0.1:8081/aHR0cHM6Ly9odHRwYmluLm9yZy9oZWFkZXJz.json'
 curl --silent --insecure "$URL"
 ```
 
-8. start HTTPS proxy at specific port and send custom request headers<br>
+9. start HTTPS proxy at specific port and send custom request headers<br>
   ```bash
 h_origin='http://XXX:80'
 h_referer='http://XXX:80/page.html'
@@ -335,7 +418,7 @@ h_custom_1='X-Foo: 123'
 h_custom_2='X-Bar: baz'
 npm start -- --port "8081" --origin "$h_origin" --referer "$h_referer" --useragent "$h_useragent" --header "$h_custom_1" --header "$h_custom_2" --tls -v 1
 
-URL='https://127.0.0.1:8081/aHR0cHM6Ly9odHRwYmluLm9yZy9oZWFkZXJzCg==.json'
+URL='https://127.0.0.1:8081/aHR0cHM6Ly9odHRwYmluLm9yZy9oZWFkZXJz.json'
 curl --silent --insecure "$URL"
 ```
 
@@ -399,7 +482,7 @@ curl --silent --insecure "$URL"
        * [there](https://warren-bank.github.io/crx-webcast-reloaded/external_website/index.html) is a selection of several HTML5 videos players
          * each is better at some things and worse at others
          * each integrates with a different Chromecast receiver app
-       * [there](https://warren-bank.github.io/crx-webcast-reloaded/external_website/proxy.html) is a page to help redirect the intercepted video URL through a local instance of HLS-Proxy
+       * [there](https://warren-bank.github.io/crx-webcast-reloaded/external_website/proxy.html) is a page to help redirect the intercepted video URL through a local instance of _HLS Proxy_
 
 - - - -
 

package/hls-proxy/bin/hlsd.js

@@ -2,6 +2,8 @@
 
 const {argv_vals, bootstrap_server} = require('./lib/process_argv')
 
-const start_server = (argv_vals["--tls"]) ? require('../servers/start_https') : require('../servers/start_http')
+const start_server = ((argv_vals["--tls-cert"] && argv_vals["--tls-key"]) || argv_vals["--tls"])
+  ? require('../servers/start_https')
+  : require('../servers/start_http')
 
 bootstrap_server(start_server)

package/hls-proxy/bin/lib/help.js

@@ -1,31 +1,34 @@
-const help = `
-hlsd <options>
-
-options:
-========
---help
---version
---tls
---host <ip_address>
---port <number>
---req-headers <filepath>
---origin <header>
---referer <header>
---useragent <header>
---header <name=value>
---req-options <filepath>
---req-insecure
---req-secure-honor-server-cipher-order
---req-secure-ciphers <string>
---req-secure-protocol <string>
---req-secure-curve <string>
---hooks <filepath>
---prefetch
---max-segments <number>
---cache-timeout <number>
---cache-key <number>
--v <number>
---acl-whitelist <ip_address_list>
-`
-
-module.exports = help
+const help = `
+hlsd <options>
+
+options:
+========
+--help
+--version
+--tls
+--host <ip_address>
+--port <number>
+--req-headers <filepath>
+--origin <header>
+--referer <header>
+--useragent <header>
+--header <name=value>
+--req-options <filepath>
+--req-insecure
+--req-secure-honor-server-cipher-order
+--req-secure-ciphers <string>
+--req-secure-protocol <string>
+--req-secure-curve <string>
+--hooks <filepath>
+--prefetch
+--max-segments <number>
+--cache-timeout <number>
+--cache-key <number>
+-v <number>
+--acl-whitelist <ip_address_list>
+--tls-cert <filepath>
+--tls-key <filepath>
+--tls-pass <filepath>
+`
+
+module.exports = help

package/hls-proxy/bin/lib/process_argv.js

@@ -1,42 +1,53 @@
-const grep_argv = require('./grep_argv')
+const process_argv = require('@warren-bank/node-process-argv')
+
+const argv_flags = {
+  "--help":                                 {bool: true},
+  "--version":                              {bool: true},
+
+  "--tls":                                  {bool: true},
+  "--host":                                 {},
+  "--port":                                 {num:  "int"},
+
+  "--req-headers":                          {file: "json"},
+  "--origin":                               {},
+  "--referer":                              {},
+  "--useragent":                            {},
+  "--header":                               {many: true},
+
+  "--req-options":                          {file: "json"},
+  "--req-insecure":                         {bool: true},
+  "--req-secure-honor-server-cipher-order": {bool: true},
+  "--req-secure-ciphers":                   {},
+  "--req-secure-protocol":                  {},
+  "--req-secure-curve":                     {},
+
+  "--hooks":                                {file: "module"},
+
+  "--prefetch":                             {bool: true},
+  "--max-segments":                         {num:  "int"},
+  "--cache-timeout":                        {num:  "int"},
+  "--cache-key":                            {num:  "int"},
+
+  "-v":                                     {num:  "int"},
+  "--acl-whitelist":                        {},
+
+  "--tls-cert":                             {file: "path-exists"},
+  "--tls-key":                              {file: "path-exists"},
+  "--tls-pass":                             {file: "path-exists"}
+}
+
+const argv_flag_aliases = {
+  "--help":                                 ["-h"]
+}
+
+let argv_vals = {}
 
-let argv_vals
 try {
-  argv_vals = grep_argv({
-    "--help":                                 {bool: true},
-    "--version":                              {bool: true},
-
-    "--tls":                                  {bool: true},
-    "--host":                                 {},
-    "--port":                                 {num:  true},
-
-    "--req-headers":                          {file: "json"},
-    "--origin":                               {},
-    "--referer":                              {},
-    "--useragent":                            {},
-    "--header":                               {many: true},
-
-    "--req-options":                          {file: "json"},
-    "--req-insecure":                         {bool: true},
-    "--req-secure-honor-server-cipher-order": {bool: true},
-    "--req-secure-ciphers":                   {},
-    "--req-secure-protocol":                  {},
-    "--req-secure-curve":                     {},
-
-    "--hooks":                                {file: "module"},
-
-    "--prefetch":                             {bool: true},
-    "--max-segments":                         {num:  true},
-    "--cache-timeout":                        {num:  true},
-    "--cache-key":                            {num:  true},
-
-    "-v":                                     {num:  true},
-    "--acl-whitelist":                        {}
-  }, true)
+  argv_vals = process_argv(argv_flags, argv_flag_aliases)
 }
 catch(e) {
   console.log('ERROR: ' + e.message)
-  process.exit(0)
+  process.exit(1)
 }
 
 if (argv_vals["--help"]) {
@@ -161,7 +172,10 @@ const bootstrap_server = function(start_server) {
     cache_timeout:  argv_vals["--cache-timeout"],
     cache_key:      argv_vals["--cache-key"],
     verbosity:      argv_vals["-v"],
-    acl_whitelist:  argv_vals["--acl-whitelist"]
+    acl_whitelist:  argv_vals["--acl-whitelist"],
+    tls_cert:       argv_vals["--tls-cert"],
+    tls_key:        argv_vals["--tls-key"],
+    tls_pass:       argv_vals["--tls-pass"]
   })
 }
 

package/hls-proxy/proxy.js

@@ -11,7 +11,7 @@ const base64_decode = function(str) {
   return Buffer.from(str, 'base64').toString('binary')
 }
 
-const proxy = function({server, host, port, is_secure, req_headers, req_options, hooks, cache_segments, max_segments, cache_timeout, cache_key, debug_level, acl_whitelist}) {
+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 = function() {
     let args      = [...arguments]
@@ -277,7 +277,7 @@ const proxy = function({server, host, port, is_secure, req_headers, req_options,
         matching_url += `|${referer_url}`
 
       let ts_file_ext    = get_ts_file_ext(file_name, file_ext)
-      let redirected_url = `${ is_secure ? 'https' : 'http' }://${host}:${port}/${ base64_encode(matching_url) }${ts_file_ext || file_ext || ''}`
+      let redirected_url = `${ is_secure ? 'https' : 'http' }://${host}/${ base64_encode(matching_url) }${ts_file_ext || file_ext || ''}`
       debug(3, 'redirecting (proxied):', redirected_url)
 
       return `${head}${redirected_url}${tail}`
@@ -390,10 +390,21 @@ const proxy = function({server, host, port, is_secure, req_headers, req_options,
     add_CORS_headers(res)
 
     const [url, referer_url] = (() => {
-      let url   = base64_decode( req.url.replace(regexs.wrap, '$1') ).trim()
-      let index = url.indexOf('|http')
+      if (!regexs.wrap.test(req.url))
+        return ['', '']
+
+      let url, url_lc, index
+
+      url    = base64_decode( req.url.replace(regexs.wrap, '$1') ).trim()
+      url_lc = url.toLowerCase()
+
+      index  = url_lc.indexOf('http')
+      if (index !== 0)
+        return ['', '']
+
+      index = url_lc.indexOf('|http')
       if (index >=0) {
-        let referer_url = url.substring(index + 1)
+        const referer_url = url.substring(index + 1, url.length)
         url = url.substring(0, index).trim()
         return [url, referer_url]
       }
@@ -402,6 +413,12 @@ const proxy = function({server, host, port, is_secure, req_headers, req_options,
       }
     })()
 
+    if (!url) {
+      res.writeHead(400)
+      res.end()
+      return
+    }
+
     const is_m3u8 = regexs.m3u8.test(url)
 
     const send_ts = function(segment) {

package/hls-proxy/servers/lib/LAN_IPs.js

@@ -55,4 +55,52 @@ const prompt_user_to_choose_one_IP = function(cb) {
   })
 }
 
-module.exports = {IP, prompt: prompt_user_to_choose_one_IP}
+// -----------------------------------------------------------------------------
+// input:
+//  * host (if provided by cli option)
+//  * port (if provided by cli option, otherwise default value for type of server)
+// output:
+// * Promise
+// resolved value:
+// * host
+//   - type: String
+//   - format: "${IP}:${port}"
+// -----------------------------------------------------------------------------
+// notes:
+// * "--host" cli option can include an embedded port number
+//   - the embedded port number can be different from the value of "--port" (or default)
+//     * the value of "--port" (or default) is used to run the server and can be accessed on the local/private network (LAN)
+//     * the embedded port number can be used to access the server from a public network when port mapping is necessary
+// * if "--host" is defined, but does not include an embedded port number
+//   - the value of "--port" (or default) is added to "--host"
+// * if "--host" is undefined
+//   - a hostname is resolved
+//   - the value of "--port" (or default) is added to the resolved hostname
+// -----------------------------------------------------------------------------
+const prompt_and_normalize_IP = function(host, port) {
+  return new Promise((resolve, reject) => {
+    if (host) {
+      const parts = host.split(':')
+
+      if (parts.length > 1) {
+        host = parts[0]
+
+        const public_port = parseInt( parts[1], 10 )
+        if (! isNaN(public_port))
+          port = public_port
+      }
+    }
+
+    if (host) return resolve(host)
+
+    prompt_user_to_choose_one_IP((host) => resolve(host))
+  })
+  .then((host) => {
+    if (host === false)
+      host = 'localhost'
+
+    return `${host}:${port}`
+  })
+}
+
+module.exports = {IP, prompt: prompt_user_to_choose_one_IP, resolve: prompt_and_normalize_IP}

package/hls-proxy/servers/start_http.js

@@ -1,24 +1,16 @@
-const prompt = require('./lib/LAN_IPs').prompt
-const proxy  = require('../proxy')
-const http   = require('http')
+const resolve = require('./lib/LAN_IPs').resolve
+const proxy   = require('../proxy')
+const http    = require('http')
 
 const start_server = function({host, port, req_headers, req_options, hooks, cache_segments, max_segments, cache_timeout, cache_key, verbosity, acl_whitelist}) {
   if (!port || isNaN(port)) port = 80
 
-  new Promise((resolve, reject) => {
-    if (host) return resolve(host)
-
-    prompt((host) => resolve(host))
-  })
+  resolve(host, port)
   .then((host) => {
-    if (host === false) {
-      host = 'localhost'
-    }
-
     const server = http.createServer()
-    proxy({server, host, port, is_secure: false, req_headers, req_options, hooks, cache_segments, max_segments, cache_timeout, cache_key, debug_level: verbosity, acl_whitelist})
+    proxy({server, host, is_secure: false, req_headers, req_options, hooks, cache_segments, max_segments, cache_timeout, cache_key, debug_level: verbosity, acl_whitelist})
     server.listen(port, function () {
-      console.log(`HTTP server is listening at: ${host}:${port}`)
+      console.log(`HTTP server is listening at: ${host}`)
     })
   })
 }

package/hls-proxy/servers/start_https.js

@@ -1,34 +1,32 @@
-const prompt = require('./lib/LAN_IPs').prompt
-const proxy  = require('../proxy')
-const https  = require('https')
-const fs     = require('fs')
+const resolve = require('./lib/LAN_IPs').resolve
+const proxy   = require('../proxy')
+const https   = require('https')
+const fs      = require('fs')
 
-const start_server = function({host, port, req_headers, req_options, hooks, cache_segments, max_segments, cache_timeout, cache_key, verbosity, acl_whitelist}) {
+const start_server = function({host, port, req_headers, req_options, hooks, cache_segments, max_segments, cache_timeout, cache_key, verbosity, acl_whitelist, tls_cert, tls_key, tls_pass}) {
   if (!port || isNaN(port)) port = 443
 
-  new Promise((resolve, reject) => {
-    if (host) return resolve(host)
-
-    prompt((host) => resolve(host))
-  })
+  resolve(host, port)
   .then((host) => {
-    if (host === false) {
-      host = 'localhost'
-    }
-
     // reference:
     //   https://aghassi.github.io/ssl-using-express-4/
 
-    const ssl_options = {
-      key:  fs.readFileSync(`${__dirname}/cert/key.pem`),
-      cert: fs.readFileSync(`${__dirname}/cert/cert.pem`),
-      passphrase: 'HLS-proxy'
-    }
+    const ssl_options = (tls_cert && tls_key)
+      ? {
+          cert:       fs.readFileSync(tls_cert),
+          key:        fs.readFileSync(tls_key),
+          passphrase: tls_pass ? fs.readFileSync(tls_pass, 'utf8') : ''
+        }
+      : {
+          cert:       fs.readFileSync(`${__dirname}/cert/cert.pem`),
+          key:        fs.readFileSync(`${__dirname}/cert/key.pem`),
+          passphrase: 'HLS-proxy'
+        }
 
     const server = https.createServer(ssl_options)
-    proxy({server, host, port, is_secure: true, req_headers, req_options, hooks, cache_segments, max_segments, cache_timeout, cache_key, debug_level: verbosity, acl_whitelist})
+    proxy({server, host, is_secure: true, req_headers, req_options, hooks, cache_segments, max_segments, cache_timeout, cache_key, debug_level: verbosity, acl_whitelist})
     server.listen(port, function () {
-      console.log(`HTTPS server is listening at: ${host}:${port}`)
+      console.log(`HTTPS server is listening at: ${host}`)
     })
   })
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@warren-bank/hls-proxy",
   "description": "Node.js server to proxy HLS video streams",
-  "version":     "0.18.1",
+  "version":     "0.19.0",
   "scripts": {
     "start":     "node hls-proxy/bin/hlsd.js",
     "sudo": "sudo node hls-proxy/bin/hlsd.js"
@@ -10,7 +10,8 @@
     "hlsd": "hls-proxy/bin/hlsd.js"
   },
   "dependencies": {
-    "@warren-bank/node-request": "^1.0.4"
+    "@warren-bank/node-process-argv": "^1.2.1",
+    "@warren-bank/node-request": "^2.0.10"
   },
   "license": "GPL-2.0",
   "author": {

package/hls-proxy/bin/lib/grep_argv.js

@@ -1,91 +0,0 @@
-const fs = require('fs')
-
-// assumes that all arguments are passed with the convention: -key value
-// where "-key" is a flag
-
-const retrieve_flag_value = function(flag_opts, args, index, throw_error_if_value_matches_any_flag_key, flag_keys) {
-  let val
-
-  if (index >= 0) {
-    if (flag_opts && flag_opts["bool"]) {
-      val = true
-    }
-    else if (index + 1 < args.length) {
-      val = args[index + 1]
-
-      if (throw_error_if_value_matches_any_flag_key && (flag_keys.indexOf(val) >= 0)) {
-        throw new Error('The command-line contains option ' + val + ' at a position where a value for the previous option ' + args[index] + ' is expected.')
-      }
-
-      if (flag_opts && flag_opts["num"]) {
-        val = Number(val)
-
-        if (isNaN(val)) val = ""
-      }
-
-      if (flag_opts && flag_opts["file"]) {
-        try {
-          val = fs.realpathSync(val, {encoding: 'utf8'})
-
-          if ( (typeof flag_opts["file"] === "string") && (flag_opts["file"].toLowerCase() === "module") ) {
-            val = require(val)
-          }
-          else {
-            val = fs.readFileSync(val, {encoding: 'utf8'})
-
-            if ( (typeof flag_opts["file"] === "string") && (flag_opts["file"].toLowerCase() === "json") ) {
-              val = JSON.parse(val)
-            }
-          }
-        }
-        catch(e){
-          val = ""
-        }
-      }
-    }
-  }
-
-  if (val === "") val = undefined
-
-  return val
-}
-
-const grep_argv = function(flags, throw_error_if_value_matches_any_flag_key) {
-  const args      = process.argv.slice(2)
-  const flag_keys = Object.keys(flags)
-  const vals = {}
-
-  if (args.length > 0) {
-    flag_keys.forEach((flag) => {
-      let flag_opts = flags[flag]
-      let is_array  = flag_opts && flag_opts["many"]
-      let index     = args.indexOf(flag)
-      let val
-
-      if (!is_array) {
-        val = retrieve_flag_value(flag_opts, args, index, throw_error_if_value_matches_any_flag_key, flag_keys)
-
-        if (val !== undefined) {
-          vals[flag] = val
-        }
-      }
-      else {
-        vals[flag] = []
-
-        while (index >=0) {
-          val = retrieve_flag_value(flag_opts, args, index, throw_error_if_value_matches_any_flag_key, flag_keys)
-
-          if (val !== undefined) {
-            vals[flag].push(val)
-          }
-
-          index = args.indexOf(flag, (index + 1))
-        }
-      }
-    })
-  }
-
-  return vals
-}
-
-module.exports = grep_argv