namirasoft-node 1.4.21 → 1.4.23

package/src/OTPOperation.ts

@@ -1,72 +1,91 @@
-import { ErrorOperation, TimeOperation } from "namirasoft-core";
-
-export class OTPOperation 
-{
-    public static OTP_MIN_WAIT_TIME: number = 1; // minutes
-    public static OTP_MAX_WAIT_TIME: number = 1440; // minutes
-    public static OTP_EXPIRE_TIME: number = 5; // minutes
-    public static INCREASE_POWER_BASE: number = 2;
-
-    public static OTP_REQ_MAX_TRY_COUNT: number = 3;
-    public static OTP_VER_MAX_TRY_COUNT: number = 3;
-
-    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(x_otp_req_tried_count: number): number
-    {
-        let wait_time = OTPOperation.OTP_MIN_WAIT_TIME;
-        let extra_attempt = x_otp_req_tried_count - OTPOperation.OTP_REQ_MAX_TRY_COUNT;
-        if (extra_attempt >= 0)
-            wait_time = Math.min(Math.pow(OTPOperation.INCREASE_POWER_BASE, extra_attempt) * 60, OTPOperation.OTP_MAX_WAIT_TIME);
-        return parseInt(wait_time + "");
-    }
-    static async onSafeRequest(x_otp_time: Date | null, x_otp_req_tried_count: number, handler: () => Promise<void>)
-    {
-        // check wait time        
-        let wait_time = this.getWaitTime(x_otp_req_tried_count);
-        let wait_date = TimeOperation.minutesAgo(wait_time, new Date());
-        let next_time = TimeOperation.diffInSecond(x_otp_time ?? new Date("0001-01-01"), 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(x_otp_req_tried_count + 1);
-        next_time = wait_time * 60;
-        return { next_time };
-    }
-    static async onSafeVerify(x_otp: string | null, x_otp_time: Date | null, x_otp_ver_tried_count: number, code: string,
-        handler: () => Promise<void>, errorHandler: () => Promise<void>)
-    {
-        if (!x_otp || !x_otp_time)
-            throw ErrorOperation.getHTTP(403, "The OTP not generated yet. Please request first.");
-
-        if (x_otp_time < TimeOperation.minutesAgo(OTPOperation.OTP_EXPIRE_TIME, new Date()))
-            ErrorOperation.throwHTTP(403, "The OTP code expired. Please request again.");
-
-        if (x_otp_ver_tried_count > OTPOperation.OTP_VER_MAX_TRY_COUNT)
-            ErrorOperation.throwHTTP(403, "The try limit attempt exceeded. Please request again.");
-
-        if (x_otp !== code)
-        {
-            await errorHandler();
-            ErrorOperation.throwHTTP(403, "Wrong code.");
-        }
-        await handler();
-    }
+import { ErrorOperation, TimeOperation } from "namirasoft-core";
+
+export class OTPOperation 
+{
+    public static OTP_MIN_WAIT_TIME: number = 1; // minutes
+    public static OTP_MAX_WAIT_TIME: number = 1440; // minutes
+    public static OTP_EXPIRE_TIME: number = 5; // minutes
+    public static INCREASE_POWER_BASE: number = 2;
+
+    public static OTP_REQ_MAX_TRY_COUNT: number = 3;
+    public static OTP_VER_MAX_TRY_COUNT: number = 3;
+
+    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(x_otp_req_tried_count: number): number
+    {
+        let wait_time = OTPOperation.OTP_MIN_WAIT_TIME;
+        let extra_attempt = x_otp_req_tried_count - OTPOperation.OTP_REQ_MAX_TRY_COUNT;
+        if (extra_attempt >= 0)
+            wait_time = Math.min(Math.pow(OTPOperation.INCREASE_POWER_BASE, extra_attempt) * 60, OTPOperation.OTP_MAX_WAIT_TIME);
+        return parseInt(wait_time + "");
+    }
+    static async onSafeRequest(x_otp: string | null, x_otp_time: Date | null, x_otp_req_tried_count: number,
+        handler: (row: { x_otp: string, x_otp_time: Date, x_otp_req_tried_count: number, x_otp_ver_tried_count: number }) => Promise<void>)
+    {
+        // check wait time        
+        let wait_time = this.getWaitTime(x_otp_req_tried_count);
+        let wait_date = TimeOperation.minutesAgo(wait_time, new Date());
+        let next_time = TimeOperation.diffInSecond(x_otp_time ?? new Date("0001-01-01"), wait_date, false);
+        if (next_time > 0)
+        {
+            return {
+                error: 'Too many request, please try again in ' + next_time + ' seconds.',
+                next_time
+            };
+        }
+
+        let x_otp_ver_tried_count = 0;
+        if (!x_otp)
+            x_otp_req_tried_count = 0;
+        x_otp = OTPOperation.generate(6, 3);
+        x_otp_time = new Date();
+        x_otp_req_tried_count += 1;
+
+        await handler({ x_otp, x_otp_time, x_otp_req_tried_count, x_otp_ver_tried_count });
+
+        wait_time = this.getWaitTime(x_otp_req_tried_count);
+        next_time = wait_time * 60;
+        return { next_time };
+    }
+    static async onSafeVerify(x_otp: string | null, x_otp_time: Date | null, x_otp_ver_tried_count: number, code: string,
+        handler: (row: {
+            x_otp: string | null,
+            x_otp_time: Date | null,
+            x_verified: boolean,
+        }) => Promise<void>,
+        errorHandler: () => Promise<void>)
+    {
+        if (!x_otp || !x_otp_time)
+            throw ErrorOperation.getHTTP(403, "The OTP not generated yet. Please request first.");
+
+        if (x_otp_time < TimeOperation.minutesAgo(OTPOperation.OTP_EXPIRE_TIME, new Date()))
+            ErrorOperation.throwHTTP(403, "The OTP code expired. Please request again.");
+
+        if (x_otp_ver_tried_count > OTPOperation.OTP_VER_MAX_TRY_COUNT)
+            ErrorOperation.throwHTTP(403, "The try limit attempt exceeded. Please request again.");
+
+        if (x_otp !== code)
+        {
+            await errorHandler();
+            ErrorOperation.throwHTTP(403, "Wrong code.");
+        }
+        await handler({
+            x_otp: null,
+            x_otp_time: null,
+            x_verified: true,
+        });
+    }
 }

package/src/RequestHeaderService.ts

@@ -1,28 +1,28 @@
-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()
-    {
-        if (this.req)
-            if (this.req.headers)
-            {
-                let item = this.req.headers[this.name];
-                return new ObjectService(item).getNullString();
-            }
-        return null;
-    }
-    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()
+    {
+        if (this.req)
+            if (this.req.headers)
+            {
+                let item = this.req.headers[this.name];
+                return new ObjectService(item).getNullString();
+            }
+        return null;
+    }
+    protected override onMandatoryError(): void
+    {
+        throw new Error(`Request Header value was not provided: ${this.name}`);
+    }
 }

package/src/SMTPService.ts

@@ -1,27 +1,27 @@
-import { BaseEmailService } from './BaseEmailService';
-
-export class SMTPService extends BaseEmailService
-{
-    host: string;
-    port: number;
-    password: string;
-    constructor(host: string, port: number, username: string, password: string)
-    {
-        super(username);
-        this.host = host;
-        this.port = port;
-        this.password = password;
-    }
-    protected override getTransform(): any
-    {
-        return {
-            host: this.host,
-            port: this.port,
-            secure: true,
-            auth: {
-                user: this.username,
-                pass: this.password
-            }
-        };
-    }
+import { BaseEmailService } from './BaseEmailService';
+
+export class SMTPService extends BaseEmailService
+{
+    host: string;
+    port: number;
+    password: string;
+    constructor(host: string, port: number, username: string, password: string)
+    {
+        super(username);
+        this.host = host;
+        this.port = port;
+        this.password = password;
+    }
+    protected override getTransform(): any
+    {
+        return {
+            host: this.host,
+            port: this.port,
+            secure: true,
+            auth: {
+                user: this.username,
+                pass: this.password
+            }
+        };
+    }
 }

package/src/ServerToServerOperation.ts

@@ -1,24 +1,24 @@
-import * as express from 'express';
-import { ErrorOperation, HashOperation } 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 HashOperation.isValidSHA256Secret(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, HashOperation } 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 HashOperation.isValidSHA256Secret(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 "./BaseCron";
-export * from "./BaseDatabase";
-export * from "./BaseEmailService";
-export * from "./BaseTable";
-export * from "./CommandOperation";
-export * from "./EmptyDatabase";
-export * from "./GmailService";
-export * from "./IPOperation";
-export * from "./Meta";
-export * from "./OTPOperation";
-export * from "./RequestHeaderService";
-export * from "./ServerToServerOperation";
+export * from "./AnomalyDetector";
+export * from "./BaseApplication";
+export * from "./BaseApplicationLink";
+export * from "./BaseController";
+export * from "./BaseCron";
+export * from "./BaseDatabase";
+export * from "./BaseEmailService";
+export * from "./BaseTable";
+export * from "./CommandOperation";
+export * from "./EmptyDatabase";
+export * from "./GmailService";
+export * from "./IPOperation";
+export * from "./Meta";
+export * from "./OTPOperation";
+export * from "./RequestHeaderService";
+export * from "./ServerToServerOperation";
 export * from "./SMTPService";