Page MenuHomePhabricator
Differential D11883

[lib][native] Unshim FARCASTER_MUTUAL messages on the client
ClosedPublic
Actions

Authored by ashoat on May 5 2024, 12:20 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 16, 1:02 PM
Unknown Object (File)
Wed, Apr 16, 10:25 AM
Unknown Object (File)
Wed, Apr 16, 12:55 AM
Unknown Object (File)
Tue, Apr 15, 8:10 AM
Unknown Object (File)
Feb 20 2025, 8:24 PM
Unknown Object (File)
Feb 20 2025, 8:24 PM
Unknown Object (File)
Feb 20 2025, 8:24 PM
Unknown Object (File)
Feb 20 2025, 8:24 PM
View All 68 Files
Subscribers
tomek

Details

Reviewers
ginsu
atul
Commits
rCOMMa4d35ff3939a: [lib][native] Unshim FARCASTER_MUTUAL messages on the client
Summary

This addresses ENG-7991 and ENG-7992.

Depends on D11871

Test Plan

Tested sending a shimmed message to a client (both native and web) and confirmed it was unshimmed

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

ashoat created this revision.May 5 2024, 12:20 PM
Herald added a subscriber: tomek. · View Herald TranscriptMay 5 2024, 12:20 PM
ashoat added a reviewer: atul.May 5 2024, 12:20 PM
ashoat added a child revision: D11884: [web] Factor out handleReduxMigrationFailure.May 5 2024, 12:23 PM
ashoat added inline comments.May 5 2024, 12:35 PM
lib/shared/messages/update-relationship-message-spec.js
277 ↗(On Diff #39792)

I don't think we need majorDesktop here at all... desktop version doesn't matter for gating these messages

ashoat edited the summary of this revision. (Show Details)May 5 2024, 12:36 PM
Harbormaster completed remote builds in B28666: Diff 39792.May 5 2024, 12:57 PM
ashoat requested review of this revision.May 5 2024, 12:57 PM
ginsu accepted this revision.May 5 2024, 4:36 PM
This revision is now accepted and ready to land.May 5 2024, 4:36 PM
Closed by commit rCOMMa4d35ff3939a: [lib][native] Unshim FARCASTER_MUTUAL messages on the client (authored by ashoat). · Explain WhyMay 7 2024, 7:48 PM
This revision was automatically updated to reflect the committed changes.
ashoat added a commit: rCOMMa4d35ff3939a: [lib][native] Unshim FARCASTER_MUTUAL messages on the client.

Revision Contents
Changeset List

PathSize
lib/
shared/
messages/
9 lines
1 line
native/
redux/
4 lines

Diff 39904

View Options

lib/shared/messages/update-relationship-message-spec.js

Show All 25 Lines
import type { ClientDBMessageInfo } from 'lib/types/message-types.js'; import type { ClientDBMessageInfo } from 'lib/types/message-types.js';
import { cookieTypes } from 'lib/types/session-types.js'; import { cookieTypes } from 'lib/types/session-types.js';
import { defaultConnectionInfo } from 'lib/types/socket-types.js'; import { defaultConnectionInfo } from 'lib/types/socket-types.js';
import { defaultGlobalThemeInfo } from 'lib/types/theme-types.js'; import { defaultGlobalThemeInfo } from 'lib/types/theme-types.js';
import type { ClientDBThreadInfo } from 'lib/types/thread-types.js'; import type { ClientDBThreadInfo } from 'lib/types/thread-types.js';
import { getConfig } from 'lib/utils/config.js'; import { getConfig } from 'lib/utils/config.js';
import { parseCookies } from 'lib/utils/cookie-utils.js'; import { parseCookies } from 'lib/utils/cookie-utils.js';
import { isDev } from 'lib/utils/dev-utils.js'; import { isDev } from 'lib/utils/dev-utils.js';
import { wipeKeyserverStore } from 'lib/utils/keyserver-store-utils.js';
import { import {
generateIDSchemaMigrationOpsForDrafts, generateIDSchemaMigrationOpsForDrafts,
convertDraftStoreToNewIDSchema, convertDraftStoreToNewIDSchema,
} from 'lib/utils/migration-utils.js'; } from 'lib/utils/migration-utils.js';
import { entries } from 'lib/utils/objects.js'; import { entries } from 'lib/utils/objects.js';
import { resetUserSpecificState } from 'lib/utils/reducers-utils.js';
import { import {
convertClientDBThreadInfoToRawThreadInfo, convertClientDBThreadInfoToRawThreadInfo,
convertRawThreadInfoToClientDBThreadInfo, convertRawThreadInfoToClientDBThreadInfo,
} from 'lib/utils/thread-ops-utils.js'; } from 'lib/utils/thread-ops-utils.js';
import commReduxStorageEngine from './comm-redux-storage-engine.js'; import commReduxStorageEngine from './comm-redux-storage-engine.js';
import { defaultWebState } from './default-state.js'; import {
handleReduxMigrationFailure,
persistWhitelist,
} from './handle-redux-migration-failure.js';
import { rootKey, rootKeyPrefix } from './persist-constants.js'; import { rootKey, rootKeyPrefix } from './persist-constants.js';
import type { AppState } from './redux-setup.js'; import type { AppState } from './redux-setup.js';
import { nonUserSpecificFieldsWeb } from './redux-setup.js';
import { authoritativeKeyserverID } from '../authoritative-keyserver.js'; import { authoritativeKeyserverID } from '../authoritative-keyserver.js';
import { getCommSharedWorker } from '../shared-worker/shared-worker-provider.js'; import { getCommSharedWorker } from '../shared-worker/shared-worker-provider.js';
import { getOlmWasmPath } from '../shared-worker/utils/constants.js'; import { getOlmWasmPath } from '../shared-worker/utils/constants.js';
import { isSQLiteSupported } from '../shared-worker/utils/db-utils.js'; import { isSQLiteSupported } from '../shared-worker/utils/db-utils.js';
import { workerRequestMessageTypes } from '../types/worker-types.js'; import { workerRequestMessageTypes } from '../types/worker-types.js';
declare var keyserverURL: string; declare var keyserverURL: string;
const persistWhitelist = [
'enabledApps',
'alertStore',
'commServicesAccessToken',
'keyserverStore',
'globalThemeInfo',
'customServer',
'messageStore',
];
function handleReduxMigrationFailure(oldState: AppState): AppState {
const persistedNonUserSpecificFields = nonUserSpecificFieldsWeb.filter(
field => persistWhitelist.includes(field) || field === '_persist',
);
const stateAfterReset = resetUserSpecificState(
oldState,
defaultWebState,
persistedNonUserSpecificFields,
);
return {
...stateAfterReset,
keyserverStore: wipeKeyserverStore(stateAfterReset.keyserverStore),
};
}
const migrations = { const migrations = {
[1]: async (state: any) => { [1]: async (state: any) => {
const { const {
primaryIdentityPublicKey, primaryIdentityPublicKey,
...stateWithoutPrimaryIdentityPublicKey ...stateWithoutPrimaryIdentityPublicKey
} = state; } = state;
return { return {
...stateWithoutPrimaryIdentityPublicKey, ...stateWithoutPrimaryIdentityPublicKey,
▲ Show 20 Lines • Show All 453 Lines • Show Last 20 Lines
View Options

lib/shared/unshim-utils.js

Show All 25 Lines
import type { ClientDBMessageInfo } from 'lib/types/message-types.js'; import type { ClientDBMessageInfo } from 'lib/types/message-types.js';
import { cookieTypes } from 'lib/types/session-types.js'; import { cookieTypes } from 'lib/types/session-types.js';
import { defaultConnectionInfo } from 'lib/types/socket-types.js'; import { defaultConnectionInfo } from 'lib/types/socket-types.js';
import { defaultGlobalThemeInfo } from 'lib/types/theme-types.js'; import { defaultGlobalThemeInfo } from 'lib/types/theme-types.js';
import type { ClientDBThreadInfo } from 'lib/types/thread-types.js'; import type { ClientDBThreadInfo } from 'lib/types/thread-types.js';
import { getConfig } from 'lib/utils/config.js'; import { getConfig } from 'lib/utils/config.js';
import { parseCookies } from 'lib/utils/cookie-utils.js'; import { parseCookies } from 'lib/utils/cookie-utils.js';
import { isDev } from 'lib/utils/dev-utils.js'; import { isDev } from 'lib/utils/dev-utils.js';
import { wipeKeyserverStore } from 'lib/utils/keyserver-store-utils.js';
import { import {
generateIDSchemaMigrationOpsForDrafts, generateIDSchemaMigrationOpsForDrafts,
convertDraftStoreToNewIDSchema, convertDraftStoreToNewIDSchema,
} from 'lib/utils/migration-utils.js'; } from 'lib/utils/migration-utils.js';
import { entries } from 'lib/utils/objects.js'; import { entries } from 'lib/utils/objects.js';
import { resetUserSpecificState } from 'lib/utils/reducers-utils.js';
import { import {
convertClientDBThreadInfoToRawThreadInfo, convertClientDBThreadInfoToRawThreadInfo,
convertRawThreadInfoToClientDBThreadInfo, convertRawThreadInfoToClientDBThreadInfo,
} from 'lib/utils/thread-ops-utils.js'; } from 'lib/utils/thread-ops-utils.js';
import commReduxStorageEngine from './comm-redux-storage-engine.js'; import commReduxStorageEngine from './comm-redux-storage-engine.js';
import { defaultWebState } from './default-state.js'; import {
handleReduxMigrationFailure,
persistWhitelist,
} from './handle-redux-migration-failure.js';
import { rootKey, rootKeyPrefix } from './persist-constants.js'; import { rootKey, rootKeyPrefix } from './persist-constants.js';
import type { AppState } from './redux-setup.js'; import type { AppState } from './redux-setup.js';
import { nonUserSpecificFieldsWeb } from './redux-setup.js';
import { authoritativeKeyserverID } from '../authoritative-keyserver.js'; import { authoritativeKeyserverID } from '../authoritative-keyserver.js';
import { getCommSharedWorker } from '../shared-worker/shared-worker-provider.js'; import { getCommSharedWorker } from '../shared-worker/shared-worker-provider.js';
import { getOlmWasmPath } from '../shared-worker/utils/constants.js'; import { getOlmWasmPath } from '../shared-worker/utils/constants.js';
import { isSQLiteSupported } from '../shared-worker/utils/db-utils.js'; import { isSQLiteSupported } from '../shared-worker/utils/db-utils.js';
import { workerRequestMessageTypes } from '../types/worker-types.js'; import { workerRequestMessageTypes } from '../types/worker-types.js';
declare var keyserverURL: string; declare var keyserverURL: string;
const persistWhitelist = [
'enabledApps',
'alertStore',
'commServicesAccessToken',
'keyserverStore',
'globalThemeInfo',
'customServer',
'messageStore',
];
function handleReduxMigrationFailure(oldState: AppState): AppState {
const persistedNonUserSpecificFields = nonUserSpecificFieldsWeb.filter(
field => persistWhitelist.includes(field) || field === '_persist',
);
const stateAfterReset = resetUserSpecificState(
oldState,
defaultWebState,
persistedNonUserSpecificFields,
);
return {
...stateAfterReset,
keyserverStore: wipeKeyserverStore(stateAfterReset.keyserverStore),
};
}
const migrations = { const migrations = {
[1]: async (state: any) => { [1]: async (state: any) => {
const { const {
primaryIdentityPublicKey, primaryIdentityPublicKey,
...stateWithoutPrimaryIdentityPublicKey ...stateWithoutPrimaryIdentityPublicKey
} = state; } = state;
return { return {
...stateWithoutPrimaryIdentityPublicKey, ...stateWithoutPrimaryIdentityPublicKey,
▲ Show 20 Lines • Show All 453 Lines • Show Last 20 Lines
View Options

native/redux/persist.js

Show All 25 Lines
import type { ClientDBMessageInfo } from 'lib/types/message-types.js'; import type { ClientDBMessageInfo } from 'lib/types/message-types.js';
import { cookieTypes } from 'lib/types/session-types.js'; import { cookieTypes } from 'lib/types/session-types.js';
import { defaultConnectionInfo } from 'lib/types/socket-types.js'; import { defaultConnectionInfo } from 'lib/types/socket-types.js';
import { defaultGlobalThemeInfo } from 'lib/types/theme-types.js'; import { defaultGlobalThemeInfo } from 'lib/types/theme-types.js';
import type { ClientDBThreadInfo } from 'lib/types/thread-types.js'; import type { ClientDBThreadInfo } from 'lib/types/thread-types.js';
import { getConfig } from 'lib/utils/config.js'; import { getConfig } from 'lib/utils/config.js';
import { parseCookies } from 'lib/utils/cookie-utils.js'; import { parseCookies } from 'lib/utils/cookie-utils.js';
import { isDev } from 'lib/utils/dev-utils.js'; import { isDev } from 'lib/utils/dev-utils.js';
import { wipeKeyserverStore } from 'lib/utils/keyserver-store-utils.js';
import { import {
generateIDSchemaMigrationOpsForDrafts, generateIDSchemaMigrationOpsForDrafts,
convertDraftStoreToNewIDSchema, convertDraftStoreToNewIDSchema,
} from 'lib/utils/migration-utils.js'; } from 'lib/utils/migration-utils.js';
import { entries } from 'lib/utils/objects.js'; import { entries } from 'lib/utils/objects.js';
import { resetUserSpecificState } from 'lib/utils/reducers-utils.js';
import { import {
convertClientDBThreadInfoToRawThreadInfo, convertClientDBThreadInfoToRawThreadInfo,
convertRawThreadInfoToClientDBThreadInfo, convertRawThreadInfoToClientDBThreadInfo,
} from 'lib/utils/thread-ops-utils.js'; } from 'lib/utils/thread-ops-utils.js';
import commReduxStorageEngine from './comm-redux-storage-engine.js'; import commReduxStorageEngine from './comm-redux-storage-engine.js';
import { defaultWebState } from './default-state.js'; import {
handleReduxMigrationFailure,
persistWhitelist,
} from './handle-redux-migration-failure.js';
import { rootKey, rootKeyPrefix } from './persist-constants.js'; import { rootKey, rootKeyPrefix } from './persist-constants.js';
import type { AppState } from './redux-setup.js'; import type { AppState } from './redux-setup.js';
import { nonUserSpecificFieldsWeb } from './redux-setup.js';
import { authoritativeKeyserverID } from '../authoritative-keyserver.js'; import { authoritativeKeyserverID } from '../authoritative-keyserver.js';
import { getCommSharedWorker } from '../shared-worker/shared-worker-provider.js'; import { getCommSharedWorker } from '../shared-worker/shared-worker-provider.js';
import { getOlmWasmPath } from '../shared-worker/utils/constants.js'; import { getOlmWasmPath } from '../shared-worker/utils/constants.js';
import { isSQLiteSupported } from '../shared-worker/utils/db-utils.js'; import { isSQLiteSupported } from '../shared-worker/utils/db-utils.js';
import { workerRequestMessageTypes } from '../types/worker-types.js'; import { workerRequestMessageTypes } from '../types/worker-types.js';
declare var keyserverURL: string; declare var keyserverURL: string;
const persistWhitelist = [
'enabledApps',
'alertStore',
'commServicesAccessToken',
'keyserverStore',
'globalThemeInfo',
'customServer',
'messageStore',
];
function handleReduxMigrationFailure(oldState: AppState): AppState {
const persistedNonUserSpecificFields = nonUserSpecificFieldsWeb.filter(
field => persistWhitelist.includes(field) || field === '_persist',
);
const stateAfterReset = resetUserSpecificState(
oldState,
defaultWebState,
persistedNonUserSpecificFields,
);
return {
...stateAfterReset,
keyserverStore: wipeKeyserverStore(stateAfterReset.keyserverStore),
};
}
const migrations = { const migrations = {
[1]: async (state: any) => { [1]: async (state: any) => {
const { const {
primaryIdentityPublicKey, primaryIdentityPublicKey,
...stateWithoutPrimaryIdentityPublicKey ...stateWithoutPrimaryIdentityPublicKey
} = state; } = state;
return { return {
...stateWithoutPrimaryIdentityPublicKey, ...stateWithoutPrimaryIdentityPublicKey,
▲ Show 20 Lines • Show All 453 Lines • Show Last 20 Lines