@faasjs/request 0.0.2-beta.87 → 0.0.3-beta.2

package/README.md

@@ -1,9 +1,157 @@
 # @faasjs/request
 
-网络请求库
-
-[![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)
 
+FaasJS's request module.
+
+## Install
+
+    npm install @faasjs/request
+
+## Modules
+
+### Type Aliases
+
+- [Request](#request)
+- [RequestOptions](#requestoptions)
+- [Response](#response)
+
+### Functions
+
+- [querystringify](#querystringify)
+- [request](#request-1)
+- [setMock](#setmock)
+
+## Type Aliases
+
+### Request
+
+Ƭ **Request**: `Object`
+
+#### Type declaration
+
+| Name | Type |
+| :------ | :------ |
+| `body?` | { `[key: string]`: `any`;  } |
+| `headers?` | `http.OutgoingHttpHeaders` |
+| `host?` | `string` |
+| `method?` | `string` |
+| `path?` | `string` |
+| `query?` | `http.OutgoingHttpHeaders` |
+
+___
+
+### RequestOptions
+
+Ƭ **RequestOptions**: `Object`
+
+#### Type declaration
+
+| Name | Type | Description |
+| :------ | :------ | :------ |
+| `agent?` | `boolean` | - |
+| `auth?` | `string` | The authentication credentials to use for the request.  Format: `username:password` |
+| `body?` | { `[key: string]`: `any`;  } \| `string` | - |
+| `downloadStream?` | `NodeJS.WritableStream` | Create a write stream to download a file. |
+| `file?` | `string` | Path of uploading a file to the server. |
+| `headers?` | `http.OutgoingHttpHeaders` | - |
+| `logger?` | `Logger` | - |
+| `method?` | `string` | The HTTP method to use when making the request. Defaults to GET. |
+| `parse?` | (`body`: `string`) => `any` | Body parser. Defaults to `JSON.parse`. |
+| `passphrase?` | `string` | - |
+| `pfx?` | `Buffer` | - |
+| `query?` | { `[key: string]`: `any`;  } | - |
+| `timeout?` | `number` | - |
+
+___
+
+### Response
+
+Ƭ **Response**<`T`\>: `Object`
+
+#### Type parameters
+
+| Name | Type |
+| :------ | :------ |
+| `T` | `any` |
+
+#### Type declaration
+
+| Name | Type |
+| :------ | :------ |
+| `body` | `T` |
+| `headers` | `http.OutgoingHttpHeaders` |
+| `request?` | [`Request`](#request) |
+| `statusCode?` | `number` |
+| `statusMessage?` | `string` |
+
+## Functions
+
+### querystringify
+
+▸ **querystringify**(`obj`): `string`
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `obj` | `any` |
+
+#### Returns
+
+`string`
+
+___
+
+### request
+
+▸ **request**<`T`\>(`url`, `options?`): `Promise`<[`Response`](#response)<`T`\>\>
+
+Request
+
+**`Url`**
+
 https://faasjs.com/doc/request.html
+
+#### Type parameters
+
+| Name | Type |
+| :------ | :------ |
+| `T` | `any` |
+
+#### Parameters
+
+| Name | Type | Description |
+| :------ | :------ | :------ |
+| `url` | `string` | Url |
+| `options?` | [`RequestOptions`](#requestoptions) | Options |
+
+#### Returns
+
+`Promise`<[`Response`](#response)<`T`\>\>
+
+___
+
+### setMock
+
+▸ **setMock**(`handler`): `void`
+
+Mock requests
+
+**`Example`**
+
+```ts
+setMock(async (url, options) => Promise.resolve({ headers: {}, statusCode: 200, body: { data: 'ok' } }))
+```
+
+#### Parameters
+
+| Name | Type | Description |
+| :------ | :------ | :------ |
+| `handler` | `Mock` | {function \| null} null to disable mock |
+
+#### Returns
+
+`void`

package/dist/index.d.ts

@@ -0,0 +1,87 @@
+import * as http from 'http';
+import { Logger } from '@faasjs/logger';
+
+type Request = {
+    headers?: http.OutgoingHttpHeaders;
+    method?: string;
+    host?: string;
+    path?: string;
+    query?: http.OutgoingHttpHeaders;
+    body?: {
+        [key: string]: any;
+    };
+};
+type Response<T = any> = {
+    request?: Request;
+    statusCode?: number;
+    statusMessage?: string;
+    headers: http.OutgoingHttpHeaders;
+    body: T;
+};
+type RequestOptions = {
+    headers?: http.OutgoingHttpHeaders;
+    /**
+     * The HTTP method to use when making the request. Defaults to GET.
+     */
+    method?: string;
+    query?: {
+        [key: string]: any;
+    };
+    body?: {
+        [key: string]: any;
+    } | string;
+    timeout?: number;
+    /**
+     * The authentication credentials to use for the request.
+     *
+     * Format: `username:password`
+     */
+    auth?: string;
+    /**
+     * Path of uploading a file to the server.
+     */
+    file?: string;
+    /**
+     * Create a write stream to download a file.
+     */
+    downloadStream?: NodeJS.WritableStream;
+    pfx?: Buffer;
+    passphrase?: string;
+    agent?: boolean;
+    /**
+     * Body parser. Defaults to `JSON.parse`.
+     */
+    parse?: (body: string) => any;
+    logger?: Logger;
+};
+type Mock = (url: string, options: RequestOptions) => Promise<Response>;
+/**
+ * Mock requests
+ * @param handler {function | null} null to disable mock
+ * @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;
+/**
+ * Request
+ * @param {string} url Url
+ * @param {object=} [options={}] Options
+ * @param {string} [options.method=GET] Method
+ * @param {object} [options.query={}] Query
+ * @param {object} [options.headers={}] Headers
+ * @param {object=} options.body Body
+ * @param {number=} options.timeout Timeout
+ * @param {string=} options.auth Auth, format: user:password
+ * @param {string=} options.file Upload file path
+ * @param {WritableStream=} options.downloadStream Download stream
+ * @param {Buffer=} options.pfx pfx
+ * @param {string=} options.passphrase passphrase
+ * @param {boolean=} options.agent agent
+ * @param {parse=} options.parse body parser, default is 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, logger, }?: RequestOptions): Promise<Response<T>>;
+
+export { Request, RequestOptions, Response, querystringify, request, setMock };

package/dist/index.js

@@ -0,0 +1,192 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/index.ts
+var src_exports = {};
+__export(src_exports, {
+  querystringify: () => querystringify,
+  request: () => request,
+  setMock: () => setMock
+});
+module.exports = __toCommonJS(src_exports);
+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,
+  logger
+} = { headers: {} }) {
+  if (!logger)
+    logger = 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,
+    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) {
+    logger.debug("request %j", {
+      ...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();
+          logger.timeEnd(url, "response %s %s %s", res.statusCode, res.headers["content-type"], data);
+          const response = /* @__PURE__ */ 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);
+              logger.debug("response.parse JSON");
+            } catch (error) {
+              console.warn("response plain body", response.body);
+              console.error(error);
+            }
+          if (response.statusCode >= 200 && response.statusCode < 400)
+            resolve(response);
+          else {
+            logger.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) {
+      logger.timeEnd(url, "response.error %j", e);
+      reject(e);
+    });
+    logger.time(url);
+    req.end();
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  querystringify,
+  request,
+  setMock
+});

package/dist/index.mjs

@@ -0,0 +1,159 @@
+// 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,
+  logger
+} = { headers: {} }) {
+  if (!logger)
+    logger = 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,
+    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) {
+    logger.debug("request %j", {
+      ...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();
+          logger.timeEnd(url, "response %s %s %s", res.statusCode, res.headers["content-type"], data);
+          const response = /* @__PURE__ */ 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);
+              logger.debug("response.parse JSON");
+            } catch (error) {
+              console.warn("response plain body", response.body);
+              console.error(error);
+            }
+          if (response.statusCode >= 200 && response.statusCode < 400)
+            resolve(response);
+          else {
+            logger.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) {
+      logger.timeEnd(url, "response.error %j", e);
+      reject(e);
+    });
+    logger.time(url);
+    req.end();
+  });
+}
+export {
+  querystringify,
+  request,
+  setMock
+};

package/package.json

@@ -1,26 +1,31 @@
 {
   "name": "@faasjs/request",
-  "version": "0.0.2-beta.87",
+  "version": "0.0.3-beta.2",
   "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",
+  "homepage": "https://faasjs.com/doc/request",
+  "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": "tsup-node src/index.ts --format esm,cjs",
+    "build:types": "tsup-node src/index.ts --dts-only"
   },
   "files": [
-    "lib"
+    "dist"
   ],
   "dependencies": {
-    "@faasjs/logger": "^0.0.2-beta.69"
-  },
-  "devDependencies": {
-    "@types/debug": "*",
-    "@types/jest": "*",
-    "@types/node": "*",
-    "rollup": "*",
-    "rollup-plugin-typescript2": "*",
-    "typescript": "*"
+    "@faasjs/logger": "^0.0.3-beta.2"
   },
-  "gitHead": "f2af1e2dd131245a0075728ace54387bc2ab7262"
+  "engines": {
+    "npm": ">=8.0.0",
+    "node": ">=16.0.0"
+  }
 }

