npm - @faasjs/request - Versions diffs - 0.0.2-beta.255 → 0.0.2-beta.314 - Mend

@faasjs/request 0.0.2-beta.255 → 0.0.2-beta.314

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/README.md CHANGED Viewed

@@ -2,7 +2,7 @@
 网络请求库
-[![License: MIT](https://img.shields.io/npm/l/@faasjs/request.svg)](https://github.com/faasjs/faasjs/blob/master/packages/faasjs/request/LICENSE)
+[![License: MIT](https://img.shields.io/npm/l/@faasjs/request.svg)](https://github.com/faasjs/faasjs/blob/main/packages/faasjs/request/LICENSE)
 [![NPM Stable Version](https://img.shields.io/npm/v/@faasjs/request/stable.svg)](https://www.npmjs.com/package/@faasjs/request)
 [![NPM Beta Version](https://img.shields.io/npm/v/@faasjs/request/beta.svg)](https://www.npmjs.com/package/@faasjs/request)

package/{lib → dist}/index.d.ts RENAMED Viewed

@@ -1,76 +1,77 @@
-/// <reference types="node" />
-import * as http from 'http';
-export declare type Request = {
-    headers?: http.OutgoingHttpHeaders;
-    method?: string;
-    host?: string;
-    path?: string;
-    query?: http.OutgoingHttpHeaders;
-    body?: {
-        [key: string]: any;
-    };
-};
-export declare type Response<T = any> = {
-    request?: Request;
-    statusCode?: number;
-    statusMessage?: string;
-    headers: http.OutgoingHttpHeaders;
-    body: T;
-};
-export declare type RequestOptions = {
-    /** 请求头 */
-    headers?: http.OutgoingHttpHeaders;
-    /** 请求方法，默认为 GET */
-    method?: string;
-    /** 请求参数，放置于 path 后，若需放置在 body 中，请使用 body 参数 */
-    query?: {
-        [key: string]: any;
-    };
-    /** 请求体 */
-    body?: {
-        [key: string]: any;
-    } | string;
-    /** 最长耗时，单位为毫秒 */
-    timeout?: number;
-    /** HTTP 认证头，格式为 user:password */
-    auth?: string;
-    /** 上传文件的完整路径 */
-    file?: string;
-    /** 下载流，用于直接将响应内容保存到本地文件，通过 fs.createWriteStream 创建 */
-    downloadStream?: NodeJS.WritableStream;
-    pfx?: Buffer;
-    passphrase?: string;
-    agent?: boolean;
-    /** body 解析器，默认为 JSON.parse */
-    parse?: (body: string) => any;
-};
-declare type Mock = (url: string, options: RequestOptions) => Promise<Response>;
-/**
- * 设置模拟请求
- * @param handler {function | null} 模拟函数，若设置为 null 则表示清除模拟函数
- * @example setMock(async (url, options) => Promise.resolve({ headers: {}, statusCode: 200, body: { data: 'ok' } }))
- */
-export declare function setMock(handler: Mock | null): void;
-export declare function querystringify(obj: any): string;
-/**
- * 发起网络请求
- * @param {string} url 请求路径或完整网址
- * @param {object=} [options={}] 参数和配置
- * @param {string} [options.methd=GET] 请求方法
- * @param {object} [options.query={}] 请求参数，放置于 path 后，若需放置在 body 中，请使用 body 参数
- * @param {object} [options.headers={}] 请求头
- * @param {object=} options.body 请求体
- * @param {number=} options.timeout 最长耗时，单位为毫秒
- * @param {string=} options.auth HTTP 认证头，格式为 user:password
- * @param {string=} options.file 上传文件的完整路径
- * @param {WritableStream=} options.downloadStream 下载流，用于直接将响应内容保存到本地文件
- * @param {Buffer=} options.pfx pfx
- * @param {string=} options.passphrase passphrase
- * @param {boolean=} options.agent agent
- * @param {parse=} options.parse body 解析器，默认为 JSON.parse
- *
- * @returns {promise}
- * @url https://faasjs.com/doc/request.html
- */
-export declare function request<T = any>(url: string, { headers, method, query, body, timeout, auth, file, downloadStream, pfx, passphrase, agent, parse }?: RequestOptions): Promise<Response<T>>;
-export default request;
+import * as http from 'http';
+declare type Request = {
+    headers?: http.OutgoingHttpHeaders;
+    method?: string;
+    host?: string;
+    path?: string;
+    query?: http.OutgoingHttpHeaders;
+    body?: {
+        [key: string]: any;
+    };
+};
+declare type Response<T = any> = {
+    request?: Request;
+    statusCode?: number;
+    statusMessage?: string;
+    headers: http.OutgoingHttpHeaders;
+    body: T;
+};
+declare type RequestOptions = {
+    /** 请求头 */
+    headers?: http.OutgoingHttpHeaders;
+    /** 请求方法，默认为 GET */
+    method?: string;
+    /** 请求参数，放置于 path 后，若需放置在 body 中，请使用 body 参数 */
+    query?: {
+        [key: string]: any;
+    };
+    /** 请求体 */
+    body?: {
+        [key: string]: any;
+    } | string;
+    /** 最长耗时，单位为毫秒 */
+    timeout?: number;
+    /** HTTP 认证头，格式为 user:password */
+    auth?: string;
+    /** 上传文件的完整路径 */
+    file?: string;
+    /** 下载流，用于直接将响应内容保存到本地文件，通过 fs.createWriteStream 创建 */
+    downloadStream?: NodeJS.WritableStream;
+    pfx?: Buffer;
+    passphrase?: string;
+    agent?: boolean;
+    /** body 解析器，默认为 JSON.parse */
+    parse?: (body: string) => any;
+};
+declare type Mock = (url: string, options: RequestOptions) => Promise<Response>;
+/**
+ * 设置模拟请求
+ * @param handler {function | null} 模拟函数，若设置为 null 则表示清除模拟函数
+ * @example setMock(async (url, options) => Promise.resolve({ headers: {}, statusCode: 200, body: { data: 'ok' } }))
+ */
+declare function setMock(handler: Mock | null): void;
+declare function querystringify(obj: any): string;
+/**
+ * 发起网络请求
+ * @param {string} url 请求路径或完整网址
+ * @param {object=} [options={}] 参数和配置
+ * @param {string} [options.method=GET] 请求方法
+ * @param {object} [options.query={}] 请求参数，放置于 path 后，若需放置在 body 中，请使用 body 参数
+ * @param {object} [options.headers={}] 请求头
+ * @param {object=} options.body 请求体
+ * @param {number=} options.timeout 最长耗时，单位为毫秒
+ * @param {string=} options.auth HTTP 认证头，格式为 user:password
+ * @param {string=} options.file 上传文件的完整路径
+ * @param {WritableStream=} options.downloadStream 下载流，用于直接将响应内容保存到本地文件
+ * @param {Buffer=} options.pfx pfx
+ * @param {string=} options.passphrase passphrase
+ * @param {boolean=} options.agent agent
+ * @param {parse=} options.parse body 解析器，默认为 JSON.parse
+ *
+ * @returns {promise}
+ * @url https://faasjs.com/doc/request.html
+ */
+declare function request<T = any>(url: string, { headers, method, query, body, timeout, auth, file, downloadStream, pfx, passphrase, agent, parse }?: RequestOptions): Promise<Response<T>>;
+export { Request, RequestOptions, Response, request as default, querystringify, request, setMock };

package/dist/index.js ADDED Viewed

@@ -0,0 +1,214 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __reExport = (target, module2, copyDefault, desc) => {
+  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
+    for (let key of __getOwnPropNames(module2))
+      if (!__hasOwnProp.call(target, key) && (copyDefault || key !== "default"))
+        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
+  }
+  return target;
+};
+var __toESM = (module2, isNodeMode) => {
+  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", !isNodeMode && module2 && module2.__esModule ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
+};
+var __toCommonJS = /* @__PURE__ */ ((cache) => {
+  return (module2, temp) => {
+    return cache && cache.get(module2) || (temp = __reExport(__markAsModule({}), module2, 1), cache && cache.set(module2, temp), temp);
+  };
+})(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
+// src/index.ts
+var src_exports = {};
+__export(src_exports, {
+  default: () => src_default,
+  querystringify: () => querystringify,
+  request: () => request,
+  setMock: () => setMock
+});
+var http = __toESM(require("http"));
+var https = __toESM(require("https"));
+var import_url = require("url");
+var import_fs = require("fs");
+var import_path = require("path");
+var import_logger = require("@faasjs/logger");
+var mock = null;
+function setMock(handler) {
+  mock = handler;
+}
+function querystringify(obj) {
+  const pairs = [];
+  let value;
+  let key;
+  for (key in obj) {
+    if (Object.prototype.hasOwnProperty.call(obj, key)) {
+      value = obj[key];
+      if (!value && (value === null || value === void 0 || isNaN(value))) {
+        value = "";
+      }
+      key = encodeURIComponent(key);
+      value = encodeURIComponent(value);
+      if (key === null || value === null)
+        continue;
+      pairs.push(key + "=" + value);
+    }
+  }
+  return pairs.length ? pairs.join("&") : "";
+}
+async function request(url, {
+  headers,
+  method,
+  query,
+  body,
+  timeout,
+  auth,
+  file,
+  downloadStream,
+  pfx,
+  passphrase,
+  agent,
+  parse
+} = {
+  headers: {},
+  query: {}
+}) {
+  const log = new import_logger.Logger("request");
+  if (mock)
+    return mock(url, {
+      headers,
+      method,
+      query,
+      body
+    });
+  if (query) {
+    if (!url.includes("?"))
+      url += "?";
+    else if (!url.endsWith("?"))
+      url += "&";
+    url += querystringify(query);
+  }
+  const uri = new import_url.URL(url);
+  const protocol = uri.protocol === "https:" ? https : http;
+  if (!uri.protocol)
+    throw Error("Unknown protocol");
+  const options = {
+    headers: {},
+    host: uri.host ? uri.host.replace(/:[0-9]+$/, "") : uri.host,
+    method: method ? method.toUpperCase() : "GET",
+    path: uri.pathname + uri.search,
+    query: {},
+    port: uri.port,
+    timeout,
+    auth,
+    pfx,
+    passphrase,
+    agent
+  };
+  for (const key in headers)
+    if (typeof headers[key] !== "undefined" && headers[key] !== null)
+      options.headers[key] = headers[key];
+  if (body && typeof body !== "string")
+    if (options.headers["Content-Type"] && options.headers["Content-Type"].toString().includes("application/x-www-form-urlencoded"))
+      body = querystringify(body);
+    else
+      body = JSON.stringify(body);
+  if (body && !options.headers["Content-Length"])
+    options.headers["Content-Length"] = Buffer.byteLength(body);
+  return await new Promise(function(resolve, reject) {
+    log.debug("request %j", __spreadProps(__spreadValues({}, options), {
+      body
+    }));
+    const req = protocol.request(options, function(res) {
+      if (downloadStream) {
+        res.pipe(downloadStream);
+        downloadStream.on("finish", function() {
+          resolve(void 0);
+        });
+      } else {
+        const raw = [];
+        res.on("data", (chunk) => {
+          raw.push(chunk);
+        });
+        res.on("end", () => {
+          const data = Buffer.concat(raw).toString();
+          log.timeEnd(url, "response %s %s %s", res.statusCode, res.headers["content-type"], data);
+          const response = Object.create(null);
+          response.request = options;
+          response.request.body = body;
+          response.statusCode = res.statusCode;
+          response.statusMessage = res.statusMessage;
+          response.headers = res.headers;
+          response.body = data;
+          if (response.body && response.headers["content-type"] && response.headers["content-type"].includes("application/json"))
+            try {
+              response.body = parse ? parse(response.body) : JSON.parse(response.body);
+              log.debug("response.parse JSON");
+            } catch (error) {
+              console.error(error);
+            }
+          if (response.statusCode >= 200 && response.statusCode < 400)
+            resolve(response);
+          else {
+            log.debug("response.error %j", response);
+            reject(response);
+          }
+        });
+      }
+    });
+    if (body)
+      req.write(body);
+    if (file) {
+      const crlf = "\r\n";
+      const boundary = `--${Math.random().toString(16)}`;
+      const delimiter = `${crlf}--${boundary}`;
+      const headers2 = [`Content-Disposition: form-data; name="file"; filename="${(0, import_path.basename)(file)}"${crlf}`];
+      const multipartBody = Buffer.concat([
+        Buffer.from(delimiter + crlf + headers2.join("") + crlf),
+        (0, import_fs.readFileSync)(file),
+        Buffer.from(`${delimiter}--`)
+      ]);
+      req.setHeader("Content-Type", "multipart/form-data; boundary=" + boundary);
+      req.setHeader("Content-Length", multipartBody.length);
+      req.write(multipartBody);
+    }
+    req.on("error", function(e) {
+      log.timeEnd(url, "response.error %j", e);
+      reject(e);
+    });
+    log.time(url);
+    req.end();
+  });
+}
+var src_default = request;
+module.exports = __toCommonJS(src_exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  querystringify,
+  request,
+  setMock
+});

package/dist/index.mjs ADDED Viewed

@@ -0,0 +1,181 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+// src/index.ts
+import * as http from "http";
+import * as https from "https";
+import { URL } from "url";
+import { readFileSync } from "fs";
+import { basename } from "path";
+import { Logger } from "@faasjs/logger";
+var mock = null;
+function setMock(handler) {
+  mock = handler;
+}
+function querystringify(obj) {
+  const pairs = [];
+  let value;
+  let key;
+  for (key in obj) {
+    if (Object.prototype.hasOwnProperty.call(obj, key)) {
+      value = obj[key];
+      if (!value && (value === null || value === void 0 || isNaN(value))) {
+        value = "";
+      }
+      key = encodeURIComponent(key);
+      value = encodeURIComponent(value);
+      if (key === null || value === null)
+        continue;
+      pairs.push(key + "=" + value);
+    }
+  }
+  return pairs.length ? pairs.join("&") : "";
+}
+async function request(url, {
+  headers,
+  method,
+  query,
+  body,
+  timeout,
+  auth,
+  file,
+  downloadStream,
+  pfx,
+  passphrase,
+  agent,
+  parse
+} = {
+  headers: {},
+  query: {}
+}) {
+  const log = new Logger("request");
+  if (mock)
+    return mock(url, {
+      headers,
+      method,
+      query,
+      body
+    });
+  if (query) {
+    if (!url.includes("?"))
+      url += "?";
+    else if (!url.endsWith("?"))
+      url += "&";
+    url += querystringify(query);
+  }
+  const uri = new URL(url);
+  const protocol = uri.protocol === "https:" ? https : http;
+  if (!uri.protocol)
+    throw Error("Unknown protocol");
+  const options = {
+    headers: {},
+    host: uri.host ? uri.host.replace(/:[0-9]+$/, "") : uri.host,
+    method: method ? method.toUpperCase() : "GET",
+    path: uri.pathname + uri.search,
+    query: {},
+    port: uri.port,
+    timeout,
+    auth,
+    pfx,
+    passphrase,
+    agent
+  };
+  for (const key in headers)
+    if (typeof headers[key] !== "undefined" && headers[key] !== null)
+      options.headers[key] = headers[key];
+  if (body && typeof body !== "string")
+    if (options.headers["Content-Type"] && options.headers["Content-Type"].toString().includes("application/x-www-form-urlencoded"))
+      body = querystringify(body);
+    else
+      body = JSON.stringify(body);
+  if (body && !options.headers["Content-Length"])
+    options.headers["Content-Length"] = Buffer.byteLength(body);
+  return await new Promise(function(resolve, reject) {
+    log.debug("request %j", __spreadProps(__spreadValues({}, options), {
+      body
+    }));
+    const req = protocol.request(options, function(res) {
+      if (downloadStream) {
+        res.pipe(downloadStream);
+        downloadStream.on("finish", function() {
+          resolve(void 0);
+        });
+      } else {
+        const raw = [];
+        res.on("data", (chunk) => {
+          raw.push(chunk);
+        });
+        res.on("end", () => {
+          const data = Buffer.concat(raw).toString();
+          log.timeEnd(url, "response %s %s %s", res.statusCode, res.headers["content-type"], data);
+          const response = Object.create(null);
+          response.request = options;
+          response.request.body = body;
+          response.statusCode = res.statusCode;
+          response.statusMessage = res.statusMessage;
+          response.headers = res.headers;
+          response.body = data;
+          if (response.body && response.headers["content-type"] && response.headers["content-type"].includes("application/json"))
+            try {
+              response.body = parse ? parse(response.body) : JSON.parse(response.body);
+              log.debug("response.parse JSON");
+            } catch (error) {
+              console.error(error);
+            }
+          if (response.statusCode >= 200 && response.statusCode < 400)
+            resolve(response);
+          else {
+            log.debug("response.error %j", response);
+            reject(response);
+          }
+        });
+      }
+    });
+    if (body)
+      req.write(body);
+    if (file) {
+      const crlf = "\r\n";
+      const boundary = `--${Math.random().toString(16)}`;
+      const delimiter = `${crlf}--${boundary}`;
+      const headers2 = [`Content-Disposition: form-data; name="file"; filename="${basename(file)}"${crlf}`];
+      const multipartBody = Buffer.concat([
+        Buffer.from(delimiter + crlf + headers2.join("") + crlf),
+        readFileSync(file),
+        Buffer.from(`${delimiter}--`)
+      ]);
+      req.setHeader("Content-Type", "multipart/form-data; boundary=" + boundary);
+      req.setHeader("Content-Length", multipartBody.length);
+      req.write(multipartBody);
+    }
+    req.on("error", function(e) {
+      log.timeEnd(url, "response.error %j", e);
+      reject(e);
+    });
+    log.time(url);
+    req.end();
+  });
+}
+var src_default = request;
+export {
+  src_default as default,
+  querystringify,
+  request,
+  setMock
+};

package/package.json CHANGED Viewed

@@ -1,32 +1,35 @@
 {
   "name": "@faasjs/request",
-  "version": "0.0.2-beta.255",
+  "version": "0.0.2-beta.314",
   "license": "MIT",
-  "main": "lib/index.js",
-  "module": "lib/index.es.js",
-  "types": "lib/index.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "module": "dist/index.mjs",
   "homepage": "https://faasjs.com/doc/request.html",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/faasjs/faasjs.git",
     "directory": "packages/request"
   },
+  "bugs": {
+    "url": "https://github.com/faasjs/faasjs/issues"
+  },
+  "funding": "https://github.com/sponsors/faasjs",
   "scripts": {
-    "prepack": "rm -rf ./lib && rollup -c && mv lib/*/src/* lib/"
+    "build": "rm -rf ./dist && tsup-node src/index.ts --format esm,cjs --dts"
   },
   "files": [
-    "lib"
+    "dist"
   ],
   "peerDependencies": {
     "@faasjs/logger": "^0.0.2-beta.243"
   },
   "devDependencies": {
-    "@types/debug": "*",
-    "@types/jest": "*",
-    "@types/node": "*",
-    "rollup": "*",
-    "rollup-plugin-typescript2": "*",
+    "tsup": "*",
     "typescript": "*"
   },
-  "gitHead": "b44a8294ba8ed5b08cf56931f00e58fa9adfb6ce"
+  "engines": {
+    "npm": ">=8.0.0"
+  },
+  "gitHead": "60be0e54eb369177b416d109a3f9a5a12dedbf24"
 }

package/lib/index.es.js DELETED Viewed

@@ -1,176 +0,0 @@
-import * as http from 'http';
-import * as https from 'https';
-import { URL } from 'url';
-import { readFileSync } from 'fs';
-import { basename } from 'path';
-import { Logger } from '@faasjs/logger';
-let mock = null;
-/**
- * 设置模拟请求
- * @param handler {function | null} 模拟函数，若设置为 null 则表示清除模拟函数
- * @example setMock(async (url, options) => Promise.resolve({ headers: {}, statusCode: 200, body: { data: 'ok' } }))
- */
-function setMock(handler) {
-    mock = handler;
-}
-function querystringify(obj) {
-    const pairs = [];
-    let value;
-    let key;
-    for (key in obj) {
-        if (Object.prototype.hasOwnProperty.call(obj, key)) {
-            value = obj[key];
-            if (!value && (value === null || value === undefined || isNaN(value))) {
-                value = '';
-            }
-            key = encodeURIComponent(key);
-            value = encodeURIComponent(value);
-            if (key === null || value === null)
-                continue;
-            pairs.push(key + '=' + value);
-        }
-    }
-    return pairs.length ? pairs.join('&') : '';
-}
-/**
- * 发起网络请求
- * @param {string} url 请求路径或完整网址
- * @param {object=} [options={}] 参数和配置
- * @param {string} [options.methd=GET] 请求方法
- * @param {object} [options.query={}] 请求参数，放置于 path 后，若需放置在 body 中，请使用 body 参数
- * @param {object} [options.headers={}] 请求头
- * @param {object=} options.body 请求体
- * @param {number=} options.timeout 最长耗时，单位为毫秒
- * @param {string=} options.auth HTTP 认证头，格式为 user:password
- * @param {string=} options.file 上传文件的完整路径
- * @param {WritableStream=} options.downloadStream 下载流，用于直接将响应内容保存到本地文件
- * @param {Buffer=} options.pfx pfx
- * @param {string=} options.passphrase passphrase
- * @param {boolean=} options.agent agent
- * @param {parse=} options.parse body 解析器，默认为 JSON.parse
- *
- * @returns {promise}
- * @url https://faasjs.com/doc/request.html
- */
-async function request(url, { headers, method, query, body, timeout, auth, file, downloadStream, pfx, passphrase, agent, parse } = {
-    headers: {},
-    query: {}
-}) {
-    const log = new Logger('request');
-    if (mock)
-        return mock(url, {
-            headers,
-            method,
-            query,
-            body
-        });
-    // 序列化 query
-    if (query) {
-        if (!url.includes('?'))
-            url += '?';
-        else if (!url.endsWith('?'))
-            url += '&';
-        url += querystringify(query);
-    }
-    // 处理 URL 并生成 options
-    const uri = new URL(url);
-    const protocol = uri.protocol === 'https:' ? https : http;
-    if (!uri.protocol)
-        throw Error('Unkonw protocol');
-    const options = {
-        headers: {},
-        host: uri.host ? uri.host.replace(/:[0-9]+$/, '') : uri.host,
-        method: method ? method.toUpperCase() : 'GET',
-        path: uri.pathname + uri.search,
-        query: {},
-        port: uri.port,
-        timeout,
-        auth,
-        pfx,
-        passphrase,
-        agent
-    };
-    // 处理 headers
-    for (const key in headers)
-        if (typeof headers[key] !== 'undefined' && headers[key] !== null)
-            options.headers[key] = headers[key];
-    // 序列化 body
-    if (body && typeof body !== 'string')
-        if (options.headers['Content-Type'] &&
-            options.headers['Content-Type'].toString().includes('application/x-www-form-urlencoded'))
-            body = querystringify(body);
-        else
-            body = JSON.stringify(body);
-    if (body && !options.headers['Content-Length'])
-        options.headers['Content-Length'] = Buffer.byteLength(body);
-    return await new Promise(function (resolve, reject) {
-        log.debug('request %O', {
-            ...options,
-            body
-        });
-        const req = protocol.request(options, function (res) {
-            if (downloadStream) {
-                res.pipe(downloadStream);
-                downloadStream.on('finish', function () {
-                    resolve(undefined);
-                });
-            }
-            else {
-                const raw = [];
-                res.on('data', (chunk) => {
-                    raw.push(chunk);
-                });
-                res.on('end', () => {
-                    const data = Buffer.concat(raw).toString();
-                    log.timeEnd(url, 'response %s %s %s', res.statusCode, res.headers['content-type'], data);
-                    const response = Object.create(null);
-                    response.request = options;
-                    response.request.body = body;
-                    response.statusCode = res.statusCode;
-                    response.statusMessage = res.statusMessage;
-                    response.headers = res.headers;
-                    response.body = data;
-                    if (response.body && response.headers['content-type'] && response.headers['content-type'].includes('application/json'))
-                        try {
-                            response.body = (parse) ? parse(response.body) : JSON.parse(response.body);
-                            log.debug('response.parse JSON');
-                        }
-                        catch (error) {
-                            console.error(error);
-                        }
-                    if (response.statusCode >= 200 && response.statusCode < 400)
-                        resolve(response);
-                    else {
-                        log.debug('response.error %O', response);
-                        reject(response);
-                    }
-                });
-            }
-        });
-        if (body)
-            req.write(body);
-        if (file) {
-            const crlf = '\r\n';
-            const boundary = `--${Math.random().toString(16)}`;
-            const delimeter = `${crlf}--${boundary}`;
-            const headers = [`Content-Disposition: form-data; name="file"; filename="${basename(file)}"${crlf}`];
-            const multipartBody = Buffer.concat([
-                Buffer.from(delimeter + crlf + headers.join('') + crlf),
-                readFileSync(file),
-                Buffer.from(`${delimeter}--`)
-            ]);
-            req.setHeader('Content-Type', 'multipart/form-data; boundary=' + boundary);
-            req.setHeader('Content-Length', multipartBody.length);
-            req.write(multipartBody);
-        }
-        req.on('error', function (e) {
-            log.timeEnd(url, 'response.error %O', e);
-            reject(e);
-        });
-        log.time(url);
-        req.end();
-    });
-}
-export { request as default, querystringify, request, setMock };

package/lib/index.js DELETED Viewed

@@ -1,204 +0,0 @@
-'use strict';
-Object.defineProperty(exports, '__esModule', { value: true });
-var http = require('http');
-var https = require('https');
-var url = require('url');
-var fs = require('fs');
-var path = require('path');
-var logger = require('@faasjs/logger');
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n["default"] = e;
-  return Object.freeze(n);
-}
-var http__namespace = /*#__PURE__*/_interopNamespace(http);
-var https__namespace = /*#__PURE__*/_interopNamespace(https);
-let mock = null;
-/**
- * 设置模拟请求
- * @param handler {function | null} 模拟函数，若设置为 null 则表示清除模拟函数
- * @example setMock(async (url, options) => Promise.resolve({ headers: {}, statusCode: 200, body: { data: 'ok' } }))
- */
-function setMock(handler) {
-    mock = handler;
-}
-function querystringify(obj) {
-    const pairs = [];
-    let value;
-    let key;
-    for (key in obj) {
-        if (Object.prototype.hasOwnProperty.call(obj, key)) {
-            value = obj[key];
-            if (!value && (value === null || value === undefined || isNaN(value))) {
-                value = '';
-            }
-            key = encodeURIComponent(key);
-            value = encodeURIComponent(value);
-            if (key === null || value === null)
-                continue;
-            pairs.push(key + '=' + value);
-        }
-    }
-    return pairs.length ? pairs.join('&') : '';
-}
-/**
- * 发起网络请求
- * @param {string} url 请求路径或完整网址
- * @param {object=} [options={}] 参数和配置
- * @param {string} [options.methd=GET] 请求方法
- * @param {object} [options.query={}] 请求参数，放置于 path 后，若需放置在 body 中，请使用 body 参数
- * @param {object} [options.headers={}] 请求头
- * @param {object=} options.body 请求体
- * @param {number=} options.timeout 最长耗时，单位为毫秒
- * @param {string=} options.auth HTTP 认证头，格式为 user:password
- * @param {string=} options.file 上传文件的完整路径
- * @param {WritableStream=} options.downloadStream 下载流，用于直接将响应内容保存到本地文件
- * @param {Buffer=} options.pfx pfx
- * @param {string=} options.passphrase passphrase
- * @param {boolean=} options.agent agent
- * @param {parse=} options.parse body 解析器，默认为 JSON.parse
- *
- * @returns {promise}
- * @url https://faasjs.com/doc/request.html
- */
-async function request(url$1, { headers, method, query, body, timeout, auth, file, downloadStream, pfx, passphrase, agent, parse } = {
-    headers: {},
-    query: {}
-}) {
-    const log = new logger.Logger('request');
-    if (mock)
-        return mock(url$1, {
-            headers,
-            method,
-            query,
-            body
-        });
-    // 序列化 query
-    if (query) {
-        if (!url$1.includes('?'))
-            url$1 += '?';
-        else if (!url$1.endsWith('?'))
-            url$1 += '&';
-        url$1 += querystringify(query);
-    }
-    // 处理 URL 并生成 options
-    const uri = new url.URL(url$1);
-    const protocol = uri.protocol === 'https:' ? https__namespace : http__namespace;
-    if (!uri.protocol)
-        throw Error('Unkonw protocol');
-    const options = {
-        headers: {},
-        host: uri.host ? uri.host.replace(/:[0-9]+$/, '') : uri.host,
-        method: method ? method.toUpperCase() : 'GET',
-        path: uri.pathname + uri.search,
-        query: {},
-        port: uri.port,
-        timeout,
-        auth,
-        pfx,
-        passphrase,
-        agent
-    };
-    // 处理 headers
-    for (const key in headers)
-        if (typeof headers[key] !== 'undefined' && headers[key] !== null)
-            options.headers[key] = headers[key];
-    // 序列化 body
-    if (body && typeof body !== 'string')
-        if (options.headers['Content-Type'] &&
-            options.headers['Content-Type'].toString().includes('application/x-www-form-urlencoded'))
-            body = querystringify(body);
-        else
-            body = JSON.stringify(body);
-    if (body && !options.headers['Content-Length'])
-        options.headers['Content-Length'] = Buffer.byteLength(body);
-    return await new Promise(function (resolve, reject) {
-        log.debug('request %O', {
-            ...options,
-            body
-        });
-        const req = protocol.request(options, function (res) {
-            if (downloadStream) {
-                res.pipe(downloadStream);
-                downloadStream.on('finish', function () {
-                    resolve(undefined);
-                });
-            }
-            else {
-                const raw = [];
-                res.on('data', (chunk) => {
-                    raw.push(chunk);
-                });
-                res.on('end', () => {
-                    const data = Buffer.concat(raw).toString();
-                    log.timeEnd(url$1, 'response %s %s %s', res.statusCode, res.headers['content-type'], data);
-                    const response = Object.create(null);
-                    response.request = options;
-                    response.request.body = body;
-                    response.statusCode = res.statusCode;
-                    response.statusMessage = res.statusMessage;
-                    response.headers = res.headers;
-                    response.body = data;
-                    if (response.body && response.headers['content-type'] && response.headers['content-type'].includes('application/json'))
-                        try {
-                            response.body = (parse) ? parse(response.body) : JSON.parse(response.body);
-                            log.debug('response.parse JSON');
-                        }
-                        catch (error) {
-                            console.error(error);
-                        }
-                    if (response.statusCode >= 200 && response.statusCode < 400)
-                        resolve(response);
-                    else {
-                        log.debug('response.error %O', response);
-                        reject(response);
-                    }
-                });
-            }
-        });
-        if (body)
-            req.write(body);
-        if (file) {
-            const crlf = '\r\n';
-            const boundary = `--${Math.random().toString(16)}`;
-            const delimeter = `${crlf}--${boundary}`;
-            const headers = [`Content-Disposition: form-data; name="file"; filename="${path.basename(file)}"${crlf}`];
-            const multipartBody = Buffer.concat([
-                Buffer.from(delimeter + crlf + headers.join('') + crlf),
-                fs.readFileSync(file),
-                Buffer.from(`${delimeter}--`)
-            ]);
-            req.setHeader('Content-Type', 'multipart/form-data; boundary=' + boundary);
-            req.setHeader('Content-Length', multipartBody.length);
-            req.write(multipartBody);
-        }
-        req.on('error', function (e) {
-            log.timeEnd(url$1, 'response.error %O', e);
-            reject(e);
-        });
-        log.time(url$1);
-        req.end();
-    });
-}
-exports["default"] = request;
-exports.querystringify = querystringify;
-exports.request = request;
-exports.setMock = setMock;