@koi-design/callkit 1.0.24-beta.41 → 1.0.24-beta.43

package/dist/index.d.ts

@@ -15,7 +15,7 @@ declare class Api {
      * @param params
      * @returns
      */
-    sdkLog(params: any): Promise<any>;
+    sdkLog(data: any): Promise<any>;
     /**
      *
      * @param params agentId userStatus
@@ -230,6 +230,7 @@ declare class Logger {
     logData: Record<LogDataType, any[]>;
     private callKit;
     constructor(callKit: CallKit, level?: LoggerLevel);
+    static formatStrLog(logObj: any): string;
     setLevel(level: LoggerLevel): void;
     debug(msg: any, extra?: Object): void;
     log(msg: any, extra?: Object): void;
@@ -478,7 +479,7 @@ declare class User {
      * @param params
      * @returns
      */
-    sendSdkLog(params: any): Promise<any>;
+    sendSdkLog(data: any): Promise<any>;
     sendHangUpReason(data: any): Promise<void>;
 }
 

package/dist/index.global.js

@@ -3861,6 +3861,167 @@ var WebCall = (() => {
     ALL: "all"
   };
 
+  // package/logger.ts
+  var import_json_stringify_safe = __toESM(require_stringify());
+  function getLevel(level) {
+    return LoggerLevelMap[level];
+  }
+  var Logger = class {
+    prefix = "CallKit";
+    level = "debug";
+    logData = {
+      sip: [],
+      incall: [],
+      ajax: [],
+      error: [],
+      reconnect: [],
+      all: []
+    };
+    callKit;
+    constructor(callKit, level) {
+      this.callKit = callKit;
+      this.level = level || "debug";
+      this.logData = {
+        sip: [],
+        incall: [],
+        ajax: [],
+        error: [],
+        reconnect: [],
+        all: []
+      };
+    }
+    static formatStrLog(logObj) {
+      const {
+        type = "info"
+        // 默认等级
+      } = logObj;
+      const time = (/* @__PURE__ */ new Date()).toISOString().replace("T", " ").replace(/\.\d+Z$/, "");
+      const level = String(type).toUpperCase().padEnd(5, " ");
+      const tagStr = logObj.typeag ? `[${logObj.type}]` : "";
+      const msg = JSON.stringify(logObj);
+      return `${time} [${level}] ${tagStr} ${msg}`.trim();
+    }
+    setLevel(level) {
+      this.level = level;
+    }
+    debug(msg, extra) {
+      if (getLevel(this.level) >= getLevel("debug")) {
+        this.output("blue")(msg, extra);
+      }
+    }
+    log(msg, extra) {
+      if (getLevel(this.level) >= getLevel("log")) {
+        this.output("green")(msg, extra);
+      }
+    }
+    warn(msg, extra) {
+      if (getLevel(this.level) >= getLevel("warn")) {
+        this.output("orange")(msg, extra);
+      }
+    }
+    error(msg, extra) {
+      const message = msg?.message ?? msg;
+      if (getLevel(this.level) >= getLevel("error")) {
+        this.output("red")(message, extra);
+      }
+      const { errCode, ...rest } = extra;
+      const errorCode = errCode ?? ErrorCode.UNKNOWN_ERROR;
+      this.callKit.trigger(KitEvent.KIT_ERROR, {
+        code: errorCode,
+        msg: message,
+        data: rest
+      });
+      this.callKit.reset();
+      const error = new Error(message);
+      error.name = "CallKitError";
+      error.code = errorCode;
+      error.data = rest;
+      throw error;
+    }
+    addLogData(type, data) {
+      this.callKit.user.sendSdkLog({
+        ...data,
+        type,
+        timestamp: (/* @__PURE__ */ new Date()).valueOf(),
+        time: (/* @__PURE__ */ new Date()).toLocaleString()
+      });
+      if (!this.callKit.config.isLogGatherEnable()) {
+        return;
+      }
+      let logData = {
+        type,
+        timestamp: (/* @__PURE__ */ new Date()).valueOf(),
+        time: (/* @__PURE__ */ new Date()).toLocaleString(),
+        data: ""
+      };
+      if (type === LogDataEnum.INCALL) {
+        logData.data = (0, import_json_stringify_safe.default)({
+          // customField
+          callKitSocketFrom: data?.callKitSocketFrom,
+          type: data?.ev.type || data?.type,
+          data: data?.ev.data || data?.data,
+          // message
+          origin: data?.ev.origin || data?.origin,
+          lastEventId: data?.ev.lastEventId || data?.lastEventId,
+          isTrusted: data?.ev.isTrusted || data?.isTrusted,
+          // close
+          code: data?.ev.code || data?.code,
+          reason: data?.ev.reason || data?.reason,
+          wasClean: data?.ev.wasClean || data?.wasClean
+        });
+      } else {
+        logData = (0, import_json_stringify_safe.default)(data);
+      }
+      switch (type) {
+        case LogDataEnum.SIP:
+          this.logData.sip.push(logData);
+          this.logData.all.push(logData);
+          break;
+        case LogDataEnum.INCALL:
+          this.logData.incall.push(logData);
+          this.logData.all.push(logData);
+          break;
+        case LogDataEnum.AJAX:
+          this.logData.ajax.push(logData);
+          this.logData.all.push(logData);
+          break;
+        case LogDataEnum.RECONNECT:
+          this.logData.reconnect.push(logData);
+          this.logData.all.push(logData);
+          break;
+        case LogDataEnum.ERROR:
+          this.logData.error.push(logData);
+          this.logData.all.push(logData);
+          break;
+        default:
+          this.logData.all.push(logData);
+          break;
+      }
+      this.callKit.socket.sendMessage(SocketSendEvent.SDK_LOG, logData);
+    }
+    output(color) {
+      return (msg, extra = {}) => {
+        const now = /* @__PURE__ */ new Date();
+        if (Object.keys(extra).length > 0) {
+          console.log(
+            `%c[${this.prefix}] %c ${msg} %o %c ${now.toLocaleString()}`,
+            `color: ${color};`,
+            "color:block;",
+            extra,
+            "color:#999;"
+          );
+        } else {
+          console.log(
+            `%c[${this.prefix}] %c ${msg} %c ${now.toLocaleString()}`,
+            `color: ${color};`,
+            "color:block;",
+            "color:#999;"
+          );
+        }
+      };
+    }
+  };
+
   // package/api.ts
   var Api = class {
     callKit;
@@ -3886,11 +4047,15 @@ var WebCall = (() => {
      * @param params
      * @returns
      */
-    async sdkLog(params) {
+    async sdkLog(data) {
+      const strLog = Logger.formatStrLog(data);
       return this.post({
+        // headers: {
+        //   'Content-Type': 'application/json'
+        // },
         url: "/agent/user/sdkLog",
         method: "post",
-        data: params
+        data: strLog
       });
     }
     /**
@@ -3912,8 +4077,8 @@ var WebCall = (() => {
       const { sessionId } = userInfo;
       config.url = `${host}${config.url}`;
       config.headers = {
-        ...config.headers,
-        "Content-Type": "application/x-www-form-urlencoded"
+        "Content-Type": "application/x-www-form-urlencoded",
+        ...config.headers
       };
       if (config.headers["Content-Type"] === "application/x-www-form-urlencoded") {
         config.data = new URLSearchParams(config.data).toString();
@@ -4124,153 +4289,6 @@ var WebCall = (() => {
     }
   };
 
-  // package/logger.ts
-  var import_json_stringify_safe = __toESM(require_stringify());
-  function getLevel(level) {
-    return LoggerLevelMap[level];
-  }
-  var Logger = class {
-    prefix = "CallKit";
-    level = "debug";
-    logData = {
-      sip: [],
-      incall: [],
-      ajax: [],
-      error: [],
-      reconnect: [],
-      all: []
-    };
-    callKit;
-    constructor(callKit, level) {
-      this.callKit = callKit;
-      this.level = level || "debug";
-      this.logData = {
-        sip: [],
-        incall: [],
-        ajax: [],
-        error: [],
-        reconnect: [],
-        all: []
-      };
-    }
-    setLevel(level) {
-      this.level = level;
-    }
-    debug(msg, extra) {
-      if (getLevel(this.level) >= getLevel("debug")) {
-        this.output("blue")(msg, extra);
-      }
-    }
-    log(msg, extra) {
-      if (getLevel(this.level) >= getLevel("log")) {
-        this.output("green")(msg, extra);
-      }
-    }
-    warn(msg, extra) {
-      if (getLevel(this.level) >= getLevel("warn")) {
-        this.output("orange")(msg, extra);
-      }
-    }
-    error(msg, extra) {
-      const message = msg?.message ?? msg;
-      if (getLevel(this.level) >= getLevel("error")) {
-        this.output("red")(message, extra);
-      }
-      const { errCode, ...rest } = extra;
-      const errorCode = errCode ?? ErrorCode.UNKNOWN_ERROR;
-      this.callKit.trigger(KitEvent.KIT_ERROR, {
-        code: errorCode,
-        msg: message,
-        data: rest
-      });
-      this.callKit.reset();
-      const error = new Error(message);
-      error.name = "CallKitError";
-      error.code = errorCode;
-      error.data = rest;
-      throw error;
-    }
-    addLogData(type, data) {
-      this.callKit.user.sendSdkLog({
-        content: data || {}
-      });
-      if (!this.callKit.config.isLogGatherEnable()) {
-        return;
-      }
-      let logData = {
-        type,
-        timestamp: (/* @__PURE__ */ new Date()).valueOf(),
-        time: (/* @__PURE__ */ new Date()).toLocaleString(),
-        data: ""
-      };
-      if (type === LogDataEnum.INCALL) {
-        logData.data = (0, import_json_stringify_safe.default)({
-          // customField
-          callKitSocketFrom: data?.callKitSocketFrom,
-          type: data?.ev.type || data?.type,
-          data: data?.ev.data || data?.data,
-          // message
-          origin: data?.ev.origin || data?.origin,
-          lastEventId: data?.ev.lastEventId || data?.lastEventId,
-          isTrusted: data?.ev.isTrusted || data?.isTrusted,
-          // close
-          code: data?.ev.code || data?.code,
-          reason: data?.ev.reason || data?.reason,
-          wasClean: data?.ev.wasClean || data?.wasClean
-        });
-      } else {
-        logData = (0, import_json_stringify_safe.default)(data);
-      }
-      switch (type) {
-        case LogDataEnum.SIP:
-          this.logData.sip.push(logData);
-          this.logData.all.push(logData);
-          break;
-        case LogDataEnum.INCALL:
-          this.logData.incall.push(logData);
-          this.logData.all.push(logData);
-          break;
-        case LogDataEnum.AJAX:
-          this.logData.ajax.push(logData);
-          this.logData.all.push(logData);
-          break;
-        case LogDataEnum.RECONNECT:
-          this.logData.reconnect.push(logData);
-          this.logData.all.push(logData);
-          break;
-        case LogDataEnum.ERROR:
-          this.logData.error.push(logData);
-          this.logData.all.push(logData);
-          break;
-        default:
-          this.logData.all.push(logData);
-          break;
-      }
-      this.callKit.socket.sendMessage(SocketSendEvent.SDK_LOG, logData);
-    }
-    output(color) {
-      return (msg, extra = {}) => {
-        const now = /* @__PURE__ */ new Date();
-        if (Object.keys(extra).length > 0) {
-          console.log(
-            `%c[${this.prefix}] %c ${msg} %o %c ${now.toLocaleString()}`,
-            `color: ${color};`,
-            "color:block;",
-            extra,
-            "color:#999;"
-          );
-        } else {
-          console.log(
-            `%c[${this.prefix}] %c ${msg} %c ${now.toLocaleString()}`,
-            `color: ${color};`,
-            "color:block;",
-            "color:#999;"
-          );
-        }
-      };
-    }
-  };
-
   // node_modules/.pnpm/sip.js@0.21.2/node_modules/sip.js/lib/version.js
   var LIBRARY_VERSION = "0.21.1";
 
@@ -20012,8 +20030,8 @@ var WebCall = (() => {
      * @param params
      * @returns
      */
-    async sendSdkLog(params) {
-      return this.callKit.api.sdkLog(params);
+    async sendSdkLog(data) {
+      return this.callKit.api.sdkLog(data);
     }
     async sendHangUpReason(data) {
       try {