@amityco/ts-sdk-react-native 6.30.4 → 6.31.0

package/dist/@types/domains/client.d.ts

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

package/dist/@types/domains/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/@types/domains/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/@types/domains/client.ts"],"names":[],"mappings":"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"}

package/dist/client/api/createClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createClient.d.ts","sourceRoot":"","sources":["../../../src/client/api/createClient.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAc,MAAM,0BAA0B,CAAC;AAsBnE;;;;;;;;;;;;;;;KAeK;AACL,eAAO,MAAM,YAAY,WACf,MAAM,cACH,CAAA,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;;;;;;MAQtD,MAAM,MA4ER,CAAC"}
+{"version":3,"file":"createClient.d.ts","sourceRoot":"","sources":["../../../src/client/api/createClient.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAc,MAAM,0BAA0B,CAAC;AAsBnE;;;;;;;;;;;;;;;KAeK;AACL,eAAO,MAAM,YAAY,WACf,MAAM,cACH,CAAA,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;;;;;;MAQtD,MAAM,MAsGR,CAAC"}

package/dist/core/model/index.d.ts

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

package/dist/core/model/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/model/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAEhC;;;GAGG;AACH,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CA+CtD,CAAC;AAEF,aAAa;AACb,eAAO,MAAM,UAAU,2DAA0D,OAMhF,CAAC;AAEF,aAAa;AACb,wBAAgB,aAAa,CAAC,IAAI,GAAE,MAAM,GAAG,SAAoC,GAAG,MAAM,CAEzF;AAED,aAAa;AACb,wBAAgB,WAAW,CAAC,IAAI,GAAE,MAAM,GAAG,SAAoC,GAAG,MAAM,CAEvF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/model/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AAEnC;;;GAGG;AACH,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CA+CtD,CAAC;AAEF,aAAa;AACb,eAAO,MAAM,UAAU,2DAA0D,OAMhF,CAAC;AAEF,aAAa;AACb,wBAAgB,aAAa,CAAC,IAAI,GAAE,MAAM,GAAG,SAAoC,GAAG,MAAM,CAEzF;AAED,aAAa;AACb,wBAAgB,WAAW,CAAC,IAAI,GAAE,MAAM,GAAG,SAAoC,GAAG,MAAM,CAEvF"}

package/dist/core/model/localReferenceId.d.ts

@@ -0,0 +1,2 @@
+export declare const isLocalId: (id: string) => boolean;
+//# sourceMappingURL=localReferenceId.d.ts.map

package/dist/core/model/localReferenceId.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"localReferenceId.d.ts","sourceRoot":"","sources":["../../../src/core/model/localReferenceId.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,SAAS,OAAQ,MAAM,YAEnC,CAAC"}

package/dist/index.cjs.js

@@ -123,8 +123,8 @@ const PostContentType = Object.freeze({
 
 function getVersion() {
     try {
-        // the string ''v6.30.4-cjs'' should be replaced by actual value by @rollup/plugin-replace
-        return 'v6.30.4-cjs';
+        // the string ''v6.31.0-cjs'' should be replaced by actual value by @rollup/plugin-replace
+        return 'v6.31.0-cjs';
     }
     catch (error) {
         return '__dev__';
@@ -572,6 +572,18 @@ const idResolvers = {
  */
 const getResolver = (name) => idResolvers[name];
 
+/*
+ * 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
+ */
+const isLocalId = (id) => {
+    return id.startsWith('LOCAL_');
+};
+
 /**
  * A map of v3 response keys to a store name.
  * @hidden
@@ -6829,21 +6841,26 @@ function convertFromRaw$1(_a) {
         } }, rest), { channelId: channelPublicId, creatorId: creatorPublicId, displayName: name, lastActivity: lastMessageTimestamp, latestMessageId: lastMessageId, messageCount: childCount, subChannelId: messageFeedId, isUnreadCountSupport: isUnreadCountSupport$1({ channelType }) });
 }
 
-const mergePayloadWithLocal = (payload) => {
-    var _a, _b, _c;
-    const localMessage = (_b = (_a = queryCache(['message', 'get'])) === null || _a === void 0 ? void 0 : _a.find(({ data }) => data.messageId === payload.messageId)) === null || _b === void 0 ? void 0 : _b.data;
-    if (localMessage) {
-        return Object.assign(Object.assign(Object.assign({}, 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: (_c = localMessage.referenceId) !== null && _c !== void 0 ? _c : payload.referenceId });
-    }
-    return payload;
+const addLocalReferenceId = (payload) => {
+    const client = getActiveClient();
+    const { objectSyncMap } = client;
+    return Object.assign(Object.assign({}, 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) });
 };
 function convertFromRaw(message, reactors, event) {
     var _a;
-    const mergeMessage = mergePayloadWithLocal(message);
-    const { channelPublicId, childCount, creatorPublicId, mentionedUsers, messageFeedId, myReactions, reactionCount, reactions, referenceId, segment, messageId, creatorId } = mergeMessage, rest = __rest(mergeMessage, ["channelPublicId", "childCount", "creatorPublicId", "mentionedUsers", "messageFeedId", "myReactions", "reactionCount", "reactions", "referenceId", "segment", "messageId", "creatorId"]);
+    const messageWithReferenceId = addLocalReferenceId(message);
+    const { channelPublicId, childCount, creatorPublicId, mentionedUsers, messageFeedId, myReactions, reactionCount, reactions, referenceId, segment, messageId, creatorId } = messageWithReferenceId, rest = __rest(messageWithReferenceId, ["channelPublicId", "childCount", "creatorPublicId", "mentionedUsers", "messageFeedId", "myReactions", "reactionCount", "reactions", "referenceId", "segment", "messageId", "creatorId"]);
     let cache;
     if (referenceId) {
         cache = pullFromCache(['message', 'get', referenceId]);
@@ -8660,6 +8677,42 @@ const updateSubChannelUnreadFromMessage = (message) => {
     pushToCache(cacheKeyUnreadCount, updatedCachedUnreadCount);
 };
 
+/*
+ * 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
+ */
+function getMessageIdentifierIds(messages) {
+    const client = getActiveClient();
+    const { objectSyncMap } = client;
+    return messages
+        .map(message => {
+        var _a;
+        /* 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 (_a = objectSyncMap.get(message.messageId)) !== null && _a !== void 0 ? _a : message.messageId;
+    })
+        .filter(Boolean);
+}
+
 /**
  * ```js
  * import { onMessageCreated } from '@amityco/ts-sdk-react-native'
@@ -9360,6 +9413,7 @@ const createClient = (apiKey, apiRegion = API_REGIONS.SG, { debugSession = DEFAU
     const sessionState = "notLoggedIn" /* Amity.SessionStates.NOT_LOGGED_IN */;
     const sessionHandler = undefined;
     const isUnreadCountEnabled = false;
+    const objectSyncMap = new Map();
     const client = {
         version: `${VERSION}`,
         apiKey,
@@ -9390,6 +9444,29 @@ const createClient = (apiKey, apiRegion = API_REGIONS.SG, { debugSession = DEFAU
         use: () => setActiveClient(client),
         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 {
         const activeClient = getActiveClient();
@@ -15008,12 +15085,24 @@ const unmuteChannel = async (channelId) => {
 /* end_public_function */
 
 const convertEventPayload = (eventHandler, sourceModelProp, destinationDomain) => (callback) => eventHandler(sourceModel => {
-    var _a;
+    var _a, _b;
     if (!sourceModel) {
         return sourceModel;
     }
-    const cacheKey = [destinationDomain, 'get', `${sourceModel[sourceModelProp]}`];
-    const model = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.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])
+        ? sourceModel[sourceModelProp]
+        : (_a = objectSyncMap.get(sourceModel[sourceModelProp])) !== null && _a !== void 0 ? _a : sourceModel[sourceModelProp];
+    const model = (_b = pullFromCache([
+        destinationDomain,
+        'get',
+        `${resolvedId}`,
+    ])) === null || _b === void 0 ? void 0 : _b.data;
     if (!model)
         return;
     return callback(model);
@@ -15441,6 +15530,7 @@ let uniqueId;
 const createMessageOptimistic = (bundle) => {
     var _a, _b;
     const client = getActiveClient();
+    const { objectSyncMap } = client;
     if (!client.cache)
         return;
     /*
@@ -15469,6 +15559,7 @@ const createMessageOptimistic = (bundle) => {
     const message = Object.assign({ creatorId: client.userId, creatorPrivateId: getActiveUser()._id, channelSegment: ((_b = subChannel === null || subChannel === void 0 ? void 0 : subChannel.data.messageCount) !== null && _b !== void 0 ? _b : 0) + 1, childrenNumber: 0, createdAt: createdTime, updatedAt: createdTime, syncState: "syncing" /* Amity.SyncState.Syncing */, isDeleted: false }, bundleWithMessageId);
     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;
 };
@@ -15496,12 +15587,15 @@ const createMessageOptimistic = (bundle) => {
  */
 const createMessage = async (bundle) => {
     const client = getActiveClient();
+    const { objectSyncMap } = client;
     client.log('message/createMessage', bundle);
     const optimisticData = createMessageOptimistic(bundle);
     const referenceId = bundle.referenceId || uniqueId || getLocalId();
     uniqueId = undefined;
     try {
         const { data: payload } = await client.http.post('/api/v5/messages', Object.assign(Object.assign({}, convertParams(bundle)), { referenceId }));
+        objectSyncMap.set(referenceId, payload.messages[0].messageId);
+        objectSyncMap.set(payload.messages[0].messageId, referenceId);
         const data = await prepareMessagePayload(payload);
         const { messages } = data;
         const cachedAt = client.cache && Date.now();
@@ -16256,7 +16350,7 @@ class MessageQueryStreamController extends QueryStreamController {
         var _a, _b;
         if (refresh) {
             pushToCache(this.cacheKey, {
-                data: response.messages.map(getResolver('message')),
+                data: getMessageIdentifierIds(response.messages),
                 query: this.query,
             });
         }
@@ -16264,8 +16358,8 @@ class MessageQueryStreamController extends QueryStreamController {
             const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
             const messages = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
             pushToCache(this.cacheKey, Object.assign(Object.assign({}, 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])] }));
         }
     }
     reactor(action) {
@@ -16339,12 +16433,12 @@ class MessagePaginationController extends PaginationController {
 
 const getMessageFromMainDB = (messageId) => {
     var _a, _b;
-    const message = (_a = pullFromCache(['message', 'get', messageId])) === null || _a === void 0 ? void 0 : _a.data;
-    if (message)
-        return message;
-    // If message is not found by messageId as a key, query all messages in cache and find the message by messageId
-    const messages = queryCache(['message', 'get']);
-    return (_b = messages === null || messages === void 0 ? void 0 : messages.find(({ data }) => data.messageId === messageId)) === null || _b === void 0 ? void 0 : _b.data;
+    const client = getActiveClient();
+    const { objectSyncMap } = client;
+    const resolvedMessageId = isLocalId(messageId)
+        ? messageId
+        : (_a = objectSyncMap.get(messageId)) !== null && _a !== void 0 ? _a : messageId;
+    return (_b = pullFromCache(['message', 'get', resolvedMessageId])) === null || _b === void 0 ? void 0 : _b.data;
 };
 
 class MessageLiveCollectionController extends LiveCollectionController {
@@ -16684,7 +16778,8 @@ var index$g = /*#__PURE__*/Object.freeze({
   convertFromRaw: convertFromRaw,
   prepareMessagePayload: prepareMessagePayload,
   convertParams: convertParams,
-  convertQueryParams: convertQueryParams$1
+  convertQueryParams: convertQueryParams$1,
+  getMessageIdentifierIds: getMessageIdentifierIds
 });
 
 /**

package/dist/index.esm.js

@@ -89,8 +89,8 @@ const PostContentType = Object.freeze({
 
 function getVersion() {
     try {
-        // the string ''v6.30.4-esm'' should be replaced by actual value by @rollup/plugin-replace
-        return 'v6.30.4-esm';
+        // the string ''v6.31.0-esm'' should be replaced by actual value by @rollup/plugin-replace
+        return 'v6.31.0-esm';
     }
     catch (error) {
         return '__dev__';
@@ -538,6 +538,18 @@ const idResolvers = {
  */
 const getResolver = (name) => idResolvers[name];
 
+/*
+ * 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
+ */
+const isLocalId = (id) => {
+    return id.startsWith('LOCAL_');
+};
+
 /**
  * A map of v3 response keys to a store name.
  * @hidden
@@ -22902,21 +22914,26 @@ function convertFromRaw$1(_a) {
         } }, rest), { channelId: channelPublicId, creatorId: creatorPublicId, displayName: name, lastActivity: lastMessageTimestamp, latestMessageId: lastMessageId, messageCount: childCount, subChannelId: messageFeedId, isUnreadCountSupport: isUnreadCountSupport$1({ channelType }) });
 }
 
-const mergePayloadWithLocal = (payload) => {
-    var _a, _b, _c;
-    const localMessage = (_b = (_a = queryCache(['message', 'get'])) === null || _a === void 0 ? void 0 : _a.find(({ data }) => data.messageId === payload.messageId)) === null || _b === void 0 ? void 0 : _b.data;
-    if (localMessage) {
-        return Object.assign(Object.assign(Object.assign({}, 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: (_c = localMessage.referenceId) !== null && _c !== void 0 ? _c : payload.referenceId });
-    }
-    return payload;
+const addLocalReferenceId = (payload) => {
+    const client = getActiveClient();
+    const { objectSyncMap } = client;
+    return Object.assign(Object.assign({}, 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) });
 };
 function convertFromRaw(message, reactors, event) {
     var _a;
-    const mergeMessage = mergePayloadWithLocal(message);
-    const { channelPublicId, childCount, creatorPublicId, mentionedUsers, messageFeedId, myReactions, reactionCount, reactions, referenceId, segment, messageId, creatorId } = mergeMessage, rest = __rest(mergeMessage, ["channelPublicId", "childCount", "creatorPublicId", "mentionedUsers", "messageFeedId", "myReactions", "reactionCount", "reactions", "referenceId", "segment", "messageId", "creatorId"]);
+    const messageWithReferenceId = addLocalReferenceId(message);
+    const { channelPublicId, childCount, creatorPublicId, mentionedUsers, messageFeedId, myReactions, reactionCount, reactions, referenceId, segment, messageId, creatorId } = messageWithReferenceId, rest = __rest(messageWithReferenceId, ["channelPublicId", "childCount", "creatorPublicId", "mentionedUsers", "messageFeedId", "myReactions", "reactionCount", "reactions", "referenceId", "segment", "messageId", "creatorId"]);
     let cache;
     if (referenceId) {
         cache = pullFromCache(['message', 'get', referenceId]);
@@ -24733,6 +24750,42 @@ const updateSubChannelUnreadFromMessage = (message) => {
     pushToCache(cacheKeyUnreadCount, updatedCachedUnreadCount);
 };
 
+/*
+ * 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
+ */
+function getMessageIdentifierIds(messages) {
+    const client = getActiveClient();
+    const { objectSyncMap } = client;
+    return messages
+        .map(message => {
+        var _a;
+        /* 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 (_a = objectSyncMap.get(message.messageId)) !== null && _a !== void 0 ? _a : message.messageId;
+    })
+        .filter(Boolean);
+}
+
 /**
  * ```js
  * import { onMessageCreated } from '@amityco/ts-sdk-react-native'
@@ -25433,6 +25486,7 @@ const createClient = (apiKey, apiRegion = API_REGIONS.SG, { debugSession = DEFAU
     const sessionState = "notLoggedIn" /* Amity.SessionStates.NOT_LOGGED_IN */;
     const sessionHandler = undefined;
     const isUnreadCountEnabled = false;
+    const objectSyncMap = new Map();
     const client = {
         version: `${VERSION}`,
         apiKey,
@@ -25463,6 +25517,29 @@ const createClient = (apiKey, apiRegion = API_REGIONS.SG, { debugSession = DEFAU
         use: () => setActiveClient(client),
         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 {
         const activeClient = getActiveClient();
@@ -31081,12 +31158,24 @@ const unmuteChannel = async (channelId) => {
 /* end_public_function */
 
 const convertEventPayload = (eventHandler, sourceModelProp, destinationDomain) => (callback) => eventHandler(sourceModel => {
-    var _a;
+    var _a, _b;
     if (!sourceModel) {
         return sourceModel;
     }
-    const cacheKey = [destinationDomain, 'get', `${sourceModel[sourceModelProp]}`];
-    const model = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.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])
+        ? sourceModel[sourceModelProp]
+        : (_a = objectSyncMap.get(sourceModel[sourceModelProp])) !== null && _a !== void 0 ? _a : sourceModel[sourceModelProp];
+    const model = (_b = pullFromCache([
+        destinationDomain,
+        'get',
+        `${resolvedId}`,
+    ])) === null || _b === void 0 ? void 0 : _b.data;
     if (!model)
         return;
     return callback(model);
@@ -31514,6 +31603,7 @@ let uniqueId;
 const createMessageOptimistic = (bundle) => {
     var _a, _b;
     const client = getActiveClient();
+    const { objectSyncMap } = client;
     if (!client.cache)
         return;
     /*
@@ -31542,6 +31632,7 @@ const createMessageOptimistic = (bundle) => {
     const message = Object.assign({ creatorId: client.userId, creatorPrivateId: getActiveUser()._id, channelSegment: ((_b = subChannel === null || subChannel === void 0 ? void 0 : subChannel.data.messageCount) !== null && _b !== void 0 ? _b : 0) + 1, childrenNumber: 0, createdAt: createdTime, updatedAt: createdTime, syncState: "syncing" /* Amity.SyncState.Syncing */, isDeleted: false }, bundleWithMessageId);
     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;
 };
@@ -31569,12 +31660,15 @@ const createMessageOptimistic = (bundle) => {
  */
 const createMessage = async (bundle) => {
     const client = getActiveClient();
+    const { objectSyncMap } = client;
     client.log('message/createMessage', bundle);
     const optimisticData = createMessageOptimistic(bundle);
     const referenceId = bundle.referenceId || uniqueId || getLocalId();
     uniqueId = undefined;
     try {
         const { data: payload } = await client.http.post('/api/v5/messages', Object.assign(Object.assign({}, convertParams(bundle)), { referenceId }));
+        objectSyncMap.set(referenceId, payload.messages[0].messageId);
+        objectSyncMap.set(payload.messages[0].messageId, referenceId);
         const data = await prepareMessagePayload(payload);
         const { messages } = data;
         const cachedAt = client.cache && Date.now();
@@ -32329,7 +32423,7 @@ class MessageQueryStreamController extends QueryStreamController {
         var _a, _b;
         if (refresh) {
             pushToCache(this.cacheKey, {
-                data: response.messages.map(getResolver('message')),
+                data: getMessageIdentifierIds(response.messages),
                 query: this.query,
             });
         }
@@ -32337,8 +32431,8 @@ class MessageQueryStreamController extends QueryStreamController {
             const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
             const messages = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
             pushToCache(this.cacheKey, Object.assign(Object.assign({}, 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])] }));
         }
     }
     reactor(action) {
@@ -32412,12 +32506,12 @@ class MessagePaginationController extends PaginationController {
 
 const getMessageFromMainDB = (messageId) => {
     var _a, _b;
-    const message = (_a = pullFromCache(['message', 'get', messageId])) === null || _a === void 0 ? void 0 : _a.data;
-    if (message)
-        return message;
-    // If message is not found by messageId as a key, query all messages in cache and find the message by messageId
-    const messages = queryCache(['message', 'get']);
-    return (_b = messages === null || messages === void 0 ? void 0 : messages.find(({ data }) => data.messageId === messageId)) === null || _b === void 0 ? void 0 : _b.data;
+    const client = getActiveClient();
+    const { objectSyncMap } = client;
+    const resolvedMessageId = isLocalId(messageId)
+        ? messageId
+        : (_a = objectSyncMap.get(messageId)) !== null && _a !== void 0 ? _a : messageId;
+    return (_b = pullFromCache(['message', 'get', resolvedMessageId])) === null || _b === void 0 ? void 0 : _b.data;
 };
 
 class MessageLiveCollectionController extends LiveCollectionController {
@@ -32757,7 +32851,8 @@ var index$g = /*#__PURE__*/Object.freeze({
   convertFromRaw: convertFromRaw,
   prepareMessagePayload: prepareMessagePayload,
   convertParams: convertParams,
-  convertQueryParams: convertQueryParams$1
+  convertQueryParams: convertQueryParams$1,
+  getMessageIdentifierIds: getMessageIdentifierIds
 });
 
 /**