mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

base_config: Don't throw if loaded config file is empty

Browse source
This commit is contained in:
Scott Nonnenberg 2021-10-25 12:41:44 -07:00 • committed by GitHub
parent 53bc13a401
commit be862afd1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 90 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/base_config.ts
View file

@ -13,6 +13,9 @@ export type ConfigType = {
set: (keyPath: string, value: unknown) => void;
get: (keyPath: string) => unknown;
remove: () => void;
// Test-only
_getCachedValue: () => InternalConfigType | undefined;
};
export function start(
@ -21,10 +24,11 @@ export function start(
options?: { allowMalformedOnStartup?: boolean }
): ConfigType {
let cachedValue: InternalConfigType | undefined;
let incomingJson: string | undefined;
try {
const text = readFileSync(targetPath, ENCODING);
cachedValue = JSON.parse(text);
incomingJson = readFileSync(targetPath, ENCODING);
cachedValue = incomingJson ? JSON.parse(incomingJson) : undefined;
console.log(`config/get: Successfully read ${name} config file`);
if (!cachedValue) {
@ -38,9 +42,15 @@ export function start(
throw error;
}
console.log(
`config/get: Did not find ${name} config file, cache is now empty object`
);
if (incomingJson) {
console.log(
`config/get: ${name} config file was malformed, starting afresh`
);
} else {
console.log(
`config/get: Did not find ${name} config file (or it was empty), cache is now empty object`
);
}
cachedValue = Object.create(null);
}
@ -55,8 +65,8 @@ export function start(
set(cachedValue, keyPath, value);
console.log(`config/set: Saving ${name} config to disk`);
const text = JSON.stringify(cachedValue, null, ' ');
writeFileSync(targetPath, text, ENCODING);
const outgoingJson = JSON.stringify(cachedValue, null, ' ');
writeFileSync(targetPath, outgoingJson, ENCODING);
}
function remove(): void {
@ -69,5 +79,6 @@ export function start(
set: ourSet,
get: ourGet,
remove,
_getCachedValue: () => cachedValue,
};
}