send-sls-logger 0.0.29 → 0.0.31

package/lib/index.d.ts

@@ -1,7 +1,7 @@
 import { WebTrackerBrowserOptions } from "@aliyun-sls/web-track-browser";
 
 interface StringObject {
-  [name: string]: string;
+  [name: string]: string | Function;
 }
 
 interface Options extends WebTrackerBrowserOptions {

package/lib/init.js

@@ -29,17 +29,28 @@ const formatDataMaxLength = (data) => {
   }
 };
 
+const formatFunctionObj = (data) => {
+  if (getType(data) === "object") {
+    return Object.keys(data).reduce((curr, key) => {
+      curr[key] = formatFunctionObj(data[key]);
+      return curr;
+    }, {});
+  } else if (getType(data) === "array") {
+    return data.map((i) => formatFunctionObj(i));
+  } else if (getType(data) === "function") {
+    return data();
+  } else {
+    return data;
+  }
+};
 const formatLogData = (data, type = "log") => {
-  const result = {
-    type,
-    ...defaultLogData,
-  };
+  const result = { ...defaultLogData, type };
   if (typeof data === "string") {
-    return { ...result, data };
+    Object.assign(result, { data });
   } else if (typeof data === "object") {
-    return { ...result, ...data };
+    Object.assign(result, data);
   }
-  return result;
+  return formatFunctionObj(result);
 };
 
 const send = (type) => {
@@ -50,14 +61,16 @@ const send = (type) => {
     } else if (typeof err === "object") {
       data = { ...err };
     }
-    const isExcludeMsg = Object.keys(data).find((key) => {
-      return exclude.find((i) => new RegExp(i, "g").test(data[key]));
+
+    const result = formatLogData(data, type);
+    const isExcludeMsg = Object.keys(result).find((key) => {
+      return exclude.find((i) => new RegExp(i, "g").test(result[key]));
     });
+
     if (isExcludeMsg) {
-      console.log(data);
+      console.log(`logger ${type}`, result);
       return;
     }
-    const result = formatLogData(data, type);
     if (!opts.host || !opts.project || !opts.logstore) {
       return console.warn("日志初始化需要配置options", result);
     }

package/lib/mini.d.ts

@@ -1,6 +1,6 @@
-import { WebTrackerBrowserOptions } from "@aliyun-sls/web-track-browser";
+import { WebTrackerBrowserOptions } from "@aliyun-sls/web-track-mini";
 interface StringObject {
-  [name: string]: string;
+  [name: string]: string | Function;
 }
 
 interface Options extends WebTrackerBrowserOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "send-sls-logger",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "description": "阿里云sls的logger发送",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"