iptv-checker 0.24.1 → 0.24.4

package/.readme/errors.md

@@ -44,6 +44,8 @@
 | HTTP_NETWORK_UNREACHABLE             | HTTP Network Unreachable                 |
 | HTTP_ECONNRESET                      | HTTP Connection Reset                    |
 | HTTP_CONNECTION_REFUSED              | HTTP Connection Refused                  |
+| HTTP_CANNOT_ASSIGN_REQUESTED_ADDRESS | HTTP Cannot Assign Requested Address     |
+| HTTP_4XX_CLIENT_ERROR                | HTTP 4XX Client Error                    |
 | HTTP_UNDEFINED                       | HTTP Undefined Error                     |
 | FFMPEG_INPUT_OUTPUT_ERROR            | FFMPEG Input/output Error                |
 | FFMPEG_PROTOCOL_NOT_FOUND            | FFMPEG Protocol Not Found                |

package/README.md

@@ -222,8 +222,8 @@ _On error:_
       timeshift: '',
       status: {
         ok: false,
-        code: ,
-        message: 'Request Timeout',
+        code: 'HTTP_REQUEST_TIMEOUT',
+        message: 'HTTP 408 Request Timeout',
       }
     },
     //...

package/package.json

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

package/src/errors.js

@@ -49,8 +49,9 @@ module.exports = {
   HTTP_NETWORK_UNREACHABLE: 'HTTP Network Unreachable',
   HTTP_ECONNRESET: 'HTTP Connection Reset',
   HTTP_CONNECTION_REFUSED: 'HTTP Connection Refused',
-  HTTP_UNDEFINED: 'HTTP Undefined Error',
   HTTP_CANNOT_ASSIGN_REQUESTED_ADDRESS: 'HTTP Cannot Assign Requested Address',
+  HTTP_4XX_CLIENT_ERROR: 'HTTP 4XX Client Error',
+  HTTP_UNDEFINED: 'HTTP Undefined Error',
 
   FFMPEG_INPUT_OUTPUT_ERROR: 'FFMPEG Input/output Error',
   FFMPEG_PROTOCOL_NOT_FOUND: 'FFMPEG Protocol Not Found',

package/src/ffprobe.js

@@ -146,6 +146,8 @@ function parseError(output, item, config, logger) {
       return 'HTTP_CONNECTION_REFUSED'
     case "Can't assign requested address":
       return 'HTTP_CANNOT_ASSIGN_REQUESTED_ADDRESS'
+    case 'Server returned 4XX Client Error, but not one of 40{0,1,3,4}':
+      return 'HTTP_4XX_CLIENT_ERROR'
   }
 
   logger.debug('FFMPEG_UNDEFINED')

package/src/http.js

@@ -2,6 +2,7 @@ const curlirize = require('axios-curlirize')
 const axios = require('axios')
 const https = require('https')
 const errors = require('./errors')
+const CancelToken = axios.CancelToken
 
 module.exports.loadPlaylist = loadPlaylist
 module.exports.loadStream = loadStream
@@ -32,6 +33,7 @@ playlistClient.interceptors.response.use(
 const streamClient = axios.create({
   method: 'GET',
   timeout: 60000,
+  maxContentLength: 5 * 1024 * 1024,
   httpsAgent: new https.Agent({
     rejectUnauthorized: false,
   }),
@@ -68,14 +70,23 @@ function loadStream(item, config, logger) {
     headers['Referer'] = referer
   }
 
+  let source = CancelToken.source()
+  setTimeout(() => {
+    source.cancel('timeout')
+  }, timeout)
+
   return streamClient(item.url, {
     timeout,
     headers,
+    cancelToken: source.token,
     curlirize: config.debug,
   })
     .then(() => Promise.resolve())
     .catch(err => {
       const code = parseError(err, config, logger)
+      if (code === 'HTTP_MAX_CONTENT_LENGTH_EXCEEDED') {
+        return Promise.resolve()
+      }
 
       return Promise.reject({
         ok: false,
@@ -88,10 +99,12 @@ function loadStream(item, config, logger) {
 function parseError(err, config, logger) {
   if (err.response) {
     return parseResponseStatus(err.response.status)
-  } else if (err.message.startsWith('timeout')) {
+  } else if (err.message && err.message.startsWith('timeout')) {
     return 'HTTP_REQUEST_TIMEOUT'
-  } else if (err.message.includes('ECONNREFUSED')) {
+  } else if (err.message && err.message.includes('ECONNREFUSED')) {
     return 'HTTP_INTERNAL_SERVER_ERROR'
+  } else if (err.message && err.message.startsWith('maxContentLength')) {
+    return 'HTTP_MAX_CONTENT_LENGTH_EXCEEDED'
   } else if (err.code === 'EPROTO') {
     return 'HTTP_PROTOCOL_ERROR'
   } else if (err.code === 'ENETUNREACH') {

package/test/index.test.js

@@ -29,10 +29,9 @@ test(`Should process a playlist URL`, done => {
 })
 
 test(`Should process a stream URL`, done => {
-  const url =
-    'http://cdn.theoplayer.com/video/elephants-dream/playlist-single-audio.m3u8'
+  const url = 'https://live-hls-web-aja.getaj.net/AJA/index.m3u8'
   checker
-    .checkStream({ url, timeout: 5000 })
+    .checkStream({ url, timeout: 10000 })
     .then(results => {
       expect(results.status.ok).toBeTruthy()
       done()
@@ -138,3 +137,16 @@ test(`Should handle HTTP_FORBIDDEN`, done => {
     })
     .catch(done)
 })
+
+test(`Should use timeout parameter`, done => {
+  const url =
+    'http://hbbtvlive.v3.tvp.pl/hbbtvlive/livestream.php?app_id=tvpbialystok'
+  checker
+    .checkStream({ url, timeout: 100 })
+    .then(results => {
+      expect(results.status.code).toBe('HTTP_REQUEST_TIMEOUT')
+      expect(results.status.message).toBe('HTTP 408 Request Timeout')
+      done()
+    })
+    .catch(done)
+})