@faasjs/http 0.0.2-beta.452 → 0.0.2-beta.453

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { Plugin, DeployData, Next, MountData, InvokeData, UseifyPlugin } from '@faasjs/func';
 import { Logger } from '@faasjs/logger';
 
-declare type SessionOptions = {
+type SessionOptions = {
     key: string;
     secret: string;
     salt?: string;
@@ -11,7 +11,7 @@ declare type SessionOptions = {
     digest?: string;
     cipherName?: string;
 };
-declare type SessionContent = string | number | {
+type SessionContent = string | number | {
     [key: string]: any;
 } | null | undefined;
 declare class Session<S extends Record<string, string> = any, C extends Record<string, string> = any> {
@@ -39,7 +39,7 @@ declare class Session<S extends Record<string, string> = any, C extends Record<s
     update(): Session<S, C>;
 }
 
-declare type CookieOptions = {
+type CookieOptions = {
     domain?: string;
     path?: string;
     expires?: number;
@@ -78,8 +78,8 @@ declare class Cookie<C extends Record<string, string> = any, S extends Record<st
     };
 }
 
-declare type ValidatorRuleOptionsType = 'string' | 'number' | 'boolean' | 'object' | 'array';
-declare type ValidatorRuleOptions = {
+type ValidatorRuleOptionsType = 'string' | 'number' | 'boolean' | 'object' | 'array';
+type ValidatorRuleOptions = {
     type?: ValidatorRuleOptionsType;
     required?: boolean;
     in?: any[];
@@ -87,7 +87,7 @@ declare type ValidatorRuleOptions = {
     config?: Partial<ValidatorOptions>;
     regexp?: RegExp;
 };
-declare type ValidatorOptions<Content = Record<string, any>> = {
+type ValidatorOptions<Content = Record<string, any>> = {
     whitelist?: 'error' | 'ignore';
     rules: {
         [k in keyof Content]?: ValidatorRuleOptions;
@@ -97,7 +97,7 @@ declare type ValidatorOptions<Content = Record<string, any>> = {
         message: any;
     } | void;
 };
-declare type Request<TParams extends Record<string, any> = any, TCookie extends Record<string, string> = any, TSession extends Record<string, string> = any> = {
+type Request<TParams extends Record<string, any> = any, TCookie extends Record<string, string> = any, TSession extends Record<string, string> = any> = {
     headers: {
         [key: string]: string;
     };
@@ -105,11 +105,11 @@ declare type Request<TParams extends Record<string, any> = any, TCookie extends
     cookie?: Cookie<TCookie, TSession>;
     session?: Session<TSession, TCookie>;
 };
-declare type BeforeOption<TParams extends Record<string, any> = any, TCookie extends Record<string, string> = any, TSession extends Record<string, string> = any> = (request: Request<TParams, TCookie, TSession>) => Promise<void | {
+type BeforeOption<TParams extends Record<string, any> = any, TCookie extends Record<string, string> = any, TSession extends Record<string, string> = any> = (request: Request<TParams, TCookie, TSession>) => Promise<void | {
     statusCode?: number;
     message: string;
 }>;
-declare type ValidatorConfig<TParams extends Record<string, any> = any, TCookie extends Record<string, string> = any, TSession extends Record<string, string> = any> = {
+type ValidatorConfig<TParams extends Record<string, any> = any, TCookie extends Record<string, string> = any, TSession extends Record<string, string> = any> = {
     params?: ValidatorOptions<TParams>;
     cookie?: ValidatorOptions<TCookie>;
     session?: ValidatorOptions<TSession>;
@@ -131,7 +131,7 @@ declare class Validator<TParams extends Record<string, any> = any, TCookie exten
 declare const ContentType: {
     [key: string]: string;
 };
-declare type HttpConfig<TParams extends Record<string, any> = any, TCookie extends Record<string, string> = any, TSession extends Record<string, string> = any> = {
+type HttpConfig<TParams extends Record<string, any> = any, TCookie extends Record<string, string> = any, TSession extends Record<string, string> = any> = {
     [key: string]: any;
     name?: string;
     config?: {
@@ -147,7 +147,7 @@ declare type HttpConfig<TParams extends Record<string, any> = any, TCookie exten
     };
     validator?: ValidatorConfig<TParams, TCookie, TSession>;
 };
-declare type Response = {
+type Response = {
     statusCode?: number;
     headers?: {
         [key: string]: string;

package/dist/index.js

@@ -29,7 +29,129 @@ __export(src_exports, {
   useHttp: () => useHttp
 });
 module.exports = __toCommonJS(src_exports);
-var import_func = require("@faasjs/func");
+
+// ../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 {
+  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 = 500;
+    this.stdout = console.log;
+    this.stderr = console.error;
+  }
+  debug(message, ...args) {
+    this.log("debug", message, ...args);
+    return this;
+  }
+  info(message, ...args) {
+    this.log("info", message, ...args);
+    return this;
+  }
+  warn(message, ...args) {
+    this.log("warn", message, ...args);
+    return this;
+  }
+  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;
+  }
+  time(key, level = "debug") {
+    this.cachedTimers[key] = {
+      level,
+      time: new Date().getTime()
+    };
+    return this;
+  }
+  timeEnd(key, message, ...args) {
+    if (this.cachedTimers[key]) {
+      const timer = this.cachedTimers[key];
+      message = message + " +%ims";
+      args.push(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;
+  }
+  raw(message, ...args) {
+    if (this.silent)
+      return this;
+    this.stdout((0, import_util.format)(message, ...args));
+    return this;
+  }
+  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)
+      output = output.slice(0, this.size) + "...";
+    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({ config }) {
+      if (plugin.onMount)
+        await plugin.onMount({
+          config,
+          event: {},
+          context: {},
+          logger: new Logger(plugin.name)
+        }, async () => Promise.resolve());
+    };
+  return plugin;
+}
 
 // ../deep_merge/src/index.ts
 var shouldMerge = function(item) {
@@ -58,17 +180,14 @@ function deepMerge(...sources) {
   return acc;
 }
 
-// src/index.ts
-var import_logger = require("@faasjs/logger");
-
 // src/session.ts
-var import_crypto = require("crypto");
+var import_crypto2 = require("crypto");
 var Session = class {
   constructor(cookie, config) {
     this.cookie = cookie;
     this.config = Object.assign({
       key: "key",
-      secret: (0, import_crypto.randomBytes)(128).toString("hex"),
+      secret: (0, import_crypto2.randomBytes)(128).toString("hex"),
       salt: "salt",
       signedSalt: "signedSalt",
       keylen: 64,
@@ -76,14 +195,14 @@ var Session = class {
       digest: "sha256",
       cipherName: "aes-256-cbc"
     }, config);
-    this.secret = (0, import_crypto.pbkdf2Sync)(
+    this.secret = (0, import_crypto2.pbkdf2Sync)(
       this.config.secret,
       this.config.salt,
       this.config.iterations,
       this.config.keylen / 2,
       this.config.digest
     );
-    this.signedSecret = (0, import_crypto.pbkdf2Sync)(
+    this.signedSecret = (0, import_crypto2.pbkdf2Sync)(
       this.config.secret,
       this.config.signedSalt,
       this.config.iterations,
@@ -104,11 +223,11 @@ var Session = class {
   encode(text) {
     if (typeof text !== "string")
       text = JSON.stringify(text);
-    const iv = (0, import_crypto.randomBytes)(16);
-    const cipher = (0, import_crypto.createCipheriv)(this.config.cipherName, this.secret, iv);
+    const iv = (0, import_crypto2.randomBytes)(16);
+    const cipher = (0, import_crypto2.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_crypto.createHmac)(this.config.digest, this.signedSecret);
+    const hmac = (0, import_crypto2.createHmac)(this.config.digest, this.signedSecret);
     hmac.update(main);
     const digest = hmac.digest("hex");
     return main + "--" + digest;
@@ -116,7 +235,7 @@ var Session = class {
   decode(text) {
     text = decodeURIComponent(text);
     const signedParts = text.split("--");
-    const hmac = (0, import_crypto.createHmac)(this.config.digest, this.signedSecret);
+    const hmac = (0, import_crypto2.createHmac)(this.config.digest, this.signedSecret);
     hmac.update(signedParts[0]);
     const digest = hmac.digest("hex");
     if (signedParts[1] !== digest)
@@ -125,7 +244,7 @@ var Session = class {
     const parts = message.split("--").map(function(part2) {
       return Buffer.from(part2, "base64");
     });
-    const cipher = (0, import_crypto.createDecipheriv)(this.config.cipherName, this.secret, parts[1]);
+    const cipher = (0, import_crypto2.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("");
@@ -438,7 +557,7 @@ var Http = class {
     var _a;
     data.dependencies["@faasjs/http"] = "*";
     await next();
-    const logger = new import_logger.Logger(this.name);
+    const logger = new 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 };
@@ -575,7 +694,7 @@ var Http = class {
   }
 };
 function useHttp(config) {
-  return (0, import_func.usePlugin)(new Http(config));
+  return usePlugin(new Http(config));
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.mjs

@@ -6,10 +6,128 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw new Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// src/index.ts
-import {
-  usePlugin
-} from "@faasjs/func";
+// ../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 {
+  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 = 500;
+    this.stdout = console.log;
+    this.stderr = console.error;
+  }
+  debug(message, ...args) {
+    this.log("debug", message, ...args);
+    return this;
+  }
+  info(message, ...args) {
+    this.log("info", message, ...args);
+    return this;
+  }
+  warn(message, ...args) {
+    this.log("warn", message, ...args);
+    return this;
+  }
+  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;
+  }
+  time(key, level = "debug") {
+    this.cachedTimers[key] = {
+      level,
+      time: new Date().getTime()
+    };
+    return this;
+  }
+  timeEnd(key, message, ...args) {
+    if (this.cachedTimers[key]) {
+      const timer = this.cachedTimers[key];
+      message = message + " +%ims";
+      args.push(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;
+  }
+  raw(message, ...args) {
+    if (this.silent)
+      return this;
+    this.stdout(format(message, ...args));
+    return this;
+  }
+  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)
+      output = output.slice(0, this.size) + "...";
+    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({ config }) {
+      if (plugin.onMount)
+        await plugin.onMount({
+          config,
+          event: {},
+          context: {},
+          logger: new Logger(plugin.name)
+        }, async () => Promise.resolve());
+    };
+  return plugin;
+}
 
 // ../deep_merge/src/index.ts
 var shouldMerge = function(item) {
@@ -38,12 +156,9 @@ function deepMerge(...sources) {
   return acc;
 }
 
-// src/index.ts
-import { Logger } from "@faasjs/logger";
-
 // src/session.ts
 import {
-  randomBytes,
+  randomBytes as randomBytes2,
   pbkdf2Sync,
   createCipheriv,
   createHmac,
@@ -54,7 +169,7 @@ var Session = class {
     this.cookie = cookie;
     this.config = Object.assign({
       key: "key",
-      secret: randomBytes(128).toString("hex"),
+      secret: randomBytes2(128).toString("hex"),
       salt: "salt",
       signedSalt: "signedSalt",
       keylen: 64,
@@ -90,7 +205,7 @@ var Session = class {
   encode(text) {
     if (typeof text !== "string")
       text = JSON.stringify(text);
-    const iv = randomBytes(16);
+    const iv = randomBytes2(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");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/http",
-  "version": "0.0.2-beta.452",
+  "version": "0.0.2-beta.453",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -23,8 +23,8 @@
     "dist"
   ],
   "dependencies": {
-    "@faasjs/func": "^0.0.2-beta.452",
-    "@faasjs/logger": "^0.0.2-beta.452"
+    "@faasjs/func": "^0.0.2-beta.453",
+    "@faasjs/logger": "^0.0.2-beta.453"
   },
   "devDependencies": {
     "tsup": "*",