limepotato/sharkey
1
0
Fork 0
mirror of https://activitypub.software/limepotato/sharkey.git synced 2024-09-19 08:40:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix types in config.ts

Browse source 
my recent changes to allow overrides from the environment had bad types
This commit is contained in:
dakkar 2024-05-18 15:56:21 +01:00
parent 95ec40d3c8
commit aa7271469e
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
packages/backend/src/config.ts
View file

@ -327,11 +327,11 @@ function applyEnvOverrides(config: Source) {
// these inner functions recurse through the config structure, using
// the given steps, building the env variable name
function _apply_top(steps: (string | number)[]) {
function _apply_top(steps: (string | string[] | number | number[])[]) {
_walk('', [], steps);
}
function _walk(name: string, path: (string | number)[], steps: (string | number)[]) {
function _walk(name: string, path: (string | number)[], steps: (string | string[] | number | number[])[]) {
// are there more steps after this one? recurse
if (steps.length > 1) {
const thisStep = steps.shift();
@ -368,7 +368,7 @@ function applyEnvOverrides(config: Source) {
}
// this recurses down, bailing out if there's no config to override
function _descend(name: string, path: (string | number)[], thisStep: string | number, steps: (string | number)[]) {
function _descend(name: string, path: (string | number)[], thisStep: string | number, steps: (string | string[] | number | number[])[]) {
name = `${name}${_step2name(thisStep)}_`;
path = [ ...path, thisStep ];
_walk(name, path, steps);
@ -390,10 +390,10 @@ function applyEnvOverrides(config: Source) {
}
}
const alwaysStrings = { 'chmodSocket': 1 };
const alwaysStrings = { 'chmodSocket': 1 } as any;
function _assign(path: (string | number)[], lastStep: string | number, value: string) {
let thisConfig = config;
let thisConfig = config as any;
for (const step of path) {
if (!thisConfig[step]) {
thisConfig[step] = {};
@ -403,9 +403,11 @@ function applyEnvOverrides(config: Source) {
if (!alwaysStrings[lastStep]) {
if (value.match(/^[0-9]+$/)) {
value = parseInt(value);
thisConfig[lastStep] = parseInt(value);
return;
} else if (value.match(/^(true|false)$/i)) {
value = !!value.match(/^true$/i);
thisConfig[lastStep] = !!value.match(/^true$/i);
return;
}
}
@ -416,7 +418,7 @@ function applyEnvOverrides(config: Source) {
_apply_top([['url', 'port', 'socket', 'chmodSocket', 'disableHsts']]);
_apply_top(['db', ['host', 'port', 'db', 'user', 'pass']]);
_apply_top(['dbSlaves', config.dbSlaves?.keys(), ['host', 'port', 'db', 'user', 'pass']]);
_apply_top(['dbSlaves', Array.from((config.dbSlaves ?? []).keys()), ['host', 'port', 'db', 'user', 'pass']]);
_apply_top([
['redis', 'redisForPubsub', 'redisForJobQueue', 'redisForTimelines'],
['host','port','username','pass','db','prefix'],