utils-lib-js 1.0.15 → 1.2.1

package/dist/common/request.d.ts

@@ -21,6 +21,13 @@ declare abstract class RequestBase extends Interceptors implements IRequestBase
     initAbort: (params: any) => any;
     requestType: () => (url: any, opts: any) => Promise<void>;
     getDataByType: (type: any, response: any) => any;
+    formatBodyString: (bodyString: any) => {
+        text: () => any;
+        json: () => any;
+        blob: () => IObject<any>;
+        formData: () => IObject<any>;
+        arrayBuffer: () => IObject<any>;
+    };
 }
 declare abstract class RequestInit extends RequestBase implements IRequestInit {
     constructor(origin: any);

package/dist/common/request.js

@@ -134,6 +134,25 @@ var RequestBase = function (_super) {
                     return response['json']();
             }
         };
+        _this.formatBodyString = function (bodyString) {
+            return {
+                text: function () {
+                    return bodyString;
+                },
+                json: function () {
+                    var _a;return (_a = (0, index_js_1.stringToJson)(bodyString)) !== null && _a !== void 0 ? _a : bodyString;
+                },
+                blob: function () {
+                    return (0, index_js_1.stringToJson)(bodyString);
+                },
+                formData: function () {
+                    return (0, index_js_1.stringToJson)(bodyString);
+                },
+                arrayBuffer: function () {
+                    return (0, index_js_1.stringToJson)(bodyString);
+                }
+            };
+        };
         _this.origin = origin !== null && origin !== void 0 ? origin : '';
         return _this;
     }
@@ -170,7 +189,7 @@ var RequestInit = function (_super) {
             var _a, _b;
             var params = _this.initAbort(_this.initDefaultParams(url, opts));
             var options = (0, url_1.parse)(params.url, true);
-            return (_b = (_a = _this.reqFn) === null || _a === void 0 ? void 0 : _a.call(_this, __assign(__assign({}, params), options))) !== null && _b !== void 0 ? _b : params;
+            return (_b = (_a = _this.reqFn) === null || _a === void 0 ? void 0 : _a.call(_this, __assign(__assign({}, params), options))) !== null && _b !== void 0 ? _b : __assign(__assign({}, params), options);
         };
         return _this;
     }
