Merge pull request #161 from ator-dev/storage-migration-version-fix

Fix schema version detection in migration
searchmarkers · May 21, 2024 · 68f6537 · 68f6537
2 parents 481b12d + 255d680
commit 68f6537
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/include/storage.ts b/src/include/storage.ts
@@ -789,8 +789,8 @@ const storageMigrateArea = async (areaName: StorageAreaName, schemaVersion: numb
 const storageInitializeArea = async (areaName: StorageAreaName) => {
 	const storageArea: chrome.storage.StorageArea = chrome.storage[areaName];
 	const version1Key = KEYS.reservedFor[areaName].schemaVersion1;
-	const keyValues = await storageArea.get([ "schemaVersion", version1Key ]);
-	const versionValue = keyValues.version ?? (keyValues[version1Key] ? 1 : undefined);
+	const storageSpecial = await storageArea.get([ "schemaVersion", KEYS.special.schemaVersion ]);
+	const versionValue = storageSpecial[KEYS.special.schemaVersion] ?? (storageSpecial[version1Key] ? 1 : undefined);
 	const schemaVersion = (typeof versionValue === "number") ? versionValue : 0;
 	if (schemaVersion === SCHEMA_VERSION) {
 		log("storage-initialize (single-area) complete with no changes", "schema version matches", { areaName, schemaVersion });
@@ -803,8 +803,9 @@ const storageInitializeArea = async (areaName: StorageAreaName) => {
 		await storageMigrateArea(areaName, schemaVersion);
 	} else {
 		const storage = await storageResetArea(areaName, "no appropriate migration found", true);
-		await storageCleanAreaOf(areaName, Object.keys(storage));
+		storageCleanAreaOf(areaName, Object.keys(storage));
 	}
+	log("storage-initialize (single-area) complete", "", { areaName });
 };
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars