@@ -32,7 +32,7 @@ There are three methods to create DID-Connect-Request Message
3232``` javascript
3333const socketId: string = socketId;
3434
35- // 1) didConnectRequestMessage from General json
35+ // 1) didConnectRequestMessage from json
3636const json = {
3737 from: did,
3838 body: {
@@ -49,7 +49,7 @@ const json = {
4949const didConnectRequestMessage =
5050 DIDConnectRequestMessage .fromJSON (json);
5151
52- // 2) didConnectRequestMessage from Compact
52+ // 2) didConnectRequestMessage from compactJSON
5353const compactJson = {
5454 from: did,
5555 body: {
@@ -66,7 +66,7 @@ const compactJson = {
6666const didConnectRequestMessageFromCompact =
6767 DIDConnectRequestMessage .fromJSON (compactJson);
6868
69- // 3) didConnectRequestMessage from minimalCompactJson
69+ // 3) didConnectRequestMessage from minimalCompactJSON
7070const minimalCompactJson = {
7171 from: did,
7272 body: {
@@ -158,16 +158,16 @@ const didAuthFailedMessage = new DIDAuthFailedMessage(
158158### Sign / Verify JWS
159159
160160``` javascript
161- const jws = await compactJWS (
162- payload,
163- CryptoHelper .jwk2KeyObject (JWK , " private" ),
164- {
165- typ: " JWM" ,
166- alg: " EdDSA" ,
167- },
168- );
161+ const privateKey = privateKeyFromMnemonic (mnemonic);
162+ const publicKey = publicKeyFromMnemonic (mnemonic);
163+ const JWK = key2JWK (" Ed25519" , publicKey, privateKey);
169164
170- var payload = verifyJWS (token, publicKey);
165+ const jws = await compactJWS (payload, JWK , {
166+ typ: " JWM" ,
167+ alg: " EdDSA" ,
168+ });
169+
170+ var payload = verifyJWS (jws, publicKey);
171171```
172172
173173### Encrypt / Decrypt JWE
@@ -185,14 +185,15 @@ const sharedKey = deriveSharedKey(
185185
186186const jwe = await compactJWE (
187187 payload,
188- await exportJWK (sharedKey),
188+ await jose . exportJWK (sharedKey),
189189 x25519JwkFromX25519PublicKey (ephemeralPublicKey),
190190);
191191```
192192
193193- Without epk
194194
195195``` javascript
196+ const x25519JwkPublicKey = x25519JwkFromEd25519PublicKey (publicKey);
196197const senderPrivateKeyX25519JWK = x25519JwkFromMnemonic (mnemonic);
197198const sharedKey = deriveSharedKey (
198199 privateKeyfromX25519Jwk (senderPrivateKeyX25519JWK),
@@ -224,11 +225,11 @@ const { ephemeralPrivateKey1, ephemeralPublicKey1 } =
224225const { ephemeralPrivateKey2 , ephemeralPublicKey2 } =
225226 generateX25519EphemeralKeyPair ();
226227
227- const sharedKey2 = deriveSharedKey (ephemeralPrivateKey1, ephemeralPublicKey2);
228+ const sharedKey1 = deriveSharedKey (ephemeralPrivateKey1, ephemeralPublicKey2);
228229const sharedKey2 = deriveSharedKey (ephemeralPrivateKey2, ephemeralPublicKey1);
229230```
230231
231- ### Connect to Websocket Server
232+ ### Connect to Websocket Server with Receiving Connect Request Message
232233
233234Check [ example] ( ./examples/websocket ) for more detail.
234235
@@ -242,15 +243,15 @@ const agent = new InfraDIDCommAgent(
242243 mnemonic,
243244 " HOLDER" ,
244245);
246+ const encoded = " connectRequestMessageCreatedByPeer" ;
245247
246248agent .setDIDAuthCallback (didAuthCallback);
247249agent .setDIDConnectedCallback (didConnectedCallback);
248250agent .setDIDAuthFailedCallback (didAuthFailedCallback);
249-
250- agent .init ();
251+ agent .initReceivingConnectRequest (encoded);
251252```
252253
253- ### Make Dynamic QR Code
254+ ### Connect to Websocket Server with Creating Connect Request Message
254255
255256``` javascript
256257const mnemonic =
@@ -266,6 +267,5 @@ const agent = new InfraDIDCommAgent(
266267agent .setDIDAuthCallback (didAuthCallback);
267268agent .setDIDConnectedCallback (didConnectedCallback);
268269agent .setDIDAuthFailedCallback (didAuthFailedCallback);
269-
270- agent .initWithConnectRequest ();
270+ agent .initCreatingDynamicConnectRequest (context, 30 , setConnectRequestCallback);
271271```
0 commit comments