cloudcommerce 2.12.1 → 2.12.2
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/CHANGELOG.md +10 -0
- package/ecomplus-stores/barradoce/functions/many/package.json +3 -3
- package/ecomplus-stores/barradoce/functions/ssr/package.json +6 -6
- package/ecomplus-stores/barradoce/functions/ssr/public/assets/cvv.png +0 -0
- package/ecomplus-stores/barradoce/functions/ssr/public/assets/payments.png +0 -0
- package/ecomplus-stores/barradoce/functions/with-apps/package.json +3 -3
- package/ecomplus-stores/barradoce/package.json +2 -2
- package/package.json +2 -2
- package/packages/api/package.json +1 -1
- package/packages/api/types.d.ts +1 -1
- package/packages/apps/affiliate-program/package.json +1 -1
- package/packages/apps/correios/package.json +1 -1
- package/packages/apps/custom-payment/package.json +1 -1
- package/packages/apps/custom-shipping/package.json +1 -1
- package/packages/apps/datafrete/package.json +1 -1
- package/packages/apps/discounts/package.json +1 -1
- package/packages/apps/emails/lib/functios-lib/handle-orders.js +5 -6
- package/packages/apps/emails/lib/functios-lib/handle-orders.js.map +1 -1
- package/packages/apps/emails/lib/functios-lib/utils.js +2 -3
- package/packages/apps/emails/lib/functios-lib/utils.js.map +1 -1
- package/packages/apps/emails/package.json +1 -1
- package/packages/apps/emails/src/functios-lib/handle-orders.ts +5 -14
- package/packages/apps/emails/src/functios-lib/utils.ts +2 -5
- package/packages/apps/fb-conversions/package.json +1 -1
- package/packages/apps/flash-courier/package.json +1 -1
- package/packages/apps/frenet/package.json +1 -1
- package/packages/apps/galaxpay/package.json +1 -1
- package/packages/apps/google-analytics/package.json +1 -1
- package/packages/apps/jadlog/package.json +1 -1
- package/packages/apps/loyalty-points/package.json +1 -1
- package/packages/apps/mandae/package.json +1 -1
- package/packages/apps/melhor-envio/package.json +1 -1
- package/packages/apps/mercadopago/package.json +1 -1
- package/packages/apps/pagaleve/package.json +1 -1
- package/packages/apps/pagarme/package.json +1 -1
- package/packages/apps/pagarme-v5/package.json +1 -1
- package/packages/apps/paghiper/package.json +1 -1
- package/packages/apps/pix/package.json +1 -1
- package/packages/apps/tiny-erp/package.json +1 -1
- package/packages/apps/webhooks/package.json +1 -1
- package/packages/cli/package.json +1 -1
- package/packages/config/package.json +1 -1
- package/packages/emails/package.json +1 -1
- package/packages/eslint/package.json +1 -1
- package/packages/events/package.json +1 -1
- package/packages/feeds/package.json +1 -1
- package/packages/firebase/lib/helpers/pubsub.js +3 -1
- package/packages/firebase/lib/helpers/pubsub.js.map +1 -1
- package/packages/firebase/package.json +1 -1
- package/packages/firebase/src/handlers/check-store-events.ts +1 -1
- package/packages/firebase/src/helpers/pubsub.ts +3 -1
- package/packages/i18n/package.json +1 -1
- package/packages/modules/package.json +1 -1
- package/packages/passport/package.json +1 -1
- package/packages/ssr/package.json +1 -1
- package/packages/storefront/package.json +1 -1
- package/packages/test-base/package.json +1 -1
- package/packages/types/package.json +1 -1
- package/ecomplus-stores/barradoce/functions/ssr/public/assets/.gitkeep +0 -2
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,16 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
### [2.12.2](https://github.com/ecomplus/cloud-commerce/compare/v2.12.1...v2.12.2) (2024-04-09)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* **api:** Improving `EventsResult` type def ([ffd7d87](https://github.com/ecomplus/cloud-commerce/commit/ffd7d871bd52ef06e066b3e205aa069eae5566a3))
|
|
11
|
+
* **apps:** Not relying on api event body anymore ([0e999d6](https://github.com/ecomplus/cloud-commerce/commit/0e999d68266e22a57535261424acc99770b5a1c1))
|
|
12
|
+
* **emails:** Prevent fatal error with undefined API event body ([22ab548](https://github.com/ecomplus/cloud-commerce/commit/22ab548ad4b5a049f93e0fb9d3271f788a7541c5))
|
|
13
|
+
* Ensure `body` and `resource` fields on store event objects ([65e7796](https://github.com/ecomplus/cloud-commerce/commit/65e7796093069ab47dc897f9a520e02e8b67cdfc))
|
|
14
|
+
|
|
5
15
|
### [2.12.1](https://github.com/ecomplus/cloud-commerce/compare/v2.12.0...v2.12.1) (2024-04-08)
|
|
6
16
|
|
|
7
17
|
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
},
|
|
16
16
|
"main": "index.js",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@cloudcommerce/feeds": "^2.12.
|
|
19
|
-
"@cloudcommerce/firebase": "^2.12.
|
|
20
|
-
"@cloudcommerce/passport": "^2.12.
|
|
18
|
+
"@cloudcommerce/feeds": "^2.12.1",
|
|
19
|
+
"@cloudcommerce/firebase": "^2.12.1",
|
|
20
|
+
"@cloudcommerce/passport": "^2.12.1"
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -19,16 +19,16 @@
|
|
|
19
19
|
},
|
|
20
20
|
"main": "index.js",
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@cloudcommerce/api": "^2.12.
|
|
23
|
-
"@cloudcommerce/firebase": "^2.12.
|
|
24
|
-
"@cloudcommerce/ssr": "^2.12.
|
|
22
|
+
"@cloudcommerce/api": "^2.12.1",
|
|
23
|
+
"@cloudcommerce/firebase": "^2.12.1",
|
|
24
|
+
"@cloudcommerce/ssr": "^2.12.1",
|
|
25
25
|
"@headlessui/vue": "^1.7.18",
|
|
26
26
|
"micromark": "^4.0.0"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"@cloudcommerce/i18n": "^2.12.
|
|
30
|
-
"@cloudcommerce/storefront": "^2.12.
|
|
31
|
-
"@cloudcommerce/types": "^2.12.
|
|
29
|
+
"@cloudcommerce/i18n": "^2.12.1",
|
|
30
|
+
"@cloudcommerce/storefront": "^2.12.1",
|
|
31
|
+
"@cloudcommerce/types": "^2.12.1",
|
|
32
32
|
"@iconify-json/mingcute": "^1.1.16",
|
|
33
33
|
"photoswipe": "^5.4.3"
|
|
34
34
|
}
|
|
Binary file
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
},
|
|
16
16
|
"main": "index.js",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@cloudcommerce/events": "^2.12.
|
|
19
|
-
"@cloudcommerce/firebase": "^2.12.
|
|
20
|
-
"@cloudcommerce/modules": "^2.12.
|
|
18
|
+
"@cloudcommerce/events": "^2.12.1",
|
|
19
|
+
"@cloudcommerce/firebase": "^2.12.1",
|
|
20
|
+
"@cloudcommerce/modules": "^2.12.1"
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -26,10 +26,10 @@
|
|
|
26
26
|
"url": "https://github.com/ecomplus/cloud-commerce/issues"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@cloudcommerce/cli": "^2.12.
|
|
29
|
+
"@cloudcommerce/cli": "^2.12.1"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
|
-
"@cloudcommerce/eslint": "^2.12.
|
|
32
|
+
"@cloudcommerce/eslint": "^2.12.1",
|
|
33
33
|
"husky": "^9.0.10",
|
|
34
34
|
"lint-staged": "^15.2.2"
|
|
35
35
|
}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cloudcommerce",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "2.12.
|
|
4
|
+
"version": "2.12.2",
|
|
5
5
|
"description": "Open fair-code headless commerce platform: API-first, microservices based, event driven and cloud native",
|
|
6
6
|
"main": "packages/api/lib/index.js",
|
|
7
7
|
"author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"vite": "^5.2.7",
|
|
37
37
|
"vitest": "^1.4.0",
|
|
38
38
|
"zx": "^7.2.3",
|
|
39
|
-
"@cloudcommerce/eslint": "2.12.
|
|
39
|
+
"@cloudcommerce/eslint": "2.12.2"
|
|
40
40
|
},
|
|
41
41
|
"scripts": {
|
|
42
42
|
"fix-install": "bash scripts/pre-install.sh && pnpm i",
|
package/packages/api/types.d.ts
CHANGED
|
@@ -369,7 +369,7 @@ type EventsResult<TEndpoint extends EventsEndpoint> = {
|
|
|
369
369
|
resource?: string,
|
|
370
370
|
authentication_id?: ResourceId | null,
|
|
371
371
|
resource_id?: ResourceId,
|
|
372
|
-
action:
|
|
372
|
+
action: 'create' | 'update' | 'delete',
|
|
373
373
|
modified_fields: string[],
|
|
374
374
|
method?: number | undefined,
|
|
375
375
|
endpoint?: string,
|
|
@@ -48,9 +48,7 @@ export default async (trigger, application, order) => {
|
|
|
48
48
|
let html;
|
|
49
49
|
let templateId;
|
|
50
50
|
if (action !== 'delete') {
|
|
51
|
-
const triggerBody = trigger.body;
|
|
52
51
|
const resourceId = trigger.resource_id;
|
|
53
|
-
const insertedId = triggerBody._id || null;
|
|
54
52
|
const orderId = resourceId;
|
|
55
53
|
if (store && order && order.buyers && order.buyers) {
|
|
56
54
|
let checkStatus = order.status;
|
|
@@ -65,12 +63,13 @@ export default async (trigger, application, order) => {
|
|
|
65
63
|
if (Array.isArray(order[subresource])) {
|
|
66
64
|
const sortedRecords = order[subresource]
|
|
67
65
|
.sort((a, b) => (a.date_time > b.date_time ? -1 : 1));
|
|
68
|
-
lastValidRecord = sortedRecords.find(({ status }) =>
|
|
66
|
+
lastValidRecord = sortedRecords.find(({ status }) => {
|
|
67
|
+
return orderStatus.includes(status);
|
|
68
|
+
});
|
|
69
69
|
if (lastValidRecord) {
|
|
70
70
|
checkStatus = lastValidRecord.status;
|
|
71
71
|
}
|
|
72
|
-
isCustomerNotified = Boolean(
|
|
73
|
-
.find((entry) => entry._id === insertedId && entry.customer_notified));
|
|
72
|
+
isCustomerNotified = Boolean(lastValidRecord.customer_notified);
|
|
74
73
|
if (!isCustomerNotified) {
|
|
75
74
|
const lastNotification = sortedRecords.find((entry) => entry.customer_notified);
|
|
76
75
|
if (lastNotification) {
|
|
@@ -156,7 +155,7 @@ export default async (trigger, application, order) => {
|
|
|
156
155
|
});
|
|
157
156
|
// logger.log('>> Email sent');
|
|
158
157
|
if (subresource === 'payments_history' || subresource === 'fulfillment') {
|
|
159
|
-
await updateOrderSubresource(orderId, subresource, lastValidRecord
|
|
158
|
+
await updateOrderSubresource(orderId, subresource, lastValidRecord);
|
|
160
159
|
}
|
|
161
160
|
}
|
|
162
161
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handle-orders.js","sourceRoot":"","sources":["../../src/functios-lib/handle-orders.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAC/C,OAAO,GAAG,MAAM,oBAAoB,CAAC;AACrC,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACxE,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,aAAa,MAAM,mBAAmB,CAAC;AAE9C,MAAM,WAAW,GAAG;IAClB,SAAS;IACT,gBAAgB;IAChB,YAAY;IACZ,cAAc;IACd,gBAAgB;IAChB,MAAM;IACN,YAAY;IACZ,oBAAoB;IACpB,UAAU;IACV,UAAU;IACV,QAAQ;IACR,gBAAgB;IAChB,eAAe;IACf,eAAe;IACf,oBAAoB;IACpB,mBAAmB;IACnB,SAAS;IACT,qBAAqB;IACrB,WAAW;IACX,uBAAuB;IACvB,uBAAuB;IACvB,UAAU;CACX,CAAC;AAEF,eAAe,KAAK,EAClB,OAAqC,EACrC,WAAoC,EACpC,KAAa,EACb,EAAE;IACF,MAAM,OAAO,GAAG;QACd,GAAG,WAAW,CAAC,IAAI;QACnB,GAAG,WAAW,CAAC,WAAW;KAC3B,CAAC;IAEF,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IAEzB,yBAAyB;IACzB,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,cAAc,GAAoD,EAAE,CAAC;IAC3E,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACxC,IAAI,KAAK,KAAK,kBAAkB,IAAI,KAAK,KAAK,aAAa,EAAE,CAAC;YAC5D,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC;IAC7F,IAAI,IAAwB,CAAC;IAC7B,IAAI,UAA8B,CAAC;IAEnC,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;QACxB,MAAM,
|
|
1
|
+
{"version":3,"file":"handle-orders.js","sourceRoot":"","sources":["../../src/functios-lib/handle-orders.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import api from '@cloudcommerce/api';
|
|
2
2
|
import config from '@cloudcommerce/firebase/lib/config';
|
|
3
3
|
|
|
4
|
-
const updateOrderSubresource = (orderId, subresource, lastValidRecord
|
|
5
|
-
const statusRecordId = lastValidRecord ? lastValidRecord._id : insertedId;
|
|
4
|
+
const updateOrderSubresource = (orderId, subresource, lastValidRecord) => {
|
|
6
5
|
const body = {
|
|
7
6
|
customer_notified: true,
|
|
8
7
|
};
|
|
9
|
-
return api.patch(`orders/${orderId}/${subresource}/${
|
|
8
|
+
return api.patch(`orders/${orderId}/${subresource}/${lastValidRecord._id}`, body);
|
|
10
9
|
};
|
|
11
10
|
const toCamelCase = (status) => {
|
|
12
11
|
return status.replace(/^([A-Z])|[\s-_](\w)/g, (p1, p2) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/functios-lib/utils.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,oBAAoB,CAAC;AACrC,OAAO,MAAM,MAAM,oCAAoC,CAAC;AAExD,MAAM,sBAAsB,GAAG,CAC7B,OAAmB,EACnB,WAAmB,EACnB,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/functios-lib/utils.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,oBAAoB,CAAC;AACrC,OAAO,MAAM,MAAM,oCAAoC,CAAC;AAExD,MAAM,sBAAsB,GAAG,CAC7B,OAAmB,EACnB,WAAmB,EACnB,eAAsD,EACtD,EAAE;IACF,MAAM,IAAI,GAAG;QACX,iBAAiB,EAAE,IAAI;KACxB,CAAC;IACF,OAAO,GAAG,CAAC,KAAK,CAAC,UAAU,OAAO,IAAI,WAAW,IAAI,eAAe,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;AACpF,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,EAAE;IACrC,OAAO,MAAM,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACvD,IAAI,EAAE;YAAE,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC;QAChC,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,GAAG,EAAE;IACpB,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;IACzC,OAAO;QACL,IAAI,EAAE,eAAe,CAAC,IAAI;QAC1B,MAAM,EAAE,eAAe,CAAC,MAAM;QAC9B,IAAI,EAAE,eAAe,CAAC,IAAI;QAC1B,cAAc,EAAE,eAAe,CAAC,aAAa,IAAI,eAAe,CAAC,IAAI;QACrE,aAAa,EAAE,eAAe,CAAC,KAAK;QACpC,IAAI,EAAE;YACJ,GAAG,EAAE,WAAW,eAAe,CAAC,MAAM,GAAG,eAAe,CAAC,IAAI,EAAE;SAChE;QACD,OAAO,EAAE,eAAe,CAAC,OAAO;KACjC,CAAC;AACJ,CAAC,CAAC;AAEF,OAAO,EACL,sBAAsB,EACtB,WAAW,EACX,QAAQ,GACT,CAAC"}
|
|
@@ -57,14 +57,12 @@ export default async (
|
|
|
57
57
|
let templateId: string | undefined;
|
|
58
58
|
|
|
59
59
|
if (action !== 'delete') {
|
|
60
|
-
const triggerBody = trigger.body;
|
|
61
60
|
const resourceId = trigger.resource_id;
|
|
62
|
-
const insertedId = triggerBody._id || null;
|
|
63
61
|
const orderId = resourceId;
|
|
64
62
|
|
|
65
63
|
if (store && order && order.buyers && order.buyers) {
|
|
66
64
|
let checkStatus: string | undefined = order.status;
|
|
67
|
-
let lastValidRecord: { status: string
|
|
65
|
+
let lastValidRecord: { status: string, customer_notified: boolean, _id: string };
|
|
68
66
|
const customerId = order.buyers[0]._id;
|
|
69
67
|
const customer = (await api.get(`customers/${customerId}`)).data;
|
|
70
68
|
// fulfillment payments_history
|
|
@@ -79,21 +77,15 @@ export default async (
|
|
|
79
77
|
a: { [x: string]: any; },
|
|
80
78
|
b: { [x: string]: any; },
|
|
81
79
|
) => (a.date_time > b.date_time ? -1 : 1));
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
);
|
|
86
|
-
|
|
80
|
+
lastValidRecord = sortedRecords.find(({ status }) => {
|
|
81
|
+
return orderStatus.includes(status);
|
|
82
|
+
});
|
|
87
83
|
if (lastValidRecord) {
|
|
88
84
|
checkStatus = lastValidRecord.status;
|
|
89
85
|
}
|
|
90
|
-
|
|
91
|
-
isCustomerNotified = Boolean(order[subresource]
|
|
92
|
-
.find((entry) => entry._id === insertedId && entry.customer_notified));
|
|
93
|
-
|
|
86
|
+
isCustomerNotified = Boolean(lastValidRecord.customer_notified);
|
|
94
87
|
if (!isCustomerNotified) {
|
|
95
88
|
const lastNotification = sortedRecords.find((entry) => entry.customer_notified);
|
|
96
|
-
|
|
97
89
|
if (lastNotification) {
|
|
98
90
|
lastNotifiedStatus = lastNotification.status;
|
|
99
91
|
}
|
|
@@ -212,7 +204,6 @@ export default async (
|
|
|
212
204
|
orderId,
|
|
213
205
|
subresource,
|
|
214
206
|
lastValidRecord,
|
|
215
|
-
insertedId,
|
|
216
207
|
);
|
|
217
208
|
}
|
|
218
209
|
}
|
|
@@ -5,15 +5,12 @@ import config from '@cloudcommerce/firebase/lib/config';
|
|
|
5
5
|
const updateOrderSubresource = (
|
|
6
6
|
orderId: ResourceId,
|
|
7
7
|
subresource: string,
|
|
8
|
-
lastValidRecord: {
|
|
9
|
-
insertedId: string,
|
|
8
|
+
lastValidRecord: Record<string, any> & { _id: string },
|
|
10
9
|
) => {
|
|
11
|
-
const statusRecordId: string = lastValidRecord ? lastValidRecord._id : insertedId;
|
|
12
|
-
|
|
13
10
|
const body = {
|
|
14
11
|
customer_notified: true,
|
|
15
12
|
};
|
|
16
|
-
return api.patch(`orders/${orderId}/${subresource}/${
|
|
13
|
+
return api.patch(`orders/${orderId}/${subresource}/${lastValidRecord._id}`, body);
|
|
17
14
|
};
|
|
18
15
|
|
|
19
16
|
const toCamelCase = (status: string) => {
|
|
@@ -11,7 +11,9 @@ const createPubSubFunction = (pubSubTopic, fn, eventMaxAgeMs = 60000) => {
|
|
|
11
11
|
.pubsub.topic(pubSubTopic).onPublish((message, context) => {
|
|
12
12
|
const eventAgeMs = Date.now() - Date.parse(context.timestamp);
|
|
13
13
|
if (eventAgeMs > eventMaxAgeMs) {
|
|
14
|
-
logger.warn(`Dropping event ${context.eventId} with age[ms]: ${eventAgeMs}
|
|
14
|
+
logger.warn(`Dropping event ${context.eventId} with age[ms]: ${eventAgeMs}`, {
|
|
15
|
+
data: message.json,
|
|
16
|
+
});
|
|
15
17
|
}
|
|
16
18
|
return fn(message.json, context, message);
|
|
17
19
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../../src/helpers/pubsub.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,MAAM,MAAM,WAAW,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;AAS7B,kCAAkC;AAElC,MAAM,oBAAoB,GAAG,CAC3B,WAAmB,EACnB,EAAsB,EACtB,aAAa,GAAG,KAAK,EACrB,EAAE;IACF,MAAM,EAAE,oBAAoB,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;IAC1D,OAAO,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC;SAC5B,OAAO,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;SAChC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;QACxD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC9D,IAAI,UAAU,GAAG,aAAa,EAAE,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,kBAAkB,OAAO,CAAC,OAAO,kBAAkB,UAAU,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../../src/helpers/pubsub.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,MAAM,MAAM,WAAW,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;AAS7B,kCAAkC;AAElC,MAAM,oBAAoB,GAAG,CAC3B,WAAmB,EACnB,EAAsB,EACtB,aAAa,GAAG,KAAK,EACrB,EAAE;IACF,MAAM,EAAE,oBAAoB,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;IAC1D,OAAO,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC;SAC5B,OAAO,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;SAChC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;QACxD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC9D,IAAI,UAAU,GAAG,aAAa,EAAE,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,kBAAkB,OAAO,CAAC,OAAO,kBAAkB,UAAU,EAAE,EAAE;gBAC3E,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB,CAAC,CAAC;QACL,CAAC;QACD,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAC9B,WAA4B,EAC5B,EAAmB,EACnB,aAAa,GAAG,KAAK,EACrB,EAAE;IACF,IAAI,KAAa,CAAC;IAClB,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;QACpC,KAAK,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC;IAC/C,CAAC;SAAM,CAAC;QACN,KAAK,GAAG,WAAW,CAAC;IACtB,CAAC;IACD,OAAO,oBAAoB,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC;AAC1E,CAAC,CAAC;AAEF,eAAe,oBAAoB,CAAC;AAEpC,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,CAAC"}
|
|
@@ -25,7 +25,9 @@ const createPubSubFunction = (
|
|
|
25
25
|
.pubsub.topic(pubSubTopic).onPublish((message, context) => {
|
|
26
26
|
const eventAgeMs = Date.now() - Date.parse(context.timestamp);
|
|
27
27
|
if (eventAgeMs > eventMaxAgeMs) {
|
|
28
|
-
logger.warn(`Dropping event ${context.eventId} with age[ms]: ${eventAgeMs}
|
|
28
|
+
logger.warn(`Dropping event ${context.eventId} with age[ms]: ${eventAgeMs}`, {
|
|
29
|
+
data: message.json,
|
|
30
|
+
});
|
|
29
31
|
}
|
|
30
32
|
return fn(message.json, context, message);
|
|
31
33
|
});
|