diff --git a/package.json b/package.json index 609cece9..154e2a08 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "deploy:nocapd@amsterdam": "ansible-playbook .ansible/nocapd/deploy.yaml -i .ansible/inventories/amsterdam", "deploy:nocapd@newyork": "ansible-playbook .ansible/nocapd/deploy.yaml -i .ansible/inventories/newyork", "deploy:nocapd@johannesburg": "ansible-playbook .ansible/nocapd/deploy.yaml -i .ansible/inventories/johannesburg", - "deploy:nocapd@johannesburg": "ansible-playbook .ansible/nocapd/deploy.yaml -i .ansible/inventories/frankfurt", + "deploy:nocapd@saopaulo": "ansible-playbook .ansible/nocapd/deploy.yaml -i .ansible/inventories/saopaulo", "nukecache@all": "ansible-playbook .ansible/nocapd/nuke-cache.yaml -i .ansible/inventories/johannesburg -i .ansible/inventories/amsterdam -i .ansible/inventories/mumbai -i .ansible/inventories/newyork -i .ansible/inventories/saopaulo -i .ansible/inventories/seoul -i .ansible/inventories/siliconvalley -i .ansible/inventories/sydney" }, "packageManager": "yarn@1.22.23^", diff --git a/packages/announce/src/index.ts b/packages/announce/src/index.ts index 24bc05fc..7183dad5 100644 --- a/packages/announce/src/index.ts +++ b/packages/announce/src/index.ts @@ -75,7 +75,7 @@ export class AnnounceMonitor { } static formatChecks(checks: Array): Array { - if(checks.length === 1 && checks[0] === 'all') + if(checks.includes('all')) return ['open', 'read', 'write', 'info', 'dns', 'geo', 'ssl'] return checks } diff --git a/packages/nocap/adapters/default/EveryAdapterDefault/package.json b/packages/nocap/adapters/default/EveryAdapterDefault/package.json index 5d9dfa2b..1ca7e92c 100644 --- a/packages/nocap/adapters/default/EveryAdapterDefault/package.json +++ b/packages/nocap/adapters/default/EveryAdapterDefault/package.json @@ -1,12 +1,12 @@ { "name": "@nostrwatch/nocap-every-adapter-default", - "version": "1.2.0", + "version": "1.2.1", "type": "module", "main": "index.js", "license": "MIT", "dependencies": { "@nostrwatch/nocap-dns-adapter-default": "^1.0.2", - "@nostrwatch/nocap-geo-adapter-default": "^1.0.1", + "@nostrwatch/nocap-geo-adapter-default": "^1.0.2", "@nostrwatch/nocap-info-adapter-default": "^1.0.1", "@nostrwatch/nocap-ssl-adapter-default": "^1.0.1", "@nostrwatch/nocap-websocket-adapter-default": "^1.2.0" diff --git a/packages/nocap/adapters/default/GeoAdapterDefault/index.js b/packages/nocap/adapters/default/GeoAdapterDefault/index.js index 9b1c5294..f6ad30c4 100644 --- a/packages/nocap/adapters/default/GeoAdapterDefault/index.js +++ b/packages/nocap/adapters/default/GeoAdapterDefault/index.js @@ -9,7 +9,7 @@ import { fetch } from 'cross-fetch' let endpoint const iparr = this.$.results.get('dns')?.data.ipv4 const ip = iparr[iparr.length-1] - const apiKey = process?.env?.IP_API_KEY? process.env.IP_API_KEY: this.$.config.adapterOptions.geo.apiKey + const apiKey = typeof process !== 'undefined' && process?.env?.IP_API_KEY? process.env.IP_API_KEY: this.$.config.adapterOptions.geo.apiKey //todo, enable override via options const fields = 'proxy,mobile,timezone,continent,continentCode,country,countryCode,region,regionName,city,district,zip,lat,lon,isp,as,asname,query' if(typeof ip !== 'string') diff --git a/packages/nocap/adapters/default/GeoAdapterDefault/package.json b/packages/nocap/adapters/default/GeoAdapterDefault/package.json index 43fa2782..1f0c92a0 100644 --- a/packages/nocap/adapters/default/GeoAdapterDefault/package.json +++ b/packages/nocap/adapters/default/GeoAdapterDefault/package.json @@ -1,6 +1,6 @@ { "name": "@nostrwatch/nocap-geo-adapter-default", - "version": "1.0.1", + "version": "1.0.2", "type": "module", "main": "index.js", "license": "MIT", diff --git a/packages/nocap/package.json b/packages/nocap/package.json index c2a25935..3537d8c8 100644 --- a/packages/nocap/package.json +++ b/packages/nocap/package.json @@ -1,6 +1,6 @@ { "name": "@nostrwatch/nocap", - "version": "0.4.5", + "version": "0.4.6", "main": "src/index.js", "type": "module", "license": "MIT", @@ -10,7 +10,7 @@ }, "dependencies": { "@nostrwatch/logger": "^0.0.5", - "@nostrwatch/nocap-every-adapter-default": "^1.2.0", + "@nostrwatch/nocap-every-adapter-default": "^1.2.1", "@nostrwatch/utils": "^0.0.3", "fetch-h2": "3.0.2", "get-ssl-certificate": "2.3.3", diff --git a/packages/nocap/src/classes/Base.js b/packages/nocap/src/classes/Base.js index 9d0b912b..4b793b6b 100644 --- a/packages/nocap/src/classes/Base.js +++ b/packages/nocap/src/classes/Base.js @@ -172,7 +172,6 @@ export default class Base { this.defaultAdapters() await this.start(key).catch( err => this.logger.debug(err) ) const result = await this.promises.get(key).promise - // process.exit() this.logger.debug(`${key}: check(): resolved`) if(result?.[key]?.status === "error" ) { this.on_check_error( key, result )