Page MenuHomePhabricator
Differential D7656

[lib] Introduce server update info validators
ClosedPublic
Actions

Authored by michal on Apr 27 2023, 6:37 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 17, 10:36 PM
Unknown Object (File)
Mon, Mar 17, 1:25 PM
Unknown Object (File)
Mon, Mar 17, 1:25 PM
Unknown Object (File)
Mon, Mar 17, 1:25 PM
Unknown Object (File)
Mon, Mar 17, 1:25 PM
Unknown Object (File)
Mon, Mar 17, 1:24 PM
Unknown Object (File)
Mon, Mar 17, 1:14 PM
Unknown Object (File)
Mon, Mar 10, 8:27 AM
View All Files
Subscribers
ashoat
atul

Details

Reviewers
kamil
tomek
Commits
rCOMM512692827a6a: [lib] Introduce server update info validators
Summary

Introduce ServerUpdateInfo validator with inner validators and tests.

Depends on D7572

Test Plan

Run yarn jest

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

michal created this revision.Apr 27 2023, 6:37 AM
Herald added subscribers: atul, ashoat. · View Herald TranscriptApr 27 2023, 6:37 AM
Harbormaster completed remote builds in B18858: Diff 25827.Apr 27 2023, 6:56 AM
michal requested review of this revision.Apr 27 2023, 6:56 AM
ashoat added inline comments.Apr 27 2023, 1:09 PM
lib/types/validation.test.js
736 ↗(On Diff #25827)

Can we use constants?

michal added a child revision: D7685: [keyserver] Introduce responder validators.Apr 29 2023, 3:47 AM
michal updated this revision to Diff 26062.May 4 2023, 3:07 AM

Rebase

Harbormaster completed remote builds in B19031: Diff 26062.May 4 2023, 3:37 AM
tomek accepted this revision.May 4 2023, 3:56 AM
tomek added inline comments.
lib/types/validation.test.js
749–751 ↗(On Diff #26062)

Why do we have to use _findKey? Can't we just access the property of an object?

This revision is now accepted and ready to land.May 4 2023, 3:56 AM
ashoat added inline comments.May 4 2023, 5:40 AM
lib/types/validation.test.js
736–744 ↗(On Diff #26062)

Reminder to use constants

michal updated this revision to Diff 26068.May 4 2023, 7:08 AM

Use constants

lib/types/validation.test.js
749–751 ↗(On Diff #26062)

We want to get the update name from

export const updateTypes = Object.freeze({
  DELETE_ACCOUNT: 0,
  UPDATE_THREAD: 1,
  UPDATE_THREAD_READ_STATUS: 2,
  DELETE_THREAD: 3,
  JOIN_THREAD: 4,
  BAD_DEVICE_TOKEN: 5,
  UPDATE_ENTRY: 6,
  UPDATE_CURRENT_USER: 7,
  UPDATE_USER: 8,
});

while knowing only the numerical value from validatorByUpdateType.

Harbormaster completed remote builds in B19036: Diff 26068.May 4 2023, 7:26 AM
Closed by commit rCOMM512692827a6a: [lib] Introduce server update info validators (authored by Michal Gniadek <michal.gniadek@swmansion.com>). · Explain WhyMay 5 2023, 5:46 AM
This revision was automatically updated to reflect the committed changes.
Michal Gniadek <michal.gniadek@swmansion.com> added a commit: rCOMM512692827a6a: [lib] Introduce server update info validators.

Revision Contents
Changeset List

PathSize
lib/
types/
109 lines
1037 lines

Diff 26068

View Options

lib/types/update-types.js

// @flow // @flow
import type { Account as OlmAccount } from '@commapp/olm'; import type { Account as OlmAccount } from '@commapp/olm';
import { ServerError } from 'lib/utils/errors.js'; import { ServerError } from 'lib/utils/errors.js';
import sleep from 'lib/utils/sleep.js'; import sleep from 'lib/utils/sleep.js';
import { SQL, dbQuery } from '../database/database.js'; import { SQL, dbQuery } from '../database/database.js';
import { unpickleOlmAccount } from '../utils/olm-utils.js'; import { unpickleOlmAccount } from '../utils/olm-utils.js';
const maxOlmAccountUpdateRetriesCount = 5; const maxOlmAccountUpdateRetriesCount = 5;
const olmAccountUpdateRetryDelay = 200; const olmAccountUpdateRetryDelay = 200;
async function fetchCallUpdateOlmAccount<T>( async function fetchCallUpdateOlmAccount<T>(
olmAccountType: 'content' | 'notifications', olmAccountType: 'content' | 'notifications',
callback: (account: OlmAccount) => Promise<T>, callback: (account: OlmAccount, picklingKey: string) => Promise<T>,
): Promise<T> { ): Promise<T> {
const isContent = olmAccountType === 'content'; const isContent = olmAccountType === 'content';
let retriesLeft = maxOlmAccountUpdateRetriesCount; let retriesLeft = maxOlmAccountUpdateRetriesCount;
while (retriesLeft > 0) { while (retriesLeft > 0) {
const [olmAccountResult] = await dbQuery( const [olmAccountResult] = await dbQuery(
SQL` SQL`
SELECT version, pickling_key, pickled_olm_account SELECT version, pickling_key, pickled_olm_account
Show All 13 Lines const [
pickled_olm_account: pickledAccount, pickled_olm_account: pickledAccount,
}, },
] = olmAccountResult; ] = olmAccountResult;
const account = await unpickleOlmAccount({ const account = await unpickleOlmAccount({
picklingKey, picklingKey,
pickledAccount, pickledAccount,
}); });
const result = await callback(account); const result = await callback(account, picklingKey);
const updatedAccount = account.pickle(picklingKey); const updatedAccount = account.pickle(picklingKey);
const [transactionResult] = await dbQuery( const [transactionResult] = await dbQuery(
SQL` SQL`
START TRANSACTION; START TRANSACTION;
SELECT version INTO @currentVersion SELECT version INTO @currentVersion
FROM olm_accounts FROM olm_accounts
▲ Show 20 Lines • Show All 58 Lines • Show Last 20 Lines
View Options

lib/types/validation.test.js

// @flow // @flow
import type { Account as OlmAccount } from '@commapp/olm'; import type { Account as OlmAccount } from '@commapp/olm';
import { ServerError } from 'lib/utils/errors.js'; import { ServerError } from 'lib/utils/errors.js';
import sleep from 'lib/utils/sleep.js'; import sleep from 'lib/utils/sleep.js';
import { SQL, dbQuery } from '../database/database.js'; import { SQL, dbQuery } from '../database/database.js';
import { unpickleOlmAccount } from '../utils/olm-utils.js'; import { unpickleOlmAccount } from '../utils/olm-utils.js';
const maxOlmAccountUpdateRetriesCount = 5; const maxOlmAccountUpdateRetriesCount = 5;
const olmAccountUpdateRetryDelay = 200; const olmAccountUpdateRetryDelay = 200;
async function fetchCallUpdateOlmAccount<T>( async function fetchCallUpdateOlmAccount<T>(
olmAccountType: 'content' | 'notifications', olmAccountType: 'content' | 'notifications',
callback: (account: OlmAccount) => Promise<T>, callback: (account: OlmAccount, picklingKey: string) => Promise<T>,
): Promise<T> { ): Promise<T> {
const isContent = olmAccountType === 'content'; const isContent = olmAccountType === 'content';
let retriesLeft = maxOlmAccountUpdateRetriesCount; let retriesLeft = maxOlmAccountUpdateRetriesCount;
while (retriesLeft > 0) { while (retriesLeft > 0) {
const [olmAccountResult] = await dbQuery( const [olmAccountResult] = await dbQuery(
SQL` SQL`
SELECT version, pickling_key, pickled_olm_account SELECT version, pickling_key, pickled_olm_account
Show All 13 Lines const [
pickled_olm_account: pickledAccount, pickled_olm_account: pickledAccount,
}, },
] = olmAccountResult; ] = olmAccountResult;
const account = await unpickleOlmAccount({ const account = await unpickleOlmAccount({
picklingKey, picklingKey,
pickledAccount, pickledAccount,
}); });
const result = await callback(account); const result = await callback(account, picklingKey);
const updatedAccount = account.pickle(picklingKey); const updatedAccount = account.pickle(picklingKey);
const [transactionResult] = await dbQuery( const [transactionResult] = await dbQuery(
SQL` SQL`
START TRANSACTION; START TRANSACTION;
SELECT version INTO @currentVersion SELECT version INTO @currentVersion
FROM olm_accounts FROM olm_accounts
▲ Show 20 Lines • Show All 58 Lines • Show Last 20 Lines