@planningcenter/chat-react-native 3.20.0 → 3.20.1-rc.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/hooks/use_async_storage.d.ts +1 -1
- package/build/hooks/use_async_storage.d.ts.map +1 -1
- package/build/hooks/use_async_storage.js +21 -6
- package/build/hooks/use_async_storage.js.map +1 -1
- package/build/hooks/use_message_create_or_update.d.ts.map +1 -1
- package/build/hooks/use_message_create_or_update.js +2 -1
- package/build/hooks/use_message_create_or_update.js.map +1 -1
- package/build/utils/cache/messages_cache.d.ts +1 -0
- package/build/utils/cache/messages_cache.d.ts.map +1 -1
- package/build/utils/cache/messages_cache.js +13 -6
- package/build/utils/cache/messages_cache.js.map +1 -1
- package/package.json +2 -2
- package/src/__tests__/hooks/use_async_storage.test.tsx +313 -0
- package/src/hooks/use_async_storage.ts +33 -16
- package/src/hooks/use_message_create_or_update.ts +2 -1
- package/src/utils/cache/messages_cache.ts +18 -6
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
type SetValue<TCacheData> = (_itemValue?: TCacheData | null) => Promise<void>;
|
|
2
|
-
export declare function useAsyncStorage<TCacheData>(key: string, initialValue: TCacheData): [TCacheData, SetValue<TCacheData>];
|
|
2
|
+
export declare function useAsyncStorage<TCacheData>(key: string, initialValue: TCacheData, throwOnError?: boolean): [TCacheData, SetValue<TCacheData>];
|
|
3
3
|
export {};
|
|
4
4
|
//# sourceMappingURL=use_async_storage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use_async_storage.d.ts","sourceRoot":"","sources":["../../src/hooks/use_async_storage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"use_async_storage.d.ts","sourceRoot":"","sources":["../../src/hooks/use_async_storage.ts"],"names":[],"mappings":"AAOA,KAAK,QAAQ,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AAE7E,wBAAgB,eAAe,CAAC,UAAU,EACxC,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,UAAU,EACxB,YAAY,GAAE,OAAe,GAC5B,CAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CA+CpC"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import AsyncStorage from '@react-native-async-storage/async-storage';
|
|
2
2
|
import { useSuspenseQuery } from '@tanstack/react-query';
|
|
3
|
+
import { noop } from 'lodash';
|
|
3
4
|
import { useCallback } from 'react';
|
|
4
5
|
const cacheKeyGenerator = (key) => [`AsyncStorageResource:${key}`];
|
|
5
|
-
export function useAsyncStorage(key, initialValue) {
|
|
6
|
+
export function useAsyncStorage(key, initialValue, throwOnError = false) {
|
|
6
7
|
const cacheKey = cacheKeyGenerator(key);
|
|
7
8
|
const { data: value, refetch } = useSuspenseQuery({
|
|
8
9
|
queryKey: cacheKey,
|
|
9
|
-
queryFn: () => AsyncStorage.getItem(key)
|
|
10
|
+
queryFn: () => AsyncStorage.getItem(key)
|
|
11
|
+
.then(storedValue => {
|
|
10
12
|
if (!storedValue)
|
|
11
13
|
return initialValue;
|
|
12
14
|
try {
|
|
@@ -15,18 +17,31 @@ export function useAsyncStorage(key, initialValue) {
|
|
|
15
17
|
catch {
|
|
16
18
|
return storedValue;
|
|
17
19
|
}
|
|
20
|
+
})
|
|
21
|
+
.catch(e => {
|
|
22
|
+
if (!throwOnError)
|
|
23
|
+
return initialValue;
|
|
24
|
+
return Promise.reject(e);
|
|
18
25
|
}),
|
|
19
26
|
});
|
|
20
27
|
const setValue = useCallback(itemValue => {
|
|
21
28
|
if (itemValue === null || itemValue === undefined) {
|
|
22
|
-
return AsyncStorage.removeItem(key)
|
|
29
|
+
return AsyncStorage.removeItem(key)
|
|
30
|
+
.then(() => {
|
|
23
31
|
refetch();
|
|
24
|
-
})
|
|
32
|
+
})
|
|
33
|
+
.catch(noop);
|
|
25
34
|
}
|
|
26
|
-
return AsyncStorage.setItem(key, JSON.stringify(itemValue))
|
|
35
|
+
return AsyncStorage.setItem(key, JSON.stringify(itemValue))
|
|
36
|
+
.then(() => {
|
|
27
37
|
refetch();
|
|
38
|
+
})
|
|
39
|
+
.catch(e => {
|
|
40
|
+
if (!throwOnError)
|
|
41
|
+
return;
|
|
42
|
+
return Promise.reject(e);
|
|
28
43
|
});
|
|
29
|
-
}, [key, refetch]);
|
|
44
|
+
}, [throwOnError, key, refetch]);
|
|
30
45
|
return [value || initialValue, setValue];
|
|
31
46
|
}
|
|
32
47
|
//# sourceMappingURL=use_async_storage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use_async_storage.js","sourceRoot":"","sources":["../../src/hooks/use_async_storage.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,2CAA2C,CAAA;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAEnC,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,wBAAwB,GAAG,EAAE,CAAC,CAAA;AAI1E,MAAM,UAAU,eAAe,CAC7B,GAAW,EACX,YAAwB;
|
|
1
|
+
{"version":3,"file":"use_async_storage.js","sourceRoot":"","sources":["../../src/hooks/use_async_storage.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,2CAA2C,CAAA;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAEnC,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,wBAAwB,GAAG,EAAE,CAAC,CAAA;AAI1E,MAAM,UAAU,eAAe,CAC7B,GAAW,EACX,YAAwB,EACxB,eAAwB,KAAK;IAE7B,MAAM,QAAQ,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAA;IAEvC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAa;QAC5D,QAAQ,EAAE,QAAQ;QAClB,OAAO,EAAE,GAAG,EAAE,CACZ,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC;aACtB,IAAI,CAAC,WAAW,CAAC,EAAE;YAClB,IAAI,CAAC,WAAW;gBAAE,OAAO,YAAY,CAAA;YAErC,IAAI,CAAC;gBACH,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;YAChC,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,WAAW,CAAA;YACpB,CAAC;QACH,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE;YACT,IAAI,CAAC,YAAY;gBAAE,OAAO,YAAY,CAAA;YAEtC,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC,CAAC;KACP,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAyB,WAAW,CAChD,SAAS,CAAC,EAAE;QACV,IAAI,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAClD,OAAO,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC;iBAChC,IAAI,CAAC,GAAG,EAAE;gBACT,OAAO,EAAE,CAAA;YACX,CAAC,CAAC;iBACD,KAAK,CAAC,IAAI,CAAC,CAAA;QAChB,CAAC;QAED,OAAO,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;aACxD,IAAI,CAAC,GAAG,EAAE;YACT,OAAO,EAAE,CAAA;QACX,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE;YACT,IAAI,CAAC,YAAY;gBAAE,OAAM;YAEzB,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC,CAAC,CAAA;IACN,CAAC,EACD,CAAC,YAAY,EAAE,GAAG,EAAE,OAAO,CAAC,CAC7B,CAAA;IAED,OAAO,CAAC,KAAK,IAAI,YAAY,EAAE,QAAQ,CAAC,CAAA;AAC1C,CAAC","sourcesContent":["import AsyncStorage from '@react-native-async-storage/async-storage'\nimport { useSuspenseQuery } from '@tanstack/react-query'\nimport { noop } from 'lodash'\nimport { useCallback } from 'react'\n\nconst cacheKeyGenerator = (key: string) => [`AsyncStorageResource:${key}`]\n\ntype SetValue<TCacheData> = (_itemValue?: TCacheData | null) => Promise<void>\n\nexport function useAsyncStorage<TCacheData>(\n key: string,\n initialValue: TCacheData,\n throwOnError: boolean = false\n): [TCacheData, SetValue<TCacheData>] {\n const cacheKey = cacheKeyGenerator(key)\n\n const { data: value, refetch } = useSuspenseQuery<TCacheData>({\n queryKey: cacheKey,\n queryFn: () =>\n AsyncStorage.getItem(key)\n .then(storedValue => {\n if (!storedValue) return initialValue\n\n try {\n return JSON.parse(storedValue)\n } catch {\n return storedValue\n }\n })\n .catch(e => {\n if (!throwOnError) return initialValue\n\n return Promise.reject(e)\n }),\n })\n\n const setValue: SetValue<TCacheData> = useCallback(\n itemValue => {\n if (itemValue === null || itemValue === undefined) {\n return AsyncStorage.removeItem(key)\n .then(() => {\n refetch()\n })\n .catch(noop)\n }\n\n return AsyncStorage.setItem(key, JSON.stringify(itemValue))\n .then(() => {\n refetch()\n })\n .catch(e => {\n if (!throwOnError) return\n\n return Promise.reject(e)\n })\n },\n [throwOnError, key, refetch]\n )\n\n return [value || initialValue, setValue]\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use_message_create_or_update.d.ts","sourceRoot":"","sources":["../../src/hooks/use_message_create_or_update.ts"],"names":[],"mappings":"AAGA,OAAO,EAAiB,WAAW,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAQtE,OAAO,EAAE,uCAAuC,EAAE,MAAM,gEAAgE,CAAA;AAOxH,UAAU,KAAK;IACb,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,CAAC,EAAE,eAAe,CAAA;IACzB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAC5B;AAED,wBAAgB,wBAAwB,CAAC,EAAE,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,KAAK;UAqD5E,MAAM;kBACE,uCAAuC,EAAE;;;
|
|
1
|
+
{"version":3,"file":"use_message_create_or_update.d.ts","sourceRoot":"","sources":["../../src/hooks/use_message_create_or_update.ts"],"names":[],"mappings":"AAGA,OAAO,EAAiB,WAAW,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAQtE,OAAO,EAAE,uCAAuC,EAAE,MAAM,gEAAgE,CAAA;AAOxH,UAAU,KAAK;IACb,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,CAAC,EAAE,eAAe,CAAA;IACzB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAC5B;AAED,wBAAgB,wBAAwB,CAAC,EAAE,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,KAAK;UAqD5E,MAAM;kBACE,uCAAuC,EAAE;;;GA+E5D"}
|
|
@@ -7,7 +7,7 @@ import { useCurrentPerson } from './use_current_person';
|
|
|
7
7
|
import { optimisticallyUpdateMessage } from '../utils/cache/optimistically_update_message';
|
|
8
8
|
import { optimisticallyCreateMessage } from '../utils/cache/optimistically_create_message';
|
|
9
9
|
import { startMessageCreationTracking } from '../utils/performance_tracking';
|
|
10
|
-
import { isNewMessage } from '../utils/cache/messages_cache';
|
|
10
|
+
import { isNewMessage, mergeMessageUpdate } from '../utils/cache/messages_cache';
|
|
11
11
|
export function useMessageCreateOrUpdate({ conversationId, message, replyRootId }) {
|
|
12
12
|
const messageId = message?.id || null;
|
|
13
13
|
const isEditing = !isNewMessage(message);
|
|
@@ -105,6 +105,7 @@ export function useMessageCreateOrUpdate({ conversationId, message, replyRootId
|
|
|
105
105
|
chatQueryClient.setQueryData(queryKey, data => updateOrCreateRecordInPagesData({
|
|
106
106
|
data,
|
|
107
107
|
record: updatedMessage,
|
|
108
|
+
processRecord: (record, current) => mergeMessageUpdate(record, current),
|
|
108
109
|
}));
|
|
109
110
|
},
|
|
110
111
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use_message_create_or_update.js","sourceRoot":"","sources":["../../src/hooks/use_message_create_or_update.ts"],"names":[],"mappings":"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","sourcesContent":["import { InfiniteData, useMutation } from '@tanstack/react-query'\nimport { getMessagesQueryKey, getMessagesRequestArgs } from '../utils/request/get_messages'\nimport { useApiClient } from './use_api_client'\nimport { ApiCollection, ApiResource, MessageResource } from '../types'\nimport { chatQueryClient } from '../contexts/api_provider'\nimport {\n deleteRecordInPagesData,\n Haptic,\n updateOrCreateRecordInPagesData,\n updateRecordInPagesData,\n} from '../utils'\nimport { DenormalizedAttachmentResourceForCreate } from '../types/resources/denormalized_attachment_resource_for_create'\nimport { useCurrentPerson } from './use_current_person'\nimport { optimisticallyUpdateMessage } from '../utils/cache/optimistically_update_message'\nimport { optimisticallyCreateMessage } from '../utils/cache/optimistically_create_message'\nimport { startMessageCreationTracking } from '../utils/performance_tracking'\nimport { isNewMessage } from '../utils/cache/messages_cache'\n\ninterface Props {\n conversationId: number\n message?: MessageResource\n replyRootId?: string | null\n}\n\nexport function useMessageCreateOrUpdate({ conversationId, message, replyRootId }: Props) {\n const messageId = message?.id || null\n const isEditing = !isNewMessage(message)\n const apiClient = useApiClient()\n const currentPerson = useCurrentPerson()\n\n const mutation = useMutation({\n mutationFn: ({\n text,\n attachments,\n }: {\n text: string\n attachments?: DenormalizedAttachmentResourceForCreate[]\n }) => {\n const requestParams = getMessagesRequestArgs({ conversation_id: conversationId })\n const fieldsWithValueJoined = Object.fromEntries(\n Object.entries(requestParams.data.fields).map(([k, v]) => [k, v.join(',')])\n )\n let attributes: any = {\n text,\n ...(attachments ? { attachments } : {}),\n ...(replyRootId ? { reply_root: { id: replyRootId } } : {}),\n }\n if (!isEditing) {\n const idempotentKey = insecureUUID()\n attributes.idempotent_key = idempotentKey\n startMessageCreationTracking(idempotentKey)\n }\n const data = {\n ...requestParams.data,\n data: {\n type: 'Message',\n attributes,\n },\n fields: fieldsWithValueJoined,\n }\n\n if (isEditing) {\n return apiClient.chat.patch<ApiResource<MessageResource>>({\n url: `/me/conversations/${conversationId}/messages/${messageId}`,\n data,\n })\n } else {\n return apiClient.chat.post<ApiResource<MessageResource>>({\n url: `/me/conversations/${conversationId}/messages`,\n data,\n })\n }\n },\n onMutate: async ({\n text,\n attachments,\n }: {\n text: string\n attachments?: DenormalizedAttachmentResourceForCreate[]\n }) => {\n if (message && isEditing) {\n const optimisticMessage = optimisticallyUpdateMessage({\n conversationId,\n message,\n text,\n })\n\n return { message: optimisticMessage }\n }\n\n const optimisticMessage = optimisticallyCreateMessage({\n conversationId,\n message,\n text,\n attachments,\n currentPerson,\n replyRootId,\n })\n\n return { message: optimisticMessage }\n },\n onError: (error, variables, context) => {\n const { message: optimisticMessage } = context || {}\n Haptic.notificationError()\n\n // Add error to the optimistic message from the cache on error\n if (optimisticMessage) {\n const queryKey = getMessagesQueryKey({\n conversation_id: conversationId,\n reply_root_id: replyRootId,\n })\n chatQueryClient.setQueryData(\n queryKey,\n (data: InfiniteData<ApiCollection<MessageResource>> | undefined) =>\n updateRecordInPagesData({\n data,\n record: optimisticMessage,\n processRecord: (_next, prev) => ({\n ...prev,\n error: error.message || 'Failed to send message',\n pending: false, // Mark as no longer pending\n }),\n })\n )\n }\n },\n onSuccess: (result: ApiResource<MessageResource>, variables, context) => {\n const { message: optimisticMessage } = context || {}\n const updatedMessage = result.data\n type QueryData = InfiniteData<ApiCollection<MessageResource>>\n const queryKey = getMessagesQueryKey({\n conversation_id: conversationId,\n reply_root_id: replyRootId,\n })\n\n // First remove the optimistic message if it exists\n if (optimisticMessage) {\n chatQueryClient.setQueryData<QueryData>(queryKey, data =>\n deleteRecordInPagesData({\n data,\n record: optimisticMessage,\n })\n )\n }\n\n // Then add the real message\n chatQueryClient.setQueryData<QueryData>(queryKey, data =>\n updateOrCreateRecordInPagesData({\n data,\n record: updatedMessage,\n })\n )\n },\n })\n\n return mutation\n}\n\n/**\n * Generate a random UUID (v4) for idempotent keys.\n * Uses Math.random, which is not cryptographically secure.\n * An actual crypto library requires native dependencies.\n * This is OK for now since idempotent keys are not security-sensitive\n * or need to be guaranteed unique.\n * They are short lived and we use it in combination with the message's creator_id so\n * their impact is scoped only the current user.\n */\nfunction insecureUUID(): string {\n return 'xxxxxxxx-xxxx-4xxx-Nxxx-xxxxxxxxxxxx'\n .replace(/x/g, () => Math.floor(Math.random() * 16).toString(16))\n .replace(/N/g, () => (Math.floor(Math.random() * 4) + 8).toString(16))\n}\n"]}
|
|
1
|
+
{"version":3,"file":"use_message_create_or_update.js","sourceRoot":"","sources":["../../src/hooks/use_message_create_or_update.ts"],"names":[],"mappings":"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","sourcesContent":["import { InfiniteData, useMutation } from '@tanstack/react-query'\nimport { getMessagesQueryKey, getMessagesRequestArgs } from '../utils/request/get_messages'\nimport { useApiClient } from './use_api_client'\nimport { ApiCollection, ApiResource, MessageResource } from '../types'\nimport { chatQueryClient } from '../contexts/api_provider'\nimport {\n deleteRecordInPagesData,\n Haptic,\n updateOrCreateRecordInPagesData,\n updateRecordInPagesData,\n} from '../utils'\nimport { DenormalizedAttachmentResourceForCreate } from '../types/resources/denormalized_attachment_resource_for_create'\nimport { useCurrentPerson } from './use_current_person'\nimport { optimisticallyUpdateMessage } from '../utils/cache/optimistically_update_message'\nimport { optimisticallyCreateMessage } from '../utils/cache/optimistically_create_message'\nimport { startMessageCreationTracking } from '../utils/performance_tracking'\nimport { isNewMessage, mergeMessageUpdate } from '../utils/cache/messages_cache'\n\ninterface Props {\n conversationId: number\n message?: MessageResource\n replyRootId?: string | null\n}\n\nexport function useMessageCreateOrUpdate({ conversationId, message, replyRootId }: Props) {\n const messageId = message?.id || null\n const isEditing = !isNewMessage(message)\n const apiClient = useApiClient()\n const currentPerson = useCurrentPerson()\n\n const mutation = useMutation({\n mutationFn: ({\n text,\n attachments,\n }: {\n text: string\n attachments?: DenormalizedAttachmentResourceForCreate[]\n }) => {\n const requestParams = getMessagesRequestArgs({ conversation_id: conversationId })\n const fieldsWithValueJoined = Object.fromEntries(\n Object.entries(requestParams.data.fields).map(([k, v]) => [k, v.join(',')])\n )\n let attributes: any = {\n text,\n ...(attachments ? { attachments } : {}),\n ...(replyRootId ? { reply_root: { id: replyRootId } } : {}),\n }\n if (!isEditing) {\n const idempotentKey = insecureUUID()\n attributes.idempotent_key = idempotentKey\n startMessageCreationTracking(idempotentKey)\n }\n const data = {\n ...requestParams.data,\n data: {\n type: 'Message',\n attributes,\n },\n fields: fieldsWithValueJoined,\n }\n\n if (isEditing) {\n return apiClient.chat.patch<ApiResource<MessageResource>>({\n url: `/me/conversations/${conversationId}/messages/${messageId}`,\n data,\n })\n } else {\n return apiClient.chat.post<ApiResource<MessageResource>>({\n url: `/me/conversations/${conversationId}/messages`,\n data,\n })\n }\n },\n onMutate: async ({\n text,\n attachments,\n }: {\n text: string\n attachments?: DenormalizedAttachmentResourceForCreate[]\n }) => {\n if (message && isEditing) {\n const optimisticMessage = optimisticallyUpdateMessage({\n conversationId,\n message,\n text,\n })\n\n return { message: optimisticMessage }\n }\n\n const optimisticMessage = optimisticallyCreateMessage({\n conversationId,\n message,\n text,\n attachments,\n currentPerson,\n replyRootId,\n })\n\n return { message: optimisticMessage }\n },\n onError: (error, variables, context) => {\n const { message: optimisticMessage } = context || {}\n Haptic.notificationError()\n\n // Add error to the optimistic message from the cache on error\n if (optimisticMessage) {\n const queryKey = getMessagesQueryKey({\n conversation_id: conversationId,\n reply_root_id: replyRootId,\n })\n chatQueryClient.setQueryData(\n queryKey,\n (data: InfiniteData<ApiCollection<MessageResource>> | undefined) =>\n updateRecordInPagesData({\n data,\n record: optimisticMessage,\n processRecord: (_next, prev) => ({\n ...prev,\n error: error.message || 'Failed to send message',\n pending: false, // Mark as no longer pending\n }),\n })\n )\n }\n },\n onSuccess: (result: ApiResource<MessageResource>, variables, context) => {\n const { message: optimisticMessage } = context || {}\n const updatedMessage = result.data\n type QueryData = InfiniteData<ApiCollection<MessageResource>>\n const queryKey = getMessagesQueryKey({\n conversation_id: conversationId,\n reply_root_id: replyRootId,\n })\n\n // First remove the optimistic message if it exists\n if (optimisticMessage) {\n chatQueryClient.setQueryData<QueryData>(queryKey, data =>\n deleteRecordInPagesData({\n data,\n record: optimisticMessage,\n })\n )\n }\n\n // Then add the real message\n chatQueryClient.setQueryData<QueryData>(queryKey, data =>\n updateOrCreateRecordInPagesData({\n data,\n record: updatedMessage,\n processRecord: (record, current) => mergeMessageUpdate(record, current),\n })\n )\n },\n })\n\n return mutation\n}\n\n/**\n * Generate a random UUID (v4) for idempotent keys.\n * Uses Math.random, which is not cryptographically secure.\n * An actual crypto library requires native dependencies.\n * This is OK for now since idempotent keys are not security-sensitive\n * or need to be guaranteed unique.\n * They are short lived and we use it in combination with the message's creator_id so\n * their impact is scoped only the current user.\n */\nfunction insecureUUID(): string {\n return 'xxxxxxxx-xxxx-4xxx-Nxxx-xxxxxxxxxxxx'\n .replace(/x/g, () => Math.floor(Math.random() * 16).toString(16))\n .replace(/N/g, () => (Math.floor(Math.random() * 4) + 8).toString(16))\n}\n"]}
|
|
@@ -6,4 +6,5 @@ export declare function updateCacheWithReaction(queryClient: QueryClient, queryK
|
|
|
6
6
|
export declare function isTemporaryMessageId(messageId?: string | null): boolean;
|
|
7
7
|
export declare function isNewMessage(message?: MessageResource): boolean;
|
|
8
8
|
export declare function getThreadedMessagesQueryKey(conversationId: number, replyRootId: string): import("../../hooks/use_suspense_api").RequestQueryKey;
|
|
9
|
+
export declare function mergeMessageUpdate(record: MessageResource, current?: MessageResource): MessageResource;
|
|
9
10
|
//# sourceMappingURL=messages_cache.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages_cache.d.ts","sourceRoot":"","sources":["../../../src/utils/cache/messages_cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACjE,OAAO,EAAiB,eAAe,EAAE,MAAM,aAAa,CAAA;AAG5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAK3D,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,EAAE,eAAe,EACxB,KAAK,EAAE,iBAAiB,GAAG,iBAAiB,
|
|
1
|
+
{"version":3,"file":"messages_cache.d.ts","sourceRoot":"","sources":["../../../src/utils/cache/messages_cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACjE,OAAO,EAAiB,eAAe,EAAE,MAAM,aAAa,CAAA;AAG5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAK3D,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,EAAE,eAAe,EACxB,KAAK,EAAE,iBAAiB,GAAG,iBAAiB,QAkC7C;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,iBAAiB,EACxB,eAAe,EAAE,MAAM,QAuCxB;AAGD,wBAAgB,oBAAoB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAEvE;AACD,wBAAgB,YAAY,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAE/D;AAED,wBAAgB,2BAA2B,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,0DAMtF;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,eAAe,EACvB,OAAO,CAAC,EAAE,eAAe,GACxB,eAAe,CAWjB"}
|
|
@@ -23,18 +23,14 @@ export function updateCacheWithMessage(queryClient, queryKey, message, event) {
|
|
|
23
23
|
return updateOrCreateRecordInPagesData({
|
|
24
24
|
data: dataAfterTempRemoval,
|
|
25
25
|
record: message,
|
|
26
|
-
processRecord: (record, current) =>
|
|
27
|
-
return { ...current, ...record };
|
|
28
|
-
},
|
|
26
|
+
processRecord: (record, current) => mergeMessageUpdate(record, current),
|
|
29
27
|
});
|
|
30
28
|
}
|
|
31
29
|
else {
|
|
32
30
|
return updateRecordInPagesData({
|
|
33
31
|
data: prev,
|
|
34
32
|
record: message,
|
|
35
|
-
processRecord: (record, current) =>
|
|
36
|
-
return { ...current, ...record };
|
|
37
|
-
},
|
|
33
|
+
processRecord: (record, current) => mergeMessageUpdate(record, current),
|
|
38
34
|
});
|
|
39
35
|
}
|
|
40
36
|
});
|
|
@@ -86,4 +82,15 @@ export function getThreadedMessagesQueryKey(conversationId, replyRootId) {
|
|
|
86
82
|
});
|
|
87
83
|
return getRequestQueryKey(requestArgs);
|
|
88
84
|
}
|
|
85
|
+
export function mergeMessageUpdate(record, current) {
|
|
86
|
+
if (!current) {
|
|
87
|
+
return record;
|
|
88
|
+
}
|
|
89
|
+
return {
|
|
90
|
+
...current,
|
|
91
|
+
...record,
|
|
92
|
+
// Preserve reactions from cache - they're managed via separate reaction events
|
|
93
|
+
reactionCounts: current.reactionCounts || [],
|
|
94
|
+
};
|
|
95
|
+
}
|
|
89
96
|
//# sourceMappingURL=messages_cache.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages_cache.js","sourceRoot":"","sources":["../../../src/utils/cache/messages_cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAA;AAC1D,OAAO,EAAE,+BAA+B,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAA;AAE3F,OAAO,EAAE,iDAAiD,EAAE,MAAM,kEAAkE,CAAA;AACpI,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAEjE,MAAM,UAAU,sBAAsB,CACpC,WAAwB,EACxB,QAAmB,EACnB,OAAwB,EACxB,KAA4C;IAE5C,WAAW,CAAC,YAAY,CAAoB,QAAQ,EAAE,IAAI,CAAC,EAAE;QAC3D,IAAI,KAAK,KAAK,iBAAiB,EAAE,CAAC;YAChC,uEAAuE;YACvE,gEAAgE;YAChE,IAAI,oBAAoB,GAAG,IAAI,CAAA;YAC/B,IAAI,IAAI,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBACzC,oBAAoB,GAAG,uBAAuB,CAAC;oBAC7C,IAAI,EAAE,IAAI;oBACV,MAAM,EAAE,OAAO;oBACf,OAAO,EAAE,CAAC,eAAe,EAAE,OAAO,EAAE,EAAE;wBACpC,OAAO,CACL,oBAAoB,CAAC,eAAe,CAAC,EAAE,CAAC;4BACxC,eAAe,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI;4BACrC,eAAe,CAAC,IAAI,CACrB,CAAA;oBACH,CAAC;iBACF,CAAC,CAAA;YACJ,CAAC;YAED,OAAO,+BAA+B,CAAC;gBACrC,IAAI,EAAE,oBAAoB;gBAC1B,MAAM,EAAE,OAAO;gBACf,aAAa,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"messages_cache.js","sourceRoot":"","sources":["../../../src/utils/cache/messages_cache.ts"],"names":[],"mappings":"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","sourcesContent":["import { InfiniteData, QueryClient } from '@tanstack/react-query'\nimport { ApiCollection, MessageResource } from '../../types'\nimport { deleteRecordInPagesData } from './page_mutations'\nimport { updateOrCreateRecordInPagesData, updateRecordInPagesData } from './page_mutations'\nimport { JoltReactionEvent } from '../../types/jolt_events'\nimport { transformReactionEventDataToReactionCountResource } from '../jolt/transform_reaction_event_data_to_reaction_count_resource'\nimport { getMessagesRequestArgs } from '../request/get_messages'\nimport { getRequestQueryKey } from '../../hooks/use_suspense_api'\n\nexport function updateCacheWithMessage(\n queryClient: QueryClient,\n queryKey: unknown[],\n message: MessageResource,\n event: 'message.created' | 'message.updated'\n) {\n queryClient.setQueryData<MessagesQueryData>(queryKey, prev => {\n if (event === 'message.created') {\n // Before adding the new message, remove any pending temporary messages\n // with matching text to prevent duplicates from race conditions\n let dataAfterTempRemoval = prev\n if (prev && message.text && message.mine) {\n dataAfterTempRemoval = deleteRecordInPagesData({\n data: prev,\n record: message,\n matchFn: (existingMessage, _record) => {\n return (\n isTemporaryMessageId(existingMessage.id) &&\n existingMessage.text === message.text &&\n existingMessage.mine\n )\n },\n })\n }\n\n return updateOrCreateRecordInPagesData({\n data: dataAfterTempRemoval,\n record: message,\n processRecord: (record, current) => mergeMessageUpdate(record, current),\n })\n } else {\n return updateRecordInPagesData({\n data: prev,\n record: message,\n processRecord: (record, current) => mergeMessageUpdate(record, current),\n })\n }\n })\n}\n\nexport function updateCacheWithReaction(\n queryClient: QueryClient,\n queryKey: unknown[],\n event: JoltReactionEvent,\n currentPersonId: number\n) {\n const message = { id: event.data.data.message_sort_key } as MessageResource\n queryClient.setQueryData<MessagesQueryData>(queryKey, prev =>\n updateRecordInPagesData({\n data: prev,\n record: message,\n processRecord: (record, oldMessage) => {\n const reactionCounts = oldMessage.reactionCounts || []\n let foundMatch = false\n let newReactionCounts = reactionCounts.map(reactionCount => {\n if (reactionCount.value === event.data.data.value) {\n foundMatch = true\n return transformReactionEventDataToReactionCountResource({\n data: event.data.data,\n oldData: reactionCount,\n event: event.event,\n currentPersonId,\n })\n }\n return reactionCount\n })\n\n if (!foundMatch) {\n const newReactionCount = transformReactionEventDataToReactionCountResource({\n data: event.data.data,\n event: event.event,\n currentPersonId,\n })\n\n if (newReactionCount?.count) {\n newReactionCounts = [...newReactionCounts, newReactionCount]\n }\n }\n\n return { ...oldMessage, reactionCounts: newReactionCounts }\n },\n })\n )\n}\n\ntype MessagesQueryData = InfiniteData<ApiCollection<MessageResource>>\nexport function isTemporaryMessageId(messageId?: string | null): boolean {\n return !!messageId && messageId.endsWith('-temp')\n}\nexport function isNewMessage(message?: MessageResource): boolean {\n return !message?.id || isTemporaryMessageId(message.id)\n}\n\nexport function getThreadedMessagesQueryKey(conversationId: number, replyRootId: string) {\n const requestArgs = getMessagesRequestArgs({\n conversation_id: conversationId,\n reply_root_id: replyRootId,\n })\n return getRequestQueryKey(requestArgs)\n}\n\nexport function mergeMessageUpdate(\n record: MessageResource,\n current?: MessageResource\n): MessageResource {\n if (!current) {\n return record\n }\n\n return {\n ...current,\n ...record,\n // Preserve reactions from cache - they're managed via separate reaction events\n reactionCounts: current.reactionCounts || [],\n }\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@planningcenter/chat-react-native",
|
|
3
|
-
"version": "3.20.
|
|
3
|
+
"version": "3.20.1-rc.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"types": "build/index.d.ts",
|
|
@@ -58,5 +58,5 @@
|
|
|
58
58
|
"react-native-url-polyfill": "^2.0.0",
|
|
59
59
|
"typescript": "<5.6.0"
|
|
60
60
|
},
|
|
61
|
-
"gitHead": "
|
|
61
|
+
"gitHead": "e0a908049cd839fc176a02a3addbf94ec4b9a42d"
|
|
62
62
|
}
|
|
@@ -0,0 +1,313 @@
|
|
|
1
|
+
import { renderHook, act } from '@testing-library/react-hooks'
|
|
2
|
+
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
|
|
3
|
+
import React, { Suspense } from 'react'
|
|
4
|
+
import AsyncStorage from '@react-native-async-storage/async-storage'
|
|
5
|
+
import { useAsyncStorage } from '../../hooks/use_async_storage'
|
|
6
|
+
|
|
7
|
+
jest.mock('@react-native-async-storage/async-storage')
|
|
8
|
+
jest.useFakeTimers()
|
|
9
|
+
|
|
10
|
+
afterAll(() => {
|
|
11
|
+
jest.useRealTimers()
|
|
12
|
+
})
|
|
13
|
+
|
|
14
|
+
const mockAsyncStorage = AsyncStorage as jest.Mocked<typeof AsyncStorage>
|
|
15
|
+
|
|
16
|
+
const createWrapper = () => {
|
|
17
|
+
const queryClient = new QueryClient({
|
|
18
|
+
defaultOptions: {
|
|
19
|
+
queries: {
|
|
20
|
+
retry: false,
|
|
21
|
+
},
|
|
22
|
+
},
|
|
23
|
+
})
|
|
24
|
+
|
|
25
|
+
return ({ children }: { children: React.ReactNode }) => (
|
|
26
|
+
<QueryClientProvider client={queryClient}>
|
|
27
|
+
<Suspense fallback={null}>{children}</Suspense>
|
|
28
|
+
</QueryClientProvider>
|
|
29
|
+
)
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
// Helper to wait for Suspense and async operations to resolve
|
|
33
|
+
const waitForQuery = async () => {
|
|
34
|
+
await act(async () => {
|
|
35
|
+
await Promise.resolve()
|
|
36
|
+
await Promise.resolve()
|
|
37
|
+
await Promise.resolve()
|
|
38
|
+
})
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
describe('useAsyncStorage', () => {
|
|
42
|
+
beforeEach(() => {
|
|
43
|
+
jest.clearAllMocks()
|
|
44
|
+
mockAsyncStorage.getItem.mockResolvedValue(null)
|
|
45
|
+
mockAsyncStorage.setItem.mockResolvedValue(undefined)
|
|
46
|
+
mockAsyncStorage.removeItem.mockResolvedValue(undefined)
|
|
47
|
+
})
|
|
48
|
+
|
|
49
|
+
afterEach(() => {
|
|
50
|
+
jest.restoreAllMocks()
|
|
51
|
+
})
|
|
52
|
+
|
|
53
|
+
describe('initialization', () => {
|
|
54
|
+
it('returns initial value when storage is empty', async () => {
|
|
55
|
+
mockAsyncStorage.getItem.mockResolvedValue(null)
|
|
56
|
+
|
|
57
|
+
const { result } = renderHook(() => useAsyncStorage('test-key', 'initial-value'), {
|
|
58
|
+
wrapper: createWrapper(),
|
|
59
|
+
})
|
|
60
|
+
|
|
61
|
+
await waitForQuery()
|
|
62
|
+
|
|
63
|
+
expect(result.current).toBeDefined()
|
|
64
|
+
expect(result.current[0]).toBe('initial-value')
|
|
65
|
+
})
|
|
66
|
+
|
|
67
|
+
it('returns parsed JSON value from storage', async () => {
|
|
68
|
+
const storedValue = { foo: 'bar', count: 42 }
|
|
69
|
+
mockAsyncStorage.getItem.mockResolvedValue(JSON.stringify(storedValue))
|
|
70
|
+
|
|
71
|
+
const { result } = renderHook(() => useAsyncStorage('test-key', { default: 'value' }), {
|
|
72
|
+
wrapper: createWrapper(),
|
|
73
|
+
})
|
|
74
|
+
|
|
75
|
+
await waitForQuery()
|
|
76
|
+
|
|
77
|
+
expect(result.current).toBeDefined()
|
|
78
|
+
expect(result.current[0]).toEqual(storedValue)
|
|
79
|
+
})
|
|
80
|
+
|
|
81
|
+
it('returns raw string value when JSON parsing fails', async () => {
|
|
82
|
+
mockAsyncStorage.getItem.mockResolvedValue('not-valid-json{')
|
|
83
|
+
|
|
84
|
+
const { result } = renderHook(() => useAsyncStorage('test-key', 'initial-value'), {
|
|
85
|
+
wrapper: createWrapper(),
|
|
86
|
+
})
|
|
87
|
+
|
|
88
|
+
await waitForQuery()
|
|
89
|
+
|
|
90
|
+
expect(result.current).toBeDefined()
|
|
91
|
+
expect(result.current[0]).toBe('not-valid-json{')
|
|
92
|
+
})
|
|
93
|
+
|
|
94
|
+
it('returns initial value when getItem throws an error', async () => {
|
|
95
|
+
const error = new Error('Storage error')
|
|
96
|
+
mockAsyncStorage.getItem.mockRejectedValue(error)
|
|
97
|
+
|
|
98
|
+
const { result } = renderHook(() => useAsyncStorage('test-key', 'initial-value'), {
|
|
99
|
+
wrapper: createWrapper(),
|
|
100
|
+
})
|
|
101
|
+
|
|
102
|
+
await waitForQuery()
|
|
103
|
+
|
|
104
|
+
expect(result.current).toBeDefined()
|
|
105
|
+
expect(result.current[0]).toBe('initial-value')
|
|
106
|
+
})
|
|
107
|
+
|
|
108
|
+
it('returns initial value when getItem throws quota exceeded error', async () => {
|
|
109
|
+
const quotaError = new Error('database or disk is full (code 13): SQLITE_FULL')
|
|
110
|
+
mockAsyncStorage.getItem.mockRejectedValue(quotaError)
|
|
111
|
+
|
|
112
|
+
const { result } = renderHook(() => useAsyncStorage('test-key', 'initial-value'), {
|
|
113
|
+
wrapper: createWrapper(),
|
|
114
|
+
})
|
|
115
|
+
|
|
116
|
+
await act(async () => {
|
|
117
|
+
await waitForQuery()
|
|
118
|
+
})
|
|
119
|
+
|
|
120
|
+
expect(result.current).toBeDefined()
|
|
121
|
+
expect(result.current[0]).toBe('initial-value')
|
|
122
|
+
})
|
|
123
|
+
})
|
|
124
|
+
|
|
125
|
+
describe('setValue', () => {
|
|
126
|
+
it('saves value to storage and refetches', async () => {
|
|
127
|
+
const { result } = renderHook(() => useAsyncStorage('test-key', 'initial'), {
|
|
128
|
+
wrapper: createWrapper(),
|
|
129
|
+
})
|
|
130
|
+
|
|
131
|
+
await waitForQuery()
|
|
132
|
+
|
|
133
|
+
expect(result.current).toBeDefined()
|
|
134
|
+
expect(result.current[0]).toBe('initial')
|
|
135
|
+
|
|
136
|
+
const newValue = 'new-string-value'
|
|
137
|
+
await act(async () => {
|
|
138
|
+
await result.current[1](newValue)
|
|
139
|
+
})
|
|
140
|
+
|
|
141
|
+
expect(mockAsyncStorage.setItem).toHaveBeenCalledWith('test-key', JSON.stringify(newValue))
|
|
142
|
+
})
|
|
143
|
+
|
|
144
|
+
it('saves object value to storage', async () => {
|
|
145
|
+
const { result } = renderHook(() => useAsyncStorage('test-key', { initial: 'value' }), {
|
|
146
|
+
wrapper: createWrapper(),
|
|
147
|
+
})
|
|
148
|
+
|
|
149
|
+
await waitForQuery()
|
|
150
|
+
|
|
151
|
+
expect(result.current).toBeDefined()
|
|
152
|
+
|
|
153
|
+
const newValue = { initial: 'new-value', data: 'test' }
|
|
154
|
+
await act(async () => {
|
|
155
|
+
await result.current[1](newValue)
|
|
156
|
+
})
|
|
157
|
+
|
|
158
|
+
expect(mockAsyncStorage.setItem).toHaveBeenCalledWith('test-key', JSON.stringify(newValue))
|
|
159
|
+
})
|
|
160
|
+
|
|
161
|
+
it('removes item when value is null', async () => {
|
|
162
|
+
mockAsyncStorage.getItem.mockResolvedValue(JSON.stringify({ data: 'existing' }))
|
|
163
|
+
|
|
164
|
+
const { result } = renderHook(() => useAsyncStorage('test-key', 'initial'), {
|
|
165
|
+
wrapper: createWrapper(),
|
|
166
|
+
})
|
|
167
|
+
|
|
168
|
+
await waitForQuery()
|
|
169
|
+
|
|
170
|
+
expect(result.current).toBeDefined()
|
|
171
|
+
expect(result.current[0]).toEqual({ data: 'existing' })
|
|
172
|
+
|
|
173
|
+
await act(async () => {
|
|
174
|
+
await result.current[1](null)
|
|
175
|
+
})
|
|
176
|
+
|
|
177
|
+
expect(mockAsyncStorage.removeItem).toHaveBeenCalledWith('test-key')
|
|
178
|
+
expect(mockAsyncStorage.setItem).not.toHaveBeenCalled()
|
|
179
|
+
})
|
|
180
|
+
|
|
181
|
+
it('removes item when value is undefined', async () => {
|
|
182
|
+
const { result } = renderHook(() => useAsyncStorage('test-key', 'initial'), {
|
|
183
|
+
wrapper: createWrapper(),
|
|
184
|
+
})
|
|
185
|
+
|
|
186
|
+
await waitForQuery()
|
|
187
|
+
|
|
188
|
+
expect(result.current).toBeDefined()
|
|
189
|
+
expect(result.current[0]).toBe('initial')
|
|
190
|
+
|
|
191
|
+
await act(async () => {
|
|
192
|
+
await result.current[1](undefined)
|
|
193
|
+
})
|
|
194
|
+
|
|
195
|
+
expect(mockAsyncStorage.removeItem).toHaveBeenCalledWith('test-key')
|
|
196
|
+
expect(mockAsyncStorage.setItem).not.toHaveBeenCalled()
|
|
197
|
+
})
|
|
198
|
+
|
|
199
|
+
it('does not throw error when setItem throws quota exceeded error by default', async () => {
|
|
200
|
+
const quotaError = new Error('database or disk is full (code 13): SQLITE_FULL')
|
|
201
|
+
mockAsyncStorage.setItem.mockRejectedValue(quotaError)
|
|
202
|
+
|
|
203
|
+
const { result } = renderHook(() => useAsyncStorage('test-key', 'initial'), {
|
|
204
|
+
wrapper: createWrapper(),
|
|
205
|
+
})
|
|
206
|
+
|
|
207
|
+
await waitForQuery()
|
|
208
|
+
|
|
209
|
+
expect(result.current).toBeDefined()
|
|
210
|
+
expect(result.current[0]).toBe('initial')
|
|
211
|
+
|
|
212
|
+
// Should not throw - errors are caught by default
|
|
213
|
+
let promiseResult: void | undefined
|
|
214
|
+
await act(async () => {
|
|
215
|
+
promiseResult = await result.current[1]('new-value')
|
|
216
|
+
})
|
|
217
|
+
expect(promiseResult).toBeUndefined()
|
|
218
|
+
})
|
|
219
|
+
|
|
220
|
+
it('propagates error when setItem throws quota exceeded error with throwOnError=true', async () => {
|
|
221
|
+
const quotaError = new Error('database or disk is full (code 13): SQLITE_FULL')
|
|
222
|
+
mockAsyncStorage.setItem.mockRejectedValue(quotaError)
|
|
223
|
+
|
|
224
|
+
const { result } = renderHook(() => useAsyncStorage('test-key', 'initial', true), {
|
|
225
|
+
wrapper: createWrapper(),
|
|
226
|
+
})
|
|
227
|
+
|
|
228
|
+
await waitForQuery()
|
|
229
|
+
|
|
230
|
+
expect(result.current).toBeDefined()
|
|
231
|
+
expect(result.current[0]).toBe('initial')
|
|
232
|
+
|
|
233
|
+
await act(async () => {
|
|
234
|
+
await expect(result.current[1]('new-value')).rejects.toThrow('database or disk is full')
|
|
235
|
+
})
|
|
236
|
+
})
|
|
237
|
+
|
|
238
|
+
it('does not throw error when setItem throws other errors by default', async () => {
|
|
239
|
+
const error = new Error('Storage write failed')
|
|
240
|
+
mockAsyncStorage.setItem.mockRejectedValue(error)
|
|
241
|
+
|
|
242
|
+
const { result } = renderHook(() => useAsyncStorage('test-key', 'initial'), {
|
|
243
|
+
wrapper: createWrapper(),
|
|
244
|
+
})
|
|
245
|
+
|
|
246
|
+
await waitForQuery()
|
|
247
|
+
|
|
248
|
+
expect(result.current).toBeDefined()
|
|
249
|
+
expect(result.current[0]).toBe('initial')
|
|
250
|
+
|
|
251
|
+
// Should not throw - errors are caught by default
|
|
252
|
+
let promiseResult: void | undefined
|
|
253
|
+
await act(async () => {
|
|
254
|
+
promiseResult = await result.current[1]('new-value')
|
|
255
|
+
})
|
|
256
|
+
expect(promiseResult).toBeUndefined()
|
|
257
|
+
})
|
|
258
|
+
|
|
259
|
+
it('does not throw error when removeItem throws an error by default', async () => {
|
|
260
|
+
const error = new Error('Remove failed')
|
|
261
|
+
mockAsyncStorage.removeItem.mockRejectedValue(error)
|
|
262
|
+
|
|
263
|
+
const { result } = renderHook(() => useAsyncStorage('test-key', 'initial'), {
|
|
264
|
+
wrapper: createWrapper(),
|
|
265
|
+
})
|
|
266
|
+
|
|
267
|
+
await waitForQuery()
|
|
268
|
+
|
|
269
|
+
expect(result.current).toBeDefined()
|
|
270
|
+
expect(result.current[0]).toBe('initial')
|
|
271
|
+
|
|
272
|
+
// Should not throw - errors are caught by default (via noop)
|
|
273
|
+
let promiseResult: void | undefined
|
|
274
|
+
await act(async () => {
|
|
275
|
+
promiseResult = await result.current[1](null)
|
|
276
|
+
})
|
|
277
|
+
expect(promiseResult).toBeUndefined()
|
|
278
|
+
})
|
|
279
|
+
})
|
|
280
|
+
|
|
281
|
+
describe('edge cases', () => {
|
|
282
|
+
it('handles complex nested objects', async () => {
|
|
283
|
+
const complexValue = {
|
|
284
|
+
nested: {
|
|
285
|
+
array: [1, 2, { deep: 'value' }],
|
|
286
|
+
date: '2024-01-01',
|
|
287
|
+
},
|
|
288
|
+
}
|
|
289
|
+
mockAsyncStorage.getItem.mockResolvedValue(JSON.stringify(complexValue))
|
|
290
|
+
|
|
291
|
+
const { result } = renderHook(() => useAsyncStorage('test-key', {}), {
|
|
292
|
+
wrapper: createWrapper(),
|
|
293
|
+
})
|
|
294
|
+
|
|
295
|
+
await waitForQuery()
|
|
296
|
+
|
|
297
|
+
expect(result.current).toBeDefined()
|
|
298
|
+
expect(result.current[0]).toEqual(complexValue)
|
|
299
|
+
})
|
|
300
|
+
|
|
301
|
+
it('uses correct cache key format', async () => {
|
|
302
|
+
const { result } = renderHook(() => useAsyncStorage('my-unique-key', 'value'), {
|
|
303
|
+
wrapper: createWrapper(),
|
|
304
|
+
})
|
|
305
|
+
|
|
306
|
+
await waitForQuery()
|
|
307
|
+
|
|
308
|
+
expect(result.current).toBeDefined()
|
|
309
|
+
expect(result.current[0]).toBe('value')
|
|
310
|
+
expect(mockAsyncStorage.getItem).toHaveBeenCalledWith('my-unique-key')
|
|
311
|
+
})
|
|
312
|
+
})
|
|
313
|
+
})
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import AsyncStorage from '@react-native-async-storage/async-storage'
|
|
2
2
|
import { useSuspenseQuery } from '@tanstack/react-query'
|
|
3
|
+
import { noop } from 'lodash'
|
|
3
4
|
import { useCallback } from 'react'
|
|
4
5
|
|
|
5
6
|
const cacheKeyGenerator = (key: string) => [`AsyncStorageResource:${key}`]
|
|
@@ -8,36 +9,52 @@ type SetValue<TCacheData> = (_itemValue?: TCacheData | null) => Promise<void>
|
|
|
8
9
|
|
|
9
10
|
export function useAsyncStorage<TCacheData>(
|
|
10
11
|
key: string,
|
|
11
|
-
initialValue: TCacheData
|
|
12
|
+
initialValue: TCacheData,
|
|
13
|
+
throwOnError: boolean = false
|
|
12
14
|
): [TCacheData, SetValue<TCacheData>] {
|
|
13
15
|
const cacheKey = cacheKeyGenerator(key)
|
|
16
|
+
|
|
14
17
|
const { data: value, refetch } = useSuspenseQuery<TCacheData>({
|
|
15
18
|
queryKey: cacheKey,
|
|
16
19
|
queryFn: () =>
|
|
17
|
-
AsyncStorage.getItem(key)
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
20
|
+
AsyncStorage.getItem(key)
|
|
21
|
+
.then(storedValue => {
|
|
22
|
+
if (!storedValue) return initialValue
|
|
23
|
+
|
|
24
|
+
try {
|
|
25
|
+
return JSON.parse(storedValue)
|
|
26
|
+
} catch {
|
|
27
|
+
return storedValue
|
|
28
|
+
}
|
|
29
|
+
})
|
|
30
|
+
.catch(e => {
|
|
31
|
+
if (!throwOnError) return initialValue
|
|
32
|
+
|
|
33
|
+
return Promise.reject(e)
|
|
34
|
+
}),
|
|
26
35
|
})
|
|
27
36
|
|
|
28
37
|
const setValue: SetValue<TCacheData> = useCallback(
|
|
29
38
|
itemValue => {
|
|
30
39
|
if (itemValue === null || itemValue === undefined) {
|
|
31
|
-
return AsyncStorage.removeItem(key)
|
|
40
|
+
return AsyncStorage.removeItem(key)
|
|
41
|
+
.then(() => {
|
|
42
|
+
refetch()
|
|
43
|
+
})
|
|
44
|
+
.catch(noop)
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
return AsyncStorage.setItem(key, JSON.stringify(itemValue))
|
|
48
|
+
.then(() => {
|
|
32
49
|
refetch()
|
|
33
50
|
})
|
|
34
|
-
|
|
51
|
+
.catch(e => {
|
|
52
|
+
if (!throwOnError) return
|
|
35
53
|
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
})
|
|
54
|
+
return Promise.reject(e)
|
|
55
|
+
})
|
|
39
56
|
},
|
|
40
|
-
[key, refetch]
|
|
57
|
+
[throwOnError, key, refetch]
|
|
41
58
|
)
|
|
42
59
|
|
|
43
60
|
return [value || initialValue, setValue]
|
|
@@ -14,7 +14,7 @@ import { useCurrentPerson } from './use_current_person'
|
|
|
14
14
|
import { optimisticallyUpdateMessage } from '../utils/cache/optimistically_update_message'
|
|
15
15
|
import { optimisticallyCreateMessage } from '../utils/cache/optimistically_create_message'
|
|
16
16
|
import { startMessageCreationTracking } from '../utils/performance_tracking'
|
|
17
|
-
import { isNewMessage } from '../utils/cache/messages_cache'
|
|
17
|
+
import { isNewMessage, mergeMessageUpdate } from '../utils/cache/messages_cache'
|
|
18
18
|
|
|
19
19
|
interface Props {
|
|
20
20
|
conversationId: number
|
|
@@ -148,6 +148,7 @@ export function useMessageCreateOrUpdate({ conversationId, message, replyRootId
|
|
|
148
148
|
updateOrCreateRecordInPagesData({
|
|
149
149
|
data,
|
|
150
150
|
record: updatedMessage,
|
|
151
|
+
processRecord: (record, current) => mergeMessageUpdate(record, current),
|
|
151
152
|
})
|
|
152
153
|
)
|
|
153
154
|
},
|
|
@@ -35,17 +35,13 @@ export function updateCacheWithMessage(
|
|
|
35
35
|
return updateOrCreateRecordInPagesData({
|
|
36
36
|
data: dataAfterTempRemoval,
|
|
37
37
|
record: message,
|
|
38
|
-
processRecord: (record, current) =>
|
|
39
|
-
return { ...current, ...record }
|
|
40
|
-
},
|
|
38
|
+
processRecord: (record, current) => mergeMessageUpdate(record, current),
|
|
41
39
|
})
|
|
42
40
|
} else {
|
|
43
41
|
return updateRecordInPagesData({
|
|
44
42
|
data: prev,
|
|
45
43
|
record: message,
|
|
46
|
-
processRecord: (record, current) =>
|
|
47
|
-
return { ...current, ...record }
|
|
48
|
-
},
|
|
44
|
+
processRecord: (record, current) => mergeMessageUpdate(record, current),
|
|
49
45
|
})
|
|
50
46
|
}
|
|
51
47
|
})
|
|
@@ -111,3 +107,19 @@ export function getThreadedMessagesQueryKey(conversationId: number, replyRootId:
|
|
|
111
107
|
})
|
|
112
108
|
return getRequestQueryKey(requestArgs)
|
|
113
109
|
}
|
|
110
|
+
|
|
111
|
+
export function mergeMessageUpdate(
|
|
112
|
+
record: MessageResource,
|
|
113
|
+
current?: MessageResource
|
|
114
|
+
): MessageResource {
|
|
115
|
+
if (!current) {
|
|
116
|
+
return record
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
return {
|
|
120
|
+
...current,
|
|
121
|
+
...record,
|
|
122
|
+
// Preserve reactions from cache - they're managed via separate reaction events
|
|
123
|
+
reactionCounts: current.reactionCounts || [],
|
|
124
|
+
}
|
|
125
|
+
}
|