@faasjs/request 0.0.3-beta.64 → 0.0.3-beta.66

package/dist/index.js

@@ -18,10 +18,6 @@ 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
 ));
@@ -40,148 +36,7 @@ var https = __toESM(require("https"));
 var import_url = require("url");
 var import_fs = require("fs");
 var import_path = require("path");
-
-// ../logger/src/index.ts
-var import_util = require("util");
-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 Logger = 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 = require("@faasjs/logger");
 var mock = null;
 function setMock(handler) {
   mock = handler;
@@ -221,7 +76,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,

package/dist/index.mjs

@@ -4,148 +4,7 @@ import * as https from "https";
 import { URL } from "url";
 import { readFileSync } from "fs";
 import { basename } from "path";
-
-// ../logger/src/index.ts
-import { format } from "util";
-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 Logger = 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(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}] ` : "") + 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
+import { Logger } from "@faasjs/logger";
 var mock = null;
 function setMock(handler) {
   mock = handler;

package/package.json

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