magic-chat-im 2.9.2 → 2.9.3

package/es/socket.js

@@ -0,0 +1,163 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
+ * WebSocket
+ * https://html.spec.whatwg.org/multipage/web-sockets.html#network
+ */
+import mitt from 'mitt';
+import { IM_TYPE, WS_STATUS, WS_TYPE } from "./common";
+import { logger } from "./logger";
+import { errorHandler } from "./error-handler";
+/**
+ * 旧参数，{token, serverDomain, userId, appId} 
+ *  const wsPath = `wss://${serverDomain}/gtsWebPush/ws`;
+    const wsQuery = `param=${appId},${userId},${token}`;
+    const wsUrl = `${wsPath}?${wsQuery}`;
+ * 新参数，{url,token, appKey} 
+ *  const url = `wss://${serverDomain}/gtsWebPush/ws`;
+    const appKey = `${appId},${userId}`;
+    const wsUrl = `${url}?param=${appKey},${token}`;
+ */
+function getWsUrl(config) {
+  var url = config.url,
+    token = config.token,
+    appKey = config.appKey;
+  return "".concat(url, "?param=").concat(appKey, ",").concat(token);
+}
+var Socket = /*#__PURE__*/function () {
+  function Socket(config) {
+    _classCallCheck(this, Socket);
+    _defineProperty(this, "ws", void 0);
+    _defineProperty(this, "config", void 0);
+    _defineProperty(this, "emit", void 0);
+    _defineProperty(this, "on", void 0);
+    _defineProperty(this, "_eventHandlers", void 0);
+    var url = getWsUrl(config);
+    var ws = new WebSocket(url);
+    this._eventHandlers = {};
+    this._bindEvts(ws);
+    Object.assign(this, _objectSpread({
+      ws: ws,
+      config: config
+    }, mitt()));
+  }
+
+  /**
+   * 获取 WebSocket 的 readyState
+   */
+  _createClass(Socket, [{
+    key: "readyState",
+    get: function get() {
+      return this.ws.readyState;
+    }
+
+    /**
+     * 自动根据 WebSocket 的实际状态计算 status
+     * 使用 getter 避免状态不同步问题
+     */
+  }, {
+    key: "status",
+    get: function get() {
+      if (!this.ws) {
+        return WS_STATUS.OFFLINE;
+      }
+      switch (this.ws.readyState) {
+        case WebSocket.OPEN:
+          return WS_STATUS.ONLINE;
+        case WebSocket.CONNECTING:
+        case WebSocket.CLOSING:
+        case WebSocket.CLOSED:
+        default:
+          return WS_STATUS.OFFLINE;
+      }
+    }
+  }, {
+    key: "send",
+    value: function send(data) {
+      if (this.ws) this.ws.send(data);
+    }
+  }, {
+    key: "close",
+    value: function close() {
+      var _this$ws;
+      // 移除所有事件监听器
+      this._unbindEvts();
+      (_this$ws = this.ws) === null || _this$ws === void 0 || _this$ws.close();
+    }
+  }, {
+    key: "_bindEvts",
+    value: function _bindEvts(ws) {
+      var _this = this;
+      this._eventHandlers[WS_TYPE.OPEN] = function () {
+        // status 现在是 getter，会自动从 ws.readyState 计算，无需手动设置
+        _this.emit(IM_TYPE.OPEN);
+        logger.debug('[WebSocket] WebSocket open');
+      };
+      this._eventHandlers[WS_TYPE.MESSAGE] = function (ev) {
+        logger.debug("[WebSocket] WebSocket Message received", ev.data);
+        // status 会自动反映连接状态，无需手动设置
+        _this.emit(IM_TYPE.MESSAGE, {
+          type: IM_TYPE.MESSAGE,
+          data: ev.data
+        });
+      };
+      this._eventHandlers[WS_TYPE.ERROR] = function (err) {
+        var _this$config;
+        // 使用统一的错误处理中心记录详细的错误信息
+        errorHandler.reportError('[WebSocket] WebSocket error occurred', err, {
+          url: (_this$config = _this.config) === null || _this$config === void 0 ? void 0 : _this$config.url,
+          status: _this.status,
+          readyState: _this.readyState
+        });
+
+        // status 会自动反映连接状态，无需手动设置
+        _this.emit(IM_TYPE.ERROR, err);
+      };
+      this._eventHandlers[WS_TYPE.CLOSE] = function (err) {
+        // 记录连接关闭的详细信息，特别是code 1006的情况
+        if (err.code === 1006) {
+          errorHandler.reportError('[WebSocket] WebSocket closed abnormally with code 1006 (connection lost without proper close frame)', err, {
+            reason: err.reason,
+            wasClean: err.wasClean
+          });
+        } else {
+          logger.info('[WebSocket] WebSocket closed', {
+            code: err.code,
+            reason: err.reason,
+            wasClean: err.wasClean
+          });
+        }
+
+        // status 会自动反映连接状态，无需手动设置
+        _this.emit(IM_TYPE.CLOSE, err);
+      };
+
+      // 添加事件监听器
+      ws.addEventListener(WS_TYPE.OPEN, this._eventHandlers[WS_TYPE.OPEN]);
+      ws.addEventListener(WS_TYPE.MESSAGE, this._eventHandlers[WS_TYPE.MESSAGE]);
+      ws.addEventListener(WS_TYPE.ERROR, this._eventHandlers[WS_TYPE.ERROR]);
+      ws.addEventListener(WS_TYPE.CLOSE, this._eventHandlers[WS_TYPE.CLOSE]);
+    }
+  }, {
+    key: "_unbindEvts",
+    value: function _unbindEvts() {
+      var _this2 = this;
+      if (this.ws && this._eventHandlers) {
+        // 移除所有事件监听器
+        Object.keys(this._eventHandlers).forEach(function (eventType) {
+          _this2.ws.removeEventListener(eventType, _this2._eventHandlers[eventType]);
+        });
+        this._eventHandlers = {};
+      }
+    }
+  }]);
+  return Socket;
+}();
+export { Socket as default };

