@amityco/ts-sdk 7.32.0 → 7.32.1-23b143a2.0

package/dist/cache/api/dropFromCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dropFromCache.d.ts","sourceRoot":"","sources":["../../../src/cache/api/dropFromCache.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,aAAa,4CAAyC,OAsBlE,CAAC"}
+{"version":3,"file":"dropFromCache.d.ts","sourceRoot":"","sources":["../../../src/cache/api/dropFromCache.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,aAAa,4CAAyC,OAqBlE,CAAC"}

package/dist/cache/api/pushToCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pushToCache.d.ts","sourceRoot":"","sources":["../../../src/cache/api/pushToCache.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,WAAW,8BAEhB,OAAO,YACJ,MAAM,YAAY,KAC1B,OAkBF,CAAC"}
+{"version":3,"file":"pushToCache.d.ts","sourceRoot":"","sources":["../../../src/cache/api/pushToCache.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,WAAW,8BAEhB,OAAO,YACJ,MAAM,YAAY,KAC1B,OAmBF,CAAC"}

package/dist/cache/api/queryCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryCache.d.ts","sourceRoot":"","sources":["../../../src/cache/api/queryCache.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,UAAU,+EActB,CAAC"}
+{"version":3,"file":"queryCache.d.ts","sourceRoot":"","sources":["../../../src/cache/api/queryCache.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,UAAU,+EAWtB,CAAC"}

package/dist/cache/api/queryCacheByProperty.d.ts

@@ -0,0 +1,3 @@
+/** Internal model lookup; deliberately excluded from the public Cache API. @hidden */
+export declare const queryCacheByProperty: <T>(prefix: [string, string], property: keyof T & string, value: string) => Amity.CacheEntry<T>[] | undefined;
+//# sourceMappingURL=queryCacheByProperty.d.ts.map

package/dist/cache/api/queryCacheByProperty.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"queryCacheByProperty.d.ts","sourceRoot":"","sources":["../../../src/cache/api/queryCacheByProperty.ts"],"names":[],"mappings":"AAGA,sFAAsF;AACtF,eAAO,MAAM,oBAAoB,cACvB,CAAC,MAAM,EAAE,MAAM,CAAC,qCAEjB,MAAM,sCAKd,CAAC"}

package/dist/cache/api/tests/queryCache.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=queryCache.test.d.ts.map

package/dist/cache/api/tests/queryCache.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"queryCache.test.d.ts","sourceRoot":"","sources":["../../../../src/cache/api/tests/queryCache.test.ts"],"names":[],"mappings":""}

package/dist/cache/utils/cacheIndex.d.ts

@@ -0,0 +1,15 @@
+declare type IndexedKey = {
+    encodedKey: string;
+    key: Amity.CacheKey;
+    order: number;
+};
+/** @hidden */
+export declare const getMatchingCacheKeys: (data: Amity.Cache['data'], key: Amity.CacheKey) => IndexedKey[];
+/** Update only an index that has already been used; writes alone need no index build. @hidden */
+export declare const updateCacheIndex: (data: Amity.Cache['data'], encodedKey: string) => void;
+/** @hidden */
+export declare const removeFromCacheIndex: (data: Amity.Cache['data'], encodedKey: string) => void;
+/** Index a string model property within one domain/operation, retaining cache insertion order. @hidden */
+export declare const getCacheEntriesByProperty: <T>(data: Amity.Cache['data'], prefix: [string, string], property: string, value: string) => Amity.CacheEntry<T>[];
+export {};
+//# sourceMappingURL=cacheIndex.d.ts.map

package/dist/cache/utils/cacheIndex.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cacheIndex.d.ts","sourceRoot":"","sources":["../../../src/cache/utils/cacheIndex.ts"],"names":[],"mappings":"AAEA,aAAK,UAAU,GAAG;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAsFF,cAAc;AACd,eAAO,MAAM,oBAAoB,SAAU,WAAW,CAAC,MAAM,CAAC,sCACoC,CAAC;AAEnG,iGAAiG;AACjG,eAAO,MAAM,gBAAgB,SAAU,WAAW,CAAC,MAAM,CAAC,cAAc,MAAM,SAQ7E,CAAC;AAEF,cAAc;AACd,eAAO,MAAM,oBAAoB,SAAU,WAAW,CAAC,MAAM,CAAC,cAAc,MAAM,SAWjF,CAAC;AAEF,0GAA0G;AAC1G,eAAO,MAAM,yBAAyB,YAC9B,WAAW,CAAC,MAAM,CAAC,UACjB,CAAC,MAAM,EAAE,MAAM,CAAC,YACd,MAAM,SACT,MAAM,0BAed,CAAC"}

package/dist/index.cjs.js

@@ -1184,6 +1184,116 @@ const wipeCache = async (storageKey = 'amitySdk') => {
     return true;
 };
 
+// Indexes never enter persisted cache data. Replacing data (restore/wipe/enable) starts a new index.
+const indexes = new WeakMap();
+const prefixesFor = (key) => {
+    if (typeof key[0] !== 'string')
+        return [];
+    const prefixes = [JSON.stringify([key[0]])];
+    if (typeof key[1] === 'string')
+        prefixes.push(JSON.stringify([key[0], key[1]]));
+    return prefixes;
+};
+const removePropertyValue = (property, indexed) => {
+    const previous = property.previousValues.get(indexed.encodedKey);
+    if (previous === undefined)
+        return;
+    const matches = property.values.get(previous);
+    matches.delete(indexed);
+    if (!matches.size)
+        property.values.delete(previous);
+    property.previousValues.delete(indexed.encodedKey);
+};
+const addPropertyValue = (data, property, indexed) => {
+    var _a;
+    if (!partialMatch(property.prefix, indexed.key))
+        return;
+    const value = (_a = data[indexed.encodedKey].data) === null || _a === void 0 ? void 0 : _a[property.property];
+    if (typeof value !== 'string')
+        return;
+    let matches = property.values.get(value);
+    if (!matches) {
+        matches = new Set();
+        property.values.set(value, matches);
+    }
+    matches.add(indexed);
+    property.previousValues.set(indexed.encodedKey, value);
+};
+const addKey = (index, encodedKey) => {
+    const indexed = { encodedKey, key: decodeKey(encodedKey), order: index.nextOrder };
+    index.nextOrder += 1; // eslint-disable-line no-param-reassign
+    index.keys.set(encodedKey, indexed);
+    prefixesFor(indexed.key).forEach(prefix => {
+        let keys = index.prefixes.get(prefix);
+        if (!keys) {
+            keys = new Map();
+            index.prefixes.set(prefix, keys);
+        }
+        keys.set(encodedKey, indexed);
+    });
+    return indexed;
+};
+const getIndex = (data) => {
+    let index = indexes.get(data);
+    if (!index) {
+        index = { keys: new Map(), prefixes: new Map(), properties: new Map(), nextOrder: 0 };
+        Object.keys(data).forEach(encodedKey => addKey(index, encodedKey));
+        indexes.set(data, index);
+    }
+    return index;
+};
+const candidatesFor = (index, key) => {
+    var _a, _b;
+    const prefixes = prefixesFor(key);
+    if (!prefixes.length)
+        return index.keys.values();
+    return (_b = (_a = index.prefixes.get(prefixes[prefixes.length - 1])) === null || _a === void 0 ? void 0 : _a.values()) !== null && _b !== void 0 ? _b : [];
+};
+/** @hidden */
+const getMatchingCacheKeys = (data, key) => Array.from(candidatesFor(getIndex(data), key)).filter(indexed => partialMatch(key, indexed.key));
+/** Update only an index that has already been used; writes alone need no index build. @hidden */
+const updateCacheIndex = (data, encodedKey) => {
+    var _a;
+    const index = indexes.get(data);
+    if (!index)
+        return;
+    const indexed = (_a = index.keys.get(encodedKey)) !== null && _a !== void 0 ? _a : addKey(index, encodedKey);
+    index.properties.forEach(property => {
+        removePropertyValue(property, indexed);
+        addPropertyValue(data, property, indexed);
+    });
+};
+/** @hidden */
+const removeFromCacheIndex = (data, encodedKey) => {
+    const index = indexes.get(data);
+    const indexed = index === null || index === void 0 ? void 0 : index.keys.get(encodedKey);
+    if (!index || !indexed)
+        return;
+    index.properties.forEach(property => removePropertyValue(property, indexed));
+    prefixesFor(indexed.key).forEach(prefix => {
+        const keys = index.prefixes.get(prefix);
+        keys.delete(encodedKey);
+        if (!keys.size)
+            index.prefixes.delete(prefix);
+    });
+    index.keys.delete(encodedKey);
+};
+/** Index a string model property within one domain/operation, retaining cache insertion order. @hidden */
+const getCacheEntriesByProperty = (data, prefix, property, value) => {
+    var _a;
+    const index = getIndex(data);
+    const identity = JSON.stringify([prefix, property]);
+    let propertyIndex = index.properties.get(identity);
+    if (!propertyIndex) {
+        propertyIndex = { prefix, property, values: new Map(), previousValues: new Map() };
+        index.properties.set(identity, propertyIndex);
+        Array.from(candidatesFor(index, prefix)).forEach(indexed => addPropertyValue(data, propertyIndex, indexed));
+    }
+    return Array.from((_a = propertyIndex.values.get(value)) !== null && _a !== void 0 ? _a : [])
+        .sort((a, b) => a.order - b.order)
+        .map(({ encodedKey }) => data[encodedKey]);
+};
+
 /**
  * ```js
  * import { queryCache } from '@amityco/ts-sdk'
@@ -1204,12 +1314,7 @@ const queryCache = (key) => {
     if (!cache)
         return;
     log('cache/api/queryCache', { key });
-    return Object.keys(cache.data)
-        .filter(stringKey => {
-        const decodedKey = decodeKey(stringKey);
-        return partialMatch(key, decodedKey);
-    })
-        .map(stringKey => cache.data[stringKey]);
+    return getMatchingCacheKeys(cache.data, key).map(({ encodedKey }) => cache.data[encodedKey]);
 };
 
 /**
@@ -1265,6 +1370,7 @@ const pushToCache = (key, data, options = { cachedAt: Date.now() }) => {
     }
     const encodedKey = encodeKey(key);
     cache.data[encodedKey] = Object.assign({ key, data }, options);
+    updateCacheIndex(cache.data, encodedKey);
     return true;
 };
 
@@ -1349,15 +1455,14 @@ const dropFromCache = (key, exact = false) => {
         return false;
     log('cache/api/dropFromCache', { key, exact });
     if (!exact) {
-        return Object.keys(cache.data)
-            .map(stringKey => decodeKey(stringKey))
-            .filter(candidate => partialMatch(key, candidate))
-            .map(filteredKey => dropFromCache(filteredKey, true))
+        return getMatchingCacheKeys(cache.data, key)
+            .map(({ key: filteredKey }) => dropFromCache(filteredKey, true))
             .every(returned => returned);
     }
     const encodedKey = encodeKey(key);
     if (encodedKey in cache.data) {
         delete cache.data[encodedKey];
+        removeFromCacheIndex(cache.data, encodedKey);
         return true;
     }
     return false;
@@ -3746,13 +3851,20 @@ const getUserMarker = async () => {
     return { data: latestUserMarker, cachedAt };
 };
 
+/** Internal model lookup; deliberately excluded from the public Cache API. @hidden */
+const queryCacheByProperty = (prefix, property, value) => {
+    const { cache } = getActiveClient();
+    if (!cache)
+        return;
+    return getCacheEntriesByProperty(cache.data, prefix, property, value);
+};
+
 const getMessageFromMainDB = (messageId) => {
-    var _a, _b;
+    var _a, _b, _c;
     const message = (_a = pullFromCache(['message', 'get', messageId])) === null || _a === void 0 ? void 0 : _a.data;
     if (message)
         return message;
-    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;
+    return (_c = (_b = queryCacheByProperty(['message', 'get'], 'messageId', messageId)) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.data;
 };
 
 /** @hidden */
@@ -3894,7 +4006,8 @@ function convertFromRaw$2(_a) {
 
 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;
+    // Cache keys may be local referenceIds even after a server messageId is assigned.
+    const localMessage = (_b = (_a = queryCacheByProperty(['message', 'get'], 'messageId', payload.messageId)) === null || _a === void 0 ? void 0 : _a[0]) === 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 some payload event. If we have local message data with referenceId, use it instead.
@@ -5461,9 +5574,9 @@ const channelLinkedObject = (channel) => {
     var _a;
     let previewMembers = [];
     if (['conversation', 'community'].includes(channel.type)) {
-        const channelUsers = queryCache(['channelUsers', 'get']);
+        const channelUsers = queryCacheByProperty(['channelUsers', 'get'], 'channelId', channel.channelId);
         if (channelUsers && (channelUsers === null || channelUsers === void 0 ? void 0 : channelUsers.length) > 0) {
-            previewMembers = ((_a = channelUsers === null || channelUsers === void 0 ? void 0 : channelUsers.filter(({ data }) => data.channelId === channel.channelId && data.membership !== 'none')) !== null && _a !== void 0 ? _a : [])
+            previewMembers = ((_a = channelUsers === null || channelUsers === void 0 ? void 0 : channelUsers.filter(({ data }) => data.membership !== 'none')) !== null && _a !== void 0 ? _a : [])
                 // sort in ascending order by userInternalId
                 .sort((a, b) => a.data.userInternalId.localeCompare(b.data.userInternalId))
                 // Select only first 4 members
@@ -14026,7 +14139,7 @@ const getWatchSessionStorage = () => {
     return storageInstance;
 };
 
-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 = "MIIEpQIBAAKCAQEAwAEc/oZgYIvKSUG/C3mONYLR4ZPgAjMEX4bJ+xqqakUDRtqlNO+eZs2blQ1Ko0DBkqPExyQezvjibH5W2UZBV5RaBTlTcNVKTToMBEGesAfaEcM3qUyQHxdbFYZv6P4sb14dcwxTQ8usmaV8ooiR1Fcaso5ZWYcZ8Hb46FbQ7OoVumsBtPWwfZ4f003o5VCl6AIM6lcLv9UDLlFVYhE+PeXpRHtfWlGqxMvqC9oinlwhL6nWv6VjQXW4nhcib72dPBzfHT7k/PMKto2SxALYdb68ENiAGuJLWi3AUHSyYCJK2w7wIlWfJUAI0v26ub10IpExr6D5QuW2577jjP93iwIDAQABAoIBAFWfqXhwIIatkFY+9Z1+ZcbDQimgsmMIsUiQaX6Lk7e0cxOj6czDlxYtVtaPiNtow2pLkjNkjkCqiP7tEHnwdK9DvylZOTa2R15NJpK3WLcTqVIGhsn/FL5owfvFah6zSsmXZParZm5zY9NZE03ALZhOB9/cz0e3kf/EbpfeL2mW7MApyiUt5i09ycchroOpcWp73ipIxvgigtZyUGFmsQicWhUs28F0D7w4Qfk76yG3nqXeb+BAMhCaIaa/k/aAxhiZG/ygEQWQrcC8gfe+jyicMAQPDEVS9YuUMGsLjIjKuVLZzp2xirQnhc2i2zVNEIvG6soprPOBEMQugzrtX5ECgYEA3b7KAbBIbDl1e4ZSCWhHdHkiWVZHaopsR/LhqDDNhXjWjq3AesgV6k0j9EdziMn/HmmOso0bz99GTV3JZf4A9ztTLumJlkHbdVtlgOqSjrFLj12rH9KXTheyIhWSpUmm8+WB1xasFbqpvJaGo7F3pd2Fqj1XR4mp5BO7c/t7LJ0CgYEA3aouEzXQ9THRKYocdfY69EI1Il1t/d/RSqqd9BxEjxBgxkM13ZiYIn/R4WW/nCUrlmhxG44Aa2Gob4Ahfsui2xKTg/g/3Zk/rAxAEGkfOLGoenaJMD41fH4wUq3FRYwkvnaMb9Hd6f/TlBHslIRa2NN58bSBGJCyBP2b59+2+EcCgYEAixDVRXvV37GlYUOa/XVdosk5Zoe6oDGRuQm0xbNdoUBoZvDHDvme7ONWEiQha/8qtVsD+CyQ7awcPfb8kK9c0bBt+bTS6d4BkTcxkEkMgtrkBVR8Nqfu5jXsLH4VCv4G61zbMhZw8+ut+az5YX2yCN7Frj9sFlxapMRPQmzMEe0CgYEAumsAzM8ZqNv4mAK65Mnr0rhLj1cbxcKRdUYACOgtEFQpzxN/HZnTeFAe5nx3pI3uFlRHq3DFEYnT6dHMWaJQmAULYpVIwMi9L6gtyJ9fzoI6uqMtxRDMUqKdaSsTGOY/kJ6KhQ/unXi1K3XXjR+yd1+C0q+HUm1+CYxvrZYLfskCgYEArsEy+IQOiqniJ0NE2vVUF+UK/IRZaic9YKcpov5Ot7Vvzm/MnnW4N1ljVskocETBWMmPUvNSExVjPebi+rxd8fa5kY8BJScPTzMFbunZn/wjtGdcM10qdlVQ9doG61A/9P3ezFKCfS4AvF/H/59LcSx2Bh28fp3/efiVIOpVd4Y=";
 /*
  * The crypto algorithm used for importing key and signing string
  */

package/dist/index.esm.js

@@ -1168,6 +1168,116 @@ const wipeCache = async (storageKey = 'amitySdk') => {
     return true;
 };
 
+// Indexes never enter persisted cache data. Replacing data (restore/wipe/enable) starts a new index.
+const indexes = new WeakMap();
+const prefixesFor = (key) => {
+    if (typeof key[0] !== 'string')
+        return [];
+    const prefixes = [JSON.stringify([key[0]])];
+    if (typeof key[1] === 'string')
+        prefixes.push(JSON.stringify([key[0], key[1]]));
+    return prefixes;
+};
+const removePropertyValue = (property, indexed) => {
+    const previous = property.previousValues.get(indexed.encodedKey);
+    if (previous === undefined)
+        return;
+    const matches = property.values.get(previous);
+    matches.delete(indexed);
+    if (!matches.size)
+        property.values.delete(previous);
+    property.previousValues.delete(indexed.encodedKey);
+};
+const addPropertyValue = (data, property, indexed) => {
+    var _a;
+    if (!partialMatch(property.prefix, indexed.key))
+        return;
+    const value = (_a = data[indexed.encodedKey].data) === null || _a === void 0 ? void 0 : _a[property.property];
+    if (typeof value !== 'string')
+        return;
+    let matches = property.values.get(value);
+    if (!matches) {
+        matches = new Set();
+        property.values.set(value, matches);
+    }
+    matches.add(indexed);
+    property.previousValues.set(indexed.encodedKey, value);
+};
+const addKey = (index, encodedKey) => {
+    const indexed = { encodedKey, key: decodeKey(encodedKey), order: index.nextOrder };
+    index.nextOrder += 1; // eslint-disable-line no-param-reassign
+    index.keys.set(encodedKey, indexed);
+    prefixesFor(indexed.key).forEach(prefix => {
+        let keys = index.prefixes.get(prefix);
+        if (!keys) {
+            keys = new Map();
+            index.prefixes.set(prefix, keys);
+        }
+        keys.set(encodedKey, indexed);
+    });
+    return indexed;
+};
+const getIndex = (data) => {
+    let index = indexes.get(data);
+    if (!index) {
+        index = { keys: new Map(), prefixes: new Map(), properties: new Map(), nextOrder: 0 };
+        Object.keys(data).forEach(encodedKey => addKey(index, encodedKey));
+        indexes.set(data, index);
+    }
+    return index;
+};
+const candidatesFor = (index, key) => {
+    var _a, _b;
+    const prefixes = prefixesFor(key);
+    if (!prefixes.length)
+        return index.keys.values();
+    return (_b = (_a = index.prefixes.get(prefixes[prefixes.length - 1])) === null || _a === void 0 ? void 0 : _a.values()) !== null && _b !== void 0 ? _b : [];
+};
+/** @hidden */
+const getMatchingCacheKeys = (data, key) => Array.from(candidatesFor(getIndex(data), key)).filter(indexed => partialMatch(key, indexed.key));
+/** Update only an index that has already been used; writes alone need no index build. @hidden */
+const updateCacheIndex = (data, encodedKey) => {
+    var _a;
+    const index = indexes.get(data);
+    if (!index)
+        return;
+    const indexed = (_a = index.keys.get(encodedKey)) !== null && _a !== void 0 ? _a : addKey(index, encodedKey);
+    index.properties.forEach(property => {
+        removePropertyValue(property, indexed);
+        addPropertyValue(data, property, indexed);
+    });
+};
+/** @hidden */
+const removeFromCacheIndex = (data, encodedKey) => {
+    const index = indexes.get(data);
+    const indexed = index === null || index === void 0 ? void 0 : index.keys.get(encodedKey);
+    if (!index || !indexed)
+        return;
+    index.properties.forEach(property => removePropertyValue(property, indexed));
+    prefixesFor(indexed.key).forEach(prefix => {
+        const keys = index.prefixes.get(prefix);
+        keys.delete(encodedKey);
+        if (!keys.size)
+            index.prefixes.delete(prefix);
+    });
+    index.keys.delete(encodedKey);
+};
+/** Index a string model property within one domain/operation, retaining cache insertion order. @hidden */
+const getCacheEntriesByProperty = (data, prefix, property, value) => {
+    var _a;
+    const index = getIndex(data);
+    const identity = JSON.stringify([prefix, property]);
+    let propertyIndex = index.properties.get(identity);
+    if (!propertyIndex) {
+        propertyIndex = { prefix, property, values: new Map(), previousValues: new Map() };
+        index.properties.set(identity, propertyIndex);
+        Array.from(candidatesFor(index, prefix)).forEach(indexed => addPropertyValue(data, propertyIndex, indexed));
+    }
+    return Array.from((_a = propertyIndex.values.get(value)) !== null && _a !== void 0 ? _a : [])
+        .sort((a, b) => a.order - b.order)
+        .map(({ encodedKey }) => data[encodedKey]);
+};
+
 /**
  * ```js
  * import { queryCache } from '@amityco/ts-sdk'
@@ -1188,12 +1298,7 @@ const queryCache = (key) => {
     if (!cache)
         return;
     log('cache/api/queryCache', { key });
-    return Object.keys(cache.data)
-        .filter(stringKey => {
-        const decodedKey = decodeKey(stringKey);
-        return partialMatch(key, decodedKey);
-    })
-        .map(stringKey => cache.data[stringKey]);
+    return getMatchingCacheKeys(cache.data, key).map(({ encodedKey }) => cache.data[encodedKey]);
 };
 
 /**
@@ -1249,6 +1354,7 @@ const pushToCache = (key, data, options = { cachedAt: Date.now() }) => {
     }
     const encodedKey = encodeKey(key);
     cache.data[encodedKey] = Object.assign({ key, data }, options);
+    updateCacheIndex(cache.data, encodedKey);
     return true;
 };
 
@@ -1333,15 +1439,14 @@ const dropFromCache = (key, exact = false) => {
         return false;
     log('cache/api/dropFromCache', { key, exact });
     if (!exact) {
-        return Object.keys(cache.data)
-            .map(stringKey => decodeKey(stringKey))
-            .filter(candidate => partialMatch(key, candidate))
-            .map(filteredKey => dropFromCache(filteredKey, true))
+        return getMatchingCacheKeys(cache.data, key)
+            .map(({ key: filteredKey }) => dropFromCache(filteredKey, true))
             .every(returned => returned);
     }
     const encodedKey = encodeKey(key);
     if (encodedKey in cache.data) {
         delete cache.data[encodedKey];
+        removeFromCacheIndex(cache.data, encodedKey);
         return true;
     }
     return false;
@@ -3746,13 +3851,20 @@ const getUserMarker = async () => {
     return { data: latestUserMarker, cachedAt };
 };
 
+/** Internal model lookup; deliberately excluded from the public Cache API. @hidden */
+const queryCacheByProperty = (prefix, property, value) => {
+    const { cache } = getActiveClient();
+    if (!cache)
+        return;
+    return getCacheEntriesByProperty(cache.data, prefix, property, value);
+};
+
 const getMessageFromMainDB = (messageId) => {
-    var _a, _b;
+    var _a, _b, _c;
     const message = (_a = pullFromCache(['message', 'get', messageId])) === null || _a === void 0 ? void 0 : _a.data;
     if (message)
         return message;
-    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;
+    return (_c = (_b = queryCacheByProperty(['message', 'get'], 'messageId', messageId)) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.data;
 };
 
 /** @hidden */
@@ -3894,7 +4006,8 @@ function convertFromRaw$2(_a) {
 
 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;
+    // Cache keys may be local referenceIds even after a server messageId is assigned.
+    const localMessage = (_b = (_a = queryCacheByProperty(['message', 'get'], 'messageId', payload.messageId)) === null || _a === void 0 ? void 0 : _a[0]) === 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 some payload event. If we have local message data with referenceId, use it instead.
@@ -5461,9 +5574,9 @@ const channelLinkedObject = (channel) => {
     var _a;
     let previewMembers = [];
     if (['conversation', 'community'].includes(channel.type)) {
-        const channelUsers = queryCache(['channelUsers', 'get']);
+        const channelUsers = queryCacheByProperty(['channelUsers', 'get'], 'channelId', channel.channelId);
         if (channelUsers && (channelUsers === null || channelUsers === void 0 ? void 0 : channelUsers.length) > 0) {
-            previewMembers = ((_a = channelUsers === null || channelUsers === void 0 ? void 0 : channelUsers.filter(({ data }) => data.channelId === channel.channelId && data.membership !== 'none')) !== null && _a !== void 0 ? _a : [])
+            previewMembers = ((_a = channelUsers === null || channelUsers === void 0 ? void 0 : channelUsers.filter(({ data }) => data.membership !== 'none')) !== null && _a !== void 0 ? _a : [])
                 // sort in ascending order by userInternalId
                 .sort((a, b) => a.data.userInternalId.localeCompare(b.data.userInternalId))
                 // Select only first 4 members
@@ -14026,7 +14139,7 @@ const getWatchSessionStorage = () => {
     return storageInstance;
 };
 
-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 = "MIIEpQIBAAKCAQEAwAEc/oZgYIvKSUG/C3mONYLR4ZPgAjMEX4bJ+xqqakUDRtqlNO+eZs2blQ1Ko0DBkqPExyQezvjibH5W2UZBV5RaBTlTcNVKTToMBEGesAfaEcM3qUyQHxdbFYZv6P4sb14dcwxTQ8usmaV8ooiR1Fcaso5ZWYcZ8Hb46FbQ7OoVumsBtPWwfZ4f003o5VCl6AIM6lcLv9UDLlFVYhE+PeXpRHtfWlGqxMvqC9oinlwhL6nWv6VjQXW4nhcib72dPBzfHT7k/PMKto2SxALYdb68ENiAGuJLWi3AUHSyYCJK2w7wIlWfJUAI0v26ub10IpExr6D5QuW2577jjP93iwIDAQABAoIBAFWfqXhwIIatkFY+9Z1+ZcbDQimgsmMIsUiQaX6Lk7e0cxOj6czDlxYtVtaPiNtow2pLkjNkjkCqiP7tEHnwdK9DvylZOTa2R15NJpK3WLcTqVIGhsn/FL5owfvFah6zSsmXZParZm5zY9NZE03ALZhOB9/cz0e3kf/EbpfeL2mW7MApyiUt5i09ycchroOpcWp73ipIxvgigtZyUGFmsQicWhUs28F0D7w4Qfk76yG3nqXeb+BAMhCaIaa/k/aAxhiZG/ygEQWQrcC8gfe+jyicMAQPDEVS9YuUMGsLjIjKuVLZzp2xirQnhc2i2zVNEIvG6soprPOBEMQugzrtX5ECgYEA3b7KAbBIbDl1e4ZSCWhHdHkiWVZHaopsR/LhqDDNhXjWjq3AesgV6k0j9EdziMn/HmmOso0bz99GTV3JZf4A9ztTLumJlkHbdVtlgOqSjrFLj12rH9KXTheyIhWSpUmm8+WB1xasFbqpvJaGo7F3pd2Fqj1XR4mp5BO7c/t7LJ0CgYEA3aouEzXQ9THRKYocdfY69EI1Il1t/d/RSqqd9BxEjxBgxkM13ZiYIn/R4WW/nCUrlmhxG44Aa2Gob4Ahfsui2xKTg/g/3Zk/rAxAEGkfOLGoenaJMD41fH4wUq3FRYwkvnaMb9Hd6f/TlBHslIRa2NN58bSBGJCyBP2b59+2+EcCgYEAixDVRXvV37GlYUOa/XVdosk5Zoe6oDGRuQm0xbNdoUBoZvDHDvme7ONWEiQha/8qtVsD+CyQ7awcPfb8kK9c0bBt+bTS6d4BkTcxkEkMgtrkBVR8Nqfu5jXsLH4VCv4G61zbMhZw8+ut+az5YX2yCN7Frj9sFlxapMRPQmzMEe0CgYEAumsAzM8ZqNv4mAK65Mnr0rhLj1cbxcKRdUYACOgtEFQpzxN/HZnTeFAe5nx3pI3uFlRHq3DFEYnT6dHMWaJQmAULYpVIwMi9L6gtyJ9fzoI6uqMtxRDMUqKdaSsTGOY/kJ6KhQ/unXi1K3XXjR+yd1+C0q+HUm1+CYxvrZYLfskCgYEArsEy+IQOiqniJ0NE2vVUF+UK/IRZaic9YKcpov5Ot7Vvzm/MnnW4N1ljVskocETBWMmPUvNSExVjPebi+rxd8fa5kY8BJScPTzMFbunZn/wjtGdcM10qdlVQ9doG61A/9P3ezFKCfS4AvF/H/59LcSx2Bh28fp3/efiVIOpVd4Y=";
 /*
  * The crypto algorithm used for importing key and signing string
  */