oceanprotocol/ocean.js
1
0
Fork 0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00
Code Releases Activity

Merge pull request #1162 from oceanprotocol/fix-provider-encrypt

Browse Source 
fix encrypt function
This commit is contained in:
Bogdan Fazakas 2021-12-16 17:10:11 +02:00 committed by GitHub
commit 83a433b1fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/provider/Provider.ts
View File

@ -1,5 +1,5 @@
import Web3 from 'web3'
import { LoggerInstance } from '../utils'
import { LoggerInstance, fetchData, getData } from '../utils'
import {
Asset,
FileMetadata,
@ -25,9 +25,9 @@ export class Provider {
* @param {any} fetchMethod
* @return {Promise<ServiceEndpoint[]>}
*/
async getEndpoints(providerUri: string, fetchMethod: any): Promise<any> {
async getEndpoints(providerUri: string): Promise<any> {
try {
const endpoints = await await fetchMethod(providerUri).json()
const endpoints = await (await getData(providerUri)).json()
return endpoints
} catch (e) {
LoggerInstance.error('Finding the service endpoints failed:', e)
@ -77,7 +77,7 @@ export class Provider {
serviceEndpoints?: ServiceEndpoint[]
): Promise<string> {
if (!providerEndpoints) {
providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
providerEndpoints = await this.getEndpoints(providerUri)
}
if (!serviceEndpoints) {
serviceEndpoints = await this.getServiceEndpoints(providerUri, providerEndpoints)
@ -128,7 +128,7 @@ export class Provider {
providerUri: string,
fetchMethod: any
): Promise<string> {
const providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
const providerEndpoints = await this.getEndpoints(providerUri)
const serviceEndpoints = await this.getServiceEndpoints(
providerUri,
providerEndpoints
@ -162,7 +162,7 @@ export class Provider {
providerUri: string,
fetchMethod: any
): Promise<FileMetadata[]> {
const providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
const providerEndpoints = await this.getEndpoints(providerUri)
const serviceEndpoints = await this.getServiceEndpoints(
providerUri,
providerEndpoints
@ -204,7 +204,7 @@ export class Provider {
fetchMethod: any,
userCustomParameters?: UserCustomParameters
): Promise<string> {
const providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
const providerEndpoints = await this.getEndpoints(providerUri)
const serviceEndpoints = await this.getServiceEndpoints(
providerUri,
providerEndpoints
@ -253,7 +253,7 @@ export class Provider {
fetchMethod: any,
userCustomParameters?: UserCustomParameters
): Promise<any> {
const providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
const providerEndpoints = await this.getEndpoints(providerUri)
const serviceEndpoints = await this.getServiceEndpoints(
providerUri,
providerEndpoints
@ -315,7 +315,7 @@ export class Provider {
fetchMethod: any,
output?: ComputeOutput
): Promise<ComputeJob | ComputeJob[]> {
const providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
const providerEndpoints = await this.getEndpoints(providerUri)
const serviceEndpoints = await this.getServiceEndpoints(
providerUri,
providerEndpoints
@ -384,7 +384,7 @@ export class Provider {
web3: Web3,
fetchMethod: any
): Promise<ComputeJob | ComputeJob[]> {
const providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
const providerEndpoints = await this.getEndpoints(providerUri)
const serviceEndpoints = await this.getServiceEndpoints(
providerUri,
providerEndpoints
@ -452,7 +452,7 @@ export class Provider {
fetchMethod: any,
jobId?: string
): Promise<ComputeJob | ComputeJob[]> {
const providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
const providerEndpoints = await this.getEndpoints(providerUri)
const serviceEndpoints = await this.getServiceEndpoints(
providerUri,
providerEndpoints
@ -522,7 +522,7 @@ export class Provider {
web3: Web3,
fetchMethod: any
): Promise<any> {
const providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
const providerEndpoints = await this.getEndpoints(providerUri)
const serviceEndpoints = await this.getServiceEndpoints(
providerUri,
providerEndpoints
@ -581,7 +581,7 @@ export class Provider {
web3: Web3,
fetchMethod: any
): Promise<ComputeJob | ComputeJob[]> {
const providerEndpoints = await this.getEndpoints(providerUri, fetchMethod)
const providerEndpoints = await this.getEndpoints(providerUri)
const serviceEndpoints = await this.getServiceEndpoints(
providerUri,
providerEndpoints

34
src/utils/FetchHelper.ts
View File

@ -10,3 +10,37 @@ export async function fetchData(url: string, opts: RequestInit): Promise<Respons
}
return result
}
export async function getData(url: string): Promise<Response> {
return fetch(url, {
method: 'GET',
headers: {
'Content-type': 'application/json'
}
})
}
async function postWithHeaders(
url: string,
payload: BodyInit,
headers: any
): Promise<Response> {
if (payload != null) {
return fetch(url, {
method: 'POST',
body: payload,
headers
})
} else {
return fetch(url, {
method: 'POST'
})
}
}
export async function postData(url: string, payload: BodyInit): Promise<Response> {
const headers = {
'Content-type': 'application/json'
}
return postWithHeaders(url, payload, headers)
}