@legenki/print2medusa 0.6.0 → 0.7.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.
|
@@ -64,7 +64,21 @@ class PrintfulFulfillmentProviderService extends utils_1.AbstractFulfillmentProv
|
|
|
64
64
|
(shipping_rates_1.PRINTFUL_SHIPPING_METHODS.includes(id) ||
|
|
65
65
|
id === shipping_rates_1.PRINTFUL_RETURN_OPTION_ID));
|
|
66
66
|
}
|
|
67
|
-
|
|
67
|
+
/**
|
|
68
|
+
* Validate the selected method and record whether Printful confirmed it.
|
|
69
|
+
*
|
|
70
|
+
* Medusa persists this return value verbatim as `shipping_method.data`
|
|
71
|
+
* (`add-shipping-method-to-cart.js:116`), and `complete-cart.js:405` copies
|
|
72
|
+
* it onto the order — which is what makes this the right place to record the
|
|
73
|
+
* confirmation. 0.3.0 stamped these fields onto `calculatePrice`'s return
|
|
74
|
+
* value instead, which Medusa discards, so the feature was dead code.
|
|
75
|
+
*
|
|
76
|
+
* Everything except the unrecognized-id throw fails soft. This runs once, at
|
|
77
|
+
* selection, so an API call is affordable here in a way it is not on the
|
|
78
|
+
* pricing path — but a confirmation failure must never block a sale, and an
|
|
79
|
+
* unconfirmed method simply lets Printful choose, exactly as it does today.
|
|
80
|
+
*/
|
|
81
|
+
async validateFulfillmentData(optionData, data, context) {
|
|
68
82
|
// Runs when the method is added to the cart, not on every price refresh, so
|
|
69
83
|
// throwing here does not violate calculatePrice's never-throw constraint.
|
|
70
84
|
// Inventing a default would record one method on the order while the
|
|
@@ -82,7 +96,85 @@ class PrintfulFulfillmentProviderService extends utils_1.AbstractFulfillmentProv
|
|
|
82
96
|
`(${JSON.stringify(id)}). Recreate it against one of: ` +
|
|
83
97
|
`${[...shipping_rates_1.PRINTFUL_SHIPPING_METHODS, shipping_rates_1.PRINTFUL_RETURN_OPTION_ID].join(", ")}.`);
|
|
84
98
|
}
|
|
85
|
-
|
|
99
|
+
const validated = { ...data, printful_option_id: id };
|
|
100
|
+
// Printful quotes outbound shipping only, so a return has nothing to
|
|
101
|
+
// confirm against — `canCalculate` already excludes it from live rates for
|
|
102
|
+
// the same reason. It carries no rate_source at all.
|
|
103
|
+
if (id === shipping_rates_1.PRINTFUL_RETURN_OPTION_ID) {
|
|
104
|
+
return validated;
|
|
105
|
+
}
|
|
106
|
+
let confirmation;
|
|
107
|
+
try {
|
|
108
|
+
confirmation = await this.confirmSelectedMethod(id, context);
|
|
109
|
+
}
|
|
110
|
+
catch (err) {
|
|
111
|
+
// A bug in our own code must not block a sale any more than a Printful
|
|
112
|
+
// outage does.
|
|
113
|
+
this.logger_.error(`Printful method confirmation failed unexpectedly: ${err instanceof Error ? err.message : String(err)}`);
|
|
114
|
+
confirmation = "printful_unreachable";
|
|
115
|
+
}
|
|
116
|
+
if (confirmation !== "live") {
|
|
117
|
+
// No `printful_shipping`: the order path sends an override only for a
|
|
118
|
+
// method Printful confirmed, so omitting it lets Printful pick — the
|
|
119
|
+
// behaviour every order had before this release.
|
|
120
|
+
this.logger_.debug?.(`Printful method ${id} not confirmed (${confirmation}); ` +
|
|
121
|
+
"the order will let Printful choose the shipping method.");
|
|
122
|
+
return { ...validated, rate_source: confirmation };
|
|
123
|
+
}
|
|
124
|
+
return {
|
|
125
|
+
...validated,
|
|
126
|
+
printful_shipping: id,
|
|
127
|
+
rate_source: "live",
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
/**
|
|
131
|
+
* Ask whether Printful offers this method for this cart.
|
|
132
|
+
*
|
|
133
|
+
* Goes through `planRateRequest`, the same seam `calculatePrice` uses, so the
|
|
134
|
+
* two compute the same cache key and this usually reads the entry pricing
|
|
135
|
+
* wrote seconds earlier rather than hitting the API.
|
|
136
|
+
*
|
|
137
|
+
* A stale entry never confirms, and a failed re-fetch does not fall back to
|
|
138
|
+
* one the way `staleOrFlat` does — `confirmMethod` encodes that rule and this
|
|
139
|
+
* does not work around it.
|
|
140
|
+
*/
|
|
141
|
+
async confirmSelectedMethod(methodId, ctx) {
|
|
142
|
+
const plan = await this.planRateRequest(ctx);
|
|
143
|
+
if (!plan.ok) {
|
|
144
|
+
// `incomplete_address` cannot reach a shipping-method selection in
|
|
145
|
+
// practice, but it is not a FallbackReason we want to invent a meaning
|
|
146
|
+
// for either; reporting it as unreachable would misdirect an operator to
|
|
147
|
+
// Printful's status page, so it is recorded as-is.
|
|
148
|
+
return plan.reason;
|
|
149
|
+
}
|
|
150
|
+
const { recipient, items, currency, cacheKey } = plan;
|
|
151
|
+
const cached = await this.readCache(cacheKey);
|
|
152
|
+
const fromCache = (0, shipping_rates_1.confirmMethod)({
|
|
153
|
+
cached,
|
|
154
|
+
freshnessMs: this.freshnessMs_,
|
|
155
|
+
methodId,
|
|
156
|
+
currency,
|
|
157
|
+
});
|
|
158
|
+
if (fromCache.confirmation === "live") {
|
|
159
|
+
return "live";
|
|
160
|
+
}
|
|
161
|
+
let rates;
|
|
162
|
+
try {
|
|
163
|
+
rates = await this.client_.getShippingRates({
|
|
164
|
+
recipient,
|
|
165
|
+
items,
|
|
166
|
+
...(currency ? { currency } : {}),
|
|
167
|
+
});
|
|
168
|
+
}
|
|
169
|
+
catch (err) {
|
|
170
|
+
this.logger_.warn(`Printful method confirmation could not reach Printful: ${err instanceof Error ? err.message : String(err)}`);
|
|
171
|
+
return "printful_unreachable";
|
|
172
|
+
}
|
|
173
|
+
// Written back under the shared key so a subsequent price refresh reuses
|
|
174
|
+
// this response instead of paying for another call.
|
|
175
|
+
await this.writeCache(cacheKey, { rates, currency, cached_at: Date.now() }, this.staleSeconds_);
|
|
176
|
+
const selected = (0, shipping_rates_1.selectRate)(rates, methodId, currency);
|
|
177
|
+
return selected.ok ? "live" : selected.reason;
|
|
86
178
|
}
|
|
87
179
|
async canCalculate(data) {
|
|
88
180
|
const optionId = data?.data?.id;
|
|
@@ -114,48 +206,11 @@ class PrintfulFulfillmentProviderService extends utils_1.AbstractFulfillmentProv
|
|
|
114
206
|
}
|
|
115
207
|
async quote(methodId, context) {
|
|
116
208
|
const ctx = context;
|
|
117
|
-
|
|
118
|
-
|
|
209
|
+
const plan = await this.planRateRequest(ctx);
|
|
210
|
+
if (!plan.ok) {
|
|
211
|
+
return this.fallback(methodId, plan.reason);
|
|
119
212
|
}
|
|
120
|
-
const
|
|
121
|
-
const countryCode = (addr.country_code ?? "").toUpperCase();
|
|
122
|
-
const stateCode = (0, mappers_1.resolveStateCode)(addr.province, countryCode);
|
|
123
|
-
if (!(0, shipping_rates_1.isAddressQuotable)({ country_code: countryCode, state_code: stateCode })) {
|
|
124
|
-
return this.fallback(methodId, "incomplete_address");
|
|
125
|
-
}
|
|
126
|
-
const lines = (ctx.items ?? [])
|
|
127
|
-
.filter((i) => i.variant?.id)
|
|
128
|
-
.map((i) => ({
|
|
129
|
-
variant_id: i.variant.id,
|
|
130
|
-
quantity: Number(i.quantity ?? 1),
|
|
131
|
-
unit_price: i.unit_price,
|
|
132
|
-
}));
|
|
133
|
-
let catalogIds;
|
|
134
|
-
try {
|
|
135
|
-
catalogIds = await this.catalogIdsFor(lines.map((l) => l.variant_id));
|
|
136
|
-
}
|
|
137
|
-
catch (err) {
|
|
138
|
-
// Our own database, not Printful. Misreporting this sends the operator
|
|
139
|
-
// to Printful's status page during their own incident.
|
|
140
|
-
this.logger_.error(`Printful rate lookup: variant query failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
141
|
-
return this.fallback(methodId, "query_unavailable");
|
|
142
|
-
}
|
|
143
|
-
// Resolved before the items are built: each line's `value` is denominated
|
|
144
|
-
// in the cart's currency, so it decides how the minor units convert out.
|
|
145
|
-
const currency = (ctx.currency_code ?? "").toUpperCase();
|
|
146
|
-
const items = (0, shipping_rates_1.buildRateItems)(lines, catalogIds, currency);
|
|
147
|
-
if (!items.length) {
|
|
148
|
-
return this.fallback(methodId, "no_printful_items");
|
|
149
|
-
}
|
|
150
|
-
const recipient = {
|
|
151
|
-
country_code: countryCode,
|
|
152
|
-
...(stateCode ? { state_code: stateCode } : {}),
|
|
153
|
-
...(addr.city ? { city: addr.city } : {}),
|
|
154
|
-
...(addr.postal_code ? { zip: addr.postal_code } : {}),
|
|
155
|
-
...(addr.address_1 ? { address1: addr.address_1 } : {}),
|
|
156
|
-
...(addr.address_2 ? { address2: addr.address_2 } : {}),
|
|
157
|
-
};
|
|
158
|
-
const cacheKey = (0, shipping_rates_1.buildRateCacheKey)({ address: recipient, items, currency });
|
|
213
|
+
const { recipient, items, currency, cacheKey } = plan;
|
|
159
214
|
const cached = await this.readCache(cacheKey);
|
|
160
215
|
// A negative age means the entry is dated in the future — clock skew on the
|
|
161
216
|
// cache node — which would otherwise read as fresh until that date passes.
|
|
@@ -186,6 +241,39 @@ class PrintfulFulfillmentProviderService extends utils_1.AbstractFulfillmentProv
|
|
|
186
241
|
}
|
|
187
242
|
return this.priced(selected.amount, methodId, "live");
|
|
188
243
|
}
|
|
244
|
+
/**
|
|
245
|
+
* Build the Printful rate request and cache key for a cart context.
|
|
246
|
+
*
|
|
247
|
+
* The single seam `calculatePrice` and the confirm path both go through, so
|
|
248
|
+
* the two can never compute different cache keys for the same cart. It owns
|
|
249
|
+
* the parts that need the container — the `query` guard and the catalog-id
|
|
250
|
+
* lookup — and delegates the rest to the pure `buildRateRequest`.
|
|
251
|
+
*/
|
|
252
|
+
async planRateRequest(ctx) {
|
|
253
|
+
if (!this.query_) {
|
|
254
|
+
return { ok: false, reason: "query_unavailable" };
|
|
255
|
+
}
|
|
256
|
+
const addr = ctx.shipping_address ?? {};
|
|
257
|
+
const countryCode = (addr.country_code ?? "").toUpperCase();
|
|
258
|
+
const stateCode = (0, mappers_1.resolveStateCode)(addr.province, countryCode);
|
|
259
|
+
// The address guard runs before the query, so an unquotable address never
|
|
260
|
+
// costs a database round trip on every storefront cart refresh.
|
|
261
|
+
if (!(0, shipping_rates_1.isAddressQuotable)({ country_code: countryCode, state_code: stateCode })) {
|
|
262
|
+
return { ok: false, reason: "incomplete_address" };
|
|
263
|
+
}
|
|
264
|
+
const lines = (0, shipping_rates_1.rateLinesFrom)(ctx);
|
|
265
|
+
let catalogIds;
|
|
266
|
+
try {
|
|
267
|
+
catalogIds = await this.catalogIdsFor(lines.map((l) => l.variant_id));
|
|
268
|
+
}
|
|
269
|
+
catch (err) {
|
|
270
|
+
// Our own database, not Printful. Misreporting this sends the operator
|
|
271
|
+
// to Printful's status page during their own incident.
|
|
272
|
+
this.logger_.error(`Printful rate lookup: variant query failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
273
|
+
return { ok: false, reason: "query_unavailable" };
|
|
274
|
+
}
|
|
275
|
+
return (0, shipping_rates_1.buildRateRequest)(ctx, lines, catalogIds, stateCode);
|
|
276
|
+
}
|
|
189
277
|
/** Look up Printful catalog variant ids for a set of Medusa variant ids. */
|
|
190
278
|
async catalogIdsFor(variantIds) {
|
|
191
279
|
const map = new Map();
|
|
@@ -359,4 +447,4 @@ class PrintfulFulfillmentProviderService extends utils_1.AbstractFulfillmentProv
|
|
|
359
447
|
}
|
|
360
448
|
PrintfulFulfillmentProviderService.identifier = "printful";
|
|
361
449
|
exports.default = PrintfulFulfillmentProviderService;
|
|
362
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../../src/providers/printful-fulfillment/service.ts"],"names":[],"mappings":";;AAAA,qDAGkC;AAYlC,iEAA4D;AAC5D,iDAAsD;AACtD,+DAQmC;AAuCnC,MAAM,kCAAmC,SAAQ,0CAAkC;IAajF,YAAY,SAA+B,EAAE,OAA8B;QACzE,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,MAAM,CAAA;QAC/B,IAAI,CAAC,QAAQ,GAAG,OAAO,IAAK,EAA4B,CAAA;QAExD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;YAC5B,IAAI,CAAC,OAAO,CAAC,IAAI,CACf,iEAAiE,CAClE,CAAA;QACH,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,KAAK,CAAA;QAC7B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,OAAO,CAAA;QAE/B,IAAI,IAAI,CAAC,QAAQ,CAAC,iBAAiB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACpD,IAAI,CAAC,OAAO,CAAC,KAAK,CAChB,qEAAqE;gBACnE,qEAAqE;gBACrE,oEAAoE,CACvE,CAAA;QACH,CAAC;QAED,IACE,IAAI,CAAC,QAAQ,CAAC,iBAAiB;YAC/B,CAAC,IAAI,CAAC,QAAQ,CAAC,qBAAqB,EACpC,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,KAAK,CAChB,0EAA0E;gBACxE,gDAAgD,CACnD,CAAA;QACH,CAAC;QAED,0EAA0E;QAC1E,+DAA+D;QAC/D,MAAM,YAAY,GAChB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAAC,GAAG,CAAC;YACnD,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,2BAA2B,CAAC;YACnD,CAAC,CAAC,GAAG,CAAA;QACT,MAAM,YAAY,GAChB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC,GAAG,CAAC;YAChD,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC;YAChD,CAAC,CAAC,KAAK,CAAA;QAEX,yEAAyE;QACzE,8BAA8B;QAC9B,IAAI,CAAC,YAAY,GAAG,YAAY,GAAG,IAAI,CAAA;QACvC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;QAEzD,IAAI,YAAY,GAAG,YAAY,EAAE,CAAC;YAChC,IAAI,CAAC,OAAO,CAAC,IAAI,CACf,iEAAiE;gBAC/D,iEAAiE,CACpE,CAAA;QACH,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,gCAAc,CAAC;YAChC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,IAAI,EAAE;YACtC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO;SAC/B,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,qBAAqB;QACzB,OAAO;YACL,GAAG,0CAAyB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBACxC,EAAE;gBACF,IAAI,EAAE,YAAY,EAAE,EAAE;aACvB,CAAC,CAAC;YACH;gBACE,EAAE,EAAE,0CAAyB;gBAC7B,IAAI,EAAE,iBAAiB;gBACvB,SAAS,EAAE,IAAI;aAChB;SACF,CAAA;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAA6B;QAChD,MAAM,EAAE,GAAG,IAAI,EAAE,EAAE,CAAA;QACnB,OAAO,CACL,OAAO,EAAE,KAAK,QAAQ;YACtB,CAAE,0CAA+C,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC5D,EAAE,KAAK,0CAAyB,CAAC,CACpC,CAAA;IACH,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC3B,UAAmC,EACnC,IAA6B,EAC7B,QAAiC;QAEjC,4EAA4E;QAC5E,0EAA0E;QAC1E,qEAAqE;QACrE,mCAAmC;QACnC,MAAM,EAAE,GAAG,UAAU,EAAE,EAAE,CAAA;QACzB,0EAA0E;QAC1E,4EAA4E;QAC5E,0EAA0E;QAC1E,uEAAuE;QACvE,kDAAkD;QAClD,IACE,OAAO,EAAE,KAAK,QAAQ;YACtB,CAAC,CACE,0CAA+C,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC7D,EAAE,KAAK,0CAAyB,CACjC,EACD,CAAC;YACD,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,YAAY,EAC9B,yDAAyD;gBACvD,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,iCAAiC;gBACvD,GAAG,CAAC,GAAG,0CAAyB,EAAE,0CAAyB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAC7E,CAAA;QACH,CAAC;QACD,OAAO,EAAE,GAAG,IAAI,EAAE,kBAAkB,EAAE,EAAE,EAAE,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAA6B;QAC9C,MAAM,QAAQ,GAAI,IAAoC,EAAE,IAAI,EAAE,EAAE,CAAA;QAChE,yEAAyE;QACzE,qEAAqE;QACrE,IAAI,QAAQ,KAAK,0CAAyB,EAAE,CAAC;YAC3C,OAAO,KAAK,CAAA;QACd,CAAC;QACD,OAAO,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAA;IACjD,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,cAAc,CAClB,UAAyD,EACzD,KAA8C,EAC9C,OAA4C;QAE5C,MAAM,QAAQ,GAAG,MAAM,CACpB,UAA2C,EAAE,EAAE,IAAI,EAAE,CACvD,CAAA;QAED,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAC5C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,sDAAsD;YACtD,IAAI,CAAC,OAAO,CAAC,KAAK,CAChB,kDACE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CACjD,EAAE,CACH,CAAA;YACD,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAA;QACxD,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,KAAK,CACjB,QAAgB,EAChB,OAA4C;QAE5C,MAAM,GAAG,GAAG,OAeX,CAAA;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAA;QACrD,CAAC;QAED,MAAM,IAAI,GAAG,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAA;QACvC,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA;QAC3D,MAAM,SAAS,GAAG,IAAA,0BAAgB,EAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;QAE9D,IACE,CAAC,IAAA,kCAAiB,EAAC,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,EACxE,CAAC;YACD,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAA;QACtD,CAAC;QAED,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;aAC5B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;aAC5B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACX,UAAU,EAAE,CAAC,CAAC,OAAQ,CAAC,EAAY;YACnC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC;YACjC,UAAU,EAAE,CAAC,CAAC,UAAU;SACzB,CAAC,CAAC,CAAA;QAEL,IAAI,UAA+B,CAAA;QACnC,IAAI,CAAC;YACH,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAA;QACvE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,uEAAuE;YACvE,uDAAuD;YACvD,IAAI,CAAC,OAAO,CAAC,KAAK,CAChB,+CACE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CACjD,EAAE,CACH,CAAA;YACD,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAA;QACrD,CAAC;QAED,0EAA0E;QAC1E,yEAAyE;QACzE,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA;QAExD,MAAM,KAAK,GAAG,IAAA,+BAAc,EAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAA;QAEzD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAA;QACrD,CAAC;QAED,MAAM,SAAS,GAAG;YAChB,YAAY,EAAE,WAAW;YACzB,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACtD,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvD,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACxD,CAAA;QAED,MAAM,QAAQ,GAAG,IAAA,kCAAiB,EAAC,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;QAE3E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QAC7C,4EAA4E;QAC5E,2EAA2E;QAC3E,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;QACtD,IAAI,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YAClD,MAAM,GAAG,GAAG,IAAA,2BAAU,EAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;YACxD,IAAI,GAAG,CAAC,EAAE,EAAE,CAAC;gBACX,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAA;YACzD,CAAC;QACH,CAAC;QAED,IAAI,KAAqB,CAAA;QACzB,IAAI,CAAC;YACH,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC;gBAC1C,SAAS;gBACT,KAAK;gBACL,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAClC,CAAC,CAAA;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,OAAO,CAAC,IAAI,CACf,wCACE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CACjD,EAAE,CACH,CAAA;YACD,OAAO,IAAI,CAAC,WAAW,CACrB,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,sBAAsB,CACvB,CAAA;QACH,CAAC;QAED,MAAM,IAAI,CAAC,UAAU,CACnB,QAAQ,EACR,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAC1C,IAAI,CAAC,aAAa,CACnB,CAAA;QAED,MAAM,QAAQ,GAAG,IAAA,2BAAU,EAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;QACtD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,IAAI,CAAC,OAAO,CAAC,IAAI,CACf,qBAAqB,QAAQ,cAAc,QAAQ,CAAC,MAAM,iBAAiB,CAC5E,CAAA;YACD,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAA;QACtE,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;IACvD,CAAC;IAED,4EAA4E;IACpE,KAAK,CAAC,aAAa,CACzB,UAAoB;QAEpB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAA;QACrC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YACvC,OAAO,GAAG,CAAA;QACZ,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YACvC,MAAM,EAAE,iBAAiB;YACzB,MAAM,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC;YAC1B,OAAO,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE;SAC5B,CAAC,CAAA;QAEF,4EAA4E;QAC5E,yDAAyD;QACzD,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YAC9B,CAAC,CAAE,IAGE;YACL,CAAC,CAAC,EAAE,CAAA;QAEN,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,EAAE,2BAA2B,CAAA;YAC3D,IAAI,SAAS,IAAI,IAAI,IAAI,SAAS,KAAK,EAAE,EAAE,CAAC;gBAC1C,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAA;YACpC,CAAC;QACH,CAAC;QAED,OAAO,GAAG,CAAA;IACZ,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,GAAW;QACjC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,IAAI,CAAA;QACb,CAAC;QACD,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAc,GAAG,CAAC,CAAA;YACrD,wEAAwE;YACxE,wEAAwE;YACxE,yEAAyE;YACzE,IACE,CAAC,KAAK;gBACN,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;gBAC3B,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ;gBACnC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,EACjC,CAAC;gBACD,OAAO,IAAI,CAAA;YACb,CAAC;YACD,OAAO,KAAK,CAAA;QACd,CAAC;QAAC,MAAM,CAAC;YACP,2CAA2C;YAC3C,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,UAAU,CACtB,GAAW,EACX,KAAkB,EAClB,UAAkB;QAElB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,OAAM;QACR,CAAC;QACD,IAAI,CAAC;YACH,wEAAwE;YACxE,yCAAyC;YACzC,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,UAAU,CAAC,CAAA;QAC/C,CAAC;QAAC,MAAM,CAAC;YACP,aAAa;QACf,CAAC;IACH,CAAC;IAEO,WAAW,CACjB,MAA0B,EAC1B,QAAgB,EAChB,QAAgB,EAChB,MAAsB;QAEtB,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,KAAK,GAAG,IAAA,2BAAU,EAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;YAC1D,IAAI,KAAK,CAAC,EAAE,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAA;YAC3D,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IACxC,CAAC;IAEO,QAAQ,CACd,QAAgB,EAChB,MAAsB;QAEtB,uEAAuE;QACvE,2EAA2E;QAC3E,sEAAsE;QACtE,2EAA2E;QAC3E,uBAAuB;QACvB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAA;QACjD,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CACrD,KAAK,IAAI,EAAE,EACX,QAAQ,CACT;YACC,CAAC,CAAE,KAA4C,CAAC,QAAQ,CAAC;YACzD,CAAC,CAAC,SAAS,CAAA;QACb,MAAM,IAAI,GACR,OAAO,UAAU,KAAK,QAAQ;YAC9B,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;YAC3B,UAAU,IAAI,CAAC;YACb,CAAC,CAAC,UAAU;YACZ,CAAC,CAAC,SAAS,CAAA;QAEf,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YACjB,yEAAyE;YACzE,wDAAwD;YACxD,IAAI,kCAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACpC,IAAI,CAAC,OAAO,CAAC,KAAK,CAChB,0CAA0C,QAAQ,oBAAoB;oBACpE,gEAAgE;oBAChE,mBAAmB,0CAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAC7D,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,OAAO,CAAC,KAAK,CAChB,8CAA8C,QAAQ,cAAc;oBAClE,0DAA0D;oBAC1D,6BAA6B,CAChC,CAAA;YACH,CAAC;YACD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAA;QACvD,CAAC;QAED,IAAI,MAAM,KAAK,oBAAoB,IAAI,MAAM,KAAK,mBAAmB,EAAE,CAAC;YACtE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,2BAA2B,MAAM,EAAE,CAAC,CAAA;QAC3D,CAAC;aAAM,IAAI,MAAM,KAAK,mBAAmB,EAAE,CAAC;YAC1C,0EAA0E;YAC1E,iEAAiE;YACjE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACjB,IAAI,CAAC,OAAO,CAAC,KAAK,CAChB,4EAA4E,CAC7E,CAAA;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,2BAA2B,MAAM,SAAS,QAAQ,EAAE,CAAC,CAAA;QACzE,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAA;IACrD,CAAC;IAEO,MAAM,CACZ,MAAc,EACd,SAAiB,EACjB,OAAmB;QAEnB,6DAA6D;QAC7D,0EAA0E;QAC1E,uEAAuE;QACvE,uEAAuE;QACvE,OAAO;YACL,iBAAiB,EAAE,MAAM;YACzB,iCAAiC,EAAE,KAAK;SACzC,CAAA;IACH,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,IAA6B,EAC7B,KAAyD,EACzD,KAA+C,EAC/C,WAA4E;QAE5E,6EAA6E;QAC7E,MAAM,UAAU,GACb,IAAI,EAAE,iBAAwC;YAC9C,WAAW,EAAE,QAAQ,EAAE,iBAAwC,CAAA;QAElE,IAAI,UAAU,EAAE,CAAC;YACf,OAAO;gBACL,IAAI,EAAE;oBACJ,GAAG,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;oBACzC,iBAAiB,EAAE,UAAU;iBAC9B;gBACD,MAAM,EAAE,EAAE;aACX,CAAA;QACH,CAAC;QAED,2EAA2E;QAC3E,8EAA8E;QAC9E,IAAI,CAAC,OAAO,CAAC,IAAI,CACf,0CAA0C,KAAK,EAAE,EAAE,IAAI,SAAS,GAAG;YACjE,WAAW,KAAK,EAAE,MAAM,IAAI,CAAC,4DAA4D,CAC5F,CAAA;QAED,OAAO;YACL,IAAI,EAAE;gBACJ,GAAG,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzC,eAAe,EAAE,KAAK,EAAE,EAAE;aAC3B;YACD,MAAM,EAAE,EAAE;SACX,CAAA;IACH,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,IAA6B;QACnD,MAAM,eAAe,GAAG,IAAI,EAAE,iBAAuC,CAAA;QACrE,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO,EAAE,CAAA;QACX,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;QACjD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,OAAO,CAAC,KAAK,CAChB,mCAAmC,eAAe,KAChD,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CACjD,EAAE,CACH,CAAA;QACH,CAAC;QAED,OAAO,EAAE,CAAA;IACX,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC3B,WAAoC;QAEpC,OAAO;YACL,IAAI,EAAE;gBACJ,GAAI,WAAW,EAAE,IAAe;gBAChC,SAAS,EAAE,IAAI;aAChB;YACD,MAAM,EAAE,EAAE;SACX,CAAA;IACH,CAAC;;AA7gBM,6CAAU,GAAG,UAAU,CAAA;AAghBhC,kBAAe,kCAAkC,CAAA"}
|
|
450
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../../src/providers/printful-fulfillment/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,8 @@ class PrintfulClient {
|
|
|
14
14
|
this.fetchImpl = options.fetchImpl ?? fetch;
|
|
15
15
|
this.maxRetries = options.maxRetries ?? 3;
|
|
16
16
|
this.retryBaseMs = options.retryBaseMs ?? 500;
|
|
17
|
+
this.timeoutMs =
|
|
18
|
+
Number(options.timeoutMs) > 0 ? Number(options.timeoutMs) : 15000;
|
|
17
19
|
}
|
|
18
20
|
async listSyncProducts(params = {}) {
|
|
19
21
|
const search = new URLSearchParams();
|
|
@@ -133,7 +135,11 @@ class PrintfulClient {
|
|
|
133
135
|
let lastError;
|
|
134
136
|
for (let attempt = 0; attempt <= this.maxRetries; attempt++) {
|
|
135
137
|
try {
|
|
138
|
+
// A fresh signal per attempt. Sharing one would abort every retry the
|
|
139
|
+
// moment the first attempt's deadline passed, turning a transient 500
|
|
140
|
+
// into a permanent failure. A caller-supplied signal still wins.
|
|
136
141
|
const response = await this.fetchImpl(url, {
|
|
142
|
+
signal: AbortSignal.timeout(this.timeoutMs),
|
|
137
143
|
...init,
|
|
138
144
|
headers,
|
|
139
145
|
});
|
|
@@ -202,4 +208,4 @@ class PrintfulClient {
|
|
|
202
208
|
}
|
|
203
209
|
}
|
|
204
210
|
exports.PrintfulClient = PrintfulClient;
|
|
205
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
211
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"printful-client.js","sourceRoot":"","sources":["../../../../src/utils/printful-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.LEGACY_OPTION_IDS = exports.PRINTFUL_RETURN_OPTION_ID = exports.PRINTFUL_SHIPPING_METHODS = void 0;
|
|
4
4
|
exports.buildRateCacheKey = buildRateCacheKey;
|
|
5
5
|
exports.selectRate = selectRate;
|
|
6
|
+
exports.confirmMethod = confirmMethod;
|
|
7
|
+
exports.shippingOverrideFor = shippingOverrideFor;
|
|
6
8
|
exports.isAddressQuotable = isAddressQuotable;
|
|
9
|
+
exports.rateLinesFrom = rateLinesFrom;
|
|
10
|
+
exports.buildRateRequest = buildRateRequest;
|
|
7
11
|
exports.buildRateItems = buildRateItems;
|
|
8
12
|
const crypto_1 = require("crypto");
|
|
9
13
|
const currency_1 = require("./currency");
|
|
@@ -98,6 +102,97 @@ function selectRate(rates, methodId, cartCurrency) {
|
|
|
98
102
|
// used because it is the currency the rate string is actually denominated in.
|
|
99
103
|
return { ok: true, amount: (0, mappers_1.parsePriceToMinorUnits)(match.rate, quoteCurrency) };
|
|
100
104
|
}
|
|
105
|
+
/**
|
|
106
|
+
* Decide whether a cached quote confirms the method the customer selected.
|
|
107
|
+
*
|
|
108
|
+
* Pure: the caller re-fetches and calls again when this does not confirm, so
|
|
109
|
+
* the decision itself never reaches the network.
|
|
110
|
+
*
|
|
111
|
+
* A stale entry never confirms, which is deliberately unlike `calculatePrice`'s
|
|
112
|
+
* `staleOrFlat`. Serving a stale *price* is defensible — the customer sees a
|
|
113
|
+
* number that was true recently. Serving a stale *method confirmation* is not:
|
|
114
|
+
* the method may have stopped being offered, and stamping "live" on it would
|
|
115
|
+
* record an agreement Printful never made. Only a fresh entry, or a re-fetch
|
|
116
|
+
* the caller performs after this returns, can confirm.
|
|
117
|
+
*
|
|
118
|
+
* `misconfigured_zero` is reachable in `FallbackReason` but not here: it
|
|
119
|
+
* describes a missing flat rate, and confirmation never consults
|
|
120
|
+
* `fallbackShippingRates`.
|
|
121
|
+
*/
|
|
122
|
+
function confirmMethod(input) {
|
|
123
|
+
const { cached, freshnessMs, methodId, currency } = input;
|
|
124
|
+
if (!cached) {
|
|
125
|
+
return { confirmation: "printful_unreachable" };
|
|
126
|
+
}
|
|
127
|
+
// A negative age means the entry is dated in the future — clock skew on the
|
|
128
|
+
// cache node — which would otherwise read as fresh until that date passes.
|
|
129
|
+
// Same guard `calculatePrice` applies before trusting a fresh hit.
|
|
130
|
+
const age = Date.now() - cached.cached_at;
|
|
131
|
+
if (age < 0 || age >= freshnessMs) {
|
|
132
|
+
return { confirmation: "printful_unreachable" };
|
|
133
|
+
}
|
|
134
|
+
// `selectRate` already answers "does this list offer this method in a usable
|
|
135
|
+
// currency", including the currency-mismatch and malformed-rate cases, so
|
|
136
|
+
// the check is not reimplemented here.
|
|
137
|
+
const hit = selectRate(cached.rates, methodId, currency);
|
|
138
|
+
if (!hit.ok) {
|
|
139
|
+
return { confirmation: hit.reason };
|
|
140
|
+
}
|
|
141
|
+
return { confirmation: "live", methodId };
|
|
142
|
+
}
|
|
143
|
+
/**
|
|
144
|
+
* Decide the `shipping` override to send Printful for an order, if any.
|
|
145
|
+
*
|
|
146
|
+
* Pure, and a read of what `validateFulfillmentData` already recorded — the
|
|
147
|
+
* order path never calls Printful to re-confirm. All three conditions must
|
|
148
|
+
* hold: an id is present, `rate_source` marks it live, and the id is one we
|
|
149
|
+
* actually offer.
|
|
150
|
+
*
|
|
151
|
+
* Each condition guards a distinct way a bad override reaches an order.
|
|
152
|
+
* `"live"` without an id proves only that some quote succeeded, not which
|
|
153
|
+
* method it was for. An id without `"live"` is what 0.3.0 through 0.6.0 wrote —
|
|
154
|
+
* those methods carry no `rate_source` at all, so trusting a bare id would turn
|
|
155
|
+
* that release's dead code into a live promise on the first upgraded order. And
|
|
156
|
+
* an id outside the allowlist is one this plugin never offered.
|
|
157
|
+
*
|
|
158
|
+
* Omitting the override is always safe: Printful then picks the method itself,
|
|
159
|
+
* which is exactly today's behaviour. Sending an unconfirmed one is not — it
|
|
160
|
+
* insists on a method Printful may not offer for that destination, risking a
|
|
161
|
+
* rejected order. So every uncertain case resolves to `undefined`.
|
|
162
|
+
*/
|
|
163
|
+
function shippingOverrideFor(methods) {
|
|
164
|
+
const confirmed = new Set();
|
|
165
|
+
for (const method of methods ?? []) {
|
|
166
|
+
const data = method?.data;
|
|
167
|
+
if (!data) {
|
|
168
|
+
continue;
|
|
169
|
+
}
|
|
170
|
+
// Read as own properties: a crafted `data` blob deserialized from JSON
|
|
171
|
+
// cannot reach up the prototype chain, but a method id like "constructor"
|
|
172
|
+
// resolving to a function would otherwise pass the allowlist check below.
|
|
173
|
+
const id = Object.prototype.hasOwnProperty.call(data, "printful_shipping")
|
|
174
|
+
? data.printful_shipping
|
|
175
|
+
: undefined;
|
|
176
|
+
const source = Object.prototype.hasOwnProperty.call(data, "rate_source")
|
|
177
|
+
? data.rate_source
|
|
178
|
+
: undefined;
|
|
179
|
+
if (typeof id !== "string" || source !== "live") {
|
|
180
|
+
continue;
|
|
181
|
+
}
|
|
182
|
+
if (!exports.PRINTFUL_SHIPPING_METHODS.includes(id)) {
|
|
183
|
+
continue;
|
|
184
|
+
}
|
|
185
|
+
confirmed.add(id);
|
|
186
|
+
}
|
|
187
|
+
// Printful's `shipping` takes one value. One confirmed method — or several
|
|
188
|
+
// naming the same one, which a multi-profile cart shipping everything the
|
|
189
|
+
// same way produces — is unambiguous. Two genuinely different confirmed
|
|
190
|
+
// methods are not: picking either would override a method the customer paid
|
|
191
|
+
// for on the other profile, so we let Printful choose instead. Unconfirmed
|
|
192
|
+
// methods never enter this set, so a return method riding along on the order
|
|
193
|
+
// cannot veto the outbound method the customer selected.
|
|
194
|
+
return confirmed.size === 1 ? [...confirmed][0] : undefined;
|
|
195
|
+
}
|
|
101
196
|
/** Countries where Printful requires a state code alongside the country. */
|
|
102
197
|
const STATE_REQUIRED_COUNTRIES = new Set(["US", "AU", "CA"]);
|
|
103
198
|
/**
|
|
@@ -117,6 +212,84 @@ function isAddressQuotable(address) {
|
|
|
117
212
|
}
|
|
118
213
|
return true;
|
|
119
214
|
}
|
|
215
|
+
/**
|
|
216
|
+
* Read the cart lines a rate request would be built from.
|
|
217
|
+
*
|
|
218
|
+
* Split out from `buildRateRequest` because the caller must resolve catalog ids
|
|
219
|
+
* for these variants — a container-bound `query` lookup — before the request can
|
|
220
|
+
* be built. Keeping the lookup outside lets the builder stay pure.
|
|
221
|
+
*
|
|
222
|
+
* `shippingProfileId` narrows to the lines that ship under one profile. Medusa
|
|
223
|
+
* hands the two paths different item lists for the same cart: the pricing
|
|
224
|
+
* workflow filters by the option's profile
|
|
225
|
+
* (`list-shipping-options-for-cart-with-pricing.js:266`), while the
|
|
226
|
+
* add-method workflow passes the cart whole (`add-shipping-method-to-cart.js:90`).
|
|
227
|
+
* Inheriting that difference would give the two paths different cache keys, so
|
|
228
|
+
* a confirmation would miss the entry pricing wrote seconds earlier — silently,
|
|
229
|
+
* and only on mixed-profile carts.
|
|
230
|
+
*
|
|
231
|
+
* Unlike Medusa's own `filterCartItemsByShippingProfile`, this **fails open**:
|
|
232
|
+
* a line whose profile is absent is kept rather than dropped. Medusa filters a
|
|
233
|
+
* list it populated itself and can fail closed safely; this runs on a context
|
|
234
|
+
* that may legitimately omit the field, where dropping would report a cart as
|
|
235
|
+
* having no Printful items at all.
|
|
236
|
+
*/
|
|
237
|
+
function rateLinesFrom(context, shippingProfileId) {
|
|
238
|
+
return (context.items ?? [])
|
|
239
|
+
.filter((i) => i.variant?.id)
|
|
240
|
+
.filter((i) => {
|
|
241
|
+
if (!shippingProfileId) {
|
|
242
|
+
return true;
|
|
243
|
+
}
|
|
244
|
+
const profile = i.variant?.product?.shipping_profile?.id;
|
|
245
|
+
return profile === undefined || profile === shippingProfileId;
|
|
246
|
+
})
|
|
247
|
+
.map((i) => ({
|
|
248
|
+
variant_id: i.variant.id,
|
|
249
|
+
quantity: Number(i.quantity ?? 1),
|
|
250
|
+
unit_price: i.unit_price,
|
|
251
|
+
}));
|
|
252
|
+
}
|
|
253
|
+
/**
|
|
254
|
+
* Build the Printful rate request and its cache key from a cart context.
|
|
255
|
+
*
|
|
256
|
+
* `calculatePrice` and `validateFulfillmentData` must agree on the cache key
|
|
257
|
+
* exactly: the confirm path is only cheap because it reads the entry the pricing
|
|
258
|
+
* path wrote moments earlier under the same key. Two call sites computing that
|
|
259
|
+
* key independently would drift silently — a confirmation would miss a live
|
|
260
|
+
* entry and re-hit the API, or confirm against a differently-shaped cart. One
|
|
261
|
+
* function, called by both, is what makes the drift impossible.
|
|
262
|
+
*/
|
|
263
|
+
function buildRateRequest(context, lines, catalogIdByVariantId, stateCode) {
|
|
264
|
+
const addr = context.shipping_address ?? {};
|
|
265
|
+
const countryCode = (addr.country_code ?? "").toUpperCase();
|
|
266
|
+
if (!isAddressQuotable({ country_code: countryCode, state_code: stateCode })) {
|
|
267
|
+
return { ok: false, reason: "incomplete_address" };
|
|
268
|
+
}
|
|
269
|
+
// Resolved before the items are built: each line's `value` is denominated in
|
|
270
|
+
// the cart's currency, so it decides how the minor units convert out.
|
|
271
|
+
const currency = (context.currency_code ?? "").toUpperCase();
|
|
272
|
+
const items = buildRateItems(lines, catalogIdByVariantId, currency);
|
|
273
|
+
if (!items.length) {
|
|
274
|
+
return { ok: false, reason: "no_printful_items" };
|
|
275
|
+
}
|
|
276
|
+
const recipient = {
|
|
277
|
+
country_code: countryCode,
|
|
278
|
+
...(stateCode ? { state_code: stateCode } : {}),
|
|
279
|
+
...(addr.city ? { city: addr.city } : {}),
|
|
280
|
+
...(addr.postal_code ? { zip: addr.postal_code } : {}),
|
|
281
|
+
...(addr.address_1 ? { address1: addr.address_1 } : {}),
|
|
282
|
+
...(addr.address_2 ? { address2: addr.address_2 } : {}),
|
|
283
|
+
};
|
|
284
|
+
return {
|
|
285
|
+
ok: true,
|
|
286
|
+
recipient,
|
|
287
|
+
items,
|
|
288
|
+
currency,
|
|
289
|
+
cacheKey: buildRateCacheKey({ address: recipient, items, currency }),
|
|
290
|
+
variantIds: lines.map((l) => l.variant_id),
|
|
291
|
+
};
|
|
292
|
+
}
|
|
120
293
|
/**
|
|
121
294
|
* Turn cart lines into Printful rate items.
|
|
122
295
|
*
|
|
@@ -166,4 +339,4 @@ function buildRateItems(lines, catalogIdByVariantId, cartCurrency) {
|
|
|
166
339
|
}
|
|
167
340
|
return items;
|
|
168
341
|
}
|
|
169
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hpcHBpbmctcmF0ZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdXRpbHMvc2hpcHBpbmctcmF0ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBMkRBLDhDQXFCQztBQWNELGdDQTJCQztBQVlELDhDQVlDO0FBc0JELHdDQTJDQztBQWxORCxtQ0FBbUM7QUFDbkMseUNBQTRDO0FBQzVDLHVDQUFrRDtBQVFsRDs7Ozs7Ozs7O0dBU0c7QUFDVSxRQUFBLHlCQUF5QixHQUFHLENBQUMsVUFBVSxDQUFVLENBQUE7QUFFOUQ7Ozs7O0dBS0c7QUFDVSxRQUFBLHlCQUF5QixHQUFHLGlCQUFpQixDQUFBO0FBRTFEOzs7R0FHRztBQUNVLFFBQUEsaUJBQWlCLEdBQUcsSUFBSSxHQUFHLENBQUM7SUFDdkMsbUJBQW1CO0lBQ25CLGlCQUFpQjtDQUNsQixDQUFDLENBQUE7QUFRRixTQUFTLFNBQVMsQ0FBQyxLQUF5QjtJQUMxQyxPQUFPLENBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFBO0FBQzNDLENBQUM7QUFFRDs7Ozs7Ozs7O0dBU0c7QUFDSCxTQUFnQixpQkFBaUIsQ0FBQyxLQUF3QjtJQUN4RCx1RUFBdUU7SUFDdkUsb0VBQW9FO0lBQ3BFLCtCQUErQjtJQUMvQixNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDO1FBQy9CLFNBQVMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQztRQUNyQyxTQUFTLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUM7UUFDbkMsU0FBUyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDO1FBQzdCLFNBQVMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQztRQUM1QixTQUFTLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUM7UUFDakMsU0FB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
|
|
342
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"shipping-rates.js","sourceRoot":"","sources":["../../../../src/utils/shipping-rates.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ const utils_1 = require("@medusajs/framework/utils");
|
|
|
6
6
|
const printful_1 = require("../modules/printful");
|
|
7
7
|
const mappers_1 = require("../utils/mappers");
|
|
8
8
|
const costs_1 = require("../utils/costs");
|
|
9
|
+
const shipping_rates_1 = require("../utils/shipping-rates");
|
|
9
10
|
const createPrintfulOrderStep = (0, workflows_sdk_1.createStep)("printful-create-order", async (input, { container }) => {
|
|
10
11
|
const printful = container.resolve(printful_1.PRINTFUL_MODULE);
|
|
11
12
|
const orderModule = container.resolve(utils_1.Modules.ORDER);
|
|
@@ -21,7 +22,10 @@ const createPrintfulOrderStep = (0, workflows_sdk_1.createStep)("printful-create
|
|
|
21
22
|
});
|
|
22
23
|
}
|
|
23
24
|
const order = await orderModule.retrieveOrder(input.order_id, {
|
|
24
|
-
|
|
25
|
+
// `shipping_methods` carries the `data` blob `validateFulfillmentData`
|
|
26
|
+
// recorded at selection, which is the only evidence on the order that
|
|
27
|
+
// Printful confirmed the method the customer paid for.
|
|
28
|
+
relations: ["items", "shipping_address", "shipping_methods"],
|
|
25
29
|
});
|
|
26
30
|
const items = [];
|
|
27
31
|
const unresolved = [];
|
|
@@ -90,9 +94,14 @@ const createPrintfulOrderStep = (0, workflows_sdk_1.createStep)("printful-create
|
|
|
90
94
|
reason: "already_linked",
|
|
91
95
|
});
|
|
92
96
|
}
|
|
97
|
+
// A pure read of what was recorded at selection — no Printful call on the
|
|
98
|
+
// order path. Omitted unless Printful itself confirmed the method for this
|
|
99
|
+
// cart, in which case Printful picks the method as it does today.
|
|
100
|
+
const shipping = (0, shipping_rates_1.shippingOverrideFor)(order.shipping_methods);
|
|
93
101
|
const payload = {
|
|
94
102
|
external_id: order.id,
|
|
95
103
|
recipient,
|
|
104
|
+
...(shipping ? { shipping } : {}),
|
|
96
105
|
items,
|
|
97
106
|
confirm: options.autoSubmitOrders !== false,
|
|
98
107
|
};
|
|
@@ -155,4 +164,4 @@ exports.createPrintfulOrderWorkflow = (0, workflows_sdk_1.createWorkflow)("print
|
|
|
155
164
|
return new workflows_sdk_1.WorkflowResponse(result);
|
|
156
165
|
});
|
|
157
166
|
exports.default = exports.createPrintfulOrderWorkflow;
|
|
158
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
167
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLXByaW50ZnVsLW9yZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3dvcmtmbG93cy9jcmVhdGUtcHJpbnRmdWwtb3JkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEscUVBSzBDO0FBQzFDLHFEQUE4RTtBQUM5RSxrREFBcUQ7QUFPckQsOENBQW1EO0FBQ25ELDBDQUF5RDtBQUN6RCw0REFBNkQ7QUFrQjdELE1BQU0sdUJBQXVCLEdBQUcsSUFBQSwwQkFBVSxFQUN4Qyx1QkFBdUIsRUFDdkIsS0FBSyxFQUFFLEtBQStCLEVBQUUsRUFBRSxTQUFTLEVBQUUsRUFBRSxFQUFFO0lBQ3ZELE1BQU0sUUFBUSxHQUEwQixTQUFTLENBQUMsT0FBTyxDQUFDLDBCQUFlLENBQUMsQ0FBQTtJQUMxRSxNQUFNLFdBQVcsR0FBRyxTQUFTLENBQUMsT0FBTyxDQUFDLGVBQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUNwRCxNQUFNLE1BQU0sR0FBRyxTQUFTLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ2xFLE1BQU0sT0FBTyxHQUFHLE1BQU0sUUFBUSxDQUFDLFVBQVUsRUFBRSxDQUFBO0lBQzNDLE1BQU0sTUFBTSxHQUFHLE1BQU0sUUFBUSxDQUFDLFNBQVMsRUFBRSxDQUFBO0lBRXpDLE1BQU0sUUFBUSxHQUFHLE1BQU0sUUFBUSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDN0QsSUFBSSxRQUFRLEVBQUUsQ0FBQztRQUNiLE9BQU8sSUFBSSw0QkFBWSxDQUFlO1lBQ3BDLE9BQU8sRUFBRSxJQUFJO1lBQ2IsTUFBTSxFQUFFLGdCQUFnQjtZQUN4QixpQkFBaUIsRUFBRSxRQUFRLENBQUMsaUJBQWlCO1NBQzlDLENBQUMsQ0FBQTtJQUNKLENBQUM7SUFFRCxNQUFNLEtBQUssR0FBRyxNQUFNLFdBQVcsQ0FBQyxhQUFhLENBQUMsS0FB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
|