Merge pull request #11592 from iptv-org/fix-ffmpeg-timeout-issue
Fix timeout issue
This commit is contained in:
commit
c64c8803cd
9
.github/workflows/auto-update.yml
vendored
9
.github/workflows/auto-update.yml
vendored
|
@ -39,7 +39,14 @@ jobs:
|
|||
# cluster_id: [1]
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: FedericoCarboni/setup-ffmpeg@v2
|
||||
- name: Install ffmpeg
|
||||
run: |
|
||||
sudo rm -rf /var/lib/apt/lists/*
|
||||
sudo apt-get clean
|
||||
sudo apt-get update -y
|
||||
sudo apt-get install -y ffmpeg
|
||||
ffmpeg -version
|
||||
ffprobe -version
|
||||
- uses: actions/setup-node@v3
|
||||
if: ${{ !env.ACT }}
|
||||
with:
|
||||
|
|
40
package-lock.json
generated
40
package-lock.json
generated
|
@ -12,7 +12,7 @@
|
|||
"commander": "^8.3.0",
|
||||
"dayjs": "^1.10.7",
|
||||
"fs-extra": "^10.0.0",
|
||||
"iptv-checker": "^0.24.5",
|
||||
"iptv-checker": "^0.26.0",
|
||||
"iptv-playlist-parser": "^0.12.1",
|
||||
"jest": "^27.5.1",
|
||||
"jest-expect-message": "^1.0.2",
|
||||
|
@ -2012,9 +2012,9 @@
|
|||
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
|
||||
},
|
||||
"node_modules/iptv-checker": {
|
||||
"version": "0.24.5",
|
||||
"resolved": "https://registry.npmjs.org/iptv-checker/-/iptv-checker-0.24.5.tgz",
|
||||
"integrity": "sha512-ue3a3TKDTpHLfdBtO2W3IGPZYWNX5cLYBYuftelnbPDWiTfCZiJ4ECV7D9jB8KW+3J6aleMFmE/Qz+1jz88V6w==",
|
||||
"version": "0.26.0",
|
||||
"resolved": "https://registry.npmjs.org/iptv-checker/-/iptv-checker-0.26.0.tgz",
|
||||
"integrity": "sha512-8q9RWEpW7rICEj2PEz+6KnfBP5GimsCEsVaXG637ylyLx7vD5miX5MZGJDFslC+RIrQBZiBnNIQPmbhfYEHehg==",
|
||||
"dependencies": {
|
||||
"axios": "^0.21.1",
|
||||
"axios-curlirize": "^1.3.7",
|
||||
|
@ -2023,7 +2023,7 @@
|
|||
"commander": "^2.20.0",
|
||||
"dateformat": "^3.0.3",
|
||||
"get-stdin": "^7.0.0",
|
||||
"iptv-playlist-parser": "^0.11.0",
|
||||
"iptv-playlist-parser": "^0.12.0",
|
||||
"jest": "^27.0.6",
|
||||
"lodash.chunk": "^4.2.0",
|
||||
"progress": "^2.0.3",
|
||||
|
@ -2041,15 +2041,6 @@
|
|||
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
|
||||
"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
|
||||
},
|
||||
"node_modules/iptv-checker/node_modules/iptv-playlist-parser": {
|
||||
"version": "0.11.0",
|
||||
"resolved": "https://registry.npmjs.org/iptv-playlist-parser/-/iptv-playlist-parser-0.11.0.tgz",
|
||||
"integrity": "sha512-kUqayPVW8WVhDCodEOBzUlPpBTtCR3k7uvIHfmK/xB8TJCOnbMpvaxzHl0W3ImRS9qDVkBtzcIyfutdLXUr2KQ==",
|
||||
"dependencies": {
|
||||
"is-valid-path": "^0.1.1",
|
||||
"valid-url": "^1.0.9"
|
||||
}
|
||||
},
|
||||
"node_modules/iptv-playlist-parser": {
|
||||
"version": "0.12.1",
|
||||
"resolved": "https://registry.npmjs.org/iptv-playlist-parser/-/iptv-playlist-parser-0.12.1.tgz",
|
||||
|
@ -4060,7 +4051,7 @@
|
|||
"node_modules/valid-url": {
|
||||
"version": "1.0.9",
|
||||
"resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz",
|
||||
"integrity": "sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA="
|
||||
"integrity": "sha512-QQDsV8OnSf5Uc30CKSwG9lnhMPe6exHtTXLRYX8uMwKENy640pU+2BgBL0LRbDh/eYRahNCS7aewCx0wf3NYVA=="
|
||||
},
|
||||
"node_modules/validator": {
|
||||
"version": "13.7.0",
|
||||
|
@ -5757,9 +5748,9 @@
|
|||
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
|
||||
},
|
||||
"iptv-checker": {
|
||||
"version": "0.24.5",
|
||||
"resolved": "https://registry.npmjs.org/iptv-checker/-/iptv-checker-0.24.5.tgz",
|
||||
"integrity": "sha512-ue3a3TKDTpHLfdBtO2W3IGPZYWNX5cLYBYuftelnbPDWiTfCZiJ4ECV7D9jB8KW+3J6aleMFmE/Qz+1jz88V6w==",
|
||||
"version": "0.26.0",
|
||||
"resolved": "https://registry.npmjs.org/iptv-checker/-/iptv-checker-0.26.0.tgz",
|
||||
"integrity": "sha512-8q9RWEpW7rICEj2PEz+6KnfBP5GimsCEsVaXG637ylyLx7vD5miX5MZGJDFslC+RIrQBZiBnNIQPmbhfYEHehg==",
|
||||
"requires": {
|
||||
"axios": "^0.21.1",
|
||||
"axios-curlirize": "^1.3.7",
|
||||
|
@ -5768,7 +5759,7 @@
|
|||
"commander": "^2.20.0",
|
||||
"dateformat": "^3.0.3",
|
||||
"get-stdin": "^7.0.0",
|
||||
"iptv-playlist-parser": "^0.11.0",
|
||||
"iptv-playlist-parser": "^0.12.0",
|
||||
"jest": "^27.0.6",
|
||||
"lodash.chunk": "^4.2.0",
|
||||
"progress": "^2.0.3",
|
||||
|
@ -5779,15 +5770,6 @@
|
|||
"version": "2.20.3",
|
||||
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
|
||||
"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
|
||||
},
|
||||
"iptv-playlist-parser": {
|
||||
"version": "0.11.0",
|
||||
"resolved": "https://registry.npmjs.org/iptv-playlist-parser/-/iptv-playlist-parser-0.11.0.tgz",
|
||||
"integrity": "sha512-kUqayPVW8WVhDCodEOBzUlPpBTtCR3k7uvIHfmK/xB8TJCOnbMpvaxzHl0W3ImRS9qDVkBtzcIyfutdLXUr2KQ==",
|
||||
"requires": {
|
||||
"is-valid-path": "^0.1.1",
|
||||
"valid-url": "^1.0.9"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@ -7287,7 +7269,7 @@
|
|||
"valid-url": {
|
||||
"version": "1.0.9",
|
||||
"resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz",
|
||||
"integrity": "sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA="
|
||||
"integrity": "sha512-QQDsV8OnSf5Uc30CKSwG9lnhMPe6exHtTXLRYX8uMwKENy640pU+2BgBL0LRbDh/eYRahNCS7aewCx0wf3NYVA=="
|
||||
},
|
||||
"validator": {
|
||||
"version": "13.7.0",
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
"commander": "^8.3.0",
|
||||
"dayjs": "^1.10.7",
|
||||
"fs-extra": "^10.0.0",
|
||||
"iptv-checker": "^0.24.5",
|
||||
"iptv-checker": "^0.26.0",
|
||||
"iptv-playlist-parser": "^0.12.1",
|
||||
"jest": "^27.5.1",
|
||||
"jest-expect-message": "^1.0.2",
|
||||
|
|
|
@ -26,7 +26,9 @@ async function updateStreams(items = [], results = {}, origins = {}) {
|
|||
const result = results[item._id]
|
||||
if (result) {
|
||||
const status = parseStatus(result.error)
|
||||
stream.set('status', { status })
|
||||
if (status) {
|
||||
stream.set('status', { status })
|
||||
}
|
||||
|
||||
if (result.streams.length) {
|
||||
const { width, height, bitrate, frame_rate } = parseMediaInfo(result.streams)
|
||||
|
@ -145,8 +147,9 @@ function parseStatus(error) {
|
|||
if (!error) return 'online'
|
||||
|
||||
switch (error.code) {
|
||||
case 'FFMPEG_UNDEFINED':
|
||||
return null
|
||||
case 'HTTP_REQUEST_TIMEOUT':
|
||||
case 'FFMPEG_PROCESS_TIMEOUT':
|
||||
return 'timeout'
|
||||
case 'HTTP_FORBIDDEN':
|
||||
case 'HTTP_UNAUTHORIZED':
|
||||
|
|
22
yarn.lock
22
yarn.lock
|
@ -1388,10 +1388,10 @@
|
|||
"resolved" "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
|
||||
"version" "2.0.4"
|
||||
|
||||
"iptv-checker@^0.24.5":
|
||||
"integrity" "sha512-ue3a3TKDTpHLfdBtO2W3IGPZYWNX5cLYBYuftelnbPDWiTfCZiJ4ECV7D9jB8KW+3J6aleMFmE/Qz+1jz88V6w=="
|
||||
"resolved" "https://registry.npmjs.org/iptv-checker/-/iptv-checker-0.24.5.tgz"
|
||||
"version" "0.24.5"
|
||||
"iptv-checker@^0.26.0":
|
||||
"integrity" "sha512-8q9RWEpW7rICEj2PEz+6KnfBP5GimsCEsVaXG637ylyLx7vD5miX5MZGJDFslC+RIrQBZiBnNIQPmbhfYEHehg=="
|
||||
"resolved" "https://registry.npmjs.org/iptv-checker/-/iptv-checker-0.26.0.tgz"
|
||||
"version" "0.26.0"
|
||||
dependencies:
|
||||
"axios" "^0.21.1"
|
||||
"axios-curlirize" "^1.3.7"
|
||||
|
@ -1400,21 +1400,13 @@
|
|||
"commander" "^2.20.0"
|
||||
"dateformat" "^3.0.3"
|
||||
"get-stdin" "^7.0.0"
|
||||
"iptv-playlist-parser" "^0.11.0"
|
||||
"iptv-playlist-parser" "^0.12.0"
|
||||
"jest" "^27.0.6"
|
||||
"lodash.chunk" "^4.2.0"
|
||||
"progress" "^2.0.3"
|
||||
"valid-url" "^1.0.9"
|
||||
|
||||
"iptv-playlist-parser@^0.11.0":
|
||||
"integrity" "sha512-kUqayPVW8WVhDCodEOBzUlPpBTtCR3k7uvIHfmK/xB8TJCOnbMpvaxzHl0W3ImRS9qDVkBtzcIyfutdLXUr2KQ=="
|
||||
"resolved" "https://registry.npmjs.org/iptv-playlist-parser/-/iptv-playlist-parser-0.11.0.tgz"
|
||||
"version" "0.11.0"
|
||||
dependencies:
|
||||
"is-valid-path" "^0.1.1"
|
||||
"valid-url" "^1.0.9"
|
||||
|
||||
"iptv-playlist-parser@^0.12.1":
|
||||
"iptv-playlist-parser@^0.12.0", "iptv-playlist-parser@^0.12.1":
|
||||
"integrity" "sha512-N0sJFsV8+FBZiR/kl7F5YfFQsUxFXrABP9+xyHPFEQjHJmXSBbvyHLlaW0GjROTd+iXVHA9glEeEwlzJimt5NA=="
|
||||
"resolved" "https://registry.npmjs.org/iptv-playlist-parser/-/iptv-playlist-parser-0.12.1.tgz"
|
||||
"version" "0.12.1"
|
||||
|
@ -2743,7 +2735,7 @@
|
|||
"source-map" "^0.7.3"
|
||||
|
||||
"valid-url@^1.0.9":
|
||||
"integrity" "sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA="
|
||||
"integrity" "sha512-QQDsV8OnSf5Uc30CKSwG9lnhMPe6exHtTXLRYX8uMwKENy640pU+2BgBL0LRbDh/eYRahNCS7aewCx0wf3NYVA=="
|
||||
"resolved" "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz"
|
||||
"version" "1.0.9"
|
||||
|
||||
|
|
Loading…
Reference in a new issue