@amityco/ts-sdk 6.26.3 → 6.27.1-061592b.0

package/dist/index.esm.js

@@ -31,7 +31,12 @@ const VideoSize = Object.freeze({
     MEDIUM: 'medium',
     HIGH: 'high',
     ORIGINAL: 'original',
-});
+});
+var FileAccessTypeEnum;
+(function (FileAccessTypeEnum) {
+    FileAccessTypeEnum["PUBLIC"] = "public";
+    FileAccessTypeEnum["NETWORK"] = "network";
+})(FileAccessTypeEnum || (FileAccessTypeEnum = {}));
 
 const CommunityPostSettings = Object.freeze({
     ONLY_ADMIN_CAN_POST: 'ONLY_ADMIN_CAN_POST',
@@ -82,8 +87,8 @@ const PostContentType = Object.freeze({
 
 function getVersion() {
     try {
-        // the string ''v6.26.3-esm'' should be replaced by actual value by @rollup/plugin-replace
-        return 'v6.26.3-esm';
+        // the string ''v6.27.0-esm'' should be replaced by actual value by @rollup/plugin-replace
+        return 'v6.27.0-esm';
     }
     catch (error) {
         return '__dev__';
@@ -491,7 +496,7 @@ const idResolvers = {
     channel: ({ channelInternalId }) => channelInternalId,
     subChannel: ({ subChannelId }) => subChannelId,
     channelUsers: ({ channelId, userId }) => `${channelId}#${userId}`,
-    message: ({ messageId }) => messageId,
+    message: ({ messageId, referenceId }) => referenceId !== null && referenceId !== void 0 ? referenceId : messageId,
     messagePreviewChannel: ({ channelId }) => `${channelId}`,
     messagePreviewSubChannel: ({ subChannelId }) => `${subChannelId}`,
     channelUnreadInfo: ({ channelId }) => channelId,
@@ -1573,6 +1578,33 @@ const unwrapPayload = (response) => {
     return undefined;
 };
 
+class NetworkActivitiesWatcher {
+    constructor() {
+        this._listener = new Map();
+    }
+    onNetworkActivities(callback) {
+        this._listener.set(callback, callback);
+        return () => {
+            this._listener.delete(callback);
+        };
+    }
+    setNetworkActivities(request, response) {
+        this._listener.forEach(cb => cb(request, response));
+    }
+    destroy() {
+        this._listener.clear();
+    }
+}
+let instance$5;
+var NetworkActivitiesWatcher$1 = {
+    getInstance: () => {
+        if (!instance$5) {
+            instance$5 = new NetworkActivitiesWatcher();
+        }
+        return instance$5;
+    },
+};
+
 /*
  * Defined here as transport is a private module. Also, outside of this module
  * this enum holds no meaning.
@@ -1680,7 +1712,24 @@ const createHttpTransport = (endpoint) => {
         }
         return config;
     });
-    instance.interceptors.response.use(response => response, error => {
+    instance.interceptors.response.use(response => {
+        const headers = new Headers();
+        Object.entries(response.headers).forEach(([key, value]) => {
+            if (typeof value === 'string') {
+                headers.append(key, value);
+            }
+        });
+        NetworkActivitiesWatcher$1.getInstance().setNetworkActivities(new Request(response.request.url, {
+            method: response.request.method,
+            headers: response.request.headers,
+            body: response.request.data,
+        }), new Response(response.data, {
+            status: response.status,
+            statusText: response.statusText,
+            headers,
+        }));
+        return response;
+    }, error => {
         var _a, _b;
         const { response } = error;
         // handle unauthorized request
@@ -20742,6 +20791,19 @@ function __rest(s, e) {
                 t[p[i]] = s[p[i]];
         }
     return t;
+}
+
+function __classPrivateFieldGet(receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+}
+
+function __classPrivateFieldSet(receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 }
 
 /**
@@ -20948,12 +21010,12 @@ class AnalyticsEventCapturer {
         this._throttleStoryTimer = undefined;
         this._bufferNewSeenStoryReferenceIds = [];
     }
-    isAbleToEnqueue({ itemId, expireTime, isHighPriority = false, }) {
+    isAbleToEnqueue({ uniqueId, expireTime, isHighPriority = false, }) {
         const now = new Date();
         const getRecentViewedDate = () => {
             if (isHighPriority)
-                return this._recentHighPriorityViewed[itemId];
-            return this._recentViewed[itemId];
+                return this._recentHighPriorityViewed[uniqueId];
+            return this._recentViewed[uniqueId];
         };
         const recentViewedDate = getRecentViewedDate() || new Date(DAY * -1);
         const timeDiff = now.getTime() - recentViewedDate.getTime();
@@ -20963,8 +21025,8 @@ class AnalyticsEventCapturer {
         }
         return true;
     }
-    markAs(itemId, contentType, activityType, metadata = undefined) {
-        if (!this.isAbleToEnqueue({ itemId, expireTime: this._expireTime }))
+    markAs({ uniqueId, contentId, contentType, activityType, metadata, }) {
+        if (!this.isAbleToEnqueue({ uniqueId, expireTime: this._expireTime }))
             return;
         const now = new Date();
         const currentData = { event: [] };
@@ -20978,7 +21040,7 @@ class AnalyticsEventCapturer {
             currentData.event.shift();
         }
         const analyticItem = {
-            contentId: itemId,
+            contentId,
             contentType,
             activityType,
             timestamp: now.toISOString(),
@@ -20988,10 +21050,15 @@ class AnalyticsEventCapturer {
         }
         currentData.event.push(analyticItem);
         upsertInCache(ANALYTIC_CACHE_KEY, currentData);
-        this._recentViewed[itemId] = now;
+        this._recentViewed[uniqueId] = now;
     }
     markPostAsViewed(postId) {
-        this.markAs(postId, "post" /* Amity.AnalyticEventContentType.Post */, "view" /* Amity.AnalyticEventActivityType.View */);
+        this.markAs({
+            uniqueId: postId,
+            contentId: postId,
+            contentType: "post" /* Amity.AnalyticEventContentType.Post */,
+            activityType: "view" /* Amity.AnalyticEventActivityType.View */,
+        });
     }
     markStory(story, activityType) {
         if (!story.expiresAt)
@@ -20999,7 +21066,7 @@ class AnalyticsEventCapturer {
         const now = new Date();
         const expireTime = new Date(story.expiresAt);
         if (!this.isAbleToEnqueue({
-            itemId: story.storyId,
+            uniqueId: story.storyId,
             expireTime: expireTime.getTime(),
             isHighPriority: true,
         }))
@@ -21065,13 +21132,27 @@ class AnalyticsEventCapturer {
         const metadata = {
             placement,
         };
-        this.markAs(`${ad.adId}.${"view" /* Amity.AnalyticEventActivityType.View */}.${placement}`, "ad" /* Amity.AnalyticEventContentType.Ad */, "view" /* Amity.AnalyticEventActivityType.View */, metadata);
+        const activityType = "view" /* Amity.AnalyticEventActivityType.View */;
+        this.markAs({
+            uniqueId: `${ad.adId}.${activityType}.${placement}`,
+            contentId: ad.adId,
+            contentType: "ad" /* Amity.AnalyticEventContentType.Ad */,
+            activityType,
+            metadata,
+        });
     }
     markAdAsClicked(ad, placement) {
         const metadata = {
             placement,
         };
-        this.markAs(`${ad.adId}.${"view" /* Amity.AnalyticEventActivityType.View */}.${placement}`, "ad" /* Amity.AnalyticEventContentType.Ad */, "linkClicked" /* Amity.AnalyticEventActivityType.Click */, metadata);
+        const activityType = "linkClicked" /* Amity.AnalyticEventActivityType.Click */;
+        this.markAs({
+            uniqueId: `${ad.adId}.${activityType}.${placement}`,
+            contentId: ad.adId,
+            contentType: "ad" /* Amity.AnalyticEventContentType.Ad */,
+            activityType,
+            metadata,
+        });
     }
 }
 
@@ -21127,13 +21208,13 @@ class AnalyticsEngine {
         this._eventCapturer.resetAllBuckets();
     }
 }
-let instance$3;
+let instance$4;
 var AnalyticsEngine$1 = {
     getInstance: () => {
-        if (!instance$3) {
-            instance$3 = new AnalyticsEngine();
+        if (!instance$4) {
+            instance$4 = new AnalyticsEngine();
         }
-        return instance$3;
+        return instance$4;
     },
 };
 
@@ -21141,30 +21222,12 @@ const userLinkedObject = (user) => {
     return Object.assign(Object.assign({}, user), { get avatar() {
             var _a;
             if (!user.avatarFileId)
-                return null;
-            let avatar = {
-                fileId: ((_a = user.avatarFileId) === null || _a === void 0 ? void 0 : _a.toString()) ? user.avatarFileId.toString() : '',
-                type: 'image',
-                fileUrl: '',
-                createdAt: '',
-                attributes: {
-                    name: '',
-                    extension: '',
-                    size: '',
-                    mimeType: '',
-                    metadata: {
-                        exif: {},
-                        gps: {},
-                        width: 0,
-                        height: 0,
-                        isFull: false,
-                    },
-                },
-            };
-            const cacheData = pullFromCache(['file', 'get', `${user.avatarFileId}`]);
-            if (cacheData === null || cacheData === void 0 ? void 0 : cacheData.data) {
-                avatar = cacheData === null || cacheData === void 0 ? void 0 : cacheData.data;
-            }
+                return undefined;
+            const avatar = (_a = pullFromCache([
+                'file',
+                'get',
+                `${user.avatarFileId}`,
+            ])) === null || _a === void 0 ? void 0 : _a.data;
             return avatar;
         } });
 };
@@ -21379,34 +21442,12 @@ const categoryLinkedObject = (category) => {
     return Object.assign(Object.assign({}, category), { get avatar() {
             var _a;
             if (!category.avatarFileId)
-                return null;
-            let avatar = {
-                fileId: ((_a = category.avatarFileId) === null || _a === void 0 ? void 0 : _a.toString()) ? category.avatarFileId.toString() : '',
-                type: 'image',
-                fileUrl: '',
-                createdAt: '',
-                attributes: {
-                    name: '',
-                    extension: '',
-                    size: '',
-                    mimeType: '',
-                    metadata: {
-                        exif: {},
-                        gps: {},
-                        width: 0,
-                        height: 0,
-                        isFull: false,
-                    },
-                },
-            };
-            const cacheData = pullFromCache([
+                return undefined;
+            const avatar = (_a = pullFromCache([
                 'file',
                 'get',
                 `${category.avatarFileId}`,
-            ]);
-            if (cacheData === null || cacheData === void 0 ? void 0 : cacheData.data) {
-                avatar = cacheData === null || cacheData === void 0 ? void 0 : cacheData.data;
-            }
+            ])) === null || _a === void 0 ? void 0 : _a.data;
             return avatar;
         } });
 };
@@ -21764,12 +21805,12 @@ class MessageReadReceiptSyncEngine {
         }
     }
 }
-let instance$2 = null;
+let instance$3 = null;
 var ReadReceiptSyncEngine = {
     getInstance: () => {
-        if (!instance$2)
-            instance$2 = new MessageReadReceiptSyncEngine();
-        return instance$2;
+        if (!instance$3)
+            instance$3 = new MessageReadReceiptSyncEngine();
+        return instance$3;
     },
 };
 
@@ -21838,20 +21879,17 @@ const channelLinkedObject = (channel) => {
     return Object.assign(Object.assign({}, channel), { markAsRead: () => markAsRead(channel.channelInternalId) });
 };
 
-// import AnalyticsEngine from '~/analytic/service/analytic/AnalyticsEngine';
 const adLinkedObject = (ad) => {
-    // const analyticsEngineInstance = AnalyticsEngine.getInstance();
+    const analyticsEngineInstance = AnalyticsEngine$1.getInstance();
     const { image9_16: image916, image1_1: image11 } = ad, restAds = __rest(ad, ["image9_16", "image1_1"]);
-    return Object.assign(Object.assign({}, restAds), { 
-        // analytics: {
-        //   markAsSeen: (placement: Amity.AdPlacement) => {
-        //     analyticsEngineInstance.markAdAsViewed(ad, placement);
-        //   },
-        //   markLinkAsClicked: (placement: Amity.AdPlacement) => {
-        //     analyticsEngineInstance.markAdAsClicked(ad, placement);
-        //   },
-        // },
-        get advertiser() {
+    return Object.assign(Object.assign({}, restAds), { analytics: {
+            markAsSeen: (placement) => {
+                analyticsEngineInstance.markAdAsViewed(ad, placement);
+            },
+            markLinkAsClicked: (placement) => {
+                analyticsEngineInstance.markAdAsClicked(ad, placement);
+            },
+        }, get advertiser() {
             var _a, _b;
             const advertiserData = (_a = pullFromCache([
                 'advertiser',
@@ -22739,7 +22777,7 @@ function convertFromRaw(message, reactors, event) {
          *
          * Check git blame for previous iteration
          */
-        myReactions: myReactions || ((_a = cache === null || cache === void 0 ? void 0 : cache.data.myReactions) !== null && _a !== void 0 ? _a : []), reactionsCount: reactionCount, subChannelId: messageFeedId, uniqueId: cache ? cache.data.uniqueId : messageId, referenceId });
+        myReactions: myReactions || ((_a = cache === null || cache === void 0 ? void 0 : cache.data.myReactions) !== null && _a !== void 0 ? _a : []), reactionsCount: reactionCount, subChannelId: messageFeedId, uniqueId: cache ? cache.data.uniqueId : messageId, referenceId, syncState: "synced" /* Amity.SyncState.Synced */ });
     if (mentionedUsers) {
         out.mentionees = mentionedUsers.map(mention => {
             if (mention.type === 'channel') {
@@ -22882,13 +22920,13 @@ class SessionWatcher {
         this._listener.clear();
     }
 }
-let instance$1;
+let instance$2;
 var SessionWatcher$1 = {
     getInstance: () => {
-        if (!instance$1) {
-            instance$1 = new SessionWatcher();
+        if (!instance$2) {
+            instance$2 = new SessionWatcher();
         }
-        return instance$1;
+        return instance$2;
     },
 };
 
@@ -23600,13 +23638,15 @@ const setSessionState = (state) => {
  * @category Client API
  * @hidden
  */
-const getToken = async (params) => {
+const getToken = async ({ params, options, }) => {
     const client = getActiveClient();
     client.log('client/api/getToken', params);
     const deviceInfo = getDeviceInfo();
     const { data } = await client.http.post('/api/v5/sessions', Object.assign(Object.assign({}, params), { deviceInfo }), {
-        // @ts-ignore
-        headers: { 'X-API-Key': client.apiKey },
+        headers: {
+            'X-API-Key': client.apiKey,
+            'set-access-token-cookie': (options === null || options === void 0 ? void 0 : options.setAccessTokenCookie) || false,
+        },
     });
     return data;
 };
@@ -23918,12 +23958,12 @@ class ObjectResolverEngine {
         this.stopResolver();
     }
 }
-let instance = null;
+let instance$1 = null;
 var ObjectResolverEngine$1 = {
     getInstance: () => {
-        if (!instance)
-            instance = new ObjectResolverEngine();
-        return instance;
+        if (!instance$1)
+            instance$1 = new ObjectResolverEngine();
+        return instance$1;
     },
 };
 
@@ -23998,6 +24038,9 @@ const logout = async () => {
         isUserDeleted: false,
     };
     client.ws.io.opts.query = { token: '' };
+    if (typeof document !== 'undefined') {
+        document.cookie = '_ascSession=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
+    }
     /*
      * Cache should be usable if tokenExpired
      * https://ekoapp.atlassian.net/wiki/spaces/UP/pages/2082537485/ASC+Core+-+Session+Management+3.0#SDK-usability-based-on-Session-State
@@ -24105,6 +24148,17 @@ const onClientBanned = (callback) => {
     return createEventSubscriber(client, `client/onConnectionError(user.didGlobalBan)`, 'user.didGlobalBan', callback);
 };
 
+/**
+ *
+ * Fired when any {@link Amity.Client} has a session state change
+ *
+ * @param callback The function to call when the event was fired
+ * @returns an {@link Amity.Unsubscriber} function to stop listening
+ *
+ * @category Client Events
+ */
+const onNetworkActivities = (callback) => NetworkActivitiesWatcher$1.getInstance().onNetworkActivities(callback);
+
 /**
  * ```js
  * import { onTokenExpired } from '@amityco/ts-sdk'
@@ -24539,9 +24593,12 @@ const onMessageCreatedMqtt = (callback) => {
 const onMessageCreatedLocal = (callback) => {
     const client = getActiveClient();
     const disposers = [
-        createEventSubscriber(client, 'message/onMessageCreated', 'local.message.created', payload => payload.messages.forEach(message => {
-            callback(message);
-        })),
+        createEventSubscriber(client, 'message/onMessageCreated', 'local.message.created', async (payload) => {
+            ingestInCache(payload);
+            return payload.messages.forEach(message => {
+                callback(message);
+            });
+        }),
     ];
     return () => {
         disposers.forEach(fn => fn());
@@ -24944,7 +25001,12 @@ const login = async (params, sessionHandler, config) => {
     // default values
     const defaultDeviceId = await getDeviceId();
     try {
-        const { users } = await setClientToken(Object.assign(Object.assign({}, params), { displayName: params === null || params === void 0 ? void 0 : params.displayName, deviceId: (params === null || params === void 0 ? void 0 : params.deviceId) || defaultDeviceId }));
+        const { users } = await setClientToken({
+            params: Object.assign(Object.assign({}, params), { displayName: params === null || params === void 0 ? void 0 : params.displayName, deviceId: (params === null || params === void 0 ? void 0 : params.deviceId) || defaultDeviceId }),
+            options: {
+                setAccessTokenCookie: true,
+            },
+        });
         const user = users.find(u => u.userId === params.userId);
         if (user == null) {
             throw new ASCError(`${params.userId} has not been founded`, 800000 /* Amity.ClientError.UNKNOWN_ERROR */, "error" /* Amity.ErrorLevel.ERROR */);
@@ -24975,7 +25037,7 @@ const login = async (params, sessionHandler, config) => {
          * if getting token failed session state reverts to initial state when app
          * is first launched
          */
-        setSessionState("notLoggedIn" /* Amity.SessionStates.NOT_LOGGED_IN */);
+        SessionWatcher$1.getInstance().setSessionState("notLoggedIn" /* Amity.SessionStates.NOT_LOGGED_IN */);
         // pass error down tree so the calling function handle it
         throw error;
     }
@@ -25001,7 +25063,7 @@ const login = async (params, sessionHandler, config) => {
                 unsubWatcher();
             }
         }), onTokenExpired(state => {
-            setSessionState(state);
+            SessionWatcher$1.getInstance().setSessionState(state);
             logout();
             subscriptions.forEach(fn => fn());
         }), 
@@ -25046,7 +25108,12 @@ const renewal = () => {
         }
         else {
             // about to expire
-            await setClientToken(params);
+            await setClientToken({
+                params,
+                options: {
+                    setAccessTokenCookie: true,
+                },
+            });
         }
         tokenRenewed = true;
         if (renewTimeoutId)
@@ -25271,6 +25338,33 @@ const isConnected = () => {
         client.ws.connected);
 };
 
+var _GlobalFileAccessType_fileAccessType;
+class GlobalFileAccessType {
+    constructor() {
+        _GlobalFileAccessType_fileAccessType.set(this, FileAccessTypeEnum.PUBLIC);
+    }
+    setFileAccessType(fileAccessType) {
+        __classPrivateFieldSet(this, _GlobalFileAccessType_fileAccessType, fileAccessType, "f");
+    }
+    getFileAccessType() {
+        return __classPrivateFieldGet(this, _GlobalFileAccessType_fileAccessType, "f");
+    }
+}
+_GlobalFileAccessType_fileAccessType = new WeakMap();
+let instance;
+var GlobalFileAccessType$1 = {
+    getInstance: () => {
+        if (!instance) {
+            instance = new GlobalFileAccessType();
+        }
+        return instance;
+    },
+};
+
+function setUploadedFileAccessType(accessType) {
+    GlobalFileAccessType$1.getInstance().setFileAccessType(accessType);
+}
+
 /**
  * ```js
  * import { onChannelMarkerFetched } from '@amityco/ts-sdk'
@@ -25801,10 +25895,12 @@ var index$l = /*#__PURE__*/Object.freeze({
   renewal: renewal,
   markerSync: markerSync,
   enableUnreadCount: enableUnreadCount,
+  setUploadedFileAccessType: setUploadedFileAccessType,
   onConnectionError: onConnectionError,
   onClientDisconnected: onClientDisconnected,
   onClientBanned: onClientBanned,
   onSessionStateChange: onSessionStateChange,
+  onNetworkActivities: onNetworkActivities,
   getTotalUnreadCount: getTotalUnreadCount,
   getUserUnread: getUserUnread,
   getMarkerSyncEvents: getMarkerSyncEvents,
@@ -27940,6 +28036,8 @@ const uploadFile = async (formData, onProgress) => {
     const files = formData.getAll('files');
     if (!files.length)
         throw new Error('The formData object must have a `files` key.');
+    const accessType = GlobalFileAccessType$1.getInstance().getFileAccessType();
+    formData.append('accessType', accessType);
     formData.append('preferredFilename', files[0].name);
     const headers = 'getHeaders' in formData
         ? formData.getHeaders()
@@ -28025,6 +28123,8 @@ const uploadVideo = async (formData, feedType, onProgress) => {
     const files = formData.getAll('files');
     if (!files.length)
         throw new Error('The formData object must have a `files` key.');
+    const accessType = GlobalFileAccessType$1.getInstance().getFileAccessType();
+    formData.append('accessType', accessType);
     formData.append('preferredFilename', files[0].name);
     if (feedType) {
         formData.append('feedType', feedType);
@@ -28074,6 +28174,8 @@ const uploadImage = async (formData, onProgress) => {
     const files = formData.getAll('files');
     if (!files.length)
         throw new Error('The formData object must have a `files` key.');
+    const accessType = GlobalFileAccessType$1.getInstance().getFileAccessType();
+    formData.append('accessType', accessType);
     formData.append('preferredFilename', files[0].name);
     const headers = 'getHeaders' in formData
         ? formData.getHeaders()
@@ -28117,6 +28219,8 @@ const createImage = async (formData, onProgress) => {
     const files = formData.getAll('files');
     if (!files.length)
         throw new Error('The formData object must have a `files` key.');
+    const accessType = GlobalFileAccessType$1.getInstance().getFileAccessType();
+    formData.append('accessType', accessType);
     formData.append('preferredFilename', files[0].name);
     const headers = 'getHeaders' in formData
         ? formData.getHeaders()
@@ -28160,6 +28264,8 @@ const createFile = async (formData, onProgress) => {
     const files = formData.getAll('files');
     if (!files.length)
         throw new Error('The formData object must have a `files` key.');
+    const accessType = GlobalFileAccessType$1.getInstance().getFileAccessType();
+    formData.append('accessType', accessType);
     formData.append('preferredFilename', files[0].name);
     const headers = 'getHeaders' in formData
         ? formData.getHeaders()
@@ -28203,6 +28309,8 @@ const createVideo = async (formData, feedType, onProgress) => {
     const files = formData.getAll('files');
     if (!files.length)
         throw new Error('The formData object must have a `files` key.');
+    const accessType = GlobalFileAccessType$1.getInstance().getFileAccessType();
+    formData.append('accessType', accessType);
     formData.append('preferredFilename', files[0].name);
     if (feedType) {
         formData.append('feedType', feedType);
@@ -28504,7 +28612,7 @@ getMessage$2.locally = (messageId) => {
  * @category Post API
  * @async
  */
-const getPost$1 = async (postId) => {
+const getPost$2 = async (postId) => {
     const client = getActiveClient();
     client.log('post/getPost', postId);
     isInTombstone('post', postId);
@@ -28544,7 +28652,7 @@ const getPost$1 = async (postId) => {
  *
  * @category Post API
  */
-getPost$1.locally = (postId) => {
+getPost$2.locally = (postId) => {
     const client = getActiveClient();
     client.log('post/getPost.locally', postId);
     if (!client.cache)
@@ -30585,9 +30693,40 @@ getMessages$1.locally = (messageIds) => {
 const getLocalId = () => `LOCAL_${uuid()}`;
 // FIXME: temp solution
 let uniqueId;
-/* begin_public_function
-  id: message.create.text_message, message.create.image_message, message.create.file_message, message.create.video_message, message.create.audio_message, message.create.custom_message
-*/
+const createMessageOptimistic = (bundle) => {
+    var _a, _b;
+    const client = getActiveClient();
+    if (!client.cache)
+        return;
+    /*
+     * When creating messages optimistically a messageId needs to be added by the
+     * client, created a new variable to allow backward compatibility of API
+     *
+     * Updated to handle client requirement to add messageId while uploading
+     * a message with image.
+     * Temporary!
+     */
+    uniqueId = bundle.referenceId || getLocalId();
+    const bundleWithMessageId = Object.assign({ messageId: uniqueId, uniqueId }, bundle);
+    client.log('message/createMessage.optimistically', bundleWithMessageId);
+    const subChannel = pullFromCache(['subChannel', 'get', bundle.subChannelId]);
+    if (subChannel) {
+        upsertInCache(['subChannel', 'get', bundle.subChannelId], Object.assign(Object.assign({}, subChannel.data), { messageCount: subChannel.data.messageCount + 1 }));
+        if (subChannel.data.channelId === subChannel.data.subChannelId) {
+            const channel = pullFromCache(['channel', 'get', subChannel.data.channelId]);
+            if (channel === null || channel === void 0 ? void 0 : channel.data) {
+                upsertInCache(['channel', 'get', subChannel.data.channelId], Object.assign(Object.assign({}, channel.data), { messageCount: ((_a = channel.data.messageCount) !== null && _a !== void 0 ? _a : 0) + 1 }));
+            }
+        }
+    }
+    // as reused to update created and updated time, which should be the same
+    const createdTime = new Date().toISOString();
+    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 });
+    fireEvent('local.message.created', { messages: [message] });
+    return message;
+};
 /**
  * ```js
  * import { createMessage, createQuery, runQuery } from '@amityco/ts-sdk'
@@ -30613,75 +30752,31 @@ let uniqueId;
 const createMessage = async (bundle) => {
     const client = getActiveClient();
     client.log('message/createMessage', bundle);
+    const optimisticData = createMessageOptimistic(bundle);
     const referenceId = bundle.referenceId || uniqueId || getLocalId();
     uniqueId = undefined;
-    const { data: payload } = await client.http.post('/api/v5/messages', Object.assign(Object.assign({}, convertParams(bundle)), { referenceId }));
-    const data = await prepareMessagePayload(payload);
-    const { messages } = data;
-    const cachedAt = client.cache && Date.now();
-    if (client.cache) {
-        dropFromCache(['message', 'get', referenceId]);
-        ingestInCache(data, { cachedAt });
-    }
-    fireEvent('local.message.created', { messages });
-    return {
-        data: LinkedObject.message(messages[0]),
-        cachedAt,
-    };
-};
-/**
- * ```js
- * import { createMessage } from '@amityco/ts-sdk'
- *
- * const created = createMessage.optimistically({
- *   channelId: 'foobar',
- *   data: { text: 'hello world' }
- * })
- * ```
- *
- * Creates an {@link Amity.Message} in cache
- *
- * @param bundle The data necessary to create a new {@link Amity.Message}
- * @returns The newly created {@link Amity.Message}
- *
- * @category Message API
- */
-createMessage.optimistically = (_a) => {
-    var _b, _c;
-    var { referenceId } = _a, bundle = __rest(_a, ["referenceId"]);
-    const client = getActiveClient();
-    if (!client.cache)
-        return;
-    /*
-     * when creating messages optimistically a messageId needs to be added by the
-     * client, created a new variable so as to allow backward compatibility of API
-     *
-     * Updated to handle client requirement to add messageId while uploading
-     * message with image. Temporary!
-     */
-    uniqueId = referenceId || getLocalId();
-    const bundleWithMessageId = Object.assign({ messageId: uniqueId, uniqueId }, bundle);
-    client.log('message/createMessage.optimistically', bundleWithMessageId);
-    const subChannel = pullFromCache(['subChannel', 'get', bundle.subChannelId]);
-    if (subChannel) {
-        upsertInCache(['subChannel', 'get', bundle.subChannelId], Object.assign(Object.assign({}, subChannel.data), { messageCount: subChannel.data.messageCount + 1 }));
-        if (subChannel.data.channelId === subChannel.data.subChannelId) {
-            const channel = pullFromCache(['channel', 'get', subChannel.data.channelId]);
-            if (channel === null || channel === void 0 ? void 0 : channel.data) {
-                upsertInCache(['channel', 'get', subChannel.data.channelId], Object.assign(Object.assign({}, channel.data), { messageCount: ((_b = channel.data.messageCount) !== null && _b !== void 0 ? _b : 0) + 1 }));
-            }
+    try {
+        const { data: payload } = await client.http.post('/api/v5/messages', Object.assign(Object.assign({}, convertParams(bundle)), { referenceId }));
+        const data = await prepareMessagePayload(payload);
+        const { messages } = data;
+        const cachedAt = client.cache && Date.now();
+        if (client.cache) {
+            ingestInCache(data, { cachedAt });
         }
+        fireEvent('local.message.created', {
+            messages: [Object.assign(Object.assign({}, messages[0]), { syncState: "synced" /* Amity.SyncState.Synced */ })],
+        });
+        return {
+            data: LinkedObject.message(messages[0]),
+            cachedAt,
+        };
+    }
+    catch (e) {
+        fireEvent('local.message.created', {
+            messages: [Object.assign(Object.assign({}, optimisticData), { syncState: "error" /* Amity.SyncState.Error */ })],
+        });
+        throw e;
     }
-    // as reused to update created and updated time, which should be the same
-    const createdTime = new Date().toISOString();
-    const message = Object.assign({ creatorId: client.userId, creatorPrivateId: getActiveUser()._id, channelSegment: ((_c = subChannel === null || subChannel === void 0 ? void 0 : subChannel.data.messageCount) !== null && _c !== void 0 ? _c : 0) + 1, childrenNumber: 0, createdAt: createdTime, updatedAt: createdTime }, bundleWithMessageId);
-    const cachedAt = UNSYNCED_OBJECT_CACHED_AT_VALUE;
-    pushToCache(['message', 'get', message.messageId], message, { cachedAt });
-    fireEvent('local.message.created', { messages: [message] });
-    return {
-        cachedAt,
-        data: LinkedObject.message(message),
-    };
 };
 /* end_public_function */
 
@@ -31394,67 +31489,106 @@ const getMessage$1 = (messageId, callback) => {
 };
 /* end_public_function */
 
-class PaginationController {
+class PaginationNoPageController {
     constructor(queryParams) {
         const { http } = getActiveClient();
         this.queryParams = queryParams;
         this.http = http;
     }
-    loadFirstPage() {
-        return this.onFetch("first" /* Amity.LiveCollectionPageDirection.FIRST */);
+    async onFetch() {
+        const queryResponse = await this.getRequest(this.queryParams);
+        return queryResponse;
     }
-    loadNextPage() {
-        return this.onFetch("next" /* Amity.LiveCollectionPageDirection.NEXT */);
+}
+
+class LiveCollectionController {
+    constructor(paginationController, queryStreamId, cacheKey, callback) {
+        this.paginationController = paginationController;
+        this.queryStreamId = queryStreamId;
+        this.cacheKey = cacheKey;
+        this.callback = callback;
     }
-    loadPreviousPage() {
-        return this.onFetch("prev" /* Amity.LiveCollectionPageDirection.PREV */);
+    async refresh() {
+        try {
+            let result;
+            if (this.paginationController instanceof PaginationNoPageController) {
+                result = await this.paginationController.onFetch();
+            }
+            else {
+                result = await this.paginationController.loadFirstPage();
+            }
+            if (!result)
+                return;
+            await this.persistModel(result);
+            this.persistQueryStream({
+                response: result,
+                direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */,
+                refresh: true,
+            });
+            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false });
+        }
+        catch (e) {
+            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false, error: e });
+        }
     }
-    async onFetch(direction = "first" /* Amity.LiveCollectionPageDirection.FIRST */) {
-        var _a, _b, _c, _d;
-        if (direction === 'prev' && !this.previousToken)
-            return;
-        if (direction === 'next' && !this.nextToken)
-            return;
-        let token;
-        if (direction === 'prev')
-            token = this.previousToken;
-        if (direction === 'next')
-            token = this.nextToken;
-        const queryResponse = await this.getRequest(this.queryParams, token);
-        if (direction === 'first') {
-            this.nextToken = (_a = queryResponse.paging) === null || _a === void 0 ? void 0 : _a.next;
-            this.previousToken = (_b = queryResponse.paging) === null || _b === void 0 ? void 0 : _b.previous;
+    loadPage({ initial = false, direction = "next" /* Amity.LiveCollectionPageDirection.NEXT */, }) {
+        this.setup();
+        this.notifyChange({ origin: "local" /* Amity.LiveDataOrigin.LOCAL */, loading: true });
+        if (initial) {
+            this.refresh();
+        }
+        else if (direction === "prev" /* Amity.LiveCollectionPageDirection.PREV */) {
+            this.loadPrevPage();
+        }
+        else if (direction === "next" /* Amity.LiveCollectionPageDirection.NEXT */) {
+            this.loadNextPage();
         }
-        if (direction === 'prev')
-            this.previousToken = (_c = queryResponse.paging) === null || _c === void 0 ? void 0 : _c.previous;
-        if (direction === 'next')
-            this.nextToken = (_d = queryResponse.paging) === null || _d === void 0 ? void 0 : _d.next;
-        return queryResponse;
     }
-    getNextToken() {
-        return this.nextToken;
+    async loadNextPage() {
+        try {
+            if (this.paginationController instanceof PaginationNoPageController)
+                return;
+            const result = await this.paginationController.loadNextPage();
+            if (!result)
+                return;
+            await this.persistModel(result);
+            this.persistQueryStream({
+                response: result,
+                direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */,
+            });
+            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false });
+        }
+        catch (e) {
+            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false, error: e });
+        }
     }
-    getPrevToken() {
-        return this.previousToken;
+    async loadPrevPage() {
+        try {
+            if (this.paginationController instanceof PaginationNoPageController)
+                return;
+            const result = await this.paginationController.loadPreviousPage();
+            if (!result)
+                return;
+            await this.persistModel(result);
+            this.persistQueryStream({
+                response: result,
+                direction: "prev" /* Amity.LiveCollectionPageDirection.PREV */,
+            });
+            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false });
+        }
+        catch (e) {
+            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false, error: e });
+        }
     }
-}
-
-/* eslint-disable no-use-before-define */
-/**
- * TODO: handle cache receive cache option, and cache policy
- * TODO: check if querybyIds is supported
- */
-class MessagePaginationController extends PaginationController {
-    async getRequest(queryParams, token) {
-        const processedQueryParams = convertQueryParams$1(queryParams);
-        const { data: queryResponse } = await this.http.get(`/api/v5/messages`, {
-            params: Object.assign(Object.assign({}, processedQueryParams), { options: token
-                    ? {
-                        token,
-                    }
-                    : Object.assign({}, processedQueryParams.options) }),
-        });
-        return queryResponse;
+    shouldNotify(data) {
+        const newData = data.map(convertGetterPropsToStatic).map(removeFunctionProperties);
+        if (isEqual(this.snapshot, newData))
+            return false;
+        this.snapshot = newData;
+        return true;
+    }
+    getCacheKey() {
+        return this.cacheKey;
     }
 }
 
@@ -31502,6 +31636,7 @@ class MessageQueryStreamController extends QueryStreamController {
             var _a, _b, _c, _d, _e;
             if (action === 'onCreate') {
                 const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+                const { referenceId } = payload;
                 if (!collection)
                     return;
                 if (this.query.subChannelId !== (payload === null || payload === void 0 ? void 0 : payload.subChannelId) || !collection)
@@ -31531,10 +31666,10 @@ class MessageQueryStreamController extends QueryStreamController {
                     return;
                 if ((!this.query.sortBy || this.query.sortBy === 'segmentDesc') &&
                     !this.paginationController.getPrevToken()) {
-                    collection.data = [...new Set([payload.messageId, ...collection.data])];
+                    collection.data = [...new Set([referenceId !== null && referenceId !== void 0 ? referenceId : payload.messageId, ...collection.data])];
                 }
                 if (this.query.sortBy === 'segmentAsc' && !this.paginationController.getNextToken()) {
-                    collection.data = [...new Set([...collection.data, payload.messageId])];
+                    collection.data = [...new Set([...collection.data, referenceId !== null && referenceId !== void 0 ? referenceId : payload.messageId])];
                 }
                 pushToCache(this.cacheKey, collection);
             }
@@ -31546,106 +31681,67 @@ class MessageQueryStreamController extends QueryStreamController {
     }
 }
 
-class PaginationNoPageController {
+class PaginationController {
     constructor(queryParams) {
         const { http } = getActiveClient();
         this.queryParams = queryParams;
         this.http = http;
     }
-    async onFetch() {
-        const queryResponse = await this.getRequest(this.queryParams);
-        return queryResponse;
-    }
-}
-
-class LiveCollectionController {
-    constructor(paginationController, queryStreamId, cacheKey, callback) {
-        this.paginationController = paginationController;
-        this.queryStreamId = queryStreamId;
-        this.cacheKey = cacheKey;
-        this.callback = callback;
+    loadFirstPage() {
+        return this.onFetch("first" /* Amity.LiveCollectionPageDirection.FIRST */);
     }
-    async refresh() {
-        try {
-            let result;
-            if (this.paginationController instanceof PaginationNoPageController) {
-                result = await this.paginationController.onFetch();
-            }
-            else {
-                result = await this.paginationController.loadFirstPage();
-            }
-            if (!result)
-                return;
-            await this.persistModel(result);
-            this.persistQueryStream({
-                response: result,
-                direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */,
-                refresh: true,
-            });
-            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false });
-        }
-        catch (e) {
-            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false, error: e });
-        }
+    loadNextPage() {
+        return this.onFetch("next" /* Amity.LiveCollectionPageDirection.NEXT */);
     }
-    loadPage({ initial = false, direction = "next" /* Amity.LiveCollectionPageDirection.NEXT */, }) {
-        this.setup();
-        this.notifyChange({ origin: "local" /* Amity.LiveDataOrigin.LOCAL */, loading: true });
-        if (initial) {
-            this.refresh();
-        }
-        else if (direction === "prev" /* Amity.LiveCollectionPageDirection.PREV */) {
-            this.loadPrevPage();
-        }
-        else if (direction === "next" /* Amity.LiveCollectionPageDirection.NEXT */) {
-            this.loadNextPage();
-        }
+    loadPreviousPage() {
+        return this.onFetch("prev" /* Amity.LiveCollectionPageDirection.PREV */);
     }
-    async loadNextPage() {
-        try {
-            if (this.paginationController instanceof PaginationNoPageController)
-                return;
-            const result = await this.paginationController.loadNextPage();
-            if (!result)
-                return;
-            await this.persistModel(result);
-            this.persistQueryStream({
-                response: result,
-                direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */,
-            });
-            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false });
-        }
-        catch (e) {
-            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false, error: e });
+    async onFetch(direction = "first" /* Amity.LiveCollectionPageDirection.FIRST */) {
+        var _a, _b, _c, _d;
+        if (direction === 'prev' && !this.previousToken)
+            return;
+        if (direction === 'next' && !this.nextToken)
+            return;
+        let token;
+        if (direction === 'prev')
+            token = this.previousToken;
+        if (direction === 'next')
+            token = this.nextToken;
+        const queryResponse = await this.getRequest(this.queryParams, token);
+        if (direction === 'first') {
+            this.nextToken = (_a = queryResponse.paging) === null || _a === void 0 ? void 0 : _a.next;
+            this.previousToken = (_b = queryResponse.paging) === null || _b === void 0 ? void 0 : _b.previous;
         }
+        if (direction === 'prev')
+            this.previousToken = (_c = queryResponse.paging) === null || _c === void 0 ? void 0 : _c.previous;
+        if (direction === 'next')
+            this.nextToken = (_d = queryResponse.paging) === null || _d === void 0 ? void 0 : _d.next;
+        return queryResponse;
     }
-    async loadPrevPage() {
-        try {
-            if (this.paginationController instanceof PaginationNoPageController)
-                return;
-            const result = await this.paginationController.loadPreviousPage();
-            if (!result)
-                return;
-            await this.persistModel(result);
-            this.persistQueryStream({
-                response: result,
-                direction: "prev" /* Amity.LiveCollectionPageDirection.PREV */,
-            });
-            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false });
-        }
-        catch (e) {
-            this.notifyChange({ origin: "server" /* Amity.LiveDataOrigin.SERVER */, loading: false, error: e });
-        }
+    getNextToken() {
+        return this.nextToken;
     }
-    shouldNotify(data) {
-        const newData = data.map(convertGetterPropsToStatic).map(removeFunctionProperties);
-        if (isEqual(this.snapshot, newData))
-            return false;
-        this.snapshot = newData;
-        return true;
+    getPrevToken() {
+        return this.previousToken;
     }
-    getCacheKey() {
-        return this.cacheKey;
+}
+
+/* eslint-disable no-use-before-define */
+/**
+ * TODO: handle cache receive cache option, and cache policy
+ * TODO: check if querybyIds is supported
+ */
+class MessagePaginationController extends PaginationController {
+    async getRequest(queryParams, token) {
+        const processedQueryParams = convertQueryParams$1(queryParams);
+        const { data: queryResponse } = await this.http.get(`/api/v5/messages`, {
+            params: Object.assign(Object.assign({}, processedQueryParams), { options: token
+                    ? {
+                        token,
+                    }
+                    : Object.assign({}, processedQueryParams.options) }),
+        });
+        return queryResponse;
     }
 }
 
@@ -31660,25 +31756,10 @@ class MessageLiveCollectionController extends LiveCollectionController {
         this.callback = callback.bind(this);
         this.loadPage({ initial: true });
     }
-    setup() {
-        var _a;
-        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        if (!collection) {
-            pushToCache(this.cacheKey, {
-                data: [],
-                query: this.query,
-            });
-        }
-    }
-    async persistModel(response) {
-        await this.queryStreamController.saveToMainDB(response);
-    }
-    persistQueryStream({ response, direction, refresh, }) {
-        this.queryStreamController.appendToQueryStream(response, direction, refresh);
-    }
     startSubscription() {
         return this.queryStreamController.subscribeRTE([
             { fn: onMessageCreatedMqtt, action: 'onCreate' },
+            { fn: onMessageCreatedLocal, action: 'onCreate' },
             { fn: onMessageDeleted, action: 'onDelete' },
             { fn: onMessageUpdated, action: 'onUpdate' },
             { fn: onMessageFlagged, action: 'onFlagged' },
@@ -31755,6 +31836,22 @@ class MessageLiveCollectionController extends LiveCollectionController {
         });
         return messages;
     }
+    setup() {
+        var _a;
+        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        if (!collection) {
+            pushToCache(this.cacheKey, {
+                data: [],
+                query: this.query,
+            });
+        }
+    }
+    async persistModel(response) {
+        await this.queryStreamController.saveToMainDB(response);
+    }
+    persistQueryStream({ response, direction, refresh, }) {
+        this.queryStreamController.appendToQueryStream(response, direction, refresh);
+    }
 }
 
 /* eslint-disable no-use-before-define */
@@ -33955,7 +34052,7 @@ const convertCommunityUsersToUniqueObject = (communityUsers) => {
     });
     return result;
 };
-const prepareCommunityPayload = (rawPayload) => {
+const convertCommunityPayload = (rawPayload) => {
     // Unpack community payload by mapping payload field to postSetting value.
     const communities = rawPayload.communities.map((_a) => {
         var { needApprovalOnPostCreation, onlyAdminCanPost } = _a, restCommunityPayload = __rest(_a, ["needApprovalOnPostCreation", "onlyAdminCanPost"]);
@@ -33979,6 +34076,11 @@ const prepareCommunityPayload = (rawPayload) => {
     const communityWithMembershipStatus = updateMembershipStatus(communities, communityUsers);
     return Object.assign(Object.assign({}, rawPayload), { communities: communityWithMembershipStatus, communityUsers });
 };
+const prepareCommunityPayload = (rawPayload) => {
+    const { communities, communityUsers } = convertCommunityPayload(rawPayload);
+    return Object.assign(Object.assign({}, rawPayload), { communities,
+        communityUsers });
+};
 const prepareCommunityRequest = (params) => {
     const { postSetting = undefined, storySetting } = params, restParam = __rest(params, ["postSetting", "storySetting"]);
     return Object.assign(Object.assign(Object.assign({}, restParam), (postSetting ? CommunityPostSettingMaps[postSetting] : undefined)), { 
@@ -36711,7 +36813,7 @@ const editPost = async (postId, patch) => {
 const deletePost = async (postId, permanent = false) => {
     var _a;
     const client = getActiveClient();
-    const post = await getPost$1(postId);
+    const post = await getPost$2(postId);
     await client.http.delete(`/api/v4/posts/${encodeURIComponent(postId)}`, {
         params: {
             postId,
@@ -37050,7 +37152,7 @@ const observePost = (postId, callback, policy = 'cache_then_server') => {
     };
     const disposers = [];
     disposers.push(onPostUpdated(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onUpdate')), onPostDeleted(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onDelete')), onPostApproved(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onApproved')), onPostDeclined(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onDeclined')), onPostFlagged(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onFlagged')), onPostUnflagged(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onUnflagged')), onPostReactionAdded(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onReactionAdded')), onPostReactionRemoved(data => realtimeRouter({ data, loading: false, origin: 'event' }, 'onReactionRemoved')));
-    runQuery(createQuery(getPost$1, postId), result => (result.data || result.error) &&
+    runQuery(createQuery(getPost$2, postId), result => (result.data || result.error) &&
         router(Object.assign(Object.assign({}, result), { data: result.data && LinkedObject.post(result.data) }), 'onFetch'), queryOptions(policy));
     return () => {
         log(`observePosts(tmpid: ${timestamp}) > dispose`);
@@ -37165,7 +37267,7 @@ const createComment = async (bundle) => {
     if (client.cache)
         ingestInCache(data, { cachedAt });
     if (['post', 'content'].includes(bundle.referenceType)) {
-        const post = await getPost$1(bundle.referenceId);
+        const post = await getPost$2(bundle.referenceId);
         fireEvent('local.post.updated', {
             posts: [post.data],
             categories: [],
@@ -37359,7 +37461,7 @@ const deleteComment = async (commentId, permanent = false) => {
         });
     }
     else {
-        const post = await getPost$1(comment.data.referenceId);
+        const post = await getPost$2(comment.data.referenceId);
         fireEvent('local.post.updated', {
             posts: [post.data],
             categories: [],
@@ -37963,8 +38065,12 @@ var index$6 = /*#__PURE__*/Object.freeze({
  *
  * @category Post Live Object
  */
-const getPost = (postId, callback) => {
-    return liveObject(postId, callback, 'postId', getPost$1, [
+const getPost$1 = (postId, callback) => {
+    const responder = (snapshot) => {
+        const { data } = snapshot;
+        callback(Object.assign(Object.assign({}, snapshot), { data: data ? LinkedObject.post(snapshot.data) : data }));
+    };
+    return liveObject(postId, responder, 'postId', getPost$2, [
         onPostApproved,
         onPostDeclined,
         (callback) => {
@@ -38004,7 +38110,7 @@ const getPost = (postId, callback) => {
         convertEventPayload((callback) => {
             return onCommentCreated(async (comment) => {
                 if (comment.referenceId === postId) {
-                    await getPost$1(postId);
+                    await getPost$2(postId);
                     callback(comment);
                 }
             });
@@ -38012,7 +38118,7 @@ const getPost = (postId, callback) => {
         convertEventPayload((callback) => {
             return onCommentDeleted(async (comment) => {
                 if (comment.referenceId === postId) {
-                    await getPost$1(postId);
+                    await getPost$2(postId);
                     callback(comment);
                 }
             });
@@ -38021,61 +38127,272 @@ const getPost = (postId, callback) => {
 };
 /* end_public_function */
 
-/**
- * ```js
- * import { queryPosts } from '@amityco/ts-sdk'
- * const { data: posts, prevPage, nextPage } = await queryPosts({ targetId, targetType })
- * ```
- *
- * Queries a paginable list of {@link Amity.Post} objects
- *
- * @param query The query parameters
- * @returns posts
- *
- * @category Post API
- * @async
- */
-const queryPosts = async (query) => {
-    const client = getActiveClient();
-    client.log('post/queryPosts', query);
-    const { page, limit = 10, includeDeleted } = query, params = __rest(query, ["page", "limit", "includeDeleted"]);
-    const { dataTypes, matchingOnlyParentPost } = params;
-    const options = (() => {
-        if (page)
-            return { token: page };
-        if (limit)
-            return { limit };
-        return undefined;
-    })();
-    // API-FIX: parameters should be querystring. (1)
-    // API-FIX: backend should answer Amity.Response (2)
-    // const { data } = await client.http.get<Amity.Response<Amity.PagedResponse<Amity.PostPayload>>>(
-    const { data } = await client.http.get(`/api/v4/posts`, {
-        params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(includeDeleted), 
-            /*
-             * when creating post like image, file, video BE will create 2 posts
-             * 1. parent post to store text with dataType=text
-             * 2. child post to store dataTypes post data
-             *
-             * By default, BE queries only parent post
-             */
-            matchingOnlyParentPost: matchingOnlyParentPost !== null && matchingOnlyParentPost !== void 0 ? matchingOnlyParentPost : !(dataTypes === null || dataTypes === void 0 ? void 0 : dataTypes.length), options }),
+class PostPaginationController extends PaginationController {
+    async getRequest(queryParams, token) {
+        const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT, includeDeleted, matchingOnlyParentPost } = queryParams, params = __rest(queryParams, ["limit", "includeDeleted", "matchingOnlyParentPost"]);
+        const { dataTypes } = params;
+        const baseOptions = {
+            type: params.sortBy || queryParams.limit ? 'pagination' : undefined,
+        };
+        const options = token ? Object.assign(Object.assign({}, baseOptions), { token }) : Object.assign(Object.assign({}, baseOptions), { limit });
+        const { data: queryResponse } = await this.http.get(`/api/v4/posts`, {
+            params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(includeDeleted), 
+                /*
+                 * when creating post like image, file, video BE will create 2 posts
+                 * 1. parent post to store text with dataType=text
+                 * 2. child post to store dataTypes post data
+                 *
+                 * By default, BE queries only parent post
+                 */
+                matchingOnlyParentPost: matchingOnlyParentPost !== null && matchingOnlyParentPost !== void 0 ? matchingOnlyParentPost : !(dataTypes === null || dataTypes === void 0 ? void 0 : dataTypes.length), options }),
+        });
+        return queryResponse;
+    }
+}
+
+var EnumPostActions;
+(function (EnumPostActions) {
+    EnumPostActions["OnPostCreated"] = "onPostCreated";
+    EnumPostActions["OnPostUpdated"] = "onPostUpdated";
+    EnumPostActions["OnPostDeleted"] = "onPostDeleted";
+    EnumPostActions["OnPostFlagged"] = "onPostFlagged";
+    EnumPostActions["OnPostUnflagged"] = "onPostUnflagged";
+    EnumPostActions["OnPostReactionAdded"] = "onPostReactionAdded";
+    EnumPostActions["OnPostReactionRemoved"] = "onPostReactionRemoved";
+    EnumPostActions["OnPostApproved"] = "onPostApproved";
+    EnumPostActions["OnPostDeclined"] = "onPostDeclined";
+})(EnumPostActions || (EnumPostActions = {}));
+
+class PostQueryStreamController extends QueryStreamController {
+    constructor(query, cacheKey, notifyChange, preparePayload) {
+        super(query, cacheKey);
+        this.notifyChange = notifyChange;
+        this.preparePayload = preparePayload;
+    }
+    async saveToMainDB(response) {
+        const processedPayload = await this.preparePayload(response);
+        const client = getActiveClient();
+        const cachedAt = client.cache && Date.now();
+        if (client.cache) {
+            ingestInCache(processedPayload, { cachedAt });
+        }
+    }
+    appendToQueryStream(response, direction, refresh = false) {
+        var _a, _b;
+        if (refresh) {
+            pushToCache(this.cacheKey, {
+                data: response.posts.map(getResolver('post')),
+            });
+        }
+        else {
+            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+            const posts = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
+            pushToCache(this.cacheKey, Object.assign(Object.assign({}, collection), { data: [...new Set([...posts, ...response.posts.map(getResolver('post'))])] }));
+        }
+    }
+    reactor(action) {
+        return (post) => {
+            var _a, _b;
+            const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+            if (!collection)
+                return;
+            if (post.parentPostId && post.isDeleted) {
+                const parentPost = (_b = pullFromCache([
+                    'post',
+                    'get',
+                    post.parentPostId,
+                ])) === null || _b === void 0 ? void 0 : _b.data;
+                if (!parentPost || (parentPost === null || parentPost === void 0 ? void 0 : parentPost.targetId) !== this.query.targetId)
+                    return;
+                parentPost.children = parentPost.children.filter(childId => childId !== post.postId);
+                pushToCache(['post', 'get', parentPost.postId], parentPost);
+            }
+            else {
+                if (this.query.targetId !== post.targetId)
+                    return;
+                if (this.query.targetType !== post.targetType)
+                    return;
+            }
+            if (action === EnumPostActions.OnPostDeclined) {
+                collection.data = collection.data.filter(postId => postId !== post.postId);
+            }
+            if (action === EnumPostActions.OnPostCreated || action === EnumPostActions.OnPostApproved) {
+                collection.data = [...new Set([post.postId, ...collection.data])];
+            }
+            pushToCache(this.cacheKey, collection);
+            this.notifyChange({ origin: "event" /* Amity.LiveDataOrigin.EVENT */, loading: false });
+        };
+    }
+    subscribeRTE(createSubscriber) {
+        return createSubscriber.map(subscriber => subscriber.fn(this.reactor(subscriber.action)));
+    }
+}
+
+const preparePostPayload = (postPayload) => {
+    const { posts } = postPayload;
+    const { communities, communityUsers } = convertCommunityPayload({
+        communities: postPayload.communities,
+        communityUsers: postPayload.communityUsers,
     });
-    // API-FIX: backend should answer Amity.Response (2)
-    // const { paging, posts } = unwrapPayload(data)
-    // unpacking
-    const { paging } = data, payload = __rest(data, ["paging"]);
-    const paperedPayload = prepareMembershipPayload(payload, 'communityUsers');
-    const { posts } = payload;
-    const cachedAt = client.cache && Date.now();
-    if (client.cache) {
-        ingestInCache(paperedPayload, { cachedAt });
-        const cacheKey = ['post', 'query', Object.assign(Object.assign({}, params), { options })];
-        pushToCache(cacheKey, { posts: posts.map(getResolver('post')), paging });
+    return Object.assign(Object.assign({}, postPayload), { posts,
+        communities,
+        communityUsers });
+};
+
+const getPost = async (postId) => {
+    const client = getActiveClient();
+    client.log('post/getPost', postId);
+    isInTombstone('post', postId);
+    let payload;
+    try {
+        // API-FIX: endpoint should not be /list, parameters should be querystring.
+        const response = await client.http.get(`/api/v3/posts/${encodeURIComponent(postId)}`);
+        payload = response.data;
+    }
+    catch (error) {
+        if (checkIfShouldGoesToTombstone(error === null || error === void 0 ? void 0 : error.code)) {
+            pushToTombstone('post', postId);
+        }
+        throw error;
     }
-    return { data: posts.map(LinkedObject.post), cachedAt, paging };
+    const data = prepareMembershipPayload(payload, 'communityUsers');
+    const cachedAt = client.cache && Date.now();
+    if (client.cache)
+        ingestInCache(data, { cachedAt });
+    const { posts } = data;
+    const result = posts.find(post => post.postId === postId);
+    return {
+        data: result,
+        cachedAt,
+    };
+};
+getPost.locally = (postId) => {
+    const client = getActiveClient();
+    client.log('post/getPost.locally', postId);
+    if (!client.cache)
+        return;
+    const cached = pullFromCache(['post', 'get', postId]);
+    if (!cached)
+        return;
+    return {
+        data: cached.data,
+        cachedAt: cached.cachedAt,
+    };
 };
 
+class PostLiveCollectionController extends LiveCollectionController {
+    constructor(query, callback) {
+        const queryStreamId = hash(query);
+        const cacheKey = ['posts', 'collection', queryStreamId];
+        const paginationController = new PostPaginationController(query);
+        super(paginationController, queryStreamId, cacheKey, callback);
+        this.query = query;
+        this.queryStreamController = new PostQueryStreamController(this.query, this.cacheKey, this.notifyChange.bind(this), preparePostPayload);
+        this.callback = callback.bind(this);
+        this.loadPage({ initial: true });
+    }
+    setup() {
+        var _a;
+        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        if (!collection) {
+            pushToCache(this.cacheKey, {
+                data: [],
+                params: {},
+            });
+        }
+    }
+    async persistModel(queryPayload) {
+        await this.queryStreamController.saveToMainDB(queryPayload);
+    }
+    persistQueryStream({ response, direction, refresh, }) {
+        this.queryStreamController.appendToQueryStream(response, direction, refresh);
+    }
+    startSubscription() {
+        return this.queryStreamController.subscribeRTE([
+            { fn: onPostCreated, action: EnumPostActions.OnPostCreated },
+            { fn: onPostUpdated, action: EnumPostActions.OnPostUpdated },
+            { fn: onPostDeleted, action: EnumPostActions.OnPostDeleted },
+            { fn: onPostFlagged, action: EnumPostActions.OnPostFlagged },
+            { fn: onPostUnflagged, action: EnumPostActions.OnPostUnflagged },
+            { fn: onPostApproved, action: EnumPostActions.OnPostApproved },
+            { fn: onPostDeclined, action: EnumPostActions.OnPostDeclined },
+            { fn: onPostReactionAdded, action: EnumPostActions.OnPostReactionAdded },
+            { fn: onPostReactionRemoved, action: EnumPostActions.OnPostReactionRemoved },
+            {
+                fn: convertEventPayload((callback) => {
+                    return onCommentCreated(async (comment) => {
+                        var _a;
+                        const currentCollection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+                        if (!currentCollection || currentCollection.data.includes(comment.referenceId))
+                            return;
+                        await getPost(comment.referenceId);
+                        callback(comment);
+                    });
+                }, 'referenceId', 'post'),
+                action: EnumPostActions.OnPostUpdated,
+            },
+            {
+                fn: convertEventPayload((callback) => {
+                    return onCommentDeleted(async (comment) => {
+                        var _a;
+                        const currentCollection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+                        if (!currentCollection || currentCollection.data.includes(comment.referenceId))
+                            return;
+                        await getPost(comment.referenceId);
+                        callback(comment);
+                    });
+                }, 'referenceId', 'post'),
+                action: EnumPostActions.OnPostUpdated,
+            },
+        ]);
+    }
+    notifyChange({ origin, loading, error }) {
+        var _a, _b;
+        const collection = (_a = pullFromCache(this.cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        if (!collection)
+            return;
+        const data = this.applyFilter((_b = collection.data
+            .map(id => pullFromCache(['post', 'get', id]))
+            .filter(isNonNullable)
+            .map(({ data }) => data)) !== null && _b !== void 0 ? _b : []).map(LinkedObject.post);
+        if (!this.shouldNotify(data) && origin === 'event')
+            return;
+        this.callback({
+            onNextPage: () => this.loadPage({ direction: "next" /* Amity.LiveCollectionPageDirection.NEXT */ }),
+            data,
+            hasNextPage: !!this.paginationController.getNextToken(),
+            loading,
+            error,
+        });
+    }
+    applyFilter(data) {
+        var _a;
+        let posts = data;
+        if (!this.query.includeDeleted) {
+            posts = filterByPropEquality(posts, 'isDeleted', false);
+        }
+        if (this.query.tags) {
+            posts = posts.filter(p => { var _a; return (_a = p.tags) === null || _a === void 0 ? void 0 : _a.some(t => { var _a; return (_a = this.query.tags) === null || _a === void 0 ? void 0 : _a.includes(t); }); });
+        }
+        if (this.query.targetType === 'community' && this.query.feedType) {
+            posts = filterByFeedType(posts, this.query.feedType);
+        }
+        if ((_a = this.query.dataTypes) === null || _a === void 0 ? void 0 : _a.length) {
+            posts = filterByPostDataTypes(posts, this.query.dataTypes);
+        }
+        switch (this.query.sortBy) {
+            case 'firstCreated':
+                posts = posts.sort(sortByFirstCreated);
+                break;
+            case 'lastCreated':
+            default:
+                posts = posts.sort(sortByLastCreated);
+                break;
+        }
+        return posts;
+    }
+}
+
 /* begin_public_function
   id: post.query
 */
@@ -38107,121 +38424,9 @@ const getPosts = (params, callback, config) => {
     }
     const timestamp = Date.now();
     log(`getPosts(tmpid: ${timestamp}) > listen`);
-    const { limit: queryLimit } = params, queryParams = __rest(params, ["limit"]);
-    const limit = queryLimit !== null && queryLimit !== void 0 ? queryLimit : COLLECTION_DEFAULT_PAGINATION_LIMIT;
-    const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config !== null && config !== void 0 ? config : {};
-    const disposers = [];
-    const cacheKey = [
-        'post',
-        'collection',
-        { targetId: params.targetId, targetType: params.targetType },
-    ];
-    const responder = (data) => {
-        var _a, _b, _c;
-        let posts = (_a = data.data
-            .map(postId => pullFromCache(['post', 'get', postId]))
-            .filter(Boolean)
-            .map(({ data }) => LinkedObject.post(data))) !== null && _a !== void 0 ? _a : [];
-        const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
-        posts = posts.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
-        if (!params.includeDeleted) {
-            posts = filterByPropEquality(posts, 'isDeleted', false);
-        }
-        if (params.tags) {
-            posts = posts.filter(p => { var _a; return (_a = p.tags) === null || _a === void 0 ? void 0 : _a.some(t => { var _a; return (_a = params.tags) === null || _a === void 0 ? void 0 : _a.includes(t); }); });
-        }
-        if (params.targetType === 'community' && params.feedType) {
-            posts = filterByFeedType(posts, params.feedType);
-        }
-        if ((_b = params.dataTypes) === null || _b === void 0 ? void 0 : _b.length) {
-            posts = filterByPostDataTypes(posts, params.dataTypes);
-        }
-        callback({
-            onNextPage: onFetch,
-            data: posts,
-            hasNextPage: !!((_c = data.params) === null || _c === void 0 ? void 0 : _c.page),
-            loading: data.loading,
-            error: data.error,
-        });
-    };
-    const realtimeRouter = (action) => (post) => {
-        var _a, _b;
-        const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        if (!collection)
-            return;
-        if (post.parentPostId && post.isDeleted) {
-            const parentPost = (_b = pullFromCache([
-                'post',
-                'get',
-                post.parentPostId,
-            ])) === null || _b === void 0 ? void 0 : _b.data;
-            if (!parentPost || (parentPost === null || parentPost === void 0 ? void 0 : parentPost.targetId) !== params.targetId)
-                return;
-            parentPost.children = parentPost.children.filter(childId => childId !== post.postId);
-            pushToCache(['post', 'get', parentPost.postId], parentPost);
-        }
-        else {
-            if (params.targetId !== post.targetId)
-                return;
-            if (params.targetType !== post.targetType)
-                return;
-        }
-        /*
-         * This is not ideal, but currently this is the only way to update the
-         * collection on post declined
-         */
-        if (action === 'onDeclined') {
-            collection.data = collection.data.filter(postId => postId !== post.postId);
-        }
-        else {
-            collection.data = [...new Set([post.postId, ...collection.data])];
-        }
-        pushToCache(cacheKey, collection);
-        responder(collection);
-    };
-    const onFetch = (initial = false) => {
-        var _a, _b, _c;
-        const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-        const posts = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
-        if (!initial && posts.length > 0 && !((_c = collection === null || collection === void 0 ? void 0 : collection.params) === null || _c === void 0 ? void 0 : _c.page))
-            return;
-        const query = createQuery(queryPosts, Object.assign(Object.assign({}, queryParams), { limit: initial ? limit : undefined, page: !initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined }));
-        runQuery(query, ({ data: result, error, loading, paging }) => {
-            const data = {
-                loading,
-                error,
-                params: { page: paging === null || paging === void 0 ? void 0 : paging.next },
-                data: posts,
-            };
-            if (result) {
-                data.data = initial
-                    ? result.map(getResolver('post'))
-                    : [...new Set([...posts, ...result.map(getResolver('post'))])];
-            }
-            pushToCache(cacheKey, data);
-            responder(data);
-        }, queryOptions(policy, CACHE_SHORTEN_LIFESPAN));
-    };
-    disposers.push(onPostCreated(realtimeRouter('onCreate')), onPostApproved(realtimeRouter('onApproved')), onPostDeclined(realtimeRouter('onDeclined')), onPostDeleted(realtimeRouter('onDelete')), onPostUpdated(realtimeRouter('onUpdate')), onPostFlagged(realtimeRouter('onFlagged')), onPostUnflagged(realtimeRouter('onUnflagged')), onPostReactionAdded(realtimeRouter('onReactionAdded')), onPostReactionRemoved(realtimeRouter('onReactionRemoved')), convertEventPayload((callback) => {
-        return onCommentCreated(async (comment) => {
-            var _a;
-            const currentCollection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-            if (!currentCollection || currentCollection.data.includes(comment.referenceId))
-                return;
-            await getPost$1(comment.referenceId);
-            callback(comment);
-        });
-    }, 'referenceId', 'post')(realtimeRouter('onUpdate')), convertEventPayload((callback) => {
-        return onCommentDeleted(async (comment) => {
-            var _a;
-            const currentCollection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
-            if (!currentCollection || currentCollection.data.includes(comment.referenceId))
-                return;
-            await getPost$1(comment.referenceId);
-            callback(comment);
-        });
-    }, 'referenceId', 'post')(realtimeRouter('onUpdate')));
-    onFetch(true);
+    const postsLiveCollection = new PostLiveCollectionController(params, callback);
+    const disposers = postsLiveCollection.startSubscription();
+    const cacheKey = postsLiveCollection.getCacheKey();
     disposers.push(() => dropFromCache(cacheKey));
     return () => {
         log(`getPosts(tmpid: ${timestamp}) > dispose`);
@@ -38255,7 +38460,7 @@ var index$5 = /*#__PURE__*/Object.freeze({
   onPostReactionRemoved: onPostReactionRemoved,
   observePosts: observePosts,
   observePost: observePost,
-  getPost: getPost,
+  getPost: getPost$1,
   getPosts: getPosts
 });
 
@@ -39150,7 +39355,7 @@ var index$3 = /*#__PURE__*/Object.freeze({
   getPoll: getPoll
 });
 
-const privateKey = "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDHo80SecH7FuF2\nhFYnb+l26/VN8UMLXAQFLnxciNTEwkGVFMpdezlH8rU2HtUJL4RETogbAOLVY0XM\njs6sPn8G1nALmh9qeDpUtVqFOVtBHxEZ910TLOtQiunjqJKO5nWdqZ71EC3OFluR\niGQkO84BiIFbv37ub7xl3S8XarbtKoLcyVpkDHi+1wx1pgCAn6gtBUgckPL5NR8j\nLseabl3HAXQfhTCKo4tmOFM2Dxwl1IUMmIJrJg/aIU/U0tj/1Eoo7mG0JcNWX19l\nW3EecCbi0ncCJOrkUdwlBrcjaMayaX/ubEwyUeTGiLdyc4L3GRLHjyK8xgVNXRMH\nbZWJ2a5NAgMBAAECggEASxuE+35zTFO/XydKgmvIGcWL9FbgMlXb7Vcf0nBoG945\nbiz0NVc2paraIhJXc608xbYF3qLmtAE1MVBI0ORyRdBHNxY024l/6H6SH60Ed+uI\nM4ysp5ourY6Vj+DLwpdRiI9YDjqYAQDIUmhNxJP7XPhOMoZI6st+xZQBM34ic/bv\nAMSJm9OZphSp3+qXVkFZztr2mxD2EZSJJLYxi8BCdgM2qhazalbcJ6zDKHCZWVWm\n8RRxDGldyMb/237JxETzP40tAlzOZDmBAbUgEnurDJ93RVDIE3rbZUshwgeQd18a\nem096mWgvB1AIKYgsTAR3pw+V19YWAjq/glP6fz8wQKBgQD/oQq+ukKF0PRgBeM5\ngeTjSwsdGppQLmf5ndujvoiz/TpdjDEPu6R8kigQr1rG2t4K/yfdZoI8RdmJD1al\n3Q7N9hofooSy4rj6E3txzWZCHJjHad2cnCp/O26HiReGAl7wTcfTmNdiFHhZQzm5\nJBkvWAiwuvQMNfEbnXxw6/vIDwKBgQDH7fX8gsc77JLvAWgp1MaQN/sbqVb6JeT1\nFQfR8E/WFCSmzQBtNzd5KgYuCeelwr/8DyYytvN2BzCYZXp73gI1jF3YlW5jVn74\nOY6TwQ095digwo6Z0yuxopdIOApKgAkL9PRKgNrqAf3NAyMua6lOGifzjDojC3KU\nfylQmxMn4wKBgHp2B9O/H0dEBw5JQ8W0+JX6yWQz7mEjGiR2/1W+XXb8hQ1zr709\nw1r6Gb+EghRpnZ3fBpYGGbYOMFx8wKHM+N6qW3F0ReX8v2juFGE8aRSa5oYBrWzt\nU16Idjbv8hj84cZ1PJmdyvDtpYn9rpWHOZl4rxEbPvbqkIsOMyNVqdT5AoGAOSge\nmwIIU2le2FVeohbibXiToWTYKMuMmURZ5/r72AgKMmWJKbAPe+Q3wBG01/7FRBpQ\noU8Ma0HC8s6QJbliiEyIx9JwrJWd1vkdecBHONrtA4ibm/5zD2WcOllLF+FitLhi\n3qnX6+6F0IaFGFBPJrTzlv0P4dTz/OAdv52V7GECgYEA2TttOKBAqWllgOaZOkql\nLVMJVmgR7s6tLi1+cEP8ZcapV9aRbRzTAKXm4f8AEhtlG9F9kCOvHYCYGi6JaiWJ\nZkHjeex3T+eE6Di6y5Bm/Ift5jtVhJ4jCVwHOKTMej79NPUFTJfv8hCo29haBDv6\nRXFrv+T21KCcw8k3sJeJWWQ=\n-----END PRIVATE KEY-----";
+const privateKey = "-----BEGIN PRIVATE KEY-----\nMIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDAARz+hmBgi8pJ\nQb8LeY41gtHhk+ACMwRfhsn7GqpqRQNG2qU0755mzZuVDUqjQMGSo8THJB7O+OJs\nflbZRkFXlFoFOVNw1UpNOgwEQZ6wB9oRwzepTJAfF1sVhm/o/ixvXh1zDFNDy6yZ\npXyiiJHUVxqyjllZhxnwdvjoVtDs6hW6awG09bB9nh/TTejlUKXoAgzqVwu/1QMu\nUVViET495elEe19aUarEy+oL2iKeXCEvqda/pWNBdbieFyJvvZ08HN8dPuT88wq2\njZLEAth1vrwQ2IAa4ktaLcBQdLJgIkrbDvAiVZ8lQAjS/bq5vXQikTGvoPlC5bbn\nvuOM/3eLAgMBAAECggEAVZ+peHAghq2QVj71nX5lxsNCKaCyYwixSJBpfouTt7Rz\nE6PpzMOXFi1W1o+I22jDakuSM2SOQKqI/u0QefB0r0O/KVk5NrZHXk0mkrdYtxOp\nUgaGyf8UvmjB+8VqHrNKyZdk9qtmbnNj01kTTcAtmE4H39zPR7eR/8Rul94vaZbs\nwCnKJS3mLT3JxyGug6lxanveKkjG+CKC1nJQYWaxCJxaFSzbwXQPvDhB+TvrIbee\npd5v4EAyEJohpr+T9oDGGJkb/KARBZCtwLyB976PKJwwBA8MRVL1i5QwawuMiMq5\nUtnOnbGKtCeFzaLbNU0Qi8bqyims84EQxC6DOu1fkQKBgQDdvsoBsEhsOXV7hlIJ\naEd0eSJZVkdqimxH8uGoMM2FeNaOrcB6yBXqTSP0R3OIyf8eaY6yjRvP30ZNXcll\n/gD3O1Mu6YmWQdt1W2WA6pKOsUuPXasf0pdOF7IiFZKlSabz5YHXFqwVuqm8loaj\nsXel3YWqPVdHiankE7tz+3ssnQKBgQDdqi4TNdD1MdEpihx19jr0QjUiXW3939FK\nqp30HESPEGDGQzXdmJgif9HhZb+cJSuWaHEbjgBrYahvgCF+y6LbEpOD+D/dmT+s\nDEAQaR84sah6dokwPjV8fjBSrcVFjCS+doxv0d3p/9OUEeyUhFrY03nxtIEYkLIE\n/Zvn37b4RwKBgQCLENVFe9XfsaVhQ5r9dV2iyTlmh7qgMZG5CbTFs12hQGhm8McO\n+Z7s41YSJCFr/yq1WwP4LJDtrBw99vyQr1zRsG35tNLp3gGRNzGQSQyC2uQFVHw2\np+7mNewsfhUK/gbrXNsyFnDz6635rPlhfbII3sWuP2wWXFqkxE9CbMwR7QKBgQC6\nawDMzxmo2/iYArrkyevSuEuPVxvFwpF1RgAI6C0QVCnPE38dmdN4UB7mfHekje4W\nVEercMURidPp0cxZolCYBQtilUjAyL0vqC3In1/Ogjq6oy3FEMxSop1pKxMY5j+Q\nnoqFD+6deLUrddeNH7J3X4LSr4dSbX4JjG+tlgt+yQKBgQCuwTL4hA6KqeInQ0Ta\n9VQX5Qr8hFlqJz1gpymi/k63tW/Ob8yedbg3WWNWyShwRMFYyY9S81ITFWM95uL6\nvF3x9rmRjwElJw9PMwVu6dmf/CO0Z1wzXSp2VVD12gbrUD/0/d7MUoJ9LgC8X8f/\nn0txLHYGHbx+nf95+JUg6lV3hg==\n-----END PRIVATE KEY-----";
 /*
  * The crypto algorithm used for importing key and signing string
  */
@@ -40597,20 +40802,27 @@ var index$1 = /*#__PURE__*/Object.freeze({
   getGlobalStoryTargets: getGlobalStoryTargets
 });
 
-const convertToNetworkAds = (data) => {
-    const { ads, settings } = data;
-    return {
-        ads: ads.map(LinkedObject.ad),
-        settings,
-    };
+const convertToInternalAd = (ad) => {
+    return Object.assign(Object.assign({}, ad), { endAt: ad.endAt ? ad.endAt : null });
+};
+const convertToInternalAdvertiser = (advertiser) => {
+    return Object.assign({}, advertiser);
 };
 const getNetworkAds = async () => {
     const client = getActiveClient();
     const { data } = await client.http.get('/api/v1/ads/me');
-    const { settings } = data, rest = __rest(data, ["settings"]);
-    ingestInCache(rest);
-    pushToCache(['ad', 'setting'], settings);
-    return convertToNetworkAds(data);
+    const internalAds = data.ads.map(convertToInternalAd);
+    const internalAdvertisers = data.advertisers.map(convertToInternalAdvertiser);
+    ingestInCache({
+        ads: internalAds,
+        advertisers: internalAdvertisers,
+        files: data.files,
+    });
+    pushToCache(['ad', 'setting'], data.settings);
+    return {
+        ads: internalAds.map(LinkedObject.ad),
+        settings: data.settings,
+    };
 };
 
 var index = /*#__PURE__*/Object.freeze({
@@ -40640,4 +40852,4 @@ const createUserToken = async (apiKey, apiRegion, params) => {
     return { accessToken: data.accessToken };
 };
 
-export { API_REGIONS, index as AdRepository, index$8 as CategoryRepository, index$c as ChannelRepository, index$l as Client, index$6 as CommentRepository, CommunityPostSettingMaps, CommunityPostSettings, index$9 as CommunityRepository, ContentFeedType, DefaultCommunityPostSetting, index$7 as FeedRepository, index$i as FileRepository, FileType, index$2 as LiveStreamPlayer, MessageContentType, index$g as MessageRepository, index$3 as PollRepository, PostContentType, index$5 as PostRepository, index$h as ReactionRepository, index$1 as StoryRepository, index$4 as StreamRepository, index$f as SubChannelRepository, SubscriptionLevels, index$j as UserRepository, VERSION, VideoResolution, VideoSize, VideoTranscodingStatus, backupCache, createQuery, createReport, createUserToken, deleteReport, disableCache, dropFromCache, enableCache, filterByChannelMembership, filterByCommunityMembership, filterByFeedType, filterByPostDataTypes, filterByPropEquality, filterByPropInclusion, filterByPropIntersection, filterBySearchTerm, filterByStringComparePartially, getChannelTopic, getCommentTopic, getCommunityStoriesTopic, getCommunityTopic, getMarkedMessageTopic, getMarkerUserFeedTopic, getMessageTopic, getMyFollowersTopic, getMyFollowingsTopic, getNetworkTopic, getPostTopic, getRole, getSmartFeedChannelTopic, getSmartFeedMessageTopic, getSmartFeedSubChannelTopic, getStoryTopic, getSubChannelTopic, getUserTopic, isAfterBefore, isAfterBeforeRaw, isCachable, isFetcher, isFresh, isLocal, isMutator, isOffline, isPaged, isReportedByMe, isSkip, mergeInCache, onChannelMarkerFetched, onFeedMarkerFetched, onFeedMarkerUpdated, onMessageMarked, onMessageMarkerFetched, onSubChannelMarkerFetched, onSubChannelMarkerUpdated, onUserMarkerFetched, onUserMarkerFetchedLegacy, pullFromCache, pushToCache, queryCache, queryOptions, queryRoles, restoreCache, runQuery, sortByChannelSegment, sortByDisplayName, sortByFirstCreated, sortByFirstUpdated, sortByLastActivity, sortByLastCreated, sortByLastUpdated, sortByLocalSortingDate, sortByName, sortBySegmentNumber, subscribeTopic, toPage, toPageRaw, toToken, upsertInCache, wipeCache };
+export { API_REGIONS, index as AdRepository, index$8 as CategoryRepository, index$c as ChannelRepository, index$l as Client, index$6 as CommentRepository, CommunityPostSettingMaps, CommunityPostSettings, index$9 as CommunityRepository, ContentFeedType, DefaultCommunityPostSetting, index$7 as FeedRepository, FileAccessTypeEnum, index$i as FileRepository, FileType, index$2 as LiveStreamPlayer, MessageContentType, index$g as MessageRepository, index$3 as PollRepository, PostContentType, index$5 as PostRepository, index$h as ReactionRepository, index$1 as StoryRepository, index$4 as StreamRepository, index$f as SubChannelRepository, SubscriptionLevels, index$j as UserRepository, VERSION, VideoResolution, VideoSize, VideoTranscodingStatus, backupCache, createQuery, createReport, createUserToken, deleteReport, disableCache, dropFromCache, enableCache, filterByChannelMembership, filterByCommunityMembership, filterByFeedType, filterByPostDataTypes, filterByPropEquality, filterByPropInclusion, filterByPropIntersection, filterBySearchTerm, filterByStringComparePartially, getChannelTopic, getCommentTopic, getCommunityStoriesTopic, getCommunityTopic, getMarkedMessageTopic, getMarkerUserFeedTopic, getMessageTopic, getMyFollowersTopic, getMyFollowingsTopic, getNetworkTopic, getPostTopic, getRole, getSmartFeedChannelTopic, getSmartFeedMessageTopic, getSmartFeedSubChannelTopic, getStoryTopic, getSubChannelTopic, getUserTopic, isAfterBefore, isAfterBeforeRaw, isCachable, isFetcher, isFresh, isLocal, isMutator, isOffline, isPaged, isReportedByMe, isSkip, mergeInCache, onChannelMarkerFetched, onFeedMarkerFetched, onFeedMarkerUpdated, onMessageMarked, onMessageMarkerFetched, onSubChannelMarkerFetched, onSubChannelMarkerUpdated, onUserMarkerFetched, onUserMarkerFetchedLegacy, pullFromCache, pushToCache, queryCache, queryOptions, queryRoles, restoreCache, runQuery, sortByChannelSegment, sortByDisplayName, sortByFirstCreated, sortByFirstUpdated, sortByLastActivity, sortByLastCreated, sortByLastUpdated, sortByLocalSortingDate, sortByName, sortBySegmentNumber, subscribeTopic, toPage, toPageRaw, toToken, upsertInCache, wipeCache };