src
ClosedPublic
Actions

Authored by • jon on Aug 5 2022, 4:40 PM.

Details

Reviewers

atul
• karol
• max

Commits

rCOMM4aef791d3ab1: [Services] Clang fixes for services/lib/src

Summary

Clang is a bit more pedantic. Make it happy.

Occurred to me that this was never an existing workflow.
So I made it into another diff.

Allows for D4489 to be built from a MacOS device

Test Plan

Follow nix test plan from D4489 on a mac device

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

• jon created this revision.Aug 5 2022, 4:40 PM

Herald added subscribers: • abosh, • adrian, tomek, ashoat. · View Herald TranscriptAug 5 2022, 4:40 PM

• jon added a child revision: D4489: [Services] Export shared services cpp as CMake Project.Aug 5 2022, 4:41 PM

Harbormaster completed remote builds in B11180: Diff 15387.Aug 5 2022, 4:52 PM

• jon requested review of this revision.Aug 5 2022, 4:52 PM

• jon mentioned this in D4489: [Services] Export shared services cpp as CMake Project.Aug 5 2022, 6:20 PM

• jon retitled this revision from [Services] Clang fixes services/lib/src to [Services] Clang fixes for services/lib/src.Aug 6 2022, 10:17 AM

atul accepted this revision.Aug 8 2022, 10:29 AM

atul added inline comments.

