Komodo / komodo-sdk-push-trx

Compare View

switch
from
...
to
 
Commits (2)

Changes

Showing 4 changed files Side-by-side Diff

... ... @@ -4,8 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d
4 4  
5 5 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
6 6  
  7 +#### [v0.1.15](https://gitlab.kodesumber.com/komodo/komodo-sdk-push-trx/compare/v0.1.14...v0.1.15)
  8 +
  9 +- Fix sdk_trx_id_adder on push task [`e7be727`](https://gitlab.kodesumber.com/komodo/komodo-sdk-push-trx/commit/e7be7272951c1995e21b1734831ec447c1a2d79d)
  10 +
7 11 #### [v0.1.14](https://gitlab.kodesumber.com/komodo/komodo-sdk-push-trx/compare/v0.1.13...v0.1.14)
8 12  
  13 +> 8 February 2022
  14 +
9 15 - Fix report order on push-task-prepaid [`3d22698`](https://gitlab.kodesumber.com/komodo/komodo-sdk-push-trx/commit/3d22698af81261453331e047f1fbf635b32c588d)
10 16  
11 17 #### [v0.1.13](https://gitlab.kodesumber.com/komodo/komodo-sdk-push-trx/compare/v0.1.12...v0.1.13)
lib/client/push-task-prepaid.js
Diff comments   View file @ f0d7d27
... ... @@ -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 });
1 1 {
2 2 "name": "komodo-sdk-push-trx",
3   - "version": "0.1.14",
  3 + "version": "0.1.15",
4 4 "lockfileVersion": 2,
5 5 "requires": true,
6 6 "packages": {
7 7 "": {
8 8 "name": "komodo-sdk-push-trx",
9   - "version": "0.1.14",
  9 + "version": "0.1.15",
10 10 "license": "ISC",
11 11 "dependencies": {
12 12 "express": "^4.17.2",
1 1 {
2 2 "name": "komodo-sdk-push-trx",
3   - "version": "0.1.14",
  3 + "version": "0.1.15",
4 4 "description": "Komodo SDK for PUSH transaction",
5 5 "main": "index.js",
6 6 "scripts": {