ambiser
/
strapi-plugin-config-sync
mirror of https://github.com/boazpoolman/strapi-plugin-config-sync
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: an unparsable config file no longer deletes the database entry on import

pull/239/head
paul 2026-10-11 13:11:37 +02:00
parent 1d67af1558
commit e471a39e82
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
server/services/main.js
View File

@ -94,14 +94,24 @@ export default () => ({
// Replace reserved characters in filenames.
configName = configName.replace(/:/g, "#").replace(/\//g, "$");
const filePath = `${strapi.config.get('plugin::config-sync.syncDir')}${configType}.${configName}.json`;
const readFile = util.promisify(fs.readFile);
return readFile(`${strapi.config.get('plugin::config-sync.syncDir')}${configType}.${configName}.json`)
.then((data) => {
return JSON.parse(data);
})
.catch(() => {
return null;
});
let data;
try {
data = await readFile(filePath);
} catch (e) {
// No file for this config.
if (e.code === 'ENOENT') return null;
throw e;
}
try {
return JSON.parse(data);
} catch (e) {
// A file that can't be parsed is not a missing file: it must never lead to deleting the config.
throw new Error(`The config file '${filePath}' is not valid JSON (${e.message}).`);
}
},
@ -136,7 +146,13 @@ export default () => ({
return;
}
const fileContents = await strapi.plugin('config-sync').service('main').readConfigFile(type, name);
let fileContents;
try {
fileContents = await strapi.plugin('config-sync').service('main').readConfigFile(type, name);
} catch (e) {
strapi.log.warn(logMessage(`The config file '${file}' can't be read and is left out of the diff: ${e.message}`));
return;
}
if (!fileContents) {
strapi.log.warn(logMessage(`An empty config file '${file}' was found in the sync directory`));
@ -242,9 +258,9 @@ export default () => ({
const type = configName.split('.')[0]; // Grab the first part of the filename.
const name = configName.split(/\.(.+)/)[1]; // Grab the rest of the filename.
const fileContents = await strapi.plugin('config-sync').service('main').readConfigFile(type, name);
try {
const fileContents = await strapi.plugin('config-sync').service('main').readConfigFile(type, name);
const importState = await strapi.plugin('config-sync').types[type].importSingle(name, fileContents, force);
if (onSuccess && importState !== false) onSuccess(`${type}.${name}`);
} catch (e) {