@ekhein/http-request 1.0.8 → 1.0.10

package/dist/main.js

@@ -44,14 +44,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpRequest = exports.HttpRequestHeaders = void 0;
 const axios_1 = __importStar(require("axios"));
+const tldts_1 = __importDefault(require("tldts"));
+const cookie = __importStar(require("cookie"));
 const jsdom_1 = require("jsdom");
 const lodash_1 = require("lodash");
 const tough_cookie_1 = require("tough-cookie");
-const cookie_1 = require("cookie");
-const tldts_1 = require("tldts");
 const common_1 = require("@nestjs/common");
 const http_error_by_code_util_1 = require("@nestjs/common/utils/http-error-by-code.util");
 const libs_1 = require("./libs");
@@ -101,15 +104,17 @@ class HttpRequest {
         }));
         /* Set Cookie */
         this.instance.interceptors.request.use((request) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (request.headers.cookie) {
                 const api = new URL(request.url, request.baseURL);
-                const domain = (0, tldts_1.getDomain)(api.href); /* 一级域名 */
-                const cookies = (0, cookie_1.parse)(request.headers.cookie);
-                const website = Array(api.protocol, domain).join("//");
+                const parsed = tldts_1.default.parse(api.href);
+                const cookies = cookie.parse(request.headers.cookie);
+                const domain1 = String((_a = parsed.domain) !== null && _a !== void 0 ? _a : parsed.hostname); /* 顶级域名 */
+                const website = Array(api.protocol, domain1).join("//");
                 const entries = Object.entries(cookies);
                 for (const [key, value] of entries) {
-                    const cookie = new tough_cookie_1.Cookie({ key, value, domain });
-                    request.jar.setCookieSync(cookie, website);
+                    const cookie = new tough_cookie_1.Cookie(Object.assign(Object.assign({}, parsed), { key, value }));
+                    yield request.jar.setCookie(cookie, website);
                 }
             }
             return request;
@@ -230,14 +235,14 @@ class HttpRequest {
                 .request(options);
         });
     }
-    post(url, data, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
+    post(url_1, data_1) {
+        return __awaiter(this, arguments, void 0, function* (url, data, opts = {}) {
             return this.instance
                 .request(Object.assign(Object.assign({}, opts), { method: "POST", serviceType: 1, url, data }));
         });
     }
-    call(path, data, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
+    call(path_1, data_1) {
+        return __awaiter(this, arguments, void 0, function* (path, data, opts = {}) {
             return this.instance
                 .request(Object.assign(Object.assign({}, opts), { method: "POST", serviceType: 2, path, data }));
         });

package/dist/test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const main_1 = require("./main");
+const request = new main_1.HttpRequest({
+    baseURL: "http://a.b.c.goofish.com"
+});
+request.execute({
+    url: "/api/test",
+    headers: {
+        cookie: "a=1;b=2"
+    }
+})
+    .catch(e => { });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ekhein/http-request",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "license": "MIT",
   "author": "ekhein",
   "main": "./dist/main.js",
@@ -18,6 +18,7 @@
     "@types/jsdom": "^21.1.7",
     "@types/lodash": "^4.17.20",
     "@types/node": "^22.15.18",
+    "@types/tldjs": "^2.3.4",
     "tsx": "^4.19.4",
     "typescript": "^5.8.3"
   },
@@ -30,6 +31,7 @@
     "jsdom": "^25.0.1",
     "lodash": "^4.17.21",
     "proxy-agent": "^6.5.0",
+    "tldjs": "^2.3.2",
     "tldts": "^7.0.16",
     "tough-cookie": "^6.0.0"
   },