package/lib/index.d.ts

@@ -1,50 +0,0 @@
-/// <reference types="node" />
-import * as http from 'http';
-export interface Request {
-    headers?: http.OutgoingHttpHeaders;
-    method?: string;
-    host?: string;
-    path?: string;
-    query?: http.OutgoingHttpHeaders;
-    body?: any;
-}
-export interface Response<T = any> {
-    request?: Request;
-    statusCode?: number;
-    statusMessage?: string;
-    headers: http.OutgoingHttpHeaders;
-    body: T;
-}
-export interface RequestOptions {
-    headers?: http.OutgoingHttpHeaders;
-    method?: string;
-    query?: http.OutgoingHttpHeaders;
-    body?: any;
-    timeout?: number;
-    auth?: string;
-    file?: string;
-    downloadStream?: NodeJS.WritableStream;
-}
-declare type Mock = (url: string, options: RequestOptions) => Promise<Response>;
-/**
- * 设置模拟请求
- * @param handler {function | null} 模拟函数，若设置为 null 则表示清除模拟函数
- */
-export declare function setMock(handler: Mock | null): void;
-/**
- * 发起网络请求
- * @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 下载流，用于直接将响应内容保存到本地文件
- *
- * @returns {promise}
- */
-export default function request<T = any>(url: string, { headers, method, query, body, timeout, auth, file, downloadStream }?: RequestOptions): Promise<Response<T>>;
-export {};

