@amityco/ts-sdk 6.5.7-d7d687d.0 → 6.5.7-e5b9646.0

package/dist/messageRepository/events/onMessageCreated.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onMessageCreated.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/events/onMessageCreated.ts"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,gBAAgB,aACjB,MAAM,QAAQ,CAAC,MAAM,OAAO,CAAC,sBAEtC,MAAM,YAgCR,CAAC"}
+{"version":3,"file":"onMessageCreated.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/events/onMessageCreated.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,gBAAgB,aACjB,MAAM,QAAQ,CAAC,MAAM,OAAO,CAAC,sBAEtC,MAAM,YAwBR,CAAC"}

package/dist/messageRepository/observers/getMessages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMessages.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/observers/getMessages.ts"],"names":[],"mappings":"AA+BA;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,WAAW,WACd,MAAM,sBAAsB,YAC1B,MAAM,sBAAsB,CAAC,MAAM,OAAO,CAAC,WAC5C,MAAM,oBAAoB,KAClC,MAAM,YA6GR,CAAC"}
+{"version":3,"file":"getMessages.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/observers/getMessages.ts"],"names":[],"mappings":"AA+BA;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,WAAW,WACd,MAAM,sBAAsB,YAC1B,MAAM,sBAAsB,CAAC,MAAM,OAAO,CAAC,WAC5C,MAAM,oBAAoB,KAClC,MAAM,YA+GR,CAAC"}

package/dist/subChannelRepository/utils/markReadEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"markReadEngine.d.ts","sourceRoot":"","sources":["../../../src/subChannelRepository/utils/markReadEngine.ts"],"names":[],"mappings":"AAkDA;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,kBAYxC,CAAC;AA+CF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,YAAY,iBAAwB,MAAM,UAAU,CAAC,cAAc,CAAC,qBAchF,CAAC;AAMF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,WAAW,iBAAkB,MAAM,UAAU,CAAC,cAAc,CAAC,qBAIzE,CAAC"}
+{"version":3,"file":"markReadEngine.d.ts","sourceRoot":"","sources":["../../../src/subChannelRepository/utils/markReadEngine.ts"],"names":[],"mappings":"AAmDA;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,kBAYxC,CAAC;AAsCF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,YAAY,iBAAwB,MAAM,UAAU,CAAC,cAAc,CAAC,qBAchF,CAAC;AAMF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,WAAW,iBAAkB,MAAM,UAAU,CAAC,cAAc,CAAC,qBAIzE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk",
-  "version": "6.5.7-d7d687d.0",
+  "version": "6.5.7-e5b9646.0",
   "license": "CC-BY-ND-4.0",
   "author": "amity.co <developers@amity.co> (https://amity.co)",
   "description": "Amity Social Cloud Typescript SDK",
@@ -54,6 +54,7 @@
   },
   "dependencies": {
     "@react-native-async-storage/async-storage": "^1.17.7",
+    "@react-native-community/netinfo": "^9.4.1",
     "agentkeepalive": "^4.2.1",
     "axios": "^1.2.3",
     "debug": "^4.3.4",
@@ -63,5 +64,8 @@
     "react-native-uuid": "^2.0.1",
     "socket.io-client": "2.2.0",
     "ts-jest": "^28.0.3"
+  },
+  "optionalDependencies": {
+    "react-native-web": "^0.19.7"
   }
 }

package/src/client/utils/markerSyncEngine.ts

@@ -13,6 +13,7 @@ import { onSubChannelCreated, onSubChannelDeleted } from '~/subChannelRepository
 import { isUnreadCountSupport } from '~/subChannelRepository/utils';
 
 import { markerSync } from '../api';
+import { onOnline } from './onOnline';
 
 const SYNC_TRIGGER_INTERVAL_TIME = 2000;
 const ON_SUB_CHANNEL_DELETE_SYNC_TRIGGER_DELAY = 2000;
@@ -103,18 +104,6 @@ export const markerSyncTrigger = async () => {
   isWaitingForResponse = false;
 };
 
-/**
- * the event callback when app is back to online
- */
-const onOnline = () => {
-  // should add RESUME to the event to trigger marker syncing again
-  const callback = () => events.push(Amity.MarkerSyncEvent.RESUME);
-
-  window.addEventListener('online', callback);
-
-  return () => window.removeEventListener('online', callback);
-};
-
 const registerEventListeners = () => {
   // based on the tech spec design, we designed a fetch marker in case of these events
   // - new message
@@ -122,7 +111,10 @@ const registerEventListeners = () => {
   // - remove channel
   // - app going to online again after offline
   disposers.push(
-    onOnline(),
+    onOnline(() => {
+      // should add RESUME to the event to trigger marker syncing again
+      events.push(Amity.MarkerSyncEvent.RESUME);
+    }),
 
     onMessageCreated(
       message => {

package/src/client/utils/onOnline.ts

@@ -0,0 +1,26 @@
+export const onOnline = (callback: () => void) => {
+  if (typeof window !== 'undefined' && window.addEventListener) {
+    window.addEventListener('online', callback);
+    return () => window.removeEventListener('online', callback);
+  }
+
+  if (typeof document !== 'undefined' && document.addEventListener) {
+    document.addEventListener('online', callback);
+    return () => document.removeEventListener('online', callback);
+  }
+
+  //  @TODO: Please update code below to follow our coding conventions and our TS rules
+  if (typeof navigator !== 'undefined' && navigator.product === 'ReactNative') {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires,global-require
+    const NetInfo = require('@react-native-community/netinfo');
+
+    return NetInfo.addEventListener((state: { isConnected: boolean }) => {
+      if (!state.isConnected) return;
+      callback();
+    });
+  }
+
+  // Handle unsupported environment
+  console.error('Unsupported environment');
+  return () => console.error('Unsupported environment');
+};

package/src/core/query/paging.ts

@@ -80,19 +80,22 @@ export const toToken = (
       "before" or "after" value. if that would change,
       we'd need to move toward a more simple: `!paging.before`
     */
-    if (!Number.isNaN(Number(paging?.before!))) {
+    if (paging?.before) {
       payload = {
+        ...payload,
         before: paging.before,
-        last: paging.limit,
       };
-    } else if (!Number.isNaN(Number(paging?.after!))) {
+    }
+    if (paging?.after) {
       payload = {
+        ...payload,
         after: paging.after,
-        first: paging.limit,
       };
-    } else if (!Number.isNaN(Number(paging?.limit!))) {
+    }
+    if (!Number.isNaN(Number(paging?.limit))) {
       payload = {
-        last: paging.limit,
+        ...payload,
+        limit: paging.limit,
       };
     }
   } else if (style === 'afterbeforeraw') {

package/src/messageRepository/events/onMessageCreated.ts

@@ -2,7 +2,6 @@ import { getActiveClient } from '~/client/api';
 import { createEventSubscriber } from '~/core/events';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 
-import { upsertInCache } from '~/cache/api';
 import { prepareMessagePayload } from '../utils';
 
 /**
@@ -31,15 +30,7 @@ export const onMessageCreated = (
     const payload = await prepareMessagePayload(rawPayload);
     const message = payload.messages[0];
 
-    // Update in cache
     ingestInCache(payload);
-
-    // Update lastActivity for Channel and SubChannel
-    payload.messages.forEach(({ channelId, subChannelId, createdAt }) => {
-      upsertInCache(['channel', 'get', channelId], { lastActivityAt: createdAt });
-      upsertInCache(['subChannel', 'get', channelId], { lastActivityAt: createdAt });
-    });
-
     callback(message);
   };
 

package/src/messageRepository/observers/getMessages.ts

@@ -99,7 +99,9 @@ export const getMessages = (
 
     if (params.subChannelId !== message?.subChannelId || !collection) return;
 
-    collection.data = [...new Set([message.messageId, ...collection.data])];
+    if (!collection.data.includes(message.messageId)) {
+      collection.data = [...new Set([message.messageId, ...collection.data])];
+    }
 
     pushToCache(cacheKey, collection);
 

package/src/subChannelRepository/api/querySubChannels.ts

@@ -37,7 +37,7 @@ export const querySubChannels = async (
         ...params,
         isDeleted: inferIsDeleted(includeDeleted),
         options: {
-          token: toToken(page, 'skiplimit'),
+          token: toToken(page, 'afterbefore'),
         },
       },
     },

package/src/subChannelRepository/observers/getSubChannels.ts

@@ -111,7 +111,7 @@ export const getSubChannels = (
 
     const query = createQuery(querySubChannels, {
       ...queryParams,
-      page: snapshot?.params.page ?? { limit },
+      page: snapshot?.params.page ? { ...snapshot?.params.page, limit } : { limit },
     });
 
     runQuery(

package/src/subChannelRepository/utils/markReadEngine.ts

@@ -2,6 +2,7 @@ import { onSessionStateChange } from '~/client/events/onSessionStateChange';
 import { getMarkedMessageTopic, subscribeTopic } from '~/core/subscription';
 import { setIntervalTask } from '~/utils/timer';
 
+import { onOnline } from '~/client/utils/onOnline';
 import { getSubChannel } from '../api/getSubChannel';
 import { readingAPI } from '../api/readingAPI';
 import { startReadingAPI } from '../api/startReadingAPI';
@@ -68,20 +69,6 @@ export const markReadEngineOnLoginHandler = () => {
   };
 };
 
-/**
- * the event callback when app is back to online
- */
-const onOnline = () => {
-  const callback = () => {
-    // Start reading the reading subChannel again when resume from offline state
-    startReadingFromReadingList();
-  };
-
-  window.addEventListener('online', callback);
-
-  return () => window.removeEventListener('online', callback);
-};
-
 const getParentChannelId = async (
   subChannelId: Amity.SubChannel['subChannelId'],
 ): Promise<Amity.SubChannel['channelId']> => {
@@ -96,7 +83,12 @@ const getParentChannelId = async (
 };
 
 const registerEventListeners = () => {
-  disposers.push(onOnline());
+  disposers.push(
+    onOnline(() => {
+      // Start reading the reading subChannel again when resume from offline state
+      startReadingFromReadingList();
+    }),
+  );
 };
 
 const registerTopicSubscribers = async (subChannelId: Amity.SubChannel['subChannelId']) => {