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

use blob instead of buffer (#694)

Browse Source 
* use blob instead of buffer

* fix blob

* fix binary data

* fix dev typo
This commit is contained in:
Alex Coseru 2021-03-31 16:05:02 +03:00 committed by GitHub
parent 3eef8d7efe
commit 6217cfa4e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/metadatacache/MetadataCache.ts
View File

@ -151,7 +151,7 @@ export class MetadataCache {
.postWithOctet(fullUrl, ddo)
.then((response: Response) => {
if (response.ok) {
return response.buffer()
return response.blob()
}
this.logger.error('encryptDDO failed:', response.status, response.statusText, ddo)
return null

28
src/metadatacache/OnChainMetaData.ts
View File

@ -9,6 +9,7 @@ import { MetadataCache } from '../metadatacache/MetadataCache'
// Using limited, compress-only version
// See https://github.com/LZMA-JS/LZMA-JS#but-i-dont-want-to-use-web-workers
import { LZMA } from 'lzma/src/lzma-c'
import { Response } from 'node-fetch'
export interface rawMetadata {
flags: number
@ -74,12 +75,7 @@ export class OnChainMetadata {
encrypt: boolean = false
): Promise<TransactionReceipt> {
const rawData = await this.prepareRawData(ddo, encrypt)
return this.publishRaw(
didZeroX(did),
rawData.flags,
this.getHex(rawData.data),
consumerAccount
)
return this.publishRaw(didZeroX(did), rawData.flags, rawData.data, consumerAccount)
}
/**
@ -96,12 +92,7 @@ export class OnChainMetadata {
encrypt: boolean = false
): Promise<TransactionReceipt> {
const rawData = await this.prepareRawData(ddo, encrypt)
return this.updateRaw(
didZeroX(did),
rawData.flags,
this.getHex(rawData.data),
consumerAccount
)
return this.updateRaw(didZeroX(did), rawData.flags, rawData.data, consumerAccount)
}
/**
@ -116,8 +107,19 @@ export class OnChainMetadata {
if (encrypt === false) {
data = await this.compressDDO(data)
flags = flags | 1
data = this.getHex(data)
} else {
data = await this.metadataCache.encryptDDO(data)
const blob = await this.metadataCache.encryptDDO(data)
try {
const rawBuffer = (await new Response(blob).arrayBuffer()) as any
data =
'0x' +
Array.prototype.map
.call(new Uint8Array(rawBuffer), (x) => ('00' + x.toString(16)).slice(-2))
.join('')
} catch (e) {
console.error(e)
}
if (!data) return null
flags = flags | 2
}