namirasoft-log 1.4.31 → 1.4.32

package/src/Logger.ts

@@ -1,127 +1,127 @@
-import { FormatterFull } from "./FormatterFull";
-import { IFormatter } from "./IFormatter";
-import { ILogger } from "./ILogger";
-import { IStream } from "./IStream";
-import { Log } from "./Log";
-import { LogLevel } from "./LogLevel";
-import { StreamConsole } from "./StreamConsole";
-
-export class Logger implements ILogger
-{
-    static main: Logger | null = null;
-    private defaultStream: IStream = new StreamConsole();
-    private formatter?: IFormatter = new FormatterFull();
-    private customFormatter: { [level: string]: IFormatter } = {};
-    private streams: IStream[] = [];
-    constructor()
-    {
-        if (Logger.main == null)
-            Logger.main = this;
-        this.setFromatter = this.setFromatter.bind(this);
-        this.setCustomFormatter = this.setCustomFormatter.bind(this);
-        this.addStream = this.addStream.bind(this);
-        this.log = this.log.bind(this);
-        this.trace = this.trace.bind(this);
-        this.verbose = this.verbose.bind(this);
-        this.debug = this.debug.bind(this);
-        this.info = this.info.bind(this);
-        this.success = this.success.bind(this);
-        this.warning = this.warning.bind(this);
-        this.error = this.error.bind(this);
-        this.critical = this.critical.bind(this);
-        this.fatal = this.fatal.bind(this);
-        this.onCatchError = this.onCatchError.bind(this);
-        this.onCatchCritical = this.onCatchCritical.bind(this);
-        this.onCatchFatal = this.onCatchFatal.bind(this);
-        this.getErrorMessage = this.getErrorMessage.bind(this);
-        this.getErrorStack = this.getErrorStack.bind(this);
-        this.initUncought = this.initUncought.bind(this);
-    }
-    setFromatter(formatter: IFormatter): void
-    {
-        this.formatter = formatter;
-    }
-    setCustomFormatter(level: LogLevel, formatter: IFormatter): void
-    {
-        this.customFormatter[level] = formatter;
-    }
-    addStream(stream: IStream)
-    {
-        this.streams.push(stream);
-    }
-    log(level: LogLevel, ...messages: any[])
-    {
-        let log = new Log(level, ...messages);
-        let formatted: { pre: string[], messages: string[], post: string[] } = { pre: [], messages: [], post: [] };
-        let formatter = this.customFormatter[level.toString()] ?? this.formatter;
-        if (formatter)
-            formatted = formatter.format(log);
-        if (this.streams.length == 0)
-            this.defaultStream.write(log, formatted);
-        else
-            this.streams.map(s => s.write(log, formatted));
-    }
-    trace(...messages: any[])
-    {
-        this.log(LogLevel.Trace, ...messages);
-    }
-    verbose(...messages: any[])
-    {
-        this.log(LogLevel.Verbose, ...messages);
-    }
-    debug(...messages: any[])
-    {
-        this.log(LogLevel.Debug, ...messages);
-    }
-    info(...messages: any[])
-    {
-        this.log(LogLevel.Info, ...messages);
-    }
-    success(...messages: any[])
-    {
-        this.log(LogLevel.Success, ...messages);
-    }
-    warning(...messages: any[])
-    {
-        this.log(LogLevel.Warning, ...messages);
-    }
-    error(...messages: any[])
-    {
-        this.log(LogLevel.Error, ...messages);
-    }
-    critical(...messages: any[])
-    {
-        this.log(LogLevel.Critical, ...messages);
-    }
-    fatal(...messages: any[])
-    {
-        this.log(LogLevel.Fatal, ...messages);
-    }
-    onCatchError(error: Error | unknown)
-    {
-        this.error(this.getErrorMessage(error), this.getErrorStack(error));
-    }
-    onCatchCritical(error: Error | unknown)
-    {
-        this.critical(this.getErrorMessage(error), this.getErrorStack(error));
-    }
-    onCatchFatal(error: Error | unknown)
-    {
-        this.fatal(this.getErrorMessage(error), this.getErrorStack(error));
-    }
-    protected getErrorMessage(error: Error | unknown): string
-    {
-        if (error instanceof Error)
-            return error.message;
-        return error + "";
-    }
-    protected getErrorStack(error: Error | unknown): string
-    {
-        if (error instanceof Error)
-            return error.stack ?? "";
-        return error + "";
-    }
-    initUncought()
-    {
-    }
+import { FormatterFull } from "./FormatterFull";
+import { IFormatter } from "./IFormatter";
+import { ILogger } from "./ILogger";
+import { IStream } from "./IStream";
+import { Log } from "./Log";
+import { LogLevel } from "./LogLevel";
+import { StreamConsole } from "./StreamConsole";
+
+export class Logger implements ILogger
+{
+    static main: Logger | null = null;
+    private defaultStream: IStream = new StreamConsole();
+    private formatter?: IFormatter = new FormatterFull();
+    private customFormatter: { [level: string]: IFormatter } = {};
+    private streams: IStream[] = [];
+    constructor()
+    {
+        if (Logger.main == null)
+            Logger.main = this;
+        this.setFromatter = this.setFromatter.bind(this);
+        this.setCustomFormatter = this.setCustomFormatter.bind(this);
+        this.addStream = this.addStream.bind(this);
+        this.log = this.log.bind(this);
+        this.trace = this.trace.bind(this);
+        this.verbose = this.verbose.bind(this);
+        this.debug = this.debug.bind(this);
+        this.info = this.info.bind(this);
+        this.success = this.success.bind(this);
+        this.warning = this.warning.bind(this);
+        this.error = this.error.bind(this);
+        this.critical = this.critical.bind(this);
+        this.fatal = this.fatal.bind(this);
+        this.onCatchError = this.onCatchError.bind(this);
+        this.onCatchCritical = this.onCatchCritical.bind(this);
+        this.onCatchFatal = this.onCatchFatal.bind(this);
+        this.getErrorMessage = this.getErrorMessage.bind(this);
+        this.getErrorStack = this.getErrorStack.bind(this);
+        this.initUncought = this.initUncought.bind(this);
+    }
+    setFromatter(formatter: IFormatter): void
+    {
+        this.formatter = formatter;
+    }
+    setCustomFormatter(level: LogLevel, formatter: IFormatter): void
+    {
+        this.customFormatter[level] = formatter;
+    }
+    addStream(stream: IStream)
+    {
+        this.streams.push(stream);
+    }
+    log(level: LogLevel, ...messages: any[])
+    {
+        let log = new Log(level, ...messages);
+        let formatted: { pre: string[], messages: string[], post: string[] } = { pre: [], messages: [], post: [] };
+        let formatter = this.customFormatter[level.toString()] ?? this.formatter;
+        if (formatter)
+            formatted = formatter.format(log);
+        if (this.streams.length == 0)
+            this.defaultStream.write(log, formatted);
+        else
+            this.streams.map(s => s.write(log, formatted));
+    }
+    trace(...messages: any[])
+    {
+        this.log(LogLevel.Trace, ...messages);
+    }
+    verbose(...messages: any[])
+    {
+        this.log(LogLevel.Verbose, ...messages);
+    }
+    debug(...messages: any[])
+    {
+        this.log(LogLevel.Debug, ...messages);
+    }
+    info(...messages: any[])
+    {
+        this.log(LogLevel.Info, ...messages);
+    }
+    success(...messages: any[])
+    {
+        this.log(LogLevel.Success, ...messages);
+    }
+    warning(...messages: any[])
+    {
+        this.log(LogLevel.Warning, ...messages);
+    }
+    error(...messages: any[])
+    {
+        this.log(LogLevel.Error, ...messages);
+    }
+    critical(...messages: any[])
+    {
+        this.log(LogLevel.Critical, ...messages);
+    }
+    fatal(...messages: any[])
+    {
+        this.log(LogLevel.Fatal, ...messages);
+    }
+    onCatchError(error: Error | unknown)
+    {
+        this.error(this.getErrorMessage(error), this.getErrorStack(error));
+    }
+    onCatchCritical(error: Error | unknown)
+    {
+        this.critical(this.getErrorMessage(error), this.getErrorStack(error));
+    }
+    onCatchFatal(error: Error | unknown)
+    {
+        this.fatal(this.getErrorMessage(error), this.getErrorStack(error));
+    }
+    protected getErrorMessage(error: Error | unknown): string
+    {
+        if (error instanceof Error)
+            return error.message;
+        return error + "";
+    }
+    protected getErrorStack(error: Error | unknown): string
+    {
+        if (error instanceof Error)
+            return error.stack ?? "";
+        return error + "";
+    }
+    initUncought()
+    {
+    }
 }

package/src/NamirasoftLogServer.ts

@@ -41,7 +41,7 @@ export class NamirasoftLogServer extends NSABaseServer
     log: NamirasoftLogServerLog;
     constructor(base_url: string, manager: TokenManager, onError: (error: Error) => void)
     {
-        super(base_url, `1.4.30`, manager, onError);
+        super(base_url, `1.4.32`, manager, onError);
         this.healthz = new NamirasoftLogServerHealthz(this);
         this.metrics = new NamirasoftLogServerMetrics(this);
         this.value = new NamirasoftLogServerValue(this);

package/src/NamirasoftLogServerLogGroup.ts

@@ -25,6 +25,7 @@ import { LogGroupRow } from "./row/LogGroupRow";
 import { NamirasoftLogServer } from "./NamirasoftLogServer";
 import { NamirasoftLogServerBase } from "./NamirasoftLogServerBase";
 import { SortItem } from "namirasoft-core";
+import { SubscriptionValidation } from "namirasoft-payment";
 
 export class NamirasoftLogServerLogGroup extends NamirasoftLogServerBase
 {
@@ -32,6 +33,8 @@ export class NamirasoftLogServerLogGroup extends NamirasoftLogServerBase
     {
         super(server);
         this.List = this.List.bind(this);
+        this.Validation = this.Validation.bind(this);
+        this.Usage = this.Usage.bind(this);
         this.Get = this.Get.bind(this);
         this.Create = this.Create.bind(this);
         this.Update = this.Update.bind(this);
@@ -45,6 +48,18 @@ export class NamirasoftLogServerLogGroup extends NamirasoftLogServerBase
         let { data } = await this.server._get<{ rows: LogGroupRow[], count: number }>(path, { filters: filters_string_value, page, size, sorts: sorts_string_value });
         return data;
     }
+    async Validation(): Promise<SubscriptionValidation>
+    {
+        let path = `/log/group/validation`;
+        let { data } = await this.server._get<SubscriptionValidation>(path, {});
+        return data;
+    }
+    async Usage(): Promise<{ quota: { total_count: number, total_value: number }, used: { total_count: number, total_value: number } }>
+    {
+        let path = `/log/group/usage`;
+        let { data } = await this.server._get<{ quota: { total_count: number, total_value: number }, used: { total_count: number, total_value: number } }>(path, {});
+        return data;
+    }
     async Get(id: string): Promise<LogGroupFullRow>
     {
         let path = `/log/group/${id}`;

package/src/StreamConsole.ts

@@ -1,38 +1,38 @@
-import { ConsoleOperation } from "namirasoft-core";
-import { IStream } from "./IStream";
-import { Log } from "./Log";
-import { LogLevel } from './LogLevel';
-
-export class StreamConsole implements IStream
-{
-    write(log: Log, formated: { pre: string[], messages: string[], post: string[] }): void
-    {
-        let getFormatted = (data: string) =>
-        {
-            if (log.level == LogLevel.Trace)
-                return ConsoleOperation.formatTraceColor(data);
-            if (log.level == LogLevel.Verbose)
-                return ConsoleOperation.formatLogColor(data);
-            if (log.level == LogLevel.Debug)
-                return ConsoleOperation.formatDebugColor(data);
-            if (log.level == LogLevel.Info)
-                return ConsoleOperation.formatInfoColor(data);
-            if (log.level == LogLevel.Success)
-                return ConsoleOperation.formatSuccessColor(data);
-            if (log.level == LogLevel.Warning)
-                return ConsoleOperation.formatWarningColor(data);
-            if (log.level == LogLevel.Error)
-                return ConsoleOperation.formatErrorColor(data);
-            if (log.level == LogLevel.Critical)
-                return ConsoleOperation.formatErrorColor(data);
-            if (log.level == LogLevel.Fatal)
-                return ConsoleOperation.formatErrorColor(data);
-            return ConsoleOperation.formatLogColor(data);
-        }
-        let preline: string[] = formated.pre.map(ConsoleOperation.formatLogColor);
-        let msgline: string[] = formated.messages.map(getFormatted);
-        let postline: string[] = formated.post.map(ConsoleOperation.formatLogColor);
-        let lines = [...preline, ...msgline, ...postline];
-        console.log(lines.join("\n"));
-    }
+import { ConsoleOperation } from "namirasoft-core";
+import { IStream } from "./IStream";
+import { Log } from "./Log";
+import { LogLevel } from './LogLevel';
+
+export class StreamConsole implements IStream
+{
+    write(log: Log, formated: { pre: string[], messages: string[], post: string[] }): void
+    {
+        let getFormatted = (data: string) =>
+        {
+            if (log.level == LogLevel.Trace)
+                return ConsoleOperation.formatTraceColor(data);
+            if (log.level == LogLevel.Verbose)
+                return ConsoleOperation.formatLogColor(data);
+            if (log.level == LogLevel.Debug)
+                return ConsoleOperation.formatDebugColor(data);
+            if (log.level == LogLevel.Info)
+                return ConsoleOperation.formatInfoColor(data);
+            if (log.level == LogLevel.Success)
+                return ConsoleOperation.formatSuccessColor(data);
+            if (log.level == LogLevel.Warning)
+                return ConsoleOperation.formatWarningColor(data);
+            if (log.level == LogLevel.Error)
+                return ConsoleOperation.formatErrorColor(data);
+            if (log.level == LogLevel.Critical)
+                return ConsoleOperation.formatErrorColor(data);
+            if (log.level == LogLevel.Fatal)
+                return ConsoleOperation.formatErrorColor(data);
+            return ConsoleOperation.formatLogColor(data);
+        }
+        let preline: string[] = formated.pre.map(ConsoleOperation.formatLogColor);
+        let msgline: string[] = formated.messages.map(getFormatted);
+        let postline: string[] = formated.post.map(ConsoleOperation.formatLogColor);
+        let lines = [...preline, ...msgline, ...postline];
+        console.log(lines.join("\n"));
+    }
 }

package/src/StreamFile.ts

@@ -1,48 +1,48 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import { IStream } from "./IStream";
-import { Log } from "./Log";
-
-export class StreamFile implements IStream
-{
-    private baseName: string;
-    private basePath: string;
-    seprateByDate: boolean = true;
-    seprateByLevel: boolean = true;
-    constructor(basePath: string = "./")
-    {
-        this.basePath = basePath;
-        this.baseName = this.getPackageName();
-    }
-    private getPackageName()
-    {
-        let pkgPath = path.resolve(process.cwd(), "");
-        if (!pkgPath.endsWith('package.json'))
-        {
-            pkgPath = path.join(pkgPath, 'package.json');
-        }
-        if (fs.existsSync(pkgPath))
-        {
-            let json = fs.readFileSync(pkgPath) + "";
-            let pkg = JSON.parse(json);
-            return pkg.name;
-        }
-        return "";
-    }
-    private getFilePath(log: Log): string
-    {
-        let names = [this.baseName];
-        if (this.seprateByDate)
-            names.push(log.date.getFullYear() + "-" + (log.date.getMonth() + 1) + "-" + log.date.getDate());
-        if (this.seprateByLevel)
-            names.push(log.level + "");
-        names.push(".log");
-        let name = names.join("-");
-        return path.resolve(this.basePath, name);
-    }
-    write(log: Log, formated: { pre: string[], messages: string[], post: string[] }): void
-    {
-        let filePath = this.getFilePath(log);
-        fs.appendFile(filePath, [...formated.pre, ...formated.messages, ...formated.post].join("\n"), () => { });
-    }
+import * as fs from 'fs';
+import * as path from 'path';
+import { IStream } from "./IStream";
+import { Log } from "./Log";
+
+export class StreamFile implements IStream
+{
+    private baseName: string;
+    private basePath: string;
+    seprateByDate: boolean = true;
+    seprateByLevel: boolean = true;
+    constructor(basePath: string = "./")
+    {
+        this.basePath = basePath;
+        this.baseName = this.getPackageName();
+    }
+    private getPackageName()
+    {
+        let pkgPath = path.resolve(process.cwd(), "");
+        if (!pkgPath.endsWith('package.json'))
+        {
+            pkgPath = path.join(pkgPath, 'package.json');
+        }
+        if (fs.existsSync(pkgPath))
+        {
+            let json = fs.readFileSync(pkgPath) + "";
+            let pkg = JSON.parse(json);
+            return pkg.name;
+        }
+        return "";
+    }
+    private getFilePath(log: Log): string
+    {
+        let names = [this.baseName];
+        if (this.seprateByDate)
+            names.push(log.date.getFullYear() + "-" + (log.date.getMonth() + 1) + "-" + log.date.getDate());
+        if (this.seprateByLevel)
+            names.push(log.level + "");
+        names.push(".log");
+        let name = names.join("-");
+        return path.resolve(this.basePath, name);
+    }
+    write(log: Log, formated: { pre: string[], messages: string[], post: string[] }): void
+    {
+        let filePath = this.getFilePath(log);
+        fs.appendFile(filePath, [...formated.pre, ...formated.messages, ...formated.post].join("\n"), () => { });
+    }
 }

package/src/StreamNamirasoftLog.ts

@@ -1,65 +1,65 @@
-import { IStream } from "./IStream";
-import { Log } from "./Log";
-import { NamirasoftLogServer } from "./NamirasoftLogServer";
-
-export class StreamNamirasoftLog implements IStream
-{
-    private queue: (() => Promise<void>)[] = [];
-    private isProcessing = false;
-    server: NamirasoftLogServer;
-    user_id?: string;
-    log_group_id: string;
-    getProductID: () => (string | null);
-    constructor(server: NamirasoftLogServer, log_group_id: string, getProductID: () => (string | null))
-    {
-        this.server = server;
-        this.log_group_id = log_group_id;
-        this.getProductID = getProductID;
-    }
-    write(log: Log, formated: { pre: string[], messages: string[], post: string[] }): void
-    {
-        if (process.env.NAMIRASOFT_STANDALNOE)
-            return;
-        let message = [...formated.pre, ...formated.messages, ...formated.post].join("\n");
-        let body = {
-            level: log.level.toString(),
-            log_group_id: this.log_group_id,
-            product_id: this.getProductID(),
-            message
-        };
-        this.queue.push(async () =>
-        {
-            if (this.user_id)
-                await this.server.log._CreateFor(this.user_id, body);
-            else
-                await this.server.log.Create(body);
-        });
-        this.processQueue();
-    }
-    private async processQueue()
-    {
-        if (this.isProcessing)
-            return;
-        this.isProcessing = true;
-        try
-        {
-            while (this.queue.length > 0)
-            {
-                const job = this.queue.shift();
-                if (job)
-                {
-                    try
-                    {
-                        await job();
-                    }
-                    catch (err)
-                    {
-                    }
-                }
-            }
-        } finally
-        {
-            this.isProcessing = false;
-        }
-    }
+import { IStream } from "./IStream";
+import { Log } from "./Log";
+import { NamirasoftLogServer } from "./NamirasoftLogServer";
+
+export class StreamNamirasoftLog implements IStream
+{
+    private queue: (() => Promise<void>)[] = [];
+    private isProcessing = false;
+    server: NamirasoftLogServer;
+    user_id?: string;
+    log_group_id: string;
+    getProductID: () => (string | null);
+    constructor(server: NamirasoftLogServer, log_group_id: string, getProductID: () => (string | null))
+    {
+        this.server = server;
+        this.log_group_id = log_group_id;
+        this.getProductID = getProductID;
+    }
+    write(log: Log, formated: { pre: string[], messages: string[], post: string[] }): void
+    {
+        if (process.env.NAMIRASOFT_STANDALNOE)
+            return;
+        let message = [...formated.pre, ...formated.messages, ...formated.post].join("\n");
+        let body = {
+            level: log.level.toString(),
+            log_group_id: this.log_group_id,
+            product_id: this.getProductID(),
+            message
+        };
+        this.queue.push(async () =>
+        {
+            if (this.user_id)
+                await this.server.log._CreateFor(this.user_id, body);
+            else
+                await this.server.log.Create(body);
+        });
+        this.processQueue();
+    }
+    private async processQueue()
+    {
+        if (this.isProcessing)
+            return;
+        this.isProcessing = true;
+        try
+        {
+            while (this.queue.length > 0)
+            {
+                const job = this.queue.shift();
+                if (job)
+                {
+                    try
+                    {
+                        await job();
+                    }
+                    catch (err)
+                    {
+                    }
+                }
+            }
+        } finally
+        {
+            this.isProcessing = false;
+        }
+    }
 }

package/src/command/LogGroupCommand.ts

@@ -24,6 +24,8 @@ import { LogGroupDeleteCommand } from "./LogGroupDeleteCommand";
 import { LogGroupGetCommand } from "./LogGroupGetCommand";
 import { LogGroupListCommand } from "./LogGroupListCommand";
 import { LogGroupUpdateCommand } from "./LogGroupUpdateCommand";
+import { LogGroupUsageCommand } from "./LogGroupUsageCommand";
+import { LogGroupValidationCommand } from "./LogGroupValidationCommand";
 
 export class LogGroupCommand extends BaseNavigatorCommand
 {
@@ -31,6 +33,8 @@ export class LogGroupCommand extends BaseNavigatorCommand
     {
         super(argv, {
             "list": LogGroupListCommand,
+            "validation": LogGroupValidationCommand,
+            "usage": LogGroupUsageCommand,
             "get": LogGroupGetCommand,
             "create": LogGroupCreateCommand,
             "update": LogGroupUpdateCommand,

package/src/command/LogGroupUsageCommand.ts

@@ -0,0 +1,45 @@
+/****************************************************************/
+/*                                                              */
+/*                This is an Auto-Generated File                */
+/*                           Made By                            */
+/*             Namirasoft SDK Generator NPM Package             */
+/*                                                              */
+/****************************************************************/
+/****************************************************************/
+/*                                                              */
+/*          Please do not make any change to this file          */
+/*    If any change is required, ns-sdkg command must be used   */
+/*                                                              */
+/****************************************************************/
+/****************************************************************/
+/*                                                              */
+/*                 Namira Software Corporation                  */
+/*                    https://namirasoft.com                    */
+/*                                                              */
+/****************************************************************/
+
+import { BaseFinalCommand } from "namirasoft-node-cli";
+import { IStorageMemoryDedicated } from "namirasoft-core";
+import { NamirasoftLogServer } from "../NamirasoftLogServer";
+import { TokenManager } from "namirasoft-account";
+
+export class LogGroupUsageCommand extends BaseFinalCommand
+{
+    constructor(argv: string[])
+    {
+        super(argv, [], []);
+    }
+    override async exec()
+    {
+        let token = this.app.storage.getNSAToken();
+        if (token == null)
+            throw new Error("Token is not available. Please login first using:\nns-log account config \nor \nns-log account login.");
+        let storage = new IStorageMemoryDedicated();
+        let manager = new TokenManager(storage, () => { });
+        manager.setValue(token, false);
+        let url = this.app.storage.getItem("ns-log-server-url");
+        let server = new NamirasoftLogServer(url, manager, e => this.app.logger.error(e.message));
+        let ans = await server.log_group.Usage();
+        this.app.logger.success(JSON.stringify(ans));
+    }
+};