Page MenuHomePhabricator
Differential D14400

[lib] Add numMessagesToFetch param to useFetchMessages
ClosedPublic
Actions

Authored by ashoat on Feb 25 2025, 12:20 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 16, 3:46 AM
Unknown Object (File)
Sun, Apr 6, 7:30 AM
Unknown Object (File)
Sun, Apr 6, 1:00 AM
Unknown Object (File)
Sat, Apr 5, 9:05 PM
Unknown Object (File)
Sat, Apr 5, 12:37 PM
Unknown Object (File)
Wed, Apr 2, 3:20 AM
Unknown Object (File)
Mar 21 2025, 5:57 AM
Unknown Object (File)
Mar 14 2025, 1:20 PM
View All 31 Files
Subscribers
None

Details

Reviewers
tomek
angelika
Commits
rCOMM31ae31d09cad: [lib] Add numMessagesToFetch param to useFetchMessages
Summary

I observed an issue where the message fetch here ends up triggered MessageStorePruner. Normally, a message fetch can only happen when the viewer is looking at a thread, which results in lastNavigatedTo being bumped, which prevents MessageStorePruner from immediately triggering. But in the linked code the message fetch doesn't happen when the viewer is looking at a thread.

We could introduce a new action here to also bump lastNavigatedTo, but I don't think it's needed... if we can't get an acceptable MessagePreview within the first defaultNumberPerThread (unlikely), it's probably fine to just default to mostRecentMessageInfo, even though it's failing the showInMessagePreview check.

This diff simply introduces a numMessagesToFetch param to useFetchMessages, which will allow us to fetch just underneath the number we need to avoid MessageStorePruner being triggered. The next diff will adjust the code linked above.

Depends on D14399

Test Plan

I used this patch that adds a bunch of logs and ran a Release build of the iOS app pointed at production on my physical iOS device.

In combination with the next diff, I confirmed that the logs of message prune actions were gone.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
lib/
actions/
10 lines
shared/
88 lines

Diff 47276

View Options

lib/actions/message-actions.js

