Merge pull request #824 from snake-eaterr/fix/date-objects-ipc

Fix: Date objects serializing/deserializing in IPC response from stor…

src/services/storage/db/serializationHelpers.ts

@@ -85,3 +85,48 @@ export function deserializeRequest<T>(r: object): T {
     }
     return result;
 }
+
+export function serializeResponseData<T>(r: T) {
+    // flag Date objects
+    function replaceDates(val: any): any {
+        if (val instanceof Date) {
+            return { __type: 'Date', value: val.toISOString() };
+        } else if (Array.isArray(val)) {
+            return val.map(replaceDates);
+        } else if (val && typeof val === 'object') {
+            const result: any = {};
+            for (const key in val) {
+                result[key] = replaceDates(val[key]);
+            }
+            return result;
+        }
+        return val;
+    }
+
+    return replaceDates(r);
+}
+
+export function deserializeResponseData<T>(r: T) {
+
+    // reconstruct flagged Date objects
+    function reviveFlaggedDates(value: any): any {
+        if (
+            value &&
+            typeof value === 'object' &&
+            value.__type === 'Date' &&
+            typeof value.value === 'string'
+        ) {
+            return new Date(value.value);
+        } else if (Array.isArray(value)) {
+            return value.map(reviveFlaggedDates);
+        } else if (value && typeof value === 'object') {
+            for (const key in value) {
+                value[key] = reviveFlaggedDates(value[key]);
+            }
+        }
+        return value;
+    }
+
+    return reviveFlaggedDates(r);
+}
+

src/services/storage/db/storageInterface.ts

@@ -15,7 +15,7 @@ import {
     PingOperation,
 } from './storageProcessor.js';
 import { PickKeysByType } from 'typeorm/common/PickKeysByType.js';
-import { serializeRequest, WhereCondition } from './serializationHelpers.js';
+import { deserializeResponseData, serializeRequest, WhereCondition } from './serializationHelpers.js';
 import { Utils } from '../../helpers/utilsWrapper.js';
 import { ProcessMetrics } from '../tlv/processMetricsCollector.js';
 
@@ -174,7 +174,7 @@ export class StorageInterface extends EventEmitter {
                     reject(new Error('Invalid storage response type'));
                     return
                 }
-                resolve(response.data);
+               resolve(deserializeResponseData(response.data));
             }
             this.once(op.opId, responseHandler)
             this.process.send(this.serializeOperation(op))

src/services/storage/db/storageProcessor.ts

@@ -4,7 +4,7 @@ import { PubLogger, getLogger } from '../../helpers/logger.js';
 import { allMetricsMigrations, allMigrations } from '../migrations/runner.js';
 import transactionsQueue from './transactionsQueue.js';
 import { PickKeysByType } from 'typeorm/common/PickKeysByType';
-import { deserializeRequest, WhereCondition } from './serializationHelpers.js';
+import { deserializeRequest, serializeResponseData, WhereCondition } from './serializationHelpers.js';
 import { ProcessMetricsCollector } from '../tlv/processMetricsCollector.js';
 
 export type DBNames = MainDbNames | MetricsDbNames
@@ -510,9 +510,15 @@ class StorageProcessor {
     }
 
     private sendResponse(response: OperationResponse<any>) {
+        let finalResponse = response
+        if (finalResponse.success && finalResponse.data) {
+            const datesFlaggedData = serializeResponseData(finalResponse.data)
+            finalResponse = { ...finalResponse, data: datesFlaggedData }
+        }
+
         try {
             if (process.send) {
-                process.send(response, undefined, undefined, err => {
+                process.send(finalResponse, undefined, undefined, err => {
                     if (err) {
                         console.error("failed to send response to main process from storage processor, killing sub process")
                         process.exit(1)