@smart-link/im-base 1.0.23 → 1.0.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/DBAdapter.js +1 -3
- package/dist/DBAdapter.js.map +1 -1
- package/dist/ImManager.js +60 -65
- package/dist/ImManager.js.map +1 -1
- package/dist/api/api.config.js +1 -3
- package/dist/api/api.config.js.map +1 -1
- package/dist/api/index.js +12 -28
- package/dist/api/index.js.map +1 -1
- package/dist/constants.d.ts +1 -1
- package/dist/constants.js +19 -22
- package/dist/constants.js.map +1 -1
- package/dist/db/indexdb/index.js +17 -16
- package/dist/db/indexdb/index.js.map +1 -1
- package/dist/db/indexdb/indexdb.config.js +1 -3
- package/dist/db/indexdb/indexdb.config.js.map +1 -1
- package/dist/db/sqlite/index.d.ts +1 -1
- package/dist/db/sqlite/index.js +41 -30
- package/dist/db/sqlite/index.js.map +1 -1
- package/dist/db/sqlite/scripts/db-script-1.0.0.js +1 -3
- package/dist/db/sqlite/scripts/db-script-1.0.0.js.map +1 -1
- package/dist/db/sqlite/scripts/db-script-1.0.1.js +1 -3
- package/dist/db/sqlite/scripts/db-script-1.0.1.js.map +1 -1
- package/dist/db/sqlite/sqlite.config.js +5 -10
- package/dist/db/sqlite/sqlite.config.js.map +1 -1
- package/dist/index.js +13 -38
- package/dist/index.js.map +1 -1
- package/dist/interface.d.ts +6 -3
- package/dist/interface.js +1 -2
- package/dist/locales/en/im.js +1 -3
- package/dist/locales/en/im.js.map +1 -1
- package/dist/locales/index.js +4 -27
- package/dist/locales/index.js.map +1 -1
- package/dist/locales/lao/im.js +1 -3
- package/dist/locales/lao/im.js.map +1 -1
- package/dist/locales/zh/im.js +1 -3
- package/dist/locales/zh/im.js.map +1 -1
- package/dist/slice/call/call.action.js +1 -2
- package/dist/slice/call/call.action.js.map +1 -1
- package/dist/slice/call/call.slice.js +4 -8
- package/dist/slice/call/call.slice.js.map +1 -1
- package/dist/slice/collection/collection.action.js +8 -13
- package/dist/slice/collection/collection.action.js.map +1 -1
- package/dist/slice/collection/collection.slice.js +5 -9
- package/dist/slice/collection/collection.slice.js.map +1 -1
- package/dist/slice/collection/index.js +3 -29
- package/dist/slice/collection/index.js.map +1 -1
- package/dist/slice/conversation/conversation.action.js +129 -191
- package/dist/slice/conversation/conversation.action.js.map +1 -1
- package/dist/slice/conversation/conversation.slice.js +5 -9
- package/dist/slice/conversation/conversation.slice.js.map +1 -1
- package/dist/slice/conversation/index.js +3 -29
- package/dist/slice/conversation/index.js.map +1 -1
- package/dist/slice/forward/forward.action.js +32 -41
- package/dist/slice/forward/forward.action.js.map +1 -1
- package/dist/slice/forward/forward.slice.js +4 -7
- package/dist/slice/forward/forward.slice.js.map +1 -1
- package/dist/slice/forward/index.js +3 -29
- package/dist/slice/forward/index.js.map +1 -1
- package/dist/slice/getState.js +4 -11
- package/dist/slice/getState.js.map +1 -1
- package/dist/slice/group/group.action.js +6 -13
- package/dist/slice/group/group.action.js.map +1 -1
- package/dist/slice/group/group.slice.js +5 -9
- package/dist/slice/group/group.slice.js.map +1 -1
- package/dist/slice/group/index.js +4 -31
- package/dist/slice/group/index.js.map +1 -1
- package/dist/slice/index.js +23 -57
- package/dist/slice/index.js.map +1 -1
- package/dist/slice/message/index.d.ts +0 -3
- package/dist/slice/message/index.js +4 -30
- package/dist/slice/message/index.js.map +1 -1
- package/dist/slice/message/message.action.js +69 -90
- package/dist/slice/message/message.action.js.map +1 -1
- package/dist/slice/message/message.panel.action.d.ts +1 -1
- package/dist/slice/message/message.panel.action.js +106 -101
- package/dist/slice/message/message.panel.action.js.map +1 -1
- package/dist/slice/message/message.slice.d.ts +0 -6
- package/dist/slice/message/message.slice.js +4 -19
- package/dist/slice/message/message.slice.js.map +1 -1
- package/dist/slice/setting/index.js +4 -30
- package/dist/slice/setting/index.js.map +1 -1
- package/dist/slice/setting/setting.action.js +31 -39
- package/dist/slice/setting/setting.action.js.map +1 -1
- package/dist/slice/setting/setting.slice.js +4 -7
- package/dist/slice/setting/setting.slice.js.map +1 -1
- package/dist/socket/emitter-call.js +1 -2
- package/dist/socket/emitter-call.js.map +1 -1
- package/dist/socket/emitter-message.js +77 -112
- package/dist/socket/emitter-message.js.map +1 -1
- package/dist/socket/listener/busi-notify.js +3 -31
- package/dist/socket/listener/busi-notify.js.map +1 -1
- package/dist/socket/listener/c2c.js +26 -54
- package/dist/socket/listener/c2c.js.map +1 -1
- package/dist/socket/listener/c2g.d.ts +0 -1
- package/dist/socket/listener/c2g.js +10 -17
- package/dist/socket/listener/c2g.js.map +1 -1
- package/dist/socket/listener/conversation.js +5 -68
- package/dist/socket/listener/conversation.js.map +1 -1
- package/dist/socket/listener/group-operate.js +25 -62
- package/dist/socket/listener/group-operate.js.map +1 -1
- package/dist/socket/listener/index.d.ts +0 -1
- package/dist/socket/listener/index.js +7 -32
- package/dist/socket/listener/index.js.map +1 -1
- package/dist/socket/listener/one-2-one-call.js +1 -2
- package/dist/socket/listener/one-2-one-call.js.map +1 -1
- package/dist/socket/listener/session.js +35 -49
- package/dist/socket/listener/session.js.map +1 -1
- package/dist/socket/message-handler.d.ts +1 -1
- package/dist/socket/message-handler.js +109 -115
- package/dist/socket/message-handler.js.map +1 -1
- package/dist/socket/sync-subscribe.js +85 -91
- package/dist/socket/sync-subscribe.js.map +1 -1
- package/dist/utils/carousel-lock.js +1 -3
- package/dist/utils/carousel-lock.js.map +1 -1
- package/dist/utils/conversation.d.ts +1 -1
- package/dist/utils/conversation.js +7 -13
- package/dist/utils/conversation.js.map +1 -1
- package/dist/utils/file.js +11 -15
- package/dist/utils/file.js.map +1 -1
- package/dist/utils/guid.js +1 -5
- package/dist/utils/guid.js.map +1 -1
- package/dist/utils/message.d.ts +1 -0
- package/dist/utils/message.js +64 -61
- package/dist/utils/message.js.map +1 -1
- package/dist/utils/request.js +10 -20
- package/dist/utils/request.js.map +1 -1
- package/dist/utils/time.js +2 -7
- package/dist/utils/time.js.map +1 -1
- package/dist/utils/url.js +4 -11
- package/dist/utils/url.js.map +1 -1
- package/dist/utils/version.js +1 -5
- package/dist/utils/version.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
2
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
3
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -8,58 +7,53 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
8
|
});
|
|
10
9
|
};
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
const
|
|
17
|
-
const
|
|
18
|
-
const {
|
|
19
|
-
const {
|
|
20
|
-
const
|
|
21
|
-
const {
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
const { groupNameEdit } = (0, getState_1.getSettingState)(getState);
|
|
25
|
-
yield dispatch(conversation_1.ConversationActions.updateChatGroupName(imManager, {
|
|
10
|
+
import { ConversationOptionKey, ConversationType, MemberLevel } from '../../constants';
|
|
11
|
+
import { actions } from './setting.slice';
|
|
12
|
+
import { ConversationActions } from '../conversation';
|
|
13
|
+
import { updateOptionSetting, groupInviteValidateSwitch } from '../../api';
|
|
14
|
+
import { getConversationState, getSettingState } from '../getState';
|
|
15
|
+
const { ENABLE_NO_DISTURB, ENABLE_TOP, IMAGE_BACKGROUND } = ConversationOptionKey;
|
|
16
|
+
const { C2C, C2G, B2C } = ConversationType;
|
|
17
|
+
const { OWNER, MGR, MEMBER } = MemberLevel;
|
|
18
|
+
const { setEnableTop, setEnableInviteValidate, setEnableNoDisturb } = actions;
|
|
19
|
+
export const updateChatGroupName = (imManager) => (dispatch, getState) => __awaiter(void 0, void 0, void 0, function* () {
|
|
20
|
+
const { currentConversation } = getConversationState(getState);
|
|
21
|
+
const { groupNameEdit } = getSettingState(getState);
|
|
22
|
+
yield dispatch(ConversationActions.updateChatGroupName(imManager, {
|
|
26
23
|
chatGroupId: currentConversation === null || currentConversation === void 0 ? void 0 : currentConversation.id,
|
|
27
24
|
chatGroupName: groupNameEdit,
|
|
28
25
|
}));
|
|
29
26
|
});
|
|
30
|
-
|
|
31
|
-
const
|
|
32
|
-
const {
|
|
33
|
-
|
|
34
|
-
yield dispatch(conversation_1.ConversationActions.updateChatGroupNotice({
|
|
27
|
+
export const updateChatGroupNotice = () => (dispatch, getState) => __awaiter(void 0, void 0, void 0, function* () {
|
|
28
|
+
const { currentConversation } = getConversationState(getState);
|
|
29
|
+
const { groupNoticeEdit } = getSettingState(getState);
|
|
30
|
+
yield dispatch(ConversationActions.updateChatGroupNotice({
|
|
35
31
|
chatGroupId: currentConversation === null || currentConversation === void 0 ? void 0 : currentConversation.id,
|
|
36
32
|
notice: groupNoticeEdit,
|
|
37
33
|
}));
|
|
38
34
|
});
|
|
39
|
-
exports.updateChatGroupNotice = updateChatGroupNotice;
|
|
40
35
|
// 群邀请确认
|
|
41
|
-
const settingEnableInviteValidate = enableInviteValidate => (dispatch, getState) => __awaiter(void 0, void 0, void 0, function* () {
|
|
36
|
+
export const settingEnableInviteValidate = enableInviteValidate => (dispatch, getState) => __awaiter(void 0, void 0, void 0, function* () {
|
|
42
37
|
dispatch(setEnableInviteValidate(enableInviteValidate));
|
|
43
|
-
const { currentConversation } =
|
|
44
|
-
dispatch(
|
|
38
|
+
const { currentConversation } = getConversationState(getState);
|
|
39
|
+
dispatch(ConversationActions.setCurrentConversation(Object.assign(Object.assign({}, currentConversation), { enableInviteValidate })));
|
|
45
40
|
const updateData = {
|
|
46
41
|
id: currentConversation === null || currentConversation === void 0 ? void 0 : currentConversation.id,
|
|
47
42
|
enableInviteValidate,
|
|
48
43
|
};
|
|
49
|
-
yield
|
|
44
|
+
yield groupInviteValidateSwitch({
|
|
50
45
|
chatGroupId: currentConversation.id,
|
|
51
46
|
switchCode: enableInviteValidate,
|
|
52
47
|
});
|
|
53
|
-
dispatch(
|
|
48
|
+
dispatch(ConversationActions.updateConversation(updateData));
|
|
54
49
|
});
|
|
55
|
-
exports.settingEnableInviteValidate = settingEnableInviteValidate;
|
|
56
50
|
// 设置置顶
|
|
57
|
-
const settingEnableTop = (imManager, enableTop) => (dispatch, getState) => __awaiter(void 0, void 0, void 0, function* () {
|
|
58
|
-
const { currentConversation } =
|
|
51
|
+
export const settingEnableTop = (imManager, enableTop) => (dispatch, getState) => __awaiter(void 0, void 0, void 0, function* () {
|
|
52
|
+
const { currentConversation } = getConversationState(getState);
|
|
59
53
|
if (!currentConversation)
|
|
60
54
|
return;
|
|
61
|
-
dispatch(
|
|
62
|
-
yield
|
|
55
|
+
dispatch(ConversationActions.setCurrentConversation(Object.assign(Object.assign({}, currentConversation), { enableTop })));
|
|
56
|
+
yield updateOptionSetting({
|
|
63
57
|
conversationId: currentConversation.id,
|
|
64
58
|
type: currentConversation.type,
|
|
65
59
|
optionKey: ENABLE_TOP,
|
|
@@ -70,19 +64,18 @@ const settingEnableTop = (imManager, enableTop) => (dispatch, getState) => __awa
|
|
|
70
64
|
enableTop,
|
|
71
65
|
};
|
|
72
66
|
yield imManager.db.updateConversationById(updateData);
|
|
73
|
-
dispatch(
|
|
67
|
+
dispatch(ConversationActions.loadConversations(imManager));
|
|
74
68
|
});
|
|
75
|
-
|
|
76
|
-
const settingEnableNoDisturb = (imManager, enableNoDisturb) => (dispatch, getState) => __awaiter(void 0, void 0, void 0, function* () {
|
|
69
|
+
export const settingEnableNoDisturb = (imManager, enableNoDisturb) => (dispatch, getState) => __awaiter(void 0, void 0, void 0, function* () {
|
|
77
70
|
dispatch(setEnableNoDisturb(enableNoDisturb));
|
|
78
71
|
const { currentConversation } = getState().conversation;
|
|
79
|
-
dispatch(
|
|
72
|
+
dispatch(ConversationActions.setCurrentConversation(Object.assign(Object.assign({}, currentConversation), { enableNoDisturb })));
|
|
80
73
|
const updateData = {
|
|
81
74
|
id: currentConversation.id,
|
|
82
75
|
enableNoDisturb,
|
|
83
76
|
};
|
|
84
|
-
dispatch(
|
|
85
|
-
yield
|
|
77
|
+
dispatch(ConversationActions.updateConversation(updateData));
|
|
78
|
+
yield updateOptionSetting({
|
|
86
79
|
conversationId: currentConversation.id,
|
|
87
80
|
type: currentConversation.type,
|
|
88
81
|
optionKey: ENABLE_NO_DISTURB,
|
|
@@ -90,5 +83,4 @@ const settingEnableNoDisturb = (imManager, enableNoDisturb) => (dispatch, getSta
|
|
|
90
83
|
});
|
|
91
84
|
yield imManager.db.updateConversationById(updateData);
|
|
92
85
|
});
|
|
93
|
-
exports.settingEnableNoDisturb = settingEnableNoDisturb;
|
|
94
86
|
//# sourceMappingURL=setting.action.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setting.action.js","sourceRoot":"","sources":["../../../src/slice/setting/setting.action.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setting.action.js","sourceRoot":"","sources":["../../../src/slice/setting/setting.action.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.actions = void 0;
|
|
4
|
-
const toolkit_1 = require("@reduxjs/toolkit");
|
|
1
|
+
import { createSlice } from "@reduxjs/toolkit";
|
|
5
2
|
const initialState = () => {
|
|
6
3
|
return {
|
|
7
4
|
creatingGroup: false,
|
|
@@ -17,7 +14,7 @@ const initialState = () => {
|
|
|
17
14
|
openTimes: 0,
|
|
18
15
|
};
|
|
19
16
|
};
|
|
20
|
-
const settingSlice =
|
|
17
|
+
const settingSlice = createSlice({
|
|
21
18
|
name: 'chat/setting',
|
|
22
19
|
initialState: initialState(),
|
|
23
20
|
reducers: {
|
|
@@ -59,6 +56,6 @@ const settingSlice = (0, toolkit_1.createSlice)({
|
|
|
59
56
|
}
|
|
60
57
|
}
|
|
61
58
|
});
|
|
62
|
-
|
|
63
|
-
|
|
59
|
+
export const actions = settingSlice.actions;
|
|
60
|
+
export default settingSlice.reducer;
|
|
64
61
|
//# sourceMappingURL=setting.slice.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setting.slice.js","sourceRoot":"","sources":["../../../src/slice/setting/setting.slice.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setting.slice.js","sourceRoot":"","sources":["../../../src/slice/setting/setting.slice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAkB7C,MAAM,YAAY,GAAG,GAAG,EAAE;IACtB,OAAO;QACH,aAAa,EAAE,KAAK;QACpB,SAAS,EAAE,KAAK;QAChB,aAAa,EAAE,IAAI;QACnB,eAAe,EAAE,IAAI;QACrB,oBAAoB,EAAE,KAAK;QAC3B,eAAe,EAAE,KAAK;QACtB,SAAS,EAAE,KAAK;QAChB,sBAAsB,EAAE,KAAK;QAC7B,aAAa,EAAE,EAAE;QACjB,iBAAiB,EAAE,EAAE;QACrB,SAAS,EAAE,CAAC;KACC,CAAA;AACrB,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,WAAW,CAAC;IAC7B,IAAI,EAAE,cAAc;IACpB,YAAY,EAAE,YAAY,EAAE;IAC5B,QAAQ,EAAE;QACN,UAAU,CAAC,KAAK;YACZ,OAAO,YAAY,EAAE,CAAC;QAC1B,CAAC;QACD,gBAAgB,CAAC,KAAK,EAAE,MAAM;YAC1B,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;QACzC,CAAC;QACD,kBAAkB,CAAC,KAAK,EAAE,MAAM;YAC5B,KAAK,CAAC,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC;QAC3C,CAAC;QACD,uBAAuB,CAAC,KAAK,EAAE,MAAM;YACjC,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,OAAO,CAAC;QAChD,CAAC;QACD,kBAAkB,CAAC,KAAK,EAAE,MAAM;YAC5B,KAAK,CAAC,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC;QAC3C,CAAC;QACD,YAAY,CAAC,KAAK,EAAE,MAAM;YACtB,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC;QACrC,CAAC;QACD,yBAAyB,CAAC,KAAK,EAAE,MAAM;YACnC,KAAK,CAAC,sBAAsB,GAAG,MAAM,CAAC,OAAO,CAAC;QAClD,CAAC;QACD,gBAAgB,CAAC,KAAK,EAAE,MAAM;YAC1B,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;QACzC,CAAC;QACD,YAAY,CAAC,KAAK,EAAE,MAAM;YACtB,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC;QACrC,CAAC;QACD,gBAAgB,CAAC,KAAK,EAAE,MAAM;YAC1B,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;QACzC,CAAC;QACD,oBAAoB,CAAC,KAAK,EAAE,MAAM;YAC9B,KAAK,CAAC,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC;QAC7C,CAAC;QACD,YAAY,CAAC,KAAK,EAAE,MAAM;YACtB,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC;QACrC,CAAC;KACJ;CACJ,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,OAAO,GAA0B,YAAY,CAAC,OAAO,CAAC;AAGnE,eAAe,YAAY,CAAC,OAAO,CAAA"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// import {CallStatus, CallType, ConversationType, HangUpType, PayloadType, SocketEvent} from '../constants';
|
|
3
2
|
// import ImManager from '../ImManager';
|
|
4
3
|
// import {AsyncAction, Caller, IMessage} from '../interface';
|
|
@@ -286,5 +285,5 @@
|
|
|
286
285
|
// console.log('getCallText', callText);
|
|
287
286
|
// return callText;
|
|
288
287
|
// }
|
|
289
|
-
|
|
288
|
+
export {};
|
|
290
289
|
//# sourceMappingURL=emitter-call.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emitter-call.js","sourceRoot":"","sources":["../../src/socket/emitter-call.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"emitter-call.js","sourceRoot":"","sources":["../../src/socket/emitter-call.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,27 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
1
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
2
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
3
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -31,48 +7,41 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
31
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
8
|
});
|
|
33
9
|
};
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
const getState_1 = require("../slice/getState");
|
|
46
|
-
function emitTextMessage(imManager, user, conversation, payload) {
|
|
10
|
+
import { ConversationType, MessageStatus, PayloadType, SocketEvent, SpreadType } from '../constants';
|
|
11
|
+
import * as ConversationActions from '../slice/conversation/conversation.action';
|
|
12
|
+
import { MessageActions } from '../slice/message';
|
|
13
|
+
import { inConversationPage } from '../utils/conversation';
|
|
14
|
+
import { guid } from '../utils/guid';
|
|
15
|
+
import { buildSearchText, buildSimpleText } from '../utils/message';
|
|
16
|
+
import { isSuccess } from '../utils/request';
|
|
17
|
+
import { shouldUpdate } from '../utils/time';
|
|
18
|
+
import { cloneDeep } from 'lodash';
|
|
19
|
+
import { getMessageState, getConversationState } from '../slice/getState';
|
|
20
|
+
export function emitTextMessage(imManager, user, conversation, payload) {
|
|
47
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
48
|
-
yield emitMessage(imManager, user, conversation,
|
|
22
|
+
yield emitMessage(imManager, user, conversation, PayloadType.TEXT, payload);
|
|
49
23
|
});
|
|
50
24
|
}
|
|
51
|
-
|
|
52
|
-
function emitVoiceMessage(imManager, user, conversation, recordInfo) {
|
|
25
|
+
export function emitVoiceMessage(imManager, user, conversation, recordInfo) {
|
|
53
26
|
return __awaiter(this, void 0, void 0, function* () {
|
|
54
|
-
yield emitMessage(imManager, user, conversation,
|
|
27
|
+
yield emitMessage(imManager, user, conversation, PayloadType.VOICE, recordInfo);
|
|
55
28
|
});
|
|
56
29
|
}
|
|
57
|
-
|
|
58
|
-
function emitPictureMessage(imManager, user, conversation, picture) {
|
|
30
|
+
export function emitPictureMessage(imManager, user, conversation, picture) {
|
|
59
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
60
|
-
yield emitMessage(imManager, user, conversation,
|
|
32
|
+
yield emitMessage(imManager, user, conversation, PayloadType.PICTURE, picture);
|
|
61
33
|
});
|
|
62
34
|
}
|
|
63
|
-
|
|
64
|
-
function emitVideoMessage(imManager, user, conversation, video) {
|
|
35
|
+
export function emitVideoMessage(imManager, user, conversation, video) {
|
|
65
36
|
return __awaiter(this, void 0, void 0, function* () {
|
|
66
|
-
yield emitMessage(imManager, user, conversation,
|
|
37
|
+
yield emitMessage(imManager, user, conversation, PayloadType.VIDEO, video);
|
|
67
38
|
});
|
|
68
39
|
}
|
|
69
|
-
|
|
70
|
-
function emitFileMessage(imManager, user, conversation, file) {
|
|
40
|
+
export function emitFileMessage(imManager, user, conversation, file) {
|
|
71
41
|
return __awaiter(this, void 0, void 0, function* () {
|
|
72
|
-
yield emitMessage(imManager, user, conversation,
|
|
42
|
+
yield emitMessage(imManager, user, conversation, PayloadType.FILE, file);
|
|
73
43
|
});
|
|
74
44
|
}
|
|
75
|
-
exports.emitFileMessage = emitFileMessage;
|
|
76
45
|
// export async function emitStaticEmojiMessage(
|
|
77
46
|
// imManager: ImManager,
|
|
78
47
|
// user: IUser,
|
|
@@ -85,20 +54,19 @@ exports.emitFileMessage = emitFileMessage;
|
|
|
85
54
|
// };
|
|
86
55
|
// await emitMessage(imManager, user, conversation, PayloadType.STATIC_EMOJI, payload);
|
|
87
56
|
// }
|
|
88
|
-
function emitContactMessage(imManager, user, conversation, contact) {
|
|
57
|
+
export function emitContactMessage(imManager, user, conversation, contact) {
|
|
89
58
|
return __awaiter(this, void 0, void 0, function* () {
|
|
90
59
|
const payload = {
|
|
91
60
|
contact,
|
|
92
61
|
};
|
|
93
|
-
yield emitMessage(imManager, user, conversation,
|
|
62
|
+
yield emitMessage(imManager, user, conversation, PayloadType.CONTACT, payload);
|
|
94
63
|
});
|
|
95
64
|
}
|
|
96
|
-
|
|
97
|
-
function emitMessage(imManager, user, conversation, payloadType, payload) {
|
|
65
|
+
export function emitMessage(imManager, user, conversation, payloadType, payload) {
|
|
98
66
|
return __awaiter(this, void 0, void 0, function* () {
|
|
99
67
|
payload.avatars = conversation.type === 'c2c' ? user.avatars : conversation.avatars;
|
|
100
68
|
setConversationText(imManager, conversation, payloadType, payload);
|
|
101
|
-
let messageStatus =
|
|
69
|
+
let messageStatus = MessageStatus.EMITTING, errorText = null;
|
|
102
70
|
const currentTime = new Date().getTime();
|
|
103
71
|
//更新消息视图,插入发送队列
|
|
104
72
|
let tMessage = buildEmittingMessage(user, conversation, {
|
|
@@ -107,9 +75,12 @@ function emitMessage(imManager, user, conversation, payloadType, payload) {
|
|
|
107
75
|
payload,
|
|
108
76
|
});
|
|
109
77
|
console.log('buildEmittingMessage', tMessage);
|
|
110
|
-
if (
|
|
111
|
-
yield imManager.store.dispatch(
|
|
112
|
-
imManager.store.dispatch(
|
|
78
|
+
if (inConversationPage(imManager, conversation.id)) {
|
|
79
|
+
yield imManager.store.dispatch(MessageActions.loadMessages(imManager, conversation.id));
|
|
80
|
+
imManager.store.dispatch(MessageActions.addMessage(imManager, tMessage));
|
|
81
|
+
setTimeout(() => {
|
|
82
|
+
imManager.scrollToLatest();
|
|
83
|
+
}, 300);
|
|
113
84
|
}
|
|
114
85
|
yield imManager.db.insertMessageEmitting(tMessage);
|
|
115
86
|
//更新会话视图及db
|
|
@@ -126,9 +97,9 @@ function emitMessage(imManager, user, conversation, payloadType, payload) {
|
|
|
126
97
|
const timeHolder = { updateTime: 0 };
|
|
127
98
|
yield uploadPayload(imManager, payloadType, payload, event => {
|
|
128
99
|
console.log('uploadPayload: ', event);
|
|
129
|
-
if (
|
|
130
|
-
|
|
131
|
-
imManager.store.dispatch(
|
|
100
|
+
if (shouldUpdate(timeHolder)) {
|
|
101
|
+
inConversationPage(imManager, conversation.id) &&
|
|
102
|
+
imManager.store.dispatch(MessageActions.updateMessage(tMessage.messageSeq, {
|
|
132
103
|
sendSize: event.loaded,
|
|
133
104
|
payload
|
|
134
105
|
}));
|
|
@@ -141,9 +112,9 @@ function emitMessage(imManager, user, conversation, payloadType, payload) {
|
|
|
141
112
|
return;
|
|
142
113
|
}
|
|
143
114
|
//消息预占
|
|
144
|
-
console.log('prepareData: ',
|
|
145
|
-
let resp = yield imManager.emit(
|
|
146
|
-
if (!
|
|
115
|
+
console.log('prepareData: ', SocketEvent.MESSAGE_PREPARE);
|
|
116
|
+
let resp = yield imManager.emit(SocketEvent.MESSAGE_PREPARE);
|
|
117
|
+
if (!isSuccess(resp)) {
|
|
147
118
|
console.warn('MESSAGE_PREPARE error ', resp);
|
|
148
119
|
yield preEmitError(imManager, tMessage, conversation);
|
|
149
120
|
return;
|
|
@@ -153,28 +124,28 @@ function emitMessage(imManager, user, conversation, payloadType, payload) {
|
|
|
153
124
|
//从消息发送队列中删除,插入消息表
|
|
154
125
|
const emittingSeq = tMessage.messageSeq;
|
|
155
126
|
yield imManager.db.deleteMessageEmittingByPK(tMessage.messageSeq);
|
|
156
|
-
tMessage = Object.assign(Object.assign(Object.assign(Object.assign({}, tMessage), prepareData), { messageStatus:
|
|
127
|
+
tMessage = Object.assign(Object.assign(Object.assign(Object.assign({}, tMessage), prepareData), { messageStatus: MessageStatus.EMITTED, emittingSeq, searchText: buildSearchText(tMessage) }));
|
|
157
128
|
yield imManager.db.insertMessage(tMessage);
|
|
158
129
|
const socketData = buildEmittingMessageSocketData(prepareData, user, conversation, {
|
|
159
130
|
payloadType: payloadType,
|
|
160
131
|
payload: Object.assign(Object.assign({}, payload), { localPath: undefined, imagePath: undefined }),
|
|
161
132
|
});
|
|
162
133
|
let event;
|
|
163
|
-
if (conversation.type ===
|
|
164
|
-
event =
|
|
134
|
+
if (conversation.type === ConversationType.C2C) {
|
|
135
|
+
event = SocketEvent.C2C_CHAT_MESSAGE;
|
|
165
136
|
}
|
|
166
137
|
else {
|
|
167
|
-
event =
|
|
138
|
+
event = SocketEvent.C2G_CHAT_MESSAGE;
|
|
168
139
|
}
|
|
169
140
|
console.log('emit: ', event, socketData);
|
|
170
141
|
resp = yield imManager.emit(event, socketData);
|
|
171
|
-
if (
|
|
172
|
-
messageStatus =
|
|
142
|
+
if (isSuccess(resp)) {
|
|
143
|
+
messageStatus = MessageStatus.EMITTED;
|
|
173
144
|
errorText = null;
|
|
174
145
|
}
|
|
175
146
|
else {
|
|
176
147
|
console.log('emit error');
|
|
177
|
-
messageStatus =
|
|
148
|
+
messageStatus = MessageStatus.EMIT_ERROR;
|
|
178
149
|
errorText = imManager.t('sendFail');
|
|
179
150
|
}
|
|
180
151
|
const updateMessage = {
|
|
@@ -184,8 +155,8 @@ function emitMessage(imManager, user, conversation, payloadType, payload) {
|
|
|
184
155
|
yield imManager.db.updateMessageStatus(updateMessage);
|
|
185
156
|
tMessage = Object.assign(Object.assign({}, tMessage), updateMessage);
|
|
186
157
|
//更新视图
|
|
187
|
-
|
|
188
|
-
imManager.store.dispatch(
|
|
158
|
+
inConversationPage(imManager, conversation.id) &&
|
|
159
|
+
imManager.store.dispatch(MessageActions.updateMessage(emittingSeq, Object.assign({}, tMessage)));
|
|
189
160
|
//更新会话
|
|
190
161
|
Object.assign(tConversation, {
|
|
191
162
|
time: prepareData.messageTime,
|
|
@@ -196,15 +167,14 @@ function emitMessage(imManager, user, conversation, payloadType, payload) {
|
|
|
196
167
|
imManager.store.dispatch(ConversationActions.loadConversations(imManager));
|
|
197
168
|
//更新订阅序列
|
|
198
169
|
const subscribe = {
|
|
199
|
-
subscribeId: conversation.spreadType && conversation.spreadType ===
|
|
170
|
+
subscribeId: conversation.spreadType && conversation.spreadType === SpreadType.READ ? conversation.id : user.userId,
|
|
200
171
|
lastMessageSeq: tMessage.messageSeq,
|
|
201
172
|
};
|
|
202
173
|
yield imManager.db.insertOrUpdateSubscribeMessageSeq(subscribe);
|
|
203
174
|
});
|
|
204
175
|
}
|
|
205
|
-
exports.emitMessage = emitMessage;
|
|
206
176
|
function buildEmittingMessage(user, conversation, ext) {
|
|
207
|
-
return Object.assign({ messageSeq: 'emitting_' +
|
|
177
|
+
return Object.assign({ messageSeq: 'emitting_' + guid(), messageTime: new Date().getTime(), conversationId: conversation.id, conversationType: conversation.type, messageFrom: user.userId, messageFromName: user.userName, messageTo: conversation.id, messageToName: conversation.name, isMyMessage: true }, ext);
|
|
208
178
|
}
|
|
209
179
|
function buildEmittingMessageSocketData(prepareData, user, conversation, ext) {
|
|
210
180
|
return Object.assign(Object.assign(Object.assign({}, prepareData), { messageFrom: user.userId, messageFromName: user.userName, messageTo: conversation.id, messageToName: conversation.name }), ext);
|
|
@@ -215,11 +185,11 @@ function uploadPayload(imManager, payloadType, payload, onUploadProgress) {
|
|
|
215
185
|
if (payload.fileId) {
|
|
216
186
|
return;
|
|
217
187
|
}
|
|
218
|
-
if (payloadType ===
|
|
219
|
-
payloadType ===
|
|
220
|
-
payloadType ===
|
|
221
|
-
payloadType ===
|
|
222
|
-
payloadType ===
|
|
188
|
+
if (payloadType === PayloadType.TEXT ||
|
|
189
|
+
payloadType === PayloadType.MULTIPLE ||
|
|
190
|
+
payloadType === PayloadType.STATIC_EMOJI ||
|
|
191
|
+
payloadType === PayloadType.CONTACT ||
|
|
192
|
+
payloadType === PayloadType.SHARE) {
|
|
223
193
|
return;
|
|
224
194
|
}
|
|
225
195
|
if (!payload.localPath) {
|
|
@@ -243,11 +213,11 @@ function preEmitError(imManager, message, conversation) {
|
|
|
243
213
|
return __awaiter(this, void 0, void 0, function* () {
|
|
244
214
|
const messageUpdate = {
|
|
245
215
|
messageSeq: message.messageSeq,
|
|
246
|
-
messageStatus:
|
|
216
|
+
messageStatus: MessageStatus.EMIT_ERROR,
|
|
247
217
|
};
|
|
248
218
|
yield imManager.db.updateMessageEmitting(messageUpdate);
|
|
249
|
-
|
|
250
|
-
imManager.store.dispatch(
|
|
219
|
+
inConversationPage(imManager, conversation.id) &&
|
|
220
|
+
imManager.store.dispatch(MessageActions.updateMessage(message.messageSeq, messageUpdate));
|
|
251
221
|
const conversationUpdate = {
|
|
252
222
|
id: conversation.id,
|
|
253
223
|
text: conversation.text,
|
|
@@ -257,29 +227,29 @@ function preEmitError(imManager, message, conversation) {
|
|
|
257
227
|
imManager.store.dispatch(ConversationActions.loadConversations(imManager));
|
|
258
228
|
});
|
|
259
229
|
}
|
|
260
|
-
function undoMessage(imManager, message) {
|
|
230
|
+
export function undoMessage(imManager, message) {
|
|
261
231
|
return __awaiter(this, void 0, void 0, function* () {
|
|
262
232
|
return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
|
|
263
233
|
const { messageSeq, conversationId, conversationType } = message;
|
|
264
234
|
//发送撤回消息
|
|
265
|
-
const event = conversationType ===
|
|
266
|
-
?
|
|
267
|
-
:
|
|
268
|
-
const socketData = Object.assign(Object.assign({}, message), { payloadType:
|
|
235
|
+
const event = conversationType === ConversationType.C2G
|
|
236
|
+
? SocketEvent.C2G_CHAT_MESSAGE_UNDO
|
|
237
|
+
: SocketEvent.C2C_CHAT_MESSAGE_UNDO;
|
|
238
|
+
const socketData = Object.assign(Object.assign({}, message), { payloadType: PayloadType.CONVERSATION_MESSAGE_UNDO, payload: {
|
|
269
239
|
undoMessageSeq: messageSeq,
|
|
270
240
|
}, undoMessageSeq: messageSeq });
|
|
271
241
|
console.log('undoMessage', socketData);
|
|
272
242
|
try {
|
|
273
243
|
let result = yield imManager.emit(event, socketData);
|
|
274
|
-
if (
|
|
244
|
+
if (isSuccess(result)) { // 检查业务级错误
|
|
275
245
|
resolve("success");
|
|
276
246
|
//更新db
|
|
277
247
|
yield imManager.db.updateMessage({
|
|
278
248
|
messageSeq: messageSeq,
|
|
279
|
-
messageStatus:
|
|
249
|
+
messageStatus: MessageStatus.UNDO,
|
|
280
250
|
});
|
|
281
251
|
//更新视图
|
|
282
|
-
imManager.store.dispatch(
|
|
252
|
+
imManager.store.dispatch(MessageActions.updateMessage(messageSeq, Object.assign(Object.assign({}, message), { messageStatus: MessageStatus.UNDO })));
|
|
283
253
|
//更新会话
|
|
284
254
|
const updateData = {
|
|
285
255
|
id: conversationId,
|
|
@@ -298,32 +268,29 @@ function undoMessage(imManager, message) {
|
|
|
298
268
|
}));
|
|
299
269
|
});
|
|
300
270
|
}
|
|
301
|
-
|
|
302
|
-
function resendMessage(imManager, user, conversation, message) {
|
|
271
|
+
export function resendMessage(imManager, user, conversation, message) {
|
|
303
272
|
return __awaiter(this, void 0, void 0, function* () {
|
|
304
273
|
const { messageSeq, payloadType, payload } = message;
|
|
305
274
|
//删除原有失败的消息
|
|
306
275
|
yield imManager.db.deleteMessageEmittingByPK(messageSeq);
|
|
307
276
|
yield imManager.db.deleteMessageByPK(messageSeq);
|
|
308
277
|
//删除后更新视图
|
|
309
|
-
imManager.store.dispatch(
|
|
278
|
+
imManager.store.dispatch(MessageActions.deleteMessage(messageSeq));
|
|
310
279
|
//获取payload 重新发送
|
|
311
|
-
yield emitMessage(imManager, user,
|
|
280
|
+
yield emitMessage(imManager, user, cloneDeep(conversation), payloadType, cloneDeep(payload));
|
|
312
281
|
});
|
|
313
282
|
}
|
|
314
|
-
exports.resendMessage = resendMessage;
|
|
315
283
|
function setConversationText(imManager, conversation, payloadType, payload) {
|
|
316
|
-
conversation.text =
|
|
284
|
+
conversation.text = buildSimpleText(imManager, payloadType, payload);
|
|
317
285
|
}
|
|
318
|
-
function emitForwardMessage(imManager, user, conversation, message) {
|
|
286
|
+
export function emitForwardMessage(imManager, user, conversation, message) {
|
|
319
287
|
return __awaiter(this, void 0, void 0, function* () {
|
|
320
288
|
const { payloadType } = message;
|
|
321
289
|
const payload = Object.assign(Object.assign({}, message.payload), { avatars: user.avatars, quoteTitle: null, quoteText: null, atList: [] });
|
|
322
290
|
yield emitMessage(imManager, user, conversation, payloadType, payload);
|
|
323
291
|
});
|
|
324
292
|
}
|
|
325
|
-
|
|
326
|
-
function emitCollectionMessage(imManager, conversation, message) {
|
|
293
|
+
export function emitCollectionMessage(imManager, conversation, message) {
|
|
327
294
|
return __awaiter(this, void 0, void 0, function* () {
|
|
328
295
|
const { payloadType } = message;
|
|
329
296
|
const user = imManager.user;
|
|
@@ -331,19 +298,17 @@ function emitCollectionMessage(imManager, conversation, message) {
|
|
|
331
298
|
yield emitMessage(imManager, user, conversation, payloadType, payload);
|
|
332
299
|
});
|
|
333
300
|
}
|
|
334
|
-
|
|
335
|
-
const
|
|
336
|
-
const {
|
|
337
|
-
|
|
338
|
-
imManager.store.dispatch(
|
|
339
|
-
imManager.store.dispatch(
|
|
340
|
-
imManager.store.dispatch(message_1.MessageActions.setDraftText(''));
|
|
301
|
+
export const handleSend = (imManager, text) => __awaiter(void 0, void 0, void 0, function* () {
|
|
302
|
+
const { currentConversation } = getConversationState(imManager.store.getState);
|
|
303
|
+
const { quote, atUsers } = getMessageState(imManager.store.getState);
|
|
304
|
+
imManager.store.dispatch(MessageActions.setAtUsers([]));
|
|
305
|
+
imManager.store.dispatch(MessageActions.setQuote(null));
|
|
306
|
+
imManager.store.dispatch(MessageActions.setDraftText(''));
|
|
341
307
|
const atList = atUsers.filter(item => text.includes('@' + item.memberName));
|
|
342
|
-
yield emitTextMessage(imManager, imManager.user,
|
|
308
|
+
yield emitTextMessage(imManager, imManager.user, cloneDeep(currentConversation), {
|
|
343
309
|
text,
|
|
344
|
-
quote:
|
|
310
|
+
quote: cloneDeep(quote),
|
|
345
311
|
atList: atList,
|
|
346
312
|
});
|
|
347
313
|
});
|
|
348
|
-
exports.handleSend = handleSend;
|
|
349
314
|
//# sourceMappingURL=emitter-message.js.map
|