kbfetch 2.1.0 → 2.1.2-beta.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/dist/index.js +39 -27
- package/dist/typings/help.d.ts +1 -0
- package/package.json +5 -5
package/dist/index.js
CHANGED
|
@@ -29,8 +29,16 @@ var help = {
|
|
|
29
29
|
});
|
|
30
30
|
return headers;
|
|
31
31
|
},
|
|
32
|
+
urlWithDomain: (url) => url.startsWith("http://") || url.startsWith("https://") || url.startsWith("//"),
|
|
32
33
|
urlWithProtocol: (url) => url.startsWith("http://") || url.startsWith("https://"),
|
|
33
|
-
addProtocol: (url) =>
|
|
34
|
+
addProtocol: (url) => {
|
|
35
|
+
if (!url)
|
|
36
|
+
return url;
|
|
37
|
+
if (help.urlWithProtocol(url))
|
|
38
|
+
return url;
|
|
39
|
+
const defProtocol = location?.protocol || "https:";
|
|
40
|
+
return defProtocol + url;
|
|
41
|
+
},
|
|
34
42
|
objPick: (obj, keys) => Object.fromEntries(keys.map((key) => [key, obj[key]])),
|
|
35
43
|
objSetDefVal: (obj, key, def) => def && (obj[key] = Object.assign({}, def, obj[key]))
|
|
36
44
|
};
|
|
@@ -48,33 +56,37 @@ var defaultKbFetch = {
|
|
|
48
56
|
const _init = Object.assign(defOpts, init);
|
|
49
57
|
help_default.objSetDefVal(_init, "headers", baseHeaders);
|
|
50
58
|
help_default.objSetDefVal(_init, "params", baseParams);
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
59
|
+
const core = async () => {
|
|
60
|
+
let { parser, after, timeout, canAbort, ...requestInit } = await _init.before(_init) || _init;
|
|
61
|
+
let abortController;
|
|
62
|
+
let timeoutIns;
|
|
63
|
+
if (timeout > 0 || canAbort) {
|
|
64
|
+
abortController = new AbortController;
|
|
65
|
+
Object.assign(requestInit, { signal: abortController.signal });
|
|
66
|
+
if (timeout >= 0) {
|
|
67
|
+
abortController.signal.onabort = () => clearTimeout(timeoutIns);
|
|
68
|
+
timeoutIns = setTimeout(() => {
|
|
69
|
+
abortController.abort();
|
|
70
|
+
}, timeout);
|
|
71
|
+
}
|
|
62
72
|
}
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
73
|
+
if (requestInit.params)
|
|
74
|
+
url = help_default.synthesizeUrlWithParams(url, requestInit.params);
|
|
75
|
+
if (requestInit.body && requestInit.body.constructor.name === "Object" && requestInit.headers?.["Content-Type"] !== "application/json") {
|
|
76
|
+
requestInit.headers ||= {};
|
|
77
|
+
requestInit.headers["Content-Type"] = "application/json";
|
|
78
|
+
baseBody && help_default.objSetDefVal(requestInit, "body", baseBody);
|
|
79
|
+
requestInit.body = JSON.stringify(requestInit.body);
|
|
80
|
+
}
|
|
81
|
+
requestInit.headers && (requestInit.headers = help_default.obj2header(requestInit.headers));
|
|
82
|
+
url = help_default.urlWithDomain(url) ? url : (baseUrl || "") + url;
|
|
83
|
+
url = help_default.addProtocol(url) || url;
|
|
84
|
+
const response = fetch(url, requestInit).then(async (respnse) => Object.assign(respnse, { data: await parser(respnse) })).finally(() => clearTimeout(timeoutIns));
|
|
85
|
+
return Object.assign(after(response, { url, init }), {
|
|
86
|
+
abort: () => abortController?.abort()
|
|
87
|
+
});
|
|
88
|
+
};
|
|
89
|
+
return core();
|
|
78
90
|
},
|
|
79
91
|
get: function(url, params, init) {
|
|
80
92
|
params && (init ||= {}, init.params = params);
|
package/dist/typings/help.d.ts
CHANGED
|
@@ -37,6 +37,7 @@ declare const help: {
|
|
|
37
37
|
synthesizeUrlWithParams: (url: string, params?: Record<string, any>) => string;
|
|
38
38
|
parseResBody: (res: Response) => Promise<any>;
|
|
39
39
|
obj2header: (obj: Object) => Headers;
|
|
40
|
+
urlWithDomain: (url: string) => boolean;
|
|
40
41
|
urlWithProtocol: (url: string) => boolean;
|
|
41
42
|
addProtocol: (url?: string) => string;
|
|
42
43
|
objPick: <T extends Object, K extends keyof T>(obj: T, keys: K[]) => Pick<T, K>;
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "kbfetch",
|
|
3
|
-
"version": "2.1.0",
|
|
3
|
+
"version": "2.1.2-beta.0",
|
|
4
4
|
"main": "./dist/index.js",
|
|
5
5
|
"module": "./dist/index.js",
|
|
6
6
|
"devDependencies": {
|
|
7
7
|
"@types/node": "^20.14.10",
|
|
8
8
|
"bun-types": "latest",
|
|
9
|
-
"typescript": "^
|
|
9
|
+
"typescript": "^6.0.3"
|
|
10
10
|
},
|
|
11
11
|
"peerDependencies": {
|
|
12
12
|
"typescript": "^5.0.0"
|
|
@@ -21,12 +21,12 @@
|
|
|
21
21
|
],
|
|
22
22
|
"license": "MIT",
|
|
23
23
|
"scripts": {
|
|
24
|
-
"pub": "bun bld && bun tsc && npm publish --registry https://registry.npmjs.org/ ",
|
|
24
|
+
"pub": "bun bld && bun tsc && npm publish --tag beta --registry https://registry.npmjs.org/ ",
|
|
25
25
|
"patch": "git stash && npm version patch && git stash pop",
|
|
26
26
|
"updatetaobao": "cnpm sync kbfetch",
|
|
27
|
-
"tsc": "tsc
|
|
27
|
+
"tsc": "tsc -d --emitDeclarationOnly --declarationDir ./dist/typings",
|
|
28
28
|
"bld": "bun build ./index.ts --outdir ./dist",
|
|
29
|
-
"t":"bun t.ts"
|
|
29
|
+
"t": "bun t.ts"
|
|
30
30
|
},
|
|
31
31
|
"type": "module",
|
|
32
32
|
"types": "./dist/typings/index.d.ts"
|