[services] Backup - Blob Put Client - Add helper functions
ClosedPublic
Actions

services/backup/blob_client/src/put_client.rs
46–63 ↗	(On Diff #16166)	I'm confused as to why we need to collect then later read error messages. We should probably just emit them as they occur, and not deal with this state management. What's the benefit of having to separately manage error messages?

This revision now requires changes to proceed.Sep 1 2022, 8:51 AM

• karol requested review of this revision.Sep 2 2022, 7:05 AM

• karol added inline comments.

services/backup/blob_client/src/put_client.rs
46–63 ↗	(On Diff #16166)	https://phab.comm.dev/D5005#146417

tomek accepted this revision.Sep 5 2022, 2:35 AM

tomek added inline comments.

services/backup/blob_client/src/put_client.rs
35–44 ↗	(On Diff #16166)	We can simplify this

• karol added inline comments.Sep 5 2022, 6:53 AM

services/backup/blob_client/src/put_client.rs
35–44 ↗	(On Diff #16166)	ok

address comment

Harbormaster completed remote builds in B11883: Diff 16315.Sep 5 2022, 7:03 AM

tomek mentioned this in D5013: [services] Backup - Blob Get Client - Add base structure.Sep 7 2022, 5:06 AM

https://linear.app/comm/issue/ENG-1734/improve-error-handling-system-in-the-blob-client

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

rebase

Harbormaster completed remote builds in B11983: Diff 16438.Sep 8 2022, 4:07 AM

Closed by commit rCOMMa20c5f282130: [services] Backup - Blob Put Client - Add helper functions (authored by • karol). · Explain WhySep 8 2022, 4:10 AM

This revision was automatically updated to reflect the committed changes.

• karol added a commit: rCOMMa20c5f282130: [services] Backup - Blob Put Client - Add helper functions.

Revision Contents
Changeset List

Path

Size

services/

backup/

blob_client/

src/

put_client.rs

29 lines

Diff 16465

View Options

services/backup/blob_client/src/put_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 Put Client - Add helper functionsClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 16465

services/backup/blob_client/src/put_client.rs

[services] Backup - Blob Put Client - Add helper functions
ClosedPublic
Actions

Revision Contents
Changeset List