node-nim 9.2.8-rc.1 → 9.3.0-rc.2

package/{js/api → dist/nim}/session.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NIMSession = void 0;
 const loader_1 = __importDefault(require("../loader"));
-const events_1 = __importDefault(require("events"));
-class NIMSession extends events_1.default.EventEmitter {
+const eventemitter3_1 = require("eventemitter3");
+class NIMSession extends eventemitter3_1.EventEmitter {
     constructor() {
         super();
         this.session = new loader_1.default.NIMSession({ emit: this.emit.bind(this) });
@@ -24,7 +24,14 @@ class NIMSession extends events_1.default.EventEmitter {
      * </pre>
      */
     queryStickTopSessionList(cb) {
-        return this.session.QueryStickTopSessionList(cb);
+        return new Promise((resolve) => {
+            this.session.QueryStickTopSessionList((rescode, result) => {
+                if (cb) {
+                    cb(rescode, result);
+                }
+                resolve([rescode, result]);
+            });
+        });
     }
     /** 设置置顶会话
      * @param session_id			会话id
@@ -38,7 +45,14 @@ class NIMSession extends events_1.default.EventEmitter {
      * </pre>
      */
     setToStickTopSession(session_id, to_type, ext, cb) {
-        return this.session.SetToStickTopSession(session_id, to_type, ext, cb);
+        return new Promise((resolve) => {
+            this.session.SetToStickTopSession(session_id, to_type, ext, (rescode, result) => {
+                if (cb) {
+                    cb(rescode, result);
+                }
+                resolve([rescode, result]);
+            });
+        });
     }
     /** 更新置顶会话列表
      * @param session_id			会话id
@@ -52,7 +66,14 @@ class NIMSession extends events_1.default.EventEmitter {
      * </pre>
      */
     updateToStickTopSession(session_id, to_type, ext, cb) {
-        return this.session.UpdateToStickTopSession(session_id, to_type, ext, cb);
+        return new Promise((resolve) => {
+            this.session.UpdateToStickTopSession(session_id, to_type, ext, (rescode, result) => {
+                if (cb) {
+                    cb(rescode, result);
+                }
+                resolve([rescode, result]);
+            });
+        });
     }
     /** 取消置顶会话列表
      * @param session_id			会话id
@@ -65,7 +86,14 @@ class NIMSession extends events_1.default.EventEmitter {
      * </pre>
      */
     cancelToStickTopSession(session_id, to_type, cb) {
-        return this.session.CancelToStickTopSession(session_id, to_type, cb);
+        return new Promise((resolve) => {
+            this.session.CancelToStickTopSession(session_id, to_type, (rescode, session_id, session_type) => {
+                if (cb) {
+                    cb(rescode, session_id, session_type);
+                }
+                resolve([rescode, session_id, session_type]);
+            });
+        });
     }
     /** 查询指定数量的最后会话数据
      * @param limit		要返回的最大数量
@@ -74,7 +102,14 @@ class NIMSession extends events_1.default.EventEmitter {
      * @return void 无返回值
      */
     queryLastFewSessionAsync(limit, cb, jsonExtension) {
-        return this.session.QueryLastFewSessionAsync(limit, cb, jsonExtension);
+        return new Promise((resolve) => {
+            this.session.QueryLastFewSessionAsync(limit, (rescode, result) => {
+                if (cb) {
+                    cb(rescode, result);
+                }
+                resolve([rescode, result]);
+            }, jsonExtension);
+        });
     }
     /** 查询会话列表,可指定最后一条会话消息要排除掉的类型(列表)
      * @param msg_excluded_type_list 最后一条会话消息要排除掉的类型(列表),如果不排除任何消息,传入空列表
@@ -83,21 +118,35 @@ class NIMSession extends events_1.default.EventEmitter {
      * @return void 无返回值
      */
     queryAllRecentSessionAsync(msg_excluded_type_list, cb, jsonExtension) {
-        return this.session.QueryAllRecentSessionAsync(msg_excluded_type_list, cb, jsonExtension);
+        return new Promise((resolve) => {
+            this.session.QueryAllRecentSessionAsync(msg_excluded_type_list, (rescode, result) => {
+                if (cb) {
+                    cb(rescode, result);
+                }
+                resolve([rescode, result]);
+            }, jsonExtension);
+        });
     }
     /** 删除最近联系人
      * @param to_type		会话类型，双人0，群组1 (nim_msglog_def.h)
      * @param id			对方的account id或者群组tid。
      * @param delete_roaming 是否同时删除漫游消息
      * @param cb			最近会话列表项变更的回调函数
-     * @return bool 检查参数如果不符合要求则返回失败
+     * @return boolean 检查参数如果不符合要求则返回失败
      * @note
      * <pre>
      * 200:成功
      * </pre>
      */
     deleteRecentSession(type, id, cb, delete_roaming) {
-        return this.session.DeleteRecentSession(type, id, cb, delete_roaming);
+        return new Promise((resolve) => {
+            this.session.DeleteRecentSession(type, id, (rescode, session_data, count) => {
+                if (cb) {
+                    cb(rescode, session_data, count);
+                }
+                resolve([rescode, session_data, count]);
+            }, delete_roaming);
+        });
     }
     /** 删除全部最近联系人
      * @param jsonExtension json扩展参数（备用，目前不需要）
@@ -109,48 +158,80 @@ class NIMSession extends events_1.default.EventEmitter {
      * </pre>
      */
     deleteAllRecentSession(cb, jsonExtension) {
-        return this.session.DeleteAllRecentSession(cb, jsonExtension);
+        return new Promise((resolve) => {
+            this.session.DeleteAllRecentSession((rescode, session_data, count) => {
+                if (cb) {
+                    cb(rescode, session_data, count);
+                }
+                resolve([rescode, session_data, count]);
+            }, jsonExtension);
+        });
     }
     /** 删除某会话的漫游消息
      * @param to_type		会话类型，双人0，群组1 (nim_msglog_def.h)
      * @param id			对方的account id或者群组tid。
      * @param jsonExtension json扩展参数（备用，目前不需要）
      * @param cb			删除结果 回调回调函数
-     * @return bool 检查参数如果不符合要求则返回失败
+     * @return boolean 检查参数如果不符合要求则返回失败
      * @note
      * <pre>
      * 200:成功
      * </pre>
      */
     deleteSessionRoamingMessage(to_type, session_id, cb, ext) {
-        return this.session.DeleteSessionRoamingMessage(to_type, session_id, cb, ext);
+        return new Promise((resolve) => {
+            this.session.DeleteSessionRoamingMessage(to_type, session_id, (rescode, to_type, session_id) => {
+                if (cb) {
+                    cb(rescode, to_type, session_id);
+                }
+                resolve([rescode, to_type, session_id]);
+            }, ext);
+        });
     }
     /** 最近联系人项未读数清零
      * @param to_type		会话类型，双人0，群组1 (nim_msglog_def.h)
      * @param id			对方的account id或者群组tid。
      * @param jsonExtension json扩展参数（备用，目前不需要）
      * @param cb			最近会话列表项变更的回调函数
-     * @return bool 检查参数如果不符合要求则返回失败
+     * @return boolean 检查参数如果不符合要求则返回失败
      * @note
      * <pre>
      * 200:成功
      * </pre>
      */
     setUnreadCountZeroAsync(type, id, cb, jsonExtension) {
-        return this.session.SetUnreadCountZeroAsync(type, id, cb, jsonExtension);
+        return new Promise((resolve) => {
+            if (!this.session.SetUnreadCountZeroAsync(type, id, (rescode, session_data, count) => {
+                if (cb) {
+                    cb(rescode, session_data, count);
+                }
+                resolve([rescode, session_data, count]);
+            }, jsonExtension)) {
+                resolve(null);
+            }
+        });
     }
     /** 最近联系人项未读数清零
      * @param is_super_team	会话列表中的会话是否是超大群会话
      * @param zero_list	清零的会话信息列表。
      * @param cb			最近会话列表项变更的回调函数
-     * @return bool 检查参数如果不符合要求则返回失败
+     * @return boolean 检查参数如果不符合要求则返回失败
      * @note
      * <pre>
      * 200:成功
      * </pre>
      */
     setMultiUnreadCountZeroAsync(is_super_team, zero_list, cb) {
-        return this.session.SetMultiUnreadCountZeroAsync(is_super_team, zero_list, cb);
+        return new Promise((resolve) => {
+            if (!this.session.SetMultiUnreadCountZeroAsync(is_super_team, zero_list, (rescode, data_list, unread_count) => {
+                if (cb) {
+                    cb(rescode, data_list, unread_count);
+                }
+                resolve([rescode, data_list, unread_count]);
+            })) {
+                resolve(null);
+            }
+        });
     }
     /** 设置会话项是否置顶(置顶属性只保存在本地)
      * @param to_type		会话类型
@@ -158,14 +239,23 @@ class NIMSession extends events_1.default.EventEmitter {
      * @param top			true - 置顶 false - 取消置顶
      * @param cb			回调函数
      * @param jsonExtension json扩展参数（备用，目前不需要）
-     * @return bool 检查参数如果不符合要求则返回失败
+     * @return boolean 检查参数如果不符合要求则返回失败
      * @note
      * <pre>
      * 200:成功
      * </pre>
      */
     setSessionTop(type, id, top, cb, jsonExtension) {
-        return this.session.SetSessionTop(type, id, top, cb, jsonExtension);
+        return new Promise((resolve) => {
+            if (!this.session.SetSessionTop(type, id, top, (rescode, session_data, count) => {
+                if (cb) {
+                    cb(rescode, session_data, count);
+                }
+                resolve([rescode, session_data, count]);
+            }, jsonExtension)) {
+                resolve(null);
+            }
+        });
     }
     /** 设置会话项扩展数据(扩展数据只保存在本地)
      * @param to_type		会话类型
@@ -173,26 +263,44 @@ class NIMSession extends events_1.default.EventEmitter {
      * @param data			扩展数据,建议使用灵活可扩展的数据结构,例如Json
      * @param cb			回调函数
      * @param jsonExtension json扩展参数（备用，目前不需要）
-     * @return bool 检查参数如果不符合要求则返回失败
+     * @return boolean 检查参数如果不符合要求则返回失败
      * @note
      * <pre>
      * 200:成功
      * </pre>
      */
     setSessionExtendData(type, id, data, cb, jsonExtension) {
-        return this.session.SetSessionExtendData(type, id, data, cb, jsonExtension);
+        return new Promise((resolve) => {
+            if (!this.session.SetSessionExtendData(type, id, data, (rescode, session_data, count) => {
+                if (cb) {
+                    cb(rescode, session_data, count);
+                }
+                resolve([rescode, session_data, count]);
+            }, jsonExtension)) {
+                resolve(null);
+            }
+        });
     }
     /** 最近联系人项全部未读数清零
      * @param jsonExtension json扩展参数（备用，目前不需要）
      * @param cb			最近会话列表项变更的回调函数
-     * @return bool 检查参数如果不符合要求则返回失败
+     * @return boolean 检查参数如果不符合要求则返回失败
      * @note
      * <pre>
      * 200:成功
      * </pre>
      */
     setAllUnreadCountZeroAsync(cb, jsonExtension) {
-        return this.session.SetAllUnreadCountZeroAsync(cb, jsonExtension);
+        return new Promise((resolve) => {
+            if (!this.session.SetAllUnreadCountZeroAsync((rescode, session_data, count) => {
+                if (cb) {
+                    cb(rescode, session_data, count);
+                }
+                resolve([rescode, session_data, count]);
+            }, jsonExtension)) {
+                resolve(null);
+            }
+        });
     }
     /** 根据给定的id查询相应会话的信息
      * @param to_type		会话类型
@@ -206,7 +314,14 @@ class NIMSession extends events_1.default.EventEmitter {
      * </pre>
      */
     querySessionDataById(type, id, cb, jsonExtension) {
-        return this.session.QuerySessionDataById(type, id, cb, jsonExtension);
+        return new Promise((resolve) => {
+            this.session.QuerySessionDataById(type, id, (rescode, session_data) => {
+                if (cb) {
+                    cb(rescode, session_data);
+                }
+                resolve([rescode, session_data]);
+            }, jsonExtension);
+        });
     }
     /** 查询会话是漫游消息未拉取信息
      * @param session_id		会话id
@@ -219,14 +334,28 @@ class NIMSession extends events_1.default.EventEmitter {
      * </pre>
      */
     queryHasmoreRoammsg(session_id, to_type, cb) {
-        return this.session.QueryHasmoreRoammsg(session_id, to_type, cb);
+        return new Promise((resolve) => {
+            this.session.QueryHasmoreRoammsg(session_id, to_type, (rescode, info) => {
+                if (cb) {
+                    cb(rescode, info);
+                }
+                resolve([rescode, info]);
+            });
+        });
     }
     /** 查询所有漫游消息未拉取完全的会话
      * @param cb	结果回调
      * @return void 无返回值
      */
     queryAllHasmoreRoammsg(cb) {
-        return this.session.QueryAllHasmoreRoammsg(cb);
+        return new Promise((resolve) => {
+            this.session.QueryAllHasmoreRoammsg((rescode, infos) => {
+                if (cb) {
+                    cb(rescode, infos);
+                }
+                resolve([rescode, infos]);
+            });
+        });
     }
     /** 更新会话是漫游消息未拉取信息
      * @param msg	对应的消息内容
@@ -234,7 +363,14 @@ class NIMSession extends events_1.default.EventEmitter {
      * @return void 无返回值
      */
     updateHasmoreRoammsg(msg, cb) {
-        return this.session.UpdateHasmoreRoammsg(msg, cb);
+        return new Promise((resolve) => {
+            this.session.UpdateHasmoreRoammsg(msg, (rescode) => {
+                if (cb) {
+                    cb(rescode);
+                }
+                resolve([rescode]);
+            });
+        });
     }
     /** 删除会话是漫游消息未拉取信息
      * @param session_id			会话id
@@ -243,7 +379,14 @@ class NIMSession extends events_1.default.EventEmitter {
      * @return void 无返回值
      */
     deleteHasmoreRoammsg(session_id, to_type, cb) {
-        return this.session.DeleteHasmoreRoammsg(session_id, to_type, cb);
+        return new Promise((resolve) => {
+            this.session.DeleteHasmoreRoammsg(session_id, to_type, (rescode) => {
+                if (cb) {
+                    cb(rescode);
+                }
+                resolve([rescode]);
+            });
+        });
     }
 }
 exports.NIMSession = NIMSession;

package/dist/nim/session.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../../ts/nim/session.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA2B;AAC3B,iDAA4C;AAoC5C,MAAa,UAAW,SAAQ,4BAA8B;IAE1D;QACI,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,OAAO,GAAG,IAAI,gBAAG,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACrE,CAAC;IAED,aAAa;IACb,iBAAiB;QACb,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAA;IAC3C,CAAC;IAED;;;;;;;OAOG;IACH,wBAAwB,CAAC,EAAoC;QACzD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACtD,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;iBACtB;gBACD,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;YAC9B,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;;;;;;OAUG;IACH,oBAAoB,CAAC,UAAkB,EAAE,OAAe,EAAE,GAAW,EAAE,EAAgC;QACnG,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC5E,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;iBACtB;gBACD,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;YAC9B,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;;;;;;OAUG;IACH,uBAAuB,CAAC,UAAkB,EAAE,OAAe,EAAE,GAAW,EAAE,EAAiC;QACvG,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC/E,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;iBACtB;gBACD,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;YAC9B,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;;;;;OASG;IACH,uBAAuB,CAAC,UAAkB,EAAE,OAAe,EAAE,EAAmC;QAC5F,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE;gBAC5F,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;iBACxC;gBACD,OAAO,CAAC,CAAC,OAAO,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC,CAAA;YAChD,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;OAKG;IACH,wBAAwB,CAAC,KAAa,EAAE,EAA4B,EAAE,aAAqB;QACvF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,wBAAwB,CACjC,KAAK,EACL,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAChB,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;iBACtB;gBACD,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;YAC9B,CAAC,EACD,aAAa,CAChB,CAAA;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;OAKG;IACH,0BAA0B,CACtB,sBAA6C,EAC7C,EAA4B,EAC5B,aAAqB;QAErB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,0BAA0B,CACnC,sBAAsB,EACtB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAChB,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;iBACtB;gBACD,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;YAC9B,CAAC,EACD,aAAa,CAChB,CAAA;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;;;;;;OAUG;IACH,mBAAmB,CAAC,IAAoB,EAAE,EAAU,EAAE,EAAyB,EAAE,cAAuB;QACpG,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAC5B,IAAI,EACJ,EAAE,EACF,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE;gBAC7B,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;iBACnC;gBACD,OAAO,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,CAAA;YAC3C,CAAC,EACD,cAAc,CACjB,CAAA;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;;;;OAQG;IACH,sBAAsB,CAAC,EAAyB,EAAE,aAAqB;QACnE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE;gBACjE,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;iBACnC;gBACD,OAAO,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,CAAA;YAC3C,CAAC,EAAE,aAAa,CAAC,CAAA;QACrB,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;;;;;;OAUG;IACH,2BAA2B,CACvB,OAAe,EACf,UAAkB,EAClB,EAAuC,EACvC,GAAW;QAEX,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,2BAA2B,CACpC,OAAO,EACP,UAAU,EACV,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE;gBAC7B,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;iBACnC;gBACD,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,CAAA;YAC3C,CAAC,EACD,GAAG,CACN,CAAA;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;;;;;;OAUG;IACH,uBAAuB,CACnB,IAAoB,EACpB,EAAU,EACV,EAAyB,EACzB,aAAqB;QAErB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IACI,CAAC,IAAI,CAAC,OAAO,CAAC,uBAAuB,CACjC,IAAI,EACJ,EAAE,EACF,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE;gBAC7B,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;iBACnC;gBACD,OAAO,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,CAAA;YAC3C,CAAC,EACD,aAAa,CAChB,EACH;gBACE,OAAO,CAAC,IAAI,CAAC,CAAA;aAChB;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;;;;;OASG;IACH,4BAA4B,CACxB,aAAsB,EACtB,SAA0C,EAC1C,EAAwC;QAExC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IACI,CAAC,IAAI,CAAC,OAAO,CAAC,4BAA4B,CAAC,aAAa,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE;gBACtG,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,YAAY,CAAC,CAAA;iBACvC;gBACD,OAAO,CAAC,CAAC,OAAO,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC,CAAA;YAC/C,CAAC,CAAC,EACJ;gBACE,OAAO,CAAC,IAAI,CAAC,CAAA;aAChB;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;;;;;;;OAWG;IACH,aAAa,CACT,IAAoB,EACpB,EAAU,EACV,GAAY,EACZ,EAAyB,EACzB,aAAqB;QAErB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IACI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CACvB,IAAI,EACJ,EAAE,EACF,GAAG,EACH,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE;gBAC7B,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;iBACnC;gBACD,OAAO,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,CAAA;YAC3C,CAAC,EACD,aAAa,CAChB,EACH;gBACE,OAAO,CAAC,IAAI,CAAC,CAAA;aAChB;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;;;;;;;OAWG;IACH,oBAAoB,CAChB,IAAoB,EACpB,EAAU,EACV,IAAY,EACZ,EAAyB,EACzB,aAAqB;QAErB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IACI,CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAC9B,IAAI,EACJ,EAAE,EACF,IAAI,EACJ,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE;gBAC7B,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;iBACnC;gBACD,OAAO,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,CAAA;YAC3C,CAAC,EACD,aAAa,CAChB,EACH;gBACE,OAAO,CAAC,IAAI,CAAC,CAAA;aAChB;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;;;;OAQG;IACH,0BAA0B,CAAC,EAAyB,EAAE,aAAqB;QACvE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IACI,CAAC,IAAI,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE;gBACtE,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;iBACnC;gBACD,OAAO,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,CAAA;YAC3C,CAAC,EAAE,aAAa,CAAC,EACnB;gBACE,OAAO,CAAC,IAAI,CAAC,CAAA;aAChB;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;;;;;;OAUG;IACH,oBAAoB,CAAC,IAAoB,EAAE,EAAU,EAAE,EAA4B,EAAE,aAAqB;QACtG,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAC7B,IAAI,EACJ,EAAE,EACF,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE;gBACtB,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;iBAC5B;gBACD,OAAO,CAAC,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAA;YACpC,CAAC,EACD,aAAa,CAChB,CAAA;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;;;;;OASG;IACH,mBAAmB,CAAC,UAAkB,EAAE,OAAe,EAAE,EAA+B;QACpF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;gBACpE,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;iBACpB;gBACD,OAAO,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAA;YAC5B,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;OAGG;IACH,sBAAsB,CAAC,EAAkC;QACrD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;gBACnD,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;iBACrB;gBACD,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;YAC7B,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;OAIG;IACH,oBAAoB,CAAC,GAAc,EAAE,EAAgC;QACjE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE;gBAC/C,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,CAAC,CAAA;iBACd;gBACD,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;YACtB,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;OAKG;IACH,oBAAoB,CAAC,UAAkB,EAAE,OAAuB,EAAE,EAAgC;QAC9F,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE;gBAC/D,IAAI,EAAE,EAAE;oBACJ,EAAE,CAAC,OAAO,CAAC,CAAA;iBACd;gBACD,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;YACtB,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AAneD,gCAmeC"}

package/{js/api → dist/nim}/subscribe_event.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NIMSubscribeEvent = void 0;
 const loader_1 = __importDefault(require("../loader"));
-const events_1 = __importDefault(require("events"));
-class NIMSubscribeEvent extends events_1.default.EventEmitter {
+const eventemitter3_1 = require("eventemitter3");
+class NIMSubscribeEvent extends eventemitter3_1.EventEmitter {
     constructor() {
         super();
         this.subscribeEvent = new loader_1.default.NIMSubscribeEvent({ emit: this.emit.bind(this) });
@@ -19,7 +19,7 @@ class NIMSubscribeEvent extends events_1.default.EventEmitter {
      * @param event_data	事件
      * @param cb			发布事件回调函数
      * @param jsonExtension json扩展参数（备用，目前不需要）
-     * @return bool 检查参数如果不符合要求则返回失败
+     * @return boolean 检查参数如果不符合要求则返回失败
      * @note
      * <pre>
      * 200:成功
@@ -30,7 +30,14 @@ class NIMSubscribeEvent extends events_1.default.EventEmitter {
      * </pre>
      */
     publish(data, cb, jsonExtension) {
-        return this.subscribeEvent.Publish(data, cb, jsonExtension);
+        return new Promise((resolve) => {
+            this.subscribeEvent.Publish(data, (rescode, eventType, data) => {
+                if (cb) {
+                    cb(rescode, eventType, data);
+                }
+                resolve([rescode, eventType, data]);
+            }, jsonExtension);
+        });
     }
     /** 订阅事件
      * @param event_type		事件类型
@@ -39,7 +46,7 @@ class NIMSubscribeEvent extends events_1.default.EventEmitter {
      * @param accid_list		要订阅的用户列表
      * @param cb				订阅事件回调函数
      * @param jsonExtension json扩展参数（备用，目前不需要）
-     * @return bool 检查参数如果不符合要求则返回失败
+     * @return boolean 检查参数如果不符合要求则返回失败
      * @note
      * <pre>
      * 200:成功
@@ -48,14 +55,23 @@ class NIMSubscribeEvent extends events_1.default.EventEmitter {
      * </pre>
      */
     subscribe(eventType, ttl, syncType, accids, cb, jsonExtension) {
-        return this.subscribeEvent.Subscribe(eventType, ttl, syncType, accids, cb, jsonExtension);
+        return new Promise((resolve) => {
+            if (!this.subscribeEvent.Subscribe(eventType, ttl, syncType, accids, (rescode, eventType, failedList) => {
+                if (cb) {
+                    cb(rescode, eventType, failedList);
+                }
+                resolve([rescode, eventType, failedList]);
+            }, jsonExtension)) {
+                resolve(null);
+            }
+        });
     }
     /** 按账号取消指定事件的订阅关系
      * @param event_type		事件类型
      * @param accid_list		要取消订阅的用户列表
      * @param cb				取消订阅事件回调函数
      * @param jsonExtension json扩展参数（备用，目前不需要）
-     * @return bool 检查参数如果不符合要求则返回失败
+     * @return boolean 检查参数如果不符合要求则返回失败
      * @note
      * <pre>
      * 200:成功
@@ -64,13 +80,22 @@ class NIMSubscribeEvent extends events_1.default.EventEmitter {
      * </pre>
      */
     unSubscribe(eventType, accids, cb, jsonExtension) {
-        return this.subscribeEvent.UnSubscribe(eventType, accids, cb, jsonExtension);
+        return new Promise((resolve) => {
+            if (!this.subscribeEvent.UnSubscribe(eventType, accids, (rescode, eventType, failedList) => {
+                if (cb) {
+                    cb(rescode, eventType, failedList);
+                }
+                resolve([rescode, eventType, failedList]);
+            }, jsonExtension)) {
+                resolve(null);
+            }
+        });
     }
     /** 取消指定事件的全部订阅关系
      * @param event_type		事件类型
      * @param cb				取消订阅事件回调函数
      * @param jsonExtension json扩展参数（备用，目前不需要）
-     * @return bool 检查参数如果不符合要求则返回失败
+     * @return boolean 检查参数如果不符合要求则返回失败
      * @note
      * <pre>
      * 200:成功
@@ -79,14 +104,23 @@ class NIMSubscribeEvent extends events_1.default.EventEmitter {
      * </pre>
      */
     batchUnSubscribe(eventType, cb, jsonExtension) {
-        return this.subscribeEvent.BatchUnSubscribe(eventType, cb, jsonExtension);
+        return new Promise((resolve) => {
+            if (!this.subscribeEvent.BatchUnSubscribe(eventType, (rescode, eventType) => {
+                if (cb) {
+                    cb(rescode, eventType);
+                }
+                resolve([rescode, eventType]);
+            }, jsonExtension)) {
+                resolve(null);
+            }
+        });
     }
     /** 按账号查询指定事件订阅关系
      * @param event_type		事件类型
      * @param accid_list		要查询订阅关系的用户列表
      * @param cb				查询订阅关系回调函数
      * @param jsonExtension json扩展参数（备用，目前不需要）
-     * @return bool 检查参数如果不符合要求则返回失败
+     * @return boolean 检查参数如果不符合要求则返回失败
      * @note
      * <pre>
      * 200:成功
@@ -95,7 +129,14 @@ class NIMSubscribeEvent extends events_1.default.EventEmitter {
      * </pre>
      */
     querySubscribe(eventType, accids, cb, jsonExtension) {
-        return this.subscribeEvent.QuerySubscribe(eventType, accids, cb, jsonExtension);
+        return new Promise((resolve) => {
+            this.subscribeEvent.QuerySubscribe(eventType, accids, (rescode, eventType, datas) => {
+                if (cb) {
+                    cb(rescode, eventType, datas);
+                }
+                resolve([rescode, eventType, datas]);
+            }, jsonExtension);
+        });
     }
 }
 exports.NIMSubscribeEvent = NIMSubscribeEvent;

package/dist/nim/subscribe_event.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"subscribe_event.js","sourceRoot":"","sources":["../../ts/nim/subscribe_event.ts"],"names":[],"mappings":"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"}