rasperrypi-home/hassio-plejd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Read version info from config instead of hard-coded string

Browse source
This commit is contained in:
Victor Hagelbäck 2021-02-13 12:58:18 +01:00
parent d133efe228
commit a3244cd6fc
2 changed files with 51 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

55
plejd/Configuration.js
View file

@ -2,27 +2,52 @@ const fs = require('fs');
class Configuration {
static _options = null;
static _addonInfo = null;
static getOptions() {
if (!Configuration._options) {
const rawData = fs.readFileSync('/data/options.json');
const config = JSON.parse(rawData);
const defaultRawData = fs.readFileSync('/plejd/config.json');
const defaultConfig = JSON.parse(defaultRawData).options;
Configuration._options = { ...defaultConfig, ...config };
// eslint-disable-next-line no-console
console.log('Config:', {
...Configuration._options,
username: '---scrubbed---',
password: '---scrubbed---',
mqttPassword: '---scrubbed---',
});
Configuration._hydrateCache();
}
return Configuration._options;
}
static getAddonInfo() {
if (!Configuration._addonInfo) {
Configuration._hydrateCache();
}
return Configuration._addonInfo;
}
static _hydrateCache() {
const rawData = fs.readFileSync('/data/options.json');
const config = JSON.parse(rawData);
const defaultRawData = fs.readFileSync('/plejd/config.json');
const defaultConfig = JSON.parse(defaultRawData);
Configuration._options = { ...defaultConfig.options, ...config };
Configuration._addonInfo = {
name: defaultConfig.name,
version: defaultConfig.version,
slug: defaultConfig.slug,
description: defaultConfig.description,
url: defaultConfig.url,
arch: defaultConfig.arch,
startup: defaultConfig.startup,
boot: defaultConfig.boot,
host_network: defaultConfig.host_network,
host_dbus: defaultConfig.host_dbus,
apparmor: defaultConfig.apparmor,
};
// eslint-disable-next-line no-console
console.log('Config:', {
...Configuration._options,
username: '---scrubbed---',
password: '---scrubbed---',
mqttPassword: '---scrubbed---',
});
}
}
module.exports = Configuration;

17
plejd/main.js
View file

@ -1,13 +1,17 @@
const Configuration = require('./Configuration');
const Logger = require('./Logger');
const PlejdAddon = require('./PlejdAddon');
const logger = Logger.getLogger('plejd-main');
const version = '0.5.1';
async function main() {
try {
logger.info(`Starting Plejd add-on v. ${version}`);
// eslint-disable-next-line no-console
console.log('Starting Plejd addon and reading configuration...');
const addonInfo = Configuration.getAddonInfo();
const logger = Logger.getLogger('plejd-main');
logger.info(`Plejd add-on, version ${addonInfo.version}`);
logger.verbose(`Addon info: ${JSON.stringify(addonInfo)}`);
const addon = new PlejdAddon();
@ -15,7 +19,8 @@ async function main() {
logger.info('main() finished');
} catch (err) {
logger.error('Catastrophic error. Resetting entire addon in 1 minute', err);
// eslint-disable-next-line no-console
console.log('Catastrophic error. Resetting entire addon in 1 minute', err);
setTimeout(() => main(), 60000);
}
}