@amityco/ts-sdk 7.1.1-207e990f.0 → 7.1.1-5d7c3fd0.0
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/@types/core/events.d.ts +1 -2
- package/dist/@types/core/events.d.ts.map +1 -1
- package/dist/@types/core/model.d.ts +0 -2
- package/dist/@types/core/model.d.ts.map +1 -1
- package/dist/@types/core/readReceipt.d.ts +1 -12
- package/dist/@types/core/readReceipt.d.ts.map +1 -1
- package/dist/@types/domains/channel.d.ts +0 -10
- package/dist/@types/domains/channel.d.ts.map +1 -1
- package/dist/@types/domains/client.d.ts +1 -1
- package/dist/@types/domains/client.d.ts.map +1 -1
- package/dist/channelRepository/events/onChannelDeleted.d.ts.map +1 -1
- package/dist/channelRepository/events/onChannelLeft.d.ts.map +1 -1
- package/dist/channelRepository/observers/getChannel.d.ts.map +1 -1
- package/dist/channelRepository/observers/getChannels/ChannelLiveCollectionController.d.ts.map +1 -1
- package/dist/channelRepository/utils/constructChannelDynamicValue.d.ts.map +1 -1
- package/dist/channelRepository/utils/prepareChannelPayload.d.ts.map +1 -1
- package/dist/client/api/createClient.d.ts +1 -0
- package/dist/client/api/createClient.d.ts.map +1 -1
- package/dist/client/api/enableUnreadCount.d.ts.map +1 -1
- package/dist/client/api/login.d.ts.map +1 -1
- package/dist/client/utils/ReadReceiptSync/readReceiptSyncEngine.d.ts +4 -2
- package/dist/client/utils/ReadReceiptSync/readReceiptSyncEngine.d.ts.map +1 -1
- package/dist/client/utils/endpoints.d.ts +1 -0
- package/dist/client/utils/endpoints.d.ts.map +1 -1
- package/dist/client/utils/setClientToken.d.ts.map +1 -1
- package/dist/core/events.d.ts +3 -3
- package/dist/core/events.d.ts.map +1 -1
- package/dist/core/model/idResolvers.d.ts.map +1 -1
- package/dist/index.cjs.js +65 -412
- package/dist/index.esm.js +65 -412
- package/dist/index.umd.js +4 -4
- package/dist/{channelRepository → marker}/events/onChannelUnreadUpdatedLocal.d.ts +2 -2
- package/dist/marker/events/onChannelUnreadUpdatedLocal.d.ts.map +1 -0
- package/dist/messageRepository/events/onMessageCreated.d.ts.map +1 -1
- package/dist/messageRepository/utils/markReadMessage.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/@types/core/events.ts +1 -2
- package/src/@types/core/model.ts +0 -4
- package/src/@types/core/readReceipt.ts +1 -14
- package/src/@types/domains/channel.ts +0 -13
- package/src/@types/domains/client.ts +1 -2
- package/src/channelRepository/events/onChannelDeleted.ts +4 -17
- package/src/channelRepository/events/onChannelLeft.ts +3 -11
- package/src/channelRepository/observers/getChannel.ts +1 -3
- package/src/channelRepository/observers/getChannels/ChannelLiveCollectionController.ts +1 -6
- package/src/channelRepository/utils/constructChannelDynamicValue.ts +2 -12
- package/src/channelRepository/utils/prepareChannelPayload.ts +17 -57
- package/src/client/api/createClient.ts +4 -4
- package/src/client/api/enableUnreadCount.ts +0 -1
- package/src/client/api/login.ts +1 -5
- package/src/client/utils/ReadReceiptSync/readReceiptSyncEngine.ts +99 -70
- package/src/client/utils/endpoints.ts +1 -0
- package/src/client/utils/setClientToken.ts +8 -0
- package/src/core/model/idResolvers.ts +0 -2
- package/src/fileRepository/api/uploadFile.ts +1 -1
- package/src/fileRepository/api/uploadImage.ts +1 -1
- package/src/fileRepository/api/uploadVideo.ts +1 -1
- package/src/{channelRepository → marker}/events/onChannelUnreadUpdatedLocal.ts +3 -3
- package/src/messageRepository/events/onMessageCreated.ts +0 -34
- package/src/messageRepository/utils/markReadMessage.ts +3 -10
- package/dist/channelRepository/api/markChannelsAsReadBySegment.d.ts +0 -16
- package/dist/channelRepository/api/markChannelsAsReadBySegment.d.ts.map +0 -1
- package/dist/channelRepository/events/onChannelUnreadUpdatedLocal.d.ts.map +0 -1
- package/dist/channelRepository/utils/getLegacyChannelUnread.d.ts +0 -2
- package/dist/channelRepository/utils/getLegacyChannelUnread.d.ts.map +0 -1
- package/dist/client/utils/ReadReceiptSync/legacyReadReceiptSyncEngine.d.ts +0 -33
- package/dist/client/utils/ReadReceiptSync/legacyReadReceiptSyncEngine.d.ts.map +0 -1
- package/dist/client/utils/ReadReceiptSync/legacyReadReceiptSyncEngineOnLoginHandler.d.ts +0 -3
- package/dist/client/utils/ReadReceiptSync/legacyReadReceiptSyncEngineOnLoginHandler.d.ts.map +0 -1
- package/dist/marker/events/onChannelUnreadInfoUpdatedLocal.d.ts +0 -12
- package/dist/marker/events/onChannelUnreadInfoUpdatedLocal.d.ts.map +0 -1
- package/src/channelRepository/api/markChannelsAsReadBySegment.ts +0 -29
- package/src/channelRepository/utils/getLegacyChannelUnread.ts +0 -5
- package/src/client/utils/ReadReceiptSync/legacyReadReceiptSyncEngine.ts +0 -267
- package/src/client/utils/ReadReceiptSync/legacyReadReceiptSyncEngineOnLoginHandler.ts +0 -21
- package/src/marker/events/onChannelUnreadInfoUpdatedLocal.ts +0 -29
|
@@ -1,267 +0,0 @@
|
|
|
1
|
-
import { pullFromCache, pushToCache, queryCache } from '~/cache/api';
|
|
2
|
-
import { getActiveClient } from '../../api/activeClient';
|
|
3
|
-
import { markAsReadBySegment } from '~/subChannelRepository/api/markAsReadBySegment';
|
|
4
|
-
import { reCalculateChannelUnreadInfo } from '~/marker/utils/reCalculateChannelUnreadInfo';
|
|
5
|
-
import { fireEvent } from '~/core/events';
|
|
6
|
-
|
|
7
|
-
export class LegacyMessageReadReceiptSyncEngine {
|
|
8
|
-
private client: Amity.Client;
|
|
9
|
-
|
|
10
|
-
private isActive = true;
|
|
11
|
-
|
|
12
|
-
private MAX_RETRY = 3;
|
|
13
|
-
|
|
14
|
-
private JOB_QUEUE_SIZE = 120;
|
|
15
|
-
|
|
16
|
-
private jobQueue: Amity.LegacyReadReceiptSyncJob[] = [];
|
|
17
|
-
|
|
18
|
-
private timer: NodeJS.Timer | undefined;
|
|
19
|
-
|
|
20
|
-
// Interval for message read receipt sync in seconds
|
|
21
|
-
private RECEIPT_SYNC_INTERVAL = 1;
|
|
22
|
-
|
|
23
|
-
constructor() {
|
|
24
|
-
this.client = getActiveClient();
|
|
25
|
-
// Get remaining unsync read receipts from cache
|
|
26
|
-
this.getUnsyncJobs();
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
// Call this when client call client.login
|
|
30
|
-
startSyncReadReceipt() {
|
|
31
|
-
// Start timer when start receipt sync
|
|
32
|
-
this.timer = setInterval(() => {
|
|
33
|
-
this.syncReadReceipts();
|
|
34
|
-
}, this.RECEIPT_SYNC_INTERVAL * 1000);
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
// Read receipt observer handling
|
|
38
|
-
syncReadReceipts(): void {
|
|
39
|
-
if (this.jobQueue.length === 0 || this.isActive === false) return;
|
|
40
|
-
|
|
41
|
-
const readReceipt = this.getReadReceipt();
|
|
42
|
-
if (readReceipt) {
|
|
43
|
-
this.markReadApi(readReceipt);
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
private getUnsyncJobs(): void {
|
|
48
|
-
// Get all read receipts that has latestSyncSegment < latestSegment
|
|
49
|
-
const readReceipts = queryCache<Amity.LegacyReadReceipt>(['legacyReadReceipt'])?.filter(
|
|
50
|
-
({ data }) => {
|
|
51
|
-
return data.latestSyncSegment < data.latestSegment;
|
|
52
|
-
},
|
|
53
|
-
);
|
|
54
|
-
|
|
55
|
-
// Enqueue unsync read receipts to the job queue
|
|
56
|
-
readReceipts?.forEach(({ data: readReceipt }) => {
|
|
57
|
-
this.enqueueReadReceipt(readReceipt.subChannelId, readReceipt.latestSegment);
|
|
58
|
-
});
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
private getReadReceipt(): Amity.LegacyReadReceiptSyncJob | undefined {
|
|
62
|
-
// Get first read receipt in queue
|
|
63
|
-
const syncJob = this.jobQueue[0];
|
|
64
|
-
|
|
65
|
-
if (!syncJob) return;
|
|
66
|
-
// Skip when it's syncing
|
|
67
|
-
if (syncJob.syncState === Amity.ReadReceiptSyncState.SYNCING) return;
|
|
68
|
-
|
|
69
|
-
// Get readReceipt from cache by subChannelId
|
|
70
|
-
const readReceipt = pullFromCache<Amity.LegacyReadReceipt>([
|
|
71
|
-
'legacyReadReceipt',
|
|
72
|
-
syncJob.subChannelId,
|
|
73
|
-
])?.data;
|
|
74
|
-
|
|
75
|
-
if (!readReceipt) return;
|
|
76
|
-
|
|
77
|
-
if (readReceipt?.latestSegment > readReceipt?.latestSyncSegment) {
|
|
78
|
-
syncJob.segment = readReceipt.latestSegment;
|
|
79
|
-
return syncJob;
|
|
80
|
-
}
|
|
81
|
-
// Clear all synced job in job queue
|
|
82
|
-
this.removeSynedReceipt(readReceipt.subChannelId, readReceipt.latestSegment);
|
|
83
|
-
|
|
84
|
-
// Recursion getReadReceipt() until get unsync read receipt or job queue is empty
|
|
85
|
-
return this.getReadReceipt();
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
private async markReadApi(syncJob: Amity.LegacyReadReceiptSyncJob): Promise<void> {
|
|
89
|
-
const newSyncJob = syncJob;
|
|
90
|
-
newSyncJob.syncState = Amity.ReadReceiptSyncState.SYNCING;
|
|
91
|
-
|
|
92
|
-
const { subChannelId, segment } = newSyncJob;
|
|
93
|
-
|
|
94
|
-
const response = await markAsReadBySegment({ subChannelId, readToSegment: segment });
|
|
95
|
-
|
|
96
|
-
if (response) {
|
|
97
|
-
this.removeSynedReceipt(syncJob.subChannelId, syncJob.segment);
|
|
98
|
-
|
|
99
|
-
const readReceiptCache = pullFromCache<Amity.LegacyReadReceipt>([
|
|
100
|
-
'legacyReadReceipt',
|
|
101
|
-
subChannelId,
|
|
102
|
-
])?.data;
|
|
103
|
-
|
|
104
|
-
pushToCache(['legacyReadReceipt', subChannelId], {
|
|
105
|
-
...readReceiptCache,
|
|
106
|
-
latestSyncSegment: segment,
|
|
107
|
-
});
|
|
108
|
-
} else if (!response) {
|
|
109
|
-
if (newSyncJob.retryCount > this.MAX_RETRY) {
|
|
110
|
-
this.removeJobFromQueue(newSyncJob);
|
|
111
|
-
} else {
|
|
112
|
-
newSyncJob.retryCount += 1;
|
|
113
|
-
newSyncJob.syncState = Amity.ReadReceiptSyncState.CREATED;
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
private removeSynedReceipt(subChannelId: string, segment: number) {
|
|
119
|
-
const syncJobs = this.jobQueue;
|
|
120
|
-
|
|
121
|
-
syncJobs.forEach(job => {
|
|
122
|
-
if (job.subChannelId === subChannelId && job.segment <= segment) {
|
|
123
|
-
this.removeJobFromQueue(job);
|
|
124
|
-
}
|
|
125
|
-
});
|
|
126
|
-
}
|
|
127
|
-
|
|
128
|
-
private startObservingReadReceiptQueue(): void {
|
|
129
|
-
if (this.client.isUnreadCountEnabled) {
|
|
130
|
-
this.isActive = true;
|
|
131
|
-
this.startSyncReadReceipt();
|
|
132
|
-
}
|
|
133
|
-
}
|
|
134
|
-
|
|
135
|
-
private stopObservingReadReceiptQueue(): void {
|
|
136
|
-
this.isActive = false;
|
|
137
|
-
|
|
138
|
-
const syncJobs = this.jobQueue;
|
|
139
|
-
syncJobs.map(job => {
|
|
140
|
-
if (job.syncState === Amity.ReadReceiptSyncState.SYNCING) {
|
|
141
|
-
return { ...job, syncState: Amity.ReadReceiptSyncState.CREATED };
|
|
142
|
-
}
|
|
143
|
-
|
|
144
|
-
return job;
|
|
145
|
-
});
|
|
146
|
-
|
|
147
|
-
if (this.timer) clearInterval(this.timer);
|
|
148
|
-
}
|
|
149
|
-
|
|
150
|
-
// Session Management
|
|
151
|
-
onSessionEstablished(): void {
|
|
152
|
-
this.startObservingReadReceiptQueue();
|
|
153
|
-
}
|
|
154
|
-
|
|
155
|
-
onSessionDestroyed(): void {
|
|
156
|
-
this.stopObservingReadReceiptQueue();
|
|
157
|
-
this.jobQueue = [];
|
|
158
|
-
}
|
|
159
|
-
|
|
160
|
-
onTokenExpired(): void {
|
|
161
|
-
this.stopObservingReadReceiptQueue();
|
|
162
|
-
}
|
|
163
|
-
|
|
164
|
-
// Network Connection Management
|
|
165
|
-
onNetworkOffline(): void {
|
|
166
|
-
// Stop observing to the read receipt queue.
|
|
167
|
-
this.stopObservingReadReceiptQueue();
|
|
168
|
-
}
|
|
169
|
-
|
|
170
|
-
onNetworkOnline(): void {
|
|
171
|
-
// Resume observing to the read receipt queue.
|
|
172
|
-
this.startObservingReadReceiptQueue();
|
|
173
|
-
}
|
|
174
|
-
|
|
175
|
-
markRead(subChannelId: string, segment: number): void {
|
|
176
|
-
// Step 1: Optimistic update of subChannelUnreadInfo.readToSegment to message.segment
|
|
177
|
-
const cacheKey = ['subChannelUnreadInfo', 'get', subChannelId];
|
|
178
|
-
const subChannelUnreadInfo = pullFromCache<Amity.SubChannelUnreadInfo>(cacheKey)?.data;
|
|
179
|
-
|
|
180
|
-
if (subChannelUnreadInfo && segment > subChannelUnreadInfo.readToSegment) {
|
|
181
|
-
subChannelUnreadInfo.readToSegment = segment;
|
|
182
|
-
subChannelUnreadInfo.unreadCount = Math.max(subChannelUnreadInfo.lastSegment - segment, 0);
|
|
183
|
-
|
|
184
|
-
const channelUnreadInfo = reCalculateChannelUnreadInfo(subChannelUnreadInfo.channelId);
|
|
185
|
-
fireEvent('local.channelUnreadInfo.updated', channelUnreadInfo);
|
|
186
|
-
|
|
187
|
-
pushToCache(cacheKey, subChannelUnreadInfo);
|
|
188
|
-
fireEvent('local.subChannelUnread.updated', subChannelUnreadInfo);
|
|
189
|
-
}
|
|
190
|
-
|
|
191
|
-
// Step 2: Enqueue the read receipt
|
|
192
|
-
this.enqueueReadReceipt(subChannelId, segment);
|
|
193
|
-
}
|
|
194
|
-
|
|
195
|
-
private enqueueReadReceipt(subChannelId: string, segment: number): void {
|
|
196
|
-
const readReceipt = pullFromCache<Amity.LegacyReadReceipt>([
|
|
197
|
-
'legacyReadReceipt',
|
|
198
|
-
subChannelId,
|
|
199
|
-
])?.data;
|
|
200
|
-
|
|
201
|
-
// Create new read receipt if it's not exists and add job to queue
|
|
202
|
-
if (!readReceipt) {
|
|
203
|
-
const readReceiptSubChannel: Amity.LegacyReadReceipt = {
|
|
204
|
-
subChannelId,
|
|
205
|
-
latestSegment: segment,
|
|
206
|
-
latestSyncSegment: 0,
|
|
207
|
-
};
|
|
208
|
-
|
|
209
|
-
pushToCache(['legacyReadReceipt', subChannelId], readReceiptSubChannel);
|
|
210
|
-
} else if (readReceipt.latestSegment < segment) {
|
|
211
|
-
pushToCache(['legacyReadReceipt', subChannelId], { ...readReceipt, latestSegment: segment });
|
|
212
|
-
} else if (readReceipt.latestSyncSegment >= segment) {
|
|
213
|
-
// Skip the job when lastSyncSegment > = segment
|
|
214
|
-
return;
|
|
215
|
-
}
|
|
216
|
-
|
|
217
|
-
let syncJob: Amity.LegacyReadReceiptSyncJob | null = this.getSyncJob(subChannelId);
|
|
218
|
-
|
|
219
|
-
if (syncJob === null || syncJob.syncState === Amity.ReadReceiptSyncState.SYNCING) {
|
|
220
|
-
syncJob = {
|
|
221
|
-
subChannelId,
|
|
222
|
-
segment,
|
|
223
|
-
syncState: Amity.ReadReceiptSyncState.CREATED,
|
|
224
|
-
retryCount: 0,
|
|
225
|
-
};
|
|
226
|
-
|
|
227
|
-
this.enqueueJob(syncJob);
|
|
228
|
-
} else if (syncJob.segment < segment) {
|
|
229
|
-
syncJob.segment = segment;
|
|
230
|
-
}
|
|
231
|
-
}
|
|
232
|
-
|
|
233
|
-
private getSyncJob(subChannelId: string): Amity.LegacyReadReceiptSyncJob | null {
|
|
234
|
-
const syncJobs = this.jobQueue;
|
|
235
|
-
|
|
236
|
-
const targetJob = syncJobs.find(job => job.subChannelId === subChannelId);
|
|
237
|
-
|
|
238
|
-
return targetJob || null;
|
|
239
|
-
}
|
|
240
|
-
|
|
241
|
-
private enqueueJob(syncJob: Amity.LegacyReadReceiptSyncJob) {
|
|
242
|
-
if (this.jobQueue.length < this.JOB_QUEUE_SIZE) {
|
|
243
|
-
this.jobQueue.push(syncJob);
|
|
244
|
-
} else {
|
|
245
|
-
// Remove oldest job when queue reach maximum capacity
|
|
246
|
-
this.jobQueue.shift();
|
|
247
|
-
this.jobQueue.push(syncJob);
|
|
248
|
-
}
|
|
249
|
-
}
|
|
250
|
-
|
|
251
|
-
private removeJobFromQueue(item: Amity.LegacyReadReceiptSyncJob) {
|
|
252
|
-
const index = this.jobQueue.indexOf(item);
|
|
253
|
-
if (index > -1) {
|
|
254
|
-
this.jobQueue.splice(index, 1);
|
|
255
|
-
}
|
|
256
|
-
}
|
|
257
|
-
}
|
|
258
|
-
|
|
259
|
-
let instance: LegacyMessageReadReceiptSyncEngine | null = null;
|
|
260
|
-
|
|
261
|
-
export default {
|
|
262
|
-
getInstance: () => {
|
|
263
|
-
if (!instance) instance = new LegacyMessageReadReceiptSyncEngine();
|
|
264
|
-
|
|
265
|
-
return instance;
|
|
266
|
-
},
|
|
267
|
-
};
|
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
import { onSessionStateChange } from '~/client/events/onSessionStateChange';
|
|
2
|
-
import LegacyReadReceiptSyncEngine from '~/client/utils/ReadReceiptSync/legacyReadReceiptSyncEngine';
|
|
3
|
-
|
|
4
|
-
export default () => {
|
|
5
|
-
const readReceiptSyncEngine = LegacyReadReceiptSyncEngine.getInstance();
|
|
6
|
-
readReceiptSyncEngine.startSyncReadReceipt();
|
|
7
|
-
|
|
8
|
-
onSessionStateChange(state => {
|
|
9
|
-
if (state === Amity.SessionStates.ESTABLISHED) {
|
|
10
|
-
readReceiptSyncEngine.onSessionEstablished();
|
|
11
|
-
} else if (state === Amity.SessionStates.TOKEN_EXPIRED) {
|
|
12
|
-
readReceiptSyncEngine.onTokenExpired();
|
|
13
|
-
} else {
|
|
14
|
-
readReceiptSyncEngine.onSessionDestroyed();
|
|
15
|
-
}
|
|
16
|
-
});
|
|
17
|
-
|
|
18
|
-
return () => {
|
|
19
|
-
readReceiptSyncEngine.onSessionDestroyed();
|
|
20
|
-
};
|
|
21
|
-
};
|
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
import { getActiveClient } from '~/client/api/activeClient';
|
|
2
|
-
import { createEventSubscriber } from '~/core/events';
|
|
3
|
-
|
|
4
|
-
/**
|
|
5
|
-
* Internal used only
|
|
6
|
-
*
|
|
7
|
-
* Fired when an {@link Amity.channelUnreadInfo} has been updated.
|
|
8
|
-
*
|
|
9
|
-
* @param callback The function to call when the event was fired
|
|
10
|
-
* @returns an {@link Amity.Unsubscriber} function to stop listening
|
|
11
|
-
*
|
|
12
|
-
* @category ChannelMarker Events
|
|
13
|
-
*/
|
|
14
|
-
export const onChannelUnreadInfoUpdatedLocal = (
|
|
15
|
-
callback: Amity.Listener<Amity.Events['local.channelUnreadInfo.updated']>,
|
|
16
|
-
): Amity.Unsubscriber => {
|
|
17
|
-
const client = getActiveClient();
|
|
18
|
-
|
|
19
|
-
const filter = (payload: Amity.Events['local.channelUnreadInfo.updated']) => {
|
|
20
|
-
callback(payload);
|
|
21
|
-
};
|
|
22
|
-
|
|
23
|
-
return createEventSubscriber(
|
|
24
|
-
client,
|
|
25
|
-
'channelMarker/onChannelUnreadInfoUpdatedLocal',
|
|
26
|
-
'local.channelUnreadInfo.updated',
|
|
27
|
-
filter,
|
|
28
|
-
);
|
|
29
|
-
};
|