namirasoft-cost 1.4.20 → 1.4.22

package/src/command/{FieldFieldEstimationCommand.ts → SecretSecretEstimateReadCommand.ts}

@@ -23,7 +23,7 @@ import { IStorageMemoryDedicated } from "namirasoft-core";
 import { NamirasoftCostServer } from "../NamirasoftCostServer";
 import { TokenManager } from "namirasoft-account";
 
-export class FieldFieldEstimationCommand extends BaseFinalCommand
+export class SecretSecretEstimateReadCommand extends BaseFinalCommand
 {
     constructor(argv: string[])
     {
@@ -37,27 +37,27 @@ export class FieldFieldEstimationCommand extends BaseFinalCommand
                 defaults: [""]
             },
             {
-                name: "row_number",
+                name: "period",
                 short: "",
-                description: "Provides the value of 'row_number' in body",
+                description: "Provides the value of 'period' in body",
                 optional: false,
-                args: ["row_number"],
+                args: ["period"],
                 defaults: [""]
             },
             {
-                name: "active",
+                name: "total",
                 short: "",
-                description: "Provides the value of 'active' in body",
+                description: "Provides the value of 'total' in body",
                 optional: false,
-                args: ["active"],
+                args: ["total"],
                 defaults: [""]
             },
             {
-                name: "period",
+                name: "count",
                 short: "",
-                description: "Provides the value of 'period' in body",
+                description: "Provides the value of 'count' in body",
                 optional: false,
-                args: ["period"],
+                args: ["count"],
                 defaults: [""]
             }
             ]);
@@ -72,11 +72,11 @@ export class FieldFieldEstimationCommand extends BaseFinalCommand
         manager.setValue(token, false);
         let url = this.app.storage.getItem("ns-cost-server-url");
         let server = new NamirasoftCostServer(url, manager, e => this.app.logger.error(e.message));
