kbfetch 1.1.0 → 2.1.1

package/dist/index.js

@@ -29,8 +29,16 @@ var help = {
     });
     return headers;
   },
+  urlWithDomain: (url) => url.startsWith("http://") || url.startsWith("https://") || url.startsWith("//"),
   urlWithProtocol: (url) => url.startsWith("http://") || url.startsWith("https://"),
-  addProtocol: (url) => !url || !globalThis.location || help.urlWithProtocol(url) ? url : location.protocol + url,
+  addProtocol: (url) => {
+    if (!url)
+      return url;
+    if (help.urlWithProtocol(url))
+      return url;
+    const defProtocol = location?.protocol || "https:";
+    return defProtocol + url;
+  },
   objPick: (obj, keys) => Object.fromEntries(keys.map((key) => [key, obj[key]])),
   objSetDefVal: (obj, key, def) => def && (obj[key] = Object.assign({}, def, obj[key]))
 };
@@ -65,12 +73,13 @@ var defaultKbFetch = {
       url = help_default.synthesizeUrlWithParams(url, requestInit.params);
     if (requestInit.body && requestInit.body.constructor.name === "Object" && requestInit.headers?.["Content-Type"] !== "application/json") {
       requestInit.headers ||= {};
-      requestInit.headers["Content-Type"] == "application/json";
+      requestInit.headers["Content-Type"] = "application/json";
       baseBody && help_default.objSetDefVal(requestInit, "body", baseBody);
       requestInit.body = JSON.stringify(requestInit.body);
     }
     requestInit.headers && (requestInit.headers = help_default.obj2header(requestInit.headers));
-    url = help_default.urlWithProtocol(url) ? url : help_default.addProtocol(baseUrl) + url;
+    url = help_default.urlWithDomain(url) ? url : (baseUrl || "") + url;
+    url = help_default.addProtocol(url) || url;
     const response = fetch(url, requestInit).then(async (respnse) => Object.assign(respnse, { data: await parser(respnse) })).finally(() => clearTimeout(timeoutIns));
     return Object.assign(after(response, { url, init }), {
       abort: () => abortController?.abort()

package/dist/typings/help.d.ts

@@ -37,6 +37,7 @@ declare const help: {
     synthesizeUrlWithParams: (url: string, params?: Record<string, any>) => string;
     parseResBody: (res: Response) => Promise<any>;
     obj2header: (obj: Object) => Headers;
+    urlWithDomain: (url: string) => boolean;
     urlWithProtocol: (url: string) => boolean;
     addProtocol: (url?: string) => string;
     objPick: <T extends Object, K extends keyof T>(obj: T, keys: K[]) => Pick<T, K>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kbfetch",
-  "version": "1.1.0",
+  "version": "2.1.1",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "devDependencies": {