update：修正部分接口

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@bilingo.com/cts",
-  "version": "1.0.0",
+  "version": "1.0.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -225,9 +225,9 @@
       }
     },
     "@bilingo.com/ts-linker-sdk": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@bilingo.com/ts-linker-sdk/-/ts-linker-sdk-1.0.0.tgz",
-      "integrity": "sha512-7nCK6/z1elrLWeqgaBngZBoZhvbKmA5+FytSygoNscwbO/YybdhZVN+HtTiWV3AvaHxpE1Bl4YvZmwKmmcACGA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@bilingo.com/ts-linker-sdk/-/ts-linker-sdk-1.0.4.tgz",
+      "integrity": "sha512-XGVcszklmz65lIXb3F9v8yy618sp1Fn3a8s4k7eA5hrNqcyZriTvr0Ei+UzTSPtV8F+4SDAyV/snvHAkuW4Q3A==",
       "requires": {
         "crypto-js": "^3.1.9-1",
         "eventemitter3": "^4.0.0",
@@ -4443,8 +4443,8 @@
     },
     "crypto-js": {
       "version": "3.3.0",
-      "resolved": "https://registry.nlark.com/crypto-js/download/crypto-js-3.3.0.tgz?cache=0&sync_timestamp=1626954954639&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcrypto-js%2Fdownload%2Fcrypto-js-3.3.0.tgz",
-      "integrity": "sha1-hG3RzOL2iqz6FWyFePkmpgm3l2s="
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
+      "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
     },
     "crypto-random-string": {
       "version": "1.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bilingo.com/cts",
-  "version": "1.0.4",
+  "version": "1.0.9",
   "description": "cts, chat-ts-sdk",
   "repository": {
     "type": "git",
@@ -90,7 +90,7 @@
     "workerize-loader": "^1.0.4"
   },
   "dependencies": {
-    "@bilingo.com/ts-linker-sdk": "^1.0.3",
+    "@bilingo.com/ts-linker-sdk": "^1.0.4",
     "@types/uuid": "^8.3.1",
     "uuid": "^8.3.2"
   }

packages/cts-api/dist/cjs/WebSocketClient.js

@@ -121,7 +121,7 @@ var WebSocketClient = (function () {
                             onClose: function () {
                                 clearInterval(_this.interval);
                             }
-                        }, binaryType);
+                        }, binaryType, true);
                     })];
             });
         });
@@ -156,7 +156,7 @@ var WebSocketClient = (function () {
                         if (this.extendOpts && this.extendOpts.connectOptions) {
                             param = __assign({}, param, this.extendOpts.connectOptions);
                         }
-                        return [4, this.request('/v1/session/start', __assign({}, this.chatToken, meta))];
+                        return [4, this.request('/v1/session/start', __assign({}, param))];
                     case 1:
                         data = _a.sent();
                         if (data && data.value) {
@@ -247,7 +247,7 @@ var WebSocketClient = (function () {
     WebSocketClient.prototype.getAllContact = function (data) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2, this.request('/v1/get/all/contact', data)];
+                return [2, this.request('/v1/users/friends', data)];
             });
         });
     };
@@ -426,6 +426,13 @@ var WebSocketClient = (function () {
             });
         });
     };
+    WebSocketClient.prototype.setConversationIsTop = function (data) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2, this.request('/v1/set/conversation/is/top/request', data)];
+            });
+        });
+    };
     WebSocketClient.prototype.searchHistoryMessage = function (data) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -433,6 +440,13 @@ var WebSocketClient = (function () {
             });
         });
     };
+    WebSocketClient.prototype.startGroupChat = function (data) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2, this.request('/v1/create/group/request', data)];
+            });
+        });
+    };
     return WebSocketClient;
 }());
 exports.WebSocketClient = WebSocketClient;

packages/cts-api/dist/cjs/api/WsApi.js

@@ -124,9 +124,10 @@ var WsApi = (function (_super) {
             delete_message: deleteMessage
         });
     };
