feat: added @oh/config - fix #96 (#97)

openhotel · Oct 3, 2024 · 4dbbb91 · 4dbbb91
1 parent f172c41
commit 4dbbb91
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 45 deletions.
diff --git a/app/server/deno.json b/app/server/deno.json
@@ -16,6 +16,7 @@
   "imports": {
     "@oh/queue": "jsr:@oh/[email protected]",
     "@oh/updater": "jsr:@oh/[email protected]",
+    "@oh/config": "jsr:@oh/[email protected]",
 
     "shared/": "./src/shared/",
     "system/": "./src/system/",

diff --git a/app/server/deno.lock b/app/server/deno.lock
diff --git a/app/server/src/shared/utils/config.utils.ts b/app/server/src/shared/utils/config.utils.ts
diff --git a/app/server/src/shared/utils/main.ts b/app/server/src/shared/utils/main.ts
@@ -1,7 +1,6 @@
 export * from "./request.utils.ts";
 export * from "./cors.utils.ts";
 export * from "./random.utils.ts";
-export * from "./config.utils.ts";
 export * from "./directory.utils.ts";
 export * from "./yaml.utils.ts";
 export * from "./envs.utils.ts";

diff --git a/app/server/src/system/main.ts b/app/server/src/system/main.ts
@@ -1,13 +1,14 @@
 import { db } from "./db.ts";
 import { api } from "./api.ts";
 import { ConfigTypes, Envs } from "shared/types/main.ts";
-import { getConfig as $getConfig } from "shared/utils/main.ts";
+import { getConfig as $getConfig } from "@oh/config";
 import { load as loadUpdater } from "modules/updater/main.ts";
 import { captcha } from "./captcha.ts";
 import { email } from "./email.ts";
 import { otp } from "./otp.ts";
 import { tasks } from "./tasks.ts";
 import { sessions } from "./sessions.ts";
+import { CONFIG_DEFAULT } from "shared/consts/config.consts.ts";
 
 export const System = (() => {
   const $db = db();
@@ -24,7 +25,7 @@ export const System = (() => {
   const load = async (envs: Envs) => {
     if (await loadUpdater(envs)) return;
 
-    $config = await $getConfig();
+    $config = await $getConfig<ConfigTypes>(CONFIG_DEFAULT);
     $envs = envs;
 
     $tasks.load();