npm - @faasjs/request - Versions diffs - 0.0.3-beta.7 → 0.0.3-beta.71 - Mend

@faasjs/request 0.0.3-beta.7 → 0.0.3-beta.71

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 (5) hide show

package/README.md CHANGED Viewed

@@ -52,10 +52,10 @@ ___
 | Name | Type | Description |
 | :------ | :------ | :------ |
 | `agent?` | `boolean` | - |
-| `auth?` | `string` | The authentication credentials to use for the request.  Format: `username:password` |
+| `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. |
+| `downloadStream?` | `NodeJS.WritableStream` | Create a write stream to download a file. ```ts const stream = createWriteStream('filepath') await request('https://example.com', { downloadStream: stream }) ``` |
+| `file?` | `string` | Path of uploading a file to the server. ```ts await request('https://example.com', { file: 'filepath' }) ``` |
 | `headers?` | `http.OutgoingHttpHeaders` | - |
 | `logger?` | `Logger` | - |
 | `method?` | `string` | The HTTP method to use when making the request. Defaults to GET. |

package/dist/index.d.ts CHANGED Viewed

@@ -39,10 +39,19 @@ type RequestOptions = {
     auth?: string;
     /**
      * Path of uploading a file to the server.
+     *
+     * ```ts
+     * await request('https://example.com', { file: 'filepath' })
+     * ```
      */
     file?: string;
     /**
      * Create a write stream to download a file.
+     *
+     * ```ts
+     * const stream = createWriteStream('filepath')
+     * await request('https://example.com', { downloadStream: stream })
+     * ```
      */
     downloadStream?: NodeJS.WritableStream;
     pfx?: Buffer;

package/dist/index.js CHANGED Viewed

@@ -5,6 +5,9 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -18,11 +21,207 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+// ../logger/dist/index.js
+var require_dist = __commonJS({
+  "../logger/dist/index.js"(exports, module2) {
+    "use strict";
+    var __defProp2 = Object.defineProperty;
+    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
+    var __getOwnPropNames2 = Object.getOwnPropertyNames;
+    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+    var __export2 = (target, all) => {
+      for (var name in all)
+        __defProp2(target, name, { get: all[name], enumerable: true });
+    };
+    var __copyProps2 = (to, from, except, desc) => {
+      if (from && typeof from === "object" || typeof from === "function") {
+        for (let key of __getOwnPropNames2(from))
+          if (!__hasOwnProp2.call(to, key) && key !== except)
+            __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+      }
+      return to;
+    };
+    var __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
+    var src_exports2 = {};
+    __export2(src_exports2, {
+      Color: () => Color,
+      Logger: () => Logger2
+    });
+    module2.exports = __toCommonJS2(src_exports2);
+    var import_util = require("util");
+    var Color = /* @__PURE__ */ ((Color2) => {
+      Color2[Color2["DEFAULT"] = 39] = "DEFAULT";
+      Color2[Color2["BLACK"] = 30] = "BLACK";
+      Color2[Color2["RED"] = 31] = "RED";
+      Color2[Color2["GREEN"] = 32] = "GREEN";
+      Color2[Color2["ORANGE"] = 33] = "ORANGE";
+      Color2[Color2["BLUE"] = 34] = "BLUE";
+      Color2[Color2["MAGENTA"] = 35] = "MAGENTA";
+      Color2[Color2["CYAN"] = 36] = "CYAN";
+      Color2[Color2["GRAY"] = 90] = "GRAY";
+      return Color2;
+    })(Color || {});
+    var LevelColor = ((LevelColor2) => {
+      LevelColor2[
+        LevelColor2["debug"] = 90
+        /* GRAY */
+      ] = "debug";
+      LevelColor2[
+        LevelColor2["info"] = 32
+        /* GREEN */
+      ] = "info";
+      LevelColor2[
+        LevelColor2["warn"] = 33
+        /* ORANGE */
+      ] = "warn";
+      LevelColor2[
+        LevelColor2["error"] = 31
+        /* RED */
+      ] = "error";
+      return LevelColor2;
+    })(LevelColor || {});
+    var LevelPriority = {
+      debug: 0,
+      info: 1,
+      warn: 2,
+      error: 3
+    };
+    var Logger2 = class {
+      /**
+       * @param label {string} Prefix label
+       */
+      constructor(label) {
+        this.colorfyOutput = true;
+        if (label)
+          this.label = label;
+        this.silent = !process.env.FaasLog && process.env.npm_config_argv && JSON.parse(process.env.npm_config_argv).original.includes("--silent");
+        if (["remote", "mono"].includes(process.env.FaasMode))
+          this.colorfyOutput = false;
+        this.level = process.env.FaasLog ? LevelPriority[process.env.FaasLog.toLowerCase()] : 0;
+        this.cachedTimers = {};
+        this.size = 1e3;
+        this.stdout = console.log;
+        this.stderr = console.error;
+      }
+      /**
+       * @param message {string} message
+       * @param args {...any=} arguments
+       */
+      debug(message, ...args) {
+        this.log("debug", message, ...args);
+        return this;
+      }
+      /**
+       * @param message {string} message
+       * @param args {...any=} arguments
+       */
+      info(message, ...args) {
+        this.log("info", message, ...args);
+        return this;
+      }
+      /**
+       * @param message {string} message
+       * @param args {...any=} arguments
+       */
+      warn(message, ...args) {
+        this.log("warn", message, ...args);
+        return this;
+      }
+      /**
+       * @param message {any} message or Error object
+       * @param args {...any=} arguments
+       */
+      error(message, ...args) {
+        let stack = false;
+        [message].concat(Array.from(args)).forEach((e) => {
+          if (e.stack) {
+            stack = true;
+            this.log("error", e.stack);
+          }
+        });
+        if (!stack)
+          this.log("error", message, ...args);
+        return this;
+      }
+      /**
+       * @param key {string} timer's label
+       * @param level [string=debug] 日志级别，支持 debug、info、warn、error
+       */
+      time(key, level = "debug") {
+        this.cachedTimers[key] = {
+          level,
+          time: (/* @__PURE__ */ new Date()).getTime()
+        };
+        return this;
+      }
+      /**
+       * @param key {string} timer's label
+       * @param message {string} message
+       * @param args {...any=} arguments
+       */
+      timeEnd(key, message, ...args) {
+        if (this.cachedTimers[key]) {
+          const timer = this.cachedTimers[key];
+          message = message + " +%ims";
+          args.push((/* @__PURE__ */ new Date()).getTime() - timer.time);
+          this[timer.level](message, ...args);
+          delete this.cachedTimers[key];
+        } else {
+          this.warn("timeEnd not found key %s", key);
+          this.debug(message);
+        }
+        return this;
+      }
+      /**
+       * @param message {string} message
+       * @param args {...any=} arguments
+       */
+      raw(message, ...args) {
+        if (this.silent)
+          return this;
+        this.stdout((0, import_util.format)(message, ...args));
+        return this;
+      }
+      /**
+       * @param color {number} color code
+       * @param message {string} message
+       */
+      colorfy(color, message) {
+        return `\x1B[0${color}m${message}\x1B[39m`;
+      }
+      log(level, message, ...args) {
+        if (this.silent)
+          return this;
+        if (LevelPriority[level] < this.level)
+          return this;
+        let output = level.toUpperCase() + " " + (this.label ? `[${this.label}] ` : "") + (0, import_util.format)(message, ...args);
+        if (this.colorfyOutput && level !== "error")
+          output = this.colorfy(LevelColor[level], output);
+        else if (!this.colorfyOutput)
+          output = output.replace(/\n/g, "");
+        if (!output)
+          return this;
+        if (output.length > this.size && !["error", "warn"].includes(level))
+          output = output.slice(0, this.size - 100) + "..." + output.slice(output.length - 100);
+        if (level === "error")
+          this.stderr(output);
+        else
+          this.stdout(output);
+        return this;
+      }
+    };
+  }
+});
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
@@ -36,7 +235,7 @@ 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 import_logger = __toESM(require_dist());
 var mock = null;
 function setMock(handler) {
   mock = handler;
@@ -136,7 +335,7 @@ async function request(url, {
         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);
+          const response = res.statusCode >= 200 && res.statusCode < 400 ? /* @__PURE__ */ Object.create(null) : new Error();
           response.request = options;
           response.request.body = body;
           response.statusCode = res.statusCode;
@@ -145,7 +344,7 @@ async function request(url, {
           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);
+              response.body = (parse || JSON.parse)(response.body);
               logger.debug("response.parse JSON");
             } catch (error) {
               console.warn("response plain body", response.body);
@@ -155,6 +354,7 @@ async function request(url, {
             resolve(response);
           else {
             logger.debug("response.error %j", response);
+            response.message = `${res.statusCode} ${res.statusMessage}`;
             reject(response);
           }
         });

package/dist/index.mjs CHANGED Viewed

@@ -1,10 +1,235 @@
+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 __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined")
+    return require.apply(this, arguments);
+  throw new Error('Dynamic require of "' + x + '" is not supported');
+});
+var __commonJS = (cb, mod) => function __require2() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+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(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+// ../logger/dist/index.js
+var require_dist = __commonJS({
+  "../logger/dist/index.js"(exports, module) {
+    "use strict";
+    var __defProp2 = Object.defineProperty;
+    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
+    var __getOwnPropNames2 = Object.getOwnPropertyNames;
+    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+    var __export = (target, all) => {
+      for (var name in all)
+        __defProp2(target, name, { get: all[name], enumerable: true });
+    };
+    var __copyProps2 = (to, from, except, desc) => {
+      if (from && typeof from === "object" || typeof from === "function") {
+        for (let key of __getOwnPropNames2(from))
+          if (!__hasOwnProp2.call(to, key) && key !== except)
+            __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+      }
+      return to;
+    };
+    var __toCommonJS = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
+    var src_exports = {};
+    __export(src_exports, {
+      Color: () => Color,
+      Logger: () => Logger2
+    });
+    module.exports = __toCommonJS(src_exports);
+    var import_util = __require("util");
+    var Color = /* @__PURE__ */ ((Color2) => {
+      Color2[Color2["DEFAULT"] = 39] = "DEFAULT";
+      Color2[Color2["BLACK"] = 30] = "BLACK";
+      Color2[Color2["RED"] = 31] = "RED";
+      Color2[Color2["GREEN"] = 32] = "GREEN";
+      Color2[Color2["ORANGE"] = 33] = "ORANGE";
+      Color2[Color2["BLUE"] = 34] = "BLUE";
+      Color2[Color2["MAGENTA"] = 35] = "MAGENTA";
+      Color2[Color2["CYAN"] = 36] = "CYAN";
+      Color2[Color2["GRAY"] = 90] = "GRAY";
+      return Color2;
+    })(Color || {});
+    var LevelColor = ((LevelColor2) => {
+      LevelColor2[
+        LevelColor2["debug"] = 90
+        /* GRAY */
+      ] = "debug";
+      LevelColor2[
+        LevelColor2["info"] = 32
+        /* GREEN */
+      ] = "info";
+      LevelColor2[
+        LevelColor2["warn"] = 33
+        /* ORANGE */
+      ] = "warn";
+      LevelColor2[
+        LevelColor2["error"] = 31
+        /* RED */
+      ] = "error";
+      return LevelColor2;
+    })(LevelColor || {});
+    var LevelPriority = {
+      debug: 0,
+      info: 1,
+      warn: 2,
+      error: 3
+    };
+    var Logger2 = class {
+      /**
+       * @param label {string} Prefix label
+       */
+      constructor(label) {
+        this.colorfyOutput = true;
+        if (label)
+          this.label = label;
+        this.silent = !process.env.FaasLog && process.env.npm_config_argv && JSON.parse(process.env.npm_config_argv).original.includes("--silent");
+        if (["remote", "mono"].includes(process.env.FaasMode))
+          this.colorfyOutput = false;
+        this.level = process.env.FaasLog ? LevelPriority[process.env.FaasLog.toLowerCase()] : 0;
+        this.cachedTimers = {};
+        this.size = 1e3;
+        this.stdout = console.log;
+        this.stderr = console.error;
+      }
+      /**
+       * @param message {string} message
+       * @param args {...any=} arguments
+       */
+      debug(message, ...args) {
+        this.log("debug", message, ...args);
+        return this;
+      }
+      /**
+       * @param message {string} message
+       * @param args {...any=} arguments
+       */
+      info(message, ...args) {
+        this.log("info", message, ...args);
+        return this;
+      }
+      /**
+       * @param message {string} message
+       * @param args {...any=} arguments
+       */
+      warn(message, ...args) {
+        this.log("warn", message, ...args);
+        return this;
+      }
+      /**
+       * @param message {any} message or Error object
+       * @param args {...any=} arguments
+       */
+      error(message, ...args) {
+        let stack = false;
+        [message].concat(Array.from(args)).forEach((e) => {
+          if (e.stack) {
+            stack = true;
+            this.log("error", e.stack);
+          }
+        });
+        if (!stack)
+          this.log("error", message, ...args);
+        return this;
+      }
+      /**
+       * @param key {string} timer's label
+       * @param level [string=debug] 日志级别，支持 debug、info、warn、error
+       */
+      time(key, level = "debug") {
+        this.cachedTimers[key] = {
+          level,
+          time: (/* @__PURE__ */ new Date()).getTime()
+        };
+        return this;
+      }
+      /**
+       * @param key {string} timer's label
+       * @param message {string} message
+       * @param args {...any=} arguments
+       */
+      timeEnd(key, message, ...args) {
+        if (this.cachedTimers[key]) {
+          const timer = this.cachedTimers[key];
+          message = message + " +%ims";
+          args.push((/* @__PURE__ */ new Date()).getTime() - timer.time);
+          this[timer.level](message, ...args);
+          delete this.cachedTimers[key];
+        } else {
+          this.warn("timeEnd not found key %s", key);
+          this.debug(message);
+        }
+        return this;
+      }
+      /**
+       * @param message {string} message
+       * @param args {...any=} arguments
+       */
+      raw(message, ...args) {
+        if (this.silent)
+          return this;
+        this.stdout((0, import_util.format)(message, ...args));
+        return this;
+      }
+      /**
+       * @param color {number} color code
+       * @param message {string} message
+       */
+      colorfy(color, message) {
+        return `\x1B[0${color}m${message}\x1B[39m`;
+      }
+      log(level, message, ...args) {
+        if (this.silent)
+          return this;
+        if (LevelPriority[level] < this.level)
+          return this;
+        let output = level.toUpperCase() + " " + (this.label ? `[${this.label}] ` : "") + (0, import_util.format)(message, ...args);
+        if (this.colorfyOutput && level !== "error")
+          output = this.colorfy(LevelColor[level], output);
+        else if (!this.colorfyOutput)
+          output = output.replace(/\n/g, "");
+        if (!output)
+          return this;
+        if (output.length > this.size && !["error", "warn"].includes(level))
+          output = output.slice(0, this.size - 100) + "..." + output.slice(output.length - 100);
+        if (level === "error")
+          this.stderr(output);
+        else
+          this.stdout(output);
+        return this;
+      }
+    };
+  }
+});
 // src/index.ts
+var import_logger = __toESM(require_dist());
 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;
@@ -44,7 +269,7 @@ async function request(url, {
   logger
 } = { headers: {} }) {
   if (!logger)
-    logger = new Logger("request");
+    logger = new import_logger.Logger("request");
   if (mock)
     return mock(url, {
       headers,
@@ -104,7 +329,7 @@ async function request(url, {
         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);
+          const response = res.statusCode >= 200 && res.statusCode < 400 ? /* @__PURE__ */ Object.create(null) : new Error();
           response.request = options;
           response.request.body = body;
           response.statusCode = res.statusCode;
@@ -113,7 +338,7 @@ async function request(url, {
           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);
+              response.body = (parse || JSON.parse)(response.body);
               logger.debug("response.parse JSON");
             } catch (error) {
               console.warn("response plain body", response.body);
@@ -123,6 +348,7 @@ async function request(url, {
             resolve(response);
           else {
             logger.debug("response.error %j", response);
+            response.message = `${res.statusCode} ${res.statusMessage}`;
             reject(response);
           }
         });

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/request",
-  "version": "0.0.3-beta.7",
+  "version": "0.0.3-beta.71",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,14 +15,13 @@
   },
   "funding": "https://github.com/sponsors/faasjs",
   "scripts": {
-    "build": "tsup-node src/index.ts --format esm,cjs",
-    "build:types": "tsup-node src/index.ts --dts-only"
+    "build": "tsup-node src/index.ts --format esm,cjs --dts --clean"
   },
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@faasjs/logger": "^0.0.3-beta.7"
+    "@faasjs/logger": "^0.0.3-beta.71"
   },
   "engines": {
     "npm": ">=8.0.0",