@nevermined-io/core-kit 0.0.14 → 0.0.16

package/dist/contracts/AssetRegistry.d.ts

@@ -25,8 +25,8 @@ export declare class AssetRegistry extends ContractBase {
         isTrialPlan?: boolean;
         txParams?: TxParameters;
     }): Promise<TransactionReceipt | UserOperationReceipt>;
-    registerAssetAndPlan({ did, url, priceConfig, creditsConfig, owner, addFees, txParams, }: {
-        did: string;
+    registerAssetAndPlan({ didSeed, url, priceConfig, creditsConfig, owner, addFees, txParams, }: {
+        didSeed: string;
         url: string;
         priceConfig: PriceConfig;
         creditsConfig: CreditsConfig;

package/dist/contracts/AssetRegistry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AssetRegistry.d.ts","sourceRoot":"","sources":["../../src/contracts/AssetRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAC/F,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAa,kBAAkB,EAAE,MAAM,MAAM,CAAA;AAC3E,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AAS7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEhD,qBAAa,aAAc,SAAQ,YAAY;WAChB,WAAW,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,aAAa,CAAC;IAS/E,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAIzD,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAMxC,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IAIvC,QAAQ,CAAC,EACpB,OAAO,EACP,GAAG,EACH,KAAK,EACL,KAAK,EACL,QAAQ,GACT,EAAE;QACD,OAAO,EAAE,MAAM,CAAA;QACf,GAAG,EAAE,MAAM,CAAA;QACX,KAAK,EAAE,MAAM,EAAE,CAAA;QACf,KAAK,EAAE,OAAO,GAAG,YAAY,CAAA;QAC7B,QAAQ,CAAC,EAAE,YAAY,CAAA;KACxB,GAAG,OAAO,CAAC,kBAAkB,GAAG,oBAAoB,CAAC;IAIzC,UAAU,CAAC,EACtB,WAAW,EACX,aAAa,EACb,KAAK,EACL,KAAU,EACV,OAAc,EACd,WAAmB,EACnB,QAAQ,GACT,EAAE;QACD,WAAW,EAAE,WAAW,CAAA;QACxB,aAAa,EAAE,aAAa,CAAA;QAC5B,KAAK,EAAE,OAAO,GAAG,YAAY,CAAA;QAC7B,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,WAAW,CAAC,EAAE,OAAO,CAAA;QACrB,QAAQ,CAAC,EAAE,YAAY,CAAA;KACxB,GAAG,OAAO,CAAC,kBAAkB,GAAG,oBAAoB,CAAC;IAqBzC,oBAAoB,CAAC,EAChC,GAAG,EACH,GAAG,EACH,WAAW,EACX,aAAa,EACb,KAAK,EACL,OAAc,EACd,QAAQ,GACT,EAAE;QACD,GAAG,EAAE,MAAM,CAAA;QACX,GAAG,EAAE,MAAM,CAAA;QACX,WAAW,EAAE,WAAW,CAAA;QACxB,aAAa,EAAE,aAAa,CAAA;QAC5B,KAAK,EAAE,OAAO,GAAG,YAAY,CAAA;QAC7B,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,QAAQ,CAAC,EAAE,YAAY,CAAA;KACxB,GAAG,OAAO,CAAC,kBAAkB,GAAG,oBAAoB,CAAC;IAWzC,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMtC,iBAAiB,CAAC,EAC7B,MAAM,EACN,IAAI,GACL,EAAE;QACD,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,IAAI,CAAC,EAAE,IAAI,CAAA;KACZ,GAAG,OAAO,CAAC,MAAM,CAAC;IAYN,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIxC,cAAc,CACzB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,OAAO,GAAG,YAAY,EAC7B,QAAQ,CAAC,EAAE,YAAY,GACtB,OAAO,CAAC,kBAAkB,GAAG,oBAAoB,CAAC;IAIxC,mBAAmB,CAC9B,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,OAAO,GAAG,YAAY,EAC7B,QAAQ,CAAC,EAAE,YAAY,GACtB,OAAO,CAAC,kBAAkB,GAAG,oBAAoB,CAAC;IAIxC,mBAAmB,CAC9B,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,aAAa,EAC5B,OAAO,UAAO;;;;;;;;;;;;;;;;;;;;IAwBH,UAAU,CACrB,YAAY,EAAE,WAAW,EACzB,cAAc,EAAE,aAAa,EAC7B,KAAK,EAAE,OAAO,EACd,OAAO,UAAO,EACd,KAAK,SAAK,GACT,OAAO,CAAC,MAAM,CAAC;IAUL,yBAAyB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAOrE,6BAA6B,CACxC,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;CAOjC"}
+{"version":3,"file":"AssetRegistry.d.ts","sourceRoot":"","sources":["../../src/contracts/AssetRegistry.ts"],"names":[],"mappings":"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"}

package/dist/contracts/AssetRegistry.js

@@ -36,9 +36,9 @@ export class AssetRegistry extends ContractBase {
             return this.send('createPlan', owner, [_config.priceConfig, _config.creditsConfig, nonce], txParams);
         }
     }
-    async registerAssetAndPlan({ did, url, priceConfig, creditsConfig, owner, addFees = true, txParams, }) {
+    async registerAssetAndPlan({ didSeed, url, priceConfig, creditsConfig, owner, addFees = true, txParams, }) {
         const _config = await this.planConfigPreFilter(priceConfig, creditsConfig, addFees);
-        return this.send('registerAssetAndPlan', owner, [didZeroX(did), url, _config.priceConfig, _config.creditsConfig], txParams);
+        return this.send('registerAssetAndPlan', owner, [didZeroX(didSeed), url, _config.priceConfig, _config.creditsConfig], txParams);
     }
     async getPlan(planId) {
         const plan = this.contract.read.getPlan([planId]);

package/dist/nevermined/api/PaymentsApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PaymentsApi.d.ts","sourceRoot":"","sources":["../../../src/nevermined/api/PaymentsApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAoC,MAAM,MAAM,CAAA;AACzE,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,IAAI,EAA8B,MAAM,uBAAuB,CAAA;AAQrF,qBAAa,WAAY,SAAQ,YAAY;IAC3C;;;;OAIG;gBACS,MAAM,EAAE,kBAAkB;IAKzB,eAAe,CAAC,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAgB7E,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;QAChD,aAAa,EAAE,MAAM,CAAA;QACrB,WAAW,EAAE,MAAM,CAAA;QACnB,cAAc,EAAE,MAAM,CAAA;QACtB,WAAW,EAAE,MAAM,CAAA;KACpB,CAAC;IAkCW,gBAAgB,CAC3B,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,GAAG,YAAY,GAC3B,OAAO,CAAC,WAAW,CAAC;IA0BV,kBAAkB,CAC7B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,OAAO,GAAG,YAAY,GAC3B,OAAO,CAAC,WAAW,CAAC;CAmFxB"}
+{"version":3,"file":"PaymentsApi.d.ts","sourceRoot":"","sources":["../../../src/nevermined/api/PaymentsApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAoC,MAAM,MAAM,CAAA;AACzE,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,IAAI,EAA8B,MAAM,uBAAuB,CAAA;AAQrF,qBAAa,WAAY,SAAQ,YAAY;IAC3C;;;;OAIG;gBACS,MAAM,EAAE,kBAAkB;IAKzB,eAAe,CAAC,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAgB7E,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;QAChD,aAAa,EAAE,MAAM,CAAA;QACrB,WAAW,EAAE,MAAM,CAAA;QACnB,cAAc,EAAE,MAAM,CAAA;QACtB,WAAW,EAAE,MAAM,CAAA;KACpB,CAAC;IAkCW,gBAAgB,CAC3B,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,GAAG,YAAY,GAC3B,OAAO,CAAC,WAAW,CAAC;IA0BV,kBAAkB,CAC7B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,OAAO,GAAG,YAAY,GAC3B,OAAO,CAAC,WAAW,CAAC;CAsFxB"}

package/dist/nevermined/api/PaymentsApi.js

@@ -101,6 +101,10 @@ export class PaymentsApi extends Instantiable {
                 else {
                     txHash = await this.nevermined.contracts.fixedPaymentTemplate.createAgreement(planId, from);
                 }
+                if (!txHash) {
+                    this.logger.error('Error in PaymentsApi order method: txHash not defined');
+                    throw new Error('txHash not defined');
+                }
                 const txReceipt = await this.nevermined.contracts.assetRegistry.getTransactionReceipt(txHash);
                 return {
                     txHash: txReceipt.transactionHash,

package/dist/utils/helpers.d.ts

@@ -1,5 +1,11 @@
 import { SearchQuery } from '@nvm-monorepo/commons';
 import { URL } from 'whatwg-url';
+interface ECIES {
+    iv: Buffer;
+    ephemPublicKey: Buffer;
+    ciphertext: Buffer;
+    mac: Buffer;
+}
 export declare const buildQuery: (url: string, query?: SearchQuery) => URL;
 export declare const getCircularReplacer: () => (_key: string, value: unknown) => unknown;
 export declare const jsonReplacer: (_key: string, value: unknown) => unknown;
@@ -10,12 +16,8 @@ export declare function _sleep(ms: number): Promise<unknown>;
 export declare function urlSafeBase64Encode(input: Uint8Array): string;
 export declare function urlSafeBase64Decode(input: string): Uint8Array;
 export declare function encryptMessage(message: string, receiverPublicKey: string): Promise<string>;
+export declare function serializeECIES(ecies: ECIES): string;
+export declare function deserializeECIES(serialized: string): ECIES;
 export declare function decryptMessage(encryptedMessage: string, privateKey: string | any): Promise<string>;
-export declare function serializeECIES(ecies: any): string;
-export declare function deserializeECIES(serialized: any): {
-    iv: Buffer<ArrayBuffer>;
-    ephemPublicKey: Buffer<ArrayBuffer>;
-    ciphertext: Buffer<ArrayBuffer>;
-    mac: Buffer<ArrayBuffer>;
-};
+export {};
 //# sourceMappingURL=helpers.d.ts.map

package/dist/utils/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/utils/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAInD,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAGhC,eAAO,MAAM,UAAU,GAAI,KAAK,MAAM,EAAE,QAAQ,WAAW,QAY1D,CAAA;AAED,eAAO,MAAM,mBAAmB,SAEtB,MAAM,MAAM,EAAE,OAAO,OAAO,YASrC,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,EAAE,OAAO,OAAO,YAGxD,CAAA;AAED,wBAAgB,eAAe,CAAC,IAAI,SAAM,GAAG,MAAM,CAWlD;AAED,wBAAgB,UAAU,CAAC,MAAM,SAAK,UAMrC;AAED,wBAAgB,eAAe,IAAI,KAAK,MAAM,EAAE,CAE/C;AAED,wBAAgB,MAAM,CAAC,EAAE,EAAE,MAAM,oBAEhC;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAO7D;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAY7D;AAED,wBAAsB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,mBAK9E;AAED,wBAAsB,cAAc,CAAC,gBAAgB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,GAAG,mBAOtF;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,GAAG,UASxC;AAED,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,GAAG;;;;;EAS/C"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/utils/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAInD,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAIhC,UAAU,KAAK;IACb,EAAE,EAAE,MAAM,CAAA;IACV,cAAc,EAAE,MAAM,CAAA;IACtB,UAAU,EAAE,MAAM,CAAA;IAClB,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,eAAO,MAAM,UAAU,GAAI,KAAK,MAAM,EAAE,QAAQ,WAAW,QAY1D,CAAA;AAED,eAAO,MAAM,mBAAmB,SAEtB,MAAM,MAAM,EAAE,OAAO,OAAO,YASrC,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,EAAE,OAAO,OAAO,YAGxD,CAAA;AAED,wBAAgB,eAAe,CAAC,IAAI,SAAM,GAAG,MAAM,CAWlD;AAED,wBAAgB,UAAU,CAAC,MAAM,SAAK,UAMrC;AAED,wBAAgB,eAAe,IAAI,KAAK,MAAM,EAAE,CAE/C;AAED,wBAAgB,MAAM,CAAC,EAAE,EAAE,MAAM,oBAEhC;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAO7D;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAY7D;AAED,wBAAsB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,mBAmB9E;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,KAAK,UAoB1C;AAED,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,KAAK,CAyB1D;AAED,wBAAsB,cAAc,CAAC,gBAAgB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,GAAG,mBAqBtF"}

package/dist/utils/helpers.js

@@ -1,4 +1,4 @@
-import { decrypt, encrypt } from 'eccrypto';
+import { decrypt, encrypt } from 'eciesjs';
 import { v4 } from 'uuid';
 import { keccak256, toBytes } from 'viem';
 import { URL } from 'whatwg-url';
@@ -76,18 +76,34 @@ export function urlSafeBase64Decode(input) {
 export async function encryptMessage(message, receiverPublicKey) {
     const publicKeyBuffer = Buffer.from(noZeroX(receiverPublicKey), 'hex');
     const messageBuffer = Buffer.from(message);
-    const ecies = await encrypt(publicKeyBuffer, messageBuffer);
-    return serializeECIES(ecies);
-}
-export async function decryptMessage(encryptedMessage, privateKey) {
-    const ecies = deserializeECIES(encryptedMessage);
-    const pk = typeof privateKey === 'string' ? noZeroX(privateKey) : privateKey;
-    const decrypted = await decrypt(Buffer.from(pk, 'hex'), ecies);
-    // Revisit this code in case there is a problem decrypting the message
-    const decryptedStr = typeof decrypted === 'string' ? decrypted : decrypted.toString('hex');
-    return Buffer.from(decryptedStr, 'hex').toString();
+    try {
+        const ecies = await encrypt(publicKeyBuffer, messageBuffer);
+        // Handle both cases: when encrypt returns a Buffer or an ECIES object
+        if (Buffer.isBuffer(ecies)) {
+            // If it returns a Buffer, we need to handle it differently
+            // This might be the case with some versions of eciesjs
+            return ecies.toString('base64');
+        }
+        else {
+            // If it returns an ECIES object, serialize it
+            return serializeECIES(ecies);
+        }
+    }
+    catch (error) {
+        throw new Error(`Encryption failed: ${error}`);
+    }
 }
 export function serializeECIES(ecies) {
+    // Validate that all required properties exist
+    if (!ecies || typeof ecies !== 'object') {
+        throw new Error('Invalid ECIES object: must be a valid object');
+    }
+    const requiredProps = ['iv', 'ephemPublicKey', 'ciphertext', 'mac'];
+    for (const prop of requiredProps) {
+        if (!ecies[prop]) {
+            throw new Error(`Invalid ECIES object: missing required property '${prop}'`);
+        }
+    }
     const serialized = JSON.stringify({
         iv: Buffer.from(ecies.iv).toString('base64'),
         ephemPublicKey: Buffer.from(ecies.ephemPublicKey).toString('base64'),
@@ -95,11 +111,24 @@ export function serializeECIES(ecies) {
         mac: Buffer.from(ecies.mac).toString('base64'),
     });
     return serialized;
-    //return Buffer.from(serialized).toString('binary')
 }
 export function deserializeECIES(serialized) {
-    // const decoded = Buffer.from(serialized, 'binary').toString()
-    const _obj = JSON.parse(serialized);
+    if (!serialized || typeof serialized !== 'string') {
+        throw new Error('Invalid serialized ECIES: must be a valid string');
+    }
+    let _obj;
+    try {
+        _obj = JSON.parse(serialized);
+    }
+    catch (error) {
+        throw new Error('Invalid serialized ECIES: not a valid JSON string');
+    }
+    const requiredProps = ['iv', 'ephemPublicKey', 'ciphertext', 'mac'];
+    for (const prop of requiredProps) {
+        if (!_obj[prop]) {
+            throw new Error(`Invalid serialized ECIES: missing required property '${prop}'`);
+        }
+    }
     return {
         iv: Buffer.from(_obj.iv, 'base64'),
         ephemPublicKey: Buffer.from(_obj.ephemPublicKey, 'base64'),
@@ -107,3 +136,26 @@ export function deserializeECIES(serialized) {
         mac: Buffer.from(_obj.mac, 'base64'),
     };
 }
+export async function decryptMessage(encryptedMessage, privateKey) {
+    const pk = typeof privateKey === 'string' ? noZeroX(privateKey) : privateKey;
+    const privateKeyBuffer = Buffer.from(pk, 'hex');
+    // Try to parse as JSON first (ECIES object)
+    try {
+        const ecies = deserializeECIES(encryptedMessage);
+        // For eciesjs, we need to serialize the ECIES object back to a buffer
+        const eciesBuffer = Buffer.concat([ecies.iv, ecies.ephemPublicKey, ecies.ciphertext, ecies.mac]);
+        const decrypted = await decrypt(privateKeyBuffer, eciesBuffer);
+        return decrypted.toString();
+    }
+    catch (error) {
+        // If JSON parsing fails, try as base64 Buffer
+        try {
+            const encryptedBuffer = Buffer.from(encryptedMessage, 'base64');
+            const decrypted = await decrypt(privateKeyBuffer, encryptedBuffer);
+            return decrypted.toString();
+        }
+        catch (secondError) {
+            throw new Error(`Failed to decrypt message: ${secondError}`);
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nevermined-io/core-kit",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -26,6 +26,22 @@
   ],
   "nx": {
     "targets": {
+      "e2e": {
+        "executor": "nx:run-commands",
+        "options": {
+          "command": "NODE_OPTIONS='--loader ts-node/esm' mocha --config ./tests/integration/.mocharc.json",
+          "cwd": "packages/core-kit"
+        },
+        "dependsOn": [
+          "^build",
+          {
+            "target": "build",
+            "projects": [
+              "@nvm-monorepo/commons"
+            ]
+          }
+        ]
+      },
       "e2e:external": {
         "executor": "nx:run-commands",
         "options": {