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

package/dist/index.js

@@ -5,9 +5,6 @@ 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 });
@@ -21,207 +18,11 @@ 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, {
@@ -235,7 +36,7 @@ var https = __toESM(require("https"));
 var import_url = require("url");
 var import_fs = require("fs");
 var import_path = require("path");
-var import_logger = __toESM(require_dist());
+var import_logger = require("@faasjs/logger");
 var mock = null;
 function setMock(handler) {
   mock = handler;
@@ -354,7 +155,7 @@ async function request(url, {
             resolve(response);
           else {
             logger.debug("response.error %j", response);
-            response.message = `${res.statusCode} ${res.statusMessage}`;
+            response.message = `${res.statusCode} ${res.statusMessage} ${url}`;
             reject(response);
           }
         });

package/dist/index.mjs

@@ -1,235 +1,10 @@
-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;
@@ -269,7 +44,7 @@ async function request(url, {
   logger
 } = { headers: {} }) {
   if (!logger)
-    logger = new import_logger.Logger("request");
+    logger = new Logger("request");
   if (mock)
     return mock(url, {
       headers,
@@ -348,7 +123,7 @@ async function request(url, {
             resolve(response);
           else {
             logger.debug("response.error %j", response);
-            response.message = `${res.statusCode} ${res.statusMessage}`;
+            response.message = `${res.statusCode} ${res.statusMessage} ${url}`;
             reject(response);
           }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/request",
-  "version": "0.0.3-beta.71",
+  "version": "0.0.3-beta.73",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,7 +21,7 @@
     "dist"
   ],
   "dependencies": {
-    "@faasjs/logger": "^0.0.3-beta.71"
+    "@faasjs/logger": "^0.0.3-beta.73"
   },
   "engines": {
     "npm": ">=8.0.0",