utils-lib-js 1.3.0 → 1.3.3

package/dist/common/index.js

@@ -26,6 +26,4 @@ __exportStar(require("./static.js"), exports);
 __exportStar(require("./types.js"), exports);
 __exportStar(require("./request.js"), exports);
 __exportStar(require("./event.js"), exports);
-__exportStar(require("./storage.js"), exports);
-console.log(require, typeof Window !== "undefined");
-typeof require === "undefined" && typeof Window !== "undefined" && (window.require = function () {});
+__exportStar(require("./storage.js"), exports);

package/dist/common/request.d.ts

@@ -14,6 +14,7 @@ declare abstract class RequestBase extends Interceptors implements IRequestBase
     abstract fetch(url: any, opts: any): Promise<void>;
     abstract http(url: any, opts: any): Promise<void>;
     chackUrl: (url: string) => boolean;
+    checkIsHttps: (url: string) => boolean;
     fixOrigin: (fixStr: string) => string;
     envDesc: () => "Window" | "Node";
     errorFn: (reject: any) => (err: any) => any;
@@ -40,7 +41,7 @@ declare abstract class RequestInit extends RequestBase implements IRequestInit {
         headers?: {};
         body?: any;
         timeout?: number;
-        controller?: AbortController;
+        controller?: any;
         type?: string;
     }) => {
         url: string;
@@ -48,8 +49,8 @@ declare abstract class RequestInit extends RequestBase implements IRequestInit {
         headers: {};
         body: string;
         timeout: number;
-        signal: AbortSignal;
-        controller: AbortController;
+        signal: any;
+        controller: any;
         type: string;
         timer: any;
     };

package/dist/common/request.js

@@ -39,8 +39,19 @@ var __rest = this && this.__rest || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Request = void 0;
 var index_js_1 = require("./index.js");
-var http_1 = require("http");
-var url_1 = require("url");
+var httpRequest, httpsRequest, parse, CustomAbortController;
+if (typeof require !== "undefined") {
+    CustomAbortController = require("abort-controller");
+    httpRequest = require("http").request;
+    httpsRequest = require("https").request;
+    parse = require("url").parse;
+} else if (typeof AbortController !== "undefined") {
+    CustomAbortController = AbortController;
+} else {
+    CustomAbortController = function () {
+        throw new Error('AbortController is not defined');
+    };
+}
 var Interceptors = function () {
     function Interceptors() {}
     Interceptors.prototype.use = function (type, fn) {
@@ -87,6 +98,9 @@ var RequestBase = function (_super) {
         _this.chackUrl = function (url) {
             return url.startsWith('/');
         };
+        _this.checkIsHttps = function (url) {
+            return url.startsWith('https');
+        };
         _this.fixOrigin = function (fixStr) {
             if (_this.chackUrl(fixStr)) return _this.origin + fixStr;
             return fixStr;
@@ -174,7 +188,7 @@ var RequestInit = function (_super) {
                 _f = _a.timeout,
                 timeout = _f === void 0 ? 30 * 1000 : _f,
                 _g = _a.controller,
-                controller = _g === void 0 ? new AbortController() : _g,
+                controller = _g === void 0 ? new CustomAbortController() : _g,
                 _h = _a.type,
                 type = _h === void 0 ? "json" : _h,
                 others = __rest(_a, ["method", "query", "headers", "body", "timeout", "controller", "type"]);
@@ -188,7 +202,7 @@ var RequestInit = function (_super) {
         _this.initHttpParams = function (url, opts) {
             var _a, _b;
             var params = _this.initAbort(_this.initDefaultParams(url, opts));
-            var options = (0, url_1.parse)(params.url, true);
+            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 : __assign(__assign({}, params), options);
         };
         return _this;
@@ -230,11 +244,13 @@ var Request = function (_super) {
                 resolve = _a.resolve,
                 reject = _a.reject;
             var params = _this.initHttpParams(_url, _opts);
-            var signal = params.signal;
+            var signal = params.signal,
+                url = params.url;
             promise.finally(function () {
                 return _this.clearTimer(params);
             });
-            var req = (0, http_1.request)(params, function (response) {
+            var request = _this.checkIsHttps(url) ? httpsRequest : httpRequest;
+            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 = "";
                     response.setEncoding('utf8');

package/dist/esm/index.js

@@ -7,6 +7,4 @@ export * from "./static.js";
 export * from "./types.js";
 export * from "./request.js";
 export * from "./event.js";
-export * from "./storage.js";
-console.log(require, typeof Window !== "undefined");
-typeof require === "undefined" && typeof Window !== "undefined" && (window.require = function () {});
+export * from "./storage.js";

package/dist/esm/request.d.ts

@@ -14,6 +14,7 @@ declare abstract class RequestBase extends Interceptors implements IRequestBase
     abstract fetch(url: any, opts: any): Promise<void>;
     abstract http(url: any, opts: any): Promise<void>;
     chackUrl: (url: string) => boolean;
+    checkIsHttps: (url: string) => boolean;
     fixOrigin: (fixStr: string) => string;
     envDesc: () => "Window" | "Node";
     errorFn: (reject: any) => (err: any) => any;
@@ -40,7 +41,7 @@ declare abstract class RequestInit extends RequestBase implements IRequestInit {
         headers?: {};
         body?: any;
         timeout?: number;
-        controller?: AbortController;
+        controller?: any;
         type?: string;
     }) => {
         url: string;
@@ -48,8 +49,8 @@ declare abstract class RequestInit extends RequestBase implements IRequestInit {
         headers: {};
         body: string;
         timeout: number;
-        signal: AbortSignal;
-        controller: AbortController;
+        signal: any;
+        controller: any;
         type: string;
         timer: any;
     };

package/dist/esm/request.js

@@ -35,8 +35,19 @@ var __rest = this && this.__rest || function (s, e) {
     return t;
 };
 import { urlJoin, defer, jsonToString, stringToJson } from "./index.js";
-import { request } from "http";
-import { parse } from "url";
+var httpRequest, httpsRequest, parse, CustomAbortController;
+if (typeof require !== "undefined") {
+    CustomAbortController = require("abort-controller");
+    httpRequest = require("http").request;
+    httpsRequest = require("https").request;
+    parse = require("url").parse;
+} else if (typeof AbortController !== "undefined") {
+    CustomAbortController = AbortController;
+} else {
+    CustomAbortController = function () {
+        throw new Error('AbortController is not defined');
+    };
+}
 var Interceptors = function () {
     function Interceptors() {}
     Interceptors.prototype.use = function (type, fn) {
@@ -83,6 +94,9 @@ var RequestBase = function (_super) {
         _this.chackUrl = function (url) {
             return url.startsWith('/');
         };
+        _this.checkIsHttps = function (url) {
+            return url.startsWith('https');
+        };
         _this.fixOrigin = function (fixStr) {
             if (_this.chackUrl(fixStr)) return _this.origin + fixStr;
             return fixStr;
@@ -170,7 +184,7 @@ var RequestInit = function (_super) {
                 _f = _a.timeout,
                 timeout = _f === void 0 ? 30 * 1000 : _f,
                 _g = _a.controller,
-                controller = _g === void 0 ? new AbortController() : _g,
+                controller = _g === void 0 ? new CustomAbortController() : _g,
                 _h = _a.type,
                 type = _h === void 0 ? "json" : _h,
                 others = __rest(_a, ["method", "query", "headers", "body", "timeout", "controller", "type"]);
@@ -226,10 +240,12 @@ var Request = function (_super) {
                 resolve = _a.resolve,
                 reject = _a.reject;
             var params = _this.initHttpParams(_url, _opts);
-            var signal = params.signal;
+            var signal = params.signal,
+                url = params.url;
             promise.finally(function () {
                 return _this.clearTimer(params);
             });
+            var request = _this.checkIsHttps(url) ? httpsRequest : httpRequest;
             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 = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "utils-lib-js",
-  "version": "1.3.0",
+  "version": "1.3.3",
   "description": "JavaScript工具函数，封装的一些常用的js函数",
   "main": "./dist/common/index.js",
   "types": "./dist/common/index.d.ts",
@@ -24,10 +24,13 @@
     "@types/node": "^18.7.15",
     "babel-cli": "^6.26.0"
   },
+  "dependencies": {
+    "abort-controller": "^3.0.0"
+  },
   "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",
+    "node:hot": "nodemon 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",

package/pnpm-lock.yaml

@@ -2,18 +2,29 @@ lockfileVersion: 5.3
 
 specifiers:
   '@types/node': ^18.7.15
+  abort-controller: ^3.0.0
   babel-cli: ^6.26.0
 
+dependencies:
+  abort-controller: 3.0.0
+
 devDependencies:
-  '@types/node': 18.7.15
+  '@types/node': 18.11.9
   babel-cli: 6.26.0
 
 packages:
 
-  /@types/node/18.7.15:
-    resolution: {integrity: sha512-XnjpaI8Bgc3eBag2Aw4t2Uj/49lLBSStHWfqKvIuXD7FIrZyMLWp8KuAFHAqxMZYTF9l08N1ctUn9YNybZJVmQ==}
+  /@types/node/18.11.9:
+    resolution: {integrity: sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==}
     dev: true
 
+  /abort-controller/3.0.0:
+    resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==}
+    engines: {node: '>=6.5'}
+    dependencies:
+      event-target-shim: 5.0.1
+    dev: false
+
   /ansi-regex/2.1.1:
     resolution: {integrity: sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==}
     engines: {node: '>=0.10.0'}
@@ -341,7 +352,7 @@ packages:
     dev: true
 
   /chokidar/1.7.0:
-    resolution: {integrity: sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==}
+    resolution: {integrity: sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=}
     deprecated: Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.
     requiresBuild: true
     dependencies:
@@ -475,6 +486,11 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /event-target-shim/5.0.1:
+    resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==}
+    engines: {node: '>=6'}
+    dev: false
+
   /expand-brackets/0.1.5:
     resolution: {integrity: sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA==}
     engines: {node: '>=0.10.0'}
@@ -615,7 +631,7 @@ packages:
     dev: true
 
   /fsevents/1.2.13:
-    resolution: {integrity: sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==}
+    resolution: {integrity: sha1-8yXLBFVZJCi88Rs4M3DvcOO/zDg=}
     engines: {node: '>= 4.0'}
     os: [darwin]
     deprecated: fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.