Merge pull request #10 from InfraBlockchain/develop

sweatpotato13 · web-flow · commit d77cae1626d9 · 2024-06-10T08:23:49.000+09:00
Merge to main
diff --git a/examples/websocket/common.ts b/examples/websocket/common.ts
@@ -1,6 +1,12 @@
 // common.ts
-import { VerifiableCredential } from "infra-did-js";
-import { CompressionLevel, DIDConnectRequestMessage } from "../../src/messages";
+import { VerifiableCredential, VerifiablePresentation } from "infra-did-js";
+import {
+    CompressionLevel,
+    DIDConnectRequestMessage,
+    VPReqRejectMessage,
+    VPSubmitLaterResMessage,
+    VPSubmitResMessage,
+} from "../../src/messages";
 import { InfraDIDCommAgent, VCRequirement } from "../../src/websocket";
 
 export const verifierDID =
@@ -31,6 +37,25 @@ export function didAuthFailedCallback(peerDID: string): void {
     console.log("DID Auth Failed Callback", peerDID);
 }
 
+export function VPVerifyCallback(vp: VerifiablePresentation): boolean {
+    console.log("VP Verify Callback", vp);
+    return true;
+}
+
+export function VPSubmitResCallback(message: VPSubmitResMessage): void {
+    console.log("VPSubmitResMessage", message);
+}
+
+export function VPReqRejectCallback(message: VPReqRejectMessage): void {
+    console.log("VPReqRejectMessage", message);
+}
+
+export function VPSubmitLaterResCallback(
+    message: VPSubmitLaterResMessage,
+): void {
+    console.log("VPSubmitLaterResMessage", message);
+}
+
 // Agent Initialization
 export async function initializeAgent(
     role: string,
@@ -48,6 +73,10 @@ export async function initializeAgent(
     agent.setDIDAuthCallback(didAuthCallback);
     agent.setDIDConnectedCallback(didConnectedCallback);
     agent.setDIDAuthFailedCallback(didAuthFailedCallback);
+    agent.setVPVerifyCallback(VPVerifyCallback);
+    agent.setVPSubmitResCallback(VPSubmitResCallback);
+    agent.setVPReqRejectCallback(VPReqRejectCallback);
+    agent.setVPSubmitLaterResCallback(VPSubmitLaterResCallback);
 
     await agent.init();
 
diff --git a/examples/websocket/socket_io_holder.ts b/examples/websocket/socket_io_holder.ts
@@ -10,6 +10,10 @@ import {
 } from "../../src/websocket";
 import {
     DID_CHAIN_ENDPOINT,
+    VPReqRejectCallback,
+    VPSubmitLaterResCallback,
+    VPSubmitResCallback,
+    VPVerifyCallback,
     createAndEncodeRequestMessage,
     didAuthCallback,
     didAuthFailedCallback,
@@ -20,11 +24,11 @@ import {
     vcRequirements,
 } from "./common";
 
-const verifierSocketId = "TcxmeCPmLlJ9GL_bAC-t";
+const verifierSocketId = "XNuk30LyTjZkisKuADKJ";
 let isPermitted = true;
 let mockVCRepository: VerifiableCredential[];
 
-export function VPSubmitDataCallback(
+export function VPReqCallback(
     vcRequirements: VCRequirement[],
     challenge: string,
 ): VPReqCallbackResponse {
@@ -123,7 +127,11 @@ async function receiveConnectionInitiatedByVerifier(): Promise<void> {
     agent.setDIDAuthCallback(didAuthCallback);
     agent.setDIDConnectedCallback(didConnectedCallback);
     agent.setDIDAuthFailedCallback(didAuthFailedCallback);
-    agent.setVPSubmitDataCallback(VPSubmitDataCallback);
+    agent.setVPReqCallback(VPReqCallback);
+    agent.setVPVerifyCallback(VPVerifyCallback);
+    agent.setVPSubmitResCallback(VPSubmitResCallback);
+    agent.setVPReqRejectCallback(VPReqRejectCallback);
+    agent.setVPSubmitLaterResCallback(VPSubmitLaterResCallback);
 
     await agent.init();
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "infra-did-comm-js",
-    "version": "0.7.1",
+    "version": "0.7.2",
     "description": "Communication Protocol using Infra DID",
     "source": "src/index.ts",
     "main": "dist/src/index.cjs",
diff --git a/src/messages/vp/vp-req-reject.ts b/src/messages/vp/vp-req-reject.ts
@@ -40,4 +40,22 @@ export class VPReqRejectMessage {
             this.ack = ack;
         }
     }
+
+    /**
+     * Creates an instance from a JSON object.
+     * @param {any} json - The JSON object to convert from.
+     * @returns {VPReqRejectMessage} The new instance created from the JSON object.
+     * @throws {Error} Throws an error if the JSON object is missing required keys.
+     */
+    static fromJSON(json: Record<string, any>): VPReqRejectMessage {
+        return new VPReqRejectMessage(
+            json.id,
+            json.from,
+            json.to,
+            json.createdTime,
+            json.expiresTime,
+            json.body.reason,
+            json.ack,
+        );
+    }
 }
diff --git a/src/messages/vp/vp-submit-later-res.ts b/src/messages/vp/vp-submit-later-res.ts
@@ -40,4 +40,21 @@ export class VPSubmitLaterResMessage {
             this.ack = ack;
         }
     }
+
+    /**
+     * Creates an instance from a JSON object.
+     * @param {any} json - The JSON object to convert from.
+     * @returns {VPSubmitLaterResMessage} The new instance created from the JSON object.
+     * @throws {Error} Throws an error if the JSON object is missing required keys.
+     */
+    static fromJSON(json: Record<string, any>): VPSubmitLaterResMessage {
+        return new VPSubmitLaterResMessage(
+            json.id,
+            json.from,
+            json.createdTime,
+            json.expiresTime,
+            json.body.callbackUrl,
+            json.ack,
+        );
+    }
 }
diff --git a/src/messages/vp/vp-submit-res.ts b/src/messages/vp/vp-submit-res.ts
@@ -41,4 +41,22 @@ export class VPSubmitResMessage {
             this.ack = ack;
         }
     }
+
+    /**
+     * Creates an instance from a JSON object.
+     * @param {any} json - The JSON object to convert from.
+     * @returns {VPSubmitResMessage} The new instance created from the JSON object.
+     * @throws {Error} Throws an error if the JSON object is missing required keys.
+     */
+    static fromJSON(json: Record<string, any>): VPSubmitResMessage {
+        return new VPSubmitResMessage(
+            json.id,
+            json.from,
+            json.to,
+            json.createdTime,
+            json.expiresTime,
+            json.body.status,
+            json.ack,
+        );
+    }
 }
diff --git a/src/websocket/agent.ts b/src/websocket/agent.ts
@@ -1,12 +1,15 @@
 import { cryptoWaitReady } from "@polkadot/util-crypto";
-import { CRYPTO_INFO, InfraSS58 } from "infra-did-js";
+import { CRYPTO_INFO, InfraSS58, VerifiablePresentation } from "infra-did-js";
 import { io,Socket } from "socket.io-client";
 import { v4 as uuidv4 } from "uuid";
 
 import {
     DIDAuthInitMessage,
     DIDConnectRequestMessage,
     VPReqMessage,
+    VPReqRejectMessage,
+    VPSubmitLaterResMessage,
+    VPSubmitResMessage,
 } from "../../src/messages";
 import { Context } from "../../src/messages/commons";
 import { connectRequestDynamic, connectRequestStatic } from "./connect-request";
@@ -38,10 +41,15 @@ export class InfraDIDCommAgent {
     didConnectedCallback: (peerDID: string) => void = peerDID => {};
     didAuthFailedCallback: (peerDID: string) => void = peerDID => {};
     didVerifyCallback: (peerDID: string) => boolean = peerDID => true;
-    VPSubmitDataCallback: (
+    VPReqCallback: (
         vcRequirements: VCRequirement[],
         challenge: string,
     ) => VPReqCallbackResponse;
+    VPVerifyCallback: (VP: VerifiablePresentation) => boolean;
+    VPSubmitResCallback: (message: VPSubmitResMessage) => void;
+    VPReqRejectCallback: (message: VPReqRejectMessage) => void;
+    VPSubmitLaterResCallback: (message: VPSubmitLaterResMessage) => void;
+
     /* eslint-enable @typescript-eslint/no-unused-vars */
 
     private _socketIdPromiseResolver: (value: string) => void;
@@ -106,13 +114,37 @@ export class InfraDIDCommAgent {
         this.didVerifyCallback = callback;
     }
 
-    setVPSubmitDataCallback(
+    setVPReqCallback(
         callback: (
             vcRequirements: VCRequirement[],
             challenge: string,
         ) => VPReqCallbackResponse,
     ): void {
-        this.VPSubmitDataCallback = callback;
+        this.VPReqCallback = callback;
+    }
+
+    setVPVerifyCallback(
+        callback: (VP: VerifiablePresentation) => boolean,
+    ): void {
+        this.VPVerifyCallback = callback;
+    }
+
+    setVPSubmitResCallback(
+        callback: (message: VPSubmitResMessage) => void,
+    ): void {
+        this.VPSubmitResCallback = callback;
+    }
+
+    setVPReqRejectCallback(
+        callback: (message: VPReqRejectMessage) => void,
+    ): void {
+        this.VPReqRejectCallback = callback;
+    }
+
+    setVPSubmitLaterResCallback(
+        callback: (message: VPSubmitLaterResMessage) => void,
+    ): void {
+        this.VPSubmitLaterResCallback = callback;
     }
 
     async init(): Promise<void> {
@@ -197,7 +229,11 @@ export class InfraDIDCommAgent {
                 this.didConnectedCallback,
                 this.didAuthFailedCallback,
                 this.didVerifyCallback,
-                this.VPSubmitDataCallback,
+                this.VPReqCallback,
+                this.VPVerifyCallback,
+                this.VPSubmitResCallback,
+                this.VPReqRejectCallback,
+                this.VPSubmitLaterResCallback,
             );
         });
     }
diff --git a/src/websocket/message-handler.ts b/src/websocket/message-handler.ts
@@ -50,15 +50,18 @@ export async function messageHandler(
     mnemonic: string,
     did: string,
     agent: InfraDIDCommAgent,
-    didAuthCallback?: (peerDID: string) => boolean,
-    didConnectedCallback?: (peerDID: string) => void,
-    didAuthFailedCallback?: (peerDID: string) => void,
-    didVerifyCallback?: (peerDID: string) => boolean,
-    VPSubmitDataCallback?: (
+    didAuthCallback: (peerDID: string) => boolean,
+    didConnectedCallback: (peerDID: string) => void,
+    didAuthFailedCallback: (peerDID: string) => void,
+    didVerifyCallback: (peerDID: string) => boolean,
+    VPReqCallback: (
         vcRequirements: VCRequirement[],
         challenge: string,
     ) => VPReqCallbackResponse,
-    VPVerifyCallback?: (issuer: string[]) => boolean,
+    VPVerifyCallback: (vp: VerifiablePresentation) => boolean,
+    VPSubmitResCallback: (message: VPSubmitResMessage) => void,
+    VPReqRejectCallback: (message: VPReqRejectMessage) => void,
+    VPSubmitLaterResCallback: (message: VPSubmitLaterResMessage) => void,
 ) {
     try {
         const header = extractJWEHeader(jwe);
@@ -145,7 +148,7 @@ export async function messageHandler(
                 console.log("DIDAuthFailed Message Received");
                 agent.disconnect();
             } else if (jwsPayload["type"] === "VPReq") {
-                await handleVPReq(jwsPayload, agent, VPSubmitDataCallback);
+                await handleVPReq(jwsPayload, agent, VPReqCallback);
             } else if (jwsPayload["type"] === "VPSubmit") {
                 console.log("VPSubmit Message Received", jwsPayload);
                 await sendVPSubmitRes(
@@ -156,16 +159,21 @@ export async function messageHandler(
                 );
             } else if (jwsPayload["type"] === "VPSubmitRes") {
                 console.log("VPSubmitRes Message Received", jwsPayload);
+                VPSubmitResCallback(VPSubmitResMessage.fromJSON(jwsPayload));
             } else if (jwsPayload["type"] === "VPReqReject") {
                 console.log("VPReqReject Message Received", jwsPayload);
                 await sendVPReqRejectRes(mnemonic, agent);
+                VPReqRejectCallback(VPReqRejectMessage.fromJSON(jwsPayload));
             } else if (jwsPayload["type"] === "VPReqRejectRes") {
                 console.log("VPReqRejectRes Message Received", jwsPayload);
             } else if (jwsPayload["type"] === "VPSubmitLater") {
                 console.log("VPSubmitLater Message Received", jwsPayload);
                 await sendVPSubmitLaterRes(agent);
             } else if (jwsPayload["type"] === "VPSubmitLaterRes") {
-                console.log("VPSubmitLaterRes Message Received", jwsPayload);
+                console.log("≈ Message Received", jwsPayload);
+                VPSubmitLaterResCallback(
+                    VPSubmitLaterResMessage.fromJSON(jwsPayload),
+                );
                 agent.disconnect();
             }
         }
@@ -399,18 +407,15 @@ export async function sendVPSubmit(
 async function handleVPReq(
     jwsPayload: Record<string, any>,
     agent: InfraDIDCommAgent,
-    VPSubmitDataCallback: (
+    VPReqCallback: (
         vcRequirements: VCRequirement[],
         challenge: string,
     ) => VPReqCallbackResponse,
 ) {
     console.log("VPReq Message Received");
     const vcRequirements: VCRequirement[] = jwsPayload.body.vcRequirements;
     const challenge = jwsPayload.body.challenge;
-    const vpReqCallbackResponse = VPSubmitDataCallback(
-        vcRequirements,
-        challenge,
-    );
+    const vpReqCallbackResponse = VPReqCallback(vcRequirements, challenge);
 
     const vcHoldingResult = vpReqCallbackResponse.status;
 
@@ -503,7 +508,7 @@ export async function sendVPSubmitRes(
     mnemonic: string,
     jwsPayload: Record<string, any>,
     agent: InfraDIDCommAgent,
-    VPVerifyCallback: (issuer: string[]) => boolean,
+    VPVerifyCallback: (vp: VerifiablePresentation) => boolean,
 ): Promise<void> {
     try {
         const VP = VerifiablePresentation.fromJSON(
@@ -543,7 +548,7 @@ export async function sendVPSubmitRes(
             "Completed to verify the VP",
         );
 
-        VPVerifyCallback([agent.did]);
+        VPVerifyCallback(VP);
 
         const jwe = await createJWE(vpSubmitResMessage, mnemonic, receiverDID);
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "infra-did-comm-js",`
`3`		`- "version": "0.7.1",`
	`3`	`+ "version": "0.7.2",`
`4`	`4`	`"description": "Communication Protocol using Infra DID",`
`5`	`5`	`"source": "src/index.ts",`
`6`	`6`	`"main": "dist/src/index.cjs",`