@things-factory/integration-base 4.3.815 → 4.3.824
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-server/service/webhook-event/webhook-event-enums.js +0 -1
- package/dist-server/service/webhook-event/webhook-event-enums.js.map +1 -1
- package/dist-server/service/webhook-handler/webhook-controller.js +0 -66
- package/dist-server/service/webhook-handler/webhook-controller.js.map +1 -1
- package/package.json +2 -2
- package/server/service/webhook-event/webhook-event-enums.ts +0 -1
- package/server/service/webhook-handler/webhook-controller.ts +1 -85
|
@@ -33,7 +33,6 @@ var WebhookEventsEnum;
|
|
|
33
33
|
WebhookEventsEnum["DeliveryOrderCompleted"] = "delivery_order_completed";
|
|
34
34
|
//Inventory Events
|
|
35
35
|
WebhookEventsEnum["InventoryAdjusted"] = "inventory_adjusted";
|
|
36
|
-
WebhookEventsEnum["InventoryTransferred"] = "inventory_transferred";
|
|
37
36
|
//Manifest Events
|
|
38
37
|
WebhookEventsEnum["DispatchManifest"] = "dispatch_manifest";
|
|
39
38
|
//Product Events
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook-event-enums.js","sourceRoot":"","sources":["../../../server/service/webhook-event/webhook-event-enums.ts"],"names":[],"mappings":";;;AAAA,IAAY,
|
|
1
|
+
{"version":3,"file":"webhook-event-enums.js","sourceRoot":"","sources":["../../../server/service/webhook-event/webhook-event-enums.ts"],"names":[],"mappings":";;;AAAA,IAAY,iBA2CX;AA3CD,WAAY,iBAAiB;IACzB,iBAAiB;IACjB,oEAA+C,CAAA;IAC/C,oEAA+C,CAAA;IAC/C,wEAAmD,CAAA;IACnD,wEAAmD,CAAA;IACnD,kFAA6D,CAAA;IAE7D,eAAe;IACf,gEAA2C,CAAA;IAC3C,gEAA2C,CAAA;IAC3C,oEAA+C,CAAA;IAC/C,oEAA+C,CAAA;IAE/C,+CAA0B,CAAA;IAE1B,iBAAiB;IACjB,8DAAyC,CAAA;IACzC,8DAAyC,CAAA;IACzC,kEAA6C,CAAA;IAC7C,kEAA4C,CAAA;IAC5C,kEAA4C,CAAA;IAC5C,sEAAiD,CAAA;IACjD,sEAAgD,CAAA;IAChD,uDAAkC,CAAA;IAClC,2DAAsC,CAAA;IACtC,uDAAkC,CAAA;IAClC,2DAAsC,CAAA;IACtC,uDAAkC,CAAA;IAClC,2DAAsC,CAAA;IAEtC,uBAAuB;IACvB,wEAAmD,CAAA;IAEnD,kBAAkB;IAClB,6DAAwC,CAAA;IAExC,iBAAiB;IACjB,2DAAsC,CAAA;IAEtC,gBAAgB;IAChB,uDAAkC,CAAA;IAClC,uDAAkC,CAAA;AACtC,CAAC,EA3CW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QA2C5B"}
|
|
@@ -1,16 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.webhookHandler = void 0;
|
|
7
4
|
const webhook_1 = require("../webhook/webhook");
|
|
8
5
|
const typeorm_1 = require("typeorm");
|
|
9
6
|
const lambda_handler_1 = require("./lambda-handler");
|
|
10
|
-
const auth_base_1 = require("@things-factory/auth-base");
|
|
11
|
-
const webhook_event_enums_1 = require("../webhook-event/webhook-event-enums");
|
|
12
|
-
const payload_log_mutation_1 = require("../payload-log/payload-log-mutation");
|
|
13
|
-
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
14
7
|
async function webhookHandler(data, bizplaces, event) {
|
|
15
8
|
//fetch the webhook
|
|
16
9
|
try {
|
|
@@ -53,65 +46,6 @@ async function webhookHandler(data, bizplaces, event) {
|
|
|
53
46
|
await (0, lambda_handler_1.lambdaService)('processWebhookEvent', data);
|
|
54
47
|
}
|
|
55
48
|
}
|
|
56
|
-
// IF ITS ORDER FROM POWRUP
|
|
57
|
-
if (data.source === auth_base_1.ApplicationType.POWRUP) {
|
|
58
|
-
const connection = (0, typeorm_1.getConnection)();
|
|
59
|
-
const powrup = await connection
|
|
60
|
-
.createQueryBuilder()
|
|
61
|
-
.select('p.id', 'id')
|
|
62
|
-
.addSelect('p."api_key"', 'apiKey')
|
|
63
|
-
.addSelect('p.staging', 'staging')
|
|
64
|
-
.from('powrups', 'p')
|
|
65
|
-
.where('p.platform = :platform', { platform: 'POWRUP' })
|
|
66
|
-
.andWhere('p.active = :active', { active: true })
|
|
67
|
-
.getRawOne();
|
|
68
|
-
if (powrup && (event === webhook_event_enums_1.WebhookEventsEnum.PickingStarted || event === webhook_event_enums_1.WebhookEventsEnum.LoadingStarted)) {
|
|
69
|
-
let status = '';
|
|
70
|
-
switch (event) {
|
|
71
|
-
case webhook_event_enums_1.WebhookEventsEnum.PickingStarted:
|
|
72
|
-
status = 'PICKING';
|
|
73
|
-
break;
|
|
74
|
-
case webhook_event_enums_1.WebhookEventsEnum.LoadingStarted:
|
|
75
|
-
status = 'LOADING';
|
|
76
|
-
break;
|
|
77
|
-
default:
|
|
78
|
-
break;
|
|
79
|
-
}
|
|
80
|
-
if (!status) {
|
|
81
|
-
return;
|
|
82
|
-
}
|
|
83
|
-
let baseUrl = `https://api${powrup.staging ? '-test' : ''}.powrup.asia/api`;
|
|
84
|
-
const path = '/wms/update-order-status';
|
|
85
|
-
const fullPath = `${baseUrl}${path}`;
|
|
86
|
-
const payload = {
|
|
87
|
-
orderId: data.refOrderId,
|
|
88
|
-
status: status
|
|
89
|
-
};
|
|
90
|
-
const response = await (0, node_fetch_1.default)(fullPath, {
|
|
91
|
-
method: 'post',
|
|
92
|
-
headers: {
|
|
93
|
-
'Content-Type': 'application/json',
|
|
94
|
-
'X-Authorization': powrup.apiKey
|
|
95
|
-
},
|
|
96
|
-
body: JSON.stringify(payload)
|
|
97
|
-
});
|
|
98
|
-
if (response.ok) {
|
|
99
|
-
const result = await response.json();
|
|
100
|
-
if (result.code == 0) {
|
|
101
|
-
await (0, payload_log_mutation_1.createPayloadLog)(powrup.id, path, JSON.stringify(payload), JSON.stringify(result), { state: { domain: data.domain, user: null } });
|
|
102
|
-
}
|
|
103
|
-
else {
|
|
104
|
-
const errorMessage = JSON.stringify(result);
|
|
105
|
-
await (0, payload_log_mutation_1.createPayloadLog)(powrup.id, path, JSON.stringify(payload), errorMessage, { state: { domain: data.domain, user: null } });
|
|
106
|
-
}
|
|
107
|
-
}
|
|
108
|
-
else {
|
|
109
|
-
const errorText = await response.text();
|
|
110
|
-
const errorMessage = `(${response.status}) ${errorText}`;
|
|
111
|
-
await (0, payload_log_mutation_1.createPayloadLog)(powrup.id, path, JSON.stringify(payload), errorMessage, { state: { domain: data.domain, user: null } });
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
}
|
|
115
49
|
}
|
|
116
50
|
catch (e) {
|
|
117
51
|
console.error(e.message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook-controller.js","sourceRoot":"","sources":["../../../server/service/webhook-handler/webhook-controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"webhook-controller.js","sourceRoot":"","sources":["../../../server/service/webhook-handler/webhook-controller.ts"],"names":[],"mappings":";;;AAAA,gDAA4C;AAC5C,qCAA2D;AAC3D,qDAAgD;AAEzC,KAAK,UAAU,cAAc,CAAC,IAAS,EAAE,SAAyB,EAAE,KAAa;IACtF,mBAAmB;IACnB,IAAI;QACF,IAAI,EAAE,GAAgC,MAAM,IAAA,uBAAa,EAAC,iBAAO,CAAC;aAC/D,kBAAkB,CAAC,SAAS,CAAC;aAC7B,kBAAkB,CAAC,mBAAmB,EAAE,IAAI,CAAC;aAC7C,kBAAkB,CAAC,uBAAuB,EAAE,cAAc,CAAC;aAC3D,KAAK,CAAC,4BAA4B,EAAE,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;aAC3G,QAAQ,CAAC,2BAA2B,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;aACtD,QAAQ,CAAC,0BAA0B,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QAEzD,IAAI,QAAQ,GAAG,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;QAEjC,iJAAiJ;QACjJ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE;gBAC7C,MAAM,YAAY,GAAG,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;;oBAAC,OAAA,CAAC;wBAC3C,IAAI,EAAE;4BACJ,KAAK,EAAE;gCACL,SAAS,EAAE,KAAK;gCAChB,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;gCAC7C,IAAI,EAAE,IAAI,CAAC,IAAI;gCACf,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI;gCACzB,QAAQ,EAAE;oCACR,EAAE,EAAE,EAAE,CAAC,EAAE;iCACV;gCACD,MAAM,EAAE;oCACN,EAAE,EAAE,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,EAAE,KAAI,IAAI,CAAC,QAAQ,IAAI,EAAE;iCAC3C;gCACD,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;6BACpC;4BACD,UAAU,EAAE,CAAC;4BACb,QAAQ,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS;yBACrF;qBACF,CAAC,CAAA;iBAAA,CAAC,CAAA;gBAEH,OAAO,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;YACjC,CAAC,EAAE,EAAE,CAAC,CAAA;YAEN,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;gBAC7B,MAAM,IAAA,8BAAa,EAAC,qBAAqB,EAAE,IAAI,CAAC,CAAA;aACjD;SACF;KACF;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;KACzB;AACH,CAAC;AA9CD,wCA8CC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/integration-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.824",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -42,5 +42,5 @@
|
|
|
42
42
|
"uuid": "11.0.0",
|
|
43
43
|
"vm2": "^3.9.2"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "7c6aa626b0ce0ce8ab988710b0e8fc2ed0bba5c2"
|
|
46
46
|
}
|
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
import { Webhook } from '../webhook/webhook'
|
|
2
|
-
import { SelectQueryBuilder, getRepository
|
|
2
|
+
import { SelectQueryBuilder, getRepository } from 'typeorm'
|
|
3
3
|
import { lambdaService } from './lambda-handler'
|
|
4
|
-
import { ApplicationType } from '@things-factory/auth-base'
|
|
5
|
-
import { WebhookEventsEnum } from '../webhook-event/webhook-event-enums'
|
|
6
|
-
import { createPayloadLog } from '../payload-log/payload-log-mutation'
|
|
7
|
-
import fetch from 'node-fetch'
|
|
8
4
|
|
|
9
5
|
export async function webhookHandler(data: any, bizplaces: any | string[], event: String) {
|
|
10
6
|
//fetch the webhook
|
|
@@ -49,86 +45,6 @@ export async function webhookHandler(data: any, bizplaces: any | string[], event
|
|
|
49
45
|
await lambdaService('processWebhookEvent', data)
|
|
50
46
|
}
|
|
51
47
|
}
|
|
52
|
-
|
|
53
|
-
// IF ITS ORDER FROM POWRUP
|
|
54
|
-
if (data.source === ApplicationType.POWRUP) {
|
|
55
|
-
const connection = getConnection()
|
|
56
|
-
const powrup: any = await connection
|
|
57
|
-
.createQueryBuilder()
|
|
58
|
-
.select('p.id', 'id')
|
|
59
|
-
.addSelect('p."api_key"', 'apiKey')
|
|
60
|
-
.addSelect('p.staging', 'staging')
|
|
61
|
-
.from('powrups', 'p')
|
|
62
|
-
.where('p.platform = :platform', { platform: 'POWRUP' })
|
|
63
|
-
.andWhere('p.active = :active', { active: true })
|
|
64
|
-
.getRawOne()
|
|
65
|
-
|
|
66
|
-
if (powrup && (event === WebhookEventsEnum.PickingStarted || event === WebhookEventsEnum.LoadingStarted)) {
|
|
67
|
-
let status = ''
|
|
68
|
-
switch (event) {
|
|
69
|
-
case WebhookEventsEnum.PickingStarted:
|
|
70
|
-
status = 'PICKING'
|
|
71
|
-
break
|
|
72
|
-
case WebhookEventsEnum.LoadingStarted:
|
|
73
|
-
status = 'LOADING'
|
|
74
|
-
break
|
|
75
|
-
default:
|
|
76
|
-
break
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
if (!status) { return }
|
|
80
|
-
|
|
81
|
-
let baseUrl = `https://api${powrup.staging ? '-test' : ''}.powrup.asia/api`
|
|
82
|
-
const path = '/wms/update-order-status'
|
|
83
|
-
const fullPath = `${baseUrl}${path}`
|
|
84
|
-
|
|
85
|
-
const payload = {
|
|
86
|
-
orderId: data.refOrderId,
|
|
87
|
-
status: status
|
|
88
|
-
}
|
|
89
|
-
|
|
90
|
-
const response: any = await fetch(fullPath, {
|
|
91
|
-
method: 'post',
|
|
92
|
-
headers: {
|
|
93
|
-
'Content-Type': 'application/json',
|
|
94
|
-
'X-Authorization': powrup.apiKey
|
|
95
|
-
},
|
|
96
|
-
body: JSON.stringify(payload)
|
|
97
|
-
})
|
|
98
|
-
|
|
99
|
-
if (response.ok) {
|
|
100
|
-
const result = await response.json()
|
|
101
|
-
if (result.code == 0) {
|
|
102
|
-
await createPayloadLog(
|
|
103
|
-
powrup.id,
|
|
104
|
-
path,
|
|
105
|
-
JSON.stringify(payload),
|
|
106
|
-
JSON.stringify(result),
|
|
107
|
-
{ state: { domain: data.domain, user: null } }
|
|
108
|
-
)
|
|
109
|
-
} else {
|
|
110
|
-
const errorMessage = JSON.stringify(result)
|
|
111
|
-
await createPayloadLog(
|
|
112
|
-
powrup.id,
|
|
113
|
-
path,
|
|
114
|
-
JSON.stringify(payload),
|
|
115
|
-
errorMessage,
|
|
116
|
-
{ state: { domain: data.domain, user: null } }
|
|
117
|
-
)
|
|
118
|
-
}
|
|
119
|
-
} else {
|
|
120
|
-
const errorText = await response.text()
|
|
121
|
-
const errorMessage = `(${response.status}) ${errorText}`
|
|
122
|
-
await createPayloadLog(
|
|
123
|
-
powrup.id,
|
|
124
|
-
path,
|
|
125
|
-
JSON.stringify(payload),
|
|
126
|
-
errorMessage,
|
|
127
|
-
{ state: { domain: data.domain, user: null } }
|
|
128
|
-
)
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
48
|
} catch (e) {
|
|
133
49
|
console.error(e.message)
|
|
134
50
|
}
|