-        let ans = await server.field_field.Estimation({
+        let ans = await server.secret_secret.EstimateRead({
             first_entity_created_at: this.option_values.first_entity_created_at,
-            row_number: this.option_values.row_number,
-            active: this.option_values.active,
-            period: this.option_values.period
+            period: this.option_values.period,
+            total: this.option_values.total,
+            count: this.option_values.count
         });
         this.app.logger.success(JSON.stringify(ans));
     }

package/src/command/{BillWatchAWS_CreateForCommand.ts → SecretSecret_CreateForHourlyCommand.ts}

@@ -23,7 +23,7 @@ import { IStorageMemoryDedicated } from "namirasoft-core";
 import { NamirasoftCostServer } from "../NamirasoftCostServer";
 import { TokenManager } from "namirasoft-account";
 
-export class BillWatchAWS_CreateForCommand extends BaseFinalCommand
+export class SecretSecret_CreateForHourlyCommand extends BaseFinalCommand
 {
     constructor(argv: string[])
     {
@@ -36,6 +36,14 @@ export class BillWatchAWS_CreateForCommand extends BaseFinalCommand
                 args: ["first_entity_created_at"],
                 defaults: [""]
             },
+            {
+                name: "period",
+                short: "",
+                description: "Provides the value of 'period' in body",
+                optional: false,
+                args: ["period"],
+                defaults: [""]
+            },
             {
                 name: "row_number",
                 short: "",
@@ -52,14 +60,6 @@ export class BillWatchAWS_CreateForCommand extends BaseFinalCommand
                 args: ["active"],
                 defaults: [""]
             },
-            {
-                name: "period",
-                short: "",
-                description: "Provides the value of 'period' in body",
-                optional: false,
-                args: ["period"],
-                defaults: [""]
-            },
             {
                 name: "workspace_id",
                 short: "",
@@ -88,11 +88,11 @@ export class BillWatchAWS_CreateForCommand extends BaseFinalCommand
         manager.setValue(token, false);
         let url = this.app.storage.getItem("ns-cost-server-url");
         let server = new NamirasoftCostServer(url, manager, e => this.app.logger.error(e.message));
-        let ans = await server.bill_watch_aws._CreateFor(this.arg_values[0], {
+        let ans = await server.secret_secret._CreateForHourly(this.arg_values[0], {
             first_entity_created_at: this.option_values.first_entity_created_at,
+            period: this.option_values.period,
             row_number: this.option_values.row_number,
             active: this.option_values.active,
-            period: this.option_values.period,
             workspace_id: this.option_values.workspace_id,
             resource_id: this.option_values.resource_id
         });

package/src/command/{FieldField_CreateForCommand.ts → SecretSecret_CreateForReadCommand.ts}

@@ -23,7 +23,7 @@ import { IStorageMemoryDedicated } from "namirasoft-core";
 import { NamirasoftCostServer } from "../NamirasoftCostServer";
 import { TokenManager } from "namirasoft-account";
 
-export class FieldField_CreateForCommand extends BaseFinalCommand
+export class SecretSecret_CreateForReadCommand extends BaseFinalCommand
 {
     constructor(argv: string[])
     {
@@ -37,27 +37,27 @@ export class FieldField_CreateForCommand extends BaseFinalCommand
                 defaults: [""]
             },
             {
-                name: "row_number",
+                name: "period",
                 short: "",
-                description: "Provides the value of 'row_number' in body",
+                description: "Provides the value of 'period' in body",
                 optional: false,
-                args: ["row_number"],
+                args: ["period"],
                 defaults: [""]
             },
             {
-                name: "active",
+                name: "total",
                 short: "",
-                description: "Provides the value of 'active' in body",
+                description: "Provides the value of 'total' in body",
                 optional: false,
-                args: ["active"],
+                args: ["total"],
                 defaults: [""]
             },
             {
-                name: "period",
+                name: "count",
                 short: "",
-                description: "Provides the value of 'period' in body",
+                description: "Provides the value of 'count' in body",
                 optional: false,
-                args: ["period"],
+                args: ["count"],
                 defaults: [""]
             },
             {
@@ -88,11 +88,11 @@ export class FieldField_CreateForCommand extends BaseFinalCommand
         manager.setValue(token, false);
         let url = this.app.storage.getItem("ns-cost-server-url");
         let server = new NamirasoftCostServer(url, manager, e => this.app.logger.error(e.message));
-        let ans = await server.field_field._CreateFor(this.arg_values[0], {
+        let ans = await server.secret_secret._CreateForRead(this.arg_values[0], {
             first_entity_created_at: this.option_values.first_entity_created_at,
-            row_number: this.option_values.row_number,
-            active: this.option_values.active,
             period: this.option_values.period,
+            total: this.option_values.total,
+            count: this.option_values.count,
             workspace_id: this.option_values.workspace_id,
             resource_id: this.option_values.resource_id
         });

package/src/command/cli.ts

@@ -30,6 +30,7 @@ import { FieldCategoryCommand } from "./FieldCategoryCommand";
 import { FieldFieldCommand } from "./FieldFieldCommand";
 import { HealthzCommand } from "./HealthzCommand";
 import { MetricsCommand } from "./MetricsCommand";
+import { SecretSecretCommand } from "./SecretSecretCommand";
 import { ValueCommand } from "./ValueCommand";
 
 let app = new Application("ns-cost", new BaseStorage(), 
@@ -42,6 +43,7 @@ let app = new Application("ns-cost", new BaseStorage(),
         "billwatchgcp": BillWatchGCPCommand,
         "fieldcategory": FieldCategoryCommand,
         "fieldfield": FieldFieldCommand,
+        "secretsecret": SecretSecretCommand,
         "cost": CostCommand,
         "account": AccountCommand,
         "config": (argv: string[]) => new ConfigCommand(argv, ["ns-cost-server-url"])

package/src/estimator/BaseEstimator.ts

@@ -0,0 +1,63 @@
+import { EstimationOption } from "../type/EstimationOption";
+import { BaseBonus } from "../bonus/BaseBonus";
+import { Estimation } from "../type/Estimation";
+import { PeriodUtil } from "../type/Period";
+
+export abstract class BaseEstimator
+{
+    async estimate(option: EstimationOption, calculate_bonus: boolean = true): Promise<Estimation[]>
+    {
+        let seconds = PeriodUtil.toSeconds(option.period);
+        let percent = seconds / 3600;
+        let fee_object = this.getFee();
+        let fee = option.active ? fee_object.active : fee_object.deactive;
+
+        let amount = percent * fee * option.value;
+        let currency = "USD";
+
+        let estimation: Estimation = {
+            option,
+            seconds,
+            usage: {
+                value: option.value,
+                ...this.getUsage()
+            },
+            fee,
+            amount,
+            currency,
+            free: undefined
+        };
+
+        let ans: Estimation[] = [];
+        if (calculate_bonus)
+        {
+            let bonuses = this.getBonues();
+            for (let bonus of bonuses)
+            {
+                let res = await bonus.isFree(option, estimation);
+                if (res.free)
+                {
+                    if (res.split)
+                    {
+                        let estimation_free = await this.estimate(res.split.free, false);
+                        estimation_free.forEach(e => { e.free = bonus; });
+                        ans.push(...estimation_free);
+                        for (let estimation_paid of res.split.paids)
+                            ans.push(...await this.estimate(estimation_paid, false));
+                    }
+                    else
+                    {
+                        estimation.free = bonus;
+                        ans.push(estimation);
+                    }
+                    break;
+                }
+            }
+        }
+
+        return ans;
+    }
+    abstract getFee(): { active: number, deactive: number };
+    abstract getUsage(): { name: string, unit: string };
+    abstract getBonues(): BaseBonus[];
+}

package/src/estimator/BillWatchAWSHourlyEstimator.ts

@@ -0,0 +1,5 @@
+import { BillWatchBaseHourlyEstimator } from "./BillWatchBaseHourlyEstimator";
+
+export class BillWatchAWSHourlyEstimator extends BillWatchBaseHourlyEstimator
+{
+}

package/src/estimator/BillWatchAzureHourlyEstimator.ts

@@ -0,0 +1,5 @@
+import { BillWatchBaseHourlyEstimator } from "./BillWatchBaseHourlyEstimator";
+
+export class BillWatchAzureHourlyEstimator extends BillWatchBaseHourlyEstimator
+{
+}

package/src/estimator/BillWatchBaseHourlyEstimator.ts

@@ -0,0 +1,26 @@
+import { DurationUnit, PriceOperation } from "namirasoft-core";
+import { BaseEstimator } from "./BaseEstimator";
+import { Usage } from "../type/Usage";
+import { TrialBonus } from "../bonus/TrialBonus";
+
+export abstract class BillWatchBaseHourlyEstimator extends BaseEstimator
+{
+    static WATCH_PER_HOUR_ACTIVE = PriceOperation.cent_to_millicent(3);
+    override getFee()
+    {
+        return { active: BillWatchBaseHourlyEstimator.WATCH_PER_HOUR_ACTIVE, deactive: 0 };
+    }
+    override getUsage()
+    {
+        return {
+            name: Usage.Time.name,
+            unit: Usage.Time.units.Hour.name
+        };
+    }
+    override getBonues()
+    {
+        return [
+            new TrialBonus(1, DurationUnit.Week)
+        ];
+    }
+}

package/src/estimator/BillWatchGCPHourlyEstimator.ts

@@ -0,0 +1,5 @@
+import { BillWatchBaseHourlyEstimator } from "./BillWatchBaseHourlyEstimator";
+
+export class BillWatchGCPHourlyEstimator extends BillWatchBaseHourlyEstimator
+{
+}

package/src/estimator/FieldBaseHourlyEstimator.ts

@@ -0,0 +1,21 @@
+import { DurationUnit } from "namirasoft-core";
+import { TrialBonus } from "../bonus/TrialBonus";
+import { BaseEstimator } from "./BaseEstimator";
+import { Usage } from "../type/Usage";
+
+export abstract class FieldBaseHourlyEstimator extends BaseEstimator
+{
+    override getBonues()
+    {
+        return [
+            new TrialBonus(1, DurationUnit.Week)
+        ];
+    }
+    override getUsage()
+    {
+        return {
+            name: Usage.Time.name,
+            unit: Usage.Time.units.Hour.name
+        };
+    }
+}

package/src/estimator/FieldCategoryHourlyEstimator.ts

@@ -0,0 +1,10 @@
+import { FieldBaseHourlyEstimator } from "./FieldBaseHourlyEstimator";
+
+export class FieldCategoryHourlyEstimator extends FieldBaseHourlyEstimator
+{
+    static PER_HOUR_ACTIVE = 200;
+    override getFee()
+    {
+        return { active: FieldCategoryHourlyEstimator.PER_HOUR_ACTIVE, deactive: FieldCategoryHourlyEstimator.PER_HOUR_ACTIVE };
+    }
+}

package/src/estimator/FieldFieldHourlyEstimator.ts

@@ -0,0 +1,10 @@
+import { FieldBaseHourlyEstimator } from "./FieldBaseHourlyEstimator";
+
+export class FieldFieldHourlyEstimator extends FieldBaseHourlyEstimator
+{
+    static PER_HOUR_ACTIVE = 250;
+    override getFee()
+    {
+        return { active: FieldFieldHourlyEstimator.PER_HOUR_ACTIVE, deactive: FieldFieldHourlyEstimator.PER_HOUR_ACTIVE };
+    }
+}

package/src/estimator/SecretSecretHourlyEstimator.ts

@@ -0,0 +1,25 @@
+import { FreeCountBonus } from "../bonus/FreeCountBonus";
+import { Usage } from "../type/Usage";
+import { BaseEstimator } from "./BaseEstimator";
+
+export class SecretSecretHourlyEstimator extends BaseEstimator
+{
+    static PER_HOUR_ACTIVE = 2;
+    override getFee()
+    {
+        return { active: SecretSecretHourlyEstimator.PER_HOUR_ACTIVE, deactive: SecretSecretHourlyEstimator.PER_HOUR_ACTIVE };
+    }
+    override getUsage()
+    {
+        return {
+            name: Usage.Time.name,
+            unit: Usage.Time.units.Hour.name
+        };
+    }
+    override getBonues()
+    {
+        return [
+            new FreeCountBonus(100)
+        ];
+    }
+}

package/src/estimator/SecretSecretReadEstimator.ts

@@ -0,0 +1,26 @@
+import { FreeTotalValueBonus } from "../bonus/FreeTotalValueBonus";
+import { Usage } from "../type/Usage";
+import { BaseEstimator } from "./BaseEstimator";
+
+export class SecretSecretReadEstimator extends BaseEstimator
+{
+    static PER_CALL = 1;
+
+    override getFee()
+    {
+        return { active: SecretSecretReadEstimator.PER_CALL, deactive: SecretSecretReadEstimator.PER_CALL };
+    }
+    override getUsage()
+    {
+        return {
+            name: Usage.APICALL.name,
+            unit: Usage.APICALL.units.REQUEST.name
+        };
+    }
+    override getBonues()
+    {
+        return [
+            new FreeTotalValueBonus(1000)
+        ];
+    }
+}

package/src/index.ts

@@ -28,40 +28,41 @@ export * from "./NamirasoftCostServerFieldCategory";
 export * from "./NamirasoftCostServerFieldField";
 export * from "./NamirasoftCostServerHealthz";
 export * from "./NamirasoftCostServerMetrics";
+export * from "./NamirasoftCostServerSecretSecret";
 export * from "./NamirasoftCostServerValue";
-export * from "./TimeUtil";
 export * from "./command/BillWatchAWSCommand";
-export * from "./command/BillWatchAWSEstimationCommand";
-export * from "./command/BillWatchAWS_CreateForCommand";
+export * from "./command/BillWatchAWSEstimateHourlyCommand";
+export * from "./command/BillWatchAWS_CreateForHourlyCommand";
 export * from "./command/BillWatchAzureCommand";
-export * from "./command/BillWatchAzureEstimationCommand";
-export * from "./command/BillWatchAzure_CreateForCommand";
+export * from "./command/BillWatchAzureEstimateHourlyCommand";
+export * from "./command/BillWatchAzure_CreateForHourlyCommand";
 export * from "./command/BillWatchGCPCommand";
-export * from "./command/BillWatchGCPEstimationCommand";
-export * from "./command/BillWatchGCP_CreateForCommand";
+export * from "./command/BillWatchGCPEstimateHourlyCommand";
+export * from "./command/BillWatchGCP_CreateForHourlyCommand";
 export * from "./command/CostCommand";
 export * from "./command/CostListCommand";
 export * from "./command/Cost_CreateForCommand";
 export * from "./command/FieldCategoryCommand";
-export * from "./command/FieldCategoryEstimationCommand";
-export * from "./command/FieldCategory_CreateForCommand";
+export * from "./command/FieldCategoryEstimateHourlyCommand";
+export * from "./command/FieldCategory_CreateForHourlyCommand";
 export * from "./command/FieldFieldCommand";
-export * from "./command/FieldFieldEstimationCommand";
-export * from "./command/FieldField_CreateForCommand";
+export * from "./command/FieldFieldEstimateHourlyCommand";
+export * from "./command/FieldField_CreateForHourlyCommand";
 export * from "./command/HealthzCommand";
 export * from "./command/HealthzGetCommand";
 export * from "./command/MetricsCommand";
 export * from "./command/MetricsGetCommand";
+export * from "./command/SecretSecretCommand";
+export * from "./command/SecretSecretEstimateHourlyCommand";
+export * from "./command/SecretSecretEstimateReadCommand";
+export * from "./command/SecretSecret_CreateForHourlyCommand";
+export * from "./command/SecretSecret_CreateForReadCommand";
 export * from "./command/ValueCommand";
 export * from "./command/ValueListCommand";
-export * from "./enum/TrialUnit";
 export * from "./meta/CostMetaTable";
 export * from "./meta/NamirasoftCostMetaDatabase";
 export * from "./row/CostCreateRow";
 export * from "./row/CostRow";
 export * from "./type/Estimation";
-export * from "./type/EstimationRow";
 export * from "./type/EstimationUsage";
-export * from "./type/Period";
-export * from "./type/Trial";
-export * from "./type/TrialDuration";
+export * from "./type/Period";

package/src/type/Estimation.ts

@@ -1,7 +1,14 @@
-import { EstimationRow } from "./EstimationRow";
+import { BaseBonus } from "../bonus/BaseBonus";
+import { EstimationOption } from "./EstimationOption";
+import { EstimationUsage } from "./EstimationUsage";
 
 export type Estimation =
     {
-        sum: number;
-        rows: EstimationRow[];
+        option: EstimationOption;
+        seconds: number;
+        usage: EstimationUsage;
+        fee: number;
+        amount: number;
+        currency: string;
+        free?: BaseBonus;
     };

package/src/type/EstimationOption.ts

@@ -0,0 +1,12 @@
+import { Period } from "./Period";
+
+export interface EstimationOption 
+{
+    period: Period;
+    total_count: number;
+    number: number;
+    total_value: number;
+    value: number;
+    active: boolean;
+    trial_started_at: Date | null;
+};

package/src/type/Period.ts

@@ -1,5 +1,74 @@
+import { TimeOperation } from "namirasoft-core";
+
 export type Period =
     {
-        start: Date;
-        end: Date;
-    };
+        year: number;
+        month: number;
+        day: number;
+        hour: number;
+        start: {
+            minute: number;
+            second: number;
+        };
+        end: {
+            minute: number;
+            second: number;
+        };
+    };
+
+export class PeriodUtil
+{
+    static toSeconds(period: Period)
+    {
+        return (period.end.minute * 60 + period.end.second) - (period.start.minute * 60 + period.start.second) + 1
+    }
+    static toDates(period: Period)
+    {
+        let start = new Date(period.year, period.month, period.day, period.hour, period.start.minute, period.start.second);
+        let end = new Date(period.year, period.month, period.day, period.hour, period.end.minute, period.end.second);
+        return { start, end };
+    }
+    static async loop(start: Date, end: Date, estimate_hour: (period: Period) => Promise<void>): Promise<void>
+    {
+        let pre_estimate_hour = async (start: Date, end: Date) =>
+        {
+            if (end <= start)
+                return;
+            return await estimate_hour({
+                year: start.getFullYear(),
+                month: start.getMonth(),
+                day: start.getDate(),
+                hour: start.getHours(),
+                start: {
+                    minute: start.getMinutes(),
+                    second: start.getSeconds(),
+                },
+                end: {
+                    minute: end.getMinutes(),
+                    second: end.getSeconds(),
+                }
+            });
+        }
+
+        let s = start;
+        let e = null;
+
+        do
+        {
+            let next_start = TimeOperation.hoursLater(1, s);
+            next_start.setMilliseconds(0);
+            next_start.setSeconds(0);
+            next_start.setMinutes(0);
+            if (end < next_start)
+            {
+                next_start = end;
+                e = end;
+            }
+            else
+                e = TimeOperation.secondsAgo(1, next_start);
+            await pre_estimate_hour(s, e);
+            s = next_start;
+        }
+        while (e < end)
+    }
+};

package/src/type/Usage.ts

@@ -0,0 +1,25 @@
+export class Usage
+{
+    static Time = {
+        name: "Time",
+        units: {
+            Second: {
+                name: "Second"
+            },
+            Minute: {
+                name: "Minute"
+            },
+            Hour: {
+                name: "Hour"
+            }
+        }
+    };
+    static APICALL = {
+        name: "API Call",
+        units: {
+            REQUEST: {
+                name: "Request"
+            }
+        }
+    };
+};

package/dist/TimeUtil.d.ts

@@ -1,7 +0,0 @@
-import { Trial } from "./type/Trial";
-import { Period } from "./type/Period";
-export declare class TimeUtil {
-    static trialEndsAt(trial: Trial): Date;
-    static isTrial(trial: Trial, date: Date): boolean;
-    static loopHourly(trial: Trial | null, period: Period, estimate_hour: (period: Period, trial: boolean) => Promise<void>): Promise<void>;
-}