@smart-link/im-base 1.0.26 → 1.1.0

package/dist/DBAdapter.d.ts

@@ -7,6 +7,7 @@ declare class DBAdapter {
     getAvatar(id: string): Promise<IAvatar | null>;
     insertAvatar(avatar: IAvatar): Promise<void>;
     updateAvatar(avatar: IAvatar): Promise<void>;
+    putAvatar(avatar: IAvatar): Promise<void>;
     selectAvatar(): Promise<IAvatar[]>;
     cleanConversations(): Promise<void>;
     insertConversation(conversation: Partial<IConversation>): Promise<void>;
@@ -33,7 +34,7 @@ declare class DBAdapter {
     deleteMessageByPK(messageSeq: string): Promise<void>;
     deleteMessageByPKBatch(messageSeqs: string[]): Promise<void>;
     insertMessageEmitting(message: IMessage): Promise<void>;
-    updateMyMessageReadStatus(message: Partial<IMessage>): Promise<void>;
+    updateMyMessageReadStatus(message: Partial<IMessage>): Promise<number>;
     updateMessageEmitting(message: Partial<IMessage>): Promise<void>;
     deleteMessageEmittingByPK(messageSeq: string): Promise<void>;
     deleteMessageEmittingByPKBatch(messageSeqs: string[]): Promise<void>;

package/dist/DBAdapter.js

@@ -16,6 +16,9 @@ class DBAdapter {
     updateAvatar(avatar) {
         return this.storage.updateAvatar(avatar);
     }
+    putAvatar(avatar) {
+        return this.storage.putAvatar(avatar);
+    }
     selectAvatar() {
         return this.storage.selectAvatar();
     }

package/dist/DBAdapter.js.map

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

package/dist/ImManager.d.ts

@@ -26,6 +26,7 @@ export interface IMSocketOptions {
     logout?: () => Promise<void>;
     scrollToLatest: (animated?: boolean) => void;
     scrollTo: (messageSeq: string, animated?: boolean) => void;
+    getCookieString?: () => Promise<string>;
     onDestroyed?: () => void;
 }
 declare class ImManager {
@@ -53,19 +54,20 @@ declare class ImManager {
     toast: IMSocketOptions['toast'];
     scrollToLatest: IMSocketOptions['scrollToLatest'];
     scrollTo: IMSocketOptions['scrollTo'];
+    getCookieString?: IMSocketOptions['getCookieString'];
     onDestroyed?: IMSocketOptions['onDestroyed'];
     logout?: () => Promise<void>;
     _destroyed: boolean;
-    constructor({ db, user, store, storage, lastSyncTime, undoLimitTime, defaultAvatars, platform, t, server, namespace, uploadFile, beforeUpload, download, toast, logout, scrollTo, scrollToLatest, onDestroyed, }: IMSocketOptions);
+    constructor({ db, user, store, storage, lastSyncTime, undoLimitTime, defaultAvatars, platform, t, server, namespace, uploadFile, beforeUpload, download, toast, logout, scrollTo, scrollToLatest, getCookieString, onDestroyed, }: IMSocketOptions);
     init(): Promise<void>;
-    newSocket(): void;
+    newSocket(): Promise<void>;
     bindSocketListener(): void;
     syncMessage(): Promise<void>;
     setNetwork(network: boolean): void;
     getNetwork(): boolean | undefined;
     emit(event: string, data?: {}, retryCount?: number): Promise<any>;
-    emitNoTips(event: string, data?: {}): Promise<unknown> | undefined;
-    disconnect(): void;
+    emitNoTips(event: string, data?: {}): Promise<unknown>;
+    disconnect(): Promise<void>;
     reconnect(): void;
     mulClientLoginKickOut(): Promise<void>;
     cleanSyncFlag(): void;
@@ -76,6 +78,7 @@ declare class ImManager {
     loadResourceFromCache(url: string): Promise<string | undefined>;
     download(options: IDownloadOptions): Promise<string | File>;
     updateAvatar(avatar: IAvatar): Promise<void>;
+    loadAvatars(): Promise<void>;
     loadAvatarFromCache(id: string): Promise<string | undefined>;
     /**
      * 会话操作 ---start
@@ -107,7 +110,7 @@ declare class ImManager {
     sendFileMessage(conversation: IConversation, fileInfo: Partial<IPayload>): Promise<void>;
     sendCollectionMessage(collection: ICollection): void;
     sendContactMessage(conversation: IConversation, contact: IUser): Promise<void>;
-    resendMessage(conversation: IConversation, message: IMessage): Promise<void>;
+    resendMessage(message: IMessage): Promise<void>;
     undoMessage(message: IMessage): Promise<unknown>;
     clearMessages(conversationId: string): Promise<void>;
     /** 收藏操作 */

package/dist/ImManager.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { io } from 'socket.io-client';
-import { ConnectStatus, LAST_SYNC_TIME_KEY } from './constants';
+import { ConnectStatus, LAST_SYNC_TIME_KEY, Platform } from './constants';
 import listener from './socket/listener';
 import { ConversationActions, MessageActions } from './slice';
 import { emitFileMessage, emitPictureMessage, emitTextMessage, emitVideoMessage, emitVoiceMessage, resendMessage, undoMessage, handleSend, emitContactMessage, } from './socket/emitter-message';
@@ -18,10 +18,13 @@ import { createUrl } from './utils/url';
 import { loadCollections } from './slice/collection/collection.action';
 import { CollectionActions } from './slice';
 import { cloneDeep } from "lodash";
+import { queryUserByIds } from "./api";
+import SyncLock from "./utils/carousel-lock";
+import avatarSubscribe from "./utils/avatar-subscribe";
 const emitRetryCount = 5;
 const emitRetryTimeout = 5000;
 class ImManager {
-    constructor({ db, user, store, storage, lastSyncTime, undoLimitTime, defaultAvatars, platform, t, server, namespace, uploadFile, beforeUpload, download, toast, logout, scrollTo, scrollToLatest, onDestroyed, }) {
+    constructor({ db, user, store, storage, lastSyncTime, undoLimitTime, defaultAvatars, platform, t, server, namespace, uploadFile, beforeUpload, download, toast, logout, scrollTo, scrollToLatest, getCookieString, onDestroyed, }) {
         this.network = true; // 是否有网
         this.syncQueries = [];
         // userId => fileId
@@ -50,7 +53,8 @@ class ImManager {
         this.logout = logout;
         this.scrollTo = scrollTo;
         this.scrollToLatest = scrollToLatest;
-        createRequest(this.server);
+        this.getCookieString = getCookieString;
+        createRequest(this.server, getCookieString);
         this.onDestroyed = onDestroyed;
         this.initResource();
     }
@@ -68,7 +72,7 @@ class ImManager {
                 }
                 this.store.dispatch(ConversationActions.loadConversations(this));
                 this.syncQueries = yield buildSyncQueries(this);
-                this.newSocket();
+                yield this.newSocket();
                 this.bindSocketListener();
             }
             catch (e) {
@@ -78,27 +82,30 @@ class ImManager {
         });
     }
     newSocket() {
-        const url = createUrl(this.server + this.namespace, {
-            client_type: this.platform,
-        });
-        this.socket = io(url, {
-            withCredentials: true,
-            forceNew: true,
-            reconnection: true,
-            rememberUpgrade: true,
+        return __awaiter(this, void 0, void 0, function* () {
+            const url = createUrl(this.server + this.namespace, {
+                client_type: this.platform,
+            });
+            const extraHeaders = {};
+            if (this.platform !== Platform.WEB) {
+                extraHeaders.Cookie = yield this.getCookieString();
+            }
+            this.socket = io(url, {
+                forceNew: true,
+                withCredentials: this.platform === Platform.WEB,
+                extraHeaders,
+                reconnection: true,
+                reconnectionDelay: 1000,
+                transports: ['websocket']
+            });
         });
     }
     bindSocketListener() {
-        const keys = Object.keys(listener);
-        keys.forEach(key => {
+        var _a;
+        (_a = this.socket) === null || _a === void 0 ? void 0 : _a.onAny((eventKey, ...params) => {
             var _a;
-            const listenerFunc = listener[key];
-            if (listenerFunc) {
-                (_a = this.socket) === null || _a === void 0 ? void 0 : _a.on(key, (...params) => {
-                    console.log('[Event] on: ' + key);
-                    listenerFunc(this, ...params);
-                });
-            }
+            console.log('[Event] on: ' + eventKey, params);
+            (_a = listener[eventKey]) === null || _a === void 0 ? void 0 : _a.call(listener, this, ...params);
         });
     }
     syncMessage() {
@@ -157,28 +164,36 @@ class ImManager {
         });
     }
     emitNoTips(event, data = {}) {
-        if (!this.socket || !this.socket.connected) {
-            return;
-        }
-        return new Promise(resolve => {
+        return new Promise((resolve, reject) => {
             console.log('emitNoTips: ', event, data);
             this.socket.emit(event, data, (resp) => {
-                console.log('emitNoTips back: ', event, resp);
+                console.log(`emitNoTips ${event} resp: `, resp);
+                // clearTimeout(timeoutId);
                 resolve(resp);
             });
         });
     }
     disconnect() {
         var _a, _b;
-        if (!((_a = this.socket) === null || _a === void 0 ? void 0 : _a.connected) || this._destroyed) {
-            return;
-        }
-        console.log('SocketManager disconnect');
-        (_b = this.socket) === null || _b === void 0 ? void 0 : _b.disconnect();
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.network || !((_a = this.socket) === null || _a === void 0 ? void 0 : _a.connected) || this._destroyed) {
+                return;
+            }
+            console.log('SocketManager disconnect');
+            (_b = this.socket) === null || _b === void 0 ? void 0 : _b.disconnect();
+            try {
+                yield SyncLock.lock('SYNC_SUBSCRIBE_LIST');
+                // 构建同步条件
+                this.syncQueries = yield buildSyncQueries(this);
+            }
+            finally {
+                SyncLock.release('SYNC_SUBSCRIBE_LIST');
+            }
+        });
     }
     reconnect() {
         var _a, _b;
-        if (((_a = this.socket) === null || _a === void 0 ? void 0 : _a.connected) || this._destroyed) {
+        if (!this.network || ((_a = this.socket) === null || _a === void 0 ? void 0 : _a.connected) || this._destroyed) {
             return;
         }
         console.log('SocketManager reconnect');
@@ -211,7 +226,6 @@ class ImManager {
             data.forEach(item => {
                 this.avatarsMap[item.avatarsId] = item.url;
             });
-            this.store.dispatch(ConversationActions.setAvatarsMap(Object.assign({}, this.avatarsMap)));
         });
     }
     // 更新资源
@@ -238,26 +252,47 @@ class ImManager {
                 return localPath;
             }
             const destPath = yield this.downloadOpt(options);
-            yield this.updateResource({
-                url: options.fileId,
-                localPath: destPath,
-            });
+            try {
+                yield this.updateResource({
+                    url: options.fileId,
+                    localPath: destPath,
+                });
+            }
+            catch (e) {
+                console.log('updateResource error: ', e);
+            }
             return destPath;
         });
     }
     // 更新头像
     updateAvatar(avatar) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log('updateAvatar: ', avatar);
+            // console.log('updateAvatar: ', avatar)
+            if (this.avatarsMap[avatar.avatarsId] === avatar.url)
+                return;
             this.avatarsMap[avatar.avatarsId] = avatar.url;
-            const old = yield this.db.getAvatar(avatar.avatarsId);
-            if (!old) {
-                yield this.db.insertAvatar(avatar);
+            try {
+                yield this.db.putAvatar(avatar);
+            }
+            catch (e) {
+                console.log('updateAvatar error: ', e);
             }
-            else if (old.url !== avatar.url) {
-                yield this.db.updateAvatar(avatar);
+            avatarSubscribe.notify(avatar.avatarsId, avatar.url);
+        });
+    }
+    loadAvatars() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userConversations = yield this.db.selectConversationByType('c2c');
+            const ids = userConversations.map(item => item.id);
+            const userList = yield queryUserByIds(ids);
+            if (userList.length) {
+                yield Promise.all(userList.map((item) => __awaiter(this, void 0, void 0, function* () {
+                    yield this.updateAvatar({
+                        avatarsId: item.userId,
+                        url: item.avatars,
+                    });
+                })));
             }
-            this.store.dispatch(ConversationActions.setAvatarsMap(Object.assign({}, this.avatarsMap)));
         });
     }
     loadAvatarFromCache(id) {
@@ -266,6 +301,9 @@ class ImManager {
                 return this.avatarsMap[id];
             }
             const avatar = yield this.db.getAvatar(id);
+            if (avatar) {
+                this.avatarsMap[avatar.avatarsId] = avatar.url;
+            }
             return avatar === null || avatar === void 0 ? void 0 : avatar.url;
         });
     }
