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

package/dist/index.js

@@ -25,146 +25,7 @@ __export(src_exports, {
   usePlugin: () => usePlugin
 });
 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;
-  }
-};
+var import_logger = require("@faasjs/logger");
 
 // src/plugins/run_handler/index.ts
 var RunHandler = class {
@@ -199,12 +60,6 @@ var RunHandler = class {
 // src/index.ts
 var import_crypto = require("crypto");
 var Func = class {
-  /**
-   * Create a cloud function
-   * @param config {object} config
-   * @param config.plugins {Plugin[]} plugins list
-   * @param config.handler {Handler} business logic
-   */
   constructor(config) {
     this.handler = config.handler;
     this.plugins = config.plugins || [];
@@ -218,7 +73,7 @@ var Func = class {
     try {
       this.filename = new Error().stack.split("\n").find((s) => /[^/]\.func\.ts/.test(s)).match(/\((.*\.func\.ts).*\)/)[1];
     } catch (error) {
-      new Logger("Func").warn(error.message);
+      new import_logger.Logger("Func").warn(error.message);
     }
   }
   compose(key) {
@@ -238,7 +93,7 @@ var Func = class {
     }
     return async function(data, next) {
       let index = -1;
-      const logger = (data == null ? void 0 : data.logger) || new Logger();
+      const logger = (data == null ? void 0 : data.logger) || new import_logger.Logger();
       const dispatch = async function(i) {
         if (i <= index)
           return Promise.reject(Error("next() called multiple times"));
@@ -265,26 +120,16 @@ var Func = class {
       return await dispatch(0);
     };
   }
-  /**
-   * Deploy the function
-   * @param data {object} data
-   * @param data.root {string} root path
-   * @param data.filename {string} filename
-   * @param data.env {string} environment
-   */
   deploy(data) {
     if (!data.logger)
-      data.logger = new Logger("Func");
+      data.logger = new import_logger.Logger("Func");
     data.logger.debug("onDeploy");
     data.logger.debug("Plugins: " + this.plugins.map((p) => `${p.type}#${p.name}`).join(","));
     return this.compose("onDeploy")(data);
   }
-  /**
-   * First time mount the function
-   */
   async mount(data) {
     if (!data.logger)
-      data.logger = new Logger("Func");
+      data.logger = new import_logger.Logger("Func");
     data.logger.debug("onMount");
     if (this.mounted) {
       data.logger.warn("mount() has been called, skipped.");
@@ -301,10 +146,6 @@ var Func = class {
       data.logger.timeEnd("mount", "mounted");
     }
   }
-  /**
-   * Invoke the function
-   * @param data {object} data
-   */
   async invoke(data) {
     if (!this.mounted)
       await this.mount({
@@ -320,9 +161,6 @@ var Func = class {
       data.response = error;
     }
   }
-  /**
-   * Export the function
-   */
   export() {
     const handler = async (event, context, callback) => {
       if (typeof context === "undefined")
@@ -330,9 +168,9 @@ var Func = class {
       if (!context.request_id)
         context.request_id = (0, import_crypto.randomBytes)(16).toString("hex");
       if (!context.request_at)
-        context.request_at = Math.round((/* @__PURE__ */ new Date()).getTime() / 1e3);
+        context.request_at = Math.round(new Date().getTime() / 1e3);
       context.callbackWaitsForEmptyEventLoop = false;
-      const logger = new Logger(context.request_id);
+      const logger = new import_logger.Logger(context.request_id);
       logger.debug("event: %j", event);
       logger.debug("context: %j", context);
       const data = {
@@ -364,7 +202,7 @@ function usePlugin(plugin) {
           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)
+          logger: new import_logger.Logger(plugin.name)
         }, async () => Promise.resolve());
       return plugin;
     };

package/dist/index.mjs

@@ -1,142 +1,5 @@
-// ../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";
 
 // src/plugins/run_handler/index.ts
 var RunHandler = class {
@@ -171,12 +34,6 @@ var RunHandler = class {
 // src/index.ts
 import { randomBytes } from "crypto";
 var Func = class {
-  /**
-   * Create a cloud function
-   * @param config {object} config
-   * @param config.plugins {Plugin[]} plugins list
-   * @param config.handler {Handler} business logic
-   */
   constructor(config) {
     this.handler = config.handler;
     this.plugins = config.plugins || [];
@@ -237,13 +94,6 @@ var Func = class {
       return await dispatch(0);
     };
   }
-  /**
-   * Deploy the function
-   * @param data {object} data
-   * @param data.root {string} root path
-   * @param data.filename {string} filename
-   * @param data.env {string} environment
-   */
   deploy(data) {
     if (!data.logger)
       data.logger = new Logger("Func");
@@ -251,9 +101,6 @@ var Func = class {
     data.logger.debug("Plugins: " + this.plugins.map((p) => `${p.type}#${p.name}`).join(","));
     return this.compose("onDeploy")(data);
   }
-  /**
-   * First time mount the function
-   */
   async mount(data) {
     if (!data.logger)
       data.logger = new Logger("Func");
@@ -273,10 +120,6 @@ var Func = class {
       data.logger.timeEnd("mount", "mounted");
     }
   }
-  /**
-   * Invoke the function
-   * @param data {object} data
-   */
   async invoke(data) {
     if (!this.mounted)
       await this.mount({
@@ -292,9 +135,6 @@ var Func = class {
       data.response = error;
     }
   }
-  /**
-   * Export the function
-   */
   export() {
     const handler = async (event, context, callback) => {
       if (typeof context === "undefined")
@@ -302,7 +142,7 @@ var Func = class {
       if (!context.request_id)
         context.request_id = randomBytes(16).toString("hex");
       if (!context.request_at)
-        context.request_at = Math.round((/* @__PURE__ */ new Date()).getTime() / 1e3);
+        context.request_at = Math.round(new Date().getTime() / 1e3);
       context.callbackWaitsForEmptyEventLoop = false;
       const logger = new Logger(context.request_id);
       logger.debug("event: %j", event);

package/package.json

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