namirasoft-node 1.1.4 → 1.1.6

package/src/IPOperation.ts

@@ -1,39 +1,39 @@
-import * as express from 'express';
-import { getClientIp } from '@supercharge/request-ip';
-import { RequestHeaderService } from './RequestHeaderService';
-import { ErrorOperation } from 'namirasoft-core';
-
-export class IPOperation
-{
-    static ERROR_MESSAGE_IP_IS_NOT_WHITELIST = `Ip does not match the whitelisted IP address: {0}`;
-    static getIP(req: express.Request): string
-    {
-        let ip = new RequestHeaderService(req, 'cf-connecting-ip').getString();
-        if (!ip)
-            ip = new RequestHeaderService(req, 'x-forwarded-for').getString();
-        if (!ip)
-            ip = getClientIp(req) ?? "";
-        ip = ip.split(',')[0];
-        return ip;
-    }
-    static isWhitelist(req: express.Request, whitelist: string[])
-    {
-        let ip = this.getIP(req);
-        if (!whitelist)
-            return true;
-        if (whitelist.length === 0)
-            return true;
-        if (whitelist.includes(ip))
-            return true;
-        for (let item of whitelist)
-            if (ip.substring(0, item.length) === item)
-                return true;
-        return false;
-    }
-    static checkWhitelist(req: express.Request, whitelist: string[])
-    {
-        let valid = this.isWhitelist(req, whitelist);
-        if (!valid)
-            ErrorOperation.throwHTTP(403, this.ERROR_MESSAGE_IP_IS_NOT_WHITELIST, this.getIP(req));
-    }
+import * as express from 'express';
+import { getClientIp } from '@supercharge/request-ip';
+import { RequestHeaderService } from './RequestHeaderService';
+import { ErrorOperation } from 'namirasoft-core';
+
+export class IPOperation
+{
+    static ERROR_MESSAGE_IP_IS_NOT_WHITELIST = `Ip does not match the whitelisted IP address: {0}`;
+    static getIP(req: express.Request): string
+    {
+        let ip = new RequestHeaderService(req, 'cf-connecting-ip').getString();
+        if (!ip)
+            ip = new RequestHeaderService(req, 'x-forwarded-for').getString();
+        if (!ip)
+            ip = getClientIp(req) ?? "";
+        ip = ip.split(',')[0];
+        return ip;
+    }
+    static isWhitelist(req: express.Request, whitelist: string[])
+    {
+        let ip = this.getIP(req);
+        if (!whitelist)
+            return true;
+        if (whitelist.length === 0)
+            return true;
+        if (whitelist.includes(ip))
+            return true;
+        for (let item of whitelist)
+            if (ip.substring(0, item.length) === item)
+                return true;
+        return false;
+    }
+    static checkWhitelist(req: express.Request, whitelist: string[])
+    {
+        let valid = this.isWhitelist(req, whitelist);
+        if (!valid)
+            ErrorOperation.throwHTTP(403, this.ERROR_MESSAGE_IP_IS_NOT_WHITELIST, this.getIP(req));
+    }
 }

package/src/Meta.ts

@@ -1,35 +1,35 @@
-import * as express from 'express';
-import { IncomingHttpHeaders } from "http";
-import { IPOperation } from './IPOperation';
-
-export class Meta
-{
-    ip: string;
-    method: string;
-    url: string;
-    headers: IncomingHttpHeaders;
-    body: any;
-    start_time: Date | null = null;
-    end_time: Date | null = null;
-    duration: number | null = null;
-    code: number = 200;
-    message: string = "Success";
-    error: Error | null = null;
-    constructor(req: express.Request)
-    {
-        this.ip = IPOperation.getIP(req);
-        this.method = req.method;
-        this.url = req.originalUrl;
-        this.headers = req.headers;
-        this.body = req.body;
-    }
-    onStart()
-    {
-        this.start_time = new Date();
-    }
-    onFinish()
-    {
-        this.end_time = new Date();
-        this.duration = (this.end_time?.getTime() ?? 0) - (this.start_time?.getTime() ?? 0);
-    }
+import * as express from 'express';
+import { IncomingHttpHeaders } from "http";
+import { IPOperation } from './IPOperation';
+
+export class Meta
+{
+    ip: string;
+    method: string;
+    url: string;
+    headers: IncomingHttpHeaders;
+    body: any;
+    start_time: Date | null = null;
+    end_time: Date | null = null;
+    duration: number | null = null;
+    code: number = 200;
+    message: string = "Success";
+    error: Error | null = null;
+    constructor(req: express.Request)
+    {
+        this.ip = IPOperation.getIP(req);
+        this.method = req.method;
+        this.url = req.originalUrl;
+        this.headers = req.headers;
+        this.body = req.body;
+    }
+    onStart()
+    {
+        this.start_time = new Date();
+    }
+    onFinish()
+    {
+        this.end_time = new Date();
+        this.duration = (this.end_time?.getTime() ?? 0) - (this.start_time?.getTime() ?? 0);
+    }
 }

package/src/OTPOperation.ts

@@ -1,65 +1,65 @@
-import { ErrorOperation, TimeOperation } from "namirasoft-core";
-
-export class OTPOperation 
-{
-    static generate(length: number = 6, digit: number = 3)
-    {
-        if (!length)
-            length = 6;
-        if (!digit)
-            digit = 3;
-        let dig = [];
-        for (let i = 0; i < digit; i++)
-            dig[i] = parseInt((Math.random() * 9 + 1) + "");
-        let ans = '';
-        for (let i = 0; i < length; i++)
-            ans = ans + '' + dig[parseInt((Math.random() * dig.length) + "")];
-        return ans;
-    }
-    static getWaitTime(min_wait_time: number, max_wait_time: number, min_attempt: number, user_attemptted: number, increase_power_base: number = 2): number
-    {
-        let wait_time = min_wait_time;
-        let extra_attempt = user_attemptted - min_attempt;
-        if (extra_attempt > 0)
-            wait_time = Math.min(Math.pow(increase_power_base, extra_attempt) * 60, max_wait_time);
-        return parseInt(wait_time + "");
-    }
-    static async onSafeRequest(handler: () => Promise<void>, min_wait_time: number, max_wait_time: number, min_try_count: number, user_tried_time: Date, user_tried_count: number, increase_power_base: number = 2)
-    {
-        // check wait time        
-        let wait_time = this.getWaitTime(min_wait_time, max_wait_time, min_try_count, user_tried_count, increase_power_base);
-        let wait_date = TimeOperation.minutesAgo(wait_time, new Date());
-        let next_time = TimeOperation.diffInSecond(user_tried_time, wait_date, false);
-        if (next_time > 0)
-        {
-            return {
-                error: 'Too many request, please try again in ' + next_time + ' seconds.',
-                next_time
-            };
-        }
-        await handler();
-        wait_time = this.getWaitTime(min_wait_time, max_wait_time, min_try_count, user_tried_count + 1, increase_power_base);
-        next_time = wait_time * 60;
-        return { next_time };
-    }
-    static async onSafeVerify(handler: () => Promise<void>, errorHandler: () => Promise<void>,
-        valid_otp: string, valid_otp_time: Date, otp_expire_time: number, max_try_count: number,
-        entered_otp: string, user_tried_count: number)
-    {
-        if (!entered_otp)
-            ErrorOperation.throwHTTP(403, "The OTP not generated yet.");
-
-        if (valid_otp_time < TimeOperation.minutesAgo(otp_expire_time, new Date()))
-            ErrorOperation.throwHTTP(403, "The OTP code expired. Please request again.");
-
-        if (user_tried_count > max_try_count)
-            ErrorOperation.throwHTTP(403, "The try limit attempt exceeded. Please request again.");
-
-        if (valid_otp !== entered_otp)
-        {
-            await errorHandler();
-            ErrorOperation.throwHTTP(403, "Wrong code.");
-        }
-        await handler();
-    }
+import { ErrorOperation, TimeOperation } from "namirasoft-core";
+
+export class OTPOperation 
+{
+    static generate(length: number = 6, digit: number = 3)
+    {
+        if (!length)
+            length = 6;
+        if (!digit)
+            digit = 3;
+        let dig = [];
+        for (let i = 0; i < digit; i++)
+            dig[i] = parseInt((Math.random() * 9 + 1) + "");
+        let ans = '';
+        for (let i = 0; i < length; i++)
+            ans = ans + '' + dig[parseInt((Math.random() * dig.length) + "")];
+        return ans;
+    }
+    static getWaitTime(min_wait_time: number, max_wait_time: number, min_attempt: number, user_attemptted: number, increase_power_base: number = 2): number
+    {
+        let wait_time = min_wait_time;
+        let extra_attempt = user_attemptted - min_attempt;
+        if (extra_attempt > 0)
+            wait_time = Math.min(Math.pow(increase_power_base, extra_attempt) * 60, max_wait_time);
+        return parseInt(wait_time + "");
+    }
+    static async onSafeRequest(handler: () => Promise<void>, min_wait_time: number, max_wait_time: number, min_try_count: number, user_tried_time: Date, user_tried_count: number, increase_power_base: number = 2)
+    {
+        // check wait time        
+        let wait_time = this.getWaitTime(min_wait_time, max_wait_time, min_try_count, user_tried_count, increase_power_base);
+        let wait_date = TimeOperation.minutesAgo(wait_time, new Date());
+        let next_time = TimeOperation.diffInSecond(user_tried_time, wait_date, false);
+        if (next_time > 0)
+        {
+            return {
+                error: 'Too many request, please try again in ' + next_time + ' seconds.',
+                next_time
+            };
+        }
+        await handler();
+        wait_time = this.getWaitTime(min_wait_time, max_wait_time, min_try_count, user_tried_count + 1, increase_power_base);
+        next_time = wait_time * 60;
+        return { next_time };
+    }
+    static async onSafeVerify(handler: () => Promise<void>, errorHandler: () => Promise<void>,
+        valid_otp: string, valid_otp_time: Date, otp_expire_time: number, max_try_count: number,
+        entered_otp: string, user_tried_count: number)
+    {
+        if (!entered_otp)
+            ErrorOperation.throwHTTP(403, "The OTP not generated yet.");
+
+        if (valid_otp_time < TimeOperation.minutesAgo(otp_expire_time, new Date()))
+            ErrorOperation.throwHTTP(403, "The OTP code expired. Please request again.");
+
+        if (user_tried_count > max_try_count)
+            ErrorOperation.throwHTTP(403, "The try limit attempt exceeded. Please request again.");
+
+        if (valid_otp !== entered_otp)
+        {
+            await errorHandler();
+            ErrorOperation.throwHTTP(403, "Wrong code.");
+        }
+        await handler();
+    }
 }

package/src/RequestHeaderService.ts

@@ -1,23 +1,23 @@
-import * as express from 'express';
-import { ConvertService, ObjectService } from 'namirasoft-core';
-
-export class RequestHeaderService extends ConvertService
-{
-    private req: express.Request;
-    private name: string;
-    constructor(req: express.Request, name: string, mandatory: boolean = false)
-    {
-        super(mandatory);
-        this.req = req;
-        this.name = name;
-    }
-    override getNullString()
-    {
-        let item = this.req.headers[this.name];
-        return new ObjectService(item).getNullString();
-    }
-    protected override onMandatoryError(): void
-    {
-        throw new Error(`Request Header value was not provided: ${this.name}`);
-    }
+import * as express from 'express';
+import { ConvertService, ObjectService } from 'namirasoft-core';
+
+export class RequestHeaderService extends ConvertService
+{
+    private req: express.Request;
+    private name: string;
+    constructor(req: express.Request, name: string, mandatory: boolean = false)
+    {
+        super(mandatory);
+        this.req = req;
+        this.name = name;
+    }
+    override getNullString()
+    {
+        let item = this.req.headers[this.name];
+        return new ObjectService(item).getNullString();
+    }
+    protected override onMandatoryError(): void
+    {
+        throw new Error(`Request Header value was not provided: ${this.name}`);
+    }
 }

package/src/ServerToServerOperation.ts

@@ -1,24 +1,24 @@
-import * as express from 'express';
-import { ErrorOperation, SignOperation } from "namirasoft-core";
-import { RequestHeaderService } from './RequestHeaderService';
-
-export class ServerToServerOperation 
-{
-    static isValid(sign_key: string, data: any, req: express.Request, sign_header: string): boolean
-    {
-        let signature = new RequestHeaderService(req, sign_header).getString();
-        return SignOperation.isValid(sign_key, data, signature);
-    }
-    static check(sign_key: string, data: any, req: express.Request, sign_header: string): void
-    {
-        if (!sign_key)
-            ErrorOperation.throwHTTP(401, "Invlid signature - No sign key.");
-        if (!sign_header)
-            ErrorOperation.throwHTTP(401, "Invlid signature - No sign header name.");
-        let signature = new RequestHeaderService(req, sign_header).getString();
-        if (!signature)
-            ErrorOperation.throwHTTP(401, "Invlid signature - No signature.");
-        if (!this.isValid(sign_key, data, req, sign_header))
-            ErrorOperation.throwHTTP(401, "Invlid signature.");
-    }
+import * as express from 'express';
+import { ErrorOperation, SignOperation } from "namirasoft-core";
+import { RequestHeaderService } from './RequestHeaderService';
+
+export class ServerToServerOperation 
+{
+    static isValid(sign_key: string, data: any, req: express.Request, sign_header: string): boolean
+    {
+        let signature = new RequestHeaderService(req, sign_header).getString();
+        return SignOperation.isValid(sign_key, data, signature);
+    }
+    static check(sign_key: string, data: any, req: express.Request, sign_header: string): void
+    {
+        if (!sign_key)
+            ErrorOperation.throwHTTP(401, "Invlid signature - No sign key.");
+        if (!sign_header)
+            ErrorOperation.throwHTTP(401, "Invlid signature - No sign header name.");
+        let signature = new RequestHeaderService(req, sign_header).getString();
+        if (!signature)
+            ErrorOperation.throwHTTP(401, "Invlid signature - No signature.");
+        if (!this.isValid(sign_key, data, req, sign_header))
+            ErrorOperation.throwHTTP(401, "Invlid signature.");
+    }
 }

package/src/index.ts

@@ -1,17 +1,17 @@
-export * from "./AnomalyDetector";
-export * from "./BaseApplication";
-export * from "./BaseApplicationLink";
-export * from "./BaseController";
-export * from "./BaseDatabase";
-export * from "./BaseMySqlDatabase";
-export * from "./BaseSequelizeDatabase";
-export * from "./BaseSequelizeModel";
-export * from "./BaseSequelizeTable";
-export * from "./BaseTable";
-export * from "./EmailService";
-export * from "./EnvService";
-export * from "./IPOperation";
-export * from "./Meta";
-export * from "./OTPOperation";
-export * from "./RequestHeaderService";
+export * from "./AnomalyDetector";
+export * from "./BaseApplication";
+export * from "./BaseApplicationLink";
+export * from "./BaseController";
+export * from "./BaseDatabase";
+export * from "./BaseMySqlDatabase";
+export * from "./BaseSequelizeDatabase";
+export * from "./BaseSequelizeModel";
+export * from "./BaseSequelizeTable";
+export * from "./BaseTable";
+export * from "./EmailService";
+export * from "./EnvService";
+export * from "./IPOperation";
+export * from "./Meta";
+export * from "./OTPOperation";
+export * from "./RequestHeaderService";
 export * from "./ServerToServerOperation";

package/tsconfig.json

@@ -1,30 +1,30 @@
-{
-    "compilerOptions": {
-        "target": "ES6",
-        "module": "CommonJS",
-        "rootDir": "./src",
-        "outDir": "./dist",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "allowJs": false,
-        "checkJs": false,
-        "strict": true,
-        "esModuleInterop": true,
-        "sourceMap": true,
-        "resolveJsonModule": true,
-        "declaration": true,
-        "noUnusedLocals": true,
-        "noUnusedParameters": true,
-        "noImplicitAny": true,
-        "noImplicitOverride": true,
-        "noImplicitReturns": true,
-        "noImplicitThis": true,
-        "skipLibCheck": false,
-        "allowSyntheticDefaultImports": true,
-        "forceConsistentCasingInFileNames": true,
-        "noFallthroughCasesInSwitch": true,
-        "isolatedModules": false,
-    }
+{
+    "compilerOptions": {
+        "target": "ES6",
+        "module": "CommonJS",
+        "rootDir": "./src",
+        "outDir": "./dist",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "allowJs": false,
+        "checkJs": false,
+        "strict": true,
+        "esModuleInterop": true,
+        "sourceMap": true,
+        "resolveJsonModule": true,
+        "declaration": true,
+        "noUnusedLocals": true,
+        "noUnusedParameters": true,
+        "noImplicitAny": true,
+        "noImplicitOverride": true,
+        "noImplicitReturns": true,
+        "noImplicitThis": true,
+        "skipLibCheck": false,
+        "allowSyntheticDefaultImports": true,
+        "forceConsistentCasingInFileNames": true,
+        "noFallthroughCasesInSwitch": true,
+        "isolatedModules": false,
+    }
 }