Show All 25 Lines
import type { ClientDBMessageInfo } from 'lib/types/message-types.js'; import type { ClientDBMessageInfo } from 'lib/types/message-types.js';
import { cookieTypes } from 'lib/types/session-types.js'; import { cookieTypes } from 'lib/types/session-types.js';
import { defaultConnectionInfo } from 'lib/types/socket-types.js'; import { defaultConnectionInfo } from 'lib/types/socket-types.js';
import { defaultGlobalThemeInfo } from 'lib/types/theme-types.js'; import { defaultGlobalThemeInfo } from 'lib/types/theme-types.js';
import type { ClientDBThreadInfo } from 'lib/types/thread-types.js'; import type { ClientDBThreadInfo } from 'lib/types/thread-types.js';
import { getConfig } from 'lib/utils/config.js'; import { getConfig } from 'lib/utils/config.js';
import { parseCookies } from 'lib/utils/cookie-utils.js'; import { parseCookies } from 'lib/utils/cookie-utils.js';
import { isDev } from 'lib/utils/dev-utils.js'; import { isDev } from 'lib/utils/dev-utils.js';
import { wipeKeyserverStore } from 'lib/utils/keyserver-store-utils.js';
import { import {
generateIDSchemaMigrationOpsForDrafts, generateIDSchemaMigrationOpsForDrafts,
convertDraftStoreToNewIDSchema, convertDraftStoreToNewIDSchema,
} from 'lib/utils/migration-utils.js'; } from 'lib/utils/migration-utils.js';
import { entries } from 'lib/utils/objects.js'; import { entries } from 'lib/utils/objects.js';
import { resetUserSpecificState } from 'lib/utils/reducers-utils.js';
import { import {
convertClientDBThreadInfoToRawThreadInfo, convertClientDBThreadInfoToRawThreadInfo,
convertRawThreadInfoToClientDBThreadInfo, convertRawThreadInfoToClientDBThreadInfo,
} from 'lib/utils/thread-ops-utils.js'; } from 'lib/utils/thread-ops-utils.js';
import commReduxStorageEngine from './comm-redux-storage-engine.js'; import commReduxStorageEngine from './comm-redux-storage-engine.js';
import { defaultWebState } from './default-state.js'; import {
handleReduxMigrationFailure,
persistWhitelist,
} from './handle-redux-migration-failure.js';
import { rootKey, rootKeyPrefix } from './persist-constants.js'; import { rootKey, rootKeyPrefix } from './persist-constants.js';
import type { AppState } from './redux-setup.js'; import type { AppState } from './redux-setup.js';
import { nonUserSpecificFieldsWeb } from './redux-setup.js';
import { authoritativeKeyserverID } from '../authoritative-keyserver.js'; import { authoritativeKeyserverID } from '../authoritative-keyserver.js';
import { getCommSharedWorker } from '../shared-worker/shared-worker-provider.js'; import { getCommSharedWorker } from '../shared-worker/shared-worker-provider.js';
import { getOlmWasmPath } from '../shared-worker/utils/constants.js'; import { getOlmWasmPath } from '../shared-worker/utils/constants.js';
import { isSQLiteSupported } from '../shared-worker/utils/db-utils.js'; import { isSQLiteSupported } from '../shared-worker/utils/db-utils.js';
import { workerRequestMessageTypes } from '../types/worker-types.js'; import { workerRequestMessageTypes } from '../types/worker-types.js';
declare var keyserverURL: string; declare var keyserverURL: string;
const persistWhitelist = [
'enabledApps',
'alertStore',
'commServicesAccessToken',
'keyserverStore',
'globalThemeInfo',
'customServer',
'messageStore',
];
function handleReduxMigrationFailure(oldState: AppState): AppState {
const persistedNonUserSpecificFields = nonUserSpecificFieldsWeb.filter(
field => persistWhitelist.includes(field) || field === '_persist',
);
const stateAfterReset = resetUserSpecificState(
oldState,
defaultWebState,
persistedNonUserSpecificFields,
);
return {
...stateAfterReset,
keyserverStore: wipeKeyserverStore(stateAfterReset.keyserverStore),
};
}
const migrations = { const migrations = {
[1]: async (state: any) => { [1]: async (state: any) => {
const { const {
primaryIdentityPublicKey, primaryIdentityPublicKey,
...stateWithoutPrimaryIdentityPublicKey ...stateWithoutPrimaryIdentityPublicKey
} = state; } = state;
return { return {
...stateWithoutPrimaryIdentityPublicKey, ...stateWithoutPrimaryIdentityPublicKey,
▲ Show 20 Lines • Show All 453 Lines • Show Last 20 Lines
View Options

lib/shared/message-utils.js

Show All 25 Lines
import type { ClientDBMessageInfo } from 'lib/types/message-types.js'; import type { ClientDBMessageInfo } from 'lib/types/message-types.js';
import { cookieTypes } from 'lib/types/session-types.js'; import { cookieTypes } from 'lib/types/session-types.js';
import { defaultConnectionInfo } from 'lib/types/socket-types.js'; import { defaultConnectionInfo } from 'lib/types/socket-types.js';
import { defaultGlobalThemeInfo } from 'lib/types/theme-types.js'; import { defaultGlobalThemeInfo } from 'lib/types/theme-types.js';
import type { ClientDBThreadInfo } from 'lib/types/thread-types.js'; import type { ClientDBThreadInfo } from 'lib/types/thread-types.js';
import { getConfig } from 'lib/utils/config.js'; import { getConfig } from 'lib/utils/config.js';
import { parseCookies } from 'lib/utils/cookie-utils.js'; import { parseCookies } from 'lib/utils/cookie-utils.js';
import { isDev } from 'lib/utils/dev-utils.js'; import { isDev } from 'lib/utils/dev-utils.js';
import { wipeKeyserverStore } from 'lib/utils/keyserver-store-utils.js';
import { import {
generateIDSchemaMigrationOpsForDrafts, generateIDSchemaMigrationOpsForDrafts,
convertDraftStoreToNewIDSchema, convertDraftStoreToNewIDSchema,
} from 'lib/utils/migration-utils.js'; } from 'lib/utils/migration-utils.js';
import { entries } from 'lib/utils/objects.js'; import { entries } from 'lib/utils/objects.js';
import { resetUserSpecificState } from 'lib/utils/reducers-utils.js';
import { import {
convertClientDBThreadInfoToRawThreadInfo, convertClientDBThreadInfoToRawThreadInfo,
convertRawThreadInfoToClientDBThreadInfo, convertRawThreadInfoToClientDBThreadInfo,
} from 'lib/utils/thread-ops-utils.js'; } from 'lib/utils/thread-ops-utils.js';
import commReduxStorageEngine from './comm-redux-storage-engine.js'; import commReduxStorageEngine from './comm-redux-storage-engine.js';
import { defaultWebState } from './default-state.js'; import {
handleReduxMigrationFailure,
persistWhitelist,
} from './handle-redux-migration-failure.js';
import { rootKey, rootKeyPrefix } from './persist-constants.js'; import { rootKey, rootKeyPrefix } from './persist-constants.js';
import type { AppState } from './redux-setup.js'; import type { AppState } from './redux-setup.js';
import { nonUserSpecificFieldsWeb } from './redux-setup.js';
import { authoritativeKeyserverID } from '../authoritative-keyserver.js'; import { authoritativeKeyserverID } from '../authoritative-keyserver.js';
import { getCommSharedWorker } from '../shared-worker/shared-worker-provider.js'; import { getCommSharedWorker } from '../shared-worker/shared-worker-provider.js';
import { getOlmWasmPath } from '../shared-worker/utils/constants.js'; import { getOlmWasmPath } from '../shared-worker/utils/constants.js';
import { isSQLiteSupported } from '../shared-worker/utils/db-utils.js'; import { isSQLiteSupported } from '../shared-worker/utils/db-utils.js';
import { workerRequestMessageTypes } from '../types/worker-types.js'; import { workerRequestMessageTypes } from '../types/worker-types.js';
declare var keyserverURL: string; declare var keyserverURL: string;
const persistWhitelist = [
'enabledApps',
'alertStore',
'commServicesAccessToken',
'keyserverStore',
'globalThemeInfo',
'customServer',
'messageStore',
];
function handleReduxMigrationFailure(oldState: AppState): AppState {
const persistedNonUserSpecificFields = nonUserSpecificFieldsWeb.filter(
field => persistWhitelist.includes(field) || field === '_persist',
);
const stateAfterReset = resetUserSpecificState(
oldState,
defaultWebState,
persistedNonUserSpecificFields,
);
return {
...stateAfterReset,
keyserverStore: wipeKeyserverStore(stateAfterReset.keyserverStore),
};
}
const migrations = { const migrations = {
[1]: async (state: any) => { [1]: async (state: any) => {
const { const {
primaryIdentityPublicKey, primaryIdentityPublicKey,
...stateWithoutPrimaryIdentityPublicKey ...stateWithoutPrimaryIdentityPublicKey
} = state; } = state;
return { return {
...stateWithoutPrimaryIdentityPublicKey, ...stateWithoutPrimaryIdentityPublicKey,
▲ Show 20 Lines • Show All 453 Lines • Show Last 20 Lines