agora-foundation 3.7.7-rc.1 → 3.7.8

package/lib/decorator/log/handler.js

@@ -12,36 +12,73 @@ var _interceptor = require("../../utilities/interceptor");
 var _misc = require("../../utilities/misc");
 var _type = require("../type");
 var _logSerializer = require("./log-serializer");
-var formatReturnLog = function formatReturnLog(identifier, elapsed, args, returnValue, thrown) {
+var formatCallLog = function formatCallLog(identifier, args) {
   var msg = '';
   if (args !== null && args !== void 0 && args.length) {
     msg += "[parameters: ".concat((0, _logSerializer.serializeArgs)(args), "]");
   }
-  if (thrown) {
-    msg += "[throw: ".concat(thrown.name, "]");
-    msg += "[message: ".concat(thrown.message, "]");
-  } else if (typeof returnValue !== 'undefined') {
-    msg += "[return: ".concat((0, _logSerializer.serialize)(returnValue), "]");
-  }
-  return "".concat(identifier.methodName, " [API Call]").concat(msg, "[elapsed: ").concat(elapsed, "ms]");
+  return "".concat(identifier.methodName, " [API Call]").concat(msg, "[traceId: ").concat(identifier.traceId, "]");
 };
+
+// const formatReturnLog = (
+//   identifier: { className: string; methodName: string; traceId: string },
+//   elapsed: number,
+//   args?: unknown[],
+//   returnValue?: unknown,
+//   thrown?: Error,
+// ) => {
+//   let msg = '';
+//   if (args?.length) {
+//     msg += `[parameters: ${serializeArgs(args)}]`;
+//   }
+
+//   if (thrown) {
+//     msg += `[throw: ${thrown.name}]`;
+//     msg += `[message: ${thrown.message}]`;
+//   } else if (typeof returnValue !== 'undefined') {
+//     msg += `[return: ${serialize(returnValue)}]`;
+//   }
+
+//   return `${identifier.methodName} [API Call]${msg}[elapsed: ${elapsed}ms]`;
+// };
+
 var createLogHandler = exports.createLogHandler = function createLogHandler(holder) {
   return function (evt) {
     if (evt.type === _type.InvocationEventType.PRE) {
+      var _evt$arguments;
       evt.context.start = new Date().getTime();
       evt.context.traceId = (0, _misc.randomString)(5);
-    } else {
-      var _evt$arguments;
-      var elapsed = new Date().getTime() - evt.context.start;
-      var msg = formatReturnLog({
+      var msg = formatCallLog({
         className: evt["class"],
         methodName: evt.method,
         traceId: evt.context.traceId
-      }, elapsed, (_evt$arguments = evt.arguments) !== null && _evt$arguments !== void 0 ? _evt$arguments : [], evt["return"], evt.error);
+      }, (_evt$arguments = evt.arguments) !== null && _evt$arguments !== void 0 ? _evt$arguments : []);
+      holder.logger.info(msg);
+    } else {
+      var elapsed = new Date().getTime() - evt.context.start;
+      // const msg = formatReturnLog(
+      //   {
+      //     className: evt.class,
+      //     methodName: evt.method,
+      //     traceId: evt.context.traceId,
+      //   },
+      //   elapsed,
+      //   evt.arguments ?? [],
+      //   evt.return,
+      //   evt.error,
+      // );
+      // if (evt.error) {
+      //   holder.logger.error(msg);
+      // } else {
+      //   holder.logger.info(msg);
+      // }
+
       if (evt.error) {
-        holder.logger.error(msg);
+        var _msg = "".concat(evt.method, " [throw: ").concat(evt.error.name, "][message: ").concat(evt.error.message, "][elapsed: ").concat(elapsed, "ms][traceId: ").concat(evt.context.traceId, "]");
+        holder.logger.error(_msg);
       } else {
-        holder.logger.info(msg);
+        var _msg2 = "".concat(evt.method, " [return: ").concat((0, _logSerializer.serialize)(evt["return"]), "][elapsed: ").concat(elapsed, "ms][traceId: ").concat(evt.context.traceId, "]");
+        holder.logger.info(_msg2);
       }
     }
     return _interceptor.Result.CONTINUE;