Page MenuHomePhabricator
Differential D11042

[web] Import backup client
ClosedPublic
Actions

Authored by michal on Feb 12 2024, 7:21 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 23, 2:43 PM
Unknown Object (File)
Sun, Apr 20, 10:05 AM
Unknown Object (File)
Sat, Apr 19, 12:57 PM
Unknown Object (File)
Sat, Apr 19, 12:37 PM
Unknown Object (File)
Sat, Apr 19, 9:02 AM
Unknown Object (File)
Sat, Apr 19, 5:55 AM
Unknown Object (File)
Sat, Apr 19, 3:19 AM
Unknown Object (File)
Fri, Apr 18, 11:06 PM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
marcin
bartek
kamil
Commits
rCOMM43658727a042: [web] Import backup client
Summary

Actually use the WASM backup client introduced in the previous diff.

  • webpack/keyserver machinery for downloading the wasm file
  • updated the worker init message so that it also intialized the backup client

Depends on D11041

Test Plan

Test on both:

  • yarn dev in web and keyserver
  • yarn prod, yarn prod-build

Send the worker init message, tested that there were no errors, and the WASM was correctly downloaded.

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

michal created this revision.Feb 12 2024, 7:21 AM
Herald added subscribers: tomek, ashoat. · View Herald TranscriptFeb 12 2024, 7:21 AM
Harbormaster returned this revision to the author for changes because remote builds failed.Feb 12 2024, 7:26 AM
Harbormaster failed remote builds in B26762: Diff 37001!
michal added a child revision: D11043: [web] Restore compaction.Feb 12 2024, 7:27 AM
michal updated this revision to Diff 37024.Feb 13 2024, 2:56 AM

Update keyserver dockerfile

Harbormaster returned this revision to the author for changes because remote builds failed.Feb 13 2024, 3:33 AM
Harbormaster failed remote builds in B26784: Diff 37024!
michal updated this revision to Diff 37071.Feb 14 2024, 5:29 AM

Rebase

