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

Compare commits

base: ale:83a28e3ad3a23a4c476f3359a338a34a9c501121
Branches Tags
ale:master
ale:v1.0
..
compare: ale:8655727009f9da473c6e172cf675e27062eccf40
Branches Tags
ale:master
ale:v1.0

No commits in common. "83a28e3ad3a23a4c476f3359a338a34a9c501121" and "8655727009f9da473c6e172cf675e27062eccf40" have entirely different histories.
83a28e3ad3 ... 8655727009

1 changed files with 27 additions and 37 deletions
Show Stats Expand all files Collapse all files

64
lib/fediblock.js
View File

@ -68,22 +68,17 @@ 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: { instance,
instance, api,
api, nodeinfo,
nodeinfo, blocks,
blocks, peers,
peers, 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 {
@ -94,23 +89,18 @@ 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, doc: {
doc: { api: api ? api : instancelocated[0]._source.api,
api: api ? api : instancelocated[0]._source.api, nodeinfo: nodeinfo ? nodeinfo : instancelocated[0]._source.nodeinfo,
nodeinfo: nodeinfo ? nodeinfo : instancelocated[0]._source.nodeinfo, blocks: blocks && blocks.length > 0 ? blocks : elasticinstance,
blocks: blocks && blocks.length > 0 ? blocks : elasticinstance, peers: peers && peers.length > 0 ? peers : instancelocated[0]._source.peers,
peers: peers && peers.length > 0 ? peers : instancelocated[0]._source.peers, last: new Date()
last: new Date() },
}, 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))
@ -144,17 +134,17 @@ module.exports = async (client, apex, app) => {
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')
app.locals.peers++ app.locals.peers++
await scanInstance(instance) await scanInstance(instance)
global.gc()
} catch (e) { } catch (e) {
console.error(e) console.error(e)
} }
} }
global.gc()
yield 0
} catch (e) { } catch (e) {
global.gc()
console.error(e) console.error(e)
yield 1 yield 1
} }
global.gc()
yield 0
}, },
scanIndex = async (server, instancesall) => { scanIndex = async (server, instancesall) => {
try { try {
@ -259,7 +249,7 @@ module.exports = async (client, apex, app) => {
} }
await Promise.all(parts.map(async (p, i) => { await Promise.all(parts.map(async (p, i) => {
for await (const exit of scanPart(p, i)) { for await (const exit of scanPart(p, i)) {
console.log('Done: ' + server + ' - ' + i + ' parts with exit ' + exit + '.') console.log(`Scan finished ${server} - index ${i} - exit ${exit}`)
} }
})) }))
return await scanReturn() return await scanReturn()