This commit is contained in:
parent
8018069c3c
commit
77f736950f
@ -127,18 +127,24 @@ module.exports = async (client, apex, app) => {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
scanPart = async (instancesall, index) => {
|
scanPart = async function* (instancesall, index) {
|
||||||
for (const instance of instancesall) {
|
try {
|
||||||
try {
|
for (const instance of instancesall) {
|
||||||
app.locals.scan.emit('data', 'data: ' + (app.locals.scannum > 0 ? '(' + app.locals.scannum-- + ':' + (index + 1) + '): ' + instance : ': ' + instance) + '\n\n')
|
try {
|
||||||
app.locals.peers++
|
app.locals.scan.emit('data', 'data: ' + (app.locals.scannum > 0 ? '(' + app.locals.scannum-- + ':' + (index + 1) + '): ' + instance : ': ' + instance) + '\n\n')
|
||||||
await scanInstance(instance)
|
app.locals.peers++
|
||||||
} catch (e) {
|
await scanInstance(instance)
|
||||||
console.error(e)
|
global.gc()
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e)
|
||||||
|
yield 1
|
||||||
}
|
}
|
||||||
global.gc()
|
global.gc()
|
||||||
return
|
yield 0
|
||||||
},
|
},
|
||||||
scanIndex = async (server, instancesall) => {
|
scanIndex = async (server, instancesall) => {
|
||||||
try {
|
try {
|
||||||
@ -241,7 +247,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(`Scan finished ${server} - index ${i} - exit ${exit}`)
|
||||||
|
}
|
||||||
|
}))
|
||||||
return await scanReturn()
|
return await scanReturn()
|
||||||
} else {
|
} else {
|
||||||
return await scanReturn()
|
return await scanReturn()
|
||||||
|
@ -1,106 +0,0 @@
|
|||||||
module.exports = async (client, apex, app) => {
|
|
||||||
util = require('./util')(apex),
|
|
||||||
constant = require('./constant'),
|
|
||||||
{ parentPort } = require('worker_threads'),
|
|
||||||
scanInstance = async instance => {
|
|
||||||
try {
|
|
||||||
const json = await util.requestPart(`https://${instance}/api/v1/instance/domain_blocks`)
|
|
||||||
if (Array.isArray(json) && json.length > 0) {
|
|
||||||
const result = await client.search({
|
|
||||||
index: constant.index,
|
|
||||||
size: 1,
|
|
||||||
query: {
|
|
||||||
term: {
|
|
||||||
instance: instance
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
instancelocated = result.hits && result.hits.hits ? result.hits.hits : [],
|
|
||||||
blocks = json.map(block => {
|
|
||||||
if (block.comment && block.comment.length > 8190) {
|
|
||||||
block.comment = block.comment.slice(0, 8190)
|
|
||||||
}
|
|
||||||
return block
|
|
||||||
}),
|
|
||||||
[api, nodeinfo, peers] = await Promise.all([
|
|
||||||
util.requestPart(`https://${instance}/api/v1/instance`),
|
|
||||||
util.requestPart(`https://${instance}/nodeinfo/2.0`),
|
|
||||||
util.requestPart(`https://${instance}/api/v1/instance/peers`)
|
|
||||||
])
|
|
||||||
if (instancelocated.length === 0) {
|
|
||||||
await client.index({
|
|
||||||
index: constant.index,
|
|
||||||
body: {
|
|
||||||
instance,
|
|
||||||
api,
|
|
||||||
nodeinfo,
|
|
||||||
blocks,
|
|
||||||
peers,
|
|
||||||
last: new Date()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
app.locals.created++
|
|
||||||
return await util.sendFederatedMessage(constant.nick, 'New Fediblock Instance', `Fediblock Instance ${instance} with ${json.length} blocks - https://${constant.apexdomain}#${instance}`, util.getAccount(api))
|
|
||||||
} else {
|
|
||||||
const elasticinstance = instancelocated[0]._source.blocks || []
|
|
||||||
if (Array.isArray(elasticinstance)) {
|
|
||||||
if (json.length !== elasticinstance.length
|
|
||||||
|| (instancelocated[0]._source.last && instancelocated[0]._source.last < new Date(Date.now() - 2678400000))
|
|
||||||
|| !instancelocated[0]._source.api
|
|
||||||
|| !instancelocated[0]._source.nodeinfo
|
|
||||||
|| !instancelocated[0]._source.peers) {
|
|
||||||
await client.update({
|
|
||||||
index: constant.index,
|
|
||||||
id: instancelocated[0]._id,
|
|
||||||
doc: {
|
|
||||||
api: api ? api : instancelocated[0]._source.api,
|
|
||||||
nodeinfo: nodeinfo ? nodeinfo : instancelocated[0]._source.nodeinfo,
|
|
||||||
blocks: blocks && blocks.length > 0 ? blocks : elasticinstance,
|
|
||||||
peers: peers && peers.length > 0 ? peers : instancelocated[0]._source.peers,
|
|
||||||
last: new Date()
|
|
||||||
},
|
|
||||||
doc_as_upsert: true
|
|
||||||
})
|
|
||||||
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) {
|
|
||||||
const difference = blocks.filter(block => block.domain && block.domain.trim().length > 0 && !elasticinstance.some(instance => block.domain === instance.domain))
|
|
||||||
if (difference.length > 0 && difference.length < 50) {
|
|
||||||
return await util.sendFederatedMessage(constant.nick, 'Detected #Fediblock by Fediblock Instance', `You blocked new instances: ${difference.map(d => d.domain).join(', ')} - https://${constant.apexdomain}#${instance}`, util.getAccount(instancelocated[0]._source.api))
|
|
||||||
} else {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
console.error(e)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
},
|
|
||||||
scanPart = async (instancesall, index) => {
|
|
||||||
for (const instance of instancesall) {
|
|
||||||
try {
|
|
||||||
app.locals.scan.emit('data', 'data: ' + (app.locals.scannum > 0 ? '(' + app.locals.scannum-- + ':' + (index + 1) + '): ' + instance : ': ' + instance) + '\n\n')
|
|
||||||
app.locals.peers++
|
|
||||||
await scanInstance(instance)
|
|
||||||
} catch (e) {
|
|
||||||
console.error(e)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return
|
|
||||||
},
|
|
||||||
work = (part, index) => {
|
|
||||||
return parentPort.postMessage({ func: scanPart, args: [part, index] })
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user