[exoframe-server] Split paths into new module to prevent circular deps

Should fix issues with logger not getting correclty inited

Author: yamalight

packages/exoframe-server/src/config/index.js

@@ -2,19 +2,9 @@
 import { spawn } from 'child_process';
 import { mkdirSync, readFileSync, statSync, watchFile, writeFileSync } from 'fs';
 import jsyaml from 'js-yaml';
-import { homedir } from 'os';
 import { join } from 'path';
 import logger from '../logger/index.js';
-
-// construct paths
-const xdgConfigHome = process.env.XDG_CONFIG_HOME || join(homedir(), '.config');
-export const baseFolder = join(xdgConfigHome, 'exoframe');
-const configPath = join(baseFolder, 'server.config.yml');
-const publicKeysPath = join(homedir(), '.ssh');
-export const extensionsFolder = join(baseFolder, 'extensions');
-export const recipesFolder = join(baseFolder, 'recipes');
-// dir for temporary files used to build docker images
-export const tempDockerDir = join(baseFolder, 'deploying');
+import { baseFolder, configPath, extensionsFolder, logFolder, publicKeysPath, recipesFolder } from './paths.js';
 
 // create base folder if doesn't exist
 try {
@@ -49,9 +39,6 @@ try {
   spawn('npm', ['init', '-y', '--silent'], { cwd: recipesFolder });
 }
 
-// construct log path
-export const logFolder = join(xdgConfigHome, 'exoframe', 'exoframe-server');
-
 // create logs folder if doesn't exist
 try {
   statSync(logFolder);

packages/exoframe-server/src/config/paths.js

@@ -0,0 +1,12 @@
+import { homedir } from 'os';
+import { join } from 'path';
+
+const xdgConfigHome = process.env.XDG_CONFIG_HOME || join(homedir(), '.config');
+
+export const baseFolder = join(xdgConfigHome, 'exoframe');
+export const configPath = join(baseFolder, 'server.config.yml');
+export const publicKeysPath = join(homedir(), '.ssh');
+export const extensionsFolder = join(baseFolder, 'extensions');
+export const recipesFolder = join(baseFolder, 'recipes');
+export const tempDockerDir = join(baseFolder, 'deploying');
+export const logFolder = join(xdgConfigHome, 'exoframe', 'exoframe-server');

packages/exoframe-server/src/db/index.js

@@ -2,7 +2,7 @@
 import Loki from 'lokijs';
 import { join } from 'path';
 // our packages
-import { baseFolder } from '../config/index.js';
+import { baseFolder } from '../config/paths.js';
 
 // TTL for auth requests
 const REQ_TTL =

packages/exoframe-server/src/db/secrets.js

@@ -2,7 +2,7 @@
 import Loki from 'lokijs';
 import { join } from 'path';
 // our packages
-import { baseFolder } from '../config/index.js';
+import { baseFolder } from '../config/paths.js';
 
 // init in-memory adapter for login requests
 const memAdapter = new Loki.LokiMemoryAdapter();

packages/exoframe-server/src/docker/build.js

@@ -1,7 +1,7 @@
 /* eslint no-async-promise-executor: off */
 import { join } from 'path';
 import { pack } from 'tar-fs';
-import { tempDockerDir } from '../config/index.js';
+import { tempDockerDir } from '../config/paths.js';
 import logger from '../logger/index.js';
 import { getBuildargs, getProjectConfig, tagFromConfig, writeStatus } from '../util/index.js';
 import docker from './docker.js';

packages/exoframe-server/src/docker/templates/index.js

@@ -1,7 +1,7 @@
 // npm packages
 import { readFileSync } from 'fs';
 import { join } from 'path';
-import { extensionsFolder } from '../../config/index.js';
+import { extensionsFolder } from '../../config/paths.js';
 import * as dockerfileTemplate from './dockerfile.js';
 import * as imageTemplate from './image.js';
 import * as nodeTemplate from './node.js';

packages/exoframe-server/src/docker/traefik.js

@@ -2,7 +2,8 @@ import { existsSync, readFileSync, statSync, writeFileSync } from 'fs';
 import jsyaml from 'js-yaml';
 import { mkdirp } from 'mkdirp';
 import { join } from 'path';
-import { baseFolder, getConfig, waitForConfig } from '../config/index.js';
+import { getConfig, waitForConfig } from '../config/index.js';
+import { baseFolder } from '../config/paths.js';
 import logger from '../logger/index.js';
 import docker from './docker.js';
 import { pullImage } from './util.js';

packages/exoframe-server/src/logger/index.js

@@ -1,6 +1,6 @@
 import { join } from 'path';
 import pino from 'pino';
-import { logFolder } from '../config/index.js';
+import { logFolder } from '../config/paths.js';
 
 // prepare level
 const levelTesting = process.env.NODE_ENV === 'testing' ? 'error' : false;

packages/exoframe-server/src/routes/deploy.js

@@ -1,7 +1,8 @@
 /* eslint no-await-in-loop: off */
 import { randomUUID } from 'crypto';
 import _ from 'highland';
-import { getConfig, tempDockerDir } from '../config/index.js';
+import { getConfig } from '../config/index.js';
+import { tempDockerDir } from '../config/paths.js';
 import { build } from '../docker/build.js';
 import { scheduleCleanup, schedulePrune } from '../docker/cleanup.js';
 import docker from '../docker/docker.js';

packages/exoframe-server/src/routes/setup.js

@@ -1,7 +1,8 @@
 import { randomUUID } from 'crypto';
 import { mkdirSync } from 'fs';
 import { join } from 'path';
-import { getConfig, recipesFolder, tempDockerDir } from '../config/index.js';
+import { getConfig } from '../config/index.js';
+import { recipesFolder, tempDockerDir } from '../config/paths.js';
 import { build, buildFromParams } from '../docker/build.js';
 import docker from '../docker/docker.js';
 import { createNetwork, initNetwork as getNetwork } from '../docker/network.js';