Page MenuHomePhabricator
Files F3514751

D12014.id40109.diff
No OneTemporary
Actions

D12014.id40109.diff
View Options

diff --git a/lib/shared/create-async-migrate.js b/lib/shared/create-async-migrate.js
deleted file mode 100644
--- a/lib/shared/create-async-migrate.js
+++ /dev/null
@@ -1,121 +0,0 @@
-// @flow
-
-import { DEFAULT_VERSION } from 'redux-persist/es/constants.js';
-import type { PersistState } from 'redux-persist/es/types.js';
-
-import type { StoreOperations } from '../types/store-ops-types.js';
-import { syncedMetadataNames } from '../types/synced-metadata-types.js';
-import { getConfig } from '../utils/config.js';
-
-type LegacyMigrationManifest = {
- +[number | string]: (PersistedState) => Promise<PersistedState>,
-};
-type PersistedState = {
- +_persist: PersistState,
- ...
-} | void;
-type ConfigType = {
- +debug: boolean,
-};
-
-export type StorageMigrationFunction = (
- debug: boolean,
-) => Promise<?PersistedState>;
-
-type MigrationManifest = {
- +[number | string]: (PersistedState) => Promise<{
- +state: PersistedState,
- +ops: StoreOperations,
- }>,
-};
-
-function createAsyncMigrate(
- legacyMigrations: LegacyMigrationManifest,
- config: ConfigType,
- migrations: MigrationManifest,
- storageMigration: ?StorageMigrationFunction,
-): (state: PersistedState, currentVersion: number) => Promise<PersistedState> {
- const debug = process.env.NODE_ENV !== 'production' && !!config?.debug;
- return async function (
- state: ?PersistedState,
- currentVersion: number,
- ): Promise<PersistedState> {
- if (!state && storageMigration) {
- state = await storageMigration(debug);
- }
- if (!state) {
- if (debug) {
- console.log('redux-persist: no inbound state, skipping migration');
- }
- return undefined;
- }
-
- const inboundVersion: number = state?._persist?.version ?? DEFAULT_VERSION;
-
- if (inboundVersion === currentVersion) {
- if (debug) {
- console.log('redux-persist: versions match, noop migration');
- }
- return state;
- }
- if (inboundVersion > currentVersion) {
- if (debug) {
- console.error('redux-persist: downgrading version is not supported');
- }
- return state;
- }
-
- const migrationKeys = [
- ...Object.keys(legacyMigrations),
- ...Object.keys(migrations),
- ]
- .map(ver => parseInt(ver))
- .filter(key => currentVersion >= key && key > inboundVersion);
- const sortedMigrationKeys = migrationKeys.sort((a, b) => a - b);
-
- if (debug) {
- console.log('redux-persist: migrationKeys', sortedMigrationKeys);
- }
-
- let migratedState: PersistedState = state;
- for (const versionKey of sortedMigrationKeys) {
- if (debug) {
- console.log(
- 'redux-persist: running migration for versionKey',
- versionKey,
- );
- }
-
- if (!versionKey) {
- continue;
- }
-
- if (legacyMigrations[versionKey]) {
- migratedState = await legacyMigrations[versionKey](migratedState);
- } else {
- const { state: newState, ops } =
- await migrations[versionKey](migratedState);
- migratedState = newState;
- const versionUpdateOp = {
- type: 'replace_synced_metadata_entry',
- payload: {
- name: syncedMetadataNames.DB_VERSION,
- data: `${versionKey}`,
- },
- };
- const dbOps = {
- ...ops,
- syncedMetadataStoreOperations: [
- ...(ops.syncedMetadataStoreOperations ?? []),
- versionUpdateOp,
- ],
- };
- await getConfig().sqliteAPI.processDBStoreOperations(dbOps);
- }
- }
-
- return migratedState;
- };
-}
-
-export { createAsyncMigrate };
diff --git a/lib/utils/migration-utils.js b/lib/utils/migration-utils.js
--- a/lib/utils/migration-utils.js
+++ b/lib/utils/migration-utils.js
@@ -1,8 +1,10 @@
// @flow
import invariant from 'invariant';
+import type { PersistState } from 'redux-persist/es/types.js';
import { authoritativeKeyserverID } from './authoritative-keyserver.js';
+import { getConfig } from './config.js';
import type { TranslatedThreadMessageInfos } from './message-ops-utils.js';
import { entries } from './objects.js';
import {
@@ -20,6 +22,8 @@
DraftStore,
} from '../types/draft-types';
import type { RawMessageInfo } from '../types/message-types.js';
+import type { StoreOperations } from '../types/store-ops-types.js';
+import { syncedMetadataNames } from '../types/synced-metadata-types.js';
import {
threadPermissions,
threadPermissionPropagationPrefixes,
@@ -187,6 +191,115 @@
threadPermissions.MANAGE_INVITE_LINKS,
];
+type LegacyMigrationManifest = {
+ +[number | string]: (PersistedState) => Promise<PersistedState>,
+};
+type PersistedState = {
+ +_persist: PersistState,
+ ...
+} | void;
+type ConfigType = {
+ +debug: boolean,
+};
+export type StorageMigrationFunction = (
+ debug: boolean,
+) => Promise<?PersistedState>;
+type MigrationManifest = {
+ +[number | string]: (PersistedState) => Promise<{
+ +state: PersistedState,
+ +ops: StoreOperations,
+ }>,
+};
+
+function createAsyncMigrate(
+ legacyMigrations: LegacyMigrationManifest,
+ config: ConfigType,
+ migrations: MigrationManifest,
+ storageMigration: ?StorageMigrationFunction,
+): (state: PersistedState, currentVersion: number) => Promise<PersistedState> {
+ const debug = process.env.NODE_ENV !== 'production' && !!config?.debug;
+ return async function (
+ state: ?PersistedState,
+ currentVersion: number,
+ ): Promise<PersistedState> {
+ if (!state && storageMigration) {
+ state = await storageMigration(debug);
+ }
+ if (!state) {
+ if (debug) {
+ console.log('redux-persist: no inbound state, skipping migration');
+ }
+ return undefined;
+ }
+
+ const inboundVersion: number = state?._persist?.version ?? -1;
+
+ if (inboundVersion === currentVersion) {
+ if (debug) {
+ console.log('redux-persist: versions match, noop migration');
+ }
+ return state;
+ }
+ if (inboundVersion > currentVersion) {
+ if (debug) {
+ console.error('redux-persist: downgrading version is not supported');
+ }
+ return state;
+ }
+
+ const migrationKeys = [
+ ...Object.keys(legacyMigrations),
+ ...Object.keys(migrations),
+ ]
+ .map(ver => parseInt(ver))
+ .filter(key => currentVersion >= key && key > inboundVersion);
+ const sortedMigrationKeys = migrationKeys.sort((a, b) => a - b);
+
+ if (debug) {
+ console.log('redux-persist: migrationKeys', sortedMigrationKeys);
+ }
+
+ let migratedState: PersistedState = state;
+ for (const versionKey of sortedMigrationKeys) {
+ if (debug) {
+ console.log(
+ 'redux-persist: running migration for versionKey',
+ versionKey,
+ );
+ }
+
+ if (!versionKey) {
+ continue;
+ }
+
+ if (legacyMigrations[versionKey]) {
+ migratedState = await legacyMigrations[versionKey](migratedState);
+ } else {
+ const { state: newState, ops } =
+ await migrations[versionKey](migratedState);
+ migratedState = newState;
+ const versionUpdateOp = {
+ type: 'replace_synced_metadata_entry',
+ payload: {
+ name: syncedMetadataNames.DB_VERSION,
+ data: `${versionKey}`,
+ },
+ };
+ const dbOps = {
+ ...ops,
+ syncedMetadataStoreOperations: [
+ ...(ops.syncedMetadataStoreOperations ?? []),
+ versionUpdateOp,
+ ],
+ };
+ await getConfig().sqliteAPI.processDBStoreOperations(dbOps);
+ }
+ }
+
+ return migratedState;
+ };
+}
+
export {
convertDraftKeyToNewIDSchema,
convertDraftStoreToNewIDSchema,
@@ -197,4 +310,5 @@
convertIDToNewSchema,
convertNotificationMessageInfoToNewIDSchema,
permissionsToRemoveInMigration,
+ createAsyncMigrate,
};
diff --git a/native/redux/persist.js b/native/redux/persist.js
--- a/native/redux/persist.js
+++ b/native/redux/persist.js
@@ -52,7 +52,6 @@
import { patchRawThreadInfosWithSpecialRole } from 'lib/permissions/special-roles.js';
import { filterThreadIDsInFilterList } from 'lib/reducers/calendar-filters-reducer.js';
import { highestLocalIDSelector } from 'lib/selectors/local-id-selectors.js';
-import { createAsyncMigrate } from 'lib/shared/create-async-migrate.js';
import { inconsistencyResponsesToReports } from 'lib/shared/report-utils.js';
import {
getContainingThreadID,
@@ -103,6 +102,7 @@
generateIDSchemaMigrationOpsForDrafts,
convertMessageStoreThreadsToNewIDSchema,
convertThreadStoreThreadInfosToNewIDSchema,
+ createAsyncMigrate,
} from 'lib/utils/migration-utils.js';
import { entries } from 'lib/utils/objects.js';
import {
diff --git a/web/redux/persist.js b/web/redux/persist.js
--- a/web/redux/persist.js
+++ b/web/redux/persist.js
@@ -13,10 +13,6 @@
import type { ClientDBMessageStoreOperation } from 'lib/ops/message-store-ops.js';
import type { ClientDBThreadStoreOperation } from 'lib/ops/thread-store-ops.js';
import { patchRawThreadInfoWithSpecialRole } from 'lib/permissions/special-roles.js';
-import {
- createAsyncMigrate,
- type StorageMigrationFunction,
-} from 'lib/shared/create-async-migrate.js';
import { keyserverStoreTransform } from 'lib/shared/transforms/keyserver-store-transform.js';
import { messageStoreMessagesBlocklistTransform } from 'lib/shared/transforms/message-store-transform.js';
import { defaultAlertInfos } from 'lib/types/alert-types.js';
@@ -34,6 +30,8 @@
import {
generateIDSchemaMigrationOpsForDrafts,
convertDraftStoreToNewIDSchema,
+ createAsyncMigrate,
+ type StorageMigrationFunction,
} from 'lib/utils/migration-utils.js';
import { entries } from 'lib/utils/objects.js';
import {

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 23, 6:25 AM (17 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2693792
Default Alt Text
D12014.id40109.diff (9 KB)

Event Timeline