@hszrdm/core 1.4.0 → 1.6.0
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/.medusa/server/src/admin/index.js +6361 -3789
- package/.medusa/server/src/admin/index.mjs +6361 -3789
- package/.medusa/server/src/api/admin/back-in-stock/route.d.ts +2 -0
- package/.medusa/server/src/api/admin/back-in-stock/route.js +70 -0
- package/.medusa/server/src/api/admin/core-carts/[id]/items/[itemId]/route.d.ts +3 -0
- package/.medusa/server/src/api/admin/core-carts/[id]/items/[itemId]/route.js +64 -0
- package/.medusa/server/src/api/admin/core-carts/[id]/items/route.d.ts +2 -0
- package/.medusa/server/src/api/admin/core-carts/[id]/items/route.js +40 -0
- package/.medusa/server/src/api/admin/core-carts/[id]/promotions/[code]/route.d.ts +2 -0
- package/.medusa/server/src/api/admin/core-carts/[id]/promotions/[code]/route.js +40 -0
- package/.medusa/server/src/api/admin/core-carts/[id]/promotions/route.d.ts +2 -0
- package/.medusa/server/src/api/admin/core-carts/[id]/promotions/route.js +41 -0
- package/.medusa/server/src/api/admin/core-carts/[id]/route.d.ts +2 -0
- package/.medusa/server/src/api/admin/core-carts/[id]/route.js +28 -0
- package/.medusa/server/src/api/admin/core-carts/customer/[id]/route.d.ts +2 -0
- package/.medusa/server/src/api/admin/core-carts/customer/[id]/route.js +34 -0
- package/.medusa/server/src/api/admin/core-carts/route.d.ts +3 -0
- package/.medusa/server/src/api/admin/core-carts/route.js +69 -0
- package/.medusa/server/src/api/admin/customer-activation/route.d.ts +2 -0
- package/.medusa/server/src/api/admin/customer-activation/route.js +97 -0
- package/.medusa/server/src/api/admin/customer-import/route.d.ts +2 -0
- package/.medusa/server/src/api/admin/customer-import/route.js +166 -0
- package/.medusa/server/src/api/admin/order-export/route.d.ts +2 -0
- package/.medusa/server/src/api/admin/order-export/route.js +88 -0
- package/.medusa/server/src/api/admin/product-migration/inventory/route.d.ts +3 -0
- package/.medusa/server/src/api/admin/product-migration/inventory/route.js +164 -0
- package/.medusa/server/src/api/admin/product-migration/price-list-prices/route.d.ts +3 -0
- package/.medusa/server/src/api/admin/product-migration/price-list-prices/route.js +204 -0
- package/.medusa/server/src/api/admin/product-migration/products/route.d.ts +2 -0
- package/.medusa/server/src/api/admin/product-migration/products/route.js +24 -0
- package/.medusa/server/src/api/admin/product-reviews/[id]/route.js +36 -4
- package/.medusa/server/src/api/admin/product-reviews/settings/route.d.ts +3 -0
- package/.medusa/server/src/api/admin/product-reviews/settings/route.js +63 -0
- package/.medusa/server/src/api/admin/shared-cart/settings/route.d.ts +5 -0
- package/.medusa/server/src/api/admin/shared-cart/settings/route.js +31 -0
- package/.medusa/server/src/api/admin/system-runtime/route.d.ts +2 -0
- package/.medusa/server/src/api/admin/system-runtime/route.js +18 -0
- package/.medusa/server/src/api/hooks/packeta/status/route.d.ts +2 -0
- package/.medusa/server/src/api/hooks/packeta/status/route.js +55 -0
- package/.medusa/server/src/api/middlewares.js +24 -1
- package/.medusa/server/src/api/store/abandoned-cart/recover/route.d.ts +2 -0
- package/.medusa/server/src/api/store/abandoned-cart/recover/route.js +37 -0
- package/.medusa/server/src/api/store/back-in-stock/route.d.ts +8 -0
- package/.medusa/server/src/api/store/back-in-stock/route.js +124 -0
- package/.medusa/server/src/api/store/core-carts/me/active/route.d.ts +2 -0
- package/.medusa/server/src/api/store/core-carts/me/active/route.js +54 -0
- package/.medusa/server/src/api/store/customer-activation/complete/route.d.ts +2 -0
- package/.medusa/server/src/api/store/customer-activation/complete/route.js +96 -0
- package/.medusa/server/src/api/store/customer-activation/route.d.ts +2 -0
- package/.medusa/server/src/api/store/customer-activation/route.js +34 -0
- package/.medusa/server/src/api/store/products/[id]/reviews/route.d.ts +1 -0
- package/.medusa/server/src/api/store/products/[id]/reviews/route.js +76 -34
- package/.medusa/server/src/api/store/review-request/route.d.ts +2 -0
- package/.medusa/server/src/api/store/review-request/route.js +60 -0
- package/.medusa/server/src/api/store/shared-carts/[token]/route.d.ts +2 -0
- package/.medusa/server/src/api/store/shared-carts/[token]/route.js +52 -0
- package/.medusa/server/src/api/store/shared-carts/route.d.ts +13 -0
- package/.medusa/server/src/api/store/shared-carts/route.js +78 -0
- package/.medusa/server/src/core/abandoned-cart.d.ts +64 -0
- package/.medusa/server/src/core/abandoned-cart.js +197 -0
- package/.medusa/server/src/core/admin-cart-management.d.ts +18 -0
- package/.medusa/server/src/core/admin-cart-management.js +102 -0
- package/.medusa/server/src/core/admin-cart-visibility.d.ts +94 -0
- package/.medusa/server/src/core/admin-cart-visibility.js +192 -0
- package/.medusa/server/src/core/back-in-stock.d.ts +51 -0
- package/.medusa/server/src/core/back-in-stock.js +107 -0
- package/.medusa/server/src/core/cart-observability.d.ts +23 -0
- package/.medusa/server/src/core/cart-observability.js +54 -0
- package/.medusa/server/src/core/checkout-contract.d.ts +1 -0
- package/.medusa/server/src/core/checkout-contract.js +2 -1
- package/.medusa/server/src/core/customer-account-contract.d.ts +3 -0
- package/.medusa/server/src/core/customer-account-contract.js +4 -1
- package/.medusa/server/src/core/customer-activation.d.ts +120 -0
- package/.medusa/server/src/core/customer-activation.js +169 -0
- package/.medusa/server/src/core/customer-cart-resume.d.ts +21 -0
- package/.medusa/server/src/core/customer-cart-resume.js +72 -0
- package/.medusa/server/src/core/customer-email.d.ts +1 -1
- package/.medusa/server/src/core/customer-email.js +4 -1
- package/.medusa/server/src/core/native-migration-export.d.ts +6 -0
- package/.medusa/server/src/core/native-migration-export.js +105 -0
- package/.medusa/server/src/core/order-export.d.ts +11 -0
- package/.medusa/server/src/core/order-export.js +297 -0
- package/.medusa/server/src/core/review-request.d.ts +61 -0
- package/.medusa/server/src/core/review-request.js +105 -0
- package/.medusa/server/src/core/review-reward.d.ts +94 -0
- package/.medusa/server/src/core/review-reward.js +124 -0
- package/.medusa/server/src/core/runtime-health.d.ts +39 -0
- package/.medusa/server/src/core/runtime-health.js +250 -0
- package/.medusa/server/src/core/storefront-core-config.d.ts +10 -0
- package/.medusa/server/src/core/storefront-core-config.js +26 -1
- package/.medusa/server/src/core/version.d.ts +2 -2
- package/.medusa/server/src/core/version.js +2 -2
- package/.medusa/server/src/jobs/abandoned-cart-recovery.d.ts +23 -0
- package/.medusa/server/src/jobs/abandoned-cart-recovery.js +137 -0
- package/.medusa/server/src/jobs/back-in-stock-reconciliation.d.ts +15 -0
- package/.medusa/server/src/jobs/back-in-stock-reconciliation.js +90 -0
- package/.medusa/server/src/jobs/dpd-statusdata-sync.d.ts +17 -0
- package/.medusa/server/src/jobs/dpd-statusdata-sync.js +107 -0
- package/.medusa/server/src/jobs/mpl-push-tracking.d.ts +19 -0
- package/.medusa/server/src/jobs/mpl-push-tracking.js +183 -0
- package/.medusa/server/src/jobs/mpl-status-sync.d.ts +8 -2
- package/.medusa/server/src/jobs/mpl-status-sync.js +12 -7
- package/.medusa/server/src/jobs/product-review-request-dispatch.d.ts +28 -0
- package/.medusa/server/src/jobs/product-review-request-dispatch.js +84 -0
- package/.medusa/server/src/jobs/runtime-heartbeat.d.ts +12 -0
- package/.medusa/server/src/jobs/runtime-heartbeat.js +13 -0
- package/.medusa/server/src/jobs/shipping-status-sync.d.ts +8 -2
- package/.medusa/server/src/jobs/shipping-status-sync.js +11 -14
- package/.medusa/server/src/lib/modules/shipping/idempotency.js +3 -3
- package/.medusa/server/src/lib/modules/shipping/index.d.ts +1 -0
- package/.medusa/server/src/lib/modules/shipping/index.js +2 -1
- package/.medusa/server/src/lib/modules/shipping/tracking.d.ts +48 -0
- package/.medusa/server/src/lib/modules/shipping/tracking.js +368 -0
- package/.medusa/server/src/lib/modules/shipping/webhooks.d.ts +6 -9
- package/.medusa/server/src/lib/modules/shipping/webhooks.js +24 -137
- package/.medusa/server/src/modules/back-in-stock/index.d.ts +23 -0
- package/.medusa/server/src/modules/back-in-stock/index.js +16 -0
- package/.medusa/server/src/modules/back-in-stock/migrations/Migration20261101202000.d.ts +5 -0
- package/.medusa/server/src/modules/back-in-stock/migrations/Migration20261101202000.js +18 -0
- package/.medusa/server/src/modules/back-in-stock/models/back-in-stock-subscription.d.ts +13 -0
- package/.medusa/server/src/modules/back-in-stock/models/back-in-stock-subscription.js +23 -0
- package/.medusa/server/src/modules/back-in-stock/service.d.ts +22 -0
- package/.medusa/server/src/modules/back-in-stock/service.js +12 -0
- package/.medusa/server/src/modules/email-center/abandoned-cart-registration.d.ts +1 -0
- package/.medusa/server/src/modules/email-center/abandoned-cart-registration.js +27 -0
- package/.medusa/server/src/modules/email-center/back-in-stock-registration.d.ts +1 -0
- package/.medusa/server/src/modules/email-center/back-in-stock-registration.js +27 -0
- package/.medusa/server/src/modules/email-center/defaults.js +7 -1
- package/.medusa/server/src/modules/email-center/index.d.ts +2 -0
- package/.medusa/server/src/modules/email-center/index.js +3 -1
- package/.medusa/server/src/modules/integration-settings/abandoned-cart-registration.d.ts +1 -0
- package/.medusa/server/src/modules/integration-settings/abandoned-cart-registration.js +30 -0
- package/.medusa/server/src/modules/integration-settings/index.d.ts +1 -0
- package/.medusa/server/src/modules/integration-settings/index.js +2 -1
- package/.medusa/server/src/modules/integration-settings/storefront-public-registration.js +15 -1
- package/.medusa/server/src/modules/product-review/index.d.ts +14 -0
- package/.medusa/server/src/modules/product-review/migrations/Migration20261101113000.d.ts +5 -0
- package/.medusa/server/src/modules/product-review/migrations/Migration20261101113000.js +28 -0
- package/.medusa/server/src/modules/product-review/migrations/Migration20261101114500.d.ts +5 -0
- package/.medusa/server/src/modules/product-review/migrations/Migration20261101114500.js +20 -0
- package/.medusa/server/src/modules/product-review/migrations/Migration20261101121500.d.ts +5 -0
- package/.medusa/server/src/modules/product-review/migrations/Migration20261101121500.js +18 -0
- package/.medusa/server/src/modules/product-review/models/product-review-settings.d.ts +15 -0
- package/.medusa/server/src/modules/product-review/models/product-review-settings.js +19 -0
- package/.medusa/server/src/modules/product-review/models/product-review.d.ts +6 -2
- package/.medusa/server/src/modules/product-review/models/product-review.js +7 -3
- package/.medusa/server/src/modules/product-review/service.d.ts +22 -1
- package/.medusa/server/src/modules/product-review/service.js +3 -2
- package/.medusa/server/src/modules/shared-cart/index.d.ts +21 -0
- package/.medusa/server/src/modules/shared-cart/index.js +13 -0
- package/.medusa/server/src/modules/shared-cart/migrations/Migration20261102010000.d.ts +5 -0
- package/.medusa/server/src/modules/shared-cart/migrations/Migration20261102010000.js +16 -0
- package/.medusa/server/src/modules/shared-cart/models/shared-cart.d.ts +10 -0
- package/.medusa/server/src/modules/shared-cart/models/shared-cart.js +17 -0
- package/.medusa/server/src/modules/shared-cart/service.d.ts +14 -0
- package/.medusa/server/src/modules/shared-cart/service.js +11 -0
- package/.medusa/server/src/modules/shared-cart/settings.d.ts +7 -0
- package/.medusa/server/src/modules/shared-cart/settings.js +64 -0
- package/.medusa/server/src/providers/dpd/index.d.ts +2 -0
- package/.medusa/server/src/providers/dpd/index.js +3 -1
- package/.medusa/server/src/providers/dpd/statusdata-ftp.d.ts +16 -0
- package/.medusa/server/src/providers/dpd/statusdata-ftp.js +268 -0
- package/.medusa/server/src/providers/dpd/statusdata.d.ts +14 -0
- package/.medusa/server/src/providers/dpd/statusdata.js +161 -0
- package/.medusa/server/src/providers/mpl/client.d.ts +3 -1
- package/.medusa/server/src/providers/mpl/client.js +154 -2
- package/.medusa/server/src/providers/mpl/service.js +31 -20
- package/.medusa/server/src/providers/mpl/types.d.ts +25 -0
- package/.medusa/server/src/providers/mpl/types.js +1 -1
- package/.medusa/server/src/providers/packeta/index.d.ts +1 -0
- package/.medusa/server/src/providers/packeta/index.js +2 -1
- package/.medusa/server/src/providers/packeta/push-tracking.d.ts +8 -0
- package/.medusa/server/src/providers/packeta/push-tracking.js +96 -0
- package/.medusa/server/src/providers/packeta/service.js +22 -2
- package/.medusa/server/src/scripts/core-init.d.ts +1 -1
- package/.medusa/server/src/scripts/core-init.js +3 -2
- package/.medusa/server/src/subscribers/back-in-stock-inventory-changed.d.ts +7 -0
- package/.medusa/server/src/subscribers/back-in-stock-inventory-changed.js +65 -0
- package/.medusa/server/src/workflows/link-migrated-customer.d.ts +8 -0
- package/.medusa/server/src/workflows/link-migrated-customer.js +17 -0
- package/README.md +1 -1
- package/package.json +30 -8
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { MedusaContainer } from "@medusajs/framework/types";
|
|
2
|
+
export default function runtimeHeartbeat(_container: MedusaContainer): Promise<{
|
|
3
|
+
schema_version?: number;
|
|
4
|
+
job?: string;
|
|
5
|
+
schedule?: string;
|
|
6
|
+
last_seen_at?: string;
|
|
7
|
+
pid?: number;
|
|
8
|
+
}>;
|
|
9
|
+
export declare const config: {
|
|
10
|
+
name: string;
|
|
11
|
+
schedule: string;
|
|
12
|
+
};
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.config = void 0;
|
|
4
|
+
exports.default = runtimeHeartbeat;
|
|
5
|
+
const runtime_health_1 = require("../core/runtime-health");
|
|
6
|
+
async function runtimeHeartbeat(_container) {
|
|
7
|
+
return (0, runtime_health_1.writeRuntimeHeartbeat)();
|
|
8
|
+
}
|
|
9
|
+
exports.config = {
|
|
10
|
+
name: "runtime-heartbeat",
|
|
11
|
+
schedule: "*/5 * * * *",
|
|
12
|
+
};
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVudGltZS1oZWFydGJlYXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvam9icy9ydW50aW1lLWhlYXJ0YmVhdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFJQSxtQ0FFQztBQUpELDJEQUE4RDtBQUUvQyxLQUFLLFVBQVUsZ0JBQWdCLENBQUMsVUFBMkI7SUFDeEUsT0FBTyxJQUFBLHNDQUFxQixHQUFFLENBQUE7QUFDaEMsQ0FBQztBQUVZLFFBQUEsTUFBTSxHQUFHO0lBQ3BCLElBQUksRUFBRSxtQkFBbUI7SUFDekIsUUFBUSxFQUFFLGFBQWE7Q0FDeEIsQ0FBQSJ9
|
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
import type { MedusaContainer } from "@medusajs/framework/types";
|
|
2
|
-
export default function shippingStatusSync(container: MedusaContainer): Promise<
|
|
3
|
-
|
|
2
|
+
export default function shippingStatusSync(container: MedusaContainer): Promise<{
|
|
3
|
+
scanned: number;
|
|
4
|
+
refreshed: number;
|
|
5
|
+
} | undefined>;
|
|
6
|
+
export declare function runBatch(container: MedusaContainer): Promise<{
|
|
7
|
+
scanned: number;
|
|
8
|
+
refreshed: number;
|
|
9
|
+
}>;
|
|
4
10
|
export declare const config: {
|
|
5
11
|
name: string;
|
|
6
12
|
schedule: string;
|
|
@@ -7,7 +7,6 @@ const utils_1 = require("@medusajs/framework/utils");
|
|
|
7
7
|
const shipping_1 = require("../lib/modules/shipping");
|
|
8
8
|
const TERMINAL = new Set(["DELIVERED", "RETURNED", "CANCELLED"]);
|
|
9
9
|
const PAGE_SIZE = 200;
|
|
10
|
-
const MAX_ORDERS_SCANNED = 2000;
|
|
11
10
|
async function shippingStatusSync(container) {
|
|
12
11
|
const locking = container.resolve("locking");
|
|
13
12
|
try {
|
|
@@ -24,31 +23,27 @@ async function shippingStatusSync(container) {
|
|
|
24
23
|
}
|
|
25
24
|
async function runBatch(container) {
|
|
26
25
|
const orderService = container.resolve("order");
|
|
27
|
-
|
|
26
|
+
let scanned = 0;
|
|
27
|
+
let refreshed = 0;
|
|
28
|
+
for (let skip = 0;; skip += PAGE_SIZE) {
|
|
28
29
|
const orders = await orderService.listOrders({}, { take: PAGE_SIZE, skip, order: { created_at: "DESC" } });
|
|
29
30
|
for (const order of orders) {
|
|
31
|
+
scanned += 1;
|
|
30
32
|
const carrier = (0, shipping_1.carrierForOrder)(order);
|
|
31
33
|
if (!carrier)
|
|
32
34
|
continue;
|
|
33
|
-
// MPL
|
|
34
|
-
//
|
|
35
|
-
if (carrier === "mpl")
|
|
35
|
+
// MPL uses the official PUSH stream with an hourly PULL fallback.
|
|
36
|
+
// DPD physical transit is supplied by Statusdata, not the Shipping API.
|
|
37
|
+
if (carrier === "mpl" || carrier === "dpd")
|
|
36
38
|
continue;
|
|
37
39
|
const shipment = order.metadata?.[carrier];
|
|
38
40
|
const hasParcel = carrier === "foxpost"
|
|
39
41
|
? Boolean(shipment?.packageId)
|
|
40
42
|
: carrier === "packeta"
|
|
41
43
|
? Boolean(shipment?.packetId)
|
|
42
|
-
:
|
|
43
|
-
? Boolean(shipment?.shipmentId)
|
|
44
|
-
: Boolean(shipment?.parcelNumber);
|
|
44
|
+
: Boolean(shipment?.parcelNumber);
|
|
45
45
|
if (!hasParcel || TERMINAL.has(String(shipment?.status ?? "").toUpperCase()))
|
|
46
46
|
continue;
|
|
47
|
-
// DPD Shipping's shipment status is the shipping-order state, not parcel transit tracking.
|
|
48
|
-
// Once a label is printed, repeated polling cannot produce DELIVERED/RETURNED states;
|
|
49
|
-
// those require DPD Statusdata, which is a separate optional integration.
|
|
50
|
-
if (carrier === "dpd" && String(shipment?.status ?? "").toUpperCase() === "PRINTED")
|
|
51
|
-
continue;
|
|
52
47
|
try {
|
|
53
48
|
await (0, shipping_1.executeShippingAction)({
|
|
54
49
|
orderService,
|
|
@@ -56,6 +51,7 @@ async function runBatch(container) {
|
|
|
56
51
|
action: "status",
|
|
57
52
|
actorId: "scheduled-status-sync",
|
|
58
53
|
});
|
|
54
|
+
refreshed += 1;
|
|
59
55
|
}
|
|
60
56
|
catch (error) {
|
|
61
57
|
console.error(`[shipping-status-sync] ${carrier} ${order.id}:`, error instanceof Error ? error.message : error);
|
|
@@ -64,6 +60,7 @@ async function runBatch(container) {
|
|
|
64
60
|
if (orders.length < PAGE_SIZE)
|
|
65
61
|
break;
|
|
66
62
|
}
|
|
63
|
+
return { scanned, refreshed };
|
|
67
64
|
}
|
|
68
65
|
exports.config = { name: "shipping-status-sync", schedule: "*/15 * * * *" };
|
|
69
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hpcHBpbmctc3RhdHVzLXN5bmMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvam9icy9zaGlwcGluZy1zdGF0dXMtc3luYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFXQSxxQ0F5QkM7QUFFRCw0QkFpREM7QUF0RkQscURBQXFFO0FBQ3JFLHNEQUlnQztBQUVoQyxNQUFNLFFBQVEsR0FBRyxJQUFJLEdBQUcsQ0FBQyxDQUFDLFdBQVcsRUFBRSxVQUFVLEVBQUUsV0FBVyxDQUFDLENBQUMsQ0FBQTtBQUNoRSxNQUFNLFNBQVMsR0FBRyxHQUFHLENBQUE7QUFFTixLQUFLLFVBQVUsa0JBQWtCLENBQUMsU0FBMEI7SUFDekUsTUFBTSxPQUFPLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBTTFDLENBQUE7SUFFRCxJQUFJLENBQUM7UUFDSCxPQUFPLE1BQU0sT0FBTyxDQUFDLE9BQU8sQ0FDMUIsMEJBQTBCLEVBQzFCLEdBQUcsRUFBRSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsRUFDekIsRUFBRSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsQ0FDNUIsQ0FBQTtJQUNILENBQUM7SUFBQyxPQUFPLEtBQUssRUFBRSxDQUFDO1FBQ2YsTUFBTSxNQUFNLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBQyxpQ0FBeUIsQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUNsRSxNQUFNLENBQUMsSUFBSSxDQUNULElBQUksQ0FBQyxTQUFTLENBQUM7WUFDYixLQUFLLEVBQUUsOEJBQThCO1lBQ3JDLEdBQUcsRUFBRSxzQkFBc0I7WUFDM0IsT0FBTyxFQUFFLEtBQUssWUFBWSxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUM7U0FDaEUsQ0FBQyxDQUNILENBQUE7SUFDSCxDQUFDO0FBQ0gsQ0FBQztBQUVNLEtBQUss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
|
|
@@ -7,11 +7,11 @@ function shipmentExternalId(carrier, shipment) {
|
|
|
7
7
|
const value = carrier === "foxpost"
|
|
8
8
|
? shipment.packageId ?? shipment.trackingNumber
|
|
9
9
|
: carrier === "gls"
|
|
10
|
-
? shipment.
|
|
10
|
+
? shipment.parcelNumber ?? shipment.parcelId
|
|
11
11
|
: carrier === "packeta"
|
|
12
12
|
? shipment.packetId ?? shipment.trackingNumber
|
|
13
13
|
: carrier === "dpd"
|
|
14
|
-
? shipment.
|
|
14
|
+
? shipment.parcelNumber ?? shipment.shipmentId
|
|
15
15
|
: shipment.trackingNumber;
|
|
16
16
|
return value == null ? null : String(value);
|
|
17
17
|
}
|
|
@@ -25,4 +25,4 @@ function shipmentCreateIdempotencyKey(carrier, orderId, cancelledExternalId) {
|
|
|
25
25
|
const base = `${carrier}:shipment:create:${orderId}`;
|
|
26
26
|
return cancelledExternalId ? `${base}:after:${cancelledExternalId}` : base;
|
|
27
27
|
}
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaWRlbXBvdGVuY3kuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvbGliL21vZHVsZXMvc2hpcHBpbmcvaWRlbXBvdGVuY3kudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFFQSxnREFlQztBQUVELGtFQVFDO0FBRUQsb0VBT0M7QUFsQ0QsU0FBZ0Isa0JBQWtCLENBQ2hDLE9BQXdCLEVBQ3hCLFFBQWlDO0lBRWpDLE1BQU0sS0FBSyxHQUFHLE9BQU8sS0FBSyxTQUFTO1FBQ2pDLENBQUMsQ0FBQyxRQUFRLENBQUMsU0FBUyxJQUFJLFFBQVEsQ0FBQyxjQUFjO1FBQy9DLENBQUMsQ0FBQyxPQUFPLEtBQUssS0FBSztZQUNqQixDQUFDLENBQUMsUUFBUSxDQUFDLFlBQVksSUFBSSxRQUFRLENBQUMsUUFBUTtZQUM1QyxDQUFDLENBQUMsT0FBTyxLQUFLLFNBQVM7Z0JBQ3JCLENBQUMsQ0FBQyxRQUFRLENBQUMsUUFBUSxJQUFJLFFBQVEsQ0FBQyxjQUFjO2dCQUM5QyxDQUFDLENBQUMsT0FBTyxLQUFLLEtBQUs7b0JBQ2pCLENBQUMsQ0FBQyxRQUFRLENBQUMsWUFBWSxJQUFJLFFBQVEsQ0FBQyxVQUFVO29CQUM5QyxDQUFDLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQTtJQUVqQyxPQUFPLEtBQUssSUFBSSxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFBO0FBQzdDLENBQUM7QUFFRCxTQUFnQiwyQkFBMkIsQ0FDekMsT0FBd0IsRUFDeEIsUUFBb0Q7SUFFcEQsSUFBSSxDQUFDLFFBQVEsSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sSUFBSSxFQUFFLENBQUMsQ0FBQyxXQUFXLEVBQUUsS0FBSyxXQUFXLEVBQUUsQ0FBQztRQUM3RSxPQUFPLFNBQVMsQ0FBQTtJQUNsQixDQUFDO0lBQ0QsT0FBTyxrQkFBa0IsQ0FBQyxPQUFPLEVBQUUsUUFBUSxDQUFDLElBQUksU0FBUyxDQUFBO0FBQzNELENBQUM7QUFFRCxTQUFnQiw0QkFBNEIsQ0FDMUMsT0FBd0IsRUFDeEIsT0FBZSxFQUNmLG1CQUFtQztJQUVuQyxNQUFNLElBQUksR0FBRyxHQUFHLE9BQU8sb0JBQW9CLE9BQU8sRUFBRSxDQUFBO0lBQ3BELE9BQU8sbUJBQW1CLENBQUMsQ0FBQyxDQUFDLEdBQUcsSUFBSSxVQUFVLG1CQUFtQixFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQTtBQUM1RSxDQUFDIn0=
|
|
@@ -21,4 +21,5 @@ __exportStar(require("./idempotency"), exports);
|
|
|
21
21
|
__exportStar(require("./durable-create"), exports);
|
|
22
22
|
__exportStar(require("./actions"), exports);
|
|
23
23
|
__exportStar(require("./webhooks"), exports);
|
|
24
|
-
|
|
24
|
+
__exportStar(require("./tracking"), exports);
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvbGliL21vZHVsZXMvc2hpcHBpbmcvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDBDQUF1QjtBQUN2QiwrQ0FBNEI7QUFDNUIsd0NBQXFCO0FBQ3JCLGdEQUE2QjtBQUM3QixtREFBZ0M7QUFDaEMsNENBQXlCO0FBQ3pCLDZDQUEwQjtBQUMxQiw2Q0FBMEIifQ==
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import type { ShippingCarrier, ShippingOrder, ShippingOrderService } from "./types";
|
|
2
|
+
import type { IntegrationOperationStore } from "../../../modules/integration-operation/types";
|
|
3
|
+
export type CanonicalShippingStatus = "CREATED" | "LABEL_CREATED" | "ACCEPTED" | "PROCESSING" | "IN_TRANSIT" | "AT_PICKUP_POINT" | "OUT_FOR_DELIVERY" | "DELIVERED" | "RETURNING" | "RETURNED" | "CANCELLED" | "ERROR" | "UNKNOWN";
|
|
4
|
+
export type NormalizedTrackingEvent = {
|
|
5
|
+
carrier: ShippingCarrier;
|
|
6
|
+
shipmentIdentifiers: string[];
|
|
7
|
+
status?: CanonicalShippingStatus | null;
|
|
8
|
+
rawStatus?: string | null;
|
|
9
|
+
statusText?: string | null;
|
|
10
|
+
occurredAt?: string | null;
|
|
11
|
+
eventId?: string | null;
|
|
12
|
+
source: string;
|
|
13
|
+
trackingNumber?: string | null;
|
|
14
|
+
trackingUrl?: string | null;
|
|
15
|
+
extra?: Record<string, unknown>;
|
|
16
|
+
};
|
|
17
|
+
export declare function isTerminalShippingStatus(value: unknown): boolean;
|
|
18
|
+
export declare function mapPacketaStatus(input: {
|
|
19
|
+
statusId?: unknown;
|
|
20
|
+
statusCode?: unknown;
|
|
21
|
+
isReturning?: unknown;
|
|
22
|
+
}): CanonicalShippingStatus | null;
|
|
23
|
+
export declare function mapMplPullStatus(input: {
|
|
24
|
+
categoryCode?: unknown;
|
|
25
|
+
category?: unknown;
|
|
26
|
+
description?: unknown;
|
|
27
|
+
}): CanonicalShippingStatus | null;
|
|
28
|
+
export declare function mapMplPushStatus(status: unknown, statusText?: unknown): CanonicalShippingStatus | null;
|
|
29
|
+
export declare function mapDpdStatusdataScanCode(scanCode: unknown, serviceCode?: unknown): CanonicalShippingStatus | null;
|
|
30
|
+
export declare function applyNormalizedTrackingEvent(input: {
|
|
31
|
+
orderService: ShippingOrderService;
|
|
32
|
+
event: NormalizedTrackingEvent;
|
|
33
|
+
operationStore?: IntegrationOperationStore;
|
|
34
|
+
}): Promise<{
|
|
35
|
+
duplicate: boolean;
|
|
36
|
+
orderId: {} | null;
|
|
37
|
+
status: {} | null;
|
|
38
|
+
stale?: undefined;
|
|
39
|
+
terminalRegression?: undefined;
|
|
40
|
+
} | {
|
|
41
|
+
orderId: string;
|
|
42
|
+
status: {} | null;
|
|
43
|
+
stale: boolean;
|
|
44
|
+
terminalRegression: boolean;
|
|
45
|
+
duplicate?: undefined;
|
|
46
|
+
} | null>;
|
|
47
|
+
export declare function findOrderByShipmentIdentifiers(orderService: ShippingOrderService, carrier: ShippingCarrier, identifiers: string[], operationStore?: IntegrationOperationStore): Promise<ShippingOrder | undefined>;
|
|
48
|
+
export declare function shipmentMatches(order: ShippingOrder, carrier: ShippingCarrier, identifiers: Set<string>): boolean;
|
|
@@ -0,0 +1,368 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isTerminalShippingStatus = isTerminalShippingStatus;
|
|
4
|
+
exports.mapPacketaStatus = mapPacketaStatus;
|
|
5
|
+
exports.mapMplPullStatus = mapMplPullStatus;
|
|
6
|
+
exports.mapMplPushStatus = mapMplPushStatus;
|
|
7
|
+
exports.mapDpdStatusdataScanCode = mapDpdStatusdataScanCode;
|
|
8
|
+
exports.applyNormalizedTrackingEvent = applyNormalizedTrackingEvent;
|
|
9
|
+
exports.findOrderByShipmentIdentifiers = findOrderByShipmentIdentifiers;
|
|
10
|
+
exports.shipmentMatches = shipmentMatches;
|
|
11
|
+
const node_crypto_1 = require("node:crypto");
|
|
12
|
+
const operations_1 = require("./operations");
|
|
13
|
+
const state_1 = require("../../../modules/integration-operation/state");
|
|
14
|
+
const TERMINAL = new Set([
|
|
15
|
+
"DELIVERED",
|
|
16
|
+
"RETURNED",
|
|
17
|
+
"CANCELLED",
|
|
18
|
+
]);
|
|
19
|
+
function isTerminalShippingStatus(value) {
|
|
20
|
+
return TERMINAL.has(String(value || "").toUpperCase());
|
|
21
|
+
}
|
|
22
|
+
function mapPacketaStatus(input) {
|
|
23
|
+
const id = Number(input.statusId);
|
|
24
|
+
const code = String(input.statusCode || "").trim().toLowerCase();
|
|
25
|
+
const returning = input.isReturning === true || input.isReturning === 1 || input.isReturning === "1";
|
|
26
|
+
if (returning && (id === 7 || code.includes("delivered") || code.includes("returned"))) {
|
|
27
|
+
return "RETURNED";
|
|
28
|
+
}
|
|
29
|
+
if (returning)
|
|
30
|
+
return "RETURNING";
|
|
31
|
+
if (code.includes("cancel"))
|
|
32
|
+
return "CANCELLED";
|
|
33
|
+
if (code.includes("returned"))
|
|
34
|
+
return "RETURNED";
|
|
35
|
+
if (code.includes("return"))
|
|
36
|
+
return "RETURNING";
|
|
37
|
+
if (code.includes("delivered"))
|
|
38
|
+
return "DELIVERED";
|
|
39
|
+
if (code.includes("ready for pickup") || code.includes("ready for pick-up"))
|
|
40
|
+
return "AT_PICKUP_POINT";
|
|
41
|
+
if (code.includes("out for delivery"))
|
|
42
|
+
return "OUT_FOR_DELIVERY";
|
|
43
|
+
if (code.includes("received data"))
|
|
44
|
+
return "CREATED";
|
|
45
|
+
if (code.includes("arrived") || code.includes("departed") || code.includes("handed to carrier") || code.includes("prepared for departure")) {
|
|
46
|
+
return "IN_TRANSIT";
|
|
47
|
+
}
|
|
48
|
+
if (id === 1)
|
|
49
|
+
return "CREATED";
|
|
50
|
+
if ([2, 3, 4, 6].includes(id))
|
|
51
|
+
return "IN_TRANSIT";
|
|
52
|
+
if (id === 5)
|
|
53
|
+
return "AT_PICKUP_POINT";
|
|
54
|
+
if (id === 7)
|
|
55
|
+
return "DELIVERED";
|
|
56
|
+
if (id === 25)
|
|
57
|
+
return "IN_TRANSIT";
|
|
58
|
+
return null;
|
|
59
|
+
}
|
|
60
|
+
function mapMplPullStatus(input) {
|
|
61
|
+
const categoryCode = Number(input.categoryCode);
|
|
62
|
+
const category = normalizeText(input.category);
|
|
63
|
+
const description = normalizeText(input.description);
|
|
64
|
+
if (containsAny(description, [
|
|
65
|
+
"feladónak visszakézbesítve",
|
|
66
|
+
"returned to sender",
|
|
67
|
+
"returned to the sender",
|
|
68
|
+
]))
|
|
69
|
+
return "RETURNED";
|
|
70
|
+
if (containsAny(description, [
|
|
71
|
+
"visszaküldés alatt",
|
|
72
|
+
"return to sender",
|
|
73
|
+
"returning to sender",
|
|
74
|
+
]))
|
|
75
|
+
return "RETURNING";
|
|
76
|
+
if (containsAny(description, [
|
|
77
|
+
"sikeresen kézbesítve",
|
|
78
|
+
"sikeres kézbesítés",
|
|
79
|
+
"successfully delivered",
|
|
80
|
+
]))
|
|
81
|
+
return "DELIVERED";
|
|
82
|
+
if (categoryCode === 5 || category.includes("kézbesített") || category.includes("delivered")) {
|
|
83
|
+
// MPL category 5 also contains non-delivery accounting events and
|
|
84
|
+
// return-to-sender events, so never infer DELIVERED from the category alone.
|
|
85
|
+
return null;
|
|
86
|
+
}
|
|
87
|
+
if (categoryCode === 4 || category.includes("kézbesítés") || category.includes("delivery")) {
|
|
88
|
+
if (containsAny(description, [
|
|
89
|
+
"postán átvehető",
|
|
90
|
+
"postaponton",
|
|
91
|
+
"csomagautomatából átvehető",
|
|
92
|
+
"ready for pickup",
|
|
93
|
+
"ready for pick-up",
|
|
94
|
+
]))
|
|
95
|
+
return "AT_PICKUP_POINT";
|
|
96
|
+
if (containsAny(description, [
|
|
97
|
+
"kézbesítőnél van",
|
|
98
|
+
"handed over to delivery man",
|
|
99
|
+
"out for delivery",
|
|
100
|
+
]))
|
|
101
|
+
return "OUT_FOR_DELIVERY";
|
|
102
|
+
return "IN_TRANSIT";
|
|
103
|
+
}
|
|
104
|
+
if (categoryCode === 3 || category.includes("szállítás") || category.includes("transport")) {
|
|
105
|
+
if (containsAny(description, ["nem kézbesíthető", "undeliverable"]))
|
|
106
|
+
return "RETURNING";
|
|
107
|
+
return "IN_TRANSIT";
|
|
108
|
+
}
|
|
109
|
+
if (categoryCode === 2 || category.includes("feldolgozás") || category.includes("processing"))
|
|
110
|
+
return "PROCESSING";
|
|
111
|
+
if (categoryCode === 1 || category.includes("felvétel") || category.includes("acceptance"))
|
|
112
|
+
return "ACCEPTED";
|
|
113
|
+
return null;
|
|
114
|
+
}
|
|
115
|
+
function mapMplPushStatus(status, statusText) {
|
|
116
|
+
const value = normalizeText(status);
|
|
117
|
+
const text = normalizeText(statusText);
|
|
118
|
+
if (containsAny(text, ["returned to sender", "feladónak visszakézbesítve"]))
|
|
119
|
+
return "RETURNED";
|
|
120
|
+
if (containsAny(value, ["returned", "return delivered"]))
|
|
121
|
+
return "RETURNED";
|
|
122
|
+
if (containsAny(value, ["return", "returning"]))
|
|
123
|
+
return "RETURNING";
|
|
124
|
+
if (containsAny(value, ["delivered"]))
|
|
125
|
+
return "DELIVERED";
|
|
126
|
+
if (containsAny(value, ["delivery"])) {
|
|
127
|
+
if (containsAny(text, ["ready for pickup", "ready for pick-up", "átvehető"]))
|
|
128
|
+
return "AT_PICKUP_POINT";
|
|
129
|
+
return "OUT_FOR_DELIVERY";
|
|
130
|
+
}
|
|
131
|
+
if (containsAny(value, ["transport", "transit"]))
|
|
132
|
+
return "IN_TRANSIT";
|
|
133
|
+
if (containsAny(value, ["processing"]))
|
|
134
|
+
return "PROCESSING";
|
|
135
|
+
if (containsAny(value, ["acceptance", "accepted"]))
|
|
136
|
+
return "ACCEPTED";
|
|
137
|
+
return null;
|
|
138
|
+
}
|
|
139
|
+
function mapDpdStatusdataScanCode(scanCode, serviceCode) {
|
|
140
|
+
const code = String(scanCode ?? "").trim().padStart(2, "0");
|
|
141
|
+
const service = String(serviceCode ?? "").trim();
|
|
142
|
+
if (code === "13") {
|
|
143
|
+
return ["298", "299", "300", "301"].includes(service)
|
|
144
|
+
? "RETURNED"
|
|
145
|
+
: "DELIVERED";
|
|
146
|
+
}
|
|
147
|
+
if (code === "23")
|
|
148
|
+
return "AT_PICKUP_POINT";
|
|
149
|
+
if (code === "03")
|
|
150
|
+
return "OUT_FOR_DELIVERY";
|
|
151
|
+
if (code === "14")
|
|
152
|
+
return "ERROR";
|
|
153
|
+
if (code === "05" || code === "15")
|
|
154
|
+
return "ACCEPTED";
|
|
155
|
+
if (["02", "04", "06", "08", "09", "10", "20"].includes(code)) {
|
|
156
|
+
return "IN_TRANSIT";
|
|
157
|
+
}
|
|
158
|
+
// DPD 18 is explicitly an information scan that can represent different
|
|
159
|
+
// states, including calculated delivery/release, so it must not be guessed.
|
|
160
|
+
return null;
|
|
161
|
+
}
|
|
162
|
+
async function applyNormalizedTrackingEvent(input) {
|
|
163
|
+
const identifiers = uniqueStrings(input.event.shipmentIdentifiers);
|
|
164
|
+
if (!identifiers.length)
|
|
165
|
+
throw new Error("Hiányzó tracking/csomagazonosító.");
|
|
166
|
+
const fingerprint = input.event.eventId || (0, node_crypto_1.createHash)("sha256")
|
|
167
|
+
.update([
|
|
168
|
+
input.event.carrier,
|
|
169
|
+
input.event.source,
|
|
170
|
+
identifiers.join(","),
|
|
171
|
+
input.event.rawStatus || input.event.status || "",
|
|
172
|
+
input.event.occurredAt || "",
|
|
173
|
+
].join("|"))
|
|
174
|
+
.digest("hex");
|
|
175
|
+
const acquired = input.operationStore
|
|
176
|
+
? await (0, state_1.acquireOperation)(input.operationStore, {
|
|
177
|
+
provider: input.event.carrier,
|
|
178
|
+
operation_type: `status.${input.event.source}`,
|
|
179
|
+
entity_type: "shipment",
|
|
180
|
+
entity_id: identifiers[0],
|
|
181
|
+
external_id: identifiers[0],
|
|
182
|
+
idempotency_key: `${input.event.carrier}:status:${input.event.source}:${fingerprint}`,
|
|
183
|
+
reference_data: {
|
|
184
|
+
replay_safe: true,
|
|
185
|
+
identifiers,
|
|
186
|
+
status: input.event.status ?? null,
|
|
187
|
+
raw_status: input.event.rawStatus ?? null,
|
|
188
|
+
occurred_at: input.event.occurredAt ?? null,
|
|
189
|
+
},
|
|
190
|
+
})
|
|
191
|
+
: null;
|
|
192
|
+
if (acquired && !acquired.acquired) {
|
|
193
|
+
if (acquired.operation.status !== "succeeded") {
|
|
194
|
+
// A concurrent/stale worker may still own this event. Returning null keeps
|
|
195
|
+
// stream cursors and Statusdata files retryable until the operation either
|
|
196
|
+
// succeeds or the existing reconciliation logic moves it to failed.
|
|
197
|
+
return null;
|
|
198
|
+
}
|
|
199
|
+
return {
|
|
200
|
+
duplicate: true,
|
|
201
|
+
orderId: acquired.operation.reference_data?.order_id ?? null,
|
|
202
|
+
status: acquired.operation.reference_data?.status ?? input.event.status ?? null,
|
|
203
|
+
};
|
|
204
|
+
}
|
|
205
|
+
try {
|
|
206
|
+
const order = await findOrderByShipmentIdentifiers(input.orderService, input.event.carrier, identifiers, input.operationStore);
|
|
207
|
+
if (!order) {
|
|
208
|
+
if (acquired && input.operationStore) {
|
|
209
|
+
await (0, state_1.operationFailed)(input.operationStore, acquired.operation, new Error("Tracking eseményhez nem található rendelés."), false, identifiers[0], {
|
|
210
|
+
...(acquired.operation.reference_data ?? {}),
|
|
211
|
+
replay_safe: true,
|
|
212
|
+
identifiers,
|
|
213
|
+
retry_reason: "order_not_found",
|
|
214
|
+
});
|
|
215
|
+
}
|
|
216
|
+
return null;
|
|
217
|
+
}
|
|
218
|
+
const rawCurrent = order.metadata?.[input.event.carrier];
|
|
219
|
+
const current = rawCurrent && typeof rawCurrent === "object"
|
|
220
|
+
? rawCurrent
|
|
221
|
+
: {};
|
|
222
|
+
const hasCanonicalStatus = Boolean(input.event.status);
|
|
223
|
+
const incomingTime = hasCanonicalStatus ? parseTime(input.event.occurredAt) : null;
|
|
224
|
+
const currentTime = parseTime(current.statusUpdatedAt ?? current.status_updated_at);
|
|
225
|
+
const currentStatus = String(current.status || "").toUpperCase();
|
|
226
|
+
const nextStatus = input.event.status || currentStatus || "UNKNOWN";
|
|
227
|
+
const stale = hasCanonicalStatus && incomingTime != null && currentTime != null && incomingTime < currentTime;
|
|
228
|
+
const terminalRegression = hasCanonicalStatus && isTerminalShippingStatus(currentStatus) && !isTerminalShippingStatus(nextStatus);
|
|
229
|
+
if (stale || terminalRegression) {
|
|
230
|
+
if (acquired && input.operationStore) {
|
|
231
|
+
await (0, state_1.operationSucceeded)(input.operationStore, acquired.operation, identifiers[0], {
|
|
232
|
+
...(acquired.operation.reference_data ?? {}),
|
|
233
|
+
replay_safe: true,
|
|
234
|
+
order_id: order.id,
|
|
235
|
+
status: current.status ?? null,
|
|
236
|
+
stale,
|
|
237
|
+
terminal_regression: terminalRegression,
|
|
238
|
+
});
|
|
239
|
+
}
|
|
240
|
+
return {
|
|
241
|
+
orderId: order.id,
|
|
242
|
+
status: current.status ?? null,
|
|
243
|
+
stale,
|
|
244
|
+
terminalRegression,
|
|
245
|
+
};
|
|
246
|
+
}
|
|
247
|
+
const eventAt = input.event.occurredAt || new Date().toISOString();
|
|
248
|
+
const statusUpdatedAt = hasCanonicalStatus
|
|
249
|
+
? eventAt
|
|
250
|
+
: String(current.statusUpdatedAt ?? current.status_updated_at ?? "") || undefined;
|
|
251
|
+
const shipment = {
|
|
252
|
+
...current,
|
|
253
|
+
...(input.event.extra ?? {}),
|
|
254
|
+
status: nextStatus,
|
|
255
|
+
...(statusUpdatedAt ? { statusUpdatedAt } : {}),
|
|
256
|
+
trackingSource: input.event.source,
|
|
257
|
+
trackingEventId: input.event.eventId || fingerprint,
|
|
258
|
+
lastTrackingEventAt: eventAt,
|
|
259
|
+
...(hasCanonicalStatus && input.event.rawStatus != null ? { rawStatus: input.event.rawStatus } : {}),
|
|
260
|
+
...(hasCanonicalStatus && input.event.statusText != null ? { statusDescription: input.event.statusText } : {}),
|
|
261
|
+
...(input.event.trackingNumber ? { trackingNumber: input.event.trackingNumber } : {}),
|
|
262
|
+
...(input.event.trackingUrl ? { trackingUrl: input.event.trackingUrl } : {}),
|
|
263
|
+
...(hasCanonicalStatus && nextStatus === "DELIVERED" ? { deliveredAt: eventAt } : {}),
|
|
264
|
+
...(hasCanonicalStatus && nextStatus === "RETURNED" ? { returnedAt: eventAt } : {}),
|
|
265
|
+
};
|
|
266
|
+
const next = (0, operations_1.appendShippingOperation)({ ...(order.metadata ?? {}), [input.event.carrier]: shipment }, {
|
|
267
|
+
carrier: input.event.carrier,
|
|
268
|
+
action: "status",
|
|
269
|
+
status: "success",
|
|
270
|
+
actorId: `${input.event.carrier}-${input.event.source}`,
|
|
271
|
+
durationMs: 0,
|
|
272
|
+
message: `${carrierName(input.event.carrier)}: tracking státusz frissítve (${input.event.source}).`,
|
|
273
|
+
response: {
|
|
274
|
+
status: nextStatus,
|
|
275
|
+
rawStatus: input.event.rawStatus ?? null,
|
|
276
|
+
source: input.event.source,
|
|
277
|
+
identifiers,
|
|
278
|
+
},
|
|
279
|
+
});
|
|
280
|
+
await input.orderService.updateOrders([{ id: order.id, metadata: next.metadata }]);
|
|
281
|
+
if (acquired && input.operationStore) {
|
|
282
|
+
await (0, state_1.operationSucceeded)(input.operationStore, acquired.operation, identifiers[0], {
|
|
283
|
+
...(acquired.operation.reference_data ?? {}),
|
|
284
|
+
replay_safe: true,
|
|
285
|
+
order_id: order.id,
|
|
286
|
+
status: nextStatus,
|
|
287
|
+
identifiers,
|
|
288
|
+
});
|
|
289
|
+
}
|
|
290
|
+
return { orderId: order.id, status: nextStatus, duplicate: false };
|
|
291
|
+
}
|
|
292
|
+
catch (error) {
|
|
293
|
+
if (acquired && input.operationStore) {
|
|
294
|
+
await (0, state_1.operationFailed)(input.operationStore, acquired.operation, error, false, identifiers[0], acquired.operation.reference_data ?? undefined);
|
|
295
|
+
}
|
|
296
|
+
throw error;
|
|
297
|
+
}
|
|
298
|
+
}
|
|
299
|
+
async function findOrderByShipmentIdentifiers(orderService, carrier, identifiers, operationStore) {
|
|
300
|
+
const ids = new Set(uniqueStrings(identifiers));
|
|
301
|
+
if (operationStore) {
|
|
302
|
+
for (const identifier of ids) {
|
|
303
|
+
const operations = await operationStore.listIntegrationOperations({
|
|
304
|
+
provider: carrier,
|
|
305
|
+
operation_type: "shipment.create",
|
|
306
|
+
entity_type: "order",
|
|
307
|
+
status: "succeeded",
|
|
308
|
+
external_id: identifier,
|
|
309
|
+
}, { take: 5, order: { updated_at: "DESC" } });
|
|
310
|
+
const entityId = operations.find((item) => item.entity_id)?.entity_id;
|
|
311
|
+
if (entityId)
|
|
312
|
+
return orderService.retrieveOrder(entityId);
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
const pageSize = 200;
|
|
316
|
+
for (let skip = 0;; skip += pageSize) {
|
|
317
|
+
const orders = await orderService.listOrders({}, { take: pageSize, skip, order: { created_at: "DESC" } });
|
|
318
|
+
const match = orders.find((order) => shipmentMatches(order, carrier, ids));
|
|
319
|
+
if (match)
|
|
320
|
+
return match;
|
|
321
|
+
if (orders.length < pageSize)
|
|
322
|
+
break;
|
|
323
|
+
}
|
|
324
|
+
return undefined;
|
|
325
|
+
}
|
|
326
|
+
function shipmentMatches(order, carrier, identifiers) {
|
|
327
|
+
const raw = order.metadata?.[carrier];
|
|
328
|
+
if (!raw || typeof raw !== "object")
|
|
329
|
+
return false;
|
|
330
|
+
const shipment = raw;
|
|
331
|
+
const candidates = carrier === "foxpost"
|
|
332
|
+
? [shipment.packageId, shipment.trackingNumber]
|
|
333
|
+
: carrier === "gls"
|
|
334
|
+
? [shipment.parcelNumber, shipment.parcelId, shipment.trackingNumber]
|
|
335
|
+
: carrier === "packeta"
|
|
336
|
+
? [shipment.packetId, shipment.barcode, shipment.trackingNumber, shipment.courierNumber]
|
|
337
|
+
: carrier === "dpd"
|
|
338
|
+
? [shipment.parcelNumber, shipment.trackingNumber, shipment.shipmentId]
|
|
339
|
+
: [shipment.trackingNumber, ...(Array.isArray(shipment.packageTrackingNumbers) ? shipment.packageTrackingNumbers : [])];
|
|
340
|
+
return candidates.some((candidate) => identifiers.has(String(candidate ?? "").trim()));
|
|
341
|
+
}
|
|
342
|
+
function carrierName(carrier) {
|
|
343
|
+
if (carrier === "foxpost")
|
|
344
|
+
return "FOXPOST";
|
|
345
|
+
if (carrier === "gls")
|
|
346
|
+
return "GLS";
|
|
347
|
+
if (carrier === "packeta")
|
|
348
|
+
return "Packeta";
|
|
349
|
+
if (carrier === "dpd")
|
|
350
|
+
return "DPD";
|
|
351
|
+
return "MPL";
|
|
352
|
+
}
|
|
353
|
+
function uniqueStrings(values) {
|
|
354
|
+
return [...new Set(values.map((value) => String(value ?? "").trim()).filter(Boolean))];
|
|
355
|
+
}
|
|
356
|
+
function parseTime(value) {
|
|
357
|
+
if (!value)
|
|
358
|
+
return null;
|
|
359
|
+
const time = Date.parse(String(value));
|
|
360
|
+
return Number.isFinite(time) ? time : null;
|
|
361
|
+
}
|
|
362
|
+
function normalizeText(value) {
|
|
363
|
+
return String(value ?? "").trim().toLowerCase();
|
|
364
|
+
}
|
|
365
|
+
function containsAny(value, needles) {
|
|
366
|
+
return needles.some((needle) => value.includes(needle));
|
|
367
|
+
}
|
|
368
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tracking.js","sourceRoot":"","sources":["../../../../../../src/lib/modules/shipping/tracking.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,21 +1,18 @@
|
|
|
1
|
-
import type { ShippingOrderService } from "./types";
|
|
2
1
|
import type { IntegrationOperationStore } from "../../../modules/integration-operation/types";
|
|
2
|
+
import type { ShippingOrderService } from "./types";
|
|
3
3
|
type ShippingWebhookCarrier = "foxpost" | "gls";
|
|
4
4
|
export declare function verifyShippingWebhook(provided: unknown): boolean;
|
|
5
5
|
export declare function applyCarrierWebhook(orderService: ShippingOrderService, carrier: ShippingWebhookCarrier, body: unknown, operationStore?: IntegrationOperationStore): Promise<{
|
|
6
6
|
duplicate: boolean;
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
orderId: {} | null;
|
|
8
|
+
status: {} | null;
|
|
9
9
|
stale?: undefined;
|
|
10
|
+
terminalRegression?: undefined;
|
|
10
11
|
} | {
|
|
11
12
|
orderId: string;
|
|
12
|
-
status:
|
|
13
|
+
status: {} | null;
|
|
13
14
|
stale: boolean;
|
|
15
|
+
terminalRegression: boolean;
|
|
14
16
|
duplicate?: undefined;
|
|
15
|
-
} | {
|
|
16
|
-
orderId: string;
|
|
17
|
-
status: "CANCELLED" | "CREATED" | "LABEL_CREATED" | "HANDED_OVER" | "IN_TRANSIT" | "AT_LOCKER" | "OUT_FOR_DELIVERY" | "DELIVERED" | "RETURNING" | "RETURNED" | "ERROR" | "UNKNOWN";
|
|
18
|
-
duplicate?: undefined;
|
|
19
|
-
stale?: undefined;
|
|
20
17
|
} | null>;
|
|
21
18
|
export {};
|