-    WsApi.prototype.markMessageRead = function (contactId) {
+    WsApi.prototype.markMessageRead = function (contactId, chatType) {
         return this.request('/v1/mark/messages/read', {
-            contact: contactId
+            contact: contactId,
+            msg_type: chatType,
         });
     };
     WsApi.prototype.listGroups = function () {

packages/cts-api/dist/types/WebSocketClient.d.ts

@@ -1,5 +1,5 @@
 import { Client } from '@bilingo.com/ts-linker-sdk';
-import { ContactMsg, ContactAddMsg, ChatroomMsg } from './messages';
+import { ContactMsg, ContactAddMsg, ChatroomMsg, ConversationTop } from './messages';
 export interface WebSocketClientStatus {
     created: boolean;
     connected: boolean;
@@ -24,73 +24,85 @@ export declare class WebSocketClient {
     create(): Promise<{}>;
     on(url: string, callback: (data: WebSocketResp) => void): void;
     off(url: string): void;
-    request(url: string, data: object): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    connect(): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    ping(): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    authentication(): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
+    request(url: string, data: object): Promise<any>;
+    connect(): Promise<any>;
+    ping(): Promise<any>;
+    authentication(): Promise<any>;
     onMessage(callback: ListenerCallback): Promise<void>;
-    sendMessage(data: object): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
+    sendMessage(data: object): Promise<any>;
     markServiced(data: {
         msg_id: string;
-    }): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
+    }): Promise<any>;
     messageReaded(data: {
         msg_id: string;
-    }): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
+    }): Promise<any>;
     getHistoryMessage(data: {
         contact_id: string;
         chat_type: string;
         start_time: number;
         limit: number;
-    }): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
+    }): Promise<any>;
     updateStatus(data: {
         status: 'on' | 'off' | 'busy';
-    }): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    getSessionLists(): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
+    }): Promise<any>;
+    getSessionLists(): Promise<any>;
     getAllConversations(data: {
         last_pull: number;
-    }): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
+    }): Promise<any>;
     getAllContact(data: {
-        last_pull: number;
-    }): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
+        page: number;
+        limit: number;
+    }): Promise<any>;
     addContact(data: {
         to_add_username: string;
         reason: string;
-    }): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    deleteContact(data: ContactMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    maskingContact(data: ContactMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    removeMaskingContact(data: ContactMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    stickingContact(data: ContactMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    removeStickContact(data: ContactMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    setNoDisturbing(data: ContactMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    removeNoDisturbing(data: ContactMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    agreeAddContact(data: ContactAddMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    rejectAddContact(data: ContactAddMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    addContactServiced(data: ContactAddMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
+    }): Promise<any>;
+    deleteContact(data: ContactMsg): Promise<any>;
+    maskingContact(data: ContactMsg): Promise<any>;
+    removeMaskingContact(data: ContactMsg): Promise<any>;
+    stickingContact(data: ContactMsg): Promise<any>;
+    removeStickContact(data: ContactMsg): Promise<any>;
+    setNoDisturbing(data: ContactMsg): Promise<any>;
+    removeNoDisturbing(data: ContactMsg): Promise<any>;
+    agreeAddContact(data: ContactAddMsg): Promise<any>;
+    rejectAddContact(data: ContactAddMsg): Promise<any>;
+    addContactServiced(data: ContactAddMsg): Promise<any>;
     createChatroom(data: {
         subject: string;
         description: string;
         welcome_message: string;
         max: number;
-    }): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    destroyChatroom(data: ChatroomMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    leaveChatroom(data: ChatroomMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    getChatroomProfile(data: ChatroomMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    updateChatroomSubject(data: ChatroomMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    updateChatroomDescription(data: ChatroomMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    addChatroomAdmin(data: ChatroomMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    removeChatroomAdmin(data: ChatroomMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    addChatroomAdmins(data: ChatroomMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    removeChatroomAdmins(data: ChatroomMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    joinChatroom(data: {}): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    removeChatroomMember(data: ChatroomMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
+    }): Promise<any>;
+    destroyChatroom(data: ChatroomMsg): Promise<any>;
+    leaveChatroom(data: ChatroomMsg): Promise<any>;
+    getChatroomProfile(data: ChatroomMsg): Promise<any>;
+    updateChatroomSubject(data: ChatroomMsg): Promise<any>;
+    updateChatroomDescription(data: ChatroomMsg): Promise<any>;
+    addChatroomAdmin(data: ChatroomMsg): Promise<any>;
+    removeChatroomAdmin(data: ChatroomMsg): Promise<any>;
+    addChatroomAdmins(data: ChatroomMsg): Promise<any>;
+    removeChatroomAdmins(data: ChatroomMsg): Promise<any>;
+    joinChatroom(data: {}): Promise<any>;
+    removeChatroomMember(data: ChatroomMsg): Promise<any>;
     fetchStickChatroom(data: {
         cache_time: number;
-    }): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    fetchChatroomMembers(data: ChatroomMsg): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
+    }): Promise<any>;
+    fetchChatroomMembers(data: ChatroomMsg): Promise<any>;
+    setConversationIsTop(data: ConversationTop): Promise<any>;
     searchHistoryMessage(data: {
         contact_id: string;
         chat_type: string;
         keyword: string;
         limit: number;
-    }): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
+    }): Promise<any>;
+    startGroupChat(data: {
+        subject: string;
+        description?: string;
+        contact_list: {
+            id: string;
+            source: string;
+        }[];
+        welcome_message?: string;
+        group_type: number;
+    }): Promise<any>;
 }

packages/cts-api/dist/types/api/WsApi.d.ts

@@ -3,31 +3,31 @@ import { MsgBase, GroupOption } from '../protocol/MsgBase';
 export declare class WsApi extends WebSocketClient {
     token: string;
     from: string;
-    sendMsg(msg: Partial<MsgBase>): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    sendGetCmdMsg(action: string, extra?: {}): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    sendPostCmdMsg(action: string, userIds: string[] | null, extra?: {}): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    getRoster(): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    addFriends(userIds: string[]): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    agreeFriends(userIds: string[]): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    rejectFriends(userIds: string[]): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    removeFriends(userIds: string[]): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    getBlacklist(): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    addToBlackList(userIds: string[]): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    removeBlackList(userIds: string[]): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    deleteConversation(contactId: string, deleteMessage?: boolean): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    markMessageRead(contactId: string): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    listGroups(): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    queryGroupInfo(roomId: string): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    queryRoomMember(roomId: string): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    getGroupBlackList(roomId: string): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    createGroup(groupOption: GroupOption): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    changeGroupInfo(groupOption: GroupOption): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    addGroupMembers(roomId: string, userIds: string[]): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    addToGroupBlackList(roomId: string, userIds: string[]): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    destroyGroup(roomId: string): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    leaveGroup(roomId: string): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    createRoom(groupOption: GroupOption): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    listRooms(): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    joinRoom(roomId: string): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
-    quitRoom(roomId: string): Promise<import("@bilingo.com/ts-linker-sdk/dist/types/types").WebSocketResp>;
+    sendMsg(msg: Partial<MsgBase>): Promise<any>;
+    sendGetCmdMsg(action: string, extra?: {}): Promise<any>;
+    sendPostCmdMsg(action: string, userIds: string[] | null, extra?: {}): Promise<any>;
+    getRoster(): Promise<any>;
+    addFriends(userIds: string[]): Promise<any>;
+    agreeFriends(userIds: string[]): Promise<any>;
+    rejectFriends(userIds: string[]): Promise<any>;
+    removeFriends(userIds: string[]): Promise<any>;
+    getBlacklist(): Promise<any>;
+    addToBlackList(userIds: string[]): Promise<any>;
+    removeBlackList(userIds: string[]): Promise<any>;
+    deleteConversation(contactId: string, deleteMessage?: boolean): Promise<any>;
+    markMessageRead(contactId: string, chatType: string): Promise<any>;
+    listGroups(): Promise<any>;
+    queryGroupInfo(roomId: string): Promise<any>;
+    queryRoomMember(roomId: string): Promise<any>;
+    getGroupBlackList(roomId: string): Promise<any>;
+    createGroup(groupOption: GroupOption): Promise<any>;
+    changeGroupInfo(groupOption: GroupOption): Promise<any>;
+    addGroupMembers(roomId: string, userIds: string[]): Promise<any>;
+    addToGroupBlackList(roomId: string, userIds: string[]): Promise<any>;
+    destroyGroup(roomId: string): Promise<any>;
+    leaveGroup(roomId: string): Promise<any>;
+    createRoom(groupOption: GroupOption): Promise<any>;
+    listRooms(): Promise<any>;
+    joinRoom(roomId: string): Promise<any>;
+    quitRoom(roomId: string): Promise<any>;
 }

packages/cts-api/dist/types/messages.d.ts

@@ -26,3 +26,8 @@ export interface ChatMsg {
     msg_id?: string;
     ext?: Record<string, string>;
 }
+export interface ConversationTop {
+    to: string;
+    is_top: boolean;
+    type: string;
+}

packages/cts-api/package.json

@@ -35,7 +35,7 @@
     "start": "npm run dev"
   },
   "dependencies": {
-    "@bilingo.com/ts-linker-sdk": "^1.0.0",
+    "@bilingo.com/ts-linker-sdk": "^1.0.4",
     "@types/uuid": "^8.3.1",
     "uuid": "^8.3.2"
   },

packages/cts-api/src/WebSocketClient.ts

@@ -1,6 +1,6 @@
 import { Client } from '@bilingo.com/ts-linker-sdk';
 
-import { ContactMsg, ContactAddMsg, ChatroomMsg } from './messages';
+import { ContactMsg, ContactAddMsg, ChatroomMsg, ConversationTop } from './messages';
 import { getMetaData } from './meta';
 
 export interface WebSocketClientStatus {
@@ -84,7 +84,7 @@ export class WebSocketClient {
         onClose: () => {
           clearInterval(this.interval);
         }
-      }, binaryType as BinaryType);
+      }, binaryType as BinaryType, true);
     });
   }
 
@@ -122,8 +122,7 @@ export class WebSocketClient {
     }
 
     const data = await this.request('/v1/session/start', {
-      ...this.chatToken,
-      ...meta
+      ...param,
     });
 
     if (data && data.value) {
@@ -191,9 +190,10 @@ export class WebSocketClient {
 
   /** 获取联系人列表 */
   async getAllContact(data: {
-    last_pull: number; // 最后一次获取的时间 0的话是全量获取
+    page: number;
+    limit: number;
   }) {
-    return this.request('/v1/get/all/contact', data);
+    return this.request('/v1/users/friends', data);
   }
 
   /** 添加联系人 */
@@ -326,6 +326,11 @@ export class WebSocketClient {
     return this.request('/v1/fetch/chatroom/members', data);
   }
 
+  /** 置顶/取消置顶会话消息 */
+  async setConversationIsTop(data: ConversationTop) {
+    return this.request('/v1/set/conversation/is/top/request', data);
+  }
+
   /** 搜索聊天室历史消息 */
   async searchHistoryMessage(data: {
     contact_id: string;
@@ -335,4 +340,18 @@ export class WebSocketClient {
   }) {
     return this.request('/v1/search/history/message', data);
   }
+
+  /** 发起群聊 */
+  async startGroupChat(data: {
+    subject: string,
+    description?: string,
+    contact_list: {
+      id: string,
+      source: string,
+    }[],
+    welcome_message?: string,
+    group_type: number,
+  }) {
+    return this.request('/v1/create/group/request', data)
+  }
 }

packages/cts-api/src/api/WsApi.ts

@@ -84,9 +84,10 @@ export class WsApi extends WebSocketClient {
   }
 
   // 标记会话消息为已读
-  markMessageRead(contactId: string) {
+  markMessageRead(contactId: string, chatType: string) {
     return this.request('/v1/mark/messages/read', {
-      contact: contactId
+      contact: contactId,
+      msg_type: chatType,
     });
   }
   /** @end 会话管理 */

packages/cts-api/src/messages.ts

@@ -37,3 +37,9 @@ export interface ChatMsg {
   msg_id?: string;
   ext?: Record<string, string>;
 }
+
+export interface ConversationTop {
+  to: string; // 会话id
+  is_top: boolean; // 是否置顶
+  type: string; // 会话类型 群、聊天室、个人、推送消息
+}