@modern-js/create-request 2.63.6 → 2.64.0

package/dist/cjs/browser.js

@@ -27,8 +27,8 @@ var import_path_to_regexp = require("path-to-regexp");
 var import_query_string = require("query-string");
 var import_handleRes = require("./handleRes");
 var import_utiles = require("./utiles");
-let realRequest;
-let realAllowedHeaders;
+const realRequest = /* @__PURE__ */ new Map();
+const realAllowedHeaders = /* @__PURE__ */ new Map();
 const originFetch = (...params) => {
   var _init_method;
   const [url, init] = params;
@@ -38,23 +38,24 @@ const originFetch = (...params) => {
   return fetch(url, init).then(import_handleRes.handleRes);
 };
 const configure = (options) => {
-  const { request, interceptor, allowedHeaders } = options;
-  realRequest = request || originFetch;
+  const { request, interceptor, allowedHeaders, requestId = "default" } = options;
+  let configuredRequest = request || originFetch;
   if (interceptor && !request) {
-    realRequest = interceptor(fetch);
+    configuredRequest = interceptor(fetch);
   }
   if (Array.isArray(allowedHeaders)) {
-    realAllowedHeaders = allowedHeaders;
+    realAllowedHeaders.set(requestId, allowedHeaders);
   }
+  realRequest.set(requestId, configuredRequest);
 };
-const createRequest = (path, method, port, httpMethodDecider = "functionName", fetch1 = originFetch) => {
+const createRequest = ({ path, method, port, httpMethodDecider = "functionName", fetch: fetch1 = originFetch, domain, requestId = "default" }) => {
   const getFinalPath = (0, import_path_to_regexp.compile)(path, {
     encode: encodeURIComponent
   });
   const keys = [];
   (0, import_path_to_regexp.pathToRegexp)(path, keys);
   const sender = async (...args) => {
-    const fetcher = realRequest || originFetch;
+    const fetcher = realRequest.get(requestId) || originFetch;
     let body;
     let finalURL;
     let headers;
@@ -103,6 +104,9 @@ const createRequest = (path, method, port, httpMethodDecider = "functionName", f
       }
     }
     headers.accept = `application/json,*/*;q=0.8`;
+    if (domain) {
+      finalURL = `${domain}${finalURL}`;
+    }
     return fetcher(finalURL, {
       method,
       body,
@@ -111,11 +115,11 @@ const createRequest = (path, method, port, httpMethodDecider = "functionName", f
   };
   return sender;
 };
-const createUploader = (path) => {
+const createUploader = ({ path, domain, requestId = "default" }) => {
   const sender = (...args) => {
-    const fetcher = realRequest || originFetch;
+    const fetcher = realRequest.get(requestId) || originFetch;
     const { body, headers } = (0, import_utiles.getUploadPayload)(args);
-    return fetcher(path, {
+    return fetcher(domain ? `${domain}${path}` : path, {
       method: "POST",
       body,
       headers

package/dist/cjs/node.js

@@ -39,8 +39,8 @@ var import_path_to_regexp = require("path-to-regexp");
 var import_query_string = require("query-string");
 var import_handleRes = require("./handleRes");
 var import_utiles = require("./utiles");
-let realRequest;
-let realAllowedHeaders = [];
+const realRequest = /* @__PURE__ */ new Map();
+const realAllowedHeaders = /* @__PURE__ */ new Map();
 const originFetch = (...params) => {
   var _init_method;
   const [, init] = params;
@@ -50,23 +50,27 @@ const originFetch = (...params) => {
   return (0, import_node_fetch.default)(...params).then(import_handleRes.handleRes);
 };
 const configure = (options) => {
-  const { request, interceptor, allowedHeaders } = options;
-  realRequest = request || originFetch;
+  const { request, interceptor, allowedHeaders, requestId = "default" } = options;
+  let configuredRequest = request || originFetch;
   if (interceptor && !request) {
-    realRequest = interceptor(import_node_fetch.default);
+    configuredRequest = interceptor(import_node_fetch.default);
   }
   if (Array.isArray(allowedHeaders)) {
-    realAllowedHeaders = allowedHeaders;
+    realAllowedHeaders.set(requestId, allowedHeaders);
   }
+  realRequest.set(requestId, configuredRequest);
 };
-const createRequest = (path, method, port, httpMethodDecider = "functionName", fetch = import_node_fetch.default) => {
+const createRequest = ({ path, method, port, httpMethodDecider = "functionName", fetch = originFetch, requestId = "default" }) => {
   const getFinalPath = (0, import_path_to_regexp.compile)(path, {
     encode: encodeURIComponent
   });
   const keys = [];
   (0, import_path_to_regexp.pathToRegexp)(path, keys);
   const sender = (...args) => {
-    const webRequestHeaders = (0, import_node.useHeaders)();
+    let webRequestHeaders = [];
+    if (requestId === "default") {
+      webRequestHeaders = (0, import_node.useHeaders)();
+    }
     let body;
     let headers;
     let url;
@@ -93,7 +97,8 @@ const createRequest = (path, method, port, httpMethodDecider = "functionName", f
       const plainPath = getFinalPath(payload.params);
       const finalPath = payload.query ? `${plainPath}?${(0, import_query_string.stringify)(payload.query)}` : plainPath;
       headers = payload.headers || {};
-      for (const key of realAllowedHeaders) {
+      const targetAllowedHeaders = realAllowedHeaders.get(requestId) || [];
+      for (const key of targetAllowedHeaders) {
         if (typeof webRequestHeaders[key] !== "undefined") {
           headers[key] = webRequestHeaders[key];
         }
@@ -116,7 +121,7 @@ const createRequest = (path, method, port, httpMethodDecider = "functionName", f
       }
       url = `http://127.0.0.1:${port}${finalPath}`;
     }
-    const fetcher = realRequest || originFetch;
+    const fetcher = realRequest.get(requestId) || originFetch;
     if (method.toLowerCase() === "get") {
       body = void 0;
     }
@@ -129,9 +134,9 @@ const createRequest = (path, method, port, httpMethodDecider = "functionName", f
   };
   return sender;
 };
-const createUploader = (path) => {
+const createUploader = ({ path, requestId = "default" }) => {
   const sender = (...args) => {
-    const fetcher = realRequest || originFetch;
+    const fetcher = realRequest.get(requestId) || originFetch;
     const { body, headers } = (0, import_utiles.getUploadPayload)(args);
     return fetcher(path, {
       method: "POST",

package/dist/esm/browser.js

@@ -7,8 +7,8 @@ import { compile, pathToRegexp } from "path-to-regexp";
 import { stringify } from "query-string";
 import { handleRes } from "./handleRes";
 import { getUploadPayload } from "./utiles";
-var realRequest;
-var realAllowedHeaders;
+var realRequest = /* @__PURE__ */ new Map();
+var realAllowedHeaders = /* @__PURE__ */ new Map();
 var originFetch = function() {
   for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
     params[_key] = arguments[_key];
@@ -21,17 +21,18 @@ var originFetch = function() {
   return fetch(url, init).then(handleRes);
 };
 var configure = function(options) {
-  var request = options.request, interceptor = options.interceptor, allowedHeaders = options.allowedHeaders;
-  realRequest = request || originFetch;
+  var request = options.request, interceptor = options.interceptor, allowedHeaders = options.allowedHeaders, _options_requestId = options.requestId, requestId = _options_requestId === void 0 ? "default" : _options_requestId;
+  var configuredRequest = request || originFetch;
   if (interceptor && !request) {
-    realRequest = interceptor(fetch);
+    configuredRequest = interceptor(fetch);
   }
   if (Array.isArray(allowedHeaders)) {
-    realAllowedHeaders = allowedHeaders;
+    realAllowedHeaders.set(requestId, allowedHeaders);
   }
+  realRequest.set(requestId, configuredRequest);
 };
-var createRequest = function(path, method, port) {
-  var httpMethodDecider = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : "functionName", fetch1 = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : originFetch;
+var createRequest = function(param) {
+  var path = param.path, method = param.method, port = param.port, _param_httpMethodDecider = param.httpMethodDecider, httpMethodDecider = _param_httpMethodDecider === void 0 ? "functionName" : _param_httpMethodDecider, _param_fetch = param.fetch, fetch1 = _param_fetch === void 0 ? originFetch : _param_fetch, domain = param.domain, _param_requestId = param.requestId, requestId = _param_requestId === void 0 ? "default" : _param_requestId;
   var getFinalPath = compile(path, {
     encode: encodeURIComponent
   });
@@ -45,7 +46,7 @@ var createRequest = function(path, method, port) {
         for (_len = _arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
           args[_key] = _arguments[_key];
         }
-        fetcher = realRequest || originFetch;
+        fetcher = realRequest.get(requestId) || originFetch;
         if (httpMethodDecider === "inputParams") {
           finalURL = path;
           body = JSON.stringify({
@@ -91,6 +92,9 @@ var createRequest = function(path, method, port) {
           }
         }
         headers.accept = "application/json,*/*;q=0.8";
+        if (domain) {
+          finalURL = "".concat(domain).concat(finalURL);
+        }
         return [
           2,
           fetcher(finalURL, {
@@ -107,14 +111,15 @@ var createRequest = function(path, method, port) {
   }();
   return sender;
 };
-var createUploader = function(path) {
+var createUploader = function(param) {
+  var path = param.path, domain = param.domain, _param_requestId = param.requestId, requestId = _param_requestId === void 0 ? "default" : _param_requestId;
   var sender = function() {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    var fetcher = realRequest || originFetch;
+    var fetcher = realRequest.get(requestId) || originFetch;
     var _getUploadPayload = getUploadPayload(args), body = _getUploadPayload.body, headers = _getUploadPayload.headers;
-    return fetcher(path, {
+    return fetcher(domain ? "".concat(domain).concat(path) : path, {
       method: "POST",
       body,
       headers

package/dist/esm/node.js

@@ -7,8 +7,8 @@ import { compile, pathToRegexp } from "path-to-regexp";
 import { stringify } from "query-string";
 import { handleRes } from "./handleRes";
 import { getUploadPayload } from "./utiles";
-var realRequest;
-var realAllowedHeaders = [];
+var realRequest = /* @__PURE__ */ new Map();
+var realAllowedHeaders = /* @__PURE__ */ new Map();
 var originFetch = function() {
   for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
     params[_key] = arguments[_key];
@@ -21,17 +21,18 @@ var originFetch = function() {
   return nodeFetch.apply(void 0, _to_consumable_array(params)).then(handleRes);
 };
 var configure = function(options) {
-  var request = options.request, interceptor = options.interceptor, allowedHeaders = options.allowedHeaders;
-  realRequest = request || originFetch;
+  var request = options.request, interceptor = options.interceptor, allowedHeaders = options.allowedHeaders, _options_requestId = options.requestId, requestId = _options_requestId === void 0 ? "default" : _options_requestId;
+  var configuredRequest = request || originFetch;
   if (interceptor && !request) {
-    realRequest = interceptor(nodeFetch);
+    configuredRequest = interceptor(nodeFetch);
   }
   if (Array.isArray(allowedHeaders)) {
-    realAllowedHeaders = allowedHeaders;
+    realAllowedHeaders.set(requestId, allowedHeaders);
   }
+  realRequest.set(requestId, configuredRequest);
 };
-var createRequest = function(path, method, port) {
-  var httpMethodDecider = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : "functionName", fetch = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : nodeFetch;
+var createRequest = function(param) {
+  var path = param.path, method = param.method, port = param.port, _param_httpMethodDecider = param.httpMethodDecider, httpMethodDecider = _param_httpMethodDecider === void 0 ? "functionName" : _param_httpMethodDecider, _param_fetch = param.fetch, fetch = _param_fetch === void 0 ? originFetch : _param_fetch, _param_requestId = param.requestId, requestId = _param_requestId === void 0 ? "default" : _param_requestId;
   var getFinalPath = compile(path, {
     encode: encodeURIComponent
   });
@@ -41,7 +42,10 @@ var createRequest = function(path, method, port) {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    var webRequestHeaders = useHeaders();
+    var webRequestHeaders = [];
+    if (requestId === "default") {
+      webRequestHeaders = useHeaders();
+    }
     var body;
     var headers;
     var url;
@@ -68,9 +72,10 @@ var createRequest = function(path, method, port) {
       var plainPath = getFinalPath(payload.params);
       var finalPath = payload.query ? "".concat(plainPath, "?").concat(stringify(payload.query)) : plainPath;
       headers = payload.headers || {};
+      var targetAllowedHeaders = realAllowedHeaders.get(requestId) || [];
       var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
       try {
-        for (var _iterator = realAllowedHeaders[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        for (var _iterator = targetAllowedHeaders[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
           var key = _step.value;
           if (typeof webRequestHeaders[key] !== "undefined") {
             headers[key] = webRequestHeaders[key];
@@ -108,7 +113,7 @@ var createRequest = function(path, method, port) {
       }
       url = "http://127.0.0.1:".concat(port).concat(finalPath);
     }
-    var fetcher = realRequest || originFetch;
+    var fetcher = realRequest.get(requestId) || originFetch;
     if (method.toLowerCase() === "get") {
       body = void 0;
     }
@@ -121,12 +126,13 @@ var createRequest = function(path, method, port) {
   };
   return sender;
 };
-var createUploader = function(path) {
+var createUploader = function(param) {
+  var path = param.path, _param_requestId = param.requestId, requestId = _param_requestId === void 0 ? "default" : _param_requestId;
   var sender = function() {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    var fetcher = realRequest || originFetch;
+    var fetcher = realRequest.get(requestId) || originFetch;
     var _getUploadPayload = getUploadPayload(args), body = _getUploadPayload.body, headers = _getUploadPayload.headers;
     return fetcher(path, {
       method: "POST",

package/dist/esm-node/browser.js

@@ -2,8 +2,8 @@ import { compile, pathToRegexp } from "path-to-regexp";
 import { stringify } from "query-string";
 import { handleRes } from "./handleRes";
 import { getUploadPayload } from "./utiles";
-let realRequest;
-let realAllowedHeaders;
+const realRequest = /* @__PURE__ */ new Map();
+const realAllowedHeaders = /* @__PURE__ */ new Map();
 const originFetch = (...params) => {
   var _init_method;
   const [url, init] = params;
@@ -13,23 +13,24 @@ const originFetch = (...params) => {
   return fetch(url, init).then(handleRes);
 };
 const configure = (options) => {
-  const { request, interceptor, allowedHeaders } = options;
-  realRequest = request || originFetch;
+  const { request, interceptor, allowedHeaders, requestId = "default" } = options;
+  let configuredRequest = request || originFetch;
   if (interceptor && !request) {
-    realRequest = interceptor(fetch);
+    configuredRequest = interceptor(fetch);
   }
   if (Array.isArray(allowedHeaders)) {
-    realAllowedHeaders = allowedHeaders;
+    realAllowedHeaders.set(requestId, allowedHeaders);
   }
+  realRequest.set(requestId, configuredRequest);
 };
-const createRequest = (path, method, port, httpMethodDecider = "functionName", fetch1 = originFetch) => {
+const createRequest = ({ path, method, port, httpMethodDecider = "functionName", fetch: fetch1 = originFetch, domain, requestId = "default" }) => {
   const getFinalPath = compile(path, {
     encode: encodeURIComponent
   });
   const keys = [];
   pathToRegexp(path, keys);
   const sender = async (...args) => {
-    const fetcher = realRequest || originFetch;
+    const fetcher = realRequest.get(requestId) || originFetch;
     let body;
     let finalURL;
     let headers;
@@ -78,6 +79,9 @@ const createRequest = (path, method, port, httpMethodDecider = "functionName", f
       }
     }
     headers.accept = `application/json,*/*;q=0.8`;
+    if (domain) {
+      finalURL = `${domain}${finalURL}`;
+    }
     return fetcher(finalURL, {
       method,
       body,
@@ -86,11 +90,11 @@ const createRequest = (path, method, port, httpMethodDecider = "functionName", f
   };
   return sender;
 };
-const createUploader = (path) => {
+const createUploader = ({ path, domain, requestId = "default" }) => {
   const sender = (...args) => {
-    const fetcher = realRequest || originFetch;
+    const fetcher = realRequest.get(requestId) || originFetch;
     const { body, headers } = getUploadPayload(args);
-    return fetcher(path, {
+    return fetcher(domain ? `${domain}${path}` : path, {
       method: "POST",
       body,
       headers

package/dist/esm-node/node.js

@@ -4,8 +4,8 @@ import { compile, pathToRegexp } from "path-to-regexp";
 import { stringify } from "query-string";
 import { handleRes } from "./handleRes";
 import { getUploadPayload } from "./utiles";
-let realRequest;
-let realAllowedHeaders = [];
+const realRequest = /* @__PURE__ */ new Map();
+const realAllowedHeaders = /* @__PURE__ */ new Map();
 const originFetch = (...params) => {
   var _init_method;
   const [, init] = params;
@@ -15,23 +15,27 @@ const originFetch = (...params) => {
   return nodeFetch(...params).then(handleRes);
 };
 const configure = (options) => {
-  const { request, interceptor, allowedHeaders } = options;
-  realRequest = request || originFetch;
+  const { request, interceptor, allowedHeaders, requestId = "default" } = options;
+  let configuredRequest = request || originFetch;
   if (interceptor && !request) {
-    realRequest = interceptor(nodeFetch);
+    configuredRequest = interceptor(nodeFetch);
   }
   if (Array.isArray(allowedHeaders)) {
-    realAllowedHeaders = allowedHeaders;
+    realAllowedHeaders.set(requestId, allowedHeaders);
   }
+  realRequest.set(requestId, configuredRequest);
 };
-const createRequest = (path, method, port, httpMethodDecider = "functionName", fetch = nodeFetch) => {
+const createRequest = ({ path, method, port, httpMethodDecider = "functionName", fetch = originFetch, requestId = "default" }) => {
   const getFinalPath = compile(path, {
     encode: encodeURIComponent
   });
   const keys = [];
   pathToRegexp(path, keys);
   const sender = (...args) => {
-    const webRequestHeaders = useHeaders();
+    let webRequestHeaders = [];
+    if (requestId === "default") {
+      webRequestHeaders = useHeaders();
+    }
     let body;
     let headers;
     let url;
@@ -58,7 +62,8 @@ const createRequest = (path, method, port, httpMethodDecider = "functionName", f
       const plainPath = getFinalPath(payload.params);
       const finalPath = payload.query ? `${plainPath}?${stringify(payload.query)}` : plainPath;
       headers = payload.headers || {};
-      for (const key of realAllowedHeaders) {
+      const targetAllowedHeaders = realAllowedHeaders.get(requestId) || [];
+      for (const key of targetAllowedHeaders) {
         if (typeof webRequestHeaders[key] !== "undefined") {
           headers[key] = webRequestHeaders[key];
         }
@@ -81,7 +86,7 @@ const createRequest = (path, method, port, httpMethodDecider = "functionName", f
       }
       url = `http://127.0.0.1:${port}${finalPath}`;
     }
-    const fetcher = realRequest || originFetch;
+    const fetcher = realRequest.get(requestId) || originFetch;
     if (method.toLowerCase() === "get") {
       body = void 0;
     }
@@ -94,9 +99,9 @@ const createRequest = (path, method, port, httpMethodDecider = "functionName", f
   };
   return sender;
 };
-const createUploader = (path) => {
+const createUploader = ({ path, requestId = "default" }) => {
   const sender = (...args) => {
-    const fetcher = realRequest || originFetch;
+    const fetcher = realRequest.get(requestId) || originFetch;
     const { body, headers } = getUploadPayload(args);
     return fetcher(path, {
       method: "POST",

package/dist/types/browser.d.ts

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

package/dist/types/node.d.ts

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

package/dist/types/types.d.ts

@@ -13,10 +13,25 @@ export type BFFRequestPayload = {
 export type Sender<F = typeof fetch> = ((...args: any[]) => Promise<any>) & {
     fetch?: F;
 };
-export type RequestCreator<F = typeof fetch> = (path: string, method: string, port: number, httpMethodDecider: HttpMethodDecider, fetch?: F) => Sender;
-export type RequestUploader = (path: string) => Sender;
+export type RequestOptions<F = typeof fetch> = {
+    path: string;
+    method: string;
+    port: number;
+    httpMethodDecider?: HttpMethodDecider;
+    domain?: string;
+    fetch?: F;
+    requestId?: string;
+};
+export type RequestCreator<F = typeof fetch> = (options: RequestOptions<F>) => Sender;
+export type UploadOptions = {
+    path: string;
+    domain?: string;
+    requestId?: string;
+};
+export type UploadCreator = (options: UploadOptions) => Sender;
 export type IOptions<F = typeof fetch> = {
     request?: F;
     interceptor?: (request: F) => F;
     allowedHeaders?: string[];
+    requestId?: string;
 };

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.63.6",
+  "version": "2.64.0",
   "jsnext:source": "./src/node.ts",
   "types": "./dist/types/browser.d.ts",
   "main": "./dist/cjs/node.js",
@@ -44,6 +44,16 @@
       "types": "./dist/types/node.d.ts",
       "jsnext:source": "./src/node.ts",
       "default": "./dist/cjs/node.js"
+    },
+    "./browser": {
+      "types": "./dist/types/browser.d.ts",
+      "jsnext:source": "./src/browser.ts",
+      "default": "./dist/esm/browser.js"
+    },
+    "./default": {
+      "types": "./dist/types/node.d.ts",
+      "jsnext:source": "./src/node.ts",
+      "default": "./dist/cjs/node.js"
     }
   },
   "typesVersions": {
@@ -65,8 +75,8 @@
     "node-fetch": "^2.6.1",
     "path-to-regexp": "^6.2.0",
     "query-string": "^7.1.1",
-    "@modern-js/runtime-utils": "2.63.6",
-    "@modern-js/utils": "2.63.6"
+    "@modern-js/runtime-utils": "2.64.0",
+    "@modern-js/utils": "2.64.0"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -76,9 +86,9 @@
     "jest": "^29",
     "nock": "^13.2.1",
     "typescript": "^5",
-    "@modern-js/types": "2.63.6",
-    "@scripts/build": "2.63.6",
-    "@scripts/jest-config": "2.63.6"
+    "@modern-js/types": "2.64.0",
+    "@scripts/build": "2.64.0",
+    "@scripts/jest-config": "2.64.0"
   },
   "sideEffects": false,
   "publishConfig": {