keq 1.6.5 → 1.6.6

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.6.6](https://www.github.com/keq-request/keq/compare/v1.6.5...v1.6.6) (2021-12-13)
+
+
+### Bug Fixes
+
+* response cannot call .text, .json, .formData and .blob together ([fa1605a](https://www.github.com/keq-request/keq/commit/fa1605a911b05ac7ce3ecdb9f6d7805b4ced36f2))
+
 ### [1.6.5](https://www.github.com/keq-request/keq/compare/v1.6.4...v1.6.5) (2021-12-13)
 
 

package/es/package.json

@@ -2,7 +2,7 @@
   "name": "keq",
   "main": "lib/index.js",
   "module": "es/index.js",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "license": "MIT",
   "types": "lib/index.d.ts",
   "scripts": {

package/es/src/keq.js

@@ -10,11 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import * as url from 'url';
 import fetch, { Headers } from 'cross-fetch';
 import * as clone from 'clone';
-import * as R from 'ramda';
 import { Exception, FileExpectedException, OverwriteArrayBodyException, UnknowContentTypeException, } from "./exception";
 import { isFormData, isFile, isBrowser, encodeBase64, sleep, inferContentTypeByBody, fixContentType, getBoundaryByContentType, parseFormData, serializeBody, } from "./util";
 import { matchHost, matchMiddleware, compose } from "./middleware";
-import { FormData } from "./polyfill";
+import { FormData, Response } from "./polyfill";
 import { compile } from 'path-to-regexp';
 export class Keq {
     constructor(urlObj, method, middlewares) {
@@ -245,36 +244,33 @@ export class Keq {
                 fetchOptions.headers.delete('content-type');
             }
             const res = yield ctx.options.fetchAPI(uri, fetchOptions);
+            function resFromData() {
+                return __awaiter(this, void 0, void 0, function* () {
+                    const str = yield this.text();
+                    const contentType = this.headers.get('content-type');
+                    if (!contentType)
+                        throw new Exception('Cannot parse form-data body without content-type');
+                    const boundary = getBoundaryByContentType(contentType);
+                    return parseFormData(str, boundary);
+                });
+            }
             if (!isBrowser()) {
                 // node-fetch does not implement Response.formData()
-                res.formData = function () {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        const str = yield this.text();
-                        const contentType = this.headers.get('content-type');
-                        if (!contentType)
-                            throw new Exception('Cannot parse form-data body without content-type');
-                        const boundary = getBoundaryByContentType(contentType);
-                        return parseFormData(str, boundary);
-                    });
-                };
+                res.formData = resFromData.bind(res);
             }
-            const cache = {};
+            let cache;
             ctx.res = new Proxy(res, {
                 get(target, property) {
                     if (!(typeof property === 'string' && ['json', 'formData', 'text', 'blob'].includes(property))) {
                         return target[property];
                     }
-                    return () => {
-                        if (!(property in cache))
-                            cache[property] = target[property]();
-                        return cache[property].then(data => {
-                            if (!isBrowser() && data instanceof Buffer)
-                                return Buffer.from(data);
-                            else if (isBrowser() && data instanceof Blob)
-                                return data.slice();
-                            return R.clone(data);
-                        });
-                    };
+                    return () => __awaiter(this, void 0, void 0, function* () {
+                        if (!cache)
+                            cache = yield target.arrayBuffer();
+                        const res = new Response(cache, { headers: target.headers });
+                        res.formData = resFromData.bind(res);
+                        return yield res[property]();
+                    });
                 },
             });
             if (ctx.options.resolveWithFullResponse) {

package/lib/package.json

@@ -2,7 +2,7 @@
   "name": "keq",
   "main": "lib/index.js",
   "module": "es/index.js",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "license": "MIT",
   "types": "lib/index.d.ts",
   "scripts": {

package/lib/src/keq.js

@@ -13,7 +13,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "url", "cross-fetch", "clone", "ramda", "./exception", "./util", "./middleware", "./polyfill", "path-to-regexp"], factory);
+        define(["require", "exports", "url", "cross-fetch", "clone", "./exception", "./util", "./middleware", "./polyfill", "path-to-regexp"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -22,7 +22,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     const url = require("url");
     const cross_fetch_1 = require("cross-fetch");
     const clone = require("clone");
-    const R = require("ramda");
     const exception_1 = require("./exception");
     const util_1 = require("./util");
     const middleware_1 = require("./middleware");
@@ -257,36 +256,33 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                     fetchOptions.headers.delete('content-type');
                 }
                 const res = yield ctx.options.fetchAPI(uri, fetchOptions);
+                function resFromData() {
+                    return __awaiter(this, void 0, void 0, function* () {
+                        const str = yield this.text();
+                        const contentType = this.headers.get('content-type');
+                        if (!contentType)
+                            throw new exception_1.Exception('Cannot parse form-data body without content-type');
+                        const boundary = (0, util_1.getBoundaryByContentType)(contentType);
+                        return (0, util_1.parseFormData)(str, boundary);
+                    });
+                }
                 if (!(0, util_1.isBrowser)()) {
                     // node-fetch does not implement Response.formData()
-                    res.formData = function () {
-                        return __awaiter(this, void 0, void 0, function* () {
-                            const str = yield this.text();
-                            const contentType = this.headers.get('content-type');
-                            if (!contentType)
-                                throw new exception_1.Exception('Cannot parse form-data body without content-type');
-                            const boundary = (0, util_1.getBoundaryByContentType)(contentType);
-                            return (0, util_1.parseFormData)(str, boundary);
-                        });
-                    };
+                    res.formData = resFromData.bind(res);
                 }
-                const cache = {};
+                let cache;
                 ctx.res = new Proxy(res, {
                     get(target, property) {
                         if (!(typeof property === 'string' && ['json', 'formData', 'text', 'blob'].includes(property))) {
                             return target[property];
                         }
-                        return () => {
-                            if (!(property in cache))
-                                cache[property] = target[property]();
-                            return cache[property].then(data => {
-                                if (!(0, util_1.isBrowser)() && data instanceof Buffer)
-                                    return Buffer.from(data);
-                                else if ((0, util_1.isBrowser)() && data instanceof Blob)
-                                    return data.slice();
-                                return R.clone(data);
-                            });
-                        };
+                        return () => __awaiter(this, void 0, void 0, function* () {
+                            if (!cache)
+                                cache = yield target.arrayBuffer();
+                            const res = new polyfill_1.Response(cache, { headers: target.headers });
+                            res.formData = resFromData.bind(res);
+                            return yield res[property]();
+                        });
                     },
                 });
                 if (ctx.options.resolveWithFullResponse) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "keq",
   "main": "lib/index.js",
   "module": "es/index.js",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "license": "MIT",
   "types": "lib/index.d.ts",
   "scripts": {