Page MenuHomePhabricator
Differential D11092

[lib] Make activity-handler keyserver-specific
ClosedPublic
Actions

Authored by tomek on Feb 15 2024, 6:15 AM.
Tags
None
Referenced Files
F5110319: D11092.id37259.diff
Tue, Apr 1, 11:01 PM
Unknown Object (File)
Fri, Mar 28, 8:12 PM
Unknown Object (File)
Tue, Mar 25, 3:38 PM
Unknown Object (File)
Mon, Mar 17, 2:23 PM
Unknown Object (File)
Mar 1 2025, 7:46 PM
Unknown Object (File)
Feb 27 2025, 11:05 AM
Unknown Object (File)
Feb 18 2025, 3:08 AM
Unknown Object (File)
Feb 16 2025, 12:45 AM
View All 73 Files
Subscribers
ashoat

Details

Reviewers
inka
kamil
michal
atul
Commits
rCOMM96972d4180cf: [lib] Make activity-handler keyserver-specific
Summary

Add a prop that identifies a keyserver.
Make sure that we queue only the updates to a keyserver that owns a thread.

https://linear.app/comm/issue/ENG-5777/update-activityhandler

Depends on D11089

Test Plan

Focus a thread and check if the action is dispatched.
Using React debugger, modified ActionHandler's activeThread prop to a thread that has a different prefix - that resulted in only one, focus: false update being generated. Changed it back to the correct prefix - again, only one update was generated (this time focus: true).

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
lib/
socket/
24 lines
1 line

Diff 37427

View Options

lib/socket/activity-handler.react.js

// @flow // @flow
import _isEqual from 'lodash/fp/isEqual.js'; import _isEqual from 'lodash/fp/isEqual.js';
import { createSelector } from 'reselect';
import t from 'tcomb'; import t from 'tcomb';
import type { StateSyncSpec } from './state-sync-spec.js'; import type { StateSyncSpec } from './state-sync-spec.js';
import { import {
type CalendarQuery, type CalendarQuery,
type RawEntryInfos, type RawEntryInfos,
rawEntryInfoValidator, rawEntryInfoValidator,
type RawEntryInfo, type RawEntryInfo,
} from '../../types/entry-types.js'; } from '../../types/entry-types.js';
import type { AppState } from '../../types/redux-types.js';
import { import {
reportTypes, reportTypes,
type ClientEntryInconsistencyReportCreationRequest, type ClientEntryInconsistencyReportCreationRequest,
} from '../../types/report-types.js'; } from '../../types/report-types.js';
import type { ProcessServerRequestAction } from '../../types/request-types.js'; import type { ProcessServerRequestAction } from '../../types/request-types.js';
import { actionLogger } from '../../utils/action-logger.js'; import { actionLogger } from '../../utils/action-logger.js';
import { getConfig } from '../../utils/config.js'; import { getConfig } from '../../utils/config.js';
import { convertClientIDsToServerIDs } from '../../utils/conversion-utils.js'; import { convertClientIDsToServerIDs } from '../../utils/conversion-utils.js';
import { values } from '../../utils/objects.js'; import { values, combineUnorderedHashes, hash } from '../../utils/objects.js';
import { generateReportID } from '../../utils/report-utils.js'; import { generateReportID } from '../../utils/report-utils.js';
import { sanitizeActionSecrets } from '../../utils/sanitization.js'; import { sanitizeActionSecrets } from '../../utils/sanitization.js';
import { ashoatKeyserverID, tID } from '../../utils/validation-utils.js'; import { ashoatKeyserverID, tID } from '../../utils/validation-utils.js';
import { import {
filterRawEntryInfosByCalendarQuery, filterRawEntryInfosByCalendarQuery,
serverEntryInfosObject, serverEntryInfosObject,
} from '../entry-utils.js'; } from '../entry-utils.js';
▲ Show 20 Lines • Show All 52 Lines • ▼ Show 20 Lines return [
calendarQuery, calendarQuery,
pushResult: afterStateCheck, pushResult: afterStateCheck,
lastActions: actionLogger.interestingActionSummaries, lastActions: actionLogger.interestingActionSummaries,
time: Date.now(), time: Date.now(),
id: generateReportID(), id: generateReportID(),
}, },
]; ];
}, },
selector: createSelector(
(state: AppState) => state.entryStore.entryInfos,
entryInfos => ({
...entriesStateSyncSpec,
getInfoHash: id => hash(entryInfos[`${ashoatKeyserverID}|${id}`]),
getAllInfosHash: calendarQuery =>
getEntryInfosHash(entryInfos, calendarQuery),
getIDs: calendarQuery => getEntryIDs(entryInfos, calendarQuery),
}),
),
}); });
const emptyArray = []; const emptyArray = [];
function getEntryInfosHash(
entryInfos: RawEntryInfos,
calendarQuery: CalendarQuery,
) {
const filteredEntryInfos = filterRawEntryInfosByCalendarQuery(
serverEntryInfosObject(values(entryInfos)),
calendarQuery,
);
return combineUnorderedHashes(Object.values(filteredEntryInfos).map(hash));
}
function getEntryIDs(entryInfos: RawEntryInfos, calendarQuery: CalendarQuery) {
const filteredEntryInfos = filterRawEntryInfosByCalendarQuery(
serverEntryInfosObject(values(entryInfos)),
calendarQuery,
);
return Object.keys(filteredEntryInfos).map(id => id.split('|')[1]);
}
View Options

lib/socket/socket.react.js

// @flow // @flow
import _isEqual from 'lodash/fp/isEqual.js'; import _isEqual from 'lodash/fp/isEqual.js';
import { createSelector } from 'reselect';
import t from 'tcomb'; import t from 'tcomb';
import type { StateSyncSpec } from './state-sync-spec.js'; import type { StateSyncSpec } from './state-sync-spec.js';
import { import {
type CalendarQuery, type CalendarQuery,
type RawEntryInfos, type RawEntryInfos,
rawEntryInfoValidator, rawEntryInfoValidator,
type RawEntryInfo, type RawEntryInfo,
} from '../../types/entry-types.js'; } from '../../types/entry-types.js';
import type { AppState } from '../../types/redux-types.js';
import { import {
reportTypes, reportTypes,
type ClientEntryInconsistencyReportCreationRequest, type ClientEntryInconsistencyReportCreationRequest,
} from '../../types/report-types.js'; } from '../../types/report-types.js';
import type { ProcessServerRequestAction } from '../../types/request-types.js'; import type { ProcessServerRequestAction } from '../../types/request-types.js';
import { actionLogger } from '../../utils/action-logger.js'; import { actionLogger } from '../../utils/action-logger.js';
import { getConfig } from '../../utils/config.js'; import { getConfig } from '../../utils/config.js';
import { convertClientIDsToServerIDs } from '../../utils/conversion-utils.js'; import { convertClientIDsToServerIDs } from '../../utils/conversion-utils.js';
import { values } from '../../utils/objects.js'; import { values, combineUnorderedHashes, hash } from '../../utils/objects.js';
import { generateReportID } from '../../utils/report-utils.js'; import { generateReportID } from '../../utils/report-utils.js';
import { sanitizeActionSecrets } from '../../utils/sanitization.js'; import { sanitizeActionSecrets } from '../../utils/sanitization.js';
import { ashoatKeyserverID, tID } from '../../utils/validation-utils.js'; import { ashoatKeyserverID, tID } from '../../utils/validation-utils.js';
import { import {
filterRawEntryInfosByCalendarQuery, filterRawEntryInfosByCalendarQuery,
serverEntryInfosObject, serverEntryInfosObject,
} from '../entry-utils.js'; } from '../entry-utils.js';
▲ Show 20 Lines • Show All 52 Lines • ▼ Show 20 Lines return [
calendarQuery, calendarQuery,
pushResult: afterStateCheck, pushResult: afterStateCheck,
lastActions: actionLogger.interestingActionSummaries, lastActions: actionLogger.interestingActionSummaries,
time: Date.now(), time: Date.now(),
id: generateReportID(), id: generateReportID(),
}, },
]; ];
}, },
selector: createSelector(
(state: AppState) => state.entryStore.entryInfos,
entryInfos => ({
...entriesStateSyncSpec,
getInfoHash: id => hash(entryInfos[`${ashoatKeyserverID}|${id}`]),
getAllInfosHash: calendarQuery =>
getEntryInfosHash(entryInfos, calendarQuery),
getIDs: calendarQuery => getEntryIDs(entryInfos, calendarQuery),
}),
),
}); });
const emptyArray = []; const emptyArray = [];
function getEntryInfosHash(
entryInfos: RawEntryInfos,
calendarQuery: CalendarQuery,
) {
const filteredEntryInfos = filterRawEntryInfosByCalendarQuery(
serverEntryInfosObject(values(entryInfos)),
calendarQuery,
);
return combineUnorderedHashes(Object.values(filteredEntryInfos).map(hash));
}
function getEntryIDs(entryInfos: RawEntryInfos, calendarQuery: CalendarQuery) {
const filteredEntryInfos = filterRawEntryInfosByCalendarQuery(
serverEntryInfosObject(values(entryInfos)),
calendarQuery,
);
return Object.keys(filteredEntryInfos).map(id => id.split('|')[1]);
}