@@ -189,6 +208,9 @@ var Request = function (_super) {
                 url = _b.url,
                 opts = __rest(_b, ["url"]);
             var signal = opts.signal;
+            promise.finally(function () {
+                return _this.clearTimer(opts);
+            });
             signal.addEventListener('abort', function () {
                 return _this.errorFn(reject);
             });
@@ -199,9 +221,7 @@ var Request = function (_super) {
                 return _this.errorFn(reject);
             }).then(function (res) {
                 var _a, _b;return resolve((_b = (_a = _this.resFn) === null || _a === void 0 ? void 0 : _a.call(_this, res)) !== null && _b !== void 0 ? _b : res);
-            }).catch(_this.errorFn(reject)).finally(function () {
-                return _this.clearTimer(opts);
-            });
+            }).catch(_this.errorFn(reject));
             return promise;
         };
         _this.http = function (_url, _opts) {
@@ -211,6 +231,9 @@ var Request = function (_super) {
                 reject = _a.reject;
             var params = _this.initHttpParams(_url, _opts);
             var signal = params.signal;
+            promise.finally(function () {
+                return _this.clearTimer(params);
+            });
             var req = (0, http_1.request)(params, function (response) {
                 if ((response === null || response === void 0 ? void 0 : response.statusCode) >= 200 && (response === null || response === void 0 ? void 0 : response.statusCode) < 300) {
                     var data_1 = "";
@@ -219,7 +242,9 @@ var Request = function (_super) {
                         return data_1 += chunk;
                     });
                     return response.on("end", function () {
-                        var _a, _b;return resolve((_b = (_a = _this.resFn) === null || _a === void 0 ? void 0 : _a.call(_this, data_1)) !== null && _b !== void 0 ? _b : data_1);
+                        var _a, _b;
+                        var result = _this.getDataByType(params.type, _this.formatBodyString(data_1));
+                        resolve((_b = (_a = _this.resFn) === null || _a === void 0 ? void 0 : _a.call(_this, result)) !== null && _b !== void 0 ? _b : result);
                     });
                 }
                 return _this.errorFn(reject)(response === null || response === void 0 ? void 0 : response.statusMessage);

package/dist/common/types.d.ts

@@ -84,6 +84,7 @@ export declare type IRequestBase = {
     fetch: IRequestBaseFn;
     http: IRequestBaseFn;
     getDataByType: (type: IDataType, response: Response) => Promise<any>;
+    formatBodyString: (bodyString: string) => IObject<Function>;
 };
 export declare type IRequestInit = {
     initDefaultParams: (url: IUrl, opts: IRequestOptions) => any;

package/dist/esm/request.d.ts

@@ -21,6 +21,13 @@ declare abstract class RequestBase extends Interceptors implements IRequestBase
     initAbort: (params: any) => any;
     requestType: () => (url: any, opts: any) => Promise<void>;
     getDataByType: (type: any, response: any) => any;
+    formatBodyString: (bodyString: any) => {
+        text: () => any;
+        json: () => any;
+        blob: () => IObject<any>;
+        formData: () => IObject<any>;
+        arrayBuffer: () => IObject<any>;
+    };
 }
 declare abstract class RequestInit extends RequestBase implements IRequestInit {
     constructor(origin: any);

package/dist/esm/request.js

@@ -34,7 +34,7 @@ var __rest = this && this.__rest || function (s, e) {
     }
     return t;
 };
-import { urlJoin, defer, jsonToString } from "./index.js";
+import { urlJoin, defer, jsonToString, stringToJson } from "./index.js";
 import { request } from "http";
 import { parse } from "url";
 var Interceptors = function () {
@@ -130,6 +130,25 @@ var RequestBase = function (_super) {
                     return response['json']();
             }
         };
+        _this.formatBodyString = function (bodyString) {
+            return {
+                text: function () {
+                    return bodyString;
+                },
+                json: function () {
+                    var _a;return (_a = stringToJson(bodyString)) !== null && _a !== void 0 ? _a : bodyString;
+                },
+                blob: function () {
+                    return stringToJson(bodyString);
+                },
+                formData: function () {
+                    return stringToJson(bodyString);
+                },
+                arrayBuffer: function () {
+                    return stringToJson(bodyString);
+                }
+            };
+        };
         _this.origin = origin !== null && origin !== void 0 ? origin : '';
         return _this;
     }
@@ -166,7 +185,7 @@ var RequestInit = function (_super) {
             var _a, _b;
             var params = _this.initAbort(_this.initDefaultParams(url, opts));
             var options = parse(params.url, true);
-            return (_b = (_a = _this.reqFn) === null || _a === void 0 ? void 0 : _a.call(_this, __assign(__assign({}, params), options))) !== null && _b !== void 0 ? _b : params;
+            return (_b = (_a = _this.reqFn) === null || _a === void 0 ? void 0 : _a.call(_this, __assign(__assign({}, params), options))) !== null && _b !== void 0 ? _b : __assign(__assign({}, params), options);
         };
         return _this;
     }
@@ -185,6 +204,9 @@ var Request = function (_super) {
                 url = _b.url,
                 opts = __rest(_b, ["url"]);
             var signal = opts.signal;
+            promise.finally(function () {
+                return _this.clearTimer(opts);
+            });
             signal.addEventListener('abort', function () {
                 return _this.errorFn(reject);
             });
@@ -195,9 +217,7 @@ var Request = function (_super) {
                 return _this.errorFn(reject);
             }).then(function (res) {
                 var _a, _b;return resolve((_b = (_a = _this.resFn) === null || _a === void 0 ? void 0 : _a.call(_this, res)) !== null && _b !== void 0 ? _b : res);
-            }).catch(_this.errorFn(reject)).finally(function () {
-                return _this.clearTimer(opts);
-            });
+            }).catch(_this.errorFn(reject));
             return promise;
         };
         _this.http = function (_url, _opts) {
@@ -207,6 +227,9 @@ var Request = function (_super) {
                 reject = _a.reject;
             var params = _this.initHttpParams(_url, _opts);
             var signal = params.signal;
+            promise.finally(function () {
+                return _this.clearTimer(params);
+            });
             var req = request(params, function (response) {
                 if ((response === null || response === void 0 ? void 0 : response.statusCode) >= 200 && (response === null || response === void 0 ? void 0 : response.statusCode) < 300) {
                     var data_1 = "";
@@ -215,7 +238,9 @@ var Request = function (_super) {
                         return data_1 += chunk;
                     });
                     return response.on("end", function () {
-                        var _a, _b;return resolve((_b = (_a = _this.resFn) === null || _a === void 0 ? void 0 : _a.call(_this, data_1)) !== null && _b !== void 0 ? _b : data_1);
+                        var _a, _b;
+                        var result = _this.getDataByType(params.type, _this.formatBodyString(data_1));
+                        resolve((_b = (_a = _this.resFn) === null || _a === void 0 ? void 0 : _a.call(_this, result)) !== null && _b !== void 0 ? _b : result);
                     });
                 }
                 return _this.errorFn(reject)(response === null || response === void 0 ? void 0 : response.statusMessage);

package/dist/esm/types.d.ts

@@ -84,6 +84,7 @@ export declare type IRequestBase = {
     fetch: IRequestBaseFn;
     http: IRequestBaseFn;
     getDataByType: (type: IDataType, response: Response) => Promise<any>;
+    formatBodyString: (bodyString: string) => IObject<Function>;
 };
 export declare type IRequestInit = {
     initDefaultParams: (url: IUrl, opts: IRequestOptions) => any;

package/package.json

@@ -1,40 +1,40 @@
-{
-  "name": "utils-lib-js",
-  "version": "1.0.15",
-  "description": "JavaScript工具函数，封装的一些常用的js函数",
-  "main": "./dist/common/index.js",
-  "types": "./dist/common/index.d.ts",
-  "module": "./dist/esm/index.js",
-  "exports": {
-    "import": "./dist/esm/index.js",
-    "require": "./dist/common/index.js"
-  },
-  "scripts": {
-    "debug:esm": "start cmd /k pnpm run build:hot:esm",
-    "debug:node": "start cmd /k pnpm run build:hot:node & pnpm run node:hot",
-    "node:hot": "nodemon ./example/server.js",
-    "build:hot:esm": "tsc -p tsconfig.es.json -w",
-    "build:hot:node": "tsc -p tsconfig.json -w",
-    "build": "pnpm run tsc:build && pnpm run babel:mjs &&  pnpm run babel:cjs",
-    "tsc:build": "rm -fr dist && tsc -p tsconfig.json && tsc -p tsconfig.es.json",
-    "publish": "pnpm run build && pnpm publish",
-    "babel:mjs": "babel dist/esm --out-dir dist/esm",
-    "babel:cjs": "babel dist/common --out-dir dist/common",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/DieHunter/utils-lib-js.git"
-  },
-  "keywords": [
-    "utils",
-    "tools",
-    "lib"
-  ],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@types/node": "^18.7.15",
-    "babel-cli": "^6.26.0"
-  }
+{
+  "name": "utils-lib-js",
+  "version": "1.2.1",
+  "description": "JavaScript工具函数，封装的一些常用的js函数",
+  "main": "./dist/common/index.js",
+  "types": "./dist/common/index.d.ts",
+  "module": "./dist/esm/index.js",
+  "exports": {
+    "import": "./dist/esm/index.js",
+    "require": "./dist/common/index.js"
+  },
+  "scripts": {
+    "debug:esm": "start cmd /k pnpm run build:hot:esm",
+    "debug:node": "start cmd /k pnpm run build:hot:node & pnpm run node:hot",
+    "node:hot": "nodemon ./example/server.js",
+    "build:hot:esm": "tsc -p tsconfig.es.json -w",
+    "build:hot:node": "tsc -p tsconfig.json -w",
+    "build": "pnpm run tsc:build && pnpm run babel:mjs &&  pnpm run babel:cjs",
+    "tsc:build": "rm -fr dist && tsc -p tsconfig.json && tsc -p tsconfig.es.json",
+    "publish": "pnpm run build && pnpm publish",
+    "babel:mjs": "babel dist/esm --out-dir dist/esm",
+    "babel:cjs": "babel dist/common --out-dir dist/common",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/DieHunter/utils-lib-js.git"
+  },
+  "keywords": [
+    "utils",
+    "tools",
+    "lib"
+  ],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/node": "^18.7.15",
+    "babel-cli": "^6.26.0"
+  }
 }