@modern-js/create-request 1.1.2-rc.0 → 1.1.2

package/dist/js/modern/browser.js

@@ -1,6 +1,29 @@
 import { compile, pathToRegexp } from 'path-to-regexp';
-const globalFetch = fetch;
-export const createRequest = (path, method, port, fetch = globalFetch) => {
+import { handleRes } from "./handleRes";
+let realRequest;
+let realAllowedHeaders;
+
+const originFetch = (...params) => fetch(...params) // eslint-disable-next-line promise/prefer-await-to-then
+.then(handleRes);
+
+export const configure = options => {
+  const {
+    request,
+    interceptor,
+    allowedHeaders
+  } = options;
+  realRequest = request || originFetch;
+
+  if (interceptor && !request) {
+    realRequest = interceptor(fetch);
+  }
+
+  if (Array.isArray(allowedHeaders)) {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    realAllowedHeaders = allowedHeaders;
+  }
+};
+export const createRequest = (path, method, port, fetch = originFetch) => {
   const getFinalPath = compile(path, {
     encode: encodeURIComponent
   });
@@ -8,7 +31,7 @@ export const createRequest = (path, method, port, fetch = globalFetch) => {
   pathToRegexp(path, keys);
 
   const sender = async (...args) => {
-    const fetcher = getFetcher(sender) || fetch;
+    const fetcher = realRequest || fetch;
     const payload = typeof args[args.length - 1] === 'object' ? args[args.length - 1] : {};
     payload.params = payload.params || {};
     keys.forEach((key, index) => {
@@ -46,22 +69,13 @@ export const createRequest = (path, method, port, fetch = globalFetch) => {
     return fetcher(finalURL, {
       method,
       body,
-      headers // eslint-disable-next-line promise/prefer-await-to-then
-
-    }).then(res => res.json());
+      headers
+    });
   };
 
   return sender;
 };
 
-const getFetcher = sender => {
-  if (sender.fetch) {
-    return sender.fetch;
-  }
-
-  return fetch;
-};
-
 const qsStringify = input => {
   const tupleList = [];
 

package/dist/js/modern/handleRes.js

@@ -0,0 +1,23 @@
+const handleRes = res => {
+  const contentType = res.headers.get('content-type');
+
+  if (contentType !== null && contentType !== void 0 && contentType.includes('application/json') || contentType !== null && contentType !== void 0 && contentType.includes('text/json')) {
+    return res.json();
+  }
+
+  if (contentType !== null && contentType !== void 0 && contentType.includes('text/html') || contentType !== null && contentType !== void 0 && contentType.includes('text/plain')) {
+    return res.text();
+  }
+
+  if ((contentType !== null && contentType !== void 0 && contentType.includes('application/x-www-form-urlencoded') || contentType !== null && contentType !== void 0 && contentType.includes('multipart/form-data')) && res instanceof Response) {
+    return res.formData();
+  }
+
+  if (contentType !== null && contentType !== void 0 && contentType.includes('application/octet-stream')) {
+    return res.arrayBuffer();
+  }
+
+  return res.text();
+};
+
+export { handleRes };

package/dist/js/modern/index.js

@@ -1,4 +1,6 @@
-// eslint-disable-next-line filenames/match-exported
+// eslint-disable-next-line eslint-comments/disable-enable-pair
+
+/* eslint-disable filenames/match-exported */
 import { isBrowser } from '@modern-js/utils';
 import { createRequest as browser } from "./browser";
 import { createRequest as node } from "./node";

package/dist/js/modern/node.js

@@ -2,8 +2,30 @@ import qs from 'querystring';
 import nodeFetch from 'node-fetch';
 import { compile, pathToRegexp } from 'path-to-regexp';
 import { useHeaders } from '@modern-js/plugin-ssr/node';
-export const createRequest = (path, method, port, fetch = nodeFetch, headerWhiteList = [] // eslint-disable-next-line max-params
-) => {
+import { handleRes } from "./handleRes";
+let realRequest;
+let realAllowedHeaders = [];
+
+const originFetch = (...params) => nodeFetch(...params) // eslint-disable-next-line promise/prefer-await-to-then
+.then(handleRes);
+
+export const configure = options => {
+  const {
+    request,
+    interceptor,
+    allowedHeaders
+  } = options;
+  realRequest = request || originFetch;
+
+  if (interceptor && !request) {
+    realRequest = interceptor(nodeFetch);
+  }
+
+  if (Array.isArray(allowedHeaders)) {
+    realAllowedHeaders = allowedHeaders;
+  }
+};
+export const createRequest = (path, method, port, fetch = nodeFetch) => {
   const getFinalPath = compile(path, {
     encode: encodeURIComponent
   });
@@ -23,7 +45,7 @@ export const createRequest = (path, method, port, fetch = nodeFetch, headerWhite
     const headers = payload.headers || {};
     let body; // BFF 内网请求需要携带 SSR 请求中的 cookie 和 traceId, 如果有压测头，则添加压测头
 
-    for (const key of headerWhiteList) {
+    for (const key of realAllowedHeaders) {
       headers[key] = webRequestHeaders[key];
     }
 
@@ -48,13 +70,13 @@ export const createRequest = (path, method, port, fetch = nodeFetch, headerWhite
       }
     }
 
-    const url = `http://localhost:${port}${finalPath}`; // eslint-disable-next-line promise/prefer-await-to-then
-
-    return fetch(url, {
+    const url = `http://localhost:${port}${finalPath}`;
+    const fetcher = realRequest || fetch;
+    return fetcher(url, {
       method,
       body,
       headers
-    }).then(res => res.json());
+    });
   };
 
   return sender;

package/dist/js/node/browser.js

@@ -3,13 +3,39 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createRequest = void 0;
+exports.createRequest = exports.configure = void 0;
 
 var _pathToRegexp = require("path-to-regexp");
 
-const globalFetch = fetch;
+var _handleRes = require("./handleRes");
 
-const createRequest = (path, method, port, fetch = globalFetch) => {
+let realRequest;
+let realAllowedHeaders;
+
+const originFetch = (...params) => fetch(...params) // eslint-disable-next-line promise/prefer-await-to-then
+.then(_handleRes.handleRes);
+
+const configure = options => {
+  const {
+    request,
+    interceptor,
+    allowedHeaders
+  } = options;
+  realRequest = request || originFetch;
+
+  if (interceptor && !request) {
+    realRequest = interceptor(fetch);
+  }
+
+  if (Array.isArray(allowedHeaders)) {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    realAllowedHeaders = allowedHeaders;
+  }
+};
+
+exports.configure = configure;
+
+const createRequest = (path, method, port, fetch = originFetch) => {
   const getFinalPath = (0, _pathToRegexp.compile)(path, {
     encode: encodeURIComponent
   });
@@ -17,7 +43,7 @@ const createRequest = (path, method, port, fetch = globalFetch) => {
   (0, _pathToRegexp.pathToRegexp)(path, keys);
 
   const sender = async (...args) => {
-    const fetcher = getFetcher(sender) || fetch;
+    const fetcher = realRequest || fetch;
     const payload = typeof args[args.length - 1] === 'object' ? args[args.length - 1] : {};
     payload.params = payload.params || {};
     keys.forEach((key, index) => {
@@ -55,9 +81,8 @@ const createRequest = (path, method, port, fetch = globalFetch) => {
     return fetcher(finalURL, {
       method,
       body,
-      headers // eslint-disable-next-line promise/prefer-await-to-then
-
-    }).then(res => res.json());
+      headers
+    });
   };
 
   return sender;
@@ -65,14 +90,6 @@ const createRequest = (path, method, port, fetch = globalFetch) => {
 
 exports.createRequest = createRequest;
 
-const getFetcher = sender => {
-  if (sender.fetch) {
-    return sender.fetch;
-  }
-
-  return fetch;
-};
-
 const qsStringify = input => {
   const tupleList = [];
 

package/dist/js/node/handleRes.js

@@ -0,0 +1,30 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.handleRes = void 0;
+
+const handleRes = res => {
+  const contentType = res.headers.get('content-type');
+
+  if (contentType !== null && contentType !== void 0 && contentType.includes('application/json') || contentType !== null && contentType !== void 0 && contentType.includes('text/json')) {
+    return res.json();
+  }
+
+  if (contentType !== null && contentType !== void 0 && contentType.includes('text/html') || contentType !== null && contentType !== void 0 && contentType.includes('text/plain')) {
+    return res.text();
+  }
+
+  if ((contentType !== null && contentType !== void 0 && contentType.includes('application/x-www-form-urlencoded') || contentType !== null && contentType !== void 0 && contentType.includes('multipart/form-data')) && res instanceof Response) {
+    return res.formData();
+  }
+
+  if (contentType !== null && contentType !== void 0 && contentType.includes('application/octet-stream')) {
+    return res.arrayBuffer();
+  }
+
+  return res.text();
+};
+
+exports.handleRes = handleRes;

package/dist/js/node/index.js

@@ -11,7 +11,9 @@ var _browser = require("./browser");
 
 var _node = require("./node");
 
-// eslint-disable-next-line filenames/match-exported
+// eslint-disable-next-line eslint-comments/disable-enable-pair
+
+/* eslint-disable filenames/match-exported */
 const createRequest = (...args) => (0, _utils.isBrowser)() ? (0, _browser.createRequest)(...args) : (0, _node.createRequest)(...args);
 
 var _default = createRequest;

package/dist/js/node/node.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createRequest = void 0;
+exports.createRequest = exports.configure = void 0;
 
 var _querystring = _interopRequireDefault(require("querystring"));
 
@@ -13,10 +13,36 @@ var _pathToRegexp = require("path-to-regexp");
 
 var _node = require("@modern-js/plugin-ssr/node");
 
+var _handleRes = require("./handleRes");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const createRequest = (path, method, port, fetch = _nodeFetch.default, headerWhiteList = [] // eslint-disable-next-line max-params
-) => {
+let realRequest;
+let realAllowedHeaders = [];
+
+const originFetch = (...params) => (0, _nodeFetch.default)(...params) // eslint-disable-next-line promise/prefer-await-to-then
+.then(_handleRes.handleRes);
+
+const configure = options => {
+  const {
+    request,
+    interceptor,
+    allowedHeaders
+  } = options;
+  realRequest = request || originFetch;
+
+  if (interceptor && !request) {
+    realRequest = interceptor(_nodeFetch.default);
+  }
+
+  if (Array.isArray(allowedHeaders)) {
+    realAllowedHeaders = allowedHeaders;
+  }
+};
+
+exports.configure = configure;
+
+const createRequest = (path, method, port, fetch = _nodeFetch.default) => {
   const getFinalPath = (0, _pathToRegexp.compile)(path, {
     encode: encodeURIComponent
   });
@@ -36,7 +62,7 @@ const createRequest = (path, method, port, fetch = _nodeFetch.default, headerWhi
     const headers = payload.headers || {};
     let body; // BFF 内网请求需要携带 SSR 请求中的 cookie 和 traceId, 如果有压测头，则添加压测头
 
-    for (const key of headerWhiteList) {
+    for (const key of realAllowedHeaders) {
       headers[key] = webRequestHeaders[key];
     }
 
@@ -61,13 +87,13 @@ const createRequest = (path, method, port, fetch = _nodeFetch.default, headerWhi
       }
     }
 
-    const url = `http://localhost:${port}${finalPath}`; // eslint-disable-next-line promise/prefer-await-to-then
-
-    return fetch(url, {
+    const url = `http://localhost:${port}${finalPath}`;
+    const fetcher = realRequest || fetch;
+    return fetcher(url, {
       method,
       body,
       headers
-    }).then(res => res.json());
+    });
   };
 
   return sender;

package/dist/js/treeshaking/browser.js

@@ -7,9 +7,32 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 import { compile, pathToRegexp } from 'path-to-regexp';
-var globalFetch = fetch;
+import { handleRes } from "./handleRes";
+var realRequest;
+var realAllowedHeaders;
+
+var originFetch = function originFetch() {
+  return fetch.apply(void 0, arguments) // eslint-disable-next-line promise/prefer-await-to-then
+  .then(handleRes);
+};
+
+export var configure = function configure(options) {
+  var request = options.request,
+      interceptor = options.interceptor,
+      allowedHeaders = options.allowedHeaders;
+  realRequest = request || originFetch;
+
+  if (interceptor && !request) {
+    realRequest = interceptor(fetch);
+  }
+
+  if (Array.isArray(allowedHeaders)) {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    realAllowedHeaders = allowedHeaders;
+  }
+};
 export var createRequest = function createRequest(path, method, port) {
-  var fetch = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : globalFetch;
+  var fetch = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : originFetch;
   var getFinalPath = compile(path, {
     encode: encodeURIComponent
   });
@@ -37,7 +60,7 @@ export var createRequest = function createRequest(path, method, port) {
                 args[_key] = _args[_key];
               }
 
-              fetcher = getFetcher(sender) || fetch;
+              fetcher = realRequest || fetch;
               payload = _typeof(args[args.length - 1]) === 'object' ? args[args.length - 1] : {};
               payload.params = payload.params || {};
               keys.forEach(function (key, index) {
@@ -75,10 +98,7 @@ export var createRequest = function createRequest(path, method, port) {
               return _context.abrupt("return", fetcher(finalURL, {
                 method: method,
                 body: body,
-                headers: headers // eslint-disable-next-line promise/prefer-await-to-then
-
-              }).then(function (res) {
-                return res.json();
+                headers: headers
               }));
 
             case 11:
@@ -97,14 +117,6 @@ export var createRequest = function createRequest(path, method, port) {
   return sender;
 };
 
-var getFetcher = function getFetcher(sender) {
-  if (sender.fetch) {
-    return sender.fetch;
-  }
-
-  return fetch;
-};
-
 var qsStringify = function qsStringify(input) {
   var tupleList = [];
 

package/dist/js/treeshaking/handleRes.js

@@ -0,0 +1,23 @@
+var handleRes = function handleRes(res) {
+  var contentType = res.headers.get('content-type');
+
+  if (contentType !== null && contentType !== void 0 && contentType.includes('application/json') || contentType !== null && contentType !== void 0 && contentType.includes('text/json')) {
+    return res.json();
+  }
+
+  if (contentType !== null && contentType !== void 0 && contentType.includes('text/html') || contentType !== null && contentType !== void 0 && contentType.includes('text/plain')) {
+    return res.text();
+  }
+
+  if ((contentType !== null && contentType !== void 0 && contentType.includes('application/x-www-form-urlencoded') || contentType !== null && contentType !== void 0 && contentType.includes('multipart/form-data')) && res instanceof Response) {
+    return res.formData();
+  }
+
+  if (contentType !== null && contentType !== void 0 && contentType.includes('application/octet-stream')) {
+    return res.arrayBuffer();
+  }
+
+  return res.text();
+};
+
+export { handleRes };

package/dist/js/treeshaking/index.js

@@ -1,4 +1,6 @@
-// eslint-disable-next-line filenames/match-exported
+// eslint-disable-next-line eslint-comments/disable-enable-pair
+
+/* eslint-disable filenames/match-exported */
 import { isBrowser } from '@modern-js/utils';
 import { createRequest as browser } from "./browser";
 import { createRequest as node } from "./node";

package/dist/js/treeshaking/node.js

@@ -10,9 +10,31 @@ import qs from 'querystring';
 import nodeFetch from 'node-fetch';
 import { compile, pathToRegexp } from 'path-to-regexp';
 import { useHeaders } from '@modern-js/plugin-ssr/node';
+import { handleRes } from "./handleRes";
+var realRequest;
+var realAllowedHeaders = [];
+
+var originFetch = function originFetch() {
+  return nodeFetch.apply(void 0, arguments) // eslint-disable-next-line promise/prefer-await-to-then
+  .then(handleRes);
+};
+
+export var configure = function configure(options) {
+  var request = options.request,
+      interceptor = options.interceptor,
+      allowedHeaders = options.allowedHeaders;
+  realRequest = request || originFetch;
+
+  if (interceptor && !request) {
+    realRequest = interceptor(nodeFetch);
+  }
+
+  if (Array.isArray(allowedHeaders)) {
+    realAllowedHeaders = allowedHeaders;
+  }
+};
 export var createRequest = function createRequest(path, method, port) {
   var fetch = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : nodeFetch;
-  var headerWhiteList = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
   var getFinalPath = compile(path, {
     encode: encodeURIComponent
   });
@@ -36,7 +58,7 @@ export var createRequest = function createRequest(path, method, port) {
     var headers = payload.headers || {};
     var body; // BFF 内网请求需要携带 SSR 请求中的 cookie 和 traceId, 如果有压测头，则添加压测头
 
-    var _iterator = _createForOfIteratorHelper(headerWhiteList),
+    var _iterator = _createForOfIteratorHelper(realAllowedHeaders),
         _step;
 
     try {
@@ -71,14 +93,12 @@ export var createRequest = function createRequest(path, method, port) {
       }
     }
 
-    var url = "http://localhost:".concat(port).concat(finalPath); // eslint-disable-next-line promise/prefer-await-to-then
-
-    return fetch(url, {
+    var url = "http://localhost:".concat(port).concat(finalPath);
+    var fetcher = realRequest || fetch;
+    return fetcher(url, {
       method: method,
       body: body,
       headers: headers
-    }).then(function (res) {
-      return res.json();
     });
   };
 

package/dist/types/browser.d.ts

@@ -1,2 +1,3 @@
-import type { RequestCreator } from '.';
+import type { RequestCreator, IOptions } from './types';
+export declare const configure: (options: IOptions) => void;
 export declare const createRequest: RequestCreator;

package/dist/types/handleRes.d.ts

@@ -0,0 +1,3 @@
+import { Response as NodeResponse } from 'node-fetch';
+declare const handleRes: (res: Response | NodeResponse) => Promise<any>;
+export { handleRes };

package/dist/types/index.d.ts

@@ -1,17 +1,4 @@
-export declare type BFFRequestPayload = {
-  params?: Record<string, any>;
-  query?: Record<string, any>;
-  body?: string;
-  formUrlencoded?: never;
-  formData?: FormData;
-  data?: Record<string, any>;
-  headers?: Record<string, any>;
-  cookies?: Record<string, any>;
-};
-export declare type Fetcher = typeof fetch;
-export declare type Sender = ((...args: any[]) => Promise<any>) & {
-  fetch?: Fetcher;
-};
-export declare type RequestCreator = (path: string, method: string, port: number, fetch?: Fetcher, headerWhiteList?: string[]) => Sender;
+import { RequestCreator, IOptions } from './types';
 declare const createRequest: RequestCreator;
+export declare const configure: (options: IOptions) => void;
 export default createRequest;

package/dist/types/node.d.ts

@@ -1,2 +1,4 @@
-import type { RequestCreator } from '.';
+import nodeFetch from 'node-fetch';
+import type { RequestCreator, IOptions } from './types';
+export declare const configure: (options: IOptions<typeof nodeFetch>) => void;
 export declare const createRequest: RequestCreator;

package/dist/types/types.d.ts

@@ -0,0 +1,21 @@
+import type nodeFetch from 'node-fetch';
+export declare type BFFRequestPayload = {
+  params?: Record<string, any>;
+  query?: Record<string, any>;
+  body?: string;
+  formUrlencoded?: never;
+  formData?: FormData;
+  data?: Record<string, any>;
+  headers?: Record<string, any>;
+  cookies?: Record<string, any>;
+};
+export declare type Fetch = typeof nodeFetch | typeof fetch;
+export declare type Sender = ((...args: any[]) => Promise<any>) & {
+  fetch?: Fetch;
+};
+export declare type RequestCreator = (path: string, method: string, port: number, fetch?: Fetch, headerWhiteList?: string[]) => Sender;
+export declare type IOptions<F = typeof fetch> = {
+  request?: F;
+  interceptor?: (request: F) => F;
+  allowedHeaders?: string[];
+};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.2-rc.0",
+  "version": "1.1.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -37,23 +37,25 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/utils": "^1.1.4-rc.0",
+    "@modern-js/utils": "^1.1.6",
     "node-fetch": "^2.6.1",
     "path-to-regexp": "^6.2.0"
   },
   "devDependencies": {
-    "@types/jest": "^26",
+    "@modern-js/module-tools": "^1.1.4",
+    "@modern-js/plugin-ssr": "^1.1.3",
+    "@modern-js/plugin-testing": "^1.2.2",
+    "@types/jest": "^27.0.3",
     "@types/node": "^14",
     "@types/node-fetch": "^2.5.12",
     "@types/react": "^17",
     "@types/react-dom": "^17",
-    "typescript": "^4",
-    "@modern-js/plugin-testing": "^1.1.1",
-    "@modern-js/module-tools": "^1.1.1",
-    "@modern-js/plugin-ssr": "^1.1.2-rc.0"
+    "isomorphic-fetch": "^3.0.0",
+    "nock": "^13.2.1",
+    "typescript": "^4"
   },
   "peerDependencies": {
-    "@modern-js/plugin-ssr": "^1.1.2-rc.0"
+    "@modern-js/plugin-ssr": "^1.1.3"
   },
   "sideEffects": false,
   "publishConfig": {

package/hook.d.ts

@@ -1 +0,0 @@
-export * from './dist/types/hook';