@@ -382,8 +420,8 @@ class ImManager {
         return emitContactMessage(this, this.user, conversation, contact);
     }
     // 重新发送消息
-    resendMessage(conversation, message) {
-        return resendMessage(this, this.user, conversation, message);
+    resendMessage(message) {
+        return resendMessage(this, this.user, message);
     }
     // 撤回消息
     undoMessage(message) {

package/dist/ImManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"ImManager.js","sourceRoot":"","sources":["../src/ImManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ImManager.js","sourceRoot":"","sources":["../src/ImManager.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,EAAE,EAAS,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAC,aAAa,EAAE,kBAAkB,EAAe,QAAQ,EAAC,MAAM,aAAa,CAAC;AAkBrF,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AAEzC,OAAO,EAAC,mBAAmB,EAAE,cAAc,EAAC,MAAM,SAAS,CAAC;AAC5D,OAAO,EACH,eAAe,EACf,kBAAkB,EAClB,eAAe,EACf,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,WAAW,EACX,UAAU,EACV,kBAAkB,GACrB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAC,gBAAgB,EAAE,sBAAsB,EAAC,MAAM,yBAAyB,CAAC;AACjF,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,EAAC,eAAe,EAAC,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAC,iBAAiB,EAAC,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAC,SAAS,EAAC,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAC,cAAc,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,QAAQ,MAAM,uBAAuB,CAAC;AAC7C,OAAO,eAAe,MAAM,0BAA0B,CAAC;AA+BvD,MAAM,cAAc,GAAG,CAAC,CAAC;AACzB,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAE9B,MAAM,SAAS;IA6CX,YAAY,EACI,EAAE,EACF,IAAI,EACJ,KAAK,EACL,OAAO,EACP,YAAY,EACZ,aAAa,EACb,cAAc,EACd,QAAQ,EACR,CAAC,EACD,MAAM,EACN,SAAS,EACT,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,KAAK,EACL,MAAM,EACN,QAAQ,EACR,cAAc,EACd,eAAe,EACf,WAAW,GACG;QA9DtB,YAAO,GAAI,IAAI,CAAC,CAAC,OAAO;QAQhC,gBAAW,GAAgB,EAAE,CAAC;QAE9B,mBAAmB;QACnB,eAAU,GAA2B,EAAE,CAAC;QACxC,sBAAsB;QACtB,gBAAW,GAA2B,EAAE,CAAC;QAIzC,yBAAoB,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;QAsB3C,eAAU,GAAG,KAAK,CAAC;QAwBf,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,aAAa,GAAG,aAAa,IAAI,IAAI,GAAG,EAAE,GAAG,CAAC,CAAC;QACpD,IAAI,YAAY,EAAE;YACd,IAAI,CAAC,oBAAoB,GAAG,YAAY,CAAC;SAC5C;QACD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QAC5C,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAE/B,IAAI,CAAC,YAAY,EAAE,CAAC;IACxB,CAAC;IAEK,IAAI;;YACN,IAAI;gBACA,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;oBACf,OAAO;iBACV;gBACD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;gBACpF,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;oBACZ,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC,CAAC;oBAC7F,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;oBAC/C,OAAO;iBACV;gBACD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;gBACjE,IAAI,CAAC,WAAW,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;gBAChD,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;gBACvB,IAAI,CAAC,kBAAkB,EAAE,CAAC;aAE7B;YAAC,OAAO,CAAC,EAAE;gBACR,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC;gBACvF,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;aACzC;QACL,CAAC;KAAA;IAEK,SAAS;;YACX,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE;gBAChD,WAAW,EAAE,IAAI,CAAC,QAAQ;aAC7B,CAAC,CAAC;YAEH,MAAM,YAAY,GAAQ,EAAE,CAAC;YAC7B,IAAI,IAAI,CAAC,QAAQ,KAAK,QAAQ,CAAC,GAAG,EAAE;gBAChC,YAAY,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,eAAgB,EAAE,CAAA;aACtD;YAED,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,EAAE;gBAClB,QAAQ,EAAE,IAAI;gBACd,eAAe,EAAE,IAAI,CAAC,QAAQ,KAAK,QAAQ,CAAC,GAAG;gBAC/C,YAAY;gBACZ,YAAY,EAAE,IAAI;gBAClB,iBAAiB,EAAE,IAAI;gBACvB,UAAU,EAAE,CAAC,WAAW,CAAC;aAC5B,CAAC,CAAC;QACP,CAAC;KAAA;IAED,kBAAkB;;QAEd,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,CAAC,QAAqB,EAAE,GAAG,MAAa,EAAE,EAAE;;YAC3D,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC/C,MAAA,QAAQ,CAAC,QAAQ,CAAC,yDAAG,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAA;IACN,CAAC;IAEK,WAAW;;YACb,MAAM,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACzD,CAAC;KAAA;IAED,UAAU,CAAC,OAAgB;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,UAAU;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,IAAI,CAAC,KAAa,EAAE,IAAI,GAAG,EAAE,EAAE,UAAU,GAAG,cAAc;QACtD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;;YACnC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;gBACxC,IAAI,UAAU,KAAK,CAAC,EAAE;oBAClB,IAAI,CAAC,SAAS,EAAE,CAAC;iBACpB;gBAED,IAAI,UAAU,KAAK,CAAC,EAAE;oBAClB,MAAM,CAAC,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC,CAAC,CAAC,WAAW;oBACnE,OAAO;iBACV;gBAED,UAAU,CAAC,GAAS,EAAE;oBAClB,IAAI;wBACA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC;wBAC1D,OAAO,CAAC,IAAI,CAAC,CAAC;qBACjB;oBAAC,OAAO,CAAC,EAAE;wBACR,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU;qBACxB;gBACL,CAAC,CAAA,EAAE,gBAAgB,CAAC,CAAC;aACxB;iBAAM;gBACH,oBAAoB;gBACpB,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;gBACjC,MAAM,mBAAmB,GAAG,UAAU,GAAQ;oBAC1C,KAAK,IAAI,GAAG,IAAI,GAAG,EAAE;wBACjB,IAAI,GAAG,KAAK,WAAW,IAAI,GAAG,KAAK,WAAW,EAAE;4BAC5C,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;yBACjB;6BAAM,IAAI,OAAO,GAAG,CAAC,GAAG,CAAC,KAAK,QAAQ,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;4BAC1D,gBAAgB;4BAChB,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;yBACjC;qBACJ;gBACL,CAAC,CAAA;gBACD,mBAAmB,CAAC,SAAS,CAAC,CAAC;gBAC/B,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;gBAC/C,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,IAAS,EAAE,EAAE;oBAC9C,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;oBAC1C,OAAO,CAAC,IAAI,CAAC,CAAC;gBAClB,CAAC,CAAC,CAAC;aACN;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAGD,UAAU,CAAC,KAAa,EAAE,IAAI,GAAG,EAAE;QAC/B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YACzC,IAAI,CAAC,MAAO,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,IAAS,EAAE,EAAE;gBACzC,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,SAAS,EAAE,IAAI,CAAC,CAAC;gBAChD,2BAA2B;gBAC3B,OAAO,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAEK,UAAU;;;YACZ,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,SAAS,CAAA,IAAI,IAAI,CAAC,UAAU,EAAE;gBAC7D,OAAO;aACV;YACD,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;YACxC,MAAA,IAAI,CAAC,MAAM,0CAAE,UAAU,EAAE,CAAC;YAC1B,IAAI;gBACA,MAAM,QAAQ,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;gBAC3C,SAAS;gBACT,IAAI,CAAC,WAAW,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;aACnD;oBAAS;gBACN,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;aAC3C;;KACJ;IAED,SAAS;;QACL,IAAI,CAAC,IAAI,CAAC,OAAO,KAAI,MAAA,IAAI,CAAC,MAAM,0CAAE,SAAS,CAAA,IAAI,IAAI,CAAC,UAAU,EAAE;YAC5D,OAAO;SACV;QACD,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QACvC,MAAA,IAAI,CAAC,MAAM,0CAAE,OAAO,EAAE,CAAC;IAC3B,CAAC;IAEK,qBAAqB;;;YACvB,MAAA,IAAI,CAAC,MAAM,oDAAI,CAAC;;KACnB;IAED,aAAa;QACT,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;IAClD,CAAC;IAED,aAAa;IACb,cAAc,CAAC,GAAc;QACzB,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC;IAC3B,CAAC;IAED,cAAc;IACd,WAAW,CAAC,GAAc;QACtB,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC;IACxB,CAAC;IAED,YAAY;QACR,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACnC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAChB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;YAChD,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC/B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAChB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC;YAC/C,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;IAED,OAAO;IACP,cAAc,CAAC,QAAmB;QAC9B,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC;QACpD,OAAO,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAEK,qBAAqB,CAAC,GAAW;;YACnC,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE;gBACvB,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;aAChC;YACD,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,EAAC,GAAG,EAAC,CAAC,CAAC;YACvD,IAAI,QAAQ,EAAE;gBACV,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC;aACvD;YACD,OAAO,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,CAAC;QAC/B,CAAC;KAAA;IAEK,QAAQ,CAAC,OAAyB;;YACpC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACnE,IAAI,SAAS,EAAE;gBACX,OAAO,SAAS,CAAC;aACpB;YACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACjD,IAAI;gBACA,MAAM,IAAI,CAAC,cAAc,CAAC;oBACtB,GAAG,EAAE,OAAO,CAAC,MAAM;oBACnB,SAAS,EAAE,QAAkB;iBAChC,CAAC,CAAC;aACN;YAAC,OAAO,CAAC,EAAE;gBACR,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,CAAC,CAAC,CAAC;aAC5C;YAED,OAAO,QAAQ,CAAC;QACpB,CAAC;KAAA;IAED,OAAO;IACD,YAAY,CAAC,MAAe;;YAC9B,wCAAwC;YACxC,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,MAAM,CAAC,GAAG;gBAAE,OAAO;YAC7D,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC;YAC/C,IAAI;gBACA,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;aACnC;YAAC,OAAO,CAAC,EAAE;gBACR,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC;aAC1C;YACD,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;QACzD,CAAC;KAAA;IAEK,WAAW;;YACb,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;YACxE,MAAM,GAAG,GAAG,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACnD,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,GAAG,CAAC,CAAC;YAC3C,IAAI,QAAQ,CAAC,MAAM,EAAE;gBACjB,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE;oBAC1C,MAAM,IAAI,CAAC,YAAY,CAAC;wBACpB,SAAS,EAAE,IAAI,CAAC,MAAM;wBACtB,GAAG,EAAE,IAAI,CAAC,OAAO;qBACpB,CAAC,CAAC;gBACP,CAAC,CAAA,CAAC,CAAC,CAAA;aACN;QACL,CAAC;KAAA;IAEK,mBAAmB,CAAC,EAAU;;YAChC,IAAI,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE;gBACrB,OAAO,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;aAC9B;YAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAC3C,IAAI,MAAM,EAAE;gBACR,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC;aAClD;YACD,OAAO,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,CAAC;QACvB,CAAC;KAAA;IAED;;OAEG;IACH,QAAQ,CAAC,YAA2B;QAChC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,UAAU,CAAC,YAA2B;QAClC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,UAAU,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,kBAAkB,CAAC,YAA2B;QAC1C,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,UAAU,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,YAA2B;QAC7B,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,YAA2B;QAC9B,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,WAAW,CAAC,YAA2B;QACnC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,WAAW,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;IAC7E,CAAC;IAED,YAAY,CAAC,YAA2B;QACpC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,gBAAgB,CAAC,YAA2B;QACxC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;IAClF,CAAC;IAEK,oBAAoB,CAAC,IAAW;;YAClC,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QACpF,CAAC;KAAA;IAEK,sBAAsB,CAAC,cAAsB,EAAE,UAAkB;;YACnE,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,sBAAsB,CAAC,IAAI,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC;QAC5G,CAAC;KAAA;IAEK,yBAAyB,CAAC,SAAqB;;YACjD,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,yBAAyB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;QAC9F,CAAC;KAAA;IAED,iBAAiB;QACb,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED;;OAEG;IAEH,OAAO;IACD,aAAa,CAAC,OAAiB;;YACjC,MAAM,EAAC,UAAU,EAAE,cAAc,EAAC,GAAG,OAAO,CAAC;YAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;YACrC,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;YACnD,MAAM,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;YAC5C,MAAM,IAAI,CAAC,EAAE,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;YACpD,MAAM,UAAU,GAAG;gBACf,EAAE,EAAE,cAAc;gBAClB,SAAS,EAAE,EAAE;gBACb,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,mBAAmB,EAAE,EAAC,KAAK,EAAE,CAAC,EAAC,CAAC;aAChD,CAAC;YACF,MAAM,IAAI,CAAC,EAAE,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;YACjD,QAAQ,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC;QACjE,CAAC;KAAA;IAED,OAAO;IACP,YAAY,CAAC,OAAiB;QAC1B,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,UAAU;IACJ,kBAAkB,CAAC,cAAsB,EAAE,KAAoB;;YACjE,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC,CAAC;QAC9F,CAAC;KAAA;IAED,UAAU;IACJ,iBAAiB,CAAC,cAAsB,EAAE,KAAoB;;YAChE,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,iBAAiB,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC,CAAC;QAC7F,CAAC;KAAA;IAED,SAAS;IACT,UAAU,CAAC,IAAY;QACnB,OAAO,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,eAAe,CAAC,YAA2B,EAAE,QAA2B;QACpE,OAAO,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,IAAK,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;IACrE,CAAC;IAED,SAAS;IACT,kBAAkB,CAAC,YAA2B,EAAE,OAA0B;QACtE,OAAO,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAK,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IACvE,CAAC;IAED,SAAS;IACT,gBAAgB,CAAC,YAA2B,EAAE,SAA4B;QACtE,OAAO,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAK,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;IACvE,CAAC;IAED,SAAS;IACT,gBAAgB,CAAC,YAA2B,EAAE,SAA4B;QACtE,OAAO,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAK,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;IACvE,CAAC;IAED,SAAS;IACT,eAAe,CAAC,YAA2B,EAAE,QAA2B;QACpE,OAAO,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,IAAK,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;IACrE,CAAC;IAED,SAAS;IACT,qBAAqB,CAAC,UAAuB;QACzC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,iBAAiB,CAAC,cAAc,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO;IACP,kBAAkB,CAAC,YAA2B,EAAE,OAAc;QAC1D,OAAO,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAK,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IACvE,CAAC;IAED,SAAS;IACT,aAAa,CAAC,OAAiB;QAC3B,OAAO,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAK,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAED,OAAO;IACP,WAAW,CAAC,OAAiB;QACzB,OAAO,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACtC,CAAC;IAED,SAAS;IACH,aAAa,CAAC,cAAsB;;YACtC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;YACpD,MAAM,YAAY,GAAG;gBACjB,EAAE,EAAE,cAAc;gBAClB,IAAI,EAAE,EAAE;gBACR,SAAS,EAAE,EAAE;aAChB,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC,CAAC;YAE1E,QAAQ;YACR,MAAM,IAAI,CAAC,EAAE,CAAC,iCAAiC,CAAC,cAAc,CAAC,CAAC;YAChE,MAAM,IAAI,CAAC,EAAE,CAAC,yBAAyB,CAAC,cAAc,CAAC,CAAC;YAExD,aAAa;YAEb,QAAQ;YACR,MAAM,IAAI,CAAC,EAAE,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC;QACvD,CAAC;KAAA;IAED,WAAW;IACX,SAAS;IACT,iBAAiB,CAAC,OAAe;QAC7B,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,OAAO;IACP,cAAc,CAAC,OAAiB;QAC5B,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,WAAW;QACP,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED,OAAO;;QACH,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9D,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,EAAE,CAAC;QACrB,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QAChB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,MAAA,IAAI,CAAC,WAAW,oDAAI,CAAC;IACzB,CAAC;CACJ;AAED,eAAe,SAAS,CAAC"}

package/dist/api/api.config.d.ts

@@ -1,6 +1,7 @@
 declare const ApiConfig: {
     user: {
         listUser: string;
+        queryUsersByIds: string;
     };
     conversation: {
         viewOptionSetting: string;

package/dist/api/api.config.js

@@ -2,7 +2,8 @@ const userApi = '/api-user-center';
 const chatApi = '/api-chat-service';
 const ApiConfig = {
     user: {
-        listUser: userApi + '/open/userQuery/listUser'
+        listUser: userApi + '/open/userQuery/listUser',
+        queryUsersByIds: userApi + '/open/userQuery/queryUsersByIds',
     },
     conversation: {
         viewOptionSetting: chatApi + '/conversation/viewOptionSetting',

package/dist/api/api.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.config.js","sourceRoot":"","sources":["../../src/api/api.config.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG,kBAAkB,CAAC;AACnC,MAAM,OAAO,GAAG,mBAAmB,CAAC;AACpC,MAAM,SAAS,GAAG;IACd,IAAI,EAAE;QACF,QAAQ,EAAE,OAAO,GAAG,0BAA0B;KACjD;IACD,YAAY,EAAE;QACV,iBAAiB,EAAE,OAAO,GAAG,iCAAiC;QAC9D,mBAAmB,EAAE,OAAO,GAAG,mCAAmC;KACrE;IACD,IAAI,EAAE;QACF,cAAc,EAAE,OAAO,GAAG,2BAA2B;QACrD,yBAAyB,EAAE,OAAO,GAAG,sCAAsC;QAC3E,eAAe,EAAE,OAAO,GAAG,4BAA4B;QACvD,eAAe,EAAE,OAAO,GAAG,4BAA4B;QACvD,eAAe,EAAE,OAAO,GAAG,4BAA4B;QACvD,iBAAiB,EAAE,OAAO,GAAG,8BAA8B;QAC3D,eAAe,EAAE,OAAO,GAAG,4BAA4B;QACvD,yBAAyB,EAAE,OAAO,GAAG,sCAAsC;QAC3E,aAAa,EAAE,OAAO,GAAG,0BAA0B;QACnD,UAAU,EAAE,OAAO,GAAG,uBAAuB;QAC7C,iBAAiB,EAAE,OAAO,GAAG,8BAA8B;QAC3D,aAAa,EAAE,OAAO,GAAG,0BAA0B;QACnD,kBAAkB,EAAE,OAAO,GAAG,+BAA+B;QAC7D,aAAa,EAAE,OAAO,GAAG,0BAA0B;QACnD,kBAAkB,EAAE,OAAO,GAAG,+BAA+B;KAChE;IACD,aAAa,EAAE;QACX,mBAAmB,EAAE,OAAO,GAAG,oCAAoC;QACnE,qBAAqB,EAAE,OAAO,GAAG,sCAAsC;QACvE,aAAa,EAAE,OAAO,GAAG,8BAA8B;QACvD,kBAAkB,EAAE,OAAO,GAAG,mCAAmC;QACjE,mBAAmB,EAAE,OAAO,GAAG,oCAAoC;QACnE,2BAA2B,EAAE,OAAO,GAAG,4CAA4C;KACtF;CACJ,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"api.config.js","sourceRoot":"","sources":["../../src/api/api.config.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG,kBAAkB,CAAC;AACnC,MAAM,OAAO,GAAG,mBAAmB,CAAC;AACpC,MAAM,SAAS,GAAG;IACd,IAAI,EAAE;QACF,QAAQ,EAAE,OAAO,GAAG,0BAA0B;QAC9C,eAAe,EAAE,OAAO,GAAG,iCAAiC;KAC/D;IACD,YAAY,EAAE;QACV,iBAAiB,EAAE,OAAO,GAAG,iCAAiC;QAC9D,mBAAmB,EAAE,OAAO,GAAG,mCAAmC;KACrE;IACD,IAAI,EAAE;QACF,cAAc,EAAE,OAAO,GAAG,2BAA2B;QACrD,yBAAyB,EAAE,OAAO,GAAG,sCAAsC;QAC3E,eAAe,EAAE,OAAO,GAAG,4BAA4B;QACvD,eAAe,EAAE,OAAO,GAAG,4BAA4B;QACvD,eAAe,EAAE,OAAO,GAAG,4BAA4B;QACvD,iBAAiB,EAAE,OAAO,GAAG,8BAA8B;QAC3D,eAAe,EAAE,OAAO,GAAG,4BAA4B;QACvD,yBAAyB,EAAE,OAAO,GAAG,sCAAsC;QAC3E,aAAa,EAAE,OAAO,GAAG,0BAA0B;QACnD,UAAU,EAAE,OAAO,GAAG,uBAAuB;QAC7C,iBAAiB,EAAE,OAAO,GAAG,8BAA8B;QAC3D,aAAa,EAAE,OAAO,GAAG,0BAA0B;QACnD,kBAAkB,EAAE,OAAO,GAAG,+BAA+B;QAC7D,aAAa,EAAE,OAAO,GAAG,0BAA0B;QACnD,kBAAkB,EAAE,OAAO,GAAG,+BAA+B;KAChE;IACD,aAAa,EAAE;QACX,mBAAmB,EAAE,OAAO,GAAG,oCAAoC;QACnE,qBAAqB,EAAE,OAAO,GAAG,sCAAsC;QACvE,aAAa,EAAE,OAAO,GAAG,8BAA8B;QACvD,kBAAkB,EAAE,OAAO,GAAG,mCAAmC;QACjE,mBAAmB,EAAE,OAAO,GAAG,oCAAoC;QACnE,2BAA2B,EAAE,OAAO,GAAG,4CAA4C;KACtF;CACJ,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/dist/api/index.d.ts

@@ -3,6 +3,7 @@ import { ConversationOptionKey, ConversationType, MemberLevel, ON_OFF } from "..
 export declare const searchUser: (params: {
     userNameLike: string;
 } & IQueryPage) => Promise<IUser[]>;
+export declare const queryUserByIds: (userIds: string[]) => Promise<IUser[]>;
 export declare const listMyCommonGroup: (id: string, config: any) => Promise<IChatGroup[]>;
 export declare const viewGroupDetail: (id: string) => Promise<IChatGroupDetail>;
 export declare const leaveGroup: (data: Partial<IChatGroup>) => Promise<void>;

package/dist/api/index.js

@@ -1,6 +1,7 @@
 import request from '../utils/request';
 import ApiConfig from './api.config';
 export const searchUser = (params) => request.post(ApiConfig.user.listUser, Object.assign(Object.assign({}, params), { queryAll: true, userStatus: 'valid' }));
+export const queryUserByIds = (userIds) => request.post(ApiConfig.user.queryUsersByIds, userIds);
 export const listMyCommonGroup = (id, config) => request.post(ApiConfig.chat.listMyCommonGroup, { id }, config);
 export const viewGroupDetail = (id) => request.post(ApiConfig.chat.viewGroupDetail, { chatGroupId: id }, { timeout: 1200 });
 export const leaveGroup = (data) => request.post(ApiConfig.chat.leaveGroup, data);

package/dist/api/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAA2C,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,CAAU,SAAS,CAAC,IAAI,CAAC,QAAQ,kCAAM,MAAM,KAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,IAAE,CAAC;AAGrG,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAU,EAAE,MAAW,EAAE,EAAE,CACzD,OAAO,CAAC,IAAI,CAAe,SAAS,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAC,EAAE,EAAC,EAAE,MAAM,CAAC,CAAC;AAC/E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAAU,EAAE,EAAE,CAC1C,OAAO,CAAC,IAAI,CAAmB,SAAS,CAAC,IAAI,CAAC,eAAe,EAAE,EAAC,WAAW,EAAE,EAAE,EAAC,EAAE,EAAC,OAAO,EAAE,IAAI,EAAC,CAAC,CAAC;AACvG,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAyB,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAO,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;AAC7G,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAyB,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAO,SAAS,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;AAEvH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,IAA+C,EAAE,EAAE,CACzF,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,yBAAyB,EAAE,IAAI,CAAC,CAAC;AAEjE,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAA4C,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAiB,SAAS,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;AACpJ,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAuF,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;AAGrL,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAAmI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;AAC9O,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,OAAyD,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAyB,SAAS,CAAC,YAAY,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAA2C,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,CAAU,SAAS,CAAC,IAAI,CAAC,QAAQ,kCAAM,MAAM,KAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,IAAE,CAAC;AAErG,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAkB,EAAE,EAAE,CACjD,OAAO,CAAC,IAAI,CAAU,SAAS,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;AAGnE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAU,EAAE,MAAW,EAAE,EAAE,CACzD,OAAO,CAAC,IAAI,CAAe,SAAS,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAC,EAAE,EAAC,EAAE,MAAM,CAAC,CAAC;AAC/E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAAU,EAAE,EAAE,CAC1C,OAAO,CAAC,IAAI,CAAmB,SAAS,CAAC,IAAI,CAAC,eAAe,EAAE,EAAC,WAAW,EAAE,EAAE,EAAC,EAAE,EAAC,OAAO,EAAE,IAAI,EAAC,CAAC,CAAC;AACvG,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAyB,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAO,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;AAC7G,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAyB,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAO,SAAS,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;AAEvH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,IAA+C,EAAE,EAAE,CACzF,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,yBAAyB,EAAE,IAAI,CAAC,CAAC;AAEjE,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAA4C,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAiB,SAAS,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;AACpJ,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAuF,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;AAGrL,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAAmI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;AAC9O,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,OAAyD,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAyB,SAAS,CAAC,YAAY,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC"}

package/dist/db/indexdb/index.d.ts

@@ -7,6 +7,7 @@ declare class IndexDBStorage implements IDbStorage {
     getAvatar(id: string): Promise<IAvatar | null>;
     insertAvatar(avatar: IAvatar): Promise<void>;
     updateAvatar(avatar: IAvatar): Promise<void>;
+    putAvatar(avatar: IAvatar): Promise<void>;
     selectAvatar(): Promise<IAvatar[]>;
     insertCollection(collection: ICollection): Promise<void>;
     isCollection(messageSeq: string): Promise<boolean>;
@@ -40,7 +41,7 @@ declare class IndexDBStorage implements IDbStorage {
     deleteMessageByPK(messageSeq: string): Promise<void>;
     deleteMessageByPKBatch(messageSeqs: string[]): Promise<void>;
     updateMessageStatus(message: Pick<IMessage, 'messageSeq' | 'messageStatus'>): Promise<void>;
-    updateMyMessageReadStatus(message: Partial<IMessage>): Promise<void>;
+    updateMyMessageReadStatus(message: Partial<IMessage>): Promise<number>;
     updateMessage(message: Partial<IMessage>): Promise<void>;
     searchMessages(cond: IMessageQuery): Promise<IMessage[]>;
     addReceiptBackList(messageSeq: string, receiptBack: IReceiptBack): Promise<IMessage | undefined>;

package/dist/db/indexdb/index.js

@@ -11,21 +11,22 @@ import { isEmpty } from 'lodash';
 import { MessageStatus } from '../../constants';
 import indexDbConfig from './indexdb.config';
 class IndexDBStorage {
-    constructor() { }
+    constructor() {
+    }
     createStores(userId) {
         return new Promise((resolve, reject) => {
             const dbRequest = window.indexedDB.open(indexDbConfig.dbName + '_' + userId, indexDbConfig.dbVersion);
             dbRequest.onupgradeneeded = event => {
                 this.db = event.target.result;
-                indexDbConfig.dbStores.forEach(store => {
+                indexDbConfig.dbTables.forEach(table => {
                     let dbStore;
-                    if (!this.db.objectStoreNames.contains(store.name)) {
-                        dbStore = this.db.createObjectStore(store.name, store.keyOptions);
+                    if (!this.db.objectStoreNames.contains(table.name)) {
+                        dbStore = this.db.createObjectStore(table.name, table.keyOptions);
                     }
                     else {
-                        dbStore = this.db.transaction(store.name, 'readwrite').objectStore(store.name);
+                        dbStore = event.target.transaction.objectStore(table.name);
                     }
-                    store.index.forEach(index => {
+                    table.index.forEach(index => {
                         if (!dbStore.indexNames.contains(index.indexName)) {
                             dbStore.createIndex(index.indexName, index.indexKey, index.indexOptions);
                         }
@@ -37,6 +38,7 @@ class IndexDBStorage {
                 resolve();
             };
             dbRequest.onerror = event => {
+                console.error('IndexedDB 打开失败:', event.target);
                 reject(event);
             };
         });
@@ -55,6 +57,11 @@ class IndexDBStorage {
             yield this.updateData('T_AVATARS', avatar);
         });
     }
+    putAvatar(avatar) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.updateData('T_AVATARS', avatar);
+        });
+    }
     selectAvatar() {
         return this.getList('T_AVATARS', '', 'next');
     }
@@ -75,7 +82,8 @@ class IndexDBStorage {
     // 收藏操作----end
     // 会话操作----start
     cleanConversations() {
-        return __awaiter(this, void 0, void 0, function* () { });
+        return __awaiter(this, void 0, void 0, function* () {
+        });
     }
     selectConversations() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -171,8 +179,7 @@ class IndexDBStorage {
             // 处理范围
             const data = [];
             const dbStore = this.db.transaction('T_MESSAGE', 'readonly').objectStore('T_MESSAGE');
-            const indexStore = dbStore.index('messageSeq');
-            const cursorRequest = indexStore.openCursor(IDBKeyRange.bound(cond.messageSeqBegin, cond.messageSeqEnd, true, true));
+            const cursorRequest = dbStore.openCursor(IDBKeyRange.bound(cond.messageSeqEnd, cond.messageSeqBegin, false, true));
             cursorRequest.onsuccess = event => {
                 const cursor = event.target.result;
                 if (cursor) {
@@ -226,29 +233,28 @@ class IndexDBStorage {
                 value: message.conversationId,
             }, 'prev', {
                 messageFrom: message.messageFrom,
+                messageStatus: [MessageStatus.EMITTED, MessageStatus.ARRIVED],
             });
-            console.log('updateMyMessageReadStatus: ', list);
             for (let index = 0; index < list.length; index++) {
                 const element = list[index];
-                if ([MessageStatus.EMITTED, MessageStatus.ARRIVED].includes(element.messageStatus)) {
-                    // console.log('update read', element);
-                    // 添加回执
-                    if (!element.receiptBackList) {
-                        element.receiptBackList = [];
-                    }
-                    // 添加送达
-                    if (!element.receiptBackList.some(item => item.receiptBackMessageStatus === MessageStatus.ARRIVED)) {
-                        element.receiptBackList.push({
-                            receiptBackMessageTime: message.messageTime,
-                            receiptBackMessageStatus: MessageStatus.ARRIVED
-                        });
-                    }
-                    yield this.updateData('T_MESSAGE', Object.assign(Object.assign({}, element), { messageStatus: MessageStatus.READ, receiptBackList: [...element.receiptBackList, {
-                                receiptBackMessageStatus: MessageStatus.READ,
-                                receiptBackMessageTime: message.messageTime,
-                            }] }));
+                // console.log('update read', element);
+                // 添加回执
+                if (!element.receiptBackList) {
+                    element.receiptBackList = [];
+                }
+                // 添加送达
+                if (!element.receiptBackList.some(item => item.receiptBackMessageStatus === MessageStatus.ARRIVED)) {
+                    element.receiptBackList.push({
+                        receiptBackMessageTime: message.messageTime,
+                        receiptBackMessageStatus: MessageStatus.ARRIVED
+                    });
                 }
+                yield this.updateData('T_MESSAGE', Object.assign(Object.assign({}, element), { messageStatus: MessageStatus.READ, receiptBackList: [...element.receiptBackList, {
+                            receiptBackMessageStatus: MessageStatus.READ,
+                            receiptBackMessageTime: message.messageTime,
+                        }] }));
             }
+            return list.length;
         });
     }
     updateMessage(message) {
@@ -603,7 +609,18 @@ class IndexDBStorage {
             cursor.continue();
             return;
         }
-        const isMatch = Object.keys(searchMap).every(key => !isEmpty(searchMap[key]) ? currentData[key] === searchMap[key] : true);
+        const isMatch = Object.keys(searchMap).every(key => {
+            if (!isEmpty(searchMap[key])) {
+                if (searchMap[key] instanceof RegExp) {
+                    return searchMap[key].test(currentData[key]);
+                }
+                if (searchMap[key] instanceof Array) {
+                    return searchMap[key].includes(currentData[key]);
+                }
+                return currentData[key] === searchMap[key];
+            }
+            return true;
+        });
         if (isMatch) {
             data.push(currentData);
         }