diff --git a/src/db.js b/src/localdb.js similarity index 82% rename from src/db.js rename to src/localdb.js index f693293..af23dde 100644 --- a/src/db.js +++ b/src/localdb.js @@ -5,14 +5,14 @@ class LocalDB { #path = null; #data = null; constructor (path) { - try { + try { this.#path = path; this.#load(); - this.pveAPI = this.getConfig().application.pveAPI; - this.pveAPIToken = this.getConfig().application.pveAPIToken; - this.listenPort = this.getConfig().application.listenPort; - this.hostname = this.getConfig().application.hostname; - this.domain = this.getConfig().application.domain; + this.pveAPI = this.getGlobal().application.pveAPI; + this.pveAPIToken = this.getGlobal().application.pveAPIToken; + this.listenPort = this.getGlobal().application.listenPort; + this.hostname = this.getGlobal().application.hostname; + this.domain = this.getGlobal().application.domain; } catch { console.log(`Error: ${path} was not found. Please follow the directions in the README to initialize localdb.json.`); diff --git a/src/main.js b/src/main.js index 831ca65..820c24d 100644 --- a/src/main.js +++ b/src/main.js @@ -7,20 +7,21 @@ import morgan from "morgan"; import _package from "./package.js"; import * as pve from "./pve.js"; import * as utils from "./utils.js"; -import LocalDB from "./db.js"; import parseArgs from "minimist"; global.argv = parseArgs(process.argv.slice(2), { default: { package: "package.json", - localdb: "config/localdb.json" + db: "./localdb.js", // relative to main.js + dbconfig: "config/localdb.json" } }); global.api = _package(global.argv.package); global.pve = pve; global.utils = utils; -global.db = new LocalDB(global.argv.localdb); +const db = (await import(global.argv.db)).default; +global.db = new db(global.argv.dbconfig); const app = express(); global.app = app;