Let's make sure we include @jonringer-comm on all CMake-related diffs going forward! Also removing @palys-swm from blocking since he is sick right now and has a huge backlog of reviews

• jon accepted this revision.Jul 14 2022, 3:23 PM

varun accepted this revision.Jul 15 2022, 8:28 AM

This revision is now accepted and ready to land.Jul 15 2022, 8:28 AM

Rebase on the stack changes.

• max edited the summary of this revision. (Show Details)Jul 15 2022, 10:46 AM

Harbormaster completed remote builds in B10557: Diff 14530.Jul 15 2022, 10:56 AM

Rebased on master.

Harbormaster completed remote builds in B10658: Diff 14672.Jul 20 2022, 3:18 AM

Closed by commit rCOMM682b9d38046b: [services] Tunnelbroker - Add Cargo manifest, headers and Rust linking to the… (authored by • max). · Explain WhyJul 20 2022, 3:28 AM

This revision was automatically updated to reflect the committed changes.

• max added a commit: rCOMM682b9d38046b: [services] Tunnelbroker - Add Cargo manifest, headers and Rust linking to the….

• max removed a child revision: D4540: [services] Tunnelbroker - Rust APNS push notifications A2 library wrapper.Jul 20 2022, 3:31 AM

Revision Contents
Changeset List

Path

Size

services/

tunnelbroker/

CMakeLists.txt

11 lines

Diff 14674

View Options

services/tunnelbroker/CMakeLists.txt

// @flow		// @flow

import AsyncStorage from '@react-native-async-storage/async-storage';		import AsyncStorage from '@react-native-async-storage/async-storage';
import invariant from 'invariant';		import invariant from 'invariant';
import { Platform } from 'react-native';		import { Platform } from 'react-native';
import Orientation from 'react-native-orientation-locker';		import Orientation from 'react-native-orientation-locker';
import { createMigrate, createTransform } from 'redux-persist';		import { createMigrate, createTransform } from 'redux-persist';
import type { Transform } from 'redux-persist/es/types.js';		import type { Transform } from 'redux-persist/es/types.js';

import { highestLocalIDSelector } from 'lib/selectors/local-id-selectors.js';		import { highestLocalIDSelector } from 'lib/selectors/local-id-selectors.js';
import { inconsistencyResponsesToReports } from 'lib/shared/report-utils.js';		import { inconsistencyResponsesToReports } from 'lib/shared/report-utils.js';
import {		import {
getContainingThreadID,		getContainingThreadID,
getCommunity,		getCommunity,
} from 'lib/shared/thread-utils.js';		} from 'lib/shared/thread-utils.js';
import {		import { DEPRECATED_unshimMessageStore } from 'lib/shared/unshim-utils.js';
DEPRECATED_unshimMessageStore,
unshimFunc,
} from 'lib/shared/unshim-utils.js';
import { defaultEnabledApps } from 'lib/types/enabled-apps.js';		import { defaultEnabledApps } from 'lib/types/enabled-apps.js';
import { defaultCalendarFilters } from 'lib/types/filter-types.js';		import { defaultCalendarFilters } from 'lib/types/filter-types.js';
import {		import {
type LocalMessageInfo,		type LocalMessageInfo,
type MessageStore,		type MessageStore,
messageTypes,		messageTypes,
type ClientDBMessageStoreOperation,		type ClientDBMessageStoreOperation,
type ClientDBMessageInfo,
} from 'lib/types/message-types.js';		} from 'lib/types/message-types.js';
import { defaultConnectionInfo } from 'lib/types/socket-types.js';		import { defaultConnectionInfo } from 'lib/types/socket-types.js';
import {		import { translateRawMessageInfoToClientDBMessageInfo } from 'lib/utils/message-ops-utils.js';
translateClientDBMessageInfoToRawMessageInfo,
translateRawMessageInfoToClientDBMessageInfo,
} from 'lib/utils/message-ops-utils.js';
import { defaultNotifPermissionAlertInfo } from 'lib/utils/push-alerts.js';		import { defaultNotifPermissionAlertInfo } from 'lib/utils/push-alerts.js';
import { convertThreadStoreOperationsToClientDBOperations } from 'lib/utils/thread-ops-utils.js';		import { convertThreadStoreOperationsToClientDBOperations } from 'lib/utils/thread-ops-utils.js';

import { migrateThreadStoreForEditThreadPermissions } from './edit-thread-permission-migration.js';		import { migrateThreadStoreForEditThreadPermissions } from './edit-thread-permission-migration.js';
import type { AppState } from './state-types.js';		import type { AppState } from './state-types.js';
		import { unshimClientDB } from './unshim-utils.js';
import { commCoreModule } from '../native-modules.js';		import { commCoreModule } from '../native-modules.js';
import { defaultDeviceCameraInfo } from '../types/camera.js';		import { defaultDeviceCameraInfo } from '../types/camera.js';
import { defaultGlobalThemeInfo } from '../types/themes.js';		import { defaultGlobalThemeInfo } from '../types/themes.js';
import { isTaskCancelledError } from '../utils/error-handling.js';		import { isTaskCancelledError } from '../utils/error-handling.js';

const migrations = {		const migrations = {
[1]: (state: AppState) => ({		[1]: (state: AppState) => ({
...state,		...state,
▲ Show 20 Lines • Show All 338 Lines • ▼ Show 20 Lines	try {
console.log(exception);		console.log(exception);
if (isTaskCancelledError(exception)) {		if (isTaskCancelledError(exception)) {
return state;		return state;
}		}
return { ...state, cookie: null };		return { ...state, cookie: null };
}		}
return state;		return state;
},		},
[32]: (state: AppState) => {		[32]: (state: AppState) => unshimClientDB(state, [messageTypes.MULTIMEDIA]),
// 1. Get messages from SQLite `messages` table.		[33]: (state: AppState) => unshimClientDB(state, [messageTypes.REACTION]),
const clientDBMessageInfos = commCoreModule.getAllMessagesSync();

// 2. Translate `ClientDBMessageInfo`s to `RawMessageInfo`s.
const rawMessageInfos = clientDBMessageInfos.map(
translateClientDBMessageInfoToRawMessageInfo,
);

// 3. "Unshim" translated `RawMessageInfo`s.
const unshimmedRawMessageInfos = rawMessageInfos.map(messageInfo =>
unshimFunc(messageInfo, new Set([messageTypes.MULTIMEDIA])),
);

// 4. Translate unshimmed `RawMessageInfo`s back to `ClientDBMessageInfo`s.
const unshimmedClientDBMessageInfos = unshimmedRawMessageInfos.map(
translateRawMessageInfoToClientDBMessageInfo,
);

// 5. Construct `ClientDBMessageStoreOperation`s to clear SQLite `messages`
// table and repopulate with unshimmed `ClientDBMessageInfo`s.
const operations: $ReadOnlyArray<ClientDBMessageStoreOperation> = [
{
type: 'remove_all',
},
...unshimmedClientDBMessageInfos.map((message: ClientDBMessageInfo) => ({
type: 'replace',
payload: message,
})),
];

// 6. Try processing `ClientDBMessageStoreOperation`s and log out if
// `processMessageStoreOperationsSync(...)` throws an exception.
try {
commCoreModule.processMessageStoreOperationsSync(operations);
} catch (exception) {
console.log(exception);
return { ...state, cookie: null };
}

return state;
},
[33]: (state: AppState) => {
// 1. Get messages from SQLite `messages` table.
const clientDBMessageInfos = commCoreModule.getAllMessagesSync();

// 2. Translate `ClientDBMessageInfo`s to `RawMessageInfo`s.
const rawMessageInfos = clientDBMessageInfos.map(
translateClientDBMessageInfoToRawMessageInfo,
);

// 3. "Unshim" translated `RawMessageInfo`s.
const unshimmedRawMessageInfos = rawMessageInfos.map(messageInfo =>
unshimFunc(messageInfo, new Set([messageTypes.REACTION])),
);

// 4. Translate unshimmed `RawMessageInfo`s back to `ClientDBMessageInfo`s.
const unshimmedClientDBMessageInfos = unshimmedRawMessageInfos.map(
translateRawMessageInfoToClientDBMessageInfo,
);

// 5. Construct `ClientDBMessageStoreOperation`s to clear SQLite `messages`
// table and repopulate with unshimmed `ClientDBMessageInfo`s.
const operations: $ReadOnlyArray<ClientDBMessageStoreOperation> = [
{
type: 'remove_all',
},
...unshimmedClientDBMessageInfos.map((message: ClientDBMessageInfo) => ({
type: 'replace',
payload: message,
})),
];

// 6. Try processing `ClientDBMessageStoreOperation`s and log out if
// `processMessageStoreOperationsSync(...)` throws an exception.
try {
commCoreModule.processMessageStoreOperationsSync(operations);
} catch (exception) {
console.log(exception);
return { ...state, cookie: null };
}

return state;
},
[34]: state => {		[34]: state => {
const { threadIDsToNotifIDs, ...stateSansThreadIDsToNotifIDs } = state;		const { threadIDsToNotifIDs, ...stateSansThreadIDsToNotifIDs } = state;
return stateSansThreadIDsToNotifIDs;		return stateSansThreadIDsToNotifIDs;
},		},
};		};

// After migration 31, we'll no longer want to persist `messageStore.messages`		// After migration 31, we'll no longer want to persist `messageStore.messages`
// via redux-persist. However, we DO want to continue persisting everything in		// via redux-persist. However, we DO want to continue persisting everything in
▲ Show 20 Lines • Show All 97 Lines • Show Last 20 Lines

[services] Tunnelbroker - Add Cargo manifest, headers and Rust linking to the CMakeListsClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 14674

services/tunnelbroker/CMakeLists.txt

[services] Tunnelbroker - Add Cargo manifest, headers and Rust linking to the CMakeLists
ClosedPublic
Actions

Revision Contents
Changeset List