← All changes | src/Shared/components/ProductAccountActivation/createAccount.js +30 -76 3.1.5 → 3.2.2 View file →

		@@ -1,89 +1,43 @@
1	1	const describeError = (error, signal) => ({
2	2	message: error?.message,
3	3	code: error?.code,
4	4	data: error?.data,
	5	+ httpStatus: error?.httpStatus,
5	6	// api-fetch collapses our AbortSignal.timeout into a generic fetch_error.
6	7	timedOut: signal.aborted,
7	8	});
8	9
9		-export async function createAccount(plugin, data) {
10		- if (!plugin?.idempotent) {
11		- const signal = AbortSignal.timeout(15000);
12		- const timings = {};
13		- const attemptStart = Date.now();
	10	+export const createAccount = async (plugin, data) => {
	11	+ const signal = AbortSignal.timeout(55000);
	12	+ const timings = {};
	13	+ const attemptStart = Date.now();
14	14
15		- try {
16		- await plugin.createAccountCallback({ ...data, signal, timings });
	15	+ try {
	16	+ const body = await plugin.createAccountCallback({
	17	+ ...data,
	18	+ endpoint: plugin.endpoint,
	19	+ signal,
	20	+ timings,
	21	+ });
17	22
18		- return {
19		- requestTimeInMs: [Date.now() - attemptStart],
20		- captchaTimeInMs: timings.captchaTimeInMs,
21		- retries: 0,
22		- errors: [],
23		- };
24		- } catch (error) {
25		- const err = new Error('Single attempt failed');
	23	+ return {
	24	+ requestTimeInMs: [Date.now() - attemptStart],
	25	+ captchaTimeInMs: timings.captchaTimeInMs,
	26	+ captchaWasWarm: timings.captchaWasWarm,
	27	+ stepTimeInMs: body?.stepTimeInMs,
	28	+ retries: 0,
	29	+ errors: [],
	30	+ };
	31	+ } catch (error) {
	32	+ const err = new Error('Account creation failed');
26	33
27		- err.requestTimeInMs = [Date.now() - attemptStart];
28		- err.captchaTimeInMs = timings.captchaTimeInMs;
29		- err.retries = 0;
30		- err.errors = [describeError(error, signal)];
	34	+ err.requestTimeInMs = [Date.now() - attemptStart];
	35	+ err.captchaTimeInMs = timings.captchaTimeInMs;
	36	+ err.captchaWasWarm = timings.captchaWasWarm;
	37	+ err.stepTimeInMs = error?.stepTimeInMs;
	38	+ err.retries = 0;
	39	+ err.errors = [describeError(error, signal)];
31	40
32		- throw err;
33		- }
	41	+ throw err;
34	42	}
35		-
36		- return createAccountWithRetry(plugin, data);
37		-}
38		-
39		-async function createAccountWithRetry(
40		- plugin,
41		- { email, marketingConsent, termsAgreed, scriptData },
42		-) {
43		- const windowMs = 10000;
44		- const perAttemptMs = 5000;
45		- const backoffMs = 2500;
46		- const maxRetries = 5;
47		-
48		- const windowStart = Date.now();
49		- const requestTimeInMs = [];
50		- const errors = [];
51		- let retries = 0;
52		-
53		- while (Date.now() - windowStart < windowMs && retries < maxRetries) {
54		- const attemptStart = Date.now();
55		- const signal = AbortSignal.timeout(perAttemptMs);
56		-
57		- try {
58		- await plugin.createAccountCallback({
59		- email,
60		- marketingConsent,
61		- termsAgreed,
62		- scriptData,
63		- signal,
64		- });
65		- requestTimeInMs.push(Date.now() - attemptStart);
66		- return { requestTimeInMs, retries, errors };
67		- } catch (error) {
68		- requestTimeInMs.push(Date.now() - attemptStart);
69		-
70		- errors.push(describeError(error, signal));
71		-
72		- const remainingMs = windowMs - (Date.now() - windowStart);
73		-
74		- if (remainingMs <= 0) break;
75		-
76		- retries++;
77		-
78		- if (!signal.aborted && remainingMs >= backoffMs) {
79		- await new Promise((resolve) => setTimeout(resolve, backoffMs));
80		- }
81		- }
82		- }
83		-
84		- const err = new Error(`Retry window of ${windowMs}ms exceeded`);
85		- err.requestTimeInMs = requestTimeInMs;
86		- err.retries = retries;
87		- err.errors = errors;
88		- throw err;
89		-}
	43	+};