allow the urls to stull build if a source dies
All checks were successful
Build and Publish Docker Image / build-and-push (push) Successful in 22s
All checks were successful
Build and Publish Docker Image / build-and-push (push) Successful in 22s
This commit is contained in:
parent
a710f242f4
commit
07340e9341
@ -21,17 +21,4 @@ services:
|
|||||||
- DATABASE=BBLB_DNS
|
- DATABASE=BBLB_DNS
|
||||||
- DBPORT=3306
|
- DBPORT=3306
|
||||||
- TORSSRV=host.docker.internal
|
- TORSSRV=host.docker.internal
|
||||||
- TORSPWD=KarlMax
|
- TORSPWD=KarlMax
|
||||||
# frontend:
|
|
||||||
# build:
|
|
||||||
# context: ./client
|
|
||||||
# dockerfile: Dockerfile.prod
|
|
||||||
# # dockerfile: .dockerfile
|
|
||||||
# image: "karl0ss/bblbtv_dns-frontend"
|
|
||||||
# ports:
|
|
||||||
# - "6969:6969"
|
|
||||||
# environment:
|
|
||||||
# - URL=vps.k-world.me.uk
|
|
||||||
# - PORT=6969
|
|
||||||
# links:
|
|
||||||
# - "backend"
|
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "react-backend",
|
"name": "react-backend",
|
||||||
"version": "1.0.9",
|
"version": "1.0.10",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "node ./bin/www"
|
"start": "node ./bin/www"
|
||||||
|
@ -18,26 +18,34 @@ async function getStreamsNew() {
|
|||||||
let jointArray = []
|
let jointArray = []
|
||||||
for (let index = 0; index < DNSArray.length; index++) {
|
for (let index = 0; index < DNSArray.length; index++) {
|
||||||
const url = DNSArray[index];
|
const url = DNSArray[index];
|
||||||
requestData = await makeRequest(url)
|
|
||||||
let DNSList = requestData.body
|
|
||||||
if (typeof DNSList === 'string' || DNSList instanceof String) {
|
|
||||||
try {
|
|
||||||
DNSList = JSON.parse(DNSList)
|
|
||||||
} catch (error) {
|
|
||||||
jointArray.unshift(...otherURLs.using)
|
|
||||||
jointArray = [...new Set(jointArray)]
|
|
||||||
return jointArray
|
|
||||||
}
|
|
||||||
}
|
|
||||||
try {
|
try {
|
||||||
DNSList = splitToArray(DNSList.su)
|
requestData = await makeRequest(url)
|
||||||
|
let DNSList = requestData.body
|
||||||
|
if (typeof DNSList === 'string' || DNSList instanceof String) {
|
||||||
|
try {
|
||||||
|
DNSList = JSON.parse(DNSList)
|
||||||
|
} catch (error) {
|
||||||
|
console.error(`Failed to parse JSON for url: ${url}`);
|
||||||
|
continue; // skip to next url
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let extractedUrls;
|
||||||
|
if (DNSList && DNSList.su) {
|
||||||
|
extractedUrls = splitToArray(DNSList.su);
|
||||||
|
} else if (DNSList && DNSList.fu) {
|
||||||
|
extractedUrls = splitToArray(DNSList.fu);
|
||||||
|
} else {
|
||||||
|
console.error(`Could not find 'su' or 'fu' for url: ${url}`);
|
||||||
|
continue; // skip to next url
|
||||||
|
}
|
||||||
|
|
||||||
|
extractedUrls.forEach(url => {
|
||||||
|
jointArray.push(url)
|
||||||
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
DNSList = splitToArray(DNSList.fu)
|
console.error(`Failed to process url: ${url}`, error);
|
||||||
}
|
}
|
||||||
|
|
||||||
DNSList.forEach(url => {
|
|
||||||
jointArray.push(url)
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
jointArray.unshift(...otherURLs.using)
|
jointArray.unshift(...otherURLs.using)
|
||||||
jointArray = [...new Set(jointArray)]
|
jointArray = [...new Set(jointArray)]
|
||||||
@ -45,10 +53,10 @@ async function getStreamsNew() {
|
|||||||
}
|
}
|
||||||
/* GET users listing. */
|
/* GET users listing. */
|
||||||
router.get('/', async function (req, res, next) {
|
router.get('/', async function (req, res, next) {
|
||||||
let fullStreamArray = await main()
|
let fullStreamArray = await getStreamsNew()
|
||||||
res.send(fullStreamArray)
|
res.send(fullStreamArray)
|
||||||
});
|
});
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
router, getStreamsNew
|
router, getStreamsNew
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user