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

Merge remote-tracking branch 'origin/feature/search' into feature/secret_store

# Conflicts:
#	src/models/Config.ts
#	src/ocean/Ocean.ts
#	test/config.ts
#	test/keeper/ContractBase.test.ts
#	test/keeper/ContractHandler.test.ts
#	test/keeper/Keeper.test.ts
#	test/ocean/Account.test.ts
#	test/ocean/Asset.test.ts
#	test/ocean/Ocean.test.ts
#	test/ocean/Order.test.ts
This commit is contained in:
Sebastian Gerske 2018-10-26 12:14:49 +02:00
commit ee1dd8e30b
19 changed files with 180 additions and 29 deletions

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "@oceanprotocol/squid", "name": "@oceanprotocol/squid",
"version": "0.1.0-beta.16", "version": "0.1.0-beta.17",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "@oceanprotocol/squid", "name": "@oceanprotocol/squid",
"version": "0.1.0-beta.16", "version": "0.1.0-beta.17",
"description": "JavaScript client library for Ocean Protocol", "description": "JavaScript client library for Ocean Protocol",
"main": "dist/squid.js", "main": "dist/squid.js",
"scripts": { "scripts": {

View File

@ -2,11 +2,11 @@ import Config from "./models/Config"
export default class ConfigProvider { export default class ConfigProvider {
public static getConfig() { public static getConfig(): Config {
return ConfigProvider.config return ConfigProvider.config
} }
public static configure(config: Config) { public static setConfig(config: Config) {
ConfigProvider.config = config ConfigProvider.config = config
} }

View File

@ -1,16 +1,21 @@
import fetch from "node-fetch" import Config from "../models/Config"
import Logger from "../utils/Logger" import Logger from "../utils/Logger"
import AquariusConnectorProvider from "./AquariusConnectorProvider"
export default class Aquarius { export default class Aquarius {
public static async getAccessUrl(accessToken: any, payload: any): Promise<string> {
const accessUrl = await fetch(`${accessToken.service_endpoint}/${accessToken.resource_id}`, { private url: string
method: "POST",
body: payload, constructor(config: Config) {
headers: {
"Content-type": "application/json", this.url = config.aquariusUri
}, }
})
public async getAccessUrl(accessToken: any, payload: any): Promise<string> {
const accessUrl = await AquariusConnectorProvider.getConnector().post(
`${accessToken.service_endpoint}/${accessToken.resource_id}`,
payload)
.then((response: any) => { .then((response: any) => {
if (response.ok) { if (response.ok) {
return response.text() return response.text()
@ -27,4 +32,22 @@ export default class Aquarius {
return accessUrl return accessUrl
} }
public async queryMetadata(query): Promise<any[]> {
const result = await AquariusConnectorProvider.getConnector().post(
this.url + "/api/v1/aquarius/assets/metadata/query",
JSON.stringify(query))
.then((response: any) => {
if (response.ok) {
return response.json()
}
Logger.log("Failed: ", response.status, response.statusText)
})
.catch((error) => {
Logger.error("Error fetching querying metdata: ", error)
})
return result
}
} }

View File

@ -0,0 +1,14 @@
import fetch from "node-fetch"
export default class AquariusConnector {
public post(url, payload) {
return fetch(url, {
method: "POST",
body: payload,
headers: {
"Content-type": "application/json",
},
})
}
}

View File

@ -0,0 +1,23 @@
import Logger from "../utils/Logger"
import AquariusConnector from "./AquariusConnector"
export default class AquariusConnectorProvider {
public static setConnector(connector: AquariusConnector) {
Logger.log("setting", typeof connector.constructor.name)
AquariusConnectorProvider.connector = connector
}
public static getConnector() {
if (!AquariusConnectorProvider.connector) {
AquariusConnectorProvider.connector = new AquariusConnector()
}
Logger.log("getting", typeof AquariusConnectorProvider.connector.constructor.name)
return AquariusConnectorProvider.connector
}
private static connector: AquariusConnector = null
}

View File

@ -1,14 +1,20 @@
import ConfigProvider from "../ConfigProvider"
import Aquarius from "./Aquarius"
export default class AquariusProvider { export default class AquariusProvider {
public static setAquarius(aquarius) { public static setAquarius(aquarius: Aquarius) {
AquariusProvider.aquarius = aquarius AquariusProvider.aquarius = aquarius
} }
public static getAquarius() { public static getAquarius() {
if (!AquariusProvider.aquarius) {
AquariusProvider.aquarius = new Aquarius(ConfigProvider.getConfig())
}
return AquariusProvider.aquarius return AquariusProvider.aquarius
} }
private static aquarius private static aquarius: Aquarius = null
} }

View File

@ -1,4 +1,3 @@
import Aquarius from "../aquarius/Aquarius"
import AquariusProvider from "../aquarius/AquariusProvider" import AquariusProvider from "../aquarius/AquariusProvider"
import ConfigProvider from "../ConfigProvider" import ConfigProvider from "../ConfigProvider"
import Keeper from "../keeper/Keeper" import Keeper from "../keeper/Keeper"
@ -15,7 +14,7 @@ export default class Ocean {
public static async getInstance(config: Config) { public static async getInstance(config: Config) {
if (!Ocean.instance) { if (!Ocean.instance) {
ConfigProvider.configure(config) ConfigProvider.setConfig(config)
SecretStoreProvider.configure(config) SecretStoreProvider.configure(config)
AquariusProvider.setAquarius(Aquarius) AquariusProvider.setAquarius(Aquarius)
Ocean.instance = new Ocean(await Keeper.getInstance()) Ocean.instance = new Ocean(await Keeper.getInstance())
@ -106,4 +105,8 @@ export default class Ocean {
return orders return orders
} }
public async searchAssets(query): Promise<any[]> {
return AquariusProvider.getAquarius().queryMetadata(query)
}
} }

View File

@ -0,0 +1,33 @@
import * as assert from "assert"
import Aquarius from "../../src/aquarius/Aquarius"
import AquariusConnectorProvider from "../../src/aquarius/AquariusConnectorProvider"
import config from "../config"
import AquariusConnectorMock from "../mocks/AquariusConnector.mock"
before(() => {
AquariusConnectorProvider.setConnector(new AquariusConnectorMock())
})
describe("Aquarius", () => {
describe("#queryMetadata()", async () => {
const aquarius: Aquarius = new Aquarius(config)
const query = {
offset: 100,
page: 0,
query: {
value: 1,
},
sort: {
value: 1,
},
text: "Office",
}
const result: any[] = await aquarius.queryMetadata(query)
assert(result)
})
})

View File

@ -1,10 +1,12 @@
import Config from "../src/models/Config" import Config from "../src/models/Config"
export default { export default {
aquariusUri: "http://localhost:5000",
nodeUri: "http://localhost:8545", nodeUri: "http://localhost:8545",
parityUri: "http://localhost:9545", parityUri: "http://localhost:9545",
secretStoreUri: "https://secret-store.dev-ocean.com", secretStoreUri: "https://secret-store.dev-ocean.com",
threshold: 2, threshold: 2,
password: "unittest", password: "unittest",
address: "0xed243adfb84a6626eba46178ccb567481c6e655d", address: "0xed243adfb84a6626eba46178ccb567481c6e655d",
web3Provider: null,
} as Config } as Config

View File

@ -5,10 +5,10 @@ import ContractBaseMock from "../mocks/ContractBase.Mock"
const wrappedContract = new ContractBaseMock("OceanToken") const wrappedContract = new ContractBaseMock("OceanToken")
describe("ContractBase", () => { describe("ContractWrapperBase", () => {
before(async () => { before(async () => {
ConfigProvider.configure(config) ConfigProvider.setConfig(config)
await ContractHandler.deployContracts() await ContractHandler.deployContracts()
wrappedContract.initMock() wrappedContract.initMock()
}) })

View File

@ -6,7 +6,7 @@ import config from "../config"
describe("ContractHandler", () => { describe("ContractHandler", () => {
before(async () => { before(async () => {
ConfigProvider.configure(config) ConfigProvider.setConfig(config)
await ContractHandler.deployContracts() await ContractHandler.deployContracts()
}) })

View File

@ -9,7 +9,7 @@ let keeper: Keeper
describe("Keeper", () => { describe("Keeper", () => {
before(async () => { before(async () => {
ConfigProvider.configure(config) ConfigProvider.setConfig(config)
await ContractHandler.deployContracts() await ContractHandler.deployContracts()
keeper = await Keeper.getInstance() keeper = await Keeper.getInstance()
}) })

View File

@ -2,7 +2,7 @@ import Aquarius from "../../src/aquarius/Aquarius"
export default class AquariusMock extends Aquarius { export default class AquariusMock extends Aquarius {
public static async getAccessUrl(accessToken: any, payload: any): Promise<string> { public async getAccessUrl(accessToken: any, payload: any): Promise<string> {
return "http://test/test" return "http://test/test"
} }
} }

View File

@ -0,0 +1,17 @@
import AquariusConnector from "../../src/aquarius/AquariusConnector"
export default class AquariusConnectorMock extends AquariusConnector {
public async post(url: string, payload: any) {
return {
ok: true,
json: () => {
return []
},
text: () => {
return ""
},
}
}
}

View File

@ -12,7 +12,7 @@ let accounts: Account[]
describe("Account", () => { describe("Account", () => {
before(async () => { before(async () => {
ConfigProvider.configure(config) ConfigProvider.setConfig(config)
await ContractHandler.deployContracts() await ContractHandler.deployContracts()
ocean = await Ocean.getInstance(config) ocean = await Ocean.getInstance(config)

View File

@ -19,11 +19,11 @@ let testAsset: Asset
let accounts: Account[] let accounts: Account[]
let testPublisher: Account let testPublisher: Account
describe("#purchase()", () => { describe("Asset", () => {
before(async () => { before(async () => {
ConfigProvider.configure(config) ConfigProvider.setConfig(config)
AquariusProvider.setAquarius(AquariusMock) AquariusProvider.setAquarius(new AquariusMock(config))
await ContractHandler.deployContracts() await ContractHandler.deployContracts()
ocean = await Ocean.getInstance(config) ocean = await Ocean.getInstance(config)
@ -34,7 +34,9 @@ describe("#purchase()", () => {
await ocean.register(testAsset) await ocean.register(testAsset)
}) })
it("should purchase an asset", async () => { describe("#purchase()", () => {
it("should purchase an asset", async () => {
// todo // todo
const consumerAccount = accounts[5] const consumerAccount = accounts[5]

View File

@ -1,4 +1,5 @@
import {assert} from "chai" import {assert} from "chai"
import AquariusProvider from "../../src/aquarius/AquariusProvider"
import ConfigProvider from "../../src/ConfigProvider" import ConfigProvider from "../../src/ConfigProvider"
import ContractHandler from "../../src/keeper/ContractHandler" import ContractHandler from "../../src/keeper/ContractHandler"
import Account from "../../src/ocean/Account" import Account from "../../src/ocean/Account"
@ -6,6 +7,7 @@ import Asset from "../../src/ocean/Asset"
import Ocean from "../../src/ocean/Ocean" import Ocean from "../../src/ocean/Ocean"
import Order from "../../src/ocean/Order" import Order from "../../src/ocean/Order"
import config from "../config" import config from "../config"
import AquariusMock from "../mocks/Aquarius.mock"
let ocean: Ocean let ocean: Ocean
let accounts: Account[] let accounts: Account[]
@ -20,7 +22,8 @@ const timeout = 100000000
describe("Ocean", () => { describe("Ocean", () => {
before(async () => { before(async () => {
ConfigProvider.configure(config) ConfigProvider.setConfig(config)
AquariusProvider.setAquarius(new AquariusMock(config))
await ContractHandler.deployContracts() await ContractHandler.deployContracts()
ocean = await Ocean.getInstance(config) ocean = await Ocean.getInstance(config)
accounts = await ocean.getAccounts() accounts = await ocean.getAccounts()
@ -84,4 +87,26 @@ describe("Ocean", () => {
}) })
describe("#searchAssets()", () => {
it("should search for assets", async () => {
const query = {
offset: 100,
page: 0,
query: {
value: 1,
},
sort: {
value: 1,
},
text: "Office",
}
const assets: any[] = await ocean.searchAssets(query)
assert(assets)
})
})
}) })

View File

@ -1,4 +1,5 @@
import {assert} from "chai" import {assert} from "chai"
import AquariusProvider from "../../src/aquarius/AquariusProvider"
import ConfigProvider from "../../src/ConfigProvider" import ConfigProvider from "../../src/ConfigProvider"
import ContractHandler from "../../src/keeper/ContractHandler" import ContractHandler from "../../src/keeper/ContractHandler"
import AccessStatus from "../../src/models/AccessStatus" import AccessStatus from "../../src/models/AccessStatus"
@ -7,6 +8,7 @@ import Asset from "../../src/ocean/Asset"
import Ocean from "../../src/ocean/Ocean" import Ocean from "../../src/ocean/Ocean"
import Order from "../../src/ocean/Order" import Order from "../../src/ocean/Order"
import config from "../config" import config from "../config"
import AquariusMock from "../mocks/Aquarius.mock"
import * as AccessToken from "./AccessToken.json" import * as AccessToken from "./AccessToken.json"
const testName = "Order Test Asset" const testName = "Order Test Asset"
@ -23,7 +25,8 @@ let testConsumer: Account
describe("Order", () => { describe("Order", () => {
before(async () => { before(async () => {
ConfigProvider.configure(config) ConfigProvider.setConfig(config)
AquariusProvider.setAquarius(new AquariusMock(config))
await ContractHandler.deployContracts() await ContractHandler.deployContracts()
ocean = await Ocean.getInstance(config) ocean = await Ocean.getInstance(config)
accounts = await ocean.getAccounts() accounts = await ocean.getAccounts()