Harbormaster completed remote builds in B26828: Diff 37071.Feb 14 2024, 5:44 AM
michal requested review of this revision.Feb 14 2024, 5:44 AM
ashoat mentioned this in D11041: [backup-client] Compile to wasm.Feb 14 2024, 10:56 AM
ashoat added inline comments.
web/package.json
46 ↗(On Diff #37071)

In the case of the opaque-ke-wasm, we appear to be using a published package. Can you explain why you chose to take a different approach here? (It looks comm_query_executor.wasm also doesn't use a separate NPM package – worth discussing that in your response as well.)

michal updated this revision to Diff 37263.Feb 15 2024, 7:30 AM

Rebase

Harbormaster failed remote builds in B26926: Diff 37263!Feb 15 2024, 7:31 AM
michal added inline comments.Feb 15 2024, 7:32 AM
web/package.json
46 ↗(On Diff #37071)

Modified the code, so there is no separate package and the approach is closer to comm_query_executor.wasm.

More detailed response about the chosen approach in the previous diff.

kamil requested changes to this revision.Feb 16 2024, 7:47 AM
kamil added inline comments.
keyserver/Dockerfile
129 ↗(On Diff #37263)

I don't think we need this?

web/database/worker/db-worker.js
108 ↗(On Diff #37263)

I think we should rename it

115 ↗(On Diff #37263)

do we need localhost? I think this issue is related to the comment below with propper directory in webpack config

171 ↗(On Diff #37263)

I think just undefined is enough without this hack - but maybe flow will complain

172 ↗(On Diff #37263)
web/types/worker-types.js
37 ↗(On Diff #37263)

perhaps we should make it more generic now?

web/webpack.config.cjs
159 ↗(On Diff #37263)

Could you make sure it works on dev?

This revision now requires changes to proceed.Feb 16 2024, 7:47 AM
michal updated this revision to Diff 37333.Feb 19 2024, 9:40 AM

Fix the webpack issue and the urls pointing to the wasm file. Renamed databaseModuleFilePath. Removed unnecessary code in the dockerfile.

Harbormaster completed remote builds in B26974: Diff 37333.Feb 19 2024, 9:56 AM
kamil accepted this revision.Feb 21 2024, 4:49 AM
kamil added inline comments.
web/database/worker/db-worker.js
112 ↗(On Diff #37333)

isn't this enough?

166–173 ↗(On Diff #37333)

nit

174 ↗(On Diff #37333)

because this field is typed backupClientFilename?: ?string not backupClientFilename: undefined | string I think the suggested condition is better but maybe I am missing something

This revision is now accepted and ready to land.Feb 21 2024, 4:49 AM
michal updated this revision to Diff 37439.Feb 22 2024, 6:16 AM

Simplify

web/database/worker/db-worker.js
174 ↗(On Diff #37333)

null is a valid value for `backupClientFilename on dev. In this case we also want to init the backup client (with the default value).

Harbormaster completed remote builds in B27061: Diff 37439.Feb 22 2024, 6:32 AM
Closed by commit rCOMM43658727a042: [web] Import backup client (authored by Michal Gniadek <michal.gniadek@swmansion.com>). · Explain WhyMar 6 2024, 6:11 AM
This revision was automatically updated to reflect the committed changes.
Michal Gniadek <michal.gniadek@swmansion.com> added a commit: rCOMM43658727a042: [web] Import backup client.

Revision Contents
Changeset List

PathSize
keyserver/
src/
responders/
5 lines
web/
database/
5 lines
6 lines
utils/
1 line
worker/
40 lines
types/
3 lines
21 lines

Diff 37439

View Options

keyserver/src/responders/website-responders.js

//@flow //@flow
import * as React from 'react'; import * as React from 'react';
import { import {
getOlmSessionInitializationData, getOlmSessionInitializationData,
getOlmSessionInitializationDataActionTypes, getOlmSessionInitializationDataActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import type { OLMIdentityKeys, OLMOneTimeKeys } from '../types/crypto-types'; import type {
OLMIdentityKeys,
OLMOneTimeKeys,
OLMPrekey,
} from '../types/crypto-types';
import type { OlmSessionInitializationInfo } from '../types/request-types'; import type { OlmSessionInitializationInfo } from '../types/request-types';
import { import {
useServerCall, useServerCall,
useDispatchActionPromise, useDispatchActionPromise,
} from '../utils/action-utils.js'; } from '../utils/action-utils.js';
import type { import type {
CallServerEndpointOptions, CallServerEndpointOptions,
CallServerEndpoint, CallServerEndpoint,
} from '../utils/call-server-endpoint.js'; } from '../utils/call-server-endpoint.js';
import { values } from '../utils/objects.js'; import { values } from '../utils/objects.js';
export type InitialNotifMessageOptions = { export type InitialNotifMessageOptions = {
+callServerEndpoint?: ?CallServerEndpoint, +callServerEndpoint?: ?CallServerEndpoint,
+callServerEndpointOptions?: ?CallServerEndpointOptions, +callServerEndpointOptions?: ?CallServerEndpointOptions,
}; };
const initialEncryptedMessageContent = {
type: 'init',
};
function useInitialNotificationsEncryptedMessage( function useInitialNotificationsEncryptedMessage(
platformSpecificSessionCreator: ( platformSpecificSessionCreator: (
notificationsIdentityKeys: OLMIdentityKeys, notificationsIdentityKeys: OLMIdentityKeys,
notificationsInitializationInfo: OlmSessionInitializationInfo, notificationsInitializationInfo: OlmSessionInitializationInfo,
) => Promise<string>, ) => Promise<string>,
): (options?: ?InitialNotifMessageOptions) => Promise<string> { ): (options?: ?InitialNotifMessageOptions) => Promise<string> {
const callGetOlmSessionInitializationData = useServerCall( const callGetOlmSessionInitializationData = useServerCall(
getOlmSessionInitializationData, getOlmSessionInitializationData,
Show All 36 Lines
} }
function getOneTimeKeyValues( function getOneTimeKeyValues(
oneTimeKeys: OLMOneTimeKeys, oneTimeKeys: OLMOneTimeKeys,
): $ReadOnlyArray<string> { ): $ReadOnlyArray<string> {
return values(oneTimeKeys.curve25519); return values(oneTimeKeys.curve25519);
} }
function getPrekeyValue(prekey: OLMPrekey): string {
const [prekeyValue] = values(prekey.curve25519);
return prekeyValue;
}
function getOneTimeKeyValuesFromBlob(keyBlob: string): $ReadOnlyArray<string> { function getOneTimeKeyValuesFromBlob(keyBlob: string): $ReadOnlyArray<string> {
const oneTimeKeys: OLMOneTimeKeys = JSON.parse(keyBlob); const oneTimeKeys: OLMOneTimeKeys = JSON.parse(keyBlob);
return getOneTimeKeyValues(oneTimeKeys); return getOneTimeKeyValues(oneTimeKeys);
} }
function getPrekeyValueFromBlob(prekeyBlob: string): string {
const prekey: OLMPrekey = JSON.parse(prekeyBlob);
return getPrekeyValue(prekey);
}
export { export {
getOneTimeKeyValues, getOneTimeKeyValues,
getPrekeyValue,
getOneTimeKeyValuesFromBlob, getOneTimeKeyValuesFromBlob,
getPrekeyValueFromBlob,
initialEncryptedMessageContent,
useInitialNotificationsEncryptedMessage, useInitialNotificationsEncryptedMessage,
}; };
View Options

web/database/database-module-provider.js

//@flow //@flow
import * as React from 'react'; import * as React from 'react';
import { import {
getOlmSessionInitializationData, getOlmSessionInitializationData,
getOlmSessionInitializationDataActionTypes, getOlmSessionInitializationDataActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import type { OLMIdentityKeys, OLMOneTimeKeys } from '../types/crypto-types'; import type {
OLMIdentityKeys,
OLMOneTimeKeys,
OLMPrekey,
} from '../types/crypto-types';
import type { OlmSessionInitializationInfo } from '../types/request-types'; import type { OlmSessionInitializationInfo } from '../types/request-types';
import { import {
useServerCall, useServerCall,
useDispatchActionPromise, useDispatchActionPromise,
} from '../utils/action-utils.js'; } from '../utils/action-utils.js';
import type { import type {
CallServerEndpointOptions, CallServerEndpointOptions,
CallServerEndpoint, CallServerEndpoint,
} from '../utils/call-server-endpoint.js'; } from '../utils/call-server-endpoint.js';
import { values } from '../utils/objects.js'; import { values } from '../utils/objects.js';
export type InitialNotifMessageOptions = { export type InitialNotifMessageOptions = {
+callServerEndpoint?: ?CallServerEndpoint, +callServerEndpoint?: ?CallServerEndpoint,
+callServerEndpointOptions?: ?CallServerEndpointOptions, +callServerEndpointOptions?: ?CallServerEndpointOptions,
}; };
const initialEncryptedMessageContent = {
type: 'init',
};
function useInitialNotificationsEncryptedMessage( function useInitialNotificationsEncryptedMessage(
platformSpecificSessionCreator: ( platformSpecificSessionCreator: (
notificationsIdentityKeys: OLMIdentityKeys, notificationsIdentityKeys: OLMIdentityKeys,
notificationsInitializationInfo: OlmSessionInitializationInfo, notificationsInitializationInfo: OlmSessionInitializationInfo,
) => Promise<string>, ) => Promise<string>,
): (options?: ?InitialNotifMessageOptions) => Promise<string> { ): (options?: ?InitialNotifMessageOptions) => Promise<string> {
const callGetOlmSessionInitializationData = useServerCall( const callGetOlmSessionInitializationData = useServerCall(
getOlmSessionInitializationData, getOlmSessionInitializationData,
Show All 36 Lines
} }
function getOneTimeKeyValues( function getOneTimeKeyValues(
oneTimeKeys: OLMOneTimeKeys, oneTimeKeys: OLMOneTimeKeys,
): $ReadOnlyArray<string> { ): $ReadOnlyArray<string> {
return values(oneTimeKeys.curve25519); return values(oneTimeKeys.curve25519);
} }
function getPrekeyValue(prekey: OLMPrekey): string {
const [prekeyValue] = values(prekey.curve25519);
return prekeyValue;
}
function getOneTimeKeyValuesFromBlob(keyBlob: string): $ReadOnlyArray<string> { function getOneTimeKeyValuesFromBlob(keyBlob: string): $ReadOnlyArray<string> {
const oneTimeKeys: OLMOneTimeKeys = JSON.parse(keyBlob); const oneTimeKeys: OLMOneTimeKeys = JSON.parse(keyBlob);
return getOneTimeKeyValues(oneTimeKeys); return getOneTimeKeyValues(oneTimeKeys);
} }
function getPrekeyValueFromBlob(prekeyBlob: string): string {
const prekey: OLMPrekey = JSON.parse(prekeyBlob);
return getPrekeyValue(prekey);
}
export { export {
getOneTimeKeyValues, getOneTimeKeyValues,
getPrekeyValue,
getOneTimeKeyValuesFromBlob, getOneTimeKeyValuesFromBlob,
getPrekeyValueFromBlob,
initialEncryptedMessageContent,
useInitialNotificationsEncryptedMessage, useInitialNotificationsEncryptedMessage,
}; };
View Options

web/database/db-module.js

//@flow //@flow
import * as React from 'react'; import * as React from 'react';
import { import {
getOlmSessionInitializationData, getOlmSessionInitializationData,
getOlmSessionInitializationDataActionTypes, getOlmSessionInitializationDataActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import type { OLMIdentityKeys, OLMOneTimeKeys } from '../types/crypto-types'; import type {
OLMIdentityKeys,
OLMOneTimeKeys,
OLMPrekey,
} from '../types/crypto-types';
import type { OlmSessionInitializationInfo } from '../types/request-types'; import type { OlmSessionInitializationInfo } from '../types/request-types';
import { import {
useServerCall, useServerCall,
useDispatchActionPromise, useDispatchActionPromise,
} from '../utils/action-utils.js'; } from '../utils/action-utils.js';
import type { import type {
CallServerEndpointOptions, CallServerEndpointOptions,
CallServerEndpoint, CallServerEndpoint,
} from '../utils/call-server-endpoint.js'; } from '../utils/call-server-endpoint.js';
import { values } from '../utils/objects.js'; import { values } from '../utils/objects.js';
export type InitialNotifMessageOptions = { export type InitialNotifMessageOptions = {
+callServerEndpoint?: ?CallServerEndpoint, +callServerEndpoint?: ?CallServerEndpoint,
+callServerEndpointOptions?: ?CallServerEndpointOptions, +callServerEndpointOptions?: ?CallServerEndpointOptions,
}; };
const initialEncryptedMessageContent = {
type: 'init',
};
function useInitialNotificationsEncryptedMessage( function useInitialNotificationsEncryptedMessage(
platformSpecificSessionCreator: ( platformSpecificSessionCreator: (
notificationsIdentityKeys: OLMIdentityKeys, notificationsIdentityKeys: OLMIdentityKeys,
notificationsInitializationInfo: OlmSessionInitializationInfo, notificationsInitializationInfo: OlmSessionInitializationInfo,
) => Promise<string>, ) => Promise<string>,
): (options?: ?InitialNotifMessageOptions) => Promise<string> { ): (options?: ?InitialNotifMessageOptions) => Promise<string> {
const callGetOlmSessionInitializationData = useServerCall( const callGetOlmSessionInitializationData = useServerCall(
getOlmSessionInitializationData, getOlmSessionInitializationData,
Show All 36 Lines
} }
function getOneTimeKeyValues( function getOneTimeKeyValues(
oneTimeKeys: OLMOneTimeKeys, oneTimeKeys: OLMOneTimeKeys,
): $ReadOnlyArray<string> { ): $ReadOnlyArray<string> {
return values(oneTimeKeys.curve25519); return values(oneTimeKeys.curve25519);
} }
function getPrekeyValue(prekey: OLMPrekey): string {
const [prekeyValue] = values(prekey.curve25519);
return prekeyValue;
}
function getOneTimeKeyValuesFromBlob(keyBlob: string): $ReadOnlyArray<string> { function getOneTimeKeyValuesFromBlob(keyBlob: string): $ReadOnlyArray<string> {
const oneTimeKeys: OLMOneTimeKeys = JSON.parse(keyBlob); const oneTimeKeys: OLMOneTimeKeys = JSON.parse(keyBlob);
return getOneTimeKeyValues(oneTimeKeys); return getOneTimeKeyValues(oneTimeKeys);
} }
function getPrekeyValueFromBlob(prekeyBlob: string): string {
const prekey: OLMPrekey = JSON.parse(prekeyBlob);
return getPrekeyValue(prekey);
}
export { export {
getOneTimeKeyValues, getOneTimeKeyValues,
getPrekeyValue,
getOneTimeKeyValuesFromBlob, getOneTimeKeyValuesFromBlob,
getPrekeyValueFromBlob,
initialEncryptedMessageContent,
useInitialNotificationsEncryptedMessage, useInitialNotificationsEncryptedMessage,
}; };
View Options

web/database/utils/constants.js

//@flow //@flow
import * as React from 'react'; import * as React from 'react';
import { import {
getOlmSessionInitializationData, getOlmSessionInitializationData,
getOlmSessionInitializationDataActionTypes, getOlmSessionInitializationDataActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import type { OLMIdentityKeys, OLMOneTimeKeys } from '../types/crypto-types'; import type {
OLMIdentityKeys,
OLMOneTimeKeys,
OLMPrekey,
} from '../types/crypto-types';
import type { OlmSessionInitializationInfo } from '../types/request-types'; import type { OlmSessionInitializationInfo } from '../types/request-types';
import { import {
useServerCall, useServerCall,
useDispatchActionPromise, useDispatchActionPromise,
} from '../utils/action-utils.js'; } from '../utils/action-utils.js';
import type { import type {
CallServerEndpointOptions, CallServerEndpointOptions,
CallServerEndpoint, CallServerEndpoint,
} from '../utils/call-server-endpoint.js'; } from '../utils/call-server-endpoint.js';
import { values } from '../utils/objects.js'; import { values } from '../utils/objects.js';
export type InitialNotifMessageOptions = { export type InitialNotifMessageOptions = {
+callServerEndpoint?: ?CallServerEndpoint, +callServerEndpoint?: ?CallServerEndpoint,
+callServerEndpointOptions?: ?CallServerEndpointOptions, +callServerEndpointOptions?: ?CallServerEndpointOptions,
}; };
const initialEncryptedMessageContent = {
type: 'init',
};
function useInitialNotificationsEncryptedMessage( function useInitialNotificationsEncryptedMessage(
platformSpecificSessionCreator: ( platformSpecificSessionCreator: (
notificationsIdentityKeys: OLMIdentityKeys, notificationsIdentityKeys: OLMIdentityKeys,
notificationsInitializationInfo: OlmSessionInitializationInfo, notificationsInitializationInfo: OlmSessionInitializationInfo,
) => Promise<string>, ) => Promise<string>,
): (options?: ?InitialNotifMessageOptions) => Promise<string> { ): (options?: ?InitialNotifMessageOptions) => Promise<string> {
const callGetOlmSessionInitializationData = useServerCall( const callGetOlmSessionInitializationData = useServerCall(
getOlmSessionInitializationData, getOlmSessionInitializationData,
Show All 36 Lines
} }
function getOneTimeKeyValues( function getOneTimeKeyValues(
oneTimeKeys: OLMOneTimeKeys, oneTimeKeys: OLMOneTimeKeys,
): $ReadOnlyArray<string> { ): $ReadOnlyArray<string> {
return values(oneTimeKeys.curve25519); return values(oneTimeKeys.curve25519);
} }
function getPrekeyValue(prekey: OLMPrekey): string {
const [prekeyValue] = values(prekey.curve25519);
return prekeyValue;
}
function getOneTimeKeyValuesFromBlob(keyBlob: string): $ReadOnlyArray<string> { function getOneTimeKeyValuesFromBlob(keyBlob: string): $ReadOnlyArray<string> {
const oneTimeKeys: OLMOneTimeKeys = JSON.parse(keyBlob); const oneTimeKeys: OLMOneTimeKeys = JSON.parse(keyBlob);
return getOneTimeKeyValues(oneTimeKeys); return getOneTimeKeyValues(oneTimeKeys);
} }
function getPrekeyValueFromBlob(prekeyBlob: string): string {
const prekey: OLMPrekey = JSON.parse(prekeyBlob);
return getPrekeyValue(prekey);
}
export { export {
getOneTimeKeyValues, getOneTimeKeyValues,
getPrekeyValue,
getOneTimeKeyValuesFromBlob, getOneTimeKeyValuesFromBlob,
getPrekeyValueFromBlob,
initialEncryptedMessageContent,
useInitialNotificationsEncryptedMessage, useInitialNotificationsEncryptedMessage,
}; };
View Options

web/database/worker/db-worker.js

Loading...
View Options

web/types/worker-types.js

Loading...
View Options

web/webpack.config.cjs

Loading...