ale/fediblock-instance
ale/fediblock-instance
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try catch

Browse Source
This commit is contained in:
ale 2024-09-21 03:07:51 +02:00
parent 886953f221
commit f27ab20679
1 changed files with 52 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/fediblock.js
View File

@ -68,6 +68,7 @@ module.exports = async (client, apex, app) => {
requestPart(`https://${instance}/api/v1/instance/peers`) requestPart(`https://${instance}/api/v1/instance/peers`)
]) ])
if (instancelocated.length === 0) { if (instancelocated.length === 0) {
try {
await client.index({ await client.index({
index: constant.index, index: constant.index,
body: { body: {
@ -79,6 +80,10 @@ module.exports = async (client, apex, app) => {
last: new Date() last: new Date()
} }
}) })
} catch (e) {
console.error(e)
return
}
app.locals.created++ app.locals.created++
return await util.sendFederatedMessage(constant.nick, 'New Fediblock Instance', `Fediblock Instance ${instance} with ${json.length} blocks - https://${constant.apexdomain}#${instance}`, getAccount(api)) return await util.sendFederatedMessage(constant.nick, 'New Fediblock Instance', `Fediblock Instance ${instance} with ${json.length} blocks - https://${constant.apexdomain}#${instance}`, getAccount(api))
} else { } else {
@ -89,6 +94,7 @@ module.exports = async (client, apex, app) => {
|| !instancelocated[0]._source.api || !instancelocated[0]._source.api
|| !instancelocated[0]._source.nodeinfo || !instancelocated[0]._source.nodeinfo
|| !instancelocated[0]._source.peers) { || !instancelocated[0]._source.peers) {
try {
await client.update({ await client.update({
index: constant.index, index: constant.index,
id: instancelocated[0]._id, id: instancelocated[0]._id,
@ -101,6 +107,10 @@ module.exports = async (client, apex, app) => {
}, },
doc_as_upsert: true doc_as_upsert: true
}) })
} catch (e) {
console.error(e)
return
}
app.locals.updated++ app.locals.updated++
if (instancelocated[0]._source.api && instancelocated[0]._source.api.uri && instancelocated[0]._source.api.contact_account && instancelocated[0]._source.api.contact_account.acct) { if (instancelocated[0]._source.api && instancelocated[0]._source.api.uri && instancelocated[0]._source.api.contact_account && instancelocated[0]._source.api.contact_account.acct) {
const difference = blocks.filter(block => block.domain && block.domain.trim().length > 0 && !elasticinstance.some(instance => block.domain === instance.domain)) const difference = blocks.filter(block => block.domain && block.domain.trim().length > 0 && !elasticinstance.some(instance => block.domain === instance.domain))
@ -127,7 +137,8 @@ module.exports = async (client, apex, app) => {
return return
} }
}, },
scanPart = async (instancesall, index) => { scanPart = async function* (instancesall, index) {
try {
for (const instance of instancesall) { for (const instance of instancesall) {
try { try {
app.locals.scan.emit('data', 'data: ' + (app.locals.scannum > 0 ? '(' + app.locals.scannum-- + ':' + (index + 1) + '): ' + instance : ': ' + instance) + '\n\n') app.locals.scan.emit('data', 'data: ' + (app.locals.scannum > 0 ? '(' + app.locals.scannum-- + ':' + (index + 1) + '): ' + instance : ': ' + instance) + '\n\n')
@ -137,8 +148,11 @@ module.exports = async (client, apex, app) => {
console.error(e) console.error(e)
} }
} }
global.gc() yield 0
return } catch (e) {
console.error(e)
yield 1
}
}, },
scanIndex = async (server, instancesall) => { scanIndex = async (server, instancesall) => {
try { try {
@ -241,7 +255,11 @@ module.exports = async (client, apex, app) => {
const chunk = instancessorted.slice(i, i + chunkSize) const chunk = instancessorted.slice(i, i + chunkSize)
parts.push(chunk) parts.push(chunk)
} }
await Promise.all(parts.map(async (p, i) => await scanPart(p, i))) await Promise.all(parts.map(async (p, i) => {
for await (const exit of scanPart(p, i)) {
console.log('Done: ' + server + ' - ' + i + ' parts with exit ' + exit + '.')
}
}))
return await scanReturn() return await scanReturn()
} else { } else {
return await scanReturn() return await scanReturn()