services/backup/blob_client/src/get_client.rs
131–137 ↗	(On Diff #16175)	we pulled `client` out of the mutex guard, and now we are re-assigning it? why?
132–136 ↗	(On Diff #16175)	This should be a similar way to express this.

This revision now requires changes to proceed.Sep 1 2022, 9:11 AM

• karol added inline comments.Sep 5 2022, 12:06 AM

services/backup/blob_client/src/get_client.rs
131–137 ↗	(On Diff #16175)	Rust will not allow modifying struct members so we have to `take()` and re-put again.
132–136 ↗	(On Diff #16175)	Yes, looks okay, nice catch, thanks!

tomek requested changes to this revision.Sep 5 2022, 5:37 AM

tomek added inline comments.

services/backup/blob_client/src/get_client.rs
131–137 ↗	(On Diff #16175)	I'm not sure if this is correct in general. For example, you can use `&mut` reference...
135 ↗	(On Diff #16175)	Is there a way to avoid mutating the data from outside this block? Can we use `block_on` return value for this?

• karol added inline comments.Sep 6 2022, 2:43 AM

services/backup/blob_client/src/get_client.rs
131–137 ↗	(On Diff #16175)	https://linear.app/comm/issue/ENG-1736/try-to-avoid-reassigning-when-modifying-the-field-of-a-global-struct
135 ↗	(On Diff #16175)	yes

address comments

Harbormaster completed remote builds in B11910: Diff 16353.Sep 6 2022, 2:52 AM

tomek accepted this revision.Sep 7 2022, 5:15 AM

tomek added inline comments.

services/backup/blob_client/src/get_client.rs
135 ↗	(On Diff #16175)	Nice!

Will address concerns in https://linear.app/comm/issue/ENG-1736/try-to-avoid-reassigning-when-modifying-the-field-of-a-global-struct

This revision is now accepted and ready to land.Sep 7 2022, 11:16 AM

rebase

This revision was landed with ongoing or failed builds.Sep 8 2022, 4:10 AM

Closed by commit rCOMM0edcf73c41af: [services] Backup - Blob Get Client - Add blocking read (authored by • karol). · Explain Why

This revision was automatically updated to reflect the committed changes.

• karol added a commit: rCOMM0edcf73c41af: [services] Backup - Blob Get Client - Add blocking read.

Harbormaster completed remote builds in B11992: Diff 16447.Sep 8 2022, 4:17 AM

Revision Contents
Changeset List

Path

Size

services/

backup/

blob_client/

src/

get_client.rs

19 lines

Diff 16473

View Options

services/backup/blob_client/src/get_client.rs

// @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;
}		}

[services] Backup - Blob Get Client - Add blocking readClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 16473

services/backup/blob_client/src/get_client.rs

[services] Backup - Blob Get Client - Add blocking read
ClosedPublic
Actions

Revision Contents
Changeset List