package/lib/index.es.js

@@ -1,156 +0,0 @@
-import * as http from 'http';
-import * as https from 'https';
-import { stringify } from 'querystring';
-import { parse } from 'url';
-import { readFileSync } from 'fs';
-import { basename } from 'path';
-import Logger from '@faasjs/logger';
-
-let mock = null;
-/**
- * 设置模拟请求
- * @param handler {function | null} 模拟函数，若设置为 null 则表示清除模拟函数
- */
-function setMock(handler) {
-    mock = handler;
-}
-/**
- * 发起网络请求
- * @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 下载流，用于直接将响应内容保存到本地文件
- *
- * @returns {promise}
- */
-async function request(url, { headers, method, query, body, timeout, auth, file, downloadStream } = {
-    headers: {},
-    query: {},
-}) {
-    const log = new Logger('request');
-    log.debug('request %s %O', url, {
-        body,
-        headers,
-        method,
-        query,
-    });
-    if (mock)
-        return mock(url, {
-            headers,
-            method,
-            query,
-            body
-        });
-    // 序列化 query
-    if (query) {
-        if (!url.includes('?'))
-            url += '?';
-        else if (!url.endsWith('?'))
-            url += '&';
-        url += stringify(query);
-    }
-    // 处理 URL 并生成 options
-    const uri = parse(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.path,
-        query: {},
-        port: uri.port,
-        timeout,
-        auth
-    };
-    // 处理 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 = stringify(body);
-        else
-            body = JSON.stringify(body);
-    if (body && !options.headers['Content-Length'])
-        options.headers['Content-Length'] = Buffer.byteLength(body);
-    return new Promise(function (resolve, reject) {
-        // 包裹请求
-        const req = protocol.request(options, function (res) {
-            if (downloadStream) {
-                res.pipe(downloadStream);
-                downloadStream.on('finish', function () {
-                    resolve();
-                });
-            }
-            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 = 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([
-                new Buffer(delimeter + crlf + headers.join('') + crlf),
-                readFileSync(file),
-                new Buffer(`${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 default request;
-export { setMock };

package/lib/index.js

@@ -1,162 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
-var http = require('http');
-var https = require('https');
-var querystring = require('querystring');
-var URL = require('url');
-var fs = require('fs');
-var path = require('path');
-var Logger = _interopDefault(require('@faasjs/logger'));
-
-let mock = null;
-/**
- * 设置模拟请求
- * @param handler {function | null} 模拟函数，若设置为 null 则表示清除模拟函数
- */
-function setMock(handler) {
-    mock = handler;
-}
-/**
- * 发起网络请求
- * @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 下载流，用于直接将响应内容保存到本地文件
- *
- * @returns {promise}
- */
-async function request(url, { headers, method, query, body, timeout, auth, file, downloadStream } = {
-    headers: {},
-    query: {},
-}) {
-    const log = new Logger('request');
-    log.debug('request %s %O', url, {
-        body,
-        headers,
-        method,
-        query,
-    });
-    if (mock)
-        return mock(url, {
-            headers,
-            method,
-            query,
-            body
-        });
-    // 序列化 query
-    if (query) {
-        if (!url.includes('?'))
-            url += '?';
-        else if (!url.endsWith('?'))
-            url += '&';
-        url += querystring.stringify(query);
-    }
-    // 处理 URL 并生成 options
-    const uri = URL.parse(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.path,
-        query: {},
-        port: uri.port,
-        timeout,
-        auth
-    };
-    // 处理 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 = querystring.stringify(body);
-        else
-            body = JSON.stringify(body);
-    if (body && !options.headers['Content-Length'])
-        options.headers['Content-Length'] = Buffer.byteLength(body);
-    return new Promise(function (resolve, reject) {
-        // 包裹请求
-        const req = protocol.request(options, function (res) {
-            if (downloadStream) {
-                res.pipe(downloadStream);
-                downloadStream.on('finish', function () {
-                    resolve();
-                });
-            }
-            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 = 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([
-                new Buffer(delimeter + crlf + headers.join('') + crlf),
-                fs.readFileSync(file),
-                new Buffer(`${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();
-    });
-}
-
-exports.default = request;
-exports.setMock = setMock;