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

Report the asset creation progress.

Browse Source
This commit is contained in:
Pedro Gutiérrez 2019-05-07 13:08:26 +02:00 committed by Pedro Gutiérrez
parent 8d166088c2
commit 7d94cf2b6c
5 changed files with 129 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
integration/ocean/ConsumeAssetBrizo.test.ts
View File

@ -26,9 +26,12 @@ describe("Consume Asset (Brizo)", () => {
})
it("should regiester an asset", async () => {
const steps = []
ddo = await ocean.assets.create(metadata as any, publisher)
.next((step) => steps.push(step))
assert.instanceOf(ddo, DDO)
assert.deepEqual(steps, [0, 1, 2, 3, 4, 5, 6, 7])
})
it("should order the asset", async () => {
@ -44,7 +47,7 @@ describe("Consume Asset (Brizo)", () => {
assert.deepEqual(steps, [0, 1, 2, 3])
})
it("should consume and store the assets", async () => {
xit("should consume and store the assets", async () => {
const accessService = ddo.findServiceByType("Access")
const folder = "/tmp/ocean/squid-js"

2
package.json
View File

@ -86,7 +86,7 @@
"lcov-result-merger": "^3.1.0",
"mocha": "^6.1.2",
"nyc": "^14.1.0",
"source-map-support": "^0.5.13",
"source-map-support": "^0.5.12",
"truffle-hdwallet-provider": "^1.0.6",
"ts-node": "^8.0.3",
"tslint": "^5.15.0",

6
src/aquarius/Aquarius.ts
View File

@ -14,10 +14,10 @@ export interface QueryResult {
export interface SearchQuery {
text?: string
offset: number
page: number
offset?: number
page?: number
query: {[property: string]: string | number | string[] | number[]}
sort: {[jsonPath: string]: number}
sort?: {[jsonPath: string]: number}
}
/**

207
src/ocean/OceanAssets.ts
View File

@ -7,6 +7,17 @@ import DID from "./DID"
import { fillConditionsWithDDO, SubscribablePromise, generateId, zeroX } from "../utils"
import { Instantiable, InstantiableConfig } from "../Instantiable.abstract"
export enum CreateProgressStep {
EncryptingFiles,
FilesEncrypted,
GeneratingProof,
ProofGenerated,
RegisteringDid,
DidRegistred,
StoringDdo,
DdoStored,
}
export enum OrderProgressStep {
CreatingAgreement,
AgreementInitialized,
@ -46,101 +57,121 @@ export class OceanAssets extends Instantiable {
* @param {Account} publisher Publisher account.
* @return {Promise<DDO>}
*/
public async create(metadata: MetaData, publisher: Account, services: Service[] = []): Promise<DDO> {
const {secretStoreUri} = this.config
const {didRegistry, templates} = this.ocean.keeper
public create(metadata: MetaData, publisher: Account, services: Service[] = []): SubscribablePromise<CreateProgressStep, DDO> {
this.logger.log("Creating asset")
return new SubscribablePromise(async (observer) => {
const {secretStoreUri} = this.config
const {didRegistry, templates} = this.ocean.keeper
const did: DID = DID.generate()
const did: DID = DID.generate()
const encryptedFiles = await this.ocean.secretStore.encrypt(did.getId(), metadata.base.files, publisher)
this.logger.log("Encrypting files")
observer.next(CreateProgressStep.EncryptingFiles)
const encryptedFiles = await this.ocean.secretStore.encrypt(did.getId(), metadata.base.files, publisher)
this.logger.log("Files encrypted")
observer.next(CreateProgressStep.FilesEncrypted)
const serviceAgreementTemplate = await templates.escrowAccessSecretStoreTemplate.getServiceAgreementTemplate()
const serviceAgreementTemplate = await templates.escrowAccessSecretStoreTemplate.getServiceAgreementTemplate()
const serviceEndpoint = this.ocean.aquarius.getServiceEndpoint(did)
const serviceEndpoint = this.ocean.aquarius.getServiceEndpoint(did)
let serviceDefinitionIdCount = 0
// create ddo itself
const ddo: DDO = new DDO({
id: did.getDid(),
authentication: [{
type: "RsaSignatureAuthentication2018",
publicKey: did.getDid(),
}],
publicKey: [
{
id: did.getDid(),
type: "EthereumECDSAKey",
owner: publisher.getId(),
},
],
service: [
{
type: "Access",
creator: "",
purchaseEndpoint: this.ocean.brizo.getPurchaseEndpoint(),
serviceEndpoint: this.ocean.brizo.getConsumeEndpoint(),
name: "dataAssetAccessServiceAgreement",
templateId: templates.escrowAccessSecretStoreTemplate.getAddress(),
serviceAgreementTemplate,
},
{
type: "Authorization",
service: "SecretStore",
serviceEndpoint: secretStoreUri,
},
{
type: "Metadata",
serviceEndpoint,
metadata: {
// Default values
curation: {
rating: 0,
numVotes: 0,
},
// Overwrites defaults
...metadata,
// Cleaning not needed information
base: {
...metadata.base,
contentUrls: undefined,
encryptedFiles,
files: metadata.base.files
.map((file, index) => ({
...file,
index,
url: undefined,
})),
} as any,
let serviceDefinitionIdCount = 0
// create ddo itself
const ddo: DDO = new DDO({
id: did.getDid(),
authentication: [{
type: "RsaSignatureAuthentication2018",
publicKey: did.getDid(),
}],
publicKey: [
{
id: did.getDid(),
type: "EthereumECDSAKey",
owner: publisher.getId(),
},
},
...services,
]
// Remove duplications
.reverse()
.filter(({type}, i, list) => list.findIndex(({type: t}) => t === type) === i)
.reverse()
// Adding ID
.map((_) => ({..._, serviceDefinitionId: String(serviceDefinitionIdCount++)})) as Service[],
],
service: [
{
type: "Access",
creator: "",
purchaseEndpoint: this.ocean.brizo.getPurchaseEndpoint(),
serviceEndpoint: this.ocean.brizo.getConsumeEndpoint(),
name: "dataAssetAccessServiceAgreement",
templateId: templates.escrowAccessSecretStoreTemplate.getAddress(),
serviceAgreementTemplate,
},
{
type: "Authorization",
service: "SecretStore",
serviceEndpoint: secretStoreUri,
},
{
type: "Metadata",
serviceEndpoint,
metadata: {
// Default values
curation: {
rating: 0,
numVotes: 0,
},
// Overwrites defaults
...metadata,
// Cleaning not needed information
base: {
...metadata.base,
contentUrls: undefined,
encryptedFiles,
files: metadata.base.files
.map((file, index) => ({
...file,
index,
url: undefined,
})),
} as any,
},
},
...services,
]
// Remove duplications
.reverse()
.filter(({type}, i, list) => list.findIndex(({type: t}) => t === type) === i)
.reverse()
// Adding ID
.map((_) => ({..._, serviceDefinitionId: String(serviceDefinitionIdCount++)})) as Service[],
})
// Overwritte initial service agreement conditions
const rawConditions = await templates.escrowAccessSecretStoreTemplate.getServiceAgreementTemplateConditions()
const conditions = fillConditionsWithDDO(rawConditions, ddo)
serviceAgreementTemplate.conditions = conditions
ddo.addChecksum()
this.logger.log("Generating proof")
observer.next(CreateProgressStep.GeneratingProof)
await ddo.addProof(this.ocean, publisher.getId(), publisher.getPassword())
this.logger.log("Proof generated")
observer.next(CreateProgressStep.ProofGenerated)
this.logger.log("Registering DID")
observer.next(CreateProgressStep.RegisteringDid)
await didRegistry.registerAttribute(
did.getId(),
ddo.getChecksum(),
[this.config.brizoAddress],
serviceEndpoint,
publisher.getId(),
)
this.logger.log("DID registred")
observer.next(CreateProgressStep.DidRegistred)
this.logger.log("Storing DDO")
observer.next(CreateProgressStep.StoringDdo)
const storedDdo = await this.ocean.aquarius.storeDDO(ddo)
this.logger.log("DDO stored")
observer.next(CreateProgressStep.DdoStored)
return storedDdo
})
// Overwritte initial service agreement conditions
const rawConditions = await templates.escrowAccessSecretStoreTemplate.getServiceAgreementTemplateConditions()
const conditions = fillConditionsWithDDO(rawConditions, ddo)
serviceAgreementTemplate.conditions = conditions
ddo.addChecksum()
await ddo.addProof(this.ocean, publisher.getId(), publisher.getPassword())
await didRegistry.registerAttribute(
did.getId(),
ddo.getChecksum(),
[this.config.brizoAddress],
serviceEndpoint,
publisher.getId(),
)
const storedDdo = await this.ocean.aquarius.storeDDO(ddo)
return storedDdo
}
// tslint:disable-next-line

2
src/squid.ts
View File

@ -13,6 +13,8 @@ import * as utils from "./utils"
export * from "./ddo/DDO"
export * from "./ddo/MetaData"
export { OrderProgressStep, CreateProgressStep } from "./ocean/OceanAssets"
export { AgreementTemplate } from "./keeper/contracts/templates"
export { Condition, ConditionState } from "./keeper/contracts/conditions"