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

update assets.download

Browse Source
This commit is contained in:
arsenyjin 2020-06-17 10:52:40 +02:00
parent 84ba2144fd
commit a6bccad3f1
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ocean/Assets.ts
View File

@ -1,5 +1,6 @@
import { TransactionReceipt } from 'web3-core' import { TransactionReceipt } from 'web3-core'
import { SearchQuery } from '../aquarius/Aquarius' import { SearchQuery } from '../aquarius/Aquarius'
import { File, MetaDataAlgorithm } from '../ddo/MetaData'
import { DDO } from '../ddo/DDO' import { DDO } from '../ddo/DDO'
import { MetaData, EditableMetaData } from '../ddo/MetaData' import { MetaData, EditableMetaData } from '../ddo/MetaData'
import { Service, ServiceAccess, ServiceComputePrivacy } from '../ddo/Service' import { Service, ServiceAccess, ServiceComputePrivacy } from '../ddo/Service'
@ -8,6 +9,7 @@ import DID from './DID'
import { SubscribablePromise, didZeroX } from '../utils' import { SubscribablePromise, didZeroX } from '../utils'
import { Instantiable, InstantiableConfig } from '../Instantiable.abstract' import { Instantiable, InstantiableConfig } from '../Instantiable.abstract'
import { WebServiceConnector } from './utils/WebServiceConnector'
import { DataTokens } from '../lib' import { DataTokens } from '../lib'
export enum CreateProgressStep { export enum CreateProgressStep {
@ -172,7 +174,7 @@ export class Assets extends Instantiable {
} }
public async download( public async download(
agreementId: string, dtAddress: string,
serviceEndpoint: string, serviceEndpoint: string,
account: Account, account: Account,
files: File[], files: File[],
@ -185,12 +187,15 @@ export class Assets extends Instantiable {
.map(async ({ index: i }) => { .map(async ({ index: i }) => {
let consumeUrl = serviceEndpoint let consumeUrl = serviceEndpoint
consumeUrl += `?index=${i}` consumeUrl += `?index=${i}`
consumeUrl += `&serviceAgreementId=${noZeroX(agreementId)}` consumeUrl += `&serviceAgreementId=${dtAddress}`
consumeUrl += `&consumerAddress=${account.getId()}` // consumeUrl += `&consumerAddress=${account.getId()}`
// consumeUrl += `&signature=${signature}` // consumeUrl += `&signature=${signature}`
let serviceConnector = new WebServiceConnector(this.logger)
try { try {
// TODO: change to WebServiceConnector.ts // TODO: change to WebServiceConnector.ts
await this.ocean.utils.fetch.downloadFile(consumeUrl, destination, i) await serviceConnector.downloadFile(consumeUrl, destination, i)
} catch (e) { } catch (e) {
this.logger.error('Error consuming assets') this.logger.error('Error consuming assets')
this.logger.error(e) this.logger.error(e)