services/lib/src/ReactorStatusHolder.h
25 ↗	(On Diff #15387)	Could we do std::atomic<ReactorState> state{ReactorState::NONE}; here?

This revision is now accepted and ready to land.Aug 8 2022, 10:29 AM

• jon requested review of this revision.Aug 8 2022, 10:55 AM

• jon added inline comments.

services/lib/src/ReactorStatusHolder.h
25 ↗	(On Diff #15387)	I'm not going to act like I know best practices in C++ cc @max Looks like they are equivalent: https://stackoverflow.com/questions/40378205/c-initialising-fields-directly-vs-initialisation-list-in-default-constructor

atul added inline comments.Aug 8 2022, 11:03 AM

services/lib/src/ReactorStatusHolder.h
25 ↗	(On Diff #15387)	Gotcha, seems reasonable to leave as is Also don't know much C++, just been blindly following that braced initialization rule.

atul accepted this revision.Aug 8 2022, 11:04 AM

atul attached a referenced file: F131041: Screen_Shot_2022-08-04_at_4.29.45_PM.png. (Show Details)

This revision is now accepted and ready to land.Aug 8 2022, 11:04 AM

Closed by commit rCOMM4aef791d3ab1: [Services] Clang fixes for services/lib/src (authored by • jon). · Explain WhyAug 8 2022, 11:34 AM

This revision was automatically updated to reflect the committed changes.

• jon added a commit: rCOMM4aef791d3ab1: [Services] Clang fixes for services/lib/src.

Revision Contents
Changeset List

Path

Size

services/

lib/

src/

ReactorStatusHolder.h

2 lines

server-base-reactors/

ServerWriteReactorBase.h

2 lines

Diff 15436

View Options

services/lib/src/ReactorStatusHolder.h

// @flow		// @flow

import reduceConnectionInfo from './connection-reducer.js';
import { reduceDeviceToken } from './device-token-reducer.js';		import { reduceDeviceToken } from './device-token-reducer.js';
import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js';		import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js';
import { updateActivityActionTypes } from '../actions/activity-actions.js';		import { updateActivityActionTypes } from '../actions/activity-actions.js';
import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js';		import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js';
import {		import {
addKeyserverActionType,		addKeyserverActionType,
removeKeyserverActionType,		removeKeyserverActionType,
} from '../actions/keyserver-actions.js';		} from '../actions/keyserver-actions.js';
import { siweAuthActionTypes } from '../actions/siwe-actions.js';		import { siweAuthActionTypes } from '../actions/siwe-actions.js';
import {		import {
logInActionTypes,
resetUserStateActionType,
logOutActionTypes,		logOutActionTypes,
deleteAccountActionTypes,		deleteAccountActionTypes,
registerActionTypes,		registerActionTypes,
		logInActionTypes,
		resetUserStateActionType,
} from '../actions/user-actions.js';		} from '../actions/user-actions.js';
import { queueActivityUpdatesActionType } from '../types/activity-types.js';		import { queueActivityUpdatesActionType } from '../types/activity-types.js';
import type { KeyserverStore } from '../types/keyserver-types';		import type { KeyserverStore } from '../types/keyserver-types';
import type { BaseAction } from '../types/redux-types.js';		import type { BaseAction } from '../types/redux-types.js';
import {		import {
fullStateSyncActionType,		fullStateSyncActionType,
incrementalStateSyncActionType,		incrementalStateSyncActionType,
updateConnectionStatusActionType,		updateConnectionStatusActionType,
		setLateResponseActionType,
		updateDisconnectedBarActionType,
} from '../types/socket-types.js';		} from '../types/socket-types.js';
import { processUpdatesActionType } from '../types/update-types.js';		import { processUpdatesActionType } from '../types/update-types.js';
import { setNewSessionActionType } from '../utils/action-utils.js';		import { setNewSessionActionType } from '../utils/action-utils.js';
import { getConfig } from '../utils/config.js';		import { getConfig } from '../utils/config.js';
import { setURLPrefix } from '../utils/url-utils.js';		import { setURLPrefix } from '../utils/url-utils.js';
import { ashoatKeyserverID } from '../utils/validation-utils.js';		import { ashoatKeyserverID } from '../utils/validation-utils.js';

export default function reduceKeyserverStore(		export default function reduceKeyserverStore(
state: KeyserverStore,		state: KeyserverStore,
action: BaseAction,		action: BaseAction,
): KeyserverStore {		): KeyserverStore {
if (		if (action.type === addKeyserverActionType) {
action.type === logOutActionTypes.success \|\|
action.type === deleteAccountActionTypes.success
) {
state = {
keyserverInfos: {
[ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID],
},
},
};
} else if (action.type === addKeyserverActionType) {
return {		return {
...state,		...state,
keyserverInfos: {		keyserverInfos: {
...state.keyserverInfos,		...state.keyserverInfos,
[action.payload.keyserverAdminUserID]: {		[action.payload.keyserverAdminUserID]: {
...action.payload.newKeyserverInfo,		...action.payload.newKeyserverInfo,
},		},
},		},
Show All 31 Lines	if (action.payload.sessionChange.cookie !== undefined) {
...state.keyserverInfos,		...state.keyserverInfos,
[keyserverID]: {		[keyserverID]: {
...state.keyserverInfos[keyserverID],		...state.keyserverInfos[keyserverID],
cookie: action.payload.sessionChange.cookie,		cookie: action.payload.sessionChange.cookie,
},		},
},		},
};		};
}		}
		if (action.payload.sessionChange.cookieInvalidated) {
		state = {
		...state,
		keyserverInfos: {
		...state.keyserverInfos,
		[keyserverID]: {
		...state.keyserverInfos[keyserverID],
		connection: {
		...state.keyserverInfos[keyserverID].connection,
		queuedActivityUpdates: [],
		},
		},
		},
		};
		}
} else if (		} else if (
action.type === logInActionTypes.success \|\|		action.type === logInActionTypes.success \|\|
action.type === siweAuthActionTypes.success		action.type === siweAuthActionTypes.success
) {		) {
const { updatesCurrentAsOf } = action.payload;		const { updatesCurrentAsOf } = action.payload;
for (const keyserverID in updatesCurrentAsOf) {		for (const keyserverID in updatesCurrentAsOf) {
state = {		state = {
...state,		...state,
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines	for (const keyserverID in activityUpdates) {
connection: { ...oldConnection, queuedActivityUpdates },		connection: { ...oldConnection, queuedActivityUpdates },
},		},
};		};
}		}
state = {		state = {
...state,		...state,
keyserverInfos,		keyserverInfos,
};		};
}		} else if (
		action.type === logOutActionTypes.success \|\|
		action.type === deleteAccountActionTypes.success
		) {
		// We want to remove all keyservers but Ashoat's keyserver
		const oldConnection = state.keyserverInfos[ashoatKeyserverID].connection;

const connection = reduceConnectionInfo(		const keyserverInfos = {
state.keyserverInfos[ashoatKeyserverID].connection,		[ashoatKeyserverID]: {
action,		...state.keyserverInfos[ashoatKeyserverID],
		connection: { ...oldConnection, queuedActivityUpdates: [] },
		},
		};

		state = {
		...state,
		keyserverInfos,
		};
		} else if (action.type === setLateResponseActionType) {
		const { messageID, isLate, keyserverID } = action.payload;
		const lateResponsesSet = new Set<number>(
		state.keyserverInfos[keyserverID].connection.lateResponses,
);		);
		if (isLate) {
		lateResponsesSet.add(messageID);
		} else {
		lateResponsesSet.delete(messageID);
		}
		state = {
		...state,
		keyserverInfos: {
		...state.keyserverInfos,
		[keyserverID]: {
		...state.keyserverInfos[keyserverID],
		connection: {
		...state.keyserverInfos[keyserverID].connection,
		lateResponses: [...lateResponsesSet],
		},
		},
		},
		};
		} else if (action.type === updateDisconnectedBarActionType) {
		const { keyserverID } = action.payload;
		state = {
		...state,
		keyserverInfos: {
		...state.keyserverInfos,
		[keyserverID]: {
		...state.keyserverInfos[keyserverID],
		connection: {
		...state.keyserverInfos[keyserverID].connection,
		showDisconnectedBar: action.payload.visible,
		},
		},
		},
		};
		}

const deviceToken = reduceDeviceToken(		const deviceToken = reduceDeviceToken(
state.keyserverInfos[ashoatKeyserverID].deviceToken,		state.keyserverInfos[ashoatKeyserverID].deviceToken,
action,		action,
);		);
if (		if (deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken) {
connection !== state.keyserverInfos[ashoatKeyserverID].connection \|\|
deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken
) {
state = {		state = {
...state,		...state,
keyserverInfos: {		keyserverInfos: {
...state.keyserverInfos,		...state.keyserverInfos,
[ashoatKeyserverID]: {		[ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID],		...state.keyserverInfos[ashoatKeyserverID],
connection,
deviceToken,		deviceToken,
},		},
},		},
};		};
}		}

return state;		return state;
}		}