package/es/types.d.ts

@@ -0,0 +1,82 @@
+/**
+ * IM SDK 类型定义
+ */
+import { EXCEPTION_ERROR, RECEIVED_MSG_TYPE, RECONNECT_RESON, SEND_MSG_TYPE } from './common';
+/**
+ * 消息数据结构
+ */
+export interface MessageData {
+    name: string;
+    args?: any[];
+    messageKey: string;
+    msgType: RECEIVED_MSG_TYPE | SEND_MSG_TYPE;
+    msgBody: MessageBody;
+    appId?: string;
+    userId?: string;
+}
+/**
+ * 消息体结构
+ */
+export interface MessageBody {
+    version?: string;
+    msgType?: string;
+    msgDetail?: any;
+    [key: string]: any;
+}
+/**
+ * 重连事件数据
+ */
+export interface ReconnectEventData {
+    code: RECONNECT_RESON;
+    err?: any;
+    attempt?: number;
+    maxRetries?: number;
+    nextRetryDelay?: number;
+    isReconnecting?: boolean;
+}
+/**
+ * 错误事件数据
+ */
+export interface ErrorEventData {
+    code: EXCEPTION_ERROR;
+    err?: any;
+    msg?: string;
+    reason?: string;
+    maxRetry?: number;
+    [key: string]: any;
+}
+/**
+ * 关闭事件数据
+ */
+export interface CloseEventData {
+    code: EXCEPTION_ERROR;
+    err?: any;
+    reason?: string;
+    [key: string]: any;
+}
+/**
+ * WebSocket 消息
+ */
+export interface WS_Message {
+    type: string;
+    data: string;
+}
+/**
+ * ACK 消息
+ */
+export interface AckMessage {
+    messageKey: string;
+    appId?: string;
+    userId?: string;
+    msgType: SEND_MSG_TYPE;
+}
+/**
+ * 发送消息格式
+ */
+export interface SendMessageData {
+    appId?: string;
+    userId?: string;
+    messageKey: string;
+    msgType: SEND_MSG_TYPE;
+    msgBody: MessageBody;
+}

package/es/types.js

@@ -0,0 +1 @@
+export {};

package/es/util.d.ts

@@ -0,0 +1,11 @@
+export declare function getMsgBody(msg: string): any | null;
+export declare function makeMsgBody(msg: Record<string, any>): string;
+/**
+ * https://stackoverflow.com/questions/44815172/log-shows-error-object-istrustedtrue-instead-of-actual-error-data
+ */
+export declare function getError(err: any): string;
+/**
+ * 检测是否为移动端设备
+ * @returns {boolean} 是否为移动端
+ */
+export declare function isMobile(): boolean;

package/es/util.js

@@ -0,0 +1,44 @@
+import { logger } from "./logger";
+export function getMsgBody(msg) {
+  if (!msg) {
+    logger.warn('[utils] getMsgBody: Empty message received');
+    return null;
+  }
+  try {
+    return JSON.parse(msg);
+  } catch (e) {
+    logger.error('[utils] getMsgBody: Failed to parse message', {
+      error: e,
+      message: msg.substring(0, 100) // 只记录前 100 字符
+    });
+
+    // 可以上报到监控系统
+    // reportError('MESSAGE_PARSE_ERROR', e);
+
+    return null; // 返回 null 而不是原始字符串
+  }
+}
+export function makeMsgBody(msg) {
+  return "".concat(JSON.stringify(msg));
+}
+
+/**
+ * https://stackoverflow.com/questions/44815172/log-shows-error-object-istrustedtrue-instead-of-actual-error-data
+ */
+export function getError(err) {
+  var res = err;
+  try {
+    res = JSON.stringify(err, ['message', 'arguments', 'type', 'name', 'code', 'reason']);
+  } catch (e) {
+    logger.error('[utils] getError: Failed to stringify error', e);
+  }
+  return res;
+}
+
+/**
+ * 检测是否为移动端设备
+ * @returns {boolean} 是否为移动端
+ */
+export function isMobile() {
+  return /Android|iPhone|iPad|iPod|Windows Phone/i.test(navigator.userAgent);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "magic-chat-im",
-  "version": "2.9.2",
+  "version": "2.9.3",
   "license": "ISC",
   "sideEffects": [
     "**/*.scss",