badmfck-api-server 1.2.2 → 1.2.4

package/dist/apiServer/APIService.js

@@ -42,7 +42,7 @@ async function Initializer(services) {
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
     static nextLogID = 0;
-    version = "1.2.2";
+    version = "1.2.3";
     options;
     netLog = [];
     constructor(options) {

package/dist/apiServer/MysqlService.d.ts

@@ -37,6 +37,7 @@ export declare class MysqlService extends BaseService {
     pool: Pool | null;
     options: MysqlServiceOptions;
     serviceStarted: boolean;
+    timeoutID: any;
     queries: never[];
     constructor(options: MysqlServiceOptions);
     static executeQuery(query: MySqlQuery | MySqlQuery[]): Promise<MysqlResult[]>;

package/dist/apiServer/MysqlService.js

@@ -7,6 +7,7 @@ exports.MysqlService = exports.executeQuery = exports.REQ_MYSQL_QUERY = void 0;
 const mysql_1 = __importDefault(require("mysql"));
 const BaseService_1 = require("./BaseService");
 const badmfck_signal_1 = require("badmfck-signal");
+const crypto_1 = require("crypto");
 exports.REQ_MYSQL_QUERY = new badmfck_signal_1.Req("REQ_MYSQL_QUERY");
 const executeQuery = async (query) => { return await exports.REQ_MYSQL_QUERY.request(query); };
 exports.executeQuery = executeQuery;
@@ -16,10 +17,17 @@ class MysqlService extends BaseService_1.BaseService {
     pool = null;
     options;
     serviceStarted = false;
+    timeoutID;
     queries = [];
     constructor(options) {
         super("mysql");
         this.options = options;
+        if (this.options.host.startsWith("_"))
+            this.options.host = decrypt(this.options.host) ?? this.options.host;
+        if (this.options.user.startsWith("_"))
+            this.options.user = decrypt(this.options.user) ?? this.options.user;
+        if (this.options.database.startsWith("_"))
+            this.options.database = decrypt(this.options.database) ?? this.options.database;
     }
     static async executeQuery(query) { return await exports.REQ_MYSQL_QUERY.request(query); }
     async init() {
@@ -44,7 +52,9 @@ class MysqlService extends BaseService_1.BaseService {
         if (!ok) {
             if (this.options.onLog)
                 this.options.onLog(2, "Mysql server not connected, retrying in 3 sec");
-            setTimeout(() => { this.recreatePool(); }, 3000);
+            if (this.timeoutID)
+                clearTimeout(this.timeoutID);
+            this.timeoutID = setTimeout(() => { this.recreatePool(); }, 3000);
         }
         else {
             this.serviceStarted = true;
@@ -136,10 +146,6 @@ class MysqlService extends BaseService_1.BaseService {
                 });
                 return;
             }
-            this.pool.on("error", (evt) => {
-                if (this.options.onLog)
-                    this.options.onLog(2, `${evt}`);
-            });
             this.pool.getConnection((err, conn) => {
                 if (err) {
                     if (this.options.onLog)
@@ -250,6 +256,19 @@ class MysqlService extends BaseService_1.BaseService {
         if (this.options.onLog)
             this.options.onLog(1, "Connecting to mysql: \n HOST: " + this.options.host + '\n USER:' + this.options.user + '\n PORT:' + this.options.port);
         let err = false;
+        if (this.pool) {
+            try {
+                this.pool.removeAllListeners();
+                this.pool.end(err => {
+                    if (err && this.options.onLog)
+                        this.options.onLog(2, err);
+                });
+            }
+            catch (e) {
+                if (this.options.onLog)
+                    this.options.onLog(2, e);
+            }
+        }
         try {
             this.pool = mysql_1.default.createPool({
                 connectionLimit: this.options.connectionLimit,
@@ -266,7 +285,12 @@ class MysqlService extends BaseService_1.BaseService {
                 this.options.onLog(2, "Can't connect to MYSQL!");
             err = true;
         }
-        2;
+        if (!err && this.pool) {
+            this.pool.on("error", (evt) => {
+                if (this.options.onLog)
+                    this.options.onLog(2, `${evt}`);
+            });
+        }
         return new Promise((res, rej) => {
             if (err) {
                 res(false);
@@ -289,4 +313,30 @@ class MysqlService extends BaseService_1.BaseService {
     }
 }
 exports.MysqlService = MysqlService;
+const secret_key = "AKLWkajw%^&dgwqhw#98453i23bfk23rn2knknglrgjeit";
+const secret_iv = "rthadrfk23rn2kn#*FNKA@gt44df3tslrgj##!it";
+const key = (0, crypto_1.createHash)('sha512').update(secret_key).digest('hex').substring(0, 32);
+const iv = (0, crypto_1.createHash)('sha512').update(secret_iv).digest('hex').substring(0, 16);
+const decrypt = (encrypted) => {
+    try {
+        encrypted = Buffer.from(encrypted, 'base64').toString('binary');
+        const decipher = (0, crypto_1.createDecipheriv)('aes-256-cbc', key, iv);
+        let decrypted = decipher.update(encrypted, 'binary', 'utf8');
+        decrypted += decipher.final('utf8');
+        return decrypted;
+    }
+    catch (e) {
+        return null;
+    }
+};
+const encrypt = (txt) => {
+    try {
+        let encipher = (0, crypto_1.createCipheriv)('aes-256-cbc', key, iv), encrypted = encipher.update(txt, 'utf8', 'binary');
+        encrypted += encipher.final('binary');
+        return Buffer.from(encrypted, 'binary').toString('base64');
+    }
+    catch (e) {
+        return null;
+    }
+};
 exports.default = MysqlService;

package/dist/apiServer/helper/Validator.d.ts

@@ -0,0 +1,18 @@
+export interface IValidatorOptions {
+    min?: number;
+    max?: number;
+    type?: "string" | "boolean" | "number";
+    regex?: RegExp;
+}
+export declare enum ValidationReport {
+    OK = 1,
+    VALUE_IS_NULL = 2,
+    TYPE_MISSMATCH = 3,
+    VALUE_TOO_BIG = 4,
+    VALUE_TOO_SHORT = 5,
+    VALUE_INCORRECT = 6
+}
+export declare class Validator {
+    static validateObject(fields: string[], object: any): boolean;
+    static validateValue(value: string | number | boolean, opt?: IValidatorOptions): ValidationReport;
+}

package/dist/apiServer/helper/Validator.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Validator = exports.ValidationReport = void 0;
+var ValidationReport;
+(function (ValidationReport) {
+    ValidationReport[ValidationReport["OK"] = 1] = "OK";
+    ValidationReport[ValidationReport["VALUE_IS_NULL"] = 2] = "VALUE_IS_NULL";
+    ValidationReport[ValidationReport["TYPE_MISSMATCH"] = 3] = "TYPE_MISSMATCH";
+    ValidationReport[ValidationReport["VALUE_TOO_BIG"] = 4] = "VALUE_TOO_BIG";
+    ValidationReport[ValidationReport["VALUE_TOO_SHORT"] = 5] = "VALUE_TOO_SHORT";
+    ValidationReport[ValidationReport["VALUE_INCORRECT"] = 6] = "VALUE_INCORRECT";
+})(ValidationReport || (exports.ValidationReport = ValidationReport = {}));
+class Validator {
+    static validateObject(fields, object) {
+        if (!object || typeof object !== "object")
+            return false;
+        for (let i of fields) {
+            if (!(i in object) || object[i] === undefined)
+                return false;
+        }
+        return true;
+    }
+    static validateValue(value, opt) {
+        if (!value)
+            return ValidationReport.VALUE_IS_NULL;
+        if (!opt)
+            return ValidationReport.OK;
+        if (!opt.type)
+            opt.type = "string";
+        if (opt.type === "boolean") {
+            if (typeof value === "boolean")
+                return ValidationReport.OK;
+            if (typeof value === "number" && (value === 1 || value === 0))
+                return ValidationReport.OK;
+            return ValidationReport.TYPE_MISSMATCH;
+        }
+        if (opt.type === "number") {
+            if (typeof value !== "number")
+                return ValidationReport.TYPE_MISSMATCH;
+            if (opt.max && value > opt.max)
+                return ValidationReport.VALUE_TOO_BIG;
+            if (opt.min && value < opt.min)
+                return ValidationReport.VALUE_TOO_BIG;
+            return ValidationReport.OK;
+        }
+        if (typeof value !== "string")
+            return ValidationReport.TYPE_MISSMATCH;
+        if (opt.max && value.length > opt.max)
+            return ValidationReport.VALUE_TOO_BIG;
+        if (opt.min && value.length < opt.min)
+            return ValidationReport.VALUE_TOO_SHORT;
+        if (opt.regex) {
+            const tmp = value.replaceAll(opt.regex, "");
+            if (tmp.length !== 0)
+                return ValidationReport.VALUE_INCORRECT;
+        }
+        return ValidationReport.OK;
+    }
+}
+exports.Validator = Validator;

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { APIService, Initializer } from "./apiServer/APIService";
 import { LocalRequest } from "./apiServer/LocalRequest";
 import { MysqlService } from "./apiServer/MysqlService";
-export { APIService, Initializer, LocalRequest, MysqlService };
+import { Validator } from "./apiServer/helper/Validator";
+export { APIService, Initializer, LocalRequest, MysqlService, Validator };

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlService = exports.LocalRequest = exports.Initializer = exports.APIService = void 0;
+exports.Validator = exports.MysqlService = exports.LocalRequest = exports.Initializer = exports.APIService = void 0;
 const APIService_1 = require("./apiServer/APIService");
 Object.defineProperty(exports, "APIService", { enumerable: true, get: function () { return APIService_1.APIService; } });
 Object.defineProperty(exports, "Initializer", { enumerable: true, get: function () { return APIService_1.Initializer; } });
@@ -8,3 +8,5 @@ const LocalRequest_1 = require("./apiServer/LocalRequest");
 Object.defineProperty(exports, "LocalRequest", { enumerable: true, get: function () { return LocalRequest_1.LocalRequest; } });
 const MysqlService_1 = require("./apiServer/MysqlService");
 Object.defineProperty(exports, "MysqlService", { enumerable: true, get: function () { return MysqlService_1.MysqlService; } });
+const Validator_1 = require("./apiServer/helper/Validator");
+Object.defineProperty(exports, "Validator", { enumerable: true, get: function () { return Validator_1.Validator; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "badmfck-api-server",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "Simple API http server based on express",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",