Skip to content

Commit 48cfe0b

Browse files
nmgwddjnmgwddj
committed
chore: bump version 10.9.60
Signed-off-by: Dylan <2894220@gmail.com>
1 parent f0c4e0f commit 48cfe0b

11 files changed

+210
-8
lines changed

‎node-nim-tester.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,9 @@ program
142142
deviceId: options.deviceId,
143143
taskId: options.taskId,
144144
targets: {
145-
NIM: nimInstance
145+
NIM: nimInstance,
146+
fs,
147+
os
146148
},
147149
oncompleted: () => {
148150
// 执行完成后退出进程

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "node-nim",
3-
"version": "10.9.53",
3+
"version": "10.9.60",
44
"description": "NetEase IM nodejs wrapper based on NetEase IM C++ SDK",
55
"main": "dist/node-nim.js",
66
"bin": {

‎src/v2/v2_node_nim_friend_service.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Napi::Object node_nim::V2NodeNIMFriendService::Init(Napi::Env env, Napi::Object
1919
RegApi("setAddApplicationReadEx", &V2NIMFriendService::setAddApplicationReadEx),
2020
RegApi("searchFriendByOption", &V2NIMFriendService::searchFriendByOption),
2121
RegApi("clearAllAddApplication", &V2NIMFriendService::clearAllAddApplication),
22+
RegApi("clearAllAddApplicationEx", &V2NIMFriendService::clearAllAddApplicationEx),
2223
RegApi("deleteAddApplication", &V2NIMFriendService::deleteAddApplication),
2324
});
2425
// clang-format on

‎src/v2/v2_node_nim_statistics_service.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#include "v2_nim_api.hpp"
33

44
namespace node_nim {
5-
65
Napi::Object V2NodeNIMStatisticsService::Init(Napi::Env env, Napi::Object exports) {
76
// clang-format off
87
return InternalInit("V2NIMStatisticsService", env, exports,{
@@ -29,7 +28,8 @@ V2NodeNIMStatisticsService::~V2NodeNIMStatisticsService() {
2928
void V2NodeNIMStatisticsService::initEventHandler() {
3029
auto& service = v2::V2NIMClient::get().getStatisticsService();
3130
listener_.onDatabaseException = MakeNotifyCallback<nstd::function<void(const V2NIMError& error)>>("databaseException");
31+
listener_.onLbsSingleRequestRecord = MakeNotifyCallback<nstd::function<void(const std::string& content)>>("lbsSingleRequestRecord");
32+
listener_.onConnectRecord = MakeNotifyCallback<nstd::function<void(const V2NIMConnectionInfo& connectionInfo)>>("connectRecord");
3233
service.addStatisticsListener(listener_);
3334
}
34-
3535
} // namespace node_nim

‎src/v2/v2_node_nim_team_service.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Napi::Object node_nim::V2NodeNIMTeamService::Init(Napi::Env env, Napi::Object ex
99
RegApi("leaveTeam", &V2NIMTeamService::leaveTeam),
1010
RegApi("getTeamInfo", &V2NIMTeamService::getTeamInfo),
1111
RegApi("getTeamInfoByIds", &V2NIMTeamService::getTeamInfoByIds),
12+
RegApi("getTeamInfoFromCloud", &V2NIMTeamService::getTeamInfoFromCloud),
1213
RegApi("dismissTeam", &V2NIMTeamService::dismissTeam),
1314
RegApi("inviteMember", &V2NIMTeamService::inviteMember),
1415
RegApi("inviteMemberEx", &V2NIMTeamService::inviteMemberEx),
@@ -27,6 +28,8 @@ Napi::Object node_nim::V2NodeNIMTeamService::Init(Napi::Env env, Napi::Object ex
2728
RegApi("setTeamMemberChatBannedStatus", &V2NIMTeamService::setTeamMemberChatBannedStatus),
2829
RegApi("getJoinedTeamList", &V2NIMTeamService::getJoinedTeamList),
2930
RegApi("getJoinedTeamCount", &V2NIMTeamService::getJoinedTeamCount),
31+
RegApi("getOwnerTeamList", &V2NIMTeamService::getOwnerTeamList),
32+
RegApi("getManagerTeamList", &V2NIMTeamService::getManagerTeamList),
3033
RegApi("getTeamMemberList", &V2NIMTeamService::getTeamMemberList),
3134
RegApi("getTeamMemberListByIds", &V2NIMTeamService::getTeamMemberListByIds),
3235
RegApi("getTeamMemberInvitor", &V2NIMTeamService::getTeamMemberInvitor),

‎ts/node-nim.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ export * from './qchat_def/attachment_def'
105105
export * from './qchat_def/role_def'
106106
export * from './v2_def/v2_nim_enum_def'
107107

108+
export * as V2NIMConst from './v2_def/v2_nim_enum_def'
109+
108110
export class NIM {
109111
/** 客户端模块 */
110112
client: NIMClient = new NIMClient()

‎ts/v2/v2_nim_friend_service.ts‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
V2NIMFriendDeleteParams,
99
V2NIMFriendSearchOption,
1010
V2NIMFriendSetParams,
11+
V2NIMFriendClearAddApplicationOption
1112
} from 'ts/v2_def/v2_nim_struct_def'
1213
import sdk from '../loader'
1314
import { EventEmitter } from 'eventemitter3'
@@ -372,6 +373,32 @@ export class V2NIMFriendService extends EventEmitter<V2NIMFriendListener> {
372373
})
373374
}
374375

376+
/**
377+
* @brief 清空所有添加好友申请（高级接口，可指定清理类型）
378+
* @returns Promise<void>
379+
* @since v10.9.60
380+
* @example
381+
* ```javascript
382+
* await v2.friendService.clearAllAddApplicationEx({
383+
* type: 1
384+
* })
385+
* ```
386+
* @param option
387+
*/
388+
clearAllAddApplicationEx (option: V2NIMFriendClearAddApplicationOption): Promise<void> {
389+
return new Promise((resolve, reject) => {
390+
this.instance.clearAllAddApplicationEx(
391+
option,
392+
() => {
393+
resolve()
394+
},
395+
(error: V2NIMError) => {
396+
reject(error)
397+
}
398+
)
399+
})
400+
}
401+
375402
/**
376403
* @brief 删除添加好友申请
377404
* @param application 添加好友申请

‎ts/v2/v2_nim_statistics_service.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import {
22
V2NIMDatabaseInfo,
3+
V2NIMConnectionInfo,
34
V2NIMError,
45
} from 'ts/v2_def/v2_nim_struct_def'
56
import { EventEmitter } from 'eventemitter3'
@@ -8,6 +9,10 @@ import sdk from '../loader'
89
export declare interface V2NIMStatisticsListener {
910
/** 数据库异常 */
1011
databaseException: [V2NIMError]
12+
/** 请求 LBS 的记录 @since v10.9.60 */
13+
lbsSingleRequestRecord: [string]
14+
/** 建立长连接结果记录 @since v10.9.60 */
15+
connectRecord: [V2NIMConnectionInfo]
1116
}
1217

1318
export class V2NIMStatisticsService extends EventEmitter<V2NIMStatisticsListener> {

‎ts/v2/v2_nim_team_service.ts‎

Lines changed: 75 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,32 @@ export class V2NIMTeamService extends EventEmitter<V2NIMTeamListener> {
208208
})
209209
}
210210

211+
/**
212+
* @brief 从云端获取群组信息
213+
* @param teamId 群组 id
214+
* @param teamType 群组类型
215+
* @returns Promise<V2NIMTeam>
216+
* @since v10.9.60
217+
* @example
218+
* ```javascript
219+
* const team = await v2.teamService.getTeamInfoFromCloud(teamId, teamType)
220+
* ```
221+
*/
222+
getTeamInfoFromCloud (teamId: string, teamType: V2NIMTeamType): Promise<V2NIMTeam> {
223+
return new Promise((resolve, reject) => {
224+
this.instance.getTeamInfoFromCloud(
225+
teamId,
226+
teamType,
227+
(team: V2NIMTeam) => {
228+
resolve(team)
229+
},
230+
(error: V2NIMError) => {
231+
reject(error)
232+
}
233+
)
234+
})
235+
}
236+
211237
/**
212238
* @brief 解散群组
213239
* @param teamId 群组 id
@@ -646,7 +672,7 @@ export class V2NIMTeamService extends EventEmitter<V2NIMTeamListener> {
646672

647673
/**
648674
* @brief 获取当前已经加入的群组列表
649-
* @param teamType 群组类型
675+
* @param teamTypes 群组类型
650676
* @returns Promise<Array<V2NIMTeam>>
651677
* @example
652678
* ```javascript
@@ -680,6 +706,54 @@ export class V2NIMTeamService extends EventEmitter<V2NIMTeamListener> {
680706
return this.instance.getJoinedTeamCount(teamTypes)
681707
}
682708

709+
/**
710+
* @brief 获取当前自己为群主的群组列表
711+
* @param teamTypes 群组类型
712+
* @returns Promise<Array<V2NIMTeam>>
713+
* @since v10.9.60
714+
* @example
715+
* ```javascript
716+
* const teams = await v2.teamService.getOwnerTeamList(teamTypes)
717+
* ```
718+
*/
719+
getOwnerTeamList (teamTypes: Array<V2NIMTeamType>): Promise<Array<V2NIMTeam>> {
720+
return new Promise((resolve, reject) => {
721+
this.instance.getOwnerTeamList(
722+
teamTypes,
723+
(teams: Array<V2NIMTeam>) => {
724+
resolve(teams)
725+
},
726+
(error: V2NIMError) => {
727+
reject(error)
728+
}
729+
)
730+
})
731+
}
732+
733+
/**
734+
* @brief 获取当前自己为管理员的群组列表（包括自己是群主的群）
735+
* @param teamTypes 群组类型
736+
* @returns Promise<Array<V2NIMTeam>>
737+
* @since v10.9.60
738+
* @example
739+
* ```javascript
740+
* const teams = await v2.teamService.getManagerTeamList(teamTypes)
741+
* ```
742+
*/
743+
getManagerTeamList (teamTypes: Array<V2NIMTeamType>): Promise<Array<V2NIMTeam>> {
744+
return new Promise((resolve, reject) => {
745+
this.instance.getManagerTeamList(
746+
teamTypes,
747+
(teams: Array<V2NIMTeam>) => {
748+
resolve(teams)
749+
},
750+
(error: V2NIMError) => {
751+
reject(error)
752+
}
753+
)
754+
})
755+
}
756+
683757
/**
684758
* @brief 获取群组成员列表
685759
* @param teamId 群组 id

‎ts/v2_def/v2_nim_enum_def.ts‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,3 +1389,35 @@ export enum V2NIMMessageStreamStatus {
13891389
/** 服务器异常终止 */
13901390
V2NIM_MESSAGE_STREAM_STATUS_ABORTED
13911391
}
1392+
1393+
/** @enum 长连接类型 @since v10.9.60 */
1394+
export enum V2NIMConnectionType {
1395+
/** 未知类型 */
1396+
V2NIM_CONNECTION_TYPE_UNKNOWN,
1397+
/** 普通 TCP */
1398+
V2NIM_CONNECTION_TYPE_TCP,
1399+
/** QUIC 协议 */
1400+
V2NIM_CONNECTION_TYPE_QUIC,
1401+
/** WebSocket 协议 */
1402+
V2NIM_CONNECTION_TYPE_WEBSOCKET,
1403+
}
1404+
1405+
/** @enum IP 地址协议族 @since v10.9.60 */
1406+
export enum V2NIMAddressFamily {
1407+
/** 未知类型 */
1408+
V2NIM_ADDRESS_FAMILY_UNKNOWN,
1409+
/** IPv4 类型 */
1410+
V2NIM_ADDRESS_FAMILY_IPV4,
1411+
/** IPv6 类型 */
1412+
V2NIM_ADDRESS_FAMILY_IPV6
1413+
}
1414+
1415+
/** @brief 好友申请查询类型 @since v10.9.60 */
1416+
export enum V2NIMFriendAddApplicationType {
1417+
/** 我发起的好友申请 */
1418+
V2NIM_FRIEND_ADD_APPLICATION_TYPE_FROM_SELF = 1,
1419+
/** 我收到的好友申请 */
1420+
V2NIM_FRIEND_ADD_APPLICATION_TYPE_TO_SELF,
1421+
/** 所有好友申请 */
1422+
V2NIM_FRIEND_ADD_APPLICATION_TYPE_ALL
1423+
}

0 commit comments

Comments
 (0)