@keplr-wallet/simple-fetch 0.12.47 → 0.12.48
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/build/fetch.js +15 -9
- package/build/fetch.js.map +1 -1
- package/package.json +2 -2
- package/src/fetch.ts +14 -9
package/build/fetch.js
CHANGED
|
@@ -62,18 +62,24 @@ function simpleFetch(baseURL, url, options) {
|
|
|
62
62
|
const _a = options || {}, { headers: optionHeaders } = _a, otherOptions = __rest(_a, ["headers"]);
|
|
63
63
|
const fetched = yield fetch(actualURL, Object.assign({ headers: Object.assign({ accept: "application/json, text/plain, */*" }, optionHeaders) }, otherOptions));
|
|
64
64
|
let data;
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
data =
|
|
65
|
+
if (fetched.status === 204) {
|
|
66
|
+
// 204 No Content
|
|
67
|
+
data = undefined;
|
|
68
68
|
}
|
|
69
69
|
else {
|
|
70
|
-
const
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
data = JSON.parse(trim);
|
|
70
|
+
const contentType = fetched.headers.get("content-type") || "";
|
|
71
|
+
if (contentType.startsWith("application/json")) {
|
|
72
|
+
data = yield fetched.json();
|
|
74
73
|
}
|
|
75
74
|
else {
|
|
76
|
-
|
|
75
|
+
const r = yield fetched.text();
|
|
76
|
+
const trim = r.trim();
|
|
77
|
+
if (trim.startsWith("{") && trim.endsWith("}")) {
|
|
78
|
+
data = JSON.parse(trim);
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
data = r;
|
|
82
|
+
}
|
|
77
83
|
}
|
|
78
84
|
}
|
|
79
85
|
const res = {
|
|
@@ -92,6 +98,6 @@ function simpleFetch(baseURL, url, options) {
|
|
|
92
98
|
}
|
|
93
99
|
exports.simpleFetch = simpleFetch;
|
|
94
100
|
function defaultValidateStatusFn(status) {
|
|
95
|
-
return status
|
|
101
|
+
return status >= 200 && status < 300;
|
|
96
102
|
}
|
|
97
103
|
//# sourceMappingURL=fetch.js.map
|
package/build/fetch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AACA,mCAA2C;AAE3C,SAAgB,OAAO,CAAC,OAAe,EAAE,GAAW;IAClD,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IACzC,OAAO,GAAG,mBAAmB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IACtD,GAAG;QACD,mBAAmB,CAAC,eAAe,CAAC,QAAQ,CAAC;YAC7C,GAAG;YACH,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAE5B,OAAO,mBAAmB,CAAC,OAAO,GAAG,GAAG,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC;AACxE,CAAC;AATD,0BASC;AAED,SAAS,oBAAoB,CAAC,GAAW;IACvC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;QACpC,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACrB;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAW;IACtC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;QACjD,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;KACrC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAaD,SAAsB,WAAW,CAC/B,OAAe,EACf,GAAwC,EACxC,OAAmC;;QAEnC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,IAAI,GAAG,EAAE;gBACP,OAAO,GAAG,GAAG,CAAC;aACf;YAED,GAAG,GAAG,EAAE,CAAC;SACV;QAED,IAAI,GAAG,KAAK,GAAG,EAAE;YACf,mEAAmE;YACnE,8FAA8F;YAC9F,uDAAuD;YACvD,GAAG,GAAG,EAAE,CAAC;SACV;QACD,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACxC,MAAM,KAA8C,OAAO,IAAI,EAAE,EAA3D,EAAE,OAAO,EAAE,aAAa,OAAmC,EAA9B,YAAY,cAAzC,WAA2C,CAAgB,CAAC;QAClE,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,SAAS,kBACnC,OAAO,kBACL,MAAM,EAAE,mCAAmC,IACxC,aAAa,KAEf,YAAY,EACf,CAAC;QAEH,IAAI,IAAO,CAAC;QAEZ,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@keplr-wallet/simple-fetch",
|
|
3
|
-
"version": "0.12.
|
|
3
|
+
"version": "0.12.48",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"author": "chainapsis",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -15,5 +15,5 @@
|
|
|
15
15
|
"lint-test": "eslint \"src/**/*\" && prettier --check \"src/**/*\"",
|
|
16
16
|
"lint-fix": "eslint --fix \"src/**/*\" && prettier --write \"src/**/*\""
|
|
17
17
|
},
|
|
18
|
-
"gitHead": "
|
|
18
|
+
"gitHead": "daa9814fe9bd6ce6a7680c66106b102551366be3"
|
|
19
19
|
}
|
package/src/fetch.ts
CHANGED
|
@@ -70,16 +70,21 @@ export async function simpleFetch<R>(
|
|
|
70
70
|
|
|
71
71
|
let data: R;
|
|
72
72
|
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
data =
|
|
73
|
+
if (fetched.status === 204) {
|
|
74
|
+
// 204 No Content
|
|
75
|
+
data = undefined as any;
|
|
76
76
|
} else {
|
|
77
|
-
const
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
data = JSON.parse(trim);
|
|
77
|
+
const contentType = fetched.headers.get("content-type") || "";
|
|
78
|
+
if (contentType.startsWith("application/json")) {
|
|
79
|
+
data = await fetched.json();
|
|
81
80
|
} else {
|
|
82
|
-
|
|
81
|
+
const r = await fetched.text();
|
|
82
|
+
const trim = r.trim();
|
|
83
|
+
if (trim.startsWith("{") && trim.endsWith("}")) {
|
|
84
|
+
data = JSON.parse(trim);
|
|
85
|
+
} else {
|
|
86
|
+
data = r as any;
|
|
87
|
+
}
|
|
83
88
|
}
|
|
84
89
|
}
|
|
85
90
|
|
|
@@ -100,5 +105,5 @@ export async function simpleFetch<R>(
|
|
|
100
105
|
}
|
|
101
106
|
|
|
102
107
|
function defaultValidateStatusFn(status: number): boolean {
|
|
103
|
-
return status
|
|
108
|
+
return status >= 200 && status < 300;
|
|
104
109
|
}
|