From 6cb28801318191dd53080429b725ac56e8d07641 Mon Sep 17 00:00:00 2001 From: William Mantly Date: Wed, 31 Dec 2025 19:28:26 -0500 Subject: [PATCH] Using the simpleworks conf now --- nodejs/bin/www | 2 +- nodejs/conf/base.js | 1 + nodejs/conf/index.js | 32 ------------------------------- nodejs/migrations/all_keys_es6.js | 2 +- nodejs/models/dns_provider.js | 4 ++-- nodejs/models/host.js | 2 +- nodejs/models/user.js | 2 +- nodejs/models/user_ldap.js | 2 +- nodejs/package-lock.json | 13 +++++++++++++ nodejs/package.json | 1 + nodejs/routes/api.js | 2 +- nodejs/routes/render.js | 2 +- nodejs/services/host_lookup.js | 2 +- nodejs/utils/letsencrypt.js | 2 +- nodejs/utils/redis_model.js | 2 +- 15 files changed, 27 insertions(+), 44 deletions(-) delete mode 100644 nodejs/conf/index.js diff --git a/nodejs/bin/www b/nodejs/bin/www index 69ccee79..2e91d94b 100755 --- a/nodejs/bin/www +++ b/nodejs/bin/www @@ -7,7 +7,7 @@ var app = require('../app'); var debug = require('debug')('proxy-api:server'); var http = require('http'); -const conf = require('../conf'); +const conf = require('@simpleworkjs/conf'); /** * Get port from environment and store in Express. diff --git a/nodejs/conf/base.js b/nodejs/conf/base.js index 14b85541..2fb73632 100644 --- a/nodejs/conf/base.js +++ b/nodejs/conf/base.js @@ -1,4 +1,5 @@ 'use strict'; +// Using https://github.com/simpleworkjs/conf to handle configuration module.exports = { userModel: 'redis', // pam, redis, ldap diff --git a/nodejs/conf/index.js b/nodejs/conf/index.js deleted file mode 100644 index ce095807..00000000 --- a/nodejs/conf/index.js +++ /dev/null @@ -1,32 +0,0 @@ -'use strict'; - -const extend = require('extend'); - -const environment = process.env.NODE_ENV || 'development'; - -function load(filePath, required){ - try { - return require(filePath); - } catch(error){ - if(error.name === 'SyntaxError'){ - console.error(`Loading ${filePath} file failed!\n`, error); - process.exit(1); - } else if (error.code === 'MODULE_NOT_FOUND'){ - console.warn(`No config file ${filePath} FOUND! This may cause issues...`); - if (required){ - process.exit(1); - } - return {}; - }else{ - console.dir(`Unknown error in loading ${filePath} config file.\n`, error); - } - } -}; - -module.exports = extend( - true, // enable deep copy - load('./base', true), - load(`./${environment}`), - load('./secrets'), - {environment} -); diff --git a/nodejs/migrations/all_keys_es6.js b/nodejs/migrations/all_keys_es6.js index 7508ce0d..c528417b 100644 --- a/nodejs/migrations/all_keys_es6.js +++ b/nodejs/migrations/all_keys_es6.js @@ -2,7 +2,7 @@ const {createClient} = require('redis'); const objValidate = require('../utils/object_validate'); -const conf = require('../conf/conf'); +const conf = require('@simpleworkjs/conf'); const client = createClient({}); diff --git a/nodejs/models/dns_provider.js b/nodejs/models/dns_provider.js index dd8bb5c0..7617d854 100644 --- a/nodejs/models/dns_provider.js +++ b/nodejs/models/dns_provider.js @@ -2,7 +2,7 @@ const crypto = require("crypto"); -const conf = require('../conf'); +const conf = require('@simpleworkjs/conf'); const Table = require('../utils/redis_model'); const ModelPs = require('../utils/model_pubsub'); @@ -178,7 +178,7 @@ DnsProvider.register(ModelPs(DnsProvider)) if(require.main === module){(async function(){try{ - const conf = require('../conf'); + const conf = require('@simpleworkjs/conf'); // console.log(await DnsProvider.findall()); diff --git a/nodejs/models/host.js b/nodejs/models/host.js index 4783895d..c9a7f4a4 100755 --- a/nodejs/models/host.js +++ b/nodejs/models/host.js @@ -6,7 +6,7 @@ const ModelPs = require('../utils/model_pubsub'); const tldExtract = require('tld-extract').parse_host; const LetsEncrypt = require('../utils/letsencrypt'); -const conf = require('../conf'); +const conf = require('@simpleworkjs/conf'); const letsEncrypt = new LetsEncrypt({ directoryUrl: conf.environment === "production" ? diff --git a/nodejs/models/user.js b/nodejs/models/user.js index ecc284f6..a95f5bfe 100644 --- a/nodejs/models/user.js +++ b/nodejs/models/user.js @@ -1,6 +1,6 @@ 'use strict'; -const conf = require('../conf'); +const conf = require('@simpleworkjs/conf'); const User = require(`./user_${conf.userModel}`) diff --git a/nodejs/models/user_ldap.js b/nodejs/models/user_ldap.js index 0c02db6d..bb3b6e9e 100644 --- a/nodejs/models/user_ldap.js +++ b/nodejs/models/user_ldap.js @@ -2,7 +2,7 @@ const { Client, Attribute, Change } = require('ldapts'); const {Token, InviteToken} = require('./token'); -const conf = require('../conf').ldap; +const conf = require('@simpleworkjs/conf').ldap; const client = new Client({ url: conf.url, diff --git a/nodejs/package-lock.json b/nodejs/package-lock.json index 54a94f05..54c90c8e 100644 --- a/nodejs/package-lock.json +++ b/nodejs/package-lock.json @@ -11,6 +11,7 @@ "dependencies": { "@fortawesome/fontawesome-free": "^7.1.0", "@popperjs/core": "^2.11.8", + "@simpleworkjs/conf": "^1.0.0", "acme-client": "^5.4.0", "axios": "^1.13.2", "bcrypt": "^6.0.0", @@ -263,6 +264,18 @@ "@redis/client": "^5.10.0" } }, + "node_modules/@simpleworkjs/conf": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@simpleworkjs/conf/-/conf-1.0.0.tgz", + "integrity": "sha512-p1dQAELW0oUBRpDoz260TYw18IMI/Y11xYAb17P1MEPjsTAUB0LWE/6ZeA2VQmpU/LXoRnDysg0G/oASGILyUA==", + "license": "MIT", + "dependencies": { + "extend": "^3.0.2" + }, + "engines": { + "node": ">=16.0.0" + } + }, "node_modules/@socket.io/component-emitter": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz", diff --git a/nodejs/package.json b/nodejs/package.json index 959ba889..e920be6e 100644 --- a/nodejs/package.json +++ b/nodejs/package.json @@ -22,6 +22,7 @@ "dependencies": { "@fortawesome/fontawesome-free": "^7.1.0", "@popperjs/core": "^2.11.8", + "@simpleworkjs/conf": "^1.0.0", "acme-client": "^5.4.0", "axios": "^1.13.2", "bcrypt": "^6.0.0", diff --git a/nodejs/routes/api.js b/nodejs/routes/api.js index 6e97c928..877906f0 100644 --- a/nodejs/routes/api.js +++ b/nodejs/routes/api.js @@ -1,7 +1,7 @@ 'use strict'; const router = require('express').Router(); -const conf = require('../conf'); +const conf = require('@simpleworkjs/conf'); const middleware = require('../middleware/auth'); // API routes for authentication. diff --git a/nodejs/routes/render.js b/nodejs/routes/render.js index 7259b0af..72bc7a8b 100644 --- a/nodejs/routes/render.js +++ b/nodejs/routes/render.js @@ -3,7 +3,7 @@ const path = require('path'); const express = require('express'); const router = require('express').Router(); -const conf = require('../conf'); +const conf = require('@simpleworkjs/conf'); const values ={ title: conf.environment !== 'production' ? `dev` : '', diff --git a/nodejs/services/host_lookup.js b/nodejs/services/host_lookup.js index 73429c3b..0392ed7c 100644 --- a/nodejs/services/host_lookup.js +++ b/nodejs/services/host_lookup.js @@ -2,7 +2,7 @@ const {Host} = require('../models/host'); const {SocketServerJson} = require('../utils/unix_socket_json'); -const conf = require('../conf'); +const conf = require('@simpleworkjs/conf'); /** * Host Lookup Service diff --git a/nodejs/utils/letsencrypt.js b/nodejs/utils/letsencrypt.js index 908aa774..eab068d8 100644 --- a/nodejs/utils/letsencrypt.js +++ b/nodejs/utils/letsencrypt.js @@ -113,7 +113,7 @@ if(require.main === module){(async function(){try{ const tldExtract = require('tld-extract').parse_host; const PorkBun = require('./porkbun'); - const conf = require('../conf/conf'); + const conf = require('@simpleworkjs/conf'); let porkBun = new PorkBun(conf.porkBun.apiKey, conf.porkBun.secretApiKey); let letsEncrypt = new LetsEncrypt({ diff --git a/nodejs/utils/redis_model.js b/nodejs/utils/redis_model.js index 9b624569..03179f7f 100644 --- a/nodejs/utils/redis_model.js +++ b/nodejs/utils/redis_model.js @@ -2,7 +2,7 @@ const {createClient} = require('redis'); const objValidate = require('../utils/object_validate'); -const conf = require('../conf'); +const conf = require('@simpleworkjs/conf'); const client = createClient({}); client.connect();