serverpreconfigured 2.2.12 → 2.2.14

package/dist/database/database.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dataBase = void 0;
-//@ts-ignore
 //@ts-nocheck
 const sequelize_1 = require("sequelize");
 const database_1 = __importDefault(require("./../settings/database/database"));

package/dist/settings/database/database.d.ts

@@ -1,8 +1,9 @@
 export const dialect: string;
-export const host: string;
+export const host: any;
 export const database: any;
-export const username: string;
-export const password: string;
+export const username: any;
+export const password: string | undefined;
+export const port: any;
 export namespace define {
     const underscored: boolean;
     const timestamps: boolean;

package/dist/settings/database/database.js

@@ -6,6 +6,7 @@ module.exports = {
     database: ENV.DATABASE.database,
     username: ENV.DATABASE.username,
     password: ENV.DATABASE.password,
+    port: ENV.DATABASE.port,
     define: {
         underscored: true,
         timestamps: true,

package/dist/settings/env.d.ts

@@ -4,10 +4,11 @@ declare const ENV: {
     PORT: number;
     DATABASE: {
         dialect: string;
-        host: string;
+        port: any;
+        host: any;
         database: any;
-        username: string;
-        password: string;
+        username: any;
+        password: string | undefined;
     };
     SESSION_SECRET: string;
 };

package/dist/settings/env.js

@@ -19,10 +19,11 @@ const ENV = {
     PORT: process.env.SERVER_PORT ? parseInt(process.env.SERVER_PORT) : 3000,
     DATABASE: {
         dialect: process.env.DATABASE_DIALECT ? process.env.DATABASE_DIALECT : 'postgres',
-        host: process.env.DATABASE_HOST ? process.env.DATABASE_HOST : 'localhost',
+        port: (custom_env.DATABASE && custom_env.DATABASE.PORT) || process.env.DATABASE_PORT || 5432,
+        host: (custom_env.DATABASE && custom_env.DATABASE.HOST) || (process.env.DATABASE_HOST ? process.env.DATABASE_HOST : 'localhost'),
         database: (custom_env.DATABASE && custom_env.DATABASE.DATABASE) || (process.env.DATABASE_DATABASE || 'postgres'),
-        username: process.env.DATABASE_USERNAME ? process.env.DATABASE_USERNAME : 'postgres',
-        password: process.env.DATABASE_PASSWORD ? process.env.DATABASE_PASSWORD : '',
+        username: (custom_env.DATABASE && custom_env.DATABASE.USERNAME) || (process.env.DATABASE_USERNAME ? process.env.DATABASE_USERNAME : 'postgres'),
+        password: (custom_env.DATABASE && custom_env.DATABASE.PASSWOR) || process.env.DATABASE_PASSWORD ? process.env.DATABASE_PASSWORD : '',
     },
     SESSION_SECRET: process.env.SESSION_SECRET ? process.env.SESSION_SECRET : "secret key session",
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverpreconfigured",
-  "version": "2.2.12",
+  "version": "2.2.14",
   "description": "\"Pre-configured server with authentication system and database integration\"",
   "main": "dist/server.js",
   "keywords": [
@@ -31,16 +31,18 @@
     "cors": "^2.8.5",
     "express": "^4.17.3",
     "express-session": "^1.17.2",
+    "install": "^0.13.0",
     "meta-sanitizer": "^2.1.4",
     "nodemon": "^2.0.15",
-    "pg": "^8.7.3",
+    "npm": "^10.9.0",
+    "pg": "^8.13.0",
     "pg-hstore": "^2.3.4",
     "sequelize": "^6.37.4",
-    "sequelize-cli": "^6.4.1",
     "sucrase": "^3.20.3",
     "typescript": "^4.6.2"
   },
   "devDependencies": {
-    "@types/node": "^17.0.21"
+    "@types/node": "^17.0.21",
+    "sequelize-cli": "^6.6.2"
   }
 }

package/spc_envfile.json

@@ -1,5 +1,8 @@
 {
     "DATABASE":{
-        "DATABASE":false
+        "DATABASE":"vini",
+        "USERNAME":"postgres",
+        "PASSWORD":"pass",
+        "PORT":5232
     }
 }

package/src/database/database.ts

@@ -1,5 +1,5 @@
-//@ts-ignore
 //@ts-nocheck
 import {Sequelize}  from "sequelize";
 import config from "./../settings/database/database";
-export const dataBase=new Sequelize(config);
+
+export const dataBase=new Sequelize(config);

package/src/settings/database/database.js

@@ -5,6 +5,7 @@ module.exports={
     database:ENV.DATABASE.database,
     username:ENV.DATABASE.username,
     password:ENV.DATABASE.password,
+    port:ENV.DATABASE.port,
     define:{
         underscored:true,
         timestamps:true,