refactor(ts): refactor src/config imports

Author: jescalada

index.ts

@@ -3,7 +3,7 @@
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 import * as fs from 'fs';
-import config from './src/config/file';
+import { configFile, setConfigFile, validate } from './src/config/file';
 import proxy from './src/proxy';
 import service from './src/service';
 
@@ -28,22 +28,22 @@ const argv = yargs(hideBin(process.argv))
   .strict()
   .parseSync();
 
-config.configFile = argv.c ? argv.c : undefined;
+setConfigFile(argv.c as string || "");
 
 if (argv.v) {
-  if (!fs.existsSync(config.configFile as string)) {
+  if (!fs.existsSync(configFile)) {
     console.error(
-      `Config file ${config.configFile} doesn't exist, nothing to validate! Did you forget -c/--config?`,
+      `Config file ${configFile} doesn't exist, nothing to validate! Did you forget -c/--config?`,
     );
     process.exit(1);
   }
 
-  config.validate();
-  console.log(`${config.configFile} is valid`);
+  validate();
+  console.log(`${configFile} is valid`);
   process.exit(0);
 }
 
-config.validate();
+validate();
 
 proxy.start();
 service.start();

packages/git-proxy-cli/index.js

@@ -7,8 +7,8 @@ const util = require('util');
 
 const GIT_PROXY_COOKIE_FILE = 'git-proxy-cookie';
 // GitProxy UI HOST and PORT (configurable via environment variable)
-const { GIT_PROXY_UI_HOST: uiHost = 'http://localhost' } = process.env;
-const { GIT_PROXY_UI_PORT: uiPort } = require('@finos/git-proxy/src/config/env').Vars;
+const { GIT_PROXY_UI_HOST: uiHost, GIT_PROXY_UI_PORT: uiPort } =
+  require('@finos/git-proxy/src/config/env').serverConfig;
 const baseUrl = `${uiHost}:${uiPort}`;
 
 axios.defaults.timeout = 30000;

src/db/file/repo.ts

@@ -1,6 +1,5 @@
 import fs from 'fs';
 import Datastore from '@seald-io/nedb'
-import { Action } from '../../proxy/actions/Action';
 import { Repo } from '../types';
 
 if (!fs.existsSync('./.data')) fs.mkdirSync('./.data');

src/proxy/index.js

@@ -9,8 +9,8 @@ const config = require('../config');
 const db = require('../db');
 const { PluginLoader } = require('../plugin');
 const chain = require('./chain');
-const { GIT_PROXY_SERVER_PORT: proxyHttpPort } = require('../config/env').Vars;
-const { GIT_PROXY_HTTPS_SERVER_PORT: proxyHttpsPort } = require('../config/env').Vars;
+const { GIT_PROXY_SERVER_PORT: proxyHttpPort, GIT_PROXY_HTTPS_SERVER_PORT: proxyHttpsPort } =
+  require('../config/env').serverConfig;
 
 const options = {
   inflate: true,

src/service/index.js

@@ -14,7 +14,7 @@ const limiter = rateLimit({
   max: 100, // limit each IP to 100 requests per windowMs
 });
 
-const { GIT_PROXY_UI_PORT: uiPort } = require('../config/env').Vars;
+const { GIT_PROXY_UI_PORT: uiPort } = require('../config/env').serverConfig;
 
 const _httpServer = http.createServer(app);
 

src/service/urls.js

@@ -1,5 +1,5 @@
 const { GIT_PROXY_SERVER_PORT: PROXY_HTTP_PORT, GIT_PROXY_UI_PORT: UI_PORT } =
-  require('../config/env').Vars;
+  require('../config/env').serverConfig;
 const config = require('../config');
 
 module.exports = {

tsconfig.json

@@ -12,7 +12,8 @@
     "isolatedModules": true,
     "module": "CommonJS",
     "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true
+    "allowSyntheticDefaultImports": true,
+    "resolveJsonModule": true
   },
   "include": ["src"]
 }