@amityco/ts-sdk 6.3.2-c5c984d.0 → 6.3.2-eee54e8.0

package/dist/userRepository/observers/getUsers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getUsers.d.ts","sourceRoot":"","sources":["../../../src/userRepository/observers/getUsers.ts"],"names":[],"mappings":"AAiCA;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,QAAQ,WACX,MAAM,kBAAkB,YACtB,MAAM,sBAAsB,CAAC,MAAM,IAAI,CAAC,WACzC,MAAM,oBAAoB,eAgHpC,CAAC"}
+{"version":3,"file":"getUsers.d.ts","sourceRoot":"","sources":["../../../src/userRepository/observers/getUsers.ts"],"names":[],"mappings":"AAiCA;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,QAAQ,WACX,MAAM,kBAAkB,YACtB,MAAM,sBAAsB,CAAC,MAAM,IAAI,CAAC,WACzC,MAAM,oBAAoB,eAuHpC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk",
-  "version": "6.3.2-c5c984d.0",
+  "version": "6.3.2-eee54e8.0",
   "license": "CC-BY-ND-4.0",
   "author": "amity.co <developers@amity.co> (https://amity.co)",
   "description": "Amity Social Cloud Typescript SDK",

package/src/channelRepsitory/channelMembership/observers/getMembers.ts

@@ -69,14 +69,8 @@ export const getMembers = (
   const disposers: Amity.Unsubscriber[] = [];
   const cacheKey = ['channelUsers', 'collection', { channelId: params.channelId }];
 
-  const responder = (data: Amity.ChannelMembersLiveCollectionCache) => {
-    let channelMembers: Amity.Membership<'channel'>[] =
-      data.data
-        .map(id => pullFromCache<Amity.Membership<'channel'>>(['channelUsers', 'get', id])!)
-        .filter(Boolean)
-        .map(({ data }) => data) ?? [];
-
-    channelMembers = filterByPropIntersection(channelMembers, 'roles', params.roles);
+  const applyFilter = <T extends Amity.Membership<'channel'>>(data: T[]): T[] => {
+    let channelMembers = filterByPropIntersection(data, 'roles', params.roles);
 
     if (params.memberships) {
       /*
@@ -106,9 +100,22 @@ export const getMembers = (
       sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated,
     );
 
+    return channelMembers;
+  };
+
+  const responder = (data: Amity.ChannelMembersLiveCollectionCache, isEventModel = false) => {
+    const channelMembers: Amity.Membership<'channel'>[] =
+      data.data
+        .map(id => pullFromCache<Amity.Membership<'channel'>>(['channelUsers', 'get', id])!)
+        .filter(Boolean)
+        .map(({ data }) => data) ?? [];
+
     callback({
       onNextPage: onFetch,
-      data: channelMembers,
+      /*
+       * Only apply filter to RTE Model
+       */
+      data: isEventModel ? applyFilter(channelMembers) : channelMembers,
       hasNextPage: !!data.params?.page,
       loading: data.loading,
       error: data.error,
@@ -137,7 +144,7 @@ export const getMembers = (
       }
 
       pushToCache(cacheKey, collection);
-      responder(collection);
+      responder(collection, true);
     };
 
   const onFetch = (initial = false) => {

package/src/channelRepsitory/channelMembership/observers/tests/getMembers.test.ts

@@ -59,68 +59,6 @@ describe('getMembers', () => {
     );
   });
 
-  const filters: [string, Amity.ChannelMembersLiveCollection, Amity.Membership<'channel'>[]][] = [
-    [
-      'roles',
-      { channelId, roles: channelUserQueryResponsePage3.data.channelUsers[0].roles },
-      [channelUserWithRole],
-    ],
-    ['searched term', { channelId, search: 'use' }, [channelUserWithRole, bannedChannelUser]],
-    ['member', { channelId, memberships: ['member'] }, [channelUserWithRole, mutedChannelUser]],
-    ['muted members', { channelId, memberships: ['muted'] }, [mutedChannelUser]],
-    ['banned members', { channelId, memberships: ['banned'] }, [bannedChannelUser]],
-    [
-      'muted and banned members',
-      { channelId, memberships: ['muted', 'banned'] },
-      [mutedChannelUser, bannedChannelUser],
-    ],
-  ];
-
-  test.each(filters)('it should filter channelUsers by %s', async (filter, params, expected) => {
-    const callback = jest.fn();
-    client.http.get = jest.fn().mockResolvedValue(channelUserQueryResponsePage3);
-
-    getMembers(params, callback);
-    await pause();
-
-    expect(callback).toHaveBeenNthCalledWith(1, expect.objectContaining(getSnapshot()));
-    expect(callback).toHaveBeenNthCalledWith(
-      2,
-      expect.objectContaining({ data: expected, loading: false }),
-    );
-  });
-
-  test('it should return method to fetch next page', async () => {
-    const callback = jest.fn();
-    client.http.get = jest
-      .fn()
-      .mockResolvedValue(channelUserQueryResponse)
-      .mockResolvedValueOnce(channelUserQueryResponsePage2);
-
-    getMembers({ channelId }, callback);
-    await pause();
-
-    expect(callback).toHaveBeenCalled();
-    expect(callback.mock.lastCall).toHaveLength(1);
-
-    const { onNextPage, hasNextPage } = callback.mock.lastCall[0];
-
-    expect(hasNextPage).toBe(true);
-    expect(onNextPage).toBeTruthy();
-
-    onNextPage();
-    await pause();
-
-    const payload = convertRawChannelPayload(channelUserQueryResponse.data);
-    const payload2 = convertRawChannelPayload(channelUserQueryResponsePage2.data);
-
-    const snapshot = getSnapshot();
-    snapshot.loading = false;
-    snapshot.data = [...payload2.channelUsers, ...payload.channelUsers];
-
-    expect(callback).toHaveBeenNthCalledWith(4, expect.objectContaining(snapshot));
-  });
-
   const events: [
     string,
     keyof Amity.Events,

package/src/channelRepsitory/channelMembership/observers/tests/searchMembers.test.ts

@@ -59,37 +59,6 @@ describe('searchMembers', () => {
     );
   });
 
-  const filters: [string, Amity.ChannelMembersLiveCollection, Amity.Membership<'channel'>[]][] = [
-    [
-      'roles',
-      { channelId, roles: channelUserQueryResponsePage3.data.channelUsers[0].roles },
-      [channelUserWithRole],
-    ],
-    ['searched term', { channelId, search: 'use' }, [channelUserWithRole, bannedChannelUser]],
-    ['member', { channelId, memberships: ['member'] }, [channelUserWithRole, mutedChannelUser]],
-    ['muted members', { channelId, memberships: ['muted'] }, [mutedChannelUser]],
-    ['banned members', { channelId, memberships: ['banned'] }, [bannedChannelUser]],
-    [
-      'muted and banned members',
-      { channelId, memberships: ['muted', 'banned'] },
-      [mutedChannelUser, bannedChannelUser],
-    ],
-  ];
-
-  test.each(filters)('it should filter channelUsers by %s', async (filter, params, expected) => {
-    const callback = jest.fn();
-    client.http.get = jest.fn().mockResolvedValue(channelUserQueryResponsePage3);
-
-    searchMembers(params, callback);
-    await pause();
-
-    expect(callback).toHaveBeenNthCalledWith(1, expect.objectContaining(getSnapshot()));
-    expect(callback).toHaveBeenNthCalledWith(
-      2,
-      expect.objectContaining({ data: expected, loading: false }),
-    );
-  });
-
   test('it should return method to fetch next page', async () => {
     const callback = jest.fn();
     client.http.get = jest

package/src/communityRepository/communityMembership/observers/getMembers.ts

@@ -70,14 +70,8 @@ export const getMembers = (
   const disposers: Amity.Unsubscriber[] = [];
   const cacheKey = ['communityUsers', 'collection', { communityId: params.communityId }];
 
-  const responder = (data: Amity.CommunityMemberLiveCollectionCache) => {
-    let communityMembers: Amity.Membership<'community'>[] =
-      data.data
-        .map(id => pullFromCache<Amity.Membership<'community'>>(['communityUsers', 'get', id])!)
-        .filter(Boolean)
-        .map(({ data }) => data) ?? [];
-
-    communityMembers = filterByPropIntersection(communityMembers, 'roles', params.roles);
+  const applyFilter = <T extends Amity.Membership<'community'>>(data: T[]): T[] => {
+    let communityMembers = filterByPropIntersection(data, 'roles', params.roles);
 
     if (params.membership) {
       communityMembers = communityMembers.filter(({ communityMembership }) =>
@@ -95,9 +89,19 @@ export const getMembers = (
       sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated,
     );
 
+    return communityMembers;
+  };
+
+  const responder = (data: Amity.CommunityMemberLiveCollectionCache, isEventModel = false) => {
+    const communityMembers: Amity.Membership<'community'>[] =
+      data.data
+        .map(id => pullFromCache<Amity.Membership<'community'>>(['communityUsers', 'get', id])!)
+        .filter(Boolean)
+        .map(({ data }) => data) ?? [];
+
     callback({
       onNextPage: onFetch,
-      data: communityMembers,
+      data: isEventModel ? applyFilter(communityMembers) : communityMembers,
       hasNextPage: !!data.params?.page,
       loading: data.loading,
       error: data.error,
@@ -122,7 +126,7 @@ export const getMembers = (
       collection.data = [...new Set([communityMemberCacheId, ...collection.data])];
 
       pushToCache(cacheKey, collection);
-      responder(collection);
+      responder(collection, true);
     };
 
   const onFetch = (initial = false) => {

package/src/communityRepository/communityMembership/observers/tests/getMembers.test.ts

@@ -50,37 +50,11 @@ describe('getMembers', () => {
     expect(callback).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining(
-        getSnapshot({ data: [convertedCommunityUser2, convertedCommunityUser1], loading: false }),
+        getSnapshot({ data: [convertedCommunityUser1, convertedCommunityUser2], loading: false }),
       ),
     );
   });
 
-  const filters: [string, Amity.CommunityMemberLiveCollection, Amity.Membership<'community'>[]][] =
-    [
-      ['roles', { communityId, roles: ['test-role'] }, [withRoleCommunityUser]],
-      [
-        'searched term',
-        { communityId, search: 'use' },
-        [withRoleCommunityUser, bannedCommunityUser],
-      ],
-      ['member', { communityId, membership: ['member'] }, [withRoleCommunityUser]],
-      ['banned members', { communityId, membership: ['banned'] }, [bannedCommunityUser]],
-    ];
-
-  test.each(filters)('it should filter channelUsers by %s', async (filter, params, expected) => {
-    const callback = jest.fn();
-    client.http.get = jest.fn().mockResolvedValue(communityUserQueryResponsePage2);
-
-    getMembers(params, callback);
-    await pause();
-
-    expect(callback).toHaveBeenNthCalledWith(1, expect.objectContaining(getSnapshot()));
-    expect(callback).toHaveBeenNthCalledWith(
-      2,
-      expect.objectContaining({ data: expected, loading: false }),
-    );
-  });
-
   test('it should return method to fetch next page', async () => {
     const callback = jest.fn();
     client.http.get = jest

package/src/core/transports/mqtt.ts

@@ -6,12 +6,12 @@ import { ASCError, ASCUnknownError } from '~/core/errors';
 const QOS_FAILURE_CODE = 128;
 
 const RETRY_BASE_TIMEOUT = 1000;
-const RETRY_COUNT_MAX = 10;
+const RETRY_MAX_TIMEOUT = 8000;
 
 const enum MqttError {
   IDENTIFIER_REJECTED = 2,
-  BAD_USERNAME_OR_PASSWORD = 4,
-  NOT_AUTHORIZED = 5,
+  BAD_USERNAME_OR_PASSWORD = 134,
+  NOT_AUTHORIZED = 135,
 }
 
 export function getMqttOptions(params: {
@@ -23,8 +23,8 @@ export function getMqttOptions(params: {
     clean: false, // keep subscriptions
     clientId: `mqttjs_ + ${Math.random().toString(16).substring(2, 10)}`,
     protocolId: 'MQTT',
-    protocolVersion: 4,
-    reconnectPeriod: 0, // disable auto reconnect
+    protocolVersion: 5,
+    reconnectPeriod: RETRY_BASE_TIMEOUT,
     will: {
       topic: 'WillMsg',
       payload: 'Connection Closed abnormally..!',
@@ -47,16 +47,7 @@ export function getMqttOptions(params: {
  * @hidden
  */
 export const createMqttTransport = (endpoint: string): Amity.MqttClient => {
-  let mqttClient: MqttClient | void;
-  let retryCount = 0;
-  let allowReconnection = true;
-
-  const reconnect = () => {
-    setTimeout(() => {
-      retryCount += 1;
-      mqttClient!.reconnect();
-    }, RETRY_BASE_TIMEOUT * 2 ** (retryCount > RETRY_COUNT_MAX ? RETRY_COUNT_MAX : retryCount));
-  };
+  let mqttClient: MqttClient;
 
   async function connect(params: { accessToken: string; userId: string }): Promise<void> {
     if (mqttClient) {
@@ -70,8 +61,7 @@ export const createMqttTransport = (endpoint: string): Amity.MqttClient => {
     );
 
     mqttClient.on('connect', () => {
-      retryCount = 0;
-      allowReconnection = true;
+      mqttClient.options.reconnectPeriod = RETRY_BASE_TIMEOUT;
     });
 
     mqttClient.on('error', (error: Error & { code: number }) => {
@@ -80,14 +70,16 @@ export const createMqttTransport = (endpoint: string): Amity.MqttClient => {
         case MqttError.IDENTIFIER_REJECTED:
         case MqttError.BAD_USERNAME_OR_PASSWORD:
         case MqttError.NOT_AUTHORIZED:
-          allowReconnection = false;
+          mqttClient.end();
       }
     });
 
-    mqttClient.on('close', () => {
-      if (allowReconnection) {
-        reconnect();
-      }
+    mqttClient.on('reconnect', () => {
+      // Double the reconnect period for each attempt
+      mqttClient.options.reconnectPeriod = Math.min(
+        (mqttClient.options.reconnectPeriod || RETRY_BASE_TIMEOUT) * 2,
+        RETRY_MAX_TIMEOUT,
+      );
     });
 
     return new Promise(resolve => mqttClient!.once('connect', () => resolve()));
@@ -96,8 +88,6 @@ export const createMqttTransport = (endpoint: string): Amity.MqttClient => {
   return {
     connect,
     async disconnect(): Promise<void> {
-      allowReconnection = false;
-
       if (this.connected) {
         return new Promise(resolve => mqttClient?.end(true, undefined, () => resolve()));
       }

package/src/userRepository/observers/getUsers.ts

@@ -69,14 +69,8 @@ export const getUsers = (
   const disposers: Amity.Unsubscriber[] = [];
   const cacheKey = ['user', 'collection', {}];
 
-  const responder = (data: Amity.UserLiveCollectionCache) => {
-    let users: Amity.User[] =
-      data.data
-        .map(userId => pullFromCache<Amity.User>(['user', 'get', userId])!)
-        .filter(Boolean)
-        .map(({ data }) => data) ?? [];
-
-    users = filterByPropEquality(users, 'displayName', params.displayName);
+  const applyFilter = (data: Amity.User[]): Amity.User[] => {
+    let users = filterByPropEquality(data, 'displayName', params.displayName);
 
     switch (params.sortBy) {
       case 'firstCreated':
@@ -95,9 +89,22 @@ export const getUsers = (
           .sort(sortByDisplayName);
     }
 
+    return users;
+  };
+
+  const responder = (data: Amity.UserLiveCollectionCache, isEventModel = false) => {
+    const users: Amity.User[] =
+      data.data
+        .map(userId => pullFromCache<Amity.User>(['user', 'get', userId])!)
+        .filter(Boolean)
+        .map(({ data }) => data) ?? [];
+
     callback({
       onNextPage: onFetch,
-      data: users,
+      /*
+       * Only apply filter to RTE Model
+       */
+      data: isEventModel ? applyFilter(users) : users,
       hasNextPage: !!data.params?.page,
       loading: data.loading,
       error: data.error,
@@ -111,7 +118,7 @@ export const getUsers = (
     collection.data = [...new Set([user.userId, ...collection.data])];
 
     pushToCache(cacheKey, collection);
-    responder(collection);
+    responder(collection, true);
   };
 
   const onFetch = (initial = false) => {

package/src/userRepository/observers/tests/getUsers.test.ts

@@ -6,7 +6,6 @@ import {
   pause,
   user11,
   user12,
-  user21,
   userQueryResponse,
   userQueryResponsePage2,
 } from '~/utils/tests';
@@ -114,6 +113,7 @@ describe('getUsers', () => {
   });
 
   describe('events', () => {
+    // integration_test_id: 60b4b354-efca-49bc-aa8b-d63a8da6ef31
     const updatedUser = { ...user11, displayName: 'updated-user' };
     const flaggedUser = { ...user11, flagCount: 1 };
     const unflaggedUser = { ...user11, flagCount: 1 };
@@ -167,32 +167,4 @@ describe('getUsers', () => {
       );
     });
   });
-
-  // integration_test_id: 60b4b354-efca-49bc-aa8b-d63a8da6ef31
-  const filters: [string, Amity.UserLiveCollection, Amity.User[]][] = [
-    ['displayName', { displayName: 'displayName' }, [user21]],
-  ];
-
-  test.each(filters)('it should filter by %s communities', async (filter, params, expected) => {
-    const callback = jest.fn();
-    client.http.get = jest.fn().mockResolvedValue(userQueryResponsePage2);
-
-    getUsers(params, callback);
-
-    expect(callback).toHaveBeenCalledTimes(1);
-    // check if cache data returned (should be empty)
-    expect(callback).toHaveBeenCalledWith(expect.objectContaining(getSnapshot()));
-
-    await pause();
-
-    expect(callback).toHaveBeenCalledTimes(2);
-    expect(callback).toHaveBeenCalledWith(
-      expect.objectContaining(
-        getSnapshot({
-          loading: false,
-          data: expected,
-        }),
-      ),
-    );
-  });
 });