Page MenuHomePhabricator
Differential D11182

[lib] Add keyserverID to processServerRequestsActionType
ClosedPublic
Actions

Authored by tomek on Feb 27 2024, 2:12 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 30, 12:24 AM
Unknown Object (File)
Sat, Mar 29, 7:25 PM
Unknown Object (File)
Sun, Mar 23, 4:00 AM
Unknown Object (File)
Feb 25 2025, 5:46 AM
Unknown Object (File)
Feb 16 2025, 12:18 AM
Unknown Object (File)
Feb 16 2025, 12:18 AM
Unknown Object (File)
Feb 16 2025, 12:17 AM
Unknown Object (File)
Feb 16 2025, 12:17 AM
View All 67 Files
Subscribers
ashoat

Details

Reviewers
michal
atul
inka
kamil
Commits
rCOMM80c75e317126: [lib] Add keyserverID to processServerRequestsActionType
Summary

This is needed to correctly compute store inconsistencies - we should filter only the entities from one keyserver.

https://linear.app/comm/issue/ENG-5780/update-requestresponsehandler

Depends on D11181

Test Plan

Increase session check frequency and add a console.log in entries reducer to verify that processServerRequestsActionType payload contains keyserverID.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
lib/
socket/
2 lines
1 line
types/
1 line

Diff 37703

View Options

lib/socket/request-response-handler.react.js

Show All 28 Linestype BaseProps = {
+inflightRequests: ?InflightRequests, +inflightRequests: ?InflightRequests,
+sendMessage: (message: ClientSocketMessageWithoutID) => number, +sendMessage: (message: ClientSocketMessageWithoutID) => number,
+addListener: (listener: SocketListener) => void, +addListener: (listener: SocketListener) => void,
+removeListener: (listener: SocketListener) => void, +removeListener: (listener: SocketListener) => void,
+getClientResponses: ( +getClientResponses: (
activeServerRequests: $ReadOnlyArray<ClientServerRequest>, activeServerRequests: $ReadOnlyArray<ClientServerRequest>,
) => Promise<$ReadOnlyArray<ClientClientResponse>>, ) => Promise<$ReadOnlyArray<ClientClientResponse>>,
+currentCalendarQuery: () => CalendarQuery, +currentCalendarQuery: () => CalendarQuery,
+keyserverID: string,
}; };
type Props = { type Props = {
...BaseProps, ...BaseProps,
+connection: ConnectionInfo, +connection: ConnectionInfo,
+dispatch: Dispatch, +dispatch: Dispatch,
}; };
class RequestResponseHandler extends React.PureComponent<Props> { class RequestResponseHandler extends React.PureComponent<Props> {
componentDidMount() { componentDidMount() {
Show All 17 Lines if (serverRequests.length === 0) {
return; return;
} }
const calendarQuery = this.props.currentCalendarQuery(); const calendarQuery = this.props.currentCalendarQuery();
this.props.dispatch({ this.props.dispatch({
type: processServerRequestsActionType, type: processServerRequestsActionType,
payload: { payload: {
serverRequests, serverRequests,
calendarQuery, calendarQuery,
keyserverID: this.props.keyserverID,
}, },
}); });
if (this.props.inflightRequests) { if (this.props.inflightRequests) {
const clientResponsesPromise = const clientResponsesPromise =
this.props.getClientResponses(serverRequests); this.props.getClientResponses(serverRequests);
void this.sendAndHandleClientResponsesToServerRequests( void this.sendAndHandleClientResponsesToServerRequests(
clientResponsesPromise, clientResponsesPromise,
); );
▲ Show 20 Lines • Show All 80 Lines • Show Last 20 Lines
View Options

lib/socket/socket.react.js

Show First 20 Lines • Show All 352 Lines • ▼ Show 20 Lines return (
/> />
<RequestResponseHandler <RequestResponseHandler
inflightRequests={this.state.inflightRequests} inflightRequests={this.state.inflightRequests}
sendMessage={this.sendMessageWithoutID} sendMessage={this.sendMessageWithoutID}
addListener={this.addListener} addListener={this.addListener}
removeListener={this.removeListener} removeListener={this.removeListener}
getClientResponses={this.props.getClientResponses} getClientResponses={this.props.getClientResponses}
currentCalendarQuery={this.props.currentCalendarQuery} currentCalendarQuery={this.props.currentCalendarQuery}
keyserverID={this.props.keyserverID}
/> />
<UpdateHandler <UpdateHandler
sendMessage={this.sendMessageWithoutID} sendMessage={this.sendMessageWithoutID}
addListener={this.addListener} addListener={this.addListener}
removeListener={this.removeListener} removeListener={this.removeListener}
keyserverID={this.props.keyserverID} keyserverID={this.props.keyserverID}
/> />
<MessageHandler <MessageHandler
▲ Show 20 Lines • Show All 464 Lines • Show Last 20 Lines
View Options

lib/types/request-types.js

Show First 20 Lines • Show All 258 Lines • ▼ Show 20 Lines
export type ClientInconsistencyResponse = export type ClientInconsistencyResponse =
| ClientThreadInconsistencyClientResponse | ClientThreadInconsistencyClientResponse
| ClientEntryInconsistencyClientResponse; | ClientEntryInconsistencyClientResponse;
export const processServerRequestsActionType = 'PROCESS_SERVER_REQUESTS'; export const processServerRequestsActionType = 'PROCESS_SERVER_REQUESTS';
export type ProcessServerRequestsPayload = { export type ProcessServerRequestsPayload = {
+serverRequests: $ReadOnlyArray<ClientServerRequest>, +serverRequests: $ReadOnlyArray<ClientServerRequest>,
+calendarQuery: CalendarQuery, +calendarQuery: CalendarQuery,
+keyserverID: string,
}; };
export type ProcessServerRequestAction = { export type ProcessServerRequestAction = {
+type: 'PROCESS_SERVER_REQUESTS', +type: 'PROCESS_SERVER_REQUESTS',
+payload: ProcessServerRequestsPayload, +payload: ProcessServerRequestsPayload,
}; };
export type OlmSessionInitializationInfo = { export type OlmSessionInitializationInfo = {
+prekey: string, +prekey: string,
Show All 21 Lines