From e03e8a77dbb6f25ee4c06dc218490985b4faff23 Mon Sep 17 00:00:00 2001 From: Carlos Amaro Date: Thu, 4 Apr 2024 16:32:26 +0100 Subject: [PATCH] feat(satp-hermes): rollback to join work forces Signed-off-by: Carlos Amaro --- .../core/stage-handlers/client/stage_1.ts | 11 +++++---- .../core/stage-handlers/client/stage_2.ts | 11 +++++---- .../core/stage-handlers/client/stage_3.ts | 23 +++++++++++++------ .../core/stage-handlers/server/stage_1.ts | 8 ++++--- .../core/stage-handlers/server/stage_2.ts | 9 +++++--- .../core/stage-handlers/server/stage_3.ts | 16 +++++++++---- .../main/typescript/plugin-satp-gateway.ts | 4 ++-- 7 files changed, 54 insertions(+), 28 deletions(-) diff --git a/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/client/stage_1.ts b/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/client/stage_1.ts index 5a7e8ad8b39..60f16da10aa 100644 --- a/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/client/stage_1.ts +++ b/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/client/stage_1.ts @@ -31,7 +31,8 @@ export class Stage1ClientHandler { ): Promise { const fnTag = `${this.className}#transferProposalRequest()`; - const sessionData = gateway.sessions.get(sessionID); + //const sessionData = gateway.sessions.get(sessionID); + const sessionData = new SessionData(); //todo change if ( sessionData == undefined || @@ -153,7 +154,7 @@ export class Stage1ClientHandler { JSON.stringify(transferProposalRequestMessage), ).toString(); - gateway.sessions.set(sessionID, sessionData); + //gateway.sessions.set(sessionID, sessionData); await gateway.storeLog({ //todo sessionID: sessionID, @@ -178,7 +179,8 @@ export class Stage1ClientHandler { throw new Error('Response or response.common is undefined'); } - const sessionData = gateway.sessions.get(response.common.sessionId); + //const sessionData = gateway.sessions.get(response.common.sessionId); + const sessionData = new SessionData(); //todo change if (sessionData == undefined || sessionData.hashes == undefined || @@ -238,7 +240,8 @@ export class Stage1ClientHandler { const sessionId = response.common.sessionId; - const sessionData = gateway.sessions.get(sessionId); + //const sessionData = gateway.sessions.get(sessionId); + const sessionData = new SessionData(); //todo change if (sessionData == undefined) { throw new Error( diff --git a/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/client/stage_2.ts b/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/client/stage_2.ts index 69884fdf641..62580d823f5 100644 --- a/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/client/stage_2.ts +++ b/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/client/stage_2.ts @@ -5,7 +5,7 @@ import { SATP_VERSION } from "../../constants"; import { CommonSatp, MessageType } from "../../../generated/proto/cacti/satp/v02/common/common_messages_pb"; import { LockAssertionRequestMessage } from "../../../generated/proto/cacti/satp/v02/stage_2_pb"; import { SHA256 } from "crypto-js"; -import { Stage2Hashes, Stage2Signatures } from "../../../generated/proto/cacti/satp/v02/common/session_pb"; +import { SessionData, Stage2Hashes, Stage2Signatures } from "../../../generated/proto/cacti/satp/v02/common/session_pb"; export class Stage2ClientHandler { public static readonly CLASS_NAME = "Stage2Handler-Client"; @@ -35,7 +35,9 @@ export class Stage2ClientHandler { `${fnTag}, message common body is missing`, ); } - const sessionData = gateway.sessions.get(response.common.sessionId); + //const sessionData = gateway.sessions.get(response.common.sessionId); + const sessionData = new SessionData(); //todo change + if (sessionData == undefined) { throw new Error( `${fnTag}, session data not found for session id ${response.common.sessionId}`, @@ -126,8 +128,9 @@ export class Stage2ClientHandler { ); } - const sessionData = gateway.sessions.get(response.common.sessionId); - + //const sessionData = gateway.sessions.get(response.common.sessionId); + const sessionData = new SessionData(); //todo change + if (sessionData == undefined) { throw new Error( `${fnTag}, session data not found for session id ${response.common.sessionId}`, diff --git a/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/client/stage_3.ts b/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/client/stage_3.ts index 7bd3b5ac70d..03a6f318b10 100644 --- a/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/client/stage_3.ts +++ b/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/client/stage_3.ts @@ -5,7 +5,7 @@ import { CommonSatp, MessageType } from "../../../generated/proto/cacti/satp/v02 import { SATP_VERSION } from "../../constants"; import { CommitFinalAcknowledgementReceiptResponseMessage, CommitFinalAssertionRequestMessage, CommitPreparationRequestMessage, CommitReadyResponseMessage, TransferCompleteRequestMessage } from "../../../generated/proto/cacti/satp/v02/stage_3_pb"; import { SHA256 } from "crypto-js"; -import { Stage3Hashes, Stage3Signatures } from "../../../generated/proto/cacti/satp/v02/common/session_pb"; +import { SessionData, Stage3Hashes, Stage3Signatures } from "../../../generated/proto/cacti/satp/v02/common/session_pb"; export class Stage3ClientHandler { public static readonly CLASS_NAME = "Stage3Handler-Client"; @@ -49,7 +49,9 @@ export class Stage3ClientHandler { ); } - const sessionData = gateway.sessions.get(response.common.sessionId); + //const sessionData = gateway.sessions.get(response.common.sessionId); + const sessionData = new SessionData(); //todo change + if (sessionData == undefined) { throw new Error( `${fnTag}, session data not found for session id ${response.common.sessionId}`, @@ -126,7 +128,8 @@ export class Stage3ClientHandler { ); } - const sessionData = gateway.sessions.get(response.common.sessionId); + //const sessionData = gateway.sessions.get(response.common.sessionId); + const sessionData = new SessionData(); //todo change if (sessionData == undefined) { throw new Error( @@ -210,7 +213,8 @@ export class Stage3ClientHandler { ); } - const sessionData = gateway.sessions.get(response.common.sessionId); + //const sessionData = gateway.sessions.get(response.common.sessionId); + const sessionData = new SessionData(); //todo change if (sessionData == undefined) { throw new Error( @@ -283,7 +287,9 @@ export class Stage3ClientHandler { ); } - const sessionData = gateway.sessions.get(response.common.sessionId); + //const sessionData = gateway.sessions.get(response.common.sessionId); + const sessionData = new SessionData(); //todo change + if (sessionData == undefined) { throw new Error( `${fnTag}, session data not found for session id ${response.common.sessionId}`, @@ -349,7 +355,9 @@ export class Stage3ClientHandler { ); } - const sessionData = gateway.sessions.get(response.common.sessionId); + //const sessionData = gateway.sessions.get(response.common.sessionId); + const sessionData = new SessionData(); //todo change + if (sessionData == undefined) { throw new Error( `${fnTag}, session data not found for session id ${response.common.sessionId}`, @@ -418,7 +426,8 @@ export class Stage3ClientHandler { ); } - const sessionData = gateway.sessions.get(response.common.sessionId); + //const sessionData = gateway.sessions.get(response.common.sessionId); + const sessionData = new SessionData(); //todo change if (sessionData == undefined) { throw new Error( diff --git a/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/server/stage_1.ts b/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/server/stage_1.ts index 178c1527ded..7328ffd5417 100644 --- a/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/server/stage_1.ts +++ b/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/server/stage_1.ts @@ -98,7 +98,7 @@ export class Stage1Handler { sessionData.receivedTimestamps.stage1.transferCommenceRequestMessageTimestamp = recvTimestamp; - gateway.sessions.set(request.common.sessionId, sessionData); + //gateway.sessions.set(request.common.sessionId, sessionData); const commonBody = new CommonSatp(); commonBody.version = sessionData.version; @@ -148,7 +148,8 @@ export class Stage1Handler { ); } - const sessionData = gateway.sessions.get(request.common.sessionId); + //const sessionData = gateway.sessions.get(request.common.sessionId); + const sessionData = new SessionData(); //todo change if (sessionData == undefined || sessionData.hashes == undefined || sessionData.hashes.stage1 == undefined) { throw new Error( @@ -289,7 +290,8 @@ export class Stage1Handler { ); } - const sessionData = gateway.sessions.get(request.common.sessionId); + //const sessionData = gateway.sessions.get(request.common.sessionId); + const sessionData = new SessionData(); //todo change if (sessionData == undefined) { throw new Error( diff --git a/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/server/stage_2.ts b/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/server/stage_2.ts index b9bcc31c1e0..136dd356577 100644 --- a/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/server/stage_2.ts +++ b/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/server/stage_2.ts @@ -3,7 +3,7 @@ import { LockAssertionReceiptMessage, LockAssertionRequestMessage } from "../../ import { PluginSATPGateway } from "../../../plugin-satp-gateway"; import { SATP_VERSION } from "../../constants"; import { CommonSatp, MessageType } from "../../../generated/proto/cacti/satp/v02/common/common_messages_pb"; -import { Stage2Hashes, Stage2Signatures } from "../../../generated/proto/cacti/satp/v02/common/session_pb"; +import { SessionData, Stage2Hashes, Stage2Signatures } from "../../../generated/proto/cacti/satp/v02/common/session_pb"; import { SHA256 } from "crypto-js"; export class Stage2ServerHandler { @@ -35,7 +35,9 @@ export class Stage2ServerHandler { `${fnTag}, message common body is missing`, ); } - const sessionData = gateway.sessions.get(request.common.sessionId); + //const sessionData = gateway.sessions.get(request.common.sessionId); + const sessionData = new SessionData(); //todo change + if (sessionData == undefined) { throw new Error( `${fnTag}, session data not found for session id ${request.common.sessionId}`, @@ -120,7 +122,8 @@ export class Stage2ServerHandler { ); } - const sessionData = gateway.sessions.get(request.common.sessionId); + //const sessionData = gateway.sessions.get(request.common.sessionId); + const sessionData = new SessionData(); //todo change if (sessionData == undefined) { throw new Error( diff --git a/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/server/stage_3.ts b/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/server/stage_3.ts index 8677fcf3af5..3324230c93f 100644 --- a/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/server/stage_3.ts +++ b/packages/cactus-plugin-satp-hermes/src/main/typescript/core/stage-handlers/server/stage_3.ts @@ -3,7 +3,7 @@ import { PluginSATPGateway } from "../../../plugin-satp-gateway"; import { CommitFinalAcknowledgementReceiptResponseMessage, CommitFinalAssertionRequestMessage, CommitPreparationRequestMessage, CommitReadyResponseMessage } from "../../../generated/proto/cacti/satp/v02/stage_3_pb"; import { SATP_VERSION } from "../../constants"; import { CommonSatp, MessageType } from "../../../generated/proto/cacti/satp/v02/common/common_messages_pb"; -import { Stage3Hashes, Stage3Signatures } from "../../../generated/proto/cacti/satp/v02/common/session_pb"; +import { SessionData, Stage3Hashes, Stage3Signatures } from "../../../generated/proto/cacti/satp/v02/common/session_pb"; import { SHA256 } from "crypto-js"; export class Stage3ServerHandler { @@ -48,7 +48,9 @@ export class Stage3ServerHandler { ); } - const sessionData = gateway.sessions.get(request.common.sessionId); + //const sessionData = gateway.sessions.get(request.common.sessionId); + const sessionData = new SessionData(); //todo change + if (sessionData == undefined) { throw new Error( `${fnTag}, session data not found for session id ${request.common.sessionId}`, @@ -125,7 +127,8 @@ export class Stage3ServerHandler { ); } - const sessionData = gateway.sessions.get(request.common.sessionId); + //const sessionData = gateway.sessions.get(request.common.sessionId); + const sessionData = new SessionData(); //todo change if (sessionData == undefined) { throw new Error( @@ -199,7 +202,9 @@ export class Stage3ServerHandler { - const sessionData = gateway.sessions.get(request.common.sessionId); + //const sessionData = gateway.sessions.get(request.common.sessionId); + const sessionData = new SessionData(); //todo change + if (sessionData == undefined) { throw new Error( `${fnTag}, session data not found for session id ${request.common.sessionId}`, @@ -268,7 +273,8 @@ export class Stage3ServerHandler { ); } - const sessionData = gateway.sessions.get(request.common.sessionId); + //const sessionData = gateway.sessions.get(request.common.sessionId); + const sessionData = new SessionData(); //todo change if (sessionData == undefined) { throw new Error( diff --git a/packages/cactus-plugin-satp-hermes/src/main/typescript/plugin-satp-gateway.ts b/packages/cactus-plugin-satp-hermes/src/main/typescript/plugin-satp-gateway.ts index 65c22431482..6a66dfaece5 100644 --- a/packages/cactus-plugin-satp-hermes/src/main/typescript/plugin-satp-gateway.ts +++ b/packages/cactus-plugin-satp-hermes/src/main/typescript/plugin-satp-gateway.ts @@ -39,7 +39,8 @@ import { RecoverUpdateV1Message, RecoverUpdateAckV1Message, RollbackV1Message, - RollbackAckV1Message + RollbackAckV1Message, + SessionData } from "./generated/openapi/typescript-axios"; import { CommitFinalRequestEndpointV1 } from "./web-services/server-side/commit-final-request-endpoint"; import { CommitFinalResponseEndpointV1 } from "./web-services/client-side/commit-final-response-endpoint"; @@ -55,7 +56,6 @@ import { CommitPreparationRequestEndpointV1 } from "./web-services/server-side/c import { randomInt } from "crypto"; import { ClientGatewayHelper } from "./core/client-helper"; import { ServerGatewayHelper } from "./core/server-helper"; -import { SessionData } from "./generated/proto/cacti/satp/v02/common/session_pb"; import { checkValidRecoverMessage, sendRecoverMessage,