@faasjs/http 0.0.3-beta.64 → 0.0.3-beta.65

package/dist/index.js

@@ -29,166 +29,7 @@ __export(src_exports, {
   useHttp: () => useHttp
 });
 module.exports = __toCommonJS(src_exports);
-
-// ../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;
-  }
-};
-
-// ../func/src/index.ts
-var import_crypto = require("crypto");
-var plugins = [];
-function usePlugin(plugin) {
-  if (!plugins.find((p) => p.name === plugin.name))
-    plugins.push(plugin);
-  if (!plugin.mount)
-    plugin.mount = async function(data) {
-      if (plugin.onMount)
-        await plugin.onMount({
-          config: (data == null ? void 0 : data.config) || /* @__PURE__ */ Object.create(null),
-          event: /* @__PURE__ */ Object.create(null),
-          context: /* @__PURE__ */ Object.create(null),
-          logger: new Logger(plugin.name)
-        }, async () => Promise.resolve());
-      return plugin;
-    };
-  return plugin;
-}
+var import_func = require("@faasjs/func");
 
 // ../deep_merge/src/index.ts
 var shouldMerge = function(item) {
@@ -217,8 +58,11 @@ function deepMerge(...sources) {
   return acc;
 }
 
+// src/index.ts
+var import_logger = require("@faasjs/logger");
+
 // src/session.ts
-var import_crypto2 = require("crypto");
+var import_crypto = require("crypto");
 var Session = class {
   constructor(cookie, config) {
     this.cookie = cookie;
@@ -226,7 +70,7 @@ var Session = class {
       console.warn("Session's secret is missing.");
     this.config = Object.assign({
       key: "key",
-      secret: (0, import_crypto2.randomBytes)(128).toString("hex"),
+      secret: (0, import_crypto.randomBytes)(128).toString("hex"),
       salt: "salt",
       signedSalt: "signedSalt",
       keylen: 64,
@@ -234,14 +78,14 @@ var Session = class {
       digest: "sha256",
       cipherName: "aes-256-cbc"
     }, config);
-    this.secret = (0, import_crypto2.pbkdf2Sync)(
+    this.secret = (0, import_crypto.pbkdf2Sync)(
       this.config.secret,
       this.config.salt,
       this.config.iterations,
       this.config.keylen / 2,
       this.config.digest
     );
-    this.signedSecret = (0, import_crypto2.pbkdf2Sync)(
+    this.signedSecret = (0, import_crypto.pbkdf2Sync)(
       this.config.secret,
       this.config.signedSalt,
       this.config.iterations,
@@ -262,11 +106,11 @@ var Session = class {
   encode(text) {
     if (typeof text !== "string")
       text = JSON.stringify(text);
-    const iv = (0, import_crypto2.randomBytes)(16);
-    const cipher = (0, import_crypto2.createCipheriv)(this.config.cipherName, this.secret, iv);
+    const iv = (0, import_crypto.randomBytes)(16);
+    const cipher = (0, import_crypto.createCipheriv)(this.config.cipherName, this.secret, iv);
     const encrypted = Buffer.concat([cipher.update(text), cipher.final()]).toString("base64");
     const main = Buffer.from([encrypted, iv.toString("base64")].join("--")).toString("base64");
-    const hmac = (0, import_crypto2.createHmac)(this.config.digest, this.signedSecret);
+    const hmac = (0, import_crypto.createHmac)(this.config.digest, this.signedSecret);
     hmac.update(main);
     const digest = hmac.digest("hex");
     return main + "--" + digest;
@@ -274,7 +118,7 @@ var Session = class {
   decode(text) {
     text = decodeURIComponent(text);
     const signedParts = text.split("--");
-    const hmac = (0, import_crypto2.createHmac)(this.config.digest, this.signedSecret);
+    const hmac = (0, import_crypto.createHmac)(this.config.digest, this.signedSecret);
     hmac.update(signedParts[0]);
     const digest = hmac.digest("hex");
     if (signedParts[1] !== digest)
@@ -283,7 +127,7 @@ var Session = class {
     const parts = message.split("--").map(function(part2) {
       return Buffer.from(part2, "base64");
     });
-    const cipher = (0, import_crypto2.createDecipheriv)(this.config.cipherName, this.secret, parts[1]);
+    const cipher = (0, import_crypto.createDecipheriv)(this.config.cipherName, this.secret, parts[1]);
     const part = Buffer.from(cipher.update(parts[0])).toString("utf8");
     const final = cipher.final("utf8");
     const decrypt = [part, final].join("");
@@ -593,7 +437,7 @@ var Http = class {
     var _a;
     data.dependencies["@faasjs/http"] = "*";
     await next();
-    const logger = new Logger(this.name);
+    const logger = new import_logger.Logger(this.name);
     logger.debug("Generate api gateway's config");
     logger.debug("%j", data);
     const config = data.config.plugins ? deepMerge(data.config.plugins[this.name || this.type], { config: this.config }) : { config: this.config };
@@ -726,20 +570,10 @@ var Http = class {
       delete data.response.headers["Content-Encoding"];
     }
   }
-  /**
-   * set header
-   * @param key {string} key
-   * @param value {*} value
-   */
   setHeader(key, value) {
     this.response.headers[key] = value;
     return this;
   }
-  /**
-   * set Content-Type
-   * @param type {string} 类型
-   * @param charset {string} 编码
-   */
   setContentType(type, charset = "utf-8") {
     if (ContentType[type])
       this.setHeader("Content-Type", `${ContentType[type]}; charset=${charset}`);
@@ -747,25 +581,17 @@ var Http = class {
       this.setHeader("Content-Type", `${type}; charset=${charset}`);
     return this;
   }
-  /**
-   * set status code
-   * @param code {number} 状态码
-   */
   setStatusCode(code) {
     this.response.statusCode = code;
     return this;
   }
-  /**
-   * set body
-   * @param body {*} 内容
-   */
   setBody(body) {
     this.response.body = body;
     return this;
   }
 };
 function useHttp(config) {
-  return usePlugin(new Http(config));
+  return (0, import_func.usePlugin)(new Http(config));
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.mjs

@@ -6,165 +6,10 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw new Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// ../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;
-  }
-};
-
-// ../func/src/index.ts
-import { randomBytes } from "crypto";
-var plugins = [];
-function usePlugin(plugin) {
-  if (!plugins.find((p) => p.name === plugin.name))
-    plugins.push(plugin);
-  if (!plugin.mount)
-    plugin.mount = async function(data) {
-      if (plugin.onMount)
-        await plugin.onMount({
-          config: (data == null ? void 0 : data.config) || /* @__PURE__ */ Object.create(null),
-          event: /* @__PURE__ */ Object.create(null),
-          context: /* @__PURE__ */ Object.create(null),
-          logger: new Logger(plugin.name)
-        }, async () => Promise.resolve());
-      return plugin;
-    };
-  return plugin;
-}
+// src/index.ts
+import {
+  usePlugin
+} from "@faasjs/func";
 
 // ../deep_merge/src/index.ts
 var shouldMerge = function(item) {
@@ -193,9 +38,12 @@ function deepMerge(...sources) {
   return acc;
 }
 
+// src/index.ts
+import { Logger } from "@faasjs/logger";
+
 // src/session.ts
 import {
-  randomBytes as randomBytes2,
+  randomBytes,
   pbkdf2Sync,
   createCipheriv,
   createHmac,
@@ -208,7 +56,7 @@ var Session = class {
       console.warn("Session's secret is missing.");
     this.config = Object.assign({
       key: "key",
-      secret: randomBytes2(128).toString("hex"),
+      secret: randomBytes(128).toString("hex"),
       salt: "salt",
       signedSalt: "signedSalt",
       keylen: 64,
@@ -244,7 +92,7 @@ var Session = class {
   encode(text) {
     if (typeof text !== "string")
       text = JSON.stringify(text);
-    const iv = randomBytes2(16);
+    const iv = randomBytes(16);
     const cipher = createCipheriv(this.config.cipherName, this.secret, iv);
     const encrypted = Buffer.concat([cipher.update(text), cipher.final()]).toString("base64");
     const main = Buffer.from([encrypted, iv.toString("base64")].join("--")).toString("base64");
@@ -712,20 +560,10 @@ var Http = class {
       delete data.response.headers["Content-Encoding"];
     }
   }
-  /**
-   * set header
-   * @param key {string} key
-   * @param value {*} value
-   */
   setHeader(key, value) {
     this.response.headers[key] = value;
     return this;
   }
-  /**
-   * set Content-Type
-   * @param type {string} 类型
-   * @param charset {string} 编码
-   */
   setContentType(type, charset = "utf-8") {
     if (ContentType[type])
       this.setHeader("Content-Type", `${ContentType[type]}; charset=${charset}`);
@@ -733,18 +571,10 @@ var Http = class {
       this.setHeader("Content-Type", `${type}; charset=${charset}`);
     return this;
   }
-  /**
-   * set status code
-   * @param code {number} 状态码
-   */
   setStatusCode(code) {
     this.response.statusCode = code;
     return this;
   }
-  /**
-   * set body
-   * @param body {*} 内容
-   */
   setBody(body) {
     this.response.body = body;
     return this;

package/package.json

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