try catch

lib/fediblock.js

@@ -68,17 +68,22 @@ module.exports = async (client, apex, app) => {
 							requestPart(`https://${instance}/api/v1/instance/peers`)
 						])
 					if (instancelocated.length === 0) {
-						await client.index({
+						try {
-							index: constant.index,
+							await client.index({
-							body: {
+								index: constant.index,
-								instance,
+								body: {
-								api,
+									instance,
-								nodeinfo,
+									api,
-								blocks,
+									nodeinfo,
-								peers,
+									blocks,
-								last: new Date()
+									peers,
-							}
+									last: new Date()
-						})
+								}
+							})
+						} catch (e) {
+							console.error(e)
+							return
+						}
 						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))
 					} else {
@@ -89,18 +94,23 @@ module.exports = async (client, apex, app) => {
 								|| !instancelocated[0]._source.api
 								|| !instancelocated[0]._source.nodeinfo
 								|| !instancelocated[0]._source.peers) {
-								await client.update({
+								try {
-									index: constant.index,
+									await client.update({
-									id: instancelocated[0]._id,
+										index: constant.index,
-									doc: {
+										id: instancelocated[0]._id,
-										api: api ? api : instancelocated[0]._source.api,
+										doc: {
-										nodeinfo: nodeinfo ? nodeinfo : instancelocated[0]._source.nodeinfo,
+											api: api ? api : instancelocated[0]._source.api,
-										blocks: blocks && blocks.length > 0 ? blocks : elasticinstance,
+											nodeinfo: nodeinfo ? nodeinfo : instancelocated[0]._source.nodeinfo,
-										peers: peers && peers.length > 0 ? peers : instancelocated[0]._source.peers,
+											blocks: blocks && blocks.length > 0 ? blocks : elasticinstance,
-										last: new Date()
+											peers: peers && peers.length > 0 ? peers : instancelocated[0]._source.peers,
-									},
+											last: new Date()
-									doc_as_upsert: true
+										},
-								})
+										doc_as_upsert: true
+									})
+								} catch (e) {
+									console.error(e)
+									return
+								}
 								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))
@@ -134,17 +144,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.peers++
 						await scanInstance(instance)
-						global.gc()
 					} catch (e) {
 						console.error(e)
 					}
 				}
+				global.gc()
+				yield 0
 			} catch (e) {
+				global.gc()
 				console.error(e)
 				yield 1
 			}
-			global.gc()
-			yield 0
 		},
 		scanIndex = async (server, instancesall) => {
 			try {
@@ -249,7 +259,7 @@ module.exports = async (client, apex, app) => {
 						}
 						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}`)
+								console.log('Done: ' + server + ' - ' + i + ' parts with exit ' + exit + '.')
 							}
 						}))
 						return await scanReturn()