@zxhy-npm/send-sls-logger 1.1.16 → 1.1.18

package/lib/init.d.ts

@@ -20,6 +20,7 @@ export interface InitConfig<T extends LogOptions> {
     formatResultToBehavior?: boolean;
 }
 export declare function deleteNullOrUndefined(obj: any): any;
+type InputType = number | string | Error | StringObject;
 declare class DefaultLog<T extends LogOptions> {
     opts: {
         host: string;
@@ -44,10 +45,10 @@ declare class DefaultLog<T extends LogOptions> {
     private formatLogData;
     private sendResult;
     private send;
-    error: (...args: any[]) => void;
-    warn: (...args: any[]) => void;
-    log: (...args: any[]) => void;
-    info: (...args: any[]) => void;
+    error: (result: InputType, formatResult: (result: StringObject) => StringObject) => void;
+    warn: (result: InputType, formatResult: (result: StringObject) => StringObject) => void;
+    log: (result: InputType, formatResult: (result: StringObject) => StringObject) => void;
+    info: (result: InputType, formatResult: (result: StringObject) => StringObject) => void;
 }
 export default DefaultLog;
 export type LogClassInterface = InstanceType<typeof DefaultLog>;

package/lib/init.js

@@ -103,20 +103,23 @@ class DefaultLog {
     formatLogData(data, type = 'log') {
         const { defaultLogData, formatFunctionObj } = this;
         const result = { ...defaultLogData, type };
-        if (typeof data === 'string') {
-            Object.assign(result, { data });
-        }
-        else if (typeof data === 'object') {
+        if (typeof data === 'object') {
             Object.assign(result, data);
         }
+        else if (typeof data === 'string') {
+            Object.assign(result, { data });
+        }
         return formatFunctionObj.call(this, result);
     }
     sendResult(type, err, activeFormatResult) {
         const { opts, formatLogData, formatDataMaxLength, userFormatResult, debug, tracker, exclude } = this;
         let data = {};
-        if (typeof err === 'string') {
+        if (typeof err === 'string' || typeof err === 'number') {
             data.msg = err;
         }
+        else if (err instanceof Error) {
+            data.msg = err.message;
+        }
         else if (typeof err === 'object') {
             data = { ...err };
         }
@@ -139,9 +142,6 @@ class DefaultLog {
         if (getType(userFormatResult) === 'function') {
             formatResultObj = userFormatResult?.(formatResultObj) || formatResultObj;
         }
-        if (getType(activeFormatResult) === 'function') {
-            formatResultObj = activeFormatResult?.(formatResultObj) || formatResultObj;
-        }
         if (isExcludeMsg) {
             debug && console.log(`该日志已被忽略：`, formatResultObj);
             return;
@@ -166,6 +166,9 @@ class DefaultLog {
             });
             Object.assign(formatResultObj, { ext });
         }
+        if (getType(activeFormatResult) === 'function') {
+            formatResultObj = activeFormatResult?.(formatResultObj) || formatResultObj;
+        }
         tracker.send({
             ...formatResultObj,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zxhy-npm/send-sls-logger",
-	"version": "1.1.16",
+	"version": "1.1.18",
 	"description": "阿里云sls的logger发送",
 	"scripts": {
 		"build": "rm -rf lib && tsc"
@@ -26,5 +26,6 @@
 	"dependencies": {
 		"@aliyun-sls/web-track-browser": "^0.0.3",
 		"@aliyun-sls/web-track-mini": "^0.0.2"
-	}
+	},
+	"repository": "git@gitee.com:howlove/send-sls-logger.git"
 }