iptv-checker 0.20.0 → 0.22.0

package/bin/iptv-checker.js

@@ -62,8 +62,6 @@ const config = {
 
 const logger = new Logger(config)
 
-logger.debug({ config })
-
 const outputDir =
   argv.output || `iptv-checker-${dateFormat(new Date(), 'd-m-yyyy-hh-MM-ss')}`
 const onlineFile = `${outputDir}/online.m3u`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iptv-checker",
-  "version": "0.20.0",
+  "version": "0.22.0",
   "description": "Node.js CLI tool for checking links in IPTV playlists",
   "main": "src/index.js",
   "preferGlobal": true,

package/src/helper.js

@@ -48,25 +48,54 @@ async function parsePlaylist(input) {
   return parse(data)
 }
 
-function parseStdout(string, item) {
+function parseError(output, item) {
   const url = item.url
-  const arr = string.split('\n')
-
-  if (arr.length === 0) return
-
-  const line = arr.find(l => {
+  const line = output.split('\n').find(l => {
     return l.indexOf(url) === 0
   })
 
   if (!line) {
-    if (/^Command failed/.test(string)) {
-      return 'Operation timed out'
-    }
+    return 'Operation timed out'
   }
 
   return line.replace(`${url}: `, '')
 }
 
+function parseStderr(stderr) {
+  const requests = stderr
+    .split('\r\n\n')
+    .map(parseRequest)
+    .filter(l => l)
+
+  return { requests }
+}
+
+function parseRequest(string) {
+  const urlMatch = string.match(/Opening '(.*)' for reading/)
+  const url = urlMatch ? urlMatch[1] : null
+  if (!url) return null
+  const requestMatch = string.match(/request: (.|[\r\n])+/gm)
+  const request = requestMatch ? requestMatch[0] : null
+  if (!request) return null
+  const arr = request
+    .split('\n')
+    .map(l => l.trim())
+    .filter(l => l)
+  const methodMatch = arr[0].match(/request: (GET|POST)/)
+  const method = methodMatch ? methodMatch[1] : null
+  arr.shift()
+  if (!arr) return null
+  const headers = {}
+  arr.forEach(line => {
+    const parts = line.split(': ')
+    if (parts && parts[1]) {
+      headers[parts[0]] = parts[1]
+    }
+  })
+
+  return { method, url, headers }
+}
+
 function checkItem(item) {
   const { config, logger } = this
 
@@ -75,12 +104,14 @@ function checkItem(item) {
   logger.debug(`EXECUTING: "${command}"`)
 
   return execAsync(command, { timeout: config.timeout })
-    .then(({ stdout }) => {
-      if (stdout && isJSON(stdout)) {
+    .then(({ stdout, stderr }) => {
+      if (stdout && isJSON(stdout) && stderr) {
         const metadata = JSON.parse(stdout)
         if (!metadata.streams.length) {
-          return { ok: false, reason: 'No working streams' }
+          return { ok: false, reason: 'No streams found' }
         }
+        const results = parseStderr(stderr)
+        metadata.requests = results.requests
 
         return { ok: true, metadata }
       }
@@ -88,34 +119,36 @@ function checkItem(item) {
       return { ok: false, reason: 'Parsing error' }
     })
     .catch(err => {
-      const reason = parseStdout(err.message, item)
+      const reason = parseError(err.message, item)
 
       return { ok: false, reason }
     })
 }
 
 function buildCommand(item, config) {
-  const { url, http = {} } = item
-  const { referrer = ``, 'user-agent': itemUserAgent = `` } = http
-  const userAgent = itemUserAgent.length ? itemUserAgent : config.userAgent
-
+  const userAgent = item.http['user-agent'] || config.userAgent
   let args = [
     `ffprobe`,
     `-of json`,
-    `-v trace`,
+    `-v debug`,
     `-hide_banner`,
     `-show_streams`,
+    `-show_format`,
   ]
 
-  if (referrer.length) {
-    args.push(`-headers`, `'Referer: ${referrer}'`)
+  if (config.timeout) {
+    args.push(`-timeout`, `'${config.timeout * 1000}'`)
+  }
+
+  if (item.http.referrer) {
+    args.push(`-headers`, `'Referer: ${item.http.referrer}'`)
   }
 
   if (userAgent) {
     args.push(`-user_agent`, `'${userAgent}'`)
   }
 
-  args.push(`'${url}'`)
+  args.push(`'${item.url}'`)
 
   args = args.join(` `)
 

package/src/index.js

@@ -90,19 +90,16 @@ class IPTVChecker {
   }
 
   async checkStream(item) {
-    const config = this.config
-    const logger = this.logger
-
-    await config.beforeEach(item)
+    await this.config.beforeEach(item)
 
-    item.status = await helper.checkItem.call({ config, logger }, item)
+    item.status = await helper.checkItem.call(this, item)
     if (item.status.ok) {
-      logger.debug(`OK: ${item.url}`.green)
+      this.logger.debug(`OK: ${item.url}`.green)
     } else {
-      logger.debug(`FAILED: ${item.url} (${item.status.reason})`.red)
+      this.logger.debug(`FAILED: ${item.url} (${item.status.reason})`.red)
     }
 
-    await config.afterEach(item)
+    await this.config.afterEach(item)
 
     return item
   }

package/test/bin.test.js

@@ -1,3 +1,4 @@
+const { performance } = require('perf_hooks')
 const { execSync } = require('child_process')
 const mkdirp = require('mkdirp')
 const del = require('del')
@@ -41,3 +42,14 @@ test(`Should process a playlist URL`, () => {
 
   expect(stdoutResultTester(result)).toBeTruthy()
 })
+
+test(`Should respect timeout argument`, () => {
+  let t0 = performance.now()
+  execSync(
+    `node ${pwd}/bin/iptv-checker.js -t 7000 -o ${pwd}/test/output ${pwd}/test/input/timeout.m3u`,
+    { encoding: 'utf8' }
+  )
+  let t1 = performance.now()
+
+  expect(t1 - t0).toBeGreaterThan(7000)
+})

package/test/index.test.js

@@ -12,7 +12,8 @@ function resultTester(result) {
       Reflect.has(item, `status`) &&
       Reflect.has(item.status, `ok`) &&
       (Reflect.has(item.status, `reason`) ||
-        Reflect.has(item.status, `metadata`))
+        (Reflect.has(item.status, `metadata`) &&
+          Reflect.has(item.status.metadata, `requests`)))
     )
   })
 }

package/test/input/timeout.m3u

@@ -0,0 +1,3 @@
+#EXTM3U
+#EXTINF:-1,Connection timed out
+https://5b464b69d264e.streamlock.net/Channels_live/ngrp:amordiscos_all/playlist.m3u8