Page MenuHomePhabricator
Differential D10917

[web] update `getClientStore` name
ClosedPublic
Actions

Authored by kamil on Feb 1 2024, 12:43 PM.
Tags
None
Referenced Files
Unknown Object (File)
Feb 21 2025, 9:16 AM
Unknown Object (File)
Feb 21 2025, 9:16 AM
Unknown Object (File)
Feb 21 2025, 9:16 AM
Unknown Object (File)
Feb 21 2025, 9:16 AM
Unknown Object (File)
Feb 21 2025, 9:15 AM
Unknown Object (File)
Feb 20 2025, 9:19 AM
Unknown Object (File)
Jan 22 2025, 3:00 AM
Unknown Object (File)
Jan 15 2025, 12:50 PM
View All 72 Files
Subscribers
ashoat
tomek

Details

Reviewers
marcin
michal
tomek
Commits
rCOMMe4972363514f: [web] update `getClientStore` name
Summary

Follow-up to https://phab.comm.dev/D10780#inline-65805.

Depends on D10780

Test Plan

Flow

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kamil created this revision.Feb 1 2024, 12:43 PM
kamil held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptFeb 1 2024, 12:43 PM
kamil published this revision for review.Feb 1 2024, 12:44 PM
kamil edited reviewers, added: marcin, michal, tomek; removed: will, varun, bartek.
kamil added inline comments.
web/database/utils/store.js
14 ↗(On Diff #36550)

rename to match native (we have the same function in CommCoreModule)

web/database/worker/process-operations.js
164 ↗(On Diff #36550)

not sure if it's the best name but can't think of anything better

kamil mentioned this in D10780: [SQLite] implement C++ code to get keyservers.Feb 1 2024, 12:45 PM
Harbormaster completed remote builds in B26435: Diff 36550.Feb 1 2024, 1:02 PM
kamil added a child revision: D10781: [SQLite] implement processing keyserver store ops on worker.Feb 2 2024, 3:13 AM
marcin accepted this revision.Feb 5 2024, 2:05 AM
This revision is now accepted and ready to land.Feb 5 2024, 2:05 AM
kamil updated this revision to Diff 36634.Feb 5 2024, 11:06 AM

rebase

This revision was landed with ongoing or failed builds.Feb 5 2024, 11:23 AM
Closed by commit rCOMMe4972363514f: [web] update `getClientStore` name (authored by kamil). · Explain Why
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMMe4972363514f: [web] update `getClientStore` name.
Harbormaster completed remote builds in B26502: Diff 36634.Feb 5 2024, 11:24 AM

Revision Contents
Changeset List

PathSize
web/
database/
utils/
4 lines
worker/
4 lines
4 lines
redux/
4 lines

Diff 36637

View Options

web/database/utils/store.js

Show All 23 Lines
import { reduceThreadInfos } from './thread-reducer.js'; import { reduceThreadInfos } from './thread-reducer.js';
import { reduceCurrentUserInfo, reduceUserInfos } from './user-reducer.js'; import { reduceCurrentUserInfo, reduceUserInfos } from './user-reducer.js';
import { addKeyserverActionType } from '../actions/keyserver-actions.js'; import { addKeyserverActionType } from '../actions/keyserver-actions.js';
import { siweAuthActionTypes } from '../actions/siwe-actions.js'; import { siweAuthActionTypes } from '../actions/siwe-actions.js';
import { import {
keyserverRegisterActionTypes, keyserverRegisterActionTypes,
logInActionTypes, logInActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import {
keyserverStoreOpsHandlers,
type ReplaceKeyserverOperation,
} from '../ops/keyserver-store-ops.js';
import { isStaff } from '../shared/staff-utils.js'; import { isStaff } from '../shared/staff-utils.js';
import type { BaseNavInfo } from '../types/nav-types.js'; import type { BaseNavInfo } from '../types/nav-types.js';
import type { BaseAppState, BaseAction } from '../types/redux-types.js'; import type { BaseAppState, BaseAction } from '../types/redux-types.js';
import { import {
fullStateSyncActionType, fullStateSyncActionType,
incrementalStateSyncActionType, incrementalStateSyncActionType,
} from '../types/socket-types.js'; } from '../types/socket-types.js';
import type { StoreOperations } from '../types/store-ops-types.js'; import type { StoreOperations } from '../types/store-ops-types.js';
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines): { state: T, storeOperations: StoreOperations } {
if ( if (
action.type !== incrementalStateSyncActionType && action.type !== incrementalStateSyncActionType &&
action.type !== fullStateSyncActionType && action.type !== fullStateSyncActionType &&
action.type !== keyserverRegisterActionTypes.success && action.type !== keyserverRegisterActionTypes.success &&
action.type !== logInActionTypes.success && action.type !== logInActionTypes.success &&
action.type !== siweAuthActionTypes.success && action.type !== siweAuthActionTypes.success &&
action.type !== addKeyserverActionType action.type !== addKeyserverActionType
) { ) {
const replaceOperations: ReplaceKeyserverOperation[] = [];
for (const keyserverID in keyserverStore.keyserverInfos) { for (const keyserverID in keyserverStore.keyserverInfos) {
if ( if (
keyserverStore.keyserverInfos[keyserverID].connection.status === keyserverStore.keyserverInfos[keyserverID].connection.status ===
'connected' 'connected'
) { ) {
continue; continue;
} }
if ( if (
messageStore.currentAsOf[keyserverID] !== messageStore.currentAsOf[keyserverID] !==
state.messageStore.currentAsOf[keyserverID] state.messageStore.currentAsOf[keyserverID]
) { ) {
messageStore = { messageStore = {
...messageStore, ...messageStore,
currentAsOf: { currentAsOf: {
...messageStore.currentAsOf, ...messageStore.currentAsOf,
[keyserverID]: state.messageStore.currentAsOf[keyserverID], [keyserverID]: state.messageStore.currentAsOf[keyserverID],
}, },
}; };
} }
if ( if (
state.keyserverStore.keyserverInfos[keyserverID] && state.keyserverStore.keyserverInfos[keyserverID] &&
keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf !== keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf !==
state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf
) { ) {
const keyserverInfos = { ...keyserverStore.keyserverInfos }; replaceOperations.push({
keyserverInfos[keyserverID] = { type: 'replace_keyserver',
...keyserverInfos[keyserverID], payload: {
id: keyserverID,
keyserverInfo: {
...keyserverStore.keyserverInfos[keyserverID],
updatesCurrentAsOf: updatesCurrentAsOf:
state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf, state.keyserverStore.keyserverInfos[keyserverID]
}; .updatesCurrentAsOf,
keyserverStore = { ...keyserverStore, keyserverInfos }; },
},
});
} }
} }
if (replaceOperations.length > 0) {
keyserverStore = {
...keyserverStore,
keyserverInfos: keyserverStoreOpsHandlers.processStoreOperations(
keyserverStore.keyserverInfos,
replaceOperations,
),
};
}
} }
const { draftStore, draftStoreOperations } = reduceDraftStore( const { draftStore, draftStoreOperations } = reduceDraftStore(
state.draftStore, state.draftStore,
action, action,
); );
const { reportStore, reportStoreOperations } = reduceReportStore( const { reportStore, reportStoreOperations } = reduceReportStore(
▲ Show 20 Lines • Show All 63 Lines • Show Last 20 Lines
View Options

web/database/worker/db-worker.js

Show All 23 Lines
import { reduceThreadInfos } from './thread-reducer.js'; import { reduceThreadInfos } from './thread-reducer.js';
import { reduceCurrentUserInfo, reduceUserInfos } from './user-reducer.js'; import { reduceCurrentUserInfo, reduceUserInfos } from './user-reducer.js';
import { addKeyserverActionType } from '../actions/keyserver-actions.js'; import { addKeyserverActionType } from '../actions/keyserver-actions.js';
import { siweAuthActionTypes } from '../actions/siwe-actions.js'; import { siweAuthActionTypes } from '../actions/siwe-actions.js';
import { import {
keyserverRegisterActionTypes, keyserverRegisterActionTypes,
logInActionTypes, logInActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import {
keyserverStoreOpsHandlers,
type ReplaceKeyserverOperation,
} from '../ops/keyserver-store-ops.js';
import { isStaff } from '../shared/staff-utils.js'; import { isStaff } from '../shared/staff-utils.js';
import type { BaseNavInfo } from '../types/nav-types.js'; import type { BaseNavInfo } from '../types/nav-types.js';
import type { BaseAppState, BaseAction } from '../types/redux-types.js'; import type { BaseAppState, BaseAction } from '../types/redux-types.js';
import { import {
fullStateSyncActionType, fullStateSyncActionType,
incrementalStateSyncActionType, incrementalStateSyncActionType,
} from '../types/socket-types.js'; } from '../types/socket-types.js';
import type { StoreOperations } from '../types/store-ops-types.js'; import type { StoreOperations } from '../types/store-ops-types.js';
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines): { state: T, storeOperations: StoreOperations } {
if ( if (
action.type !== incrementalStateSyncActionType && action.type !== incrementalStateSyncActionType &&
action.type !== fullStateSyncActionType && action.type !== fullStateSyncActionType &&
action.type !== keyserverRegisterActionTypes.success && action.type !== keyserverRegisterActionTypes.success &&
action.type !== logInActionTypes.success && action.type !== logInActionTypes.success &&
action.type !== siweAuthActionTypes.success && action.type !== siweAuthActionTypes.success &&
action.type !== addKeyserverActionType action.type !== addKeyserverActionType
) { ) {
const replaceOperations: ReplaceKeyserverOperation[] = [];
for (const keyserverID in keyserverStore.keyserverInfos) { for (const keyserverID in keyserverStore.keyserverInfos) {
if ( if (
keyserverStore.keyserverInfos[keyserverID].connection.status === keyserverStore.keyserverInfos[keyserverID].connection.status ===
'connected' 'connected'
) { ) {
continue; continue;
} }
if ( if (
messageStore.currentAsOf[keyserverID] !== messageStore.currentAsOf[keyserverID] !==
state.messageStore.currentAsOf[keyserverID] state.messageStore.currentAsOf[keyserverID]
) { ) {
messageStore = { messageStore = {
...messageStore, ...messageStore,
currentAsOf: { currentAsOf: {
...messageStore.currentAsOf, ...messageStore.currentAsOf,
[keyserverID]: state.messageStore.currentAsOf[keyserverID], [keyserverID]: state.messageStore.currentAsOf[keyserverID],
}, },
}; };
} }
if ( if (
state.keyserverStore.keyserverInfos[keyserverID] && state.keyserverStore.keyserverInfos[keyserverID] &&
keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf !== keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf !==
state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf
) { ) {
const keyserverInfos = { ...keyserverStore.keyserverInfos }; replaceOperations.push({
keyserverInfos[keyserverID] = { type: 'replace_keyserver',
...keyserverInfos[keyserverID], payload: {
id: keyserverID,
keyserverInfo: {
...keyserverStore.keyserverInfos[keyserverID],
updatesCurrentAsOf: updatesCurrentAsOf:
state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf, state.keyserverStore.keyserverInfos[keyserverID]
}; .updatesCurrentAsOf,
keyserverStore = { ...keyserverStore, keyserverInfos }; },
},
});
} }
} }
if (replaceOperations.length > 0) {
keyserverStore = {
...keyserverStore,
keyserverInfos: keyserverStoreOpsHandlers.processStoreOperations(
keyserverStore.keyserverInfos,
replaceOperations,
),
};
}
} }
const { draftStore, draftStoreOperations } = reduceDraftStore( const { draftStore, draftStoreOperations } = reduceDraftStore(
state.draftStore, state.draftStore,
action, action,
); );
const { reportStore, reportStoreOperations } = reduceReportStore( const { reportStore, reportStoreOperations } = reduceReportStore(
▲ Show 20 Lines • Show All 63 Lines • Show Last 20 Lines
View Options

web/database/worker/process-operations.js

Show All 23 Lines
import { reduceThreadInfos } from './thread-reducer.js'; import { reduceThreadInfos } from './thread-reducer.js';
import { reduceCurrentUserInfo, reduceUserInfos } from './user-reducer.js'; import { reduceCurrentUserInfo, reduceUserInfos } from './user-reducer.js';
import { addKeyserverActionType } from '../actions/keyserver-actions.js'; import { addKeyserverActionType } from '../actions/keyserver-actions.js';
import { siweAuthActionTypes } from '../actions/siwe-actions.js'; import { siweAuthActionTypes } from '../actions/siwe-actions.js';
import { import {
keyserverRegisterActionTypes, keyserverRegisterActionTypes,
logInActionTypes, logInActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import {
keyserverStoreOpsHandlers,
type ReplaceKeyserverOperation,
} from '../ops/keyserver-store-ops.js';
import { isStaff } from '../shared/staff-utils.js'; import { isStaff } from '../shared/staff-utils.js';
import type { BaseNavInfo } from '../types/nav-types.js'; import type { BaseNavInfo } from '../types/nav-types.js';
import type { BaseAppState, BaseAction } from '../types/redux-types.js'; import type { BaseAppState, BaseAction } from '../types/redux-types.js';
import { import {
fullStateSyncActionType, fullStateSyncActionType,
incrementalStateSyncActionType, incrementalStateSyncActionType,
} from '../types/socket-types.js'; } from '../types/socket-types.js';
import type { StoreOperations } from '../types/store-ops-types.js'; import type { StoreOperations } from '../types/store-ops-types.js';
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines): { state: T, storeOperations: StoreOperations } {
if ( if (
action.type !== incrementalStateSyncActionType && action.type !== incrementalStateSyncActionType &&
action.type !== fullStateSyncActionType && action.type !== fullStateSyncActionType &&
action.type !== keyserverRegisterActionTypes.success && action.type !== keyserverRegisterActionTypes.success &&
action.type !== logInActionTypes.success && action.type !== logInActionTypes.success &&
action.type !== siweAuthActionTypes.success && action.type !== siweAuthActionTypes.success &&
action.type !== addKeyserverActionType action.type !== addKeyserverActionType
) { ) {
const replaceOperations: ReplaceKeyserverOperation[] = [];
for (const keyserverID in keyserverStore.keyserverInfos) { for (const keyserverID in keyserverStore.keyserverInfos) {
if ( if (
keyserverStore.keyserverInfos[keyserverID].connection.status === keyserverStore.keyserverInfos[keyserverID].connection.status ===
'connected' 'connected'
) { ) {
continue; continue;
} }
if ( if (
messageStore.currentAsOf[keyserverID] !== messageStore.currentAsOf[keyserverID] !==
state.messageStore.currentAsOf[keyserverID] state.messageStore.currentAsOf[keyserverID]
) { ) {
messageStore = { messageStore = {
...messageStore, ...messageStore,
currentAsOf: { currentAsOf: {
...messageStore.currentAsOf, ...messageStore.currentAsOf,
[keyserverID]: state.messageStore.currentAsOf[keyserverID], [keyserverID]: state.messageStore.currentAsOf[keyserverID],
}, },
}; };
} }
if ( if (
state.keyserverStore.keyserverInfos[keyserverID] && state.keyserverStore.keyserverInfos[keyserverID] &&
keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf !== keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf !==
state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf
) { ) {
const keyserverInfos = { ...keyserverStore.keyserverInfos }; replaceOperations.push({
keyserverInfos[keyserverID] = { type: 'replace_keyserver',
...keyserverInfos[keyserverID], payload: {
id: keyserverID,
keyserverInfo: {
...keyserverStore.keyserverInfos[keyserverID],
updatesCurrentAsOf: updatesCurrentAsOf:
state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf, state.keyserverStore.keyserverInfos[keyserverID]
}; .updatesCurrentAsOf,
keyserverStore = { ...keyserverStore, keyserverInfos }; },
},
});
} }
} }
if (replaceOperations.length > 0) {
keyserverStore = {
...keyserverStore,
keyserverInfos: keyserverStoreOpsHandlers.processStoreOperations(
keyserverStore.keyserverInfos,
replaceOperations,
),
};
}
} }
const { draftStore, draftStoreOperations } = reduceDraftStore( const { draftStore, draftStoreOperations } = reduceDraftStore(
state.draftStore, state.draftStore,
action, action,
); );
const { reportStore, reportStoreOperations } = reduceReportStore( const { reportStore, reportStoreOperations } = reduceReportStore(
▲ Show 20 Lines • Show All 63 Lines • Show Last 20 Lines
View Options

web/redux/initial-state-gate.js

Show All 23 Lines
import { reduceThreadInfos } from './thread-reducer.js'; import { reduceThreadInfos } from './thread-reducer.js';
import { reduceCurrentUserInfo, reduceUserInfos } from './user-reducer.js'; import { reduceCurrentUserInfo, reduceUserInfos } from './user-reducer.js';
import { addKeyserverActionType } from '../actions/keyserver-actions.js'; import { addKeyserverActionType } from '../actions/keyserver-actions.js';
import { siweAuthActionTypes } from '../actions/siwe-actions.js'; import { siweAuthActionTypes } from '../actions/siwe-actions.js';
import { import {
keyserverRegisterActionTypes, keyserverRegisterActionTypes,
logInActionTypes, logInActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import {
keyserverStoreOpsHandlers,
type ReplaceKeyserverOperation,
} from '../ops/keyserver-store-ops.js';
import { isStaff } from '../shared/staff-utils.js'; import { isStaff } from '../shared/staff-utils.js';
import type { BaseNavInfo } from '../types/nav-types.js'; import type { BaseNavInfo } from '../types/nav-types.js';
import type { BaseAppState, BaseAction } from '../types/redux-types.js'; import type { BaseAppState, BaseAction } from '../types/redux-types.js';
import { import {
fullStateSyncActionType, fullStateSyncActionType,
incrementalStateSyncActionType, incrementalStateSyncActionType,
} from '../types/socket-types.js'; } from '../types/socket-types.js';
import type { StoreOperations } from '../types/store-ops-types.js'; import type { StoreOperations } from '../types/store-ops-types.js';
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines): { state: T, storeOperations: StoreOperations } {
if ( if (
action.type !== incrementalStateSyncActionType && action.type !== incrementalStateSyncActionType &&
action.type !== fullStateSyncActionType && action.type !== fullStateSyncActionType &&
action.type !== keyserverRegisterActionTypes.success && action.type !== keyserverRegisterActionTypes.success &&
action.type !== logInActionTypes.success && action.type !== logInActionTypes.success &&
action.type !== siweAuthActionTypes.success && action.type !== siweAuthActionTypes.success &&
action.type !== addKeyserverActionType action.type !== addKeyserverActionType
) { ) {
const replaceOperations: ReplaceKeyserverOperation[] = [];
for (const keyserverID in keyserverStore.keyserverInfos) { for (const keyserverID in keyserverStore.keyserverInfos) {
if ( if (
keyserverStore.keyserverInfos[keyserverID].connection.status === keyserverStore.keyserverInfos[keyserverID].connection.status ===
'connected' 'connected'
) { ) {
continue; continue;
} }
if ( if (
messageStore.currentAsOf[keyserverID] !== messageStore.currentAsOf[keyserverID] !==
state.messageStore.currentAsOf[keyserverID] state.messageStore.currentAsOf[keyserverID]
) { ) {
messageStore = { messageStore = {
...messageStore, ...messageStore,
currentAsOf: { currentAsOf: {
...messageStore.currentAsOf, ...messageStore.currentAsOf,
[keyserverID]: state.messageStore.currentAsOf[keyserverID], [keyserverID]: state.messageStore.currentAsOf[keyserverID],
}, },
}; };
} }
if ( if (
state.keyserverStore.keyserverInfos[keyserverID] && state.keyserverStore.keyserverInfos[keyserverID] &&
keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf !== keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf !==
state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf
) { ) {
const keyserverInfos = { ...keyserverStore.keyserverInfos }; replaceOperations.push({
keyserverInfos[keyserverID] = { type: 'replace_keyserver',
...keyserverInfos[keyserverID], payload: {
id: keyserverID,
keyserverInfo: {
...keyserverStore.keyserverInfos[keyserverID],
updatesCurrentAsOf: updatesCurrentAsOf:
state.keyserverStore.keyserverInfos[keyserverID].updatesCurrentAsOf, state.keyserverStore.keyserverInfos[keyserverID]
}; .updatesCurrentAsOf,
keyserverStore = { ...keyserverStore, keyserverInfos }; },
},
});
} }
} }
if (replaceOperations.length > 0) {
keyserverStore = {
...keyserverStore,
keyserverInfos: keyserverStoreOpsHandlers.processStoreOperations(
keyserverStore.keyserverInfos,
replaceOperations,
),
};
}
} }
const { draftStore, draftStoreOperations } = reduceDraftStore( const { draftStore, draftStoreOperations } = reduceDraftStore(
state.draftStore, state.draftStore,
action, action,
); );
const { reportStore, reportStoreOperations } = reduceReportStore( const { reportStore, reportStoreOperations } = reduceReportStore(
▲ Show 20 Lines • Show All 63 Lines • Show Last 20 Lines