refactor: moved to using znv for env and moved logger to infra

pkg/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "9.9.9",
+  "version": "0.6.0",
   "description": "Petio API",
   "main": "./src/app.ts",
   "scripts": {
@@ -74,6 +74,7 @@
     "xhr-request": "^1.1.0",
     "xml-js": "^1.6.11",
     "yargs-parser": "^21.1.1",
+    "znv": "^0.4.0",
     "zod": "^3.22.4",
     "zod-validation-error": "^3.2.0"
   },

pkg/api/src/api/index.ts

@@ -8,12 +8,13 @@ import errorHandler from '@/api/middleware/errorHandling';
 import api from '@/api/routes/api';
 import web from '@/api/routes/web';
 import { config } from '@/config/index';
-import logger from "@/loaders/logger";
+import logger from '@/infra/logger/logger';
 import listen from '@/utils/http';
 import { removeSlashes } from '@/utils/urls';
-import responseHandler from "./http/responseHandler";
-import options from "./middleware/options";
+
+import responseHandler from './http/responseHandler';
 import logging from './middleware/logging';
+import options from './middleware/options';
 
 const routes = (subpath: string): Koa => {
   const app = new Koa();

pkg/api/src/api/middleware/auth.ts

@@ -2,7 +2,7 @@ import * as HttpStatus from 'http-status-codes';
 import jwt from 'jsonwebtoken';
 import { Context, Next } from 'koa';
 
-import loggerMain from '@/loaders/logger';
+import loggerMain from '@/infra/logger/logger';
 import { UserModel } from '@/models/user';
 
 const logger = loggerMain.child({ module: 'middleware.auth' });

pkg/api/src/api/middleware/cors.ts

@@ -1,26 +1,18 @@
 import Cors from '@koa/cors';
 import Koa from 'koa';
 
-import httpConfig from "@/config/env/http";
-import envConfig from "@/config/env/node";
+import { HTTP_CORS_DOMAINS } from '@/infra/config/env';
 
 export default () => {
-  // Enable cors
-  const whitelist = httpConfig.corsDomains;
-  if (envConfig.isDevelopment) {
-    // add local react dev
-    whitelist.push('http://localhost:3000'); // frontend
-  }
-
   const corsOptions = {
     origin: async (ctx: Koa.Context): Promise<string> => {
       if (
         ctx.request.header.origin &&
-        whitelist.indexOf(ctx.request.header.origin) !== -1
+        HTTP_CORS_DOMAINS.indexOf(ctx.request.header.origin) !== -1
       ) {
         return ctx.request.header.origin;
       }
-        return 'http://localhost:7777';
+      return 'http://localhost:7777';
     },
     credentials: true,
   };

pkg/api/src/api/middleware/logging.ts

@@ -1,7 +1,7 @@
 import { Context, Next } from 'koa';
 import PinoHttp from 'pino-http';
 
-import logger from '@/loaders/logger';
+import logger from '@/infra/logger/logger';
 
 const httpLogger = PinoHttp({
   logger: logger.core(),

pkg/api/src/api/routes/api.ts

@@ -10,7 +10,6 @@ import filter from '@/api/routes/filter';
 import health from '@/api/routes/health';
 import history from '@/api/routes/history';
 import issue from '@/api/routes/issue';
-import log from '@/api/routes/log';
 import login from '@/api/routes/login';
 import mail from '@/api/routes/mail';
 import movie from '@/api/routes/movie';
@@ -67,7 +66,6 @@ export default (app: Koa, subpath: string) => {
   filter(api);
   history(api);
   issue(api);
-  log(api);
   login(api);
   mail(api);
   movie(api);

pkg/api/src/api/routes/config.ts

@@ -6,7 +6,7 @@ import * as z from 'zod';
 import { validateRequest } from '@/api/middleware/validation';
 import { HasConfig, WriteConfig } from '@/config/config';
 import { config } from '@/config/index';
-import logger from '@/loaders/logger';
+import logger from '@/infra/logger/logger';
 import setupReady from '@/services/setup/setup';
 
 const getConfig = async (ctx: Context) => {

pkg/api/src/api/routes/discovery.ts

@@ -2,7 +2,7 @@
 import Router from '@koa/router';
 import { Context } from 'koa';
 
-import logger from '@/loaders/logger';
+import logger from '@/infra/logger/logger';
 import { UserModel } from '@/models/user';
 import cache from '@/services/cache/cache';
 import { DiscoveryResult } from '@/services/discovery/display';

pkg/api/src/api/routes/filter.ts

@@ -2,7 +2,7 @@ import Router from '@koa/router';
 import { StatusCodes } from 'http-status-codes';
 import { Context } from 'koa';
 
-import logger from '@/loaders/logger';
+import logger from '@/infra/logger/logger';
 import Filter from '@/models/filter';
 
 const getFilters = async (ctx: Context) => {
@@ -80,4 +80,4 @@ export default (app: Router) => {
   route.post('/update', updateFilter);
 
   app.use(route.routes());
-};
+};

pkg/api/src/api/routes/history.ts

@@ -2,13 +2,13 @@ import Router from '@koa/router';
 import { StatusCodes } from 'http-status-codes';
 import { Context } from 'koa';
 
-import logger from '@/loaders/logger';
+import logger from '@/infra/logger/logger';
 import getBandwidth from '@/services/plex/bandwidth';
 import getHistory from '@/services/plex/history';
 import getServerInfo from '@/services/plex/serverInfo';
 
 const listHistory = async (ctx: Context) => {
-  let {id} = ctx.request.body;
+  let { id } = ctx.request.body;
   if (id === 'admin') id = 1;
   try {
     const data = await getHistory(id, ctx.request.body.type);
@@ -52,4 +52,4 @@ export default (app: Router) => {
   route.get('/bandwidth', collectBandwidth);
 
   app.use(route.routes());
-};
+};

pkg/api/src/api/routes/issue.ts

@@ -2,7 +2,7 @@ import Router from '@koa/router';
 import { StatusCodes } from 'http-status-codes';
 import { Context } from 'koa';
 
-import logger from '@/loaders/logger';
+import logger from '@/infra/logger/logger';
 import Issue from '@/models/issue';
 import { UserModel } from '@/models/user';
 import Mailer from '@/services/mail/mailer';
@@ -14,7 +14,6 @@ const listAllIssues = async (ctx: Context) => {
   ctx.body = await Issue.find();
 };
 
-
 async function mailIssue(user_id, media_id, type, title) {
   const userData = await UserModel.findOne({ id: user_id });
   let media: any = false;
@@ -80,7 +79,7 @@ async function mailIssueResolve(user_id, media_id, type, title, message) {
 const deleteIssues = async (ctx: Context) => {
   const body = ctx.request.body as any;
   const issueId = body.id;
-  const {message} = body;
+  const { message } = body;
 
   try {
     const issue = await Issue.findById(issueId);
@@ -147,4 +146,4 @@ export default (app: Router) => {
   route.post('/remove', deleteIssues);
 
   app.use(route.routes());
-};
+};

pkg/api/src/api/routes/login.ts

@@ -9,7 +9,7 @@ import xmlParser from 'xml-js';
 
 import { authenticate } from '@/api/middleware/auth';
 import { config } from '@/config/index';
-import loggerMain from '@/loaders/logger';
+import loggerMain from '@/infra/logger/logger';
 import { GetUserByPlexID, UserModel, UserRole } from '@/models/user';
 
 const logger = loggerMain.child({ module: 'routes.login' });
@@ -71,7 +71,6 @@ const attemptPlexAuth = async (ctx: Context) => {
     const userId = await plexOauth(token);
     const dbUser = await GetUserByPlexID(userId);
 
-
     if (!dbUser) {
       ctx.error({
         statusCode: StatusCodes.FORBIDDEN,

pkg/api/src/api/routes/mail.ts

@@ -6,7 +6,7 @@ import { z } from 'zod';
 import { validateRequest } from '@/api/middleware/validation';
 import { WriteConfig } from '@/config/config';
 import { config } from '@/config/index';
-import logger from '@/loaders/logger';
+import logger from '@/infra/logger/logger';
 import Mailer from '@/services/mail/mailer';
 
 const createMail = async (ctx: Context) => {

pkg/api/src/api/routes/plex.ts

@@ -5,14 +5,14 @@ import { Context } from 'koa';
 
 import { WriteConfig } from '@/config/config';
 import { config } from '@/config/index';
-import logger from '@/loaders/logger';
+import logger from '@/infra/logger/logger';
 import { UserModel } from '@/models/user';
 import plexLookup from '@/services/plex/lookup';
 import MakePlexURL from '@/services/plex/util';
 
 const lookupByIdAndType = async (ctx: Context) => {
-  const {type} = ctx.params;
-  const {id} = ctx.params;
+  const { type } = ctx.params;
+  const { id } = ctx.params;
   if (!type || !id || type === 'undefined' || type === 'undefined') {
     ctx.status = StatusCodes.BAD_REQUEST;
     ctx.body = { error: 'invalid fields provided' };
@@ -63,13 +63,12 @@ const testPlexConnection = async (ctx: Context) => {
       };
       return;
     }
-      ctx.status = StatusCodes.OK;
-      ctx.body = {
-        connection: false,
-        error: 'You are not the owner of this server',
-      };
-      return;
-
+    ctx.status = StatusCodes.OK;
+    ctx.body = {
+      connection: false,
+      error: 'You are not the owner of this server',
+    };
+    return;
   } catch (err) {
     logger.log({ level: 'error', message: err });
 

pkg/api/src/api/routes/profiles.ts

@@ -3,7 +3,7 @@ import { StatusCodes } from 'http-status-codes';
 import { Context } from 'koa';
 
 import { adminRequired } from '@/api/middleware/auth';
-import logger from '@/loaders/logger';
+import logger from '@/infra/logger/logger';
 import Profile from '@/models/profile';
 import { UserModel } from '@/models/user';
 
@@ -22,7 +22,6 @@ const listProfiles = async (ctx: Context) => {
   } catch (err) {
     ctx.status = StatusCodes.INTERNAL_SERVER_ERROR;
     ctx.body = { error: err };
-
   }
 };
 
@@ -161,4 +160,4 @@ export default (app: Router) => {
   route.post('/delete_profile', adminRequired, deleteProfile);
 
   app.use(route.routes());
-};
+};

pkg/api/src/api/routes/request.ts

@@ -3,7 +3,7 @@ import Bluebird from 'bluebird';
 import { StatusCodes } from 'http-status-codes';
 import { Context } from 'koa';
 
-import logger from '@/loaders/logger';
+import logger from '@/infra/logger/logger';
 import { GetAllDownloaders, IDownloader } from '@/models/downloaders';
 import Request from '@/models/request';
 import { UserModel } from '@/models/user';

pkg/api/src/api/routes/review.ts

@@ -2,7 +2,7 @@ import Router from '@koa/router';
 import { StatusCodes } from 'http-status-codes';
 import { Context } from 'koa';
 
-import logger from '@/loaders/logger';
+import logger from '@/infra/logger/logger';
 import Review from '@/models/review';
 import { UserModel } from '@/models/user';
 

pkg/api/src/api/routes/search.ts

@@ -2,7 +2,7 @@ import Router from '@koa/router';
 import { StatusCodes } from 'http-status-codes';
 import { Context } from 'koa';
 
-import logger from '@/loaders/logger';
+import logger from '@/infra/logger/logger';
 import search from '@/services/tmdb/search';
 
 const searchByTerm = async (ctx: Context) => {