@amityco/ts-sdk-react-native 6.30.5-d50bb81.0 → 6.31.0

package/dist/messageRepository/api/createMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createMessage.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/api/createMessage.ts"],"names":[],"mappings":"AAmBA,aAAK,kBAAkB,CAAC,CAAC,SAAS,KAAK,CAAC,kBAAkB,IAAI,IAAI,CAChE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAChB,cAAc,GAAG,UAAU,GAAG,UAAU,GAAG,MAAM,GAAG,UAAU,GAAG,YAAY,CAC9E,GAAG;IACF,IAAI,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAgEF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,aAAa,yEAEvB,QAAQ,MAAM,MAAM,CAAC,MAAM,OAAO,CAAC,CAsCrC,CAAC"}
+{"version":3,"file":"createMessage.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/api/createMessage.ts"],"names":[],"mappings":"AAmBA,aAAK,kBAAkB,CAAC,CAAC,SAAS,KAAK,CAAC,kBAAkB,IAAI,IAAI,CAChE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAChB,cAAc,GAAG,UAAU,GAAG,UAAU,GAAG,MAAM,GAAG,UAAU,GAAG,YAAY,CAC9E,GAAG;IACF,IAAI,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAoEF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,aAAa,yEAEvB,QAAQ,MAAM,MAAM,CAAC,MAAM,OAAO,CAAC,CA2CrC,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"MessageLiveCollectionController.d.ts","sourceRoot":"","sources":["../../../../src/messageRepository/observers/getMessages/MessageLiveCollectionController.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAM1F,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAG5E,qBAAa,+BAAgC,SAAQ,wBAAwB,CAC3E,SAAS,EACT,KAAK,CAAC,sBAAsB,EAC5B,KAAK,CAAC,OAAO,EACb,2BAA2B,CAC5B;IACC,OAAO,CAAC,qBAAqB,CAA+B;IAE5D,OAAO,CAAC,KAAK,CAA+B;gBAG1C,KAAK,EAAE,KAAK,CAAC,sBAAsB,EACnC,QAAQ,EAAE,KAAK,CAAC,sBAAsB,CAAC,KAAK,CAAC,OAAO,CAAC;IAqBvD,iBAAiB;IAmBjB,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,0BAA0B;IAwBzE,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE;IA4CjC,SAAS,CAAC,KAAK;cAUC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC,UAAU;IAI9E,SAAS,CAAC,kBAAkB,CAAC,EAC3B,QAAQ,EACR,SAAS,EACT,OAAO,GACR,EAAE,KAAK,CAAC,sCAAsC,CAAC,SAAS,CAAC;CAG3D"}
+{"version":3,"file":"MessageLiveCollectionController.d.ts","sourceRoot":"","sources":["../../../../src/messageRepository/observers/getMessages/MessageLiveCollectionController.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAM1F,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAG5E,qBAAa,+BAAgC,SAAQ,wBAAwB,CAC3E,SAAS,EACT,KAAK,CAAC,sBAAsB,EAC5B,KAAK,CAAC,OAAO,EACb,2BAA2B,CAC5B;IACC,OAAO,CAAC,qBAAqB,CAA+B;IAE5D,OAAO,CAAC,KAAK,CAA+B;gBAG1C,KAAK,EAAE,KAAK,CAAC,sBAAsB,EACnC,QAAQ,EAAE,KAAK,CAAC,sBAAsB,CAAC,KAAK,CAAC,OAAO,CAAC;IAqBvD,iBAAiB;IAmBjB,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,0BAA0B;IAyBzE,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE;IA4CjC,SAAS,CAAC,KAAK;cAUC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC,UAAU;IAI9E,SAAS,CAAC,kBAAkB,CAAC,EAC3B,QAAQ,EACR,SAAS,EACT,OAAO,GACR,EAAE,KAAK,CAAC,sCAAsC,CAAC,SAAS,CAAC;CAG3D"}

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

@@ -1 +1 @@
-{"version":3,"file":"MessageQueryStreamController.d.ts","sourceRoot":"","sources":["../../../../src/messageRepository/observers/getMessages/MessageQueryStreamController.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAKpF,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAE5E,qBAAa,4BAA6B,SAAQ,qBAAqB,CACrE,KAAK,CAAC,cAAc,EACpB,KAAK,CAAC,sBAAsB,CAC7B;IACC,OAAO,CAAC,YAAY,CAAqD;IAEzE,OAAO,CAAC,cAAc,CAEsB;IAE5C,OAAO,CAAC,oBAAoB,CAA8B;gBAGxD,KAAK,EAAE,KAAK,CAAC,sBAAsB,EACnC,QAAQ,EAAE,MAAM,EAAE,EAClB,YAAY,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,0BAA0B,KAAK,IAAI,EAChE,cAAc,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,KAAK,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,EAC1F,oBAAoB,EAAE,2BAA2B;IAS7C,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc;IAWjD,mBAAmB,CACjB,QAAQ,EAAE,KAAK,CAAC,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,EAC1D,SAAS,EAAE,KAAK,CAAC,2BAA2B,EAC5C,OAAO,UAAQ;IAsBjB,OAAO,CAAC,MAAM,EAAE,MAAM,aACH,MAAM,eAAe;IA6DxC,YAAY,CACV,gBAAgB,EAAE;QAChB,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,KAAK,CAAC,YAAY,CAAC;QAC3E,MAAM,EAAE,MAAM,CAAC;KAChB,EAAE;CAIN"}
+{"version":3,"file":"MessageQueryStreamController.d.ts","sourceRoot":"","sources":["../../../../src/messageRepository/observers/getMessages/MessageQueryStreamController.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAIpF,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAG5E,qBAAa,4BAA6B,SAAQ,qBAAqB,CACrE,KAAK,CAAC,cAAc,EACpB,KAAK,CAAC,sBAAsB,CAC7B;IACC,OAAO,CAAC,YAAY,CAAqD;IAEzE,OAAO,CAAC,cAAc,CAEsB;IAE5C,OAAO,CAAC,oBAAoB,CAA8B;gBAGxD,KAAK,EAAE,KAAK,CAAC,sBAAsB,EACnC,QAAQ,EAAE,MAAM,EAAE,EAClB,YAAY,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,0BAA0B,KAAK,IAAI,EAChE,cAAc,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,KAAK,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,EAC1F,oBAAoB,EAAE,2BAA2B;IAS7C,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc;IAWjD,mBAAmB,CACjB,QAAQ,EAAE,KAAK,CAAC,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,EAC1D,SAAS,EAAE,KAAK,CAAC,2BAA2B,EAC5C,OAAO,UAAQ;IAsBjB,OAAO,CAAC,MAAM,EAAE,MAAM,aACH,MAAM,eAAe;IA6DxC,YAAY,CACV,gBAAgB,EAAE;QAChB,EAAE,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,KAAK,CAAC,YAAY,CAAC;QAC3E,MAAM,EAAE,MAAM,CAAC;KAChB,EAAE;CAIN"}

package/dist/messageRepository/utils/getMessageFromMainDB.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMessageFromMainDB.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/utils/getMessageFromMainDB.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,oBAAoB,cAAe,MAAM,KAAG,MAAM,eAAe,GAAG,SAOhF,CAAC"}
+{"version":3,"file":"getMessageFromMainDB.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/utils/getMessageFromMainDB.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,oBAAoB,cAAe,MAAM,KAAG,MAAM,eAAe,GAAG,SAShF,CAAC"}

package/dist/messageRepository/utils/getMessageIdentifierIds.d.ts

@@ -0,0 +1,2 @@
+export declare function getMessageIdentifierIds(messages: Amity.RawMessage[]): string[];
+//# sourceMappingURL=getMessageIdentifierIds.d.ts.map

package/dist/messageRepository/utils/getMessageIdentifierIds.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getMessageIdentifierIds.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/utils/getMessageIdentifierIds.ts"],"names":[],"mappings":"AAoBA,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,KAAK,CAAC,UAAU,EAAE,YAgBnE"}

package/dist/messageRepository/utils/index.d.ts

@@ -1,2 +1,3 @@
 export * from './prepareMessagePayload';
+export * from './getMessageIdentifierIds';
 //# sourceMappingURL=index.d.ts.map

package/dist/messageRepository/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC"}

package/dist/messageRepository/utils/prepareMessagePayload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepareMessagePayload.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/utils/prepareMessagePayload.ts"],"names":[],"mappings":"AA6BA,wBAAgB,cAAc,CAC5B,OAAO,EAAE,KAAK,CAAC,UAAU,EACzB,QAAQ,CAAC,EAAE,KAAK,CAAC,eAAe,EAAE,EAClC,KAAK,CAAC,EAAE,MAAM,KAAK,CAAC,iBAAiB,GACpC,KAAK,CAAC,eAAe,CAqEvB;AAWD,eAAO,MAAM,qBAAqB,YACvB,MAAM,cAAc,UACrB,MAAM,MAAM,iBAAiB,KACpC,QAAQ,MAAM,uBAAuB,CA0CvC,CAAC;AAEF,aAAK,gBAAgB,GAAG,IAAI,CAC1B,KAAK,CAAC,aAAa,EAIjB,MAAM,GACN,QAAQ,GACR,cAAc,GACd,MAAM,GACN,gBAAgB,GAChB,iBAAiB,GACjB,UAAU,GACV,eAAe,GACf,eAAe,CAClB,GAAG;IACF,WAAW,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;IACnD,WAAW,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;IACnD,SAAS,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACvC,aAAa,EAAE,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;IACnD,QAAQ,CAAC,EAAE,KAAK,CAAC,kBAAkB,CAAC;IACpC,OAAO,EAAE;QACP,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACvC,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;KACrC,CAAC;CACH,CAAC;AAEF,wBAAgB,aAAa,CAAC,EAC5B,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,IAAI,EACJ,GAAG,IAAI,EACR,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAc9C;AAED,wBAAgB,kBAAkB,CAAC,EACjC,MAAM,EACN,YAAY,EACZ,IAAI,EACJ,aAAa,EACb,aAAa,EACb,cAAc,EACd,eAAe,EACf,KAAK,EACL,IAAI,EACJ,GAAG,IAAI,EACR,EAAE,KAAK,CAAC,sBAAsB,GAAG,gBAAgB,CA6BjD"}
+{"version":3,"file":"prepareMessagePayload.d.ts","sourceRoot":"","sources":["../../../src/messageRepository/utils/prepareMessagePayload.ts"],"names":[],"mappings":"AAiCA,wBAAgB,cAAc,CAC5B,OAAO,EAAE,KAAK,CAAC,UAAU,EACzB,QAAQ,CAAC,EAAE,KAAK,CAAC,eAAe,EAAE,EAClC,KAAK,CAAC,EAAE,MAAM,KAAK,CAAC,iBAAiB,GACpC,KAAK,CAAC,eAAe,CAqEvB;AAWD,eAAO,MAAM,qBAAqB,YACvB,MAAM,cAAc,UACrB,MAAM,MAAM,iBAAiB,KACpC,QAAQ,MAAM,uBAAuB,CA0CvC,CAAC;AAEF,aAAK,gBAAgB,GAAG,IAAI,CAC1B,KAAK,CAAC,aAAa,EAIjB,MAAM,GACN,QAAQ,GACR,cAAc,GACd,MAAM,GACN,gBAAgB,GAChB,iBAAiB,GACjB,UAAU,GACV,eAAe,GACf,eAAe,CAClB,GAAG;IACF,WAAW,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;IACnD,WAAW,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;IACnD,SAAS,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACvC,aAAa,EAAE,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;IACnD,QAAQ,CAAC,EAAE,KAAK,CAAC,kBAAkB,CAAC;IACpC,OAAO,EAAE;QACP,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACvC,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;KACrC,CAAC;CACH,CAAC;AAEF,wBAAgB,aAAa,CAAC,EAC5B,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,IAAI,EACJ,GAAG,IAAI,EACR,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAc9C;AAED,wBAAgB,kBAAkB,CAAC,EACjC,MAAM,EACN,YAAY,EACZ,IAAI,EACJ,aAAa,EACb,aAAa,EACb,cAAc,EACd,eAAe,EACf,KAAK,EACL,IAAI,EACJ,GAAG,IAAI,EACR,EAAE,KAAK,CAAC,sBAAsB,GAAG,gBAAgB,CA6BjD"}

package/dist/utils/event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../src/utils/event.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,mBAAmB,qMAM6B,MAAM,YAAY,iJAgBzE,CAAC"}
+{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../src/utils/event.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mBAAmB,qMAM6B,MAAM,YAAY,iJA+BzE,CAAC"}

package/package.json

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

package/src/@types/domains/client.ts

@@ -65,6 +65,8 @@ declare global {
       getMessagePreviewSetting: (refresh?: boolean) => Promise<Amity.MessagePreviewSetting>;
 
       getMarkerSyncConsistentMode: () => boolean;
+
+      objectSyncMap: Map<string, string | undefined>;
     };
 
     type Device = {

package/src/client/api/createClient.ts

@@ -77,6 +77,8 @@ export const createClient = (
 
   const isUnreadCountEnabled = false;
 
+  const objectSyncMap = new Map<string, string>();
+
   const client = {
     version: `${VERSION}`,
     apiKey,
@@ -114,6 +116,30 @@ export const createClient = (
     isUnreadCountEnabled,
 
     getMarkerSyncConsistentMode,
+
+    /*
+     * The objectSyncMap is used to keep the map between local referenceId and server id in two ways mapping.
+     *
+     * For objects created locally (optimistic creation), the SDK stores them with their local ID as the cache key, which is used throughout the entire SDK session (in-memory) for syncing updates.
+     * If the payload or response only contains the remote ID of the same object, the SDK will look up the corresponding local ID to retrieve the object through ObjectSyncMap.
+     *
+     * This is useful for syncing updates to the object, as the SDK can find the local ID from the server ID and update the object in the cache correctly.
+     *
+     * Example:
+     * In the case of message optimistically creation. The referenceId is created locally.
+     *
+     * 1. When creating a message optimistically, a local referenceId is created. The objectSyncMap will have the following structure.
+     * {
+     *   "LOCAL_uuid": undefined,
+     * }
+     *
+     * 2. After the message was created on the server and SDK received the response from server, the objectSyncMap will be updated to
+     * {
+     *  "LOCAL_uuid": "server_message_id",
+     *  "server_message_id": "LOCAL_uuid"
+     * }
+     */
+    objectSyncMap,
   };
 
   try {

package/src/core/model/index.ts

@@ -1,5 +1,6 @@
 export * from './idResolvers';
 export * from './identifyModel';
+export * from './localReferenceId';
 
 /**
  * A map of v3 response keys to a store name.

package/src/core/model/localReferenceId.ts

@@ -0,0 +1,12 @@
+/*
+ * To check if an id is a local referenceId, the id must start with 'LOCAL_'.
+ *
+ * Example: LOCAL_155f5158-281a-4a9d-a445-9243138d2041
+ *
+ * @param id as string
+ * @returns true if the id is a local referenceId, false otherwise
+ */
+
+export const isLocalId = (id: string) => {
+  return id.startsWith('LOCAL_');
+};

package/src/messageRepository/api/createMessage.ts

@@ -30,6 +30,7 @@ const createMessageOptimistic = <T extends Amity.MessageContentType>(
   bundle: createMessageParam<T>,
 ): Amity.InternalMessage | undefined => {
   const client = getActiveClient();
+  const { objectSyncMap } = client;
 
   if (!client.cache) return;
 
@@ -84,6 +85,9 @@ const createMessageOptimistic = <T extends Amity.MessageContentType>(
   const cachedAt = UNSYNCED_OBJECT_CACHED_AT_VALUE;
 
   pushToCache(['message', 'get', message.messageId], message, { cachedAt });
+
+  objectSyncMap.set(message.messageId, undefined);
+
   fireEvent('local.message.created', { messages: [message] });
 
   return message;
@@ -114,6 +118,8 @@ export const createMessage = async <T extends Amity.MessageContentType>(
   bundle: createMessageParam<T>,
 ): Promise<Amity.Cached<Amity.Message>> => {
   const client = getActiveClient();
+
+  const { objectSyncMap } = client;
   client.log('message/createMessage', bundle);
 
   const optimisticData = createMessageOptimistic<T>(bundle);
@@ -127,6 +133,9 @@ export const createMessage = async <T extends Amity.MessageContentType>(
       referenceId,
     });
 
+    objectSyncMap.set(referenceId, payload.messages[0].messageId);
+    objectSyncMap.set(payload.messages[0].messageId, referenceId);
+
     const data = await prepareMessagePayload(payload);
     const { messages } = data;
 

package/src/messageRepository/observers/getMessages/MessageLiveCollectionController.ts

@@ -75,6 +75,7 @@ export class MessageLiveCollectionController extends LiveCollectionController<
 
   notifyChange({ origin, loading, error }: Amity.LiveCollectionNotifyParams) {
     const collection = pullFromCache<Amity.MessageLiveCollectionCache>(this.cacheKey)?.data;
+
     if (!collection) return;
 
     const data = this.applyFilter(

package/src/messageRepository/observers/getMessages/MessageQueryStreamController.ts

@@ -2,9 +2,9 @@
 import { QueryStreamController } from '~/core/liveCollection/QueryStreamController';
 import { pullFromCache, pushToCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
-import { getResolver } from '~/core/model';
 import { getActiveClient } from '~/client';
 import { MessagePaginationController } from './MessagePaginationController';
+import { getMessageIdentifierIds } from '~/messageRepository/utils';
 
 export class MessageQueryStreamController extends QueryStreamController<
   Amity.MessagePayload,
@@ -50,7 +50,7 @@ export class MessageQueryStreamController extends QueryStreamController<
   ) {
     if (refresh) {
       pushToCache(this.cacheKey, {
-        data: response.messages.map(getResolver('message')),
+        data: getMessageIdentifierIds(response.messages),
         query: this.query,
       });
     } else {
@@ -62,8 +62,8 @@ export class MessageQueryStreamController extends QueryStreamController<
         ...collection,
         data:
           direction === 'next'
-            ? [...new Set([...messages, ...response.messages.map(getResolver('message'))])]
-            : [...new Set([...response.messages.map(getResolver('message')), ...messages])],
+            ? [...new Set([...messages, ...getMessageIdentifierIds(response.messages)])]
+            : [...new Set([...getMessageIdentifierIds(response.messages), ...messages])],
       });
     }
   }

package/src/messageRepository/utils/getMessageFromMainDB.ts

@@ -1,11 +1,14 @@
 import { pullFromCache } from '~/cache/api/pullFromCache';
-import { queryCache } from '~/cache/api/queryCache';
+import { getActiveClient } from '~/client/api/activeClient';
+import { isLocalId } from '~/core/model';
 
 export const getMessageFromMainDB = (messageId: string): Amity.InternalMessage | undefined => {
-  const message = pullFromCache<Amity.InternalMessage>(['message', 'get', messageId])?.data;
-  if (message) return message;
+  const client = getActiveClient();
+  const { objectSyncMap } = client;
 
-  // If message is not found by messageId as a key, query all messages in cache and find the message by messageId
-  const messages = queryCache<Amity.InternalMessage>(['message', 'get']);
-  return messages?.find(({ data }) => data.messageId === messageId)?.data;
+  const resolvedMessageId = isLocalId(messageId)
+    ? messageId
+    : objectSyncMap.get(messageId) ?? messageId;
+
+  return pullFromCache<Amity.InternalMessage>(['message', 'get', resolvedMessageId])?.data;
 };

package/src/messageRepository/utils/getMessageIdentifierIds.ts

@@ -0,0 +1,37 @@
+import { getActiveClient } from '~/client/api/activeClient';
+import { isLocalId } from '~/core/model';
+
+/*
+ * To get message identifier ids used as a cache key for the each message.
+ * These ids are used to store in the query stream and use to get messages from cache.
+ *
+ * The query stream data keeps the message identifier ids as follows:
+ * ['server_message_id_1', 'server_message_id_2', 'LOCAL_message_id_1', 'LOCAL_message_id_2']
+ *
+ * Example use case: Message created locally and then created on the server.
+ *
+ * 1. Message created locally has `LOCAL_message_id_2` as referenceId.
+ * 2. The `message.created` event will be fired from server with message payload that has no the referenceId.
+ * 3. SDK use this function to find indentifer id for each message in the payload. If the message is created locally, the identifier id will be the local reference id.
+ * 4. The SDK use this identifier ids to check if the message is already in the query stream before appending it.
+ *
+ * @param The raw message payload from server response
+ * @returns The identifier ids of the messages
+ */
+export function getMessageIdentifierIds(messages: Amity.RawMessage[]) {
+  const client = getActiveClient();
+  const { objectSyncMap } = client;
+
+  return messages
+    .map(message => {
+      /* NOTE: This logic is used to get identifier id for each message.
+       *
+       * if messageId is a local id, use it as identifier id else get identifier id from objectSyncMap.
+       * if find referenceId in objectSyncMap, this means this message is a local created message. The identifier id will be local message id.
+       * if cannot find identifier id in objectSyncMap, this means this message is not a local created message. The identifier id will be server message id.
+       */
+      if (isLocalId(message.messageId)) return message.messageId;
+      return objectSyncMap.get(message.messageId) ?? message.messageId;
+    })
+    .filter(Boolean);
+}

package/src/messageRepository/utils/index.ts

@@ -1 +1,2 @@
 export * from './prepareMessagePayload';
+export * from './getMessageIdentifierIds';

package/src/messageRepository/utils/prepareMessagePayload.ts

@@ -1,4 +1,4 @@
-import { pullFromCache, queryCache } from '~/cache/api';
+import { pullFromCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { getMessageMarkers } from '~/marker/api/getMessageMarkers';
 import { prepareMessagePayloadForCache } from '~/reactionRepository/utils/prepareMessagePayloadForCache';
@@ -8,23 +8,27 @@ import { MessageContentType } from '~/@types';
 import { convertFromRaw as convertSubChannelFromRaw } from '~/subChannelRepository/utils/convertSubChannelFromRaw';
 import { updateSubChannelCache } from '~/subChannelRepository/utils/updateSubChannelCache';
 import { COLLECTION_DEFAULT_PAGINATION_LIMIT } from '~/utils/constants';
+import { getActiveClient } from '~/client/api/activeClient';
+import { isLocalId } from '~/core/model';
 
-const mergePayloadWithLocal = (payload: Amity.RawMessage) => {
-  const localMessage = queryCache<Amity.InternalMessage>(['message', 'get'])?.find(
-    ({ data }) => data.messageId === payload.messageId,
-  )?.data;
+const addLocalReferenceId = (payload: Amity.RawMessage) => {
+  const client = getActiveClient();
+  const { objectSyncMap } = client;
 
-  if (localMessage) {
-    return {
-      ...localMessage,
-      ...payload,
-      // NOTE: referenceId is missing in the payload. If we have local message data with referenceId, use it instead.
-      // TODO: Remove this logic when BE fixes the payload
-      referenceId: localMessage.referenceId ?? payload.referenceId,
-    };
-  }
-
-  return payload;
+  return {
+    ...payload,
+    /* NOTE: This logic is used to get local referenceId for each message.
+     *
+     * if messageId is a local reference id, use it as referenceId else get referenceId from objectSyncMap.
+     * if find referenceId in objectSyncMap, this means this message is a local created message. The referenceId will be local reference id.
+     * if cannot find referenceId in objectSyncMap, referenceId will be undefined.
+     *
+     * The referenceId is undefined means this message is not a local created message (optimistic creation message).
+     */
+    referenceId: isLocalId(payload.messageId)
+      ? payload.messageId
+      : objectSyncMap.get(payload.messageId),
+  };
 };
 
 export function convertFromRaw(
@@ -32,7 +36,7 @@ export function convertFromRaw(
   reactors?: Amity.InternalReactor[],
   event?: keyof Amity.MqttMessageEvents,
 ): Amity.InternalMessage {
-  const mergeMessage = mergePayloadWithLocal(message);
+  const messageWithReferenceId = addLocalReferenceId(message);
 
   const {
     channelPublicId,
@@ -48,7 +52,7 @@ export function convertFromRaw(
     messageId,
     creatorId,
     ...rest
-  } = mergeMessage;
+  } = messageWithReferenceId;
 
   let cache: Amity.CacheEntry<Amity.Message> | undefined;
 

package/src/utils/event.ts

@@ -1,4 +1,6 @@
-import { pullFromCache } from '~/cache/api';
+import { pullFromCache } from '~/cache/api/pullFromCache';
+import { getActiveClient } from '~/client/api/activeClient';
+import { isLocalId } from '~/core/model';
 
 export const convertEventPayload =
   <
@@ -16,8 +18,23 @@ export const convertEventPayload =
         return sourceModel;
       }
 
-      const cacheKey = [destinationDomain, 'get', `${sourceModel[sourceModelProp]}`];
-      const model = pullFromCache<DestinationModel>(cacheKey)?.data;
+      const client = getActiveClient();
+      const { objectSyncMap } = client;
+
+      /*
+       * NOTE: For objects created locally (optimistic creation), the SDK stores them with their local ID as the cache key, which is used throughout the entire SDK session (in-memory) for syncing updates.
+       * If the payload or response only contains the remote ID of the same object, the SDK will look up the corresponding local ID to retrieve the object.
+       */
+      const resolvedId = isLocalId(sourceModel[sourceModelProp] as unknown as string)
+        ? sourceModel[sourceModelProp]
+        : objectSyncMap.get(sourceModel[sourceModelProp] as unknown as string) ??
+          sourceModel[sourceModelProp];
+
+      const model = pullFromCache<DestinationModel>([
+        destinationDomain,
+        'get',
+        `${resolvedId}`,
+      ])?.data;
 
       if (!model) return;