Skip to content

Commit aa5102e

Browse files
authored
Merge pull request #193 from docknetwork/chore/improve-logging-for-didcomm-handlers
chore/improve logging for didcomm handlers
2 parents a11042f + 3ee1b4c commit aa5102e

File tree

3 files changed

+33
-3
lines changed

3 files changed

+33
-3
lines changed

packages/cli/src/commands/dids.ts

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import inquirer from 'inquirer';
33
import axios from 'axios';
44
import {IWallet} from '@docknetwork/wallet-sdk-core/lib/types';
55
import {createDIDProvider} from '@docknetwork/wallet-sdk-core/src/did-provider';
6+
import {relayService} from '@docknetwork/wallet-sdk-wasm/lib/services/relay-service';
67
import {getWallet} from '../helpers';
78

89
const didsCommand = new Command('dids').description('list, create');
@@ -40,4 +41,25 @@ didsCommand
4041
console.log(did);
4142
});
4243

44+
/**
45+
* Resolve a DIDComm message
46+
* Ex.: didcomm://https://relay.dock.io/read/659ed4b1655cf81a6a35e140'
47+
*/
48+
didsCommand
49+
.command('resolve-message')
50+
.option('-m, --message <message>', 'Message to be resolved')
51+
.description('Resolve didcomm message')
52+
.action(async ({ message }) => {
53+
const wallet: IWallet = await getWallet();
54+
const didProvider = createDIDProvider({wallet});
55+
const keyPairDocs = await didProvider.getDIDKeyPairs();
56+
57+
const messsage = await relayService.resolveDidcommMessage({
58+
message,
59+
keyPairDocs,
60+
});
61+
62+
console.log(messsage);
63+
});
64+
4365
export {didsCommand};

packages/relay-service/src/index.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,12 @@ export async function resolveDidcommMessage({keyPairDocs, message}) {
232232
didCommRecipients.find(did => did.indexOf(doc.controller) > -1),
233233
);
234234

235-
assert(!!keyPairDoc, `keyPairDoc not found for did ${message.to}`);
235+
assert(
236+
!!keyPairDoc,
237+
`keyPairDoc not found for recipients ${JSON.stringify(
238+
didCommRecipients,
239+
)}`,
240+
);
236241
const keyAgreementKey = await getDerivedAgreementKey(keyPairDoc);
237242
result = await didcommDecrypt(jwe, keyAgreementKey);
238243
}

packages/transactions/lib/transactions.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export const TransactionEvents = {
9393
async function getAllTransactions() {
9494
try {
9595
const data = await getLocalStorage().getItem('transactions');
96-
return JSON.parse(data);
96+
return JSON.parse(data) || [];
9797
} catch (err) {
9898
return [];
9999
}
@@ -207,8 +207,11 @@ export class Transactions {
207207
return;
208208
}
209209

210+
let dbTransactions = await getAllTransactions();
210211

211-
const dbTransactions = await getAllTransactions();
212+
if (!dbTransactions) {
213+
dbTransactions = [];
214+
}
212215

213216
const handleTransaction = tx => {
214217
if (tx.from !== address && tx.to !== address) {

0 commit comments

Comments
 (0)