Fix sdk_trx_id_adder on push task

Adhidarma Hadiwinoto
1 parent 31728db356
Showing 1 changed file with 20 additions and 5 deletions Side-by-side Diff
lib/client/push-task-prepaid.js
@@ -21,6 +21,8 @@ const pusher = (xid, task, gwName, retry) =&gt; {
      */
     const ws = wsList[gwName];
  
+    const senderName = config.handler_name;
+
     if (!ws) {
         logger.verbose(`${MODULE_NAME} 7EB181CF: Invalid websocket`, {
             xid,
@@ -42,7 +44,7 @@ const pusher = (xid, task, gwName, retry) =&gt; {
                     xid,
                     'KOMODO-SDK-PUSH-TRX': {
                         msg: 'B7B937A2 Invalid websocket on pushing to related gateway, will retry',
-                        gwOrigin: config.partner.handler_name,
+                        gwOrigin: senderName,
                         gwTarget: gwName,
                         retried: retry || 0,
                     },
@@ -70,7 +72,7 @@ const pusher = (xid, task, gwName, retry) =&gt; {
                     xid,
                     'KOMODO-SDK-PUSH-TRX': {
                         msg: '7151F200 Invalid websocket on pushing to related gateway, retry exceeded',
-                        gwOrigin: config.partner.handler_name,
+                        gwOrigin: senderName,
                         gwTarget: gwName,
                         retried: retry || 0,
                     },
@@ -93,18 +95,31 @@ const pusher = (xid, task, gwName, retry) =&gt; {
             xid,
             'KOMODO-SDK-PUSH-TRX': {
                 msg: pushReportMsg,
-                gwOrigin: config.partner.handler_name,
+                gwOrigin: senderName,
                 gwTarget: gwName,
             },
         },
     });
  
+    const newTask = JSON.parse(JSON.stringify(task));
+    const sdkTrxIdAdder = Number(config.sdk_trx_id_adder);
+    if (sdkTrxIdAdder) {
+        const newTrxId = Number(newTask.trx_id) - sdkTrxIdAdder;
+        logger.verbose(`${MODULE_NAME} 94669AEA: Reverting trx id to original`, {
+            xid,
+            currentTrxId: newTask.trx_id,
+            newTrxId,
+        });
+
+        newTask.trx_id = newTrxId;
+    }
+
     ws.send(JSON.stringify({
         type: 'TASK',
         ts: new Date(),
         rid: xid || uniqid(),
-        senderName: config.handler_name,
-        payload: task,
+        senderName,
+        payload: newTask,
     }));
  
     logger.verbose(`${MODULE_NAME} 7D3CECCA: Task pushed`, { xid, gwName });
...	...	@@ -21,6 +21,8 @@ const pusher = (xid, task, gwName, retry) => {
21	21	*/
22	22	const ws = wsList[gwName];
23	23
	24	+ const senderName = config.handler_name;
	25	+
24	26	if (!ws) {
25	27	logger.verbose(`${MODULE_NAME} 7EB181CF: Invalid websocket`, {
26	28	xid,
...	...	@@ -42,7 +44,7 @@ const pusher = (xid, task, gwName, retry) => {
42	44	xid,
43	45	'KOMODO-SDK-PUSH-TRX': {
44	46	msg: 'B7B937A2 Invalid websocket on pushing to related gateway, will retry',
45		- gwOrigin: config.partner.handler_name,
	47	+ gwOrigin: senderName,
46	48	gwTarget: gwName,
47	49	retried: retry \|\| 0,
48	50	},
...	...	@@ -70,7 +72,7 @@ const pusher = (xid, task, gwName, retry) => {
70	72	xid,
71	73	'KOMODO-SDK-PUSH-TRX': {
72	74	msg: '7151F200 Invalid websocket on pushing to related gateway, retry exceeded',
73		- gwOrigin: config.partner.handler_name,
	75	+ gwOrigin: senderName,
74	76	gwTarget: gwName,
75	77	retried: retry \|\| 0,
76	78	},
...	...	@@ -93,18 +95,31 @@ const pusher = (xid, task, gwName, retry) => {
93	95	xid,
94	96	'KOMODO-SDK-PUSH-TRX': {
95	97	msg: pushReportMsg,
96		- gwOrigin: config.partner.handler_name,
	98	+ gwOrigin: senderName,
97	99	gwTarget: gwName,
98	100	},
99	101	},
100	102	});
101	103
	104	+ const newTask = JSON.parse(JSON.stringify(task));
	105	+ const sdkTrxIdAdder = Number(config.sdk_trx_id_adder);
	106	+ if (sdkTrxIdAdder) {
	107	+ const newTrxId = Number(newTask.trx_id) - sdkTrxIdAdder;
	108	+ logger.verbose(`${MODULE_NAME} 94669AEA: Reverting trx id to original`, {
	109	+ xid,
	110	+ currentTrxId: newTask.trx_id,
	111	+ newTrxId,
	112	+ });
	113	+
	114	+ newTask.trx_id = newTrxId;
	115	+ }
	116	+
102	117	ws.send(JSON.stringify({
103	118	type: 'TASK',
104	119	ts: new Date(),
105	120	rid: xid \|\| uniqid(),
106		- senderName: config.handler_name,
107		- payload: task,
	121	+ senderName,
	122	+ payload: newTask,
108	123	}));
109	124
110	125	logger.verbose(`${MODULE_NAME} 7D3CECCA: Task pushed`, { xid, gwName });