feat: move system to modules + bump @oh/config - fix #98 (#99)

openhotel · Oct 4, 2024 · 2f43fff · 2f43fff
1 parent 4dbbb91
commit 2f43fff
Show file tree

Hide file tree

Showing 27 changed files with 37 additions and 40 deletions.
diff --git a/app/server/deno.json b/app/server/deno.json
@@ -16,10 +16,9 @@
   "imports": {
     "@oh/queue": "jsr:@oh/[email protected]",
     "@oh/updater": "jsr:@oh/[email protected]",
-    "@oh/config": "jsr:@oh/config@1.0.1",
+    "@oh/config": "jsr:@oh/config@1.1.1",
 
     "shared/": "./src/shared/",
-    "system/": "./src/system/",
     "modules/": "./src/modules/",
 
     "deno/": "https://deno.land/[email protected]/",

diff --git a/app/server/deno.lock b/app/server/deno.lock
diff --git a/app/server/mod.ts b/app/server/mod.ts
@@ -1,4 +1,4 @@
-import { System } from "./src/main.ts";
+import { System } from "modules/system/main.ts";
 import { load as loadEnv } from "loadenv";
 import { getProcessedEnvs } from "shared/utils/main.ts";
 

diff --git a/app/server/src/main.ts b/app/server/src/main.ts
diff --git a/app/server/src/modules/api/v2/account/login.request.ts b/app/server/src/modules/api/v2/account/login.request.ts
@@ -1,6 +1,6 @@
 import { RequestType } from "shared/types/main.ts";
 import { RequestMethod } from "shared/enums/main.ts";
-import { System } from "system/main.ts";
+import { System } from "modules/system/main.ts";
 import * as bcrypt from "bcrypt";
 import {
   getIpFromRequest,

diff --git a/app/server/src/modules/api/v2/account/logout.request.ts b/app/server/src/modules/api/v2/account/logout.request.ts
@@ -1,6 +1,6 @@
 import { RequestType } from "shared/types/main.ts";
 import { RequestMethod } from "shared/enums/main.ts";
-import { System } from "system/main.ts";
+import { System } from "modules/system/main.ts";
 import * as bcrypt from "bcrypt";
 
 export const logoutRequest: RequestType = {

diff --git a/app/server/src/modules/api/v2/account/otp/delete.request.ts b/app/server/src/modules/api/v2/account/otp/delete.request.ts
@@ -4,7 +4,7 @@ import {
   getAccountFromRequest,
   isAccountAuthValid,
 } from "shared/utils/account.utils.ts";
-import { System } from "system/main.ts";
+import { System } from "modules/system/main.ts";
 
 export const deleteRequest: RequestType = {
   method: RequestMethod.DELETE,

diff --git a/app/server/src/modules/api/v2/account/otp/post.request.ts b/app/server/src/modules/api/v2/account/otp/post.request.ts
@@ -4,7 +4,7 @@ import {
   getAccountFromRequest,
   isAccountAuthValid,
 } from "shared/utils/account.utils.ts";
-import { System } from "system/main.ts";
+import { System } from "modules/system/main.ts";
 
 export const postRequest: RequestType = {
   method: RequestMethod.POST,

diff --git a/app/server/src/modules/api/v2/account/otp/verify.request.ts b/app/server/src/modules/api/v2/account/otp/verify.request.ts
@@ -4,7 +4,7 @@ import {
   getAccountFromRequest,
   isAccountAuthValid,
 } from "shared/utils/account.utils.ts";
-import { System } from "system/main.ts";
+import { System } from "modules/system/main.ts";
 
 export const verifyRequest: RequestType = {
   method: RequestMethod.GET,

diff --git a/app/server/src/modules/api/v2/account/ping.request.ts b/app/server/src/modules/api/v2/account/ping.request.ts
@@ -1,7 +1,7 @@
 import { RequestType } from "shared/types/main.ts";
 import { RequestMethod } from "shared/enums/main.ts";
 import { getIpFromRequest } from "shared/utils/main.ts";
-import { System } from "system/main.ts";
+import { System } from "modules/system/main.ts";
 import { SERVER_SESSION_EXPIRE_TIME } from "shared/consts/main.ts";
 
 export const pingRequest: RequestType = {

diff --git a/app/server/src/modules/api/v2/account/refresh-session.request.ts b/app/server/src/modules/api/v2/account/refresh-session.request.ts
@@ -1,6 +1,6 @@
 import { RequestType } from "shared/types/main.ts";
 import { RequestMethod } from "shared/enums/main.ts";
-import { System } from "system/main.ts";
+import { System } from "modules/system/main.ts";
 import * as bcrypt from "bcrypt";
 import {
   SESSION_EXPIRE_TIME,

diff --git a/app/server/src/modules/api/v2/account/register.request.ts b/app/server/src/modules/api/v2/account/register.request.ts
@@ -1,6 +1,6 @@
 import { RequestType } from "shared/types/main.ts";
 import { RequestMethod } from "shared/enums/main.ts";
-import { System } from "system/main.ts";
+import { System } from "modules/system/main.ts";
 import * as bcrypt from "bcrypt";
 import {
   PASSWORD_REGEX,

diff --git a/app/server/src/modules/api/v2/account/verify.request.ts b/app/server/src/modules/api/v2/account/verify.request.ts
@@ -1,6 +1,6 @@
 import { RequestType } from "shared/types/main.ts";
 import { RequestMethod } from "shared/enums/main.ts";
-import { System } from "system/main.ts";
+import { System } from "modules/system/main.ts";
 import * as bcrypt from "bcrypt";
 
 export const verifyRequest: RequestType = {

diff --git a/app/server/src/modules/api/v2/admin/admin.request.ts b/app/server/src/modules/api/v2/admin/admin.request.ts
@@ -7,7 +7,7 @@ import {
   isAccountAdminValid,
   isAccountAuthValid,
 } from "shared/utils/account.utils.ts";
-import { System } from "system/main.ts";
+import { System } from "modules/system/main.ts";
 
 export const accountGetRequest: RequestType = {
   method: RequestMethod.GET,

diff --git a/app/server/src/modules/api/v2/admin/update.request.ts b/app/server/src/modules/api/v2/admin/update.request.ts
@@ -2,7 +2,7 @@ import { RequestType } from "shared/types/request.types.ts";
 import { RequestMethod } from "shared/enums/request.enum.ts";
 import { isAccountAdminValid } from "shared/utils/account.utils.ts";
 import { load as loadUpdater } from "modules/updater/main.ts";
-import { System } from "system/main.ts";
+import { System } from "modules/system/main.ts";
 
 export const updateGetRequest: RequestType = {
   method: RequestMethod.GET,

diff --git a/app/server/src/modules/api/v2/server/claim-session.request.ts b/app/server/src/modules/api/v2/server/claim-session.request.ts
@@ -1,6 +1,6 @@
 import { RequestType } from "shared/types/main.ts";
 import { RequestMethod } from "shared/enums/main.ts";
-import { System } from "system/main.ts";
+import { System } from "modules/system/main.ts";
 import * as bcrypt from "bcrypt";
 import { SERVER_SESSION_EXPIRE_TIME } from "shared/consts/session.consts.ts";
 import { getIpFromRequest } from "shared/utils/ip.utils.ts";

diff --git a/app/server/src/modules/api/v2/server/create-ticket.request.ts b/app/server/src/modules/api/v2/server/create-ticket.request.ts
@@ -1,6 +1,6 @@
 import { RequestType } from "shared/types/main.ts";
 import { RequestMethod } from "shared/enums/main.ts";
-import { System } from "system/main.ts";
+import { System } from "modules/system/main.ts";
 import * as bcrypt from "bcrypt";
 import { TICKET_EXPIRE_TIME } from "shared/consts/tickets.consts.ts";
 

diff --git a/app/server/src/modules/api/v2/version.request.ts b/app/server/src/modules/api/v2/version.request.ts
@@ -1,6 +1,6 @@
 import { RequestType } from "shared/types/main.ts";
 import { RequestMethod } from "shared/enums/main.ts";
-import { System } from "system/main.ts";
+import { System } from "modules/system/main.ts";
 
 export const versionRequest: RequestType = {
   method: RequestMethod.GET,

diff --git a/app/server/src/system/api.ts → app/server/src/modules/system/api.ts b/app/server/src/system/api.ts → app/server/src/modules/system/api.ts
@@ -4,7 +4,7 @@ import {
   getContentType,
   getCORSHeaders,
 } from "shared/utils/main.ts";
-import { System } from "system/main.ts";
+import { System } from "./main.ts";
 
 export const api = () => {
   const load = () => {

diff --git a/app/server/src/system/captcha.ts → app/server/src/modules/system/captcha.ts b/app/server/src/system/captcha.ts → app/server/src/modules/system/captcha.ts
@@ -1,4 +1,4 @@
-import { System } from "system/main.ts";
+import { System } from "modules/system/main.ts";
 
 export const captcha = () => {
   const verify = async (sessionId: string): Promise<boolean> => {

diff --git a/app/server/src/system/db.ts → app/server/src/modules/system/db.ts b/app/server/src/system/db.ts → app/server/src/modules/system/db.ts
@@ -1,4 +1,4 @@
-import { System } from "system/main.ts";
+import { System } from "./main.ts";
 
 export const db = () => {
   let kv;

diff --git a/app/server/src/system/email.ts → app/server/src/modules/system/email.ts b/app/server/src/system/email.ts → app/server/src/modules/system/email.ts
diff --git a/app/server/src/system/main.ts → app/server/src/modules/system/main.ts b/app/server/src/system/main.ts → app/server/src/modules/system/main.ts
@@ -25,7 +25,7 @@ export const System = (() => {
   const load = async (envs: Envs) => {
     if (await loadUpdater(envs)) return;
 
-    $config = await $getConfig<ConfigTypes>(CONFIG_DEFAULT);
+    $config = await $getConfig<ConfigTypes>({ defaults: CONFIG_DEFAULT });
     $envs = envs;
 
     $tasks.load();

diff --git a/app/server/src/system/otp.ts → app/server/src/modules/system/otp.ts b/app/server/src/system/otp.ts → app/server/src/modules/system/otp.ts
@@ -1,5 +1,5 @@
 import * as OTPAuth from "otp";
-import { System } from "system/main.ts";
+import { System } from "modules/system/main.ts";
 
 export const otp = () => {
   const $getTOTP = (email: string, otpSecret: string): OTPAuth.TOTP =>

diff --git a/app/server/src/system/sessions.ts → app/server/src/modules/system/sessions.ts b/app/server/src/system/sessions.ts → app/server/src/modules/system/sessions.ts
@@ -1,4 +1,4 @@
-import { System } from "system/main.ts";
+import { System } from "modules/system/main.ts";
 import { TickerQueue } from "@oh/queue";
 import { getServerSessionList } from "shared/utils/main.ts";
 

diff --git a/app/server/src/system/tasks.ts → app/server/src/modules/system/tasks.ts b/app/server/src/system/tasks.ts → app/server/src/modules/system/tasks.ts
diff --git a/app/server/src/shared/utils/account.utils.ts b/app/server/src/shared/utils/account.utils.ts
@@ -1,4 +1,4 @@
-import { System } from "system/main.ts";
+import { System } from "modules/system/main.ts";
 import * as bcrypt from "bcrypt";
 
 export const getAccountFromRequest = async ({ headers }: Request) => {