oceanprotocol/squid-js
1
0
Fork 0
mirror of https://github.com/oceanprotocol-archive/squid-js.git synced 2024-02-02 15:31:51 +01:00
Code Releases Activity

Improve version output.

Browse Source
This commit is contained in:
Pedro Gutiérrez 2019-06-14 12:07:35 +02:00
parent 21fa3495c5
commit 0ca5dae306
6 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
package-lock.json generated
View File

@ -2653,8 +2653,7 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
@ -2675,14 +2674,12 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
@ -2702,8 +2699,7 @@
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
@ -2851,7 +2847,6 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
@ -2963,8 +2958,7 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
@ -5333,6 +5327,11 @@
"pinkie": "^2.0.0" "pinkie": "^2.0.0"
} }
}, },
"pjson": {
"version": "1.0.9",
"resolved": "https://registry.npmjs.org/pjson/-/pjson-1.0.9.tgz",
"integrity": "sha512-4hRJH3YzkUpOlShRzhyxAmThSNnAaIlWZCAb27hd0pVUAXNUAHAO7XZbsPPvsCYwBFEScTmCCL6DGE8NyZ8BdQ=="
},
"pkg-dir": { "pkg-dir": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",

1
package.json
View File

@ -69,6 +69,7 @@
"bignumber.js": "^8.1.1", "bignumber.js": "^8.1.1",
"deprecated-decorator": "^0.1.6", "deprecated-decorator": "^0.1.6",
"node-fetch": "^2.6.0", "node-fetch": "^2.6.0",
"pjson": "^1.0.9",
"save-file": "^2.3.1", "save-file": "^2.3.1",
"uuid": "^3.3.2", "uuid": "^3.3.2",
"web3": "1.0.0-beta.37", "web3": "1.0.0-beta.37",

2
src/aquarius/Aquarius.ts
View File

@ -34,7 +34,7 @@ export class Aquarius extends Instantiable {
this.setInstanceConfig(config) this.setInstanceConfig(config)
} }
async getVersionInfo() { public async getVersionInfo() {
return await (await this.ocean.utils.fetch.get(this.url)).json() return await (await this.ocean.utils.fetch.get(this.url)).json()
} }

2
src/brizo/Brizo.ts
View File

@ -22,7 +22,7 @@ export class Brizo extends Instantiable {
this.setInstanceConfig(config) this.setInstanceConfig(config)
} }
async getVersionInfo() { public async getVersionInfo() {
return await (await this.ocean.utils.fetch.get(this.url)).json() return await (await this.ocean.utils.fetch.get(this.url)).json()
} }

6
src/keeper/Keeper.ts
View File

@ -84,8 +84,6 @@ export class Keeper extends Instantiable {
return keeper return keeper
} }
private instances: {[contractRef: string]: ContractBase & any}
/** /**
* Is connected to the correct network or not. * Is connected to the correct network or not.
* @type {boolean} * @type {boolean}
@ -151,6 +149,8 @@ export class Keeper extends Instantiable {
eventHandler: EventHandler, eventHandler: EventHandler,
} }
private instances: {[contractRef: string]: ContractBase & any}
/** /**
* Returns a condition by address. * Returns a condition by address.
* @param {string} address Address of deployed condition. * @param {string} address Address of deployed condition.
@ -212,7 +212,7 @@ export class Keeper extends Instantiable {
}) })
} }
getAllInstances() { public getAllInstances() {
return this.instances return this.instances
} }
} }

42
src/ocean/OceanVersions.ts
View File

@ -1,13 +1,13 @@
import * as keeperPackageJson from "@oceanprotocol/keeper-contracts/package.json" import * as keeperPackageJson from "@oceanprotocol/keeper-contracts/package.json"
import * as packageJson from "pjson"
import { Instantiable, InstantiableConfig } from "../Instantiable.abstract" import { Instantiable, InstantiableConfig } from "../Instantiable.abstract"
import * as packageJson from "../../package.json"
export enum OceanPlatformTechStatus { export enum OceanPlatformTechStatus {
Loading = 'Loading', Loading = "Loading",
Unknown = 'Unknown', Unknown = "Unknown",
Stopped = 'Stopped', Stopped = "Stopped",
Working = 'Working', Working = "Working",
} }
interface OceanPlatformTech { interface OceanPlatformTech {
@ -29,7 +29,7 @@ export interface OceanPlatformVersions extends Array<OceanPlatformKeeperTech | O
status: { status: {
ok: boolean ok: boolean
contracts: boolean contracts: boolean
network: boolean network: boolean,
} }
} }
@ -54,7 +54,7 @@ export class OceanVersions extends Instantiable {
// Squid // Squid
versions.squid = { versions.squid = {
name: 'Squid', name: "Squid-js",
version: packageJson.version, version: packageJson.version,
status: OceanPlatformTechStatus.Working, status: OceanPlatformTechStatus.Working,
network: (await this.ocean.keeper.getNetworkName()).toLowerCase(), network: (await this.ocean.keeper.getNetworkName()).toLowerCase(),
@ -63,12 +63,12 @@ export class OceanVersions extends Instantiable {
.reduce((acc, {contractName, address}) => ({ .reduce((acc, {contractName, address}) => ({
...acc, ...acc,
[contractName]: address, [contractName]: address,
}), {}) }), {}),
} }
// Brizo // Brizo
try { try {
const {contracts, 'keeper-version': keeperVersion, network, software: name, version} = const {contracts, "keeper-version": keeperVersion, network, software: name, version} =
await this.ocean.brizo.getVersionInfo() await this.ocean.brizo.getVersionInfo()
versions.brizo = { versions.brizo = {
name, name,
@ -76,11 +76,11 @@ export class OceanVersions extends Instantiable {
version, version,
contracts, contracts,
network, network,
keeperVersion, keeperVersion: keeperVersion.replace(/^v/, ""),
} }
} catch { } catch {
versions.brizo = { versions.brizo = {
name: 'Brizo', name: "Brizo",
status: OceanPlatformTechStatus.Stopped, status: OceanPlatformTechStatus.Stopped,
} }
} }
@ -95,7 +95,7 @@ export class OceanVersions extends Instantiable {
} }
} catch { } catch {
versions.aquarius = { versions.aquarius = {
name: 'Aquarius', name: "Aquarius",
status: OceanPlatformTechStatus.Stopped, status: OceanPlatformTechStatus.Stopped,
} }
} }
@ -106,21 +106,21 @@ export class OceanVersions extends Instantiable {
const networks = techs const networks = techs
.map(({network}) => network) .map(({network}) => network)
.filter(_ => !!_) .filter((_) => !!_)
.reduce((acc, network) => ({...acc, [network]: true}), {}) .reduce((acc, network) => ({...acc, [network]: true}), {})
let contractStatus = true let contractStatus = true
const contracts = techs const contractList = techs
.map(({contracts}) => contracts) .map(({contracts}) => contracts)
.filter(_ => !!_) .filter((_) => !!_)
Array.from(contracts.map(Object.keys)) Array.from(contractList.map(Object.keys))
.reduce((acc, _) => [...acc, ..._], []) .reduce((acc, _) => [...acc, ..._], [])
.filter((_, i, list) => list.indexOf(_) === i) .filter((_, i, list) => list.indexOf(_) === i)
.forEach(name => { .forEach((name) => {
let address let address
contracts contractList
.map(_ => _[name]) .map((_) => _[name])
.forEach(_ => { .forEach((_) => {
if (!address) { if (!address) {
address = _ address = _
return return
@ -131,7 +131,7 @@ export class OceanVersions extends Instantiable {
}) })
}) })
versions.status = <any>{ versions.status = {
ok: !techs.find(({status}) => status !== OceanPlatformTechStatus.Working), ok: !techs.find(({status}) => status !== OceanPlatformTechStatus.Working),
network: Object.keys(networks).length === 1, network: Object.keys(networks).length === 1,
contracts: contractStatus, contracts: contractStatus,