@ledgerhq/live-network 1.2.1 → 1.2.2-next.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/CHANGELOG.md +10 -0
- package/lib/network.d.ts.map +1 -1
- package/lib/network.js +9 -0
- package/lib/network.js.map +1 -1
- package/lib/network.test.js +64 -1
- package/lib/network.test.js.map +1 -1
- package/lib-es/network.d.ts.map +1 -1
- package/lib-es/network.js +9 -0
- package/lib-es/network.js.map +1 -1
- package/lib-es/network.test.js +61 -1
- package/lib-es/network.test.js.map +1 -1
- package/package.json +3 -3
- package/src/network.test.ts +56 -1
- package/src/network.ts +9 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,15 @@
|
|
|
1
1
|
# @ledgerhq/live-network
|
|
2
2
|
|
|
3
|
+
## 1.2.2-next.0
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#6566](https://github.com/LedgerHQ/ledger-live/pull/6566) [`cfb97f7`](https://github.com/LedgerHQ/ledger-live/commit/cfb97f7d5c81824815522e8699b7469047b1513a) Thanks [@cgrellard-ledger](https://github.com/cgrellard-ledger)! - Prevent unnecessary http retries when 422
|
|
8
|
+
|
|
9
|
+
- Updated dependencies [[`df1dcbf`](https://github.com/LedgerHQ/ledger-live/commit/df1dcbffe901d7c4baddb46a06b08a4ed5b7a17e), [`cfb97f7`](https://github.com/LedgerHQ/ledger-live/commit/cfb97f7d5c81824815522e8699b7469047b1513a)]:
|
|
10
|
+
- @ledgerhq/live-env@2.0.2-next.0
|
|
11
|
+
- @ledgerhq/live-promise@0.0.4-next.0
|
|
12
|
+
|
|
3
13
|
## 1.2.1
|
|
4
14
|
|
|
5
15
|
### Patch Changes
|
package/lib/network.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../src/network.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAU,MAAM,OAAO,CAAC;AACpE,OAAc,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAG3D,KAAK,QAAQ,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AACtC,KAAK,iBAAiB,GAAG,kBAAkB,GAAG;IAAE,QAAQ,CAAC,EAAE,QAAQ,CAAA;CAAE,CAAC;AAEtE,eAAO,MAAM,kBAAkB,YAAa,kBAAkB,KAAG,iBAehE,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,MAAM,EAAE,iBAAiB,CAAC;CAC3B,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;AAEvB,eAAO,MAAM,mBAAmB,aAAc,mBAAmB,KAAG,mBAiBnE,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,QAAQ,CAAC,EAAE,mBAAmB,CAAC;CAChC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAEpB,eAAO,MAAM,gBAAgB,UAAW,gBAAgB,KAAG,gBAyC1D,CAAC;
|
|
1
|
+
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../src/network.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAU,MAAM,OAAO,CAAC;AACpE,OAAc,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAG3D,KAAK,QAAQ,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AACtC,KAAK,iBAAiB,GAAG,kBAAkB,GAAG;IAAE,QAAQ,CAAC,EAAE,QAAQ,CAAA;CAAE,CAAC;AAEtE,eAAO,MAAM,kBAAkB,YAAa,kBAAkB,KAAG,iBAehE,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,MAAM,EAAE,iBAAiB,CAAC;CAC3B,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;AAEvB,eAAO,MAAM,mBAAmB,aAAc,mBAAmB,KAAG,mBAiBnE,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,QAAQ,CAAC,EAAE,mBAAmB,CAAC;CAChC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAEpB,eAAO,MAAM,gBAAgB,UAAW,gBAAgB,KAAG,gBAyC1D,CAAC;AAgEF,QAAA,MAAM,cAAc,iBAAkB,kBAAkB,oBAyBvD,CAAC;AAiBF,eAAe,cAAc,CAAC"}
|
package/lib/network.js
CHANGED
|
@@ -95,6 +95,7 @@ const makeError = (msg, status, url, method) => {
|
|
|
95
95
|
status,
|
|
96
96
|
url,
|
|
97
97
|
method,
|
|
98
|
+
msg,
|
|
98
99
|
};
|
|
99
100
|
return (status || "").toString().startsWith("4")
|
|
100
101
|
? new errors_1.LedgerAPI4xx(msg, obj)
|
|
@@ -139,6 +140,14 @@ const implementation = (arg) => {
|
|
|
139
140
|
}
|
|
140
141
|
promise = (0, live_promise_1.retry)(() => (0, axios_1.default)(arg), {
|
|
141
142
|
maxRetry: (0, live_env_1.getEnv)("GET_CALLS_RETRY"),
|
|
143
|
+
retryCondition: error => {
|
|
144
|
+
if (error && error.status) {
|
|
145
|
+
// A 422 shouldn't be retried without change as explained in this documentation
|
|
146
|
+
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/422
|
|
147
|
+
return error.status !== 422;
|
|
148
|
+
}
|
|
149
|
+
return true;
|
|
150
|
+
},
|
|
142
151
|
});
|
|
143
152
|
}
|
|
144
153
|
else {
|
package/lib/network.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.js","sourceRoot":"","sources":["../src/network.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../src/network.ts"],"names":[],"mappings":";;;;;;;AAAA,6CAA2E;AAC3E,iDAAqD;AACrD,yDAA+C;AAC/C,yCAAqC;AAErC,kDAA2D;AAC3D,0DAAkC;AAK3B,MAAM,kBAAkB,GAAG,CAAC,OAA2B,EAAqB,EAAE;IACnF,IAAI,CAAC,IAAA,iBAAM,EAAC,qBAAqB,CAAC,EAAE;QAClC,OAAO,OAAO,CAAC;KAChB;IAED,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACpD,IAAA,UAAG,EAAC,SAAS,EAAE,GAAG,MAAM,IAAI,OAAO,IAAI,EAAE,GAAG,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAE7D,MAAM,GAAG,GAAsB,OAAO,CAAC;IAEvC,GAAG,CAAC,QAAQ,GAAG;QACb,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB,CAAC;IAEF,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAfW,QAAA,kBAAkB,sBAe7B;AAMK,MAAM,mBAAmB,GAAG,CAAC,QAA6B,EAAuB,EAAE;IACxF,IAAI,CAAC,IAAA,iBAAM,EAAC,qBAAqB,CAAC,EAAE;QAClC,OAAO,QAAQ,CAAC;KACjB;IAED,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC;IAChE,MAAM,EAAE,SAAS,GAAG,CAAC,EAAE,GAAG,QAAQ,IAAI,EAAE,CAAC;IAEzC,IAAA,UAAG,EACD,iBAAiB,EACjB,GAAG,QAAQ,CAAC,MAAM,IAAI,MAAM,IAAI,OAAO,IAAI,EAAE,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,CAAC,OAAO,CACtF,CAAC,CACF,KAAK,EACN,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CACxB,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAjBW,QAAA,mBAAmB,uBAiB9B;AAMK,MAAM,gBAAgB,GAAG,CAAC,KAAuB,EAAoB,EAAE;;IAC5E,MAAM,MAAM,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,0CAAE,MAAM,CAAC;IACvC,IAAI,CAAC,MAAM;QAAE,MAAM,KAAK,CAAC;IACzB,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IACvD,MAAM,EAAE,SAAS,GAAG,CAAC,EAAE,GAAG,QAAQ,IAAI,EAAE,CAAC;IAEzC,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IAE5D,IAAI,YAAmB,CAAC;IACxB,IAAI,KAAK,CAAC,QAAQ,EAAE;QAClB,mEAAmE;QACnE,qCAAqC;QACrC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC;QACxC,IAAI,GAAG,CAAC;QACR,IAAI;YACF,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;gBACpC,GAAG,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;aACjC;iBAAM,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;gBAC3C,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;aAC7B;SACF;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,UAAG,EAAC,MAAM,EAAE,4BAA4B,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;SACvD;QAED,IAAI,GAAG,EAAE;YACP,YAAY,GAAG,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;SACpD;aAAM;YACL,YAAY,GAAG,SAAS,CAAC,YAAY,MAAM,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;SACrE;QAED,IAAA,UAAG,EACD,eAAe,EACf,GAAG,MAAM,IAAI,MAAM,IAAI,OAAO,IAAI,EAAE,GAAG,GAAG,KAAK,QAAQ,MAAM,YAAY,CAAC,OAAO,EAAE,EACnF,IAAA,iBAAM,EAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CACpD,CAAC;QACF,MAAM,YAAY,CAAC;KACpB;SAAM,IAAI,KAAK,CAAC,OAAO,EAAE;QACxB,IAAA,UAAG,EAAC,cAAc,EAAE,QAAQ,MAAM,IAAI,OAAO,IAAI,EAAE,GAAG,GAAG,KAAK,QAAQ,GAAG,CAAC,CAAC;QAC3E,MAAM,IAAI,oBAAW,EAAE,CAAC;KACzB;IACD,MAAM,KAAK,CAAC;AACd,CAAC,CAAC;AAzCW,QAAA,gBAAgB,oBAyC3B;AAEF,eAAK,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,0BAAkB,CAAC,CAAC;AACnD,eAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,2BAAmB,EAAE,wBAAgB,CAAC,CAAC;AAEvE;;;GAGG;AACH,MAAM,4BAA4B,GAAG,CAAC,CAAA,MAAA,IAAA,iBAAM,EAAC,uBAAuB,CAAC,0CAAE,UAAU,CAAC,MAAM,CAAC,CAAA,CAAC;AAC1F,IAAI,4BAA4B,EAAE;IAChC,0JAA0J;IAC1J,qFAAqF;IACrF,+HAA+H;IAC/H,8DAA8D;IAC9D,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/B,eAAK,CAAC,QAAQ,CAAC,UAAU,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;CAClE;AAED,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,MAAc,EAAE,GAAuB,EAAE,MAAmB,EAAE,EAAE;IAC9F,MAAM,GAAG,GAAG;QACV,MAAM;QACN,GAAG;QACH,MAAM;QACN,GAAG;KACJ,CAAC;IACF,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC;QAC9C,CAAC,CAAC,IAAI,qBAAY,CAAC,GAAG,EAAE,GAAG,CAAC;QAC5B,CAAC,CAAC,IAAI,qBAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACjC,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,IAAyB,EAA6B,EAAE;IAC/E,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IACrB,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC1C,IAAI,IAAI,CAAC,MAAM,EAAE;QACf,OAAO,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;KACxC;IACD,OAAO,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC;AACtE,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,GAAW,EAAsB,EAAE;IAC9D,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,IAAI,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QAAE,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAChD,IAAI,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IAEhC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAC3B,MAAM,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC3C,MAAM,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QAEjC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAChC,IAAI,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;QACxB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;SAC3B;QACD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,GAAG,GAAG,OAAO,CAAC;SACf;QAED,OAAO,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;KACtC;IAED,OAAO;AACT,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAU,GAAuB,EAAmB,EAAE;IAC3E,IAAA,mBAAS,EAAC,OAAO,GAAG,KAAK,QAAQ,EAAE,sCAAsC,CAAC,CAAC;IAC3E,IAAI,OAAqB,CAAC;IAE1B,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,EAAE;QACxB,IAAI,CAAC,CAAC,SAAS,IAAI,GAAG,CAAC,EAAE;YACvB,GAAG,CAAC,OAAO,GAAG,IAAA,iBAAM,EAAC,mBAAmB,CAAC,CAAC;SAC3C;QAED,OAAO,GAAG,IAAA,oBAAK,EAAC,GAAG,EAAE,CAAC,IAAA,eAAK,EAAC,GAAG,CAAC,EAAE;YAChC,QAAQ,EAAE,IAAA,iBAAM,EAAC,iBAAiB,CAAC;YACnC,cAAc,EAAE,KAAK,CAAC,EAAE;gBACtB,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;oBACzB,+EAA+E;oBAC/E,+DAA+D;oBAC/D,OAAO,KAAK,CAAC,MAAM,KAAK,GAAG,CAAC;iBAC7B;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;SACF,CAAC,CAAC;KACJ;SAAM;QACL,OAAO,GAAG,IAAA,eAAK,EAAC,GAAG,CAAC,CAAC;KACtB;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,8EAA8E;AAC9E,SAAS,iCAAiC,CAAC,KAAa;IACtD,IAAI,KAAK,EAAE;QACT,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,yBAAyB,CAAC,GAAG,KAAK,CAAC;KAClE;SAAM;QACL,OAAO,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC;KACjE;AACH,CAAC;AACD,iCAAiC,CAAC,IAAA,iBAAM,EAAC,uBAAuB,CAAC,CAAC,CAAC;AACnE,kBAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;IACpB,IAAI,CAAC,CAAC,IAAI,KAAK,uBAAuB,EAAE;QACtC,iCAAiC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;KAC5C;AACH,CAAC,CAAC,CAAC;AAEH,kBAAe,cAAc,CAAC"}
|
package/lib/network.test.js
CHANGED
|
@@ -22,15 +22,32 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
+
});
|
|
33
|
+
};
|
|
34
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
|
+
};
|
|
25
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
|
+
const axios_1 = __importDefault(require("axios"));
|
|
26
39
|
const live_env_1 = require("@ledgerhq/live-env");
|
|
27
|
-
const network_1 = require("./network");
|
|
40
|
+
const network_1 = __importStar(require("./network"));
|
|
28
41
|
const logs = __importStar(require("@ledgerhq/logs"));
|
|
42
|
+
jest.mock("axios");
|
|
43
|
+
const mockedAxios = jest.mocked(axios_1.default);
|
|
29
44
|
describe("network", () => {
|
|
30
45
|
const DEFAULT_ENABLE_NETWORK_LOGS = (0, live_env_1.getEnv)("ENABLE_NETWORK_LOGS");
|
|
46
|
+
const DEFAULT_GET_CALLS_RETRY = (0, live_env_1.getEnv)("GET_CALLS_RETRY");
|
|
31
47
|
afterEach(() => {
|
|
32
48
|
// restore the spy created with spyOn
|
|
33
49
|
jest.restoreAllMocks();
|
|
50
|
+
jest.clearAllMocks();
|
|
34
51
|
// Restore DEFAULT_ENABLE_NETWORK_LOGS
|
|
35
52
|
(0, live_env_1.setEnv)("ENABLE_NETWORK_LOGS", DEFAULT_ENABLE_NETWORK_LOGS);
|
|
36
53
|
});
|
|
@@ -115,6 +132,52 @@ describe("network", () => {
|
|
|
115
132
|
(0, network_1.responseInterceptor)(response);
|
|
116
133
|
expect(spy).toHaveBeenCalledTimes(1);
|
|
117
134
|
});
|
|
135
|
+
test("should retry request when unsuccessful and response status is not 422", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
136
|
+
const response = {
|
|
137
|
+
config: {
|
|
138
|
+
baseURL: "baseURL",
|
|
139
|
+
url: "url",
|
|
140
|
+
data: "data",
|
|
141
|
+
},
|
|
142
|
+
data: "data",
|
|
143
|
+
status: 500,
|
|
144
|
+
statusText: "Error",
|
|
145
|
+
headers: {},
|
|
146
|
+
};
|
|
147
|
+
try {
|
|
148
|
+
mockedAxios.mockImplementation(() => Promise.reject(response));
|
|
149
|
+
yield (0, network_1.default)({
|
|
150
|
+
method: "GET",
|
|
151
|
+
url: "https://google.com",
|
|
152
|
+
});
|
|
153
|
+
// eslint-disable-next-line no-empty
|
|
154
|
+
}
|
|
155
|
+
catch (_a) { }
|
|
156
|
+
expect(mockedAxios).toHaveBeenCalledTimes(DEFAULT_GET_CALLS_RETRY + 1);
|
|
157
|
+
}));
|
|
158
|
+
test("should not retry request when response status is 422", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
159
|
+
const response = {
|
|
160
|
+
config: {
|
|
161
|
+
baseURL: "baseURL",
|
|
162
|
+
url: "url",
|
|
163
|
+
data: "data",
|
|
164
|
+
},
|
|
165
|
+
data: "data",
|
|
166
|
+
status: 422,
|
|
167
|
+
statusText: "Error",
|
|
168
|
+
headers: {},
|
|
169
|
+
};
|
|
170
|
+
mockedAxios.mockImplementation(() => Promise.reject(response));
|
|
171
|
+
try {
|
|
172
|
+
yield (0, network_1.default)({
|
|
173
|
+
method: "GET",
|
|
174
|
+
url: "https://google.com",
|
|
175
|
+
});
|
|
176
|
+
// eslint-disable-next-line no-empty
|
|
177
|
+
}
|
|
178
|
+
catch (_b) { }
|
|
179
|
+
expect(mockedAxios).toHaveBeenCalledTimes(1);
|
|
180
|
+
}));
|
|
118
181
|
});
|
|
119
182
|
});
|
|
120
183
|
//# sourceMappingURL=network.test.js.map
|
package/lib/network.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.test.js","sourceRoot":"","sources":["../src/network.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"network.test.js","sourceRoot":"","sources":["../src/network.test.ts"],"names":[],"mappings":"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"}
|
package/lib-es/network.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../src/network.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAU,MAAM,OAAO,CAAC;AACpE,OAAc,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAG3D,KAAK,QAAQ,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AACtC,KAAK,iBAAiB,GAAG,kBAAkB,GAAG;IAAE,QAAQ,CAAC,EAAE,QAAQ,CAAA;CAAE,CAAC;AAEtE,eAAO,MAAM,kBAAkB,YAAa,kBAAkB,KAAG,iBAehE,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,MAAM,EAAE,iBAAiB,CAAC;CAC3B,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;AAEvB,eAAO,MAAM,mBAAmB,aAAc,mBAAmB,KAAG,mBAiBnE,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,QAAQ,CAAC,EAAE,mBAAmB,CAAC;CAChC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAEpB,eAAO,MAAM,gBAAgB,UAAW,gBAAgB,KAAG,gBAyC1D,CAAC;
|
|
1
|
+
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../src/network.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAU,MAAM,OAAO,CAAC;AACpE,OAAc,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAG3D,KAAK,QAAQ,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AACtC,KAAK,iBAAiB,GAAG,kBAAkB,GAAG;IAAE,QAAQ,CAAC,EAAE,QAAQ,CAAA;CAAE,CAAC;AAEtE,eAAO,MAAM,kBAAkB,YAAa,kBAAkB,KAAG,iBAehE,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,MAAM,EAAE,iBAAiB,CAAC;CAC3B,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;AAEvB,eAAO,MAAM,mBAAmB,aAAc,mBAAmB,KAAG,mBAiBnE,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,QAAQ,CAAC,EAAE,mBAAmB,CAAC;CAChC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;AAEpB,eAAO,MAAM,gBAAgB,UAAW,gBAAgB,KAAG,gBAyC1D,CAAC;AAgEF,QAAA,MAAM,cAAc,iBAAkB,kBAAkB,oBAyBvD,CAAC;AAiBF,eAAe,cAAc,CAAC"}
|
package/lib-es/network.js
CHANGED
|
@@ -86,6 +86,7 @@ const makeError = (msg, status, url, method) => {
|
|
|
86
86
|
status,
|
|
87
87
|
url,
|
|
88
88
|
method,
|
|
89
|
+
msg,
|
|
89
90
|
};
|
|
90
91
|
return (status || "").toString().startsWith("4")
|
|
91
92
|
? new LedgerAPI4xx(msg, obj)
|
|
@@ -130,6 +131,14 @@ const implementation = (arg) => {
|
|
|
130
131
|
}
|
|
131
132
|
promise = retry(() => axios(arg), {
|
|
132
133
|
maxRetry: getEnv("GET_CALLS_RETRY"),
|
|
134
|
+
retryCondition: error => {
|
|
135
|
+
if (error && error.status) {
|
|
136
|
+
// A 422 shouldn't be retried without change as explained in this documentation
|
|
137
|
+
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/422
|
|
138
|
+
return error.status !== 422;
|
|
139
|
+
}
|
|
140
|
+
return true;
|
|
141
|
+
},
|
|
133
142
|
});
|
|
134
143
|
}
|
|
135
144
|
else {
|
package/lib-es/network.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.js","sourceRoot":"","sources":["../src/network.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../src/network.ts"],"names":[],"mappings":"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"}
|
package/lib-es/network.test.js
CHANGED
|
@@ -1,11 +1,25 @@
|
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
10
|
+
import axios from "axios";
|
|
1
11
|
import { getEnv, setEnv } from "@ledgerhq/live-env";
|
|
2
|
-
import { requestInterceptor, responseInterceptor } from "./network";
|
|
12
|
+
import network, { requestInterceptor, responseInterceptor } from "./network";
|
|
3
13
|
import * as logs from "@ledgerhq/logs";
|
|
14
|
+
jest.mock("axios");
|
|
15
|
+
const mockedAxios = jest.mocked(axios);
|
|
4
16
|
describe("network", () => {
|
|
5
17
|
const DEFAULT_ENABLE_NETWORK_LOGS = getEnv("ENABLE_NETWORK_LOGS");
|
|
18
|
+
const DEFAULT_GET_CALLS_RETRY = getEnv("GET_CALLS_RETRY");
|
|
6
19
|
afterEach(() => {
|
|
7
20
|
// restore the spy created with spyOn
|
|
8
21
|
jest.restoreAllMocks();
|
|
22
|
+
jest.clearAllMocks();
|
|
9
23
|
// Restore DEFAULT_ENABLE_NETWORK_LOGS
|
|
10
24
|
setEnv("ENABLE_NETWORK_LOGS", DEFAULT_ENABLE_NETWORK_LOGS);
|
|
11
25
|
});
|
|
@@ -90,6 +104,52 @@ describe("network", () => {
|
|
|
90
104
|
responseInterceptor(response);
|
|
91
105
|
expect(spy).toHaveBeenCalledTimes(1);
|
|
92
106
|
});
|
|
107
|
+
test("should retry request when unsuccessful and response status is not 422", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
108
|
+
const response = {
|
|
109
|
+
config: {
|
|
110
|
+
baseURL: "baseURL",
|
|
111
|
+
url: "url",
|
|
112
|
+
data: "data",
|
|
113
|
+
},
|
|
114
|
+
data: "data",
|
|
115
|
+
status: 500,
|
|
116
|
+
statusText: "Error",
|
|
117
|
+
headers: {},
|
|
118
|
+
};
|
|
119
|
+
try {
|
|
120
|
+
mockedAxios.mockImplementation(() => Promise.reject(response));
|
|
121
|
+
yield network({
|
|
122
|
+
method: "GET",
|
|
123
|
+
url: "https://google.com",
|
|
124
|
+
});
|
|
125
|
+
// eslint-disable-next-line no-empty
|
|
126
|
+
}
|
|
127
|
+
catch (_a) { }
|
|
128
|
+
expect(mockedAxios).toHaveBeenCalledTimes(DEFAULT_GET_CALLS_RETRY + 1);
|
|
129
|
+
}));
|
|
130
|
+
test("should not retry request when response status is 422", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
131
|
+
const response = {
|
|
132
|
+
config: {
|
|
133
|
+
baseURL: "baseURL",
|
|
134
|
+
url: "url",
|
|
135
|
+
data: "data",
|
|
136
|
+
},
|
|
137
|
+
data: "data",
|
|
138
|
+
status: 422,
|
|
139
|
+
statusText: "Error",
|
|
140
|
+
headers: {},
|
|
141
|
+
};
|
|
142
|
+
mockedAxios.mockImplementation(() => Promise.reject(response));
|
|
143
|
+
try {
|
|
144
|
+
yield network({
|
|
145
|
+
method: "GET",
|
|
146
|
+
url: "https://google.com",
|
|
147
|
+
});
|
|
148
|
+
// eslint-disable-next-line no-empty
|
|
149
|
+
}
|
|
150
|
+
catch (_b) { }
|
|
151
|
+
expect(mockedAxios).toHaveBeenCalledTimes(1);
|
|
152
|
+
}));
|
|
93
153
|
});
|
|
94
154
|
});
|
|
95
155
|
//# sourceMappingURL=network.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.test.js","sourceRoot":"","sources":["../src/network.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"network.test.js","sourceRoot":"","sources":["../src/network.test.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,OAAO,EAAE,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAC7E,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAEvC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAEnB,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAEvC,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,MAAM,2BAA2B,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAClE,MAAM,uBAAuB,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAE1D,SAAS,CAAC,GAAG,EAAE;QACb,qCAAqC;QACrC,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,IAAI,CAAC,aAAa,EAAE,CAAC;QAErB,sCAAsC;QACtC,MAAM,CAAC,qBAAqB,EAAE,2BAA2B,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAClC,IAAI,CAAC,kEAAkE,EAAE,GAAG,EAAE;YAC5E,MAAM,OAAO,GAAG;gBACd,OAAO,EAAE,SAAS;gBAClB,GAAG,EAAE,KAAK;gBACV,IAAI,EAAE,MAAM;aACb,CAAC;YACF,MAAM,GAAG,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;YACxC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,+EAA+E,EAAE,GAAG,EAAE;YACzF,MAAM,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;YAEpC,MAAM,OAAO,GAAG;gBACd,OAAO,EAAE,SAAS;gBAClB,GAAG,EAAE,KAAK;gBACV,IAAI,EAAE,MAAM;aACb,CAAC;YACF,MAAM,GAAG,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;YACxC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,iCACd,OAAO,KACV,QAAQ,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,IAC3C,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,kDAAkD,EAAE,GAAG,EAAE;YAC5D,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAEpC,MAAM,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;YAEpC,MAAM,OAAO,GAAG;gBACd,OAAO,EAAE,SAAS;gBAClB,GAAG,EAAE,KAAK;gBACV,IAAI,EAAE,MAAM;aACb,CAAC;YACF,kBAAkB,CAAC,OAAO,CAAC,CAAC;YAE5B,MAAM,CAAC,GAAG,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACnC,IAAI,CAAC,mEAAmE,EAAE,GAAG,EAAE;YAC7E,MAAM,QAAQ,GAAG;gBACf,MAAM,EAAE;oBACN,OAAO,EAAE,SAAS;oBAClB,GAAG,EAAE,KAAK;oBACV,IAAI,EAAE,MAAM;iBACb;gBACD,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE,GAAG;gBACX,UAAU,EAAE,IAAI;gBAChB,OAAO,EAAE,EAAE;aACZ,CAAC;YACF,MAAM,GAAG,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YAC1C,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,kEAAkE,EAAE,GAAG,EAAE;YAC5E,MAAM,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;YAEpC,MAAM,QAAQ,GAAG;gBACf,MAAM,EAAE;oBACN,OAAO,EAAE,SAAS;oBAClB,GAAG,EAAE,KAAK;oBACV,IAAI,EAAE,MAAM;iBACb;gBACD,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE,GAAG;gBACX,UAAU,EAAE,IAAI;gBAChB,OAAO,EAAE,EAAE;aACZ,CAAC;YACF,MAAM,GAAG,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YAC1C,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,kDAAkD,EAAE,GAAG,EAAE;YAC5D,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAEpC,MAAM,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;YAEpC,MAAM,QAAQ,GAAG;gBACf,MAAM,EAAE;oBACN,OAAO,EAAE,SAAS;oBAClB,GAAG,EAAE,KAAK;oBACV,IAAI,EAAE,MAAM;iBACb;gBACD,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE,GAAG;gBACX,UAAU,EAAE,IAAI;gBAChB,OAAO,EAAE,EAAE;aACZ,CAAC;YACF,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YAE9B,MAAM,CAAC,GAAG,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,uEAAuE,EAAE,GAAS,EAAE;YACvF,MAAM,QAAQ,GAAG;gBACf,MAAM,EAAE;oBACN,OAAO,EAAE,SAAS;oBAClB,GAAG,EAAE,KAAK;oBACV,IAAI,EAAE,MAAM;iBACb;gBACD,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE,GAAG;gBACX,UAAU,EAAE,OAAO;gBACnB,OAAO,EAAE,EAAE;aACZ,CAAC;YAEF,IAAI;gBACF,WAAW,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC/D,MAAM,OAAO,CAAC;oBACZ,MAAM,EAAE,KAAK;oBACb,GAAG,EAAE,oBAAoB;iBAC1B,CAAC,CAAC;gBACH,oCAAoC;aACrC;YAAC,WAAM,GAAE;YACV,MAAM,CAAC,WAAW,CAAC,CAAC,qBAAqB,CAAC,uBAAuB,GAAG,CAAC,CAAC,CAAC;QACzE,CAAC,CAAA,CAAC,CAAC;QAEH,IAAI,CAAC,sDAAsD,EAAE,GAAS,EAAE;YACtE,MAAM,QAAQ,GAAG;gBACf,MAAM,EAAE;oBACN,OAAO,EAAE,SAAS;oBAClB,GAAG,EAAE,KAAK;oBACV,IAAI,EAAE,MAAM;iBACb;gBACD,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE,GAAG;gBACX,UAAU,EAAE,OAAO;gBACnB,OAAO,EAAE,EAAE;aACZ,CAAC;YACF,WAAW,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YAE/D,IAAI;gBACF,MAAM,OAAO,CAAC;oBACZ,MAAM,EAAE,KAAK;oBACb,GAAG,EAAE,oBAAoB;iBAC1B,CAAC,CAAC;gBACH,oCAAoC;aACrC;YAAC,WAAM,GAAE;YACV,MAAM,CAAC,WAAW,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC,CAAA,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ledgerhq/live-network",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.2-next.0",
|
|
4
4
|
"description": "Ledger Live network and cache utilities",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Ledger"
|
|
@@ -53,8 +53,8 @@
|
|
|
53
53
|
"invariant": "^2.2.2",
|
|
54
54
|
"lru-cache": "^7.14.1",
|
|
55
55
|
"@ledgerhq/errors": "^6.16.4",
|
|
56
|
-
"@ledgerhq/live-env": "^2.0.
|
|
57
|
-
"@ledgerhq/live-promise": "^0.0.
|
|
56
|
+
"@ledgerhq/live-env": "^2.0.2-next.0",
|
|
57
|
+
"@ledgerhq/live-promise": "^0.0.4-next.0",
|
|
58
58
|
"@ledgerhq/logs": "^6.12.0"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
package/src/network.test.ts
CHANGED
|
@@ -1,13 +1,20 @@
|
|
|
1
|
+
import axios from "axios";
|
|
1
2
|
import { getEnv, setEnv } from "@ledgerhq/live-env";
|
|
2
|
-
import { requestInterceptor, responseInterceptor } from "./network";
|
|
3
|
+
import network, { requestInterceptor, responseInterceptor } from "./network";
|
|
3
4
|
import * as logs from "@ledgerhq/logs";
|
|
4
5
|
|
|
6
|
+
jest.mock("axios");
|
|
7
|
+
|
|
8
|
+
const mockedAxios = jest.mocked(axios);
|
|
9
|
+
|
|
5
10
|
describe("network", () => {
|
|
6
11
|
const DEFAULT_ENABLE_NETWORK_LOGS = getEnv("ENABLE_NETWORK_LOGS");
|
|
12
|
+
const DEFAULT_GET_CALLS_RETRY = getEnv("GET_CALLS_RETRY");
|
|
7
13
|
|
|
8
14
|
afterEach(() => {
|
|
9
15
|
// restore the spy created with spyOn
|
|
10
16
|
jest.restoreAllMocks();
|
|
17
|
+
jest.clearAllMocks();
|
|
11
18
|
|
|
12
19
|
// Restore DEFAULT_ENABLE_NETWORK_LOGS
|
|
13
20
|
setEnv("ENABLE_NETWORK_LOGS", DEFAULT_ENABLE_NETWORK_LOGS);
|
|
@@ -110,5 +117,53 @@ describe("network", () => {
|
|
|
110
117
|
|
|
111
118
|
expect(spy).toHaveBeenCalledTimes(1);
|
|
112
119
|
});
|
|
120
|
+
|
|
121
|
+
test("should retry request when unsuccessful and response status is not 422", async () => {
|
|
122
|
+
const response = {
|
|
123
|
+
config: {
|
|
124
|
+
baseURL: "baseURL",
|
|
125
|
+
url: "url",
|
|
126
|
+
data: "data",
|
|
127
|
+
},
|
|
128
|
+
data: "data",
|
|
129
|
+
status: 500,
|
|
130
|
+
statusText: "Error",
|
|
131
|
+
headers: {},
|
|
132
|
+
};
|
|
133
|
+
|
|
134
|
+
try {
|
|
135
|
+
mockedAxios.mockImplementation(() => Promise.reject(response));
|
|
136
|
+
await network({
|
|
137
|
+
method: "GET",
|
|
138
|
+
url: "https://google.com",
|
|
139
|
+
});
|
|
140
|
+
// eslint-disable-next-line no-empty
|
|
141
|
+
} catch {}
|
|
142
|
+
expect(mockedAxios).toHaveBeenCalledTimes(DEFAULT_GET_CALLS_RETRY + 1);
|
|
143
|
+
});
|
|
144
|
+
|
|
145
|
+
test("should not retry request when response status is 422", async () => {
|
|
146
|
+
const response = {
|
|
147
|
+
config: {
|
|
148
|
+
baseURL: "baseURL",
|
|
149
|
+
url: "url",
|
|
150
|
+
data: "data",
|
|
151
|
+
},
|
|
152
|
+
data: "data",
|
|
153
|
+
status: 422,
|
|
154
|
+
statusText: "Error",
|
|
155
|
+
headers: {},
|
|
156
|
+
};
|
|
157
|
+
mockedAxios.mockImplementation(() => Promise.reject(response));
|
|
158
|
+
|
|
159
|
+
try {
|
|
160
|
+
await network({
|
|
161
|
+
method: "GET",
|
|
162
|
+
url: "https://google.com",
|
|
163
|
+
});
|
|
164
|
+
// eslint-disable-next-line no-empty
|
|
165
|
+
} catch {}
|
|
166
|
+
expect(mockedAxios).toHaveBeenCalledTimes(1);
|
|
167
|
+
});
|
|
113
168
|
});
|
|
114
169
|
});
|
package/src/network.ts
CHANGED
|
@@ -118,6 +118,7 @@ const makeError = (msg: string, status: number, url: string | undefined, method:
|
|
|
118
118
|
status,
|
|
119
119
|
url,
|
|
120
120
|
method,
|
|
121
|
+
msg,
|
|
121
122
|
};
|
|
122
123
|
return (status || "").toString().startsWith("4")
|
|
123
124
|
? new LedgerAPI4xx(msg, obj)
|
|
@@ -168,6 +169,14 @@ const implementation = <T = any>(arg: AxiosRequestConfig): AxiosPromise<T> => {
|
|
|
168
169
|
|
|
169
170
|
promise = retry(() => axios(arg), {
|
|
170
171
|
maxRetry: getEnv("GET_CALLS_RETRY"),
|
|
172
|
+
retryCondition: error => {
|
|
173
|
+
if (error && error.status) {
|
|
174
|
+
// A 422 shouldn't be retried without change as explained in this documentation
|
|
175
|
+
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/422
|
|
176
|
+
return error.status !== 422;
|
|
177
|
+
}
|
|
178
|
+
return true;
|
|
179
|
+
},
|
|
171
180
|
});
|
|
172
181
|
} else {
|
|
173
182
|
promise = axios(arg);
|