fix(main): replace electron-store with native fs for ESM compatibility

- Remove electron-store dependency usage (ESM-only)
- Implement JSON file storage using native fs module
- Read/write config.json and secure.json directly
- Maintain same API for domain and version storage
This commit is contained in:
2026-03-12 11:03:49 +08:00
parent da7f566ecf
commit 184919b562
3 changed files with 128 additions and 39 deletions

View File

@@ -5,7 +5,6 @@
*/
import { app, safeStorage } from "electron";
import Store from "electron-store";
import * as fs from "fs";
import * as path from "path";
import type { Domain, DomainWithPassword } from "@renderer/types/domain";
@@ -15,28 +14,6 @@ import type {
BackupMetadata,
} from "@renderer/types/version";
// ==================== Store Configuration ====================
interface AppConfig {
domains: Domain[];
}
interface SecureStore {
[key: string]: string; // encrypted passwords
}
const configStore = new Store<AppConfig>({
name: "config",
defaults: {
domains: [],
},
});
const secureStore = new Store<SecureStore>({
name: "secure",
defaults: {},
});
// ==================== Path Helpers ====================
/**
@@ -62,6 +39,41 @@ function ensureDir(dirPath: string): void {
}
}
// ==================== JSON File Store ====================
interface AppConfig {
domains: Domain[];
}
interface SecureStore {
[key: string]: string; // encrypted passwords
}
function getConfigPath(): string {
return path.join(getStorageBase(), "config.json");
}
function getSecureStorePath(): string {
return path.join(getStorageBase(), "secure.json");
}
function readJsonFile<T>(filePath: string, defaultValue: T): T {
try {
if (fs.existsSync(filePath)) {
const content = fs.readFileSync(filePath, "utf-8");
return JSON.parse(content) as T;
}
return defaultValue;
} catch {
return defaultValue;
}
}
function writeJsonFile<T>(filePath: string, data: T): void {
ensureDir(path.dirname(filePath));
fs.writeFileSync(filePath, JSON.stringify(data, null, 2), "utf-8");
}
// ==================== Password Encryption ====================
/**
@@ -115,20 +127,24 @@ export async function saveDomain(
domain: Domain,
password: string,
): Promise<void> {
const domains = configStore.get("domains") as Domain[];
const existingIndex = domains.findIndex((d) => d.id === domain.id);
const configPath = getConfigPath();
const config = readJsonFile<AppConfig>(configPath, { domains: [] });
const existingIndex = config.domains.findIndex((d) => d.id === domain.id);
// Encrypt and store password
const encrypted = encryptPassword(password);
secureStore.set(`password_${domain.id}`, encrypted.toString("base64"));
const securePath = getSecureStorePath();
const secureStore = readJsonFile<SecureStore>(securePath, {});
secureStore[`password_${domain.id}`] = encrypted.toString("base64");
writeJsonFile(securePath, secureStore);
if (existingIndex >= 0) {
domains[existingIndex] = domain;
config.domains[existingIndex] = domain;
} else {
domains.push(domain);
config.domains.push(domain);
}
configStore.set("domains", domains);
writeJsonFile(configPath, config);
}
/**
@@ -137,14 +153,18 @@ export async function saveDomain(
export async function getDomain(
id: string,
): Promise<DomainWithPassword | null> {
const domains = configStore.get("domains") as Domain[];
const domain = domains.find((d) => d.id === id);
const configPath = getConfigPath();
const config = readJsonFile<AppConfig>(configPath, { domains: [] });
const domain = config.domains.find((d) => d.id === id);
if (!domain) {
return null;
}
const encryptedBase64 = secureStore.get(`password_${id}`);
const securePath = getSecureStorePath();
const secureStore = readJsonFile<SecureStore>(securePath, {});
const encryptedBase64 = secureStore[`password_${id}`];
if (!encryptedBase64) {
return null;
}
@@ -167,17 +187,24 @@ export async function getDomain(
* Get all domains (without passwords)
*/
export async function listDomains(): Promise<Domain[]> {
return configStore.get("domains") as Domain[];
const configPath = getConfigPath();
const config = readJsonFile<AppConfig>(configPath, { domains: [] });
return config.domains;
}
/**
* Delete a domain and its password
*/
export async function deleteDomain(id: string): Promise<void> {
const domains = configStore.get("domains") as Domain[];
const filtered = domains.filter((d) => d.id !== id);
configStore.set("domains", filtered);
secureStore.delete(`password_${id}`);
const configPath = getConfigPath();
const config = readJsonFile<AppConfig>(configPath, { domains: [] });
config.domains = config.domains.filter((d) => d.id !== id);
writeJsonFile(configPath, config);
const securePath = getSecureStorePath();
const secureStore = readJsonFile<SecureStore>(securePath, {});
delete secureStore[`password_${id}`];
writeJsonFile(securePath, secureStore);
}
// ==================== Version Management ====================
@@ -367,8 +394,8 @@ export function getStorageStats(): {
storageBackend: string;
} {
return {
configPath: configStore.path,
securePath: secureStore.path,
configPath: getConfigPath(),
securePath: getSecureStorePath(),
storageBase: getStorageBase(),
isSecureStorageAvailable: isSecureStorageAvailable(),
storageBackend: getStorageBackend(),