error handling for read ETIMEDOUT error

OriginTrail · Dec 25, 2023 · e3d7aa8 · e3d7aa8
1 parent 0b0f104
commit e3d7aa8
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 42 deletions.
diff --git a/src/controllers/rpc/publish-rpc-controller.js b/src/controllers/rpc/publish-rpc-controller.js
@@ -18,30 +18,35 @@ class PublishController extends BaseController {
         const command = { sequence: [], delay: 0, transactional: false, data: {} };
         let dataSource;
         const [handleInitCommand, handleRequestCommand] = this.getCommandSequence(protocol);
-        switch (messageType) {
-            case NETWORK_MESSAGE_TYPES.REQUESTS.PROTOCOL_INIT:
-                dataSource = message.data;
-                command.name = handleInitCommand;
-                command.period = 5000;
-                command.retries = 3;
+        try {
+            switch (messageType) {
+                case NETWORK_MESSAGE_TYPES.REQUESTS.PROTOCOL_INIT:
+                    dataSource = message.data;
+                    command.name = handleInitCommand;
+                    command.period = 5000;
+                    command.retries = 3;
 
-                break;
-            case NETWORK_MESSAGE_TYPES.REQUESTS.PROTOCOL_REQUEST:
-                // eslint-disable-next-line no-case-declarations
-                dataSource = await this.operationIdService.getCachedOperationIdData(operationId);
-                await this.operationIdService.cacheOperationIdData(operationId, {
-                    assertionId: dataSource.assertionId,
-                    assertion: message.data.assertion,
-                });
-                command.name = handleRequestCommand;
-                command.data.keyword = message.data.keyword;
-                command.data.agreementId = dataSource.agreementId;
-                command.data.agreementData = dataSource.agreementData;
-                break;
-            default:
-                throw Error('unknown message type');
+                    break;
+                case NETWORK_MESSAGE_TYPES.REQUESTS.PROTOCOL_REQUEST:
+                    // eslint-disable-next-line no-case-declarations
+                    dataSource = await this.operationIdService.getCachedOperationIdData(
+                        operationId,
+                    );
+                    await this.operationIdService.cacheOperationIdData(operationId, {
+                        assertionId: dataSource.assertionId,
+                        assertion: message.data.assertion,
+                    });
+                    command.name = handleRequestCommand;
+                    command.data.keyword = message.data.keyword;
+                    command.data.agreementId = dataSource.agreementId;
+                    command.data.agreementData = dataSource.agreementData;
+                    break;
+                default:
+                    throw Error('unknown message type');
+            }
+        } catch (error) {
+            this.logger.error(error.message);
         }
-
         command.data = {
             ...command.data,
             remotePeerId,

diff --git a/src/modules/network/implementation/libp2p-service.js b/src/modules/network/implementation/libp2p-service.js
@@ -632,12 +632,16 @@ class Libp2pService {
     }
 
     removeCachedSession(operationId, keywordUuid, peerIdString) {
-        if (this.sessions[peerIdString]?.[operationId]?.[keywordUuid]?.stream) {
-            this.sessions[peerIdString][operationId][keywordUuid].stream.close();
-            delete this.sessions[peerIdString][operationId];
-            this.logger.trace(
-                `Removed session for remotePeerId: ${peerIdString}, operationId: ${operationId}.`,
-            );
+        try {
+            if (this.sessions[peerIdString]?.[operationId]?.[keywordUuid]?.stream) {
+                this.sessions[peerIdString][operationId][keywordUuid].stream.close();
+                delete this.sessions[peerIdString][operationId];
+                this.logger.trace(
+                    `Removed session for remotePeerId: ${peerIdString}, operationId: ${operationId}.`,
+                );
+            }
+        } catch (error) {
+            this.logger.error(error.message);
         }
     }
 }

diff --git a/src/service/operation-id-service.js b/src/service/operation-id-service.js
@@ -102,24 +102,31 @@ class OperationIdService {
     }
 
     async cacheOperationIdData(operationId, data) {
-        this.logger.debug(`Caching data for operation id: ${operationId} in file`);
-        const operationIdCachePath = this.fileService.getOperationIdCachePath();
-
-        await this.fileService.writeContentsToFile(
-            operationIdCachePath,
-            operationId,
-            JSON.stringify(data),
-        );
-
-        this.memoryCachedHandlersData[operationId] = { data, timestamp: Date.now() };
+        try {
+            this.logger.debug(`Caching data for operation id: ${operationId} in file`);
+            const operationIdCachePath = this.fileService.getOperationIdCachePath();
+
+            await this.fileService.writeContentsToFile(
+                operationIdCachePath,
+                operationId,
+                JSON.stringify(data),
+            );
+
+            this.memoryCachedHandlersData[operationId] = { data, timestamp: Date.now() };
+        } catch (error) {
+            this.logger.error(error);
+        }
     }
 
     async getCachedOperationIdData(operationId) {
-        if (this.memoryCachedHandlersData[operationId]) {
-            this.logger.debug(`Reading operation id: ${operationId} cached data from memory`);
-            return this.memoryCachedHandlersData[operationId].data;
+        try {
+            if (this.memoryCachedHandlersData[operationId]) {
+                this.logger.debug(`Reading operation id: ${operationId} cached data from memory`);
+                return this.memoryCachedHandlersData[operationId].data;
+            }
+        } catch (error) {
+            this.logger.error(error);
         }
-
         this.logger.debug(`Reading operation id: ${operationId} cached data from file`);
         const documentPath = this.fileService.getOperationIdDocumentPath(operationId);
         let data;