npm - @qodalis/cli-server-logs - Versions diffs - 1.0.3 → 1.0.5 - Mend

@qodalis/cli-server-logs 1.0.3 → 1.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/README.md +12 -18
package/esm2022/lib/processors/cli-logs-command-processor.mjs +39 -5
package/fesm2022/qodalis-cli-server-logs.mjs +38 -4
package/fesm2022/qodalis-cli-server-logs.mjs.map +1 -1
package/lib/processors/cli-logs-command-processor.d.ts +1 -0
package/package.json +12 -4
package/umd/index.js +41 -15

package/README.md CHANGED Viewed

@@ -1,24 +1,18 @@
-# ServerLogs
+# Cli extension
-This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 16.2.0.
+The `@qodalis/cli-server-logs` package is a CLI extension designed to provide seamless server log management and analysis capabilities for the Qodalis CLI.
-## Code scaffolding
+# Features
-Run `ng generate component component-name --project server-logs` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project server-logs`.
-> Note: Don't forget to add `--project server-logs` or else it will be added to the default project in your `angular.json` file.
+    View Logs: Fetch and display server logs directly in the CLI.
+    Filter Logs: Apply filters based on date, severity, or keywords.
+    Download Logs: Download logs to a local file for further analysis.
+    Integration: Integrates seamlessly with Qodalis CLI for server monitoring.
-## Build
+# Installation
-Run `ng build server-logs` to build the project. The build artifacts will be stored in the `dist/` directory.
+```bash
+packages add @qodalis/cli-server-logs
+```
-## Publishing
-After building your library with `ng build server-logs`, go to the dist folder `cd dist/server-logs` and run `npm publish`.
-## Running unit tests
-Run `ng test server-logs` to execute the unit tests via [Karma](https://karma-runner.github.io).
-## Further help
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.
+This command downloads and registers the extension for use within the CLI environment.

package/esm2022/lib/processors/cli-logs-command-processor.mjs CHANGED Viewed

@@ -40,6 +40,24 @@ export class CliLogsCommandProcessor {
                     };
                 },
             },
+            {
+                name: 'server',
+                type: 'string',
+                description: 'The server to connect to, e.g. "http://localhost:5000"',
+                required: false,
+            },
+            {
+                name: 'hub',
+                type: 'string',
+                description: 'The hub to connect to, e.g. "loghub" (default) or "loghub2"',
+                required: false,
+            },
+            {
+                name: 'file',
+                type: 'boolean',
+                description: 'Export logs to a file',
+                required: false,
+            },
         ];
         this.author = DefaultLibraryAuthor;
         this.processors?.push({
@@ -52,19 +70,26 @@ export class CliLogsCommandProcessor {
     }
     async processCommand(command, context) {
         let qs = '?';
-        if (Object.keys(command.args).length > 0) {
-            qs += toQueryString(command.args);
+        const args = this.excludeKeys(command.args, ['server', 'hub', 'file']);
+        if (Object.keys(args).length > 0) {
+            qs += toQueryString(args);
         }
+        const hub = command.args['hub'] || 'loghub';
+        let server = command.args['server'] || '';
+        server = server.replace(/\/+$/, '');
+        const url = `${server}/${hub}${qs}`;
+        console.log('Connecting to:', url);
         this.hubConnection = new signalR.HubConnectionBuilder()
-            .withUrl('/loghub' + qs)
+            .withUrl(url)
             .build();
+        const buffer = [];
         await this.hubConnection
             .start()
             .then(() => {
             console.log('SignalR connection started');
             context.writer.writeWarning('Connected to live logs');
             if (qs.length) {
-                Object.keys(command.args).forEach((key) => {
+                Object.keys(args).forEach((key) => {
                     context.writer.writeWarning(`Filtering logs by: ${key}=${command.args[key]}`);
                 });
             }
@@ -74,6 +99,7 @@ export class CliLogsCommandProcessor {
                 if (firstLog) {
                     context.writer.writeln('');
                 }
+                buffer.push(log);
                 context.writer.writeln(`\x1b[33m${++index}\x1b[0m. ` +
                     (command.args['pattern']
                         ? highlightTextWithBg(log, new RegExp(command.args['pattern'], 'g'))
@@ -83,17 +109,25 @@ export class CliLogsCommandProcessor {
             const subscription = context.onAbort.subscribe(() => {
                 this.hubConnection.stop();
                 context.writer.writeWarning('Disconnected from live logs');
+                if (command.args['file']) {
+                    const filename = `logs-${new Date().toISOString()}.txt`;
+                    context.writer.writeToFile(filename, buffer.join('\n'));
+                }
                 subscription.unsubscribe();
             });
         })
             .catch((err) => {
             console.error('Error starting SignalR connection:', err);
             context.writer.writeError('Failed to connect to live logs');
+            context.writer.writeError(err?.toString());
         });
     }
     writeDescription(context) {
         context.writer.writeln('Show live logs');
     }
+    excludeKeys(record, keysToExclude) {
+        return Object.fromEntries(Object.entries(record).filter(([key]) => !keysToExclude.includes(key)));
+    }
     isValidRegex(pattern) {
         try {
             new RegExp(pattern);
@@ -112,4 +146,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                     providedIn: 'root',
                 }]
         }], ctorParameters: function () { return []; } });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cli-logs-command-processor.js","sourceRoot":"","sources":["../../../../../projects/server-logs/src/lib/processors/cli-logs-command-processor.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport * as signalR from '@microsoft/signalr';\nimport {\n    CliProcessCommand,\n    DefaultLibraryAuthor,\n    highlightTextWithBg,\n    ICliCommandAuthor,\n    ICliCommandParameterDescriptor,\n    ICliCommandProcessor,\n    ICliExecutionContext,\n    toQueryString,\n} from '@qodalis/cli-core';\n\nconst levels = ['verbose', 'debug', 'information', 'warning', 'error', 'fatal'];\n\n@Injectable({\n    providedIn: 'root',\n})\nexport class CliLogsCommandProcessor implements ICliCommandProcessor {\n    command = 'logs';\n\n    description?: string | undefined = 'Show live logs';\n\n    processors?: ICliCommandProcessor[] | undefined = [];\n\n    parameters?: ICliCommandParameterDescriptor[] | undefined = [\n        {\n            name: 'pattern',\n            type: 'string',\n            description: 'The regex pattern to search for in the logs',\n            required: false,\n            validator: (value: string) => {\n                const isValid = this.isValidRegex(value);\n                return {\n                    valid: isValid,\n                    message: isValid\n                        ? undefined\n                        : 'Invalid regex pattern provided',\n                };\n            },\n        },\n        {\n            name: 'level',\n            type: 'string',\n            description:\n                'The log level to filter by, e.g. ' + levels.join(', '),\n            required: false,\n            validator: (value: string) => {\n                const isValid = levels.includes(value);\n\n                return {\n                    valid: isValid,\n                    message: isValid\n                        ? undefined\n                        : 'Invalid log level provided, must be one of: ' +\n                          levels.join(', '),\n                };\n            },\n        },\n    ];\n\n    author?: ICliCommandAuthor | undefined = DefaultLibraryAuthor;\n\n    private hubConnection!: signalR.HubConnection;\n\n    constructor() {\n        this.processors?.push({\n            command: 'live',\n            description: this.description,\n            parameters: this.parameters,\n            processCommand: this.processCommand.bind(this),\n            writeDescription: this.writeDescription.bind(this),\n        });\n    }\n\n    async processCommand(\n        command: CliProcessCommand,\n        context: ICliExecutionContext,\n    ): Promise<void> {\n        let qs = '?';\n        if (Object.keys(command.args).length > 0) {\n            qs += toQueryString(command.args);\n        }\n\n        this.hubConnection = new signalR.HubConnectionBuilder()\n            .withUrl('/loghub' + qs)\n            .build();\n\n        await this.hubConnection\n            .start()\n            .then(() => {\n                console.log('SignalR connection started');\n\n                context.writer.writeWarning('Connected to live logs');\n                if (qs.length) {\n                    Object.keys(command.args).forEach((key) => {\n                        context.writer.writeWarning(\n                            `Filtering logs by: ${key}=${command.args[key]}`,\n                        );\n                    });\n                }\n\n                let firstLog = true;\n                let index = 0;\n\n                this.hubConnection.on('log', (log: string) => {\n                    if (firstLog) {\n                        context.writer.writeln('');\n                    }\n\n                    context.writer.writeln(\n                        `\\x1b[33m${++index}\\x1b[0m. ` +\n                            (command.args['pattern']\n                                ? highlightTextWithBg(\n                                      log,\n                                      new RegExp(command.args['pattern'], 'g'),\n                                  )\n                                : log),\n                    );\n                    firstLog = false;\n                });\n\n                const subscription = context.onAbort.subscribe(() => {\n                    this.hubConnection.stop();\n                    context.writer.writeWarning('Disconnected from live logs');\n\n                    subscription.unsubscribe();\n                });\n            })\n            .catch((err) => {\n                console.error('Error starting SignalR connection:', err);\n                context.writer.writeError('Failed to connect to live logs');\n            });\n    }\n\n    writeDescription(context: ICliExecutionContext): void {\n        context.writer.writeln('Show live logs');\n    }\n\n    private isValidRegex(pattern: string): boolean {\n        try {\n            new RegExp(pattern);\n            return true;\n        } catch (e) {\n            return false;\n        }\n    }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cli-logs-command-processor.js","sourceRoot":"","sources":["../../../../../projects/server-logs/src/lib/processors/cli-logs-command-processor.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport * as signalR from '@microsoft/signalr';\nimport {\n    CliProcessCommand,\n    DefaultLibraryAuthor,\n    highlightTextWithBg,\n    ICliCommandAuthor,\n    ICliCommandParameterDescriptor,\n    ICliCommandProcessor,\n    ICliExecutionContext,\n    toQueryString,\n} from '@qodalis/cli-core';\n\nconst levels = ['verbose', 'debug', 'information', 'warning', 'error', 'fatal'];\n\n@Injectable({\n    providedIn: 'root',\n})\nexport class CliLogsCommandProcessor implements ICliCommandProcessor {\n    command = 'logs';\n\n    description?: string | undefined = 'Show live logs';\n\n    processors?: ICliCommandProcessor[] | undefined = [];\n\n    parameters?: ICliCommandParameterDescriptor[] | undefined = [\n        {\n            name: 'pattern',\n            type: 'string',\n            description: 'The regex pattern to search for in the logs',\n            required: false,\n            validator: (value: string) => {\n                const isValid = this.isValidRegex(value);\n                return {\n                    valid: isValid,\n                    message: isValid\n                        ? undefined\n                        : 'Invalid regex pattern provided',\n                };\n            },\n        },\n        {\n            name: 'level',\n            type: 'string',\n            description:\n                'The log level to filter by, e.g. ' + levels.join(', '),\n            required: false,\n            validator: (value: string) => {\n                const isValid = levels.includes(value);\n\n                return {\n                    valid: isValid,\n                    message: isValid\n                        ? undefined\n                        : 'Invalid log level provided, must be one of: ' +\n                          levels.join(', '),\n                };\n            },\n        },\n        {\n            name: 'server',\n            type: 'string',\n            description:\n                'The server to connect to, e.g. \"http://localhost:5000\"',\n            required: false,\n        },\n        {\n            name: 'hub',\n            type: 'string',\n            description:\n                'The hub to connect to, e.g. \"loghub\" (default) or \"loghub2\"',\n            required: false,\n        },\n        {\n            name: 'file',\n            type: 'boolean',\n            description: 'Export logs to a file',\n            required: false,\n        },\n    ];\n\n    author?: ICliCommandAuthor | undefined = DefaultLibraryAuthor;\n\n    private hubConnection!: signalR.HubConnection;\n\n    constructor() {\n        this.processors?.push({\n            command: 'live',\n            description: this.description,\n            parameters: this.parameters,\n            processCommand: this.processCommand.bind(this),\n            writeDescription: this.writeDescription.bind(this),\n        });\n    }\n\n    async processCommand(\n        command: CliProcessCommand,\n        context: ICliExecutionContext,\n    ): Promise<void> {\n        let qs = '?';\n\n        const args = this.excludeKeys(command.args, ['server', 'hub', 'file']);\n\n        if (Object.keys(args).length > 0) {\n            qs += toQueryString(args);\n        }\n\n        const hub = command.args['hub'] || 'loghub';\n\n        let server = command.args['server'] || '';\n        server = server.replace(/\\/+$/, '');\n\n        const url = `${server}/${hub}${qs}`;\n\n        console.log('Connecting to:', url);\n\n        this.hubConnection = new signalR.HubConnectionBuilder()\n            .withUrl(url)\n            .build();\n\n        const buffer: string[] = [];\n\n        await this.hubConnection\n            .start()\n            .then(() => {\n                console.log('SignalR connection started');\n\n                context.writer.writeWarning('Connected to live logs');\n                if (qs.length) {\n                    Object.keys(args).forEach((key) => {\n                        context.writer.writeWarning(\n                            `Filtering logs by: ${key}=${command.args[key]}`,\n                        );\n                    });\n                }\n\n                let firstLog = true;\n                let index = 0;\n\n                this.hubConnection.on('log', (log: string) => {\n                    if (firstLog) {\n                        context.writer.writeln('');\n                    }\n\n                    buffer.push(log);\n\n                    context.writer.writeln(\n                        `\\x1b[33m${++index}\\x1b[0m. ` +\n                            (command.args['pattern']\n                                ? highlightTextWithBg(\n                                      log,\n                                      new RegExp(command.args['pattern'], 'g'),\n                                  )\n                                : log),\n                    );\n                    firstLog = false;\n                });\n\n                const subscription = context.onAbort.subscribe(() => {\n                    this.hubConnection.stop();\n                    context.writer.writeWarning('Disconnected from live logs');\n\n                    if (command.args['file']) {\n                        const filename = `logs-${new Date().toISOString()}.txt`;\n                        context.writer.writeToFile(filename, buffer.join('\\n'));\n                    }\n\n                    subscription.unsubscribe();\n                });\n            })\n            .catch((err) => {\n                console.error('Error starting SignalR connection:', err);\n                context.writer.writeError('Failed to connect to live logs');\n                context.writer.writeError(err?.toString());\n            });\n    }\n\n    writeDescription(context: ICliExecutionContext): void {\n        context.writer.writeln('Show live logs');\n    }\n\n    private excludeKeys<T extends Record<string, any>>(\n        record: T,\n        keysToExclude: string[],\n    ): Partial<T> {\n        return Object.fromEntries(\n            Object.entries(record).filter(\n                ([key]) => !keysToExclude.includes(key),\n            ),\n        ) as Partial<T>;\n    }\n\n    private isValidRegex(pattern: string): boolean {\n        try {\n            new RegExp(pattern);\n            return true;\n        } catch (e) {\n            return false;\n        }\n    }\n}\n"]}

package/fesm2022/qodalis-cli-server-logs.mjs CHANGED Viewed

@@ -42,6 +42,24 @@ class CliLogsCommandProcessor {
                     };
                 },
             },
+            {
+                name: 'server',
+                type: 'string',
+                description: 'The server to connect to, e.g. "http://localhost:5000"',
+                required: false,
+            },
+            {
+                name: 'hub',
+                type: 'string',
+                description: 'The hub to connect to, e.g. "loghub" (default) or "loghub2"',
+                required: false,
+            },
+            {
+                name: 'file',
+                type: 'boolean',
+                description: 'Export logs to a file',
+                required: false,
+            },
         ];
         this.author = DefaultLibraryAuthor;
         this.processors?.push({
@@ -54,19 +72,26 @@ class CliLogsCommandProcessor {
     }
     async processCommand(command, context) {
         let qs = '?';
-        if (Object.keys(command.args).length > 0) {
-            qs += toQueryString(command.args);
+        const args = this.excludeKeys(command.args, ['server', 'hub', 'file']);
+        if (Object.keys(args).length > 0) {
+            qs += toQueryString(args);
         }
+        const hub = command.args['hub'] || 'loghub';
+        let server = command.args['server'] || '';
+        server = server.replace(/\/+$/, '');
+        const url = `${server}/${hub}${qs}`;
+        console.log('Connecting to:', url);
         this.hubConnection = new signalR.HubConnectionBuilder()
-            .withUrl('/loghub' + qs)
+            .withUrl(url)
             .build();
+        const buffer = [];
         await this.hubConnection
             .start()
             .then(() => {
             console.log('SignalR connection started');
             context.writer.writeWarning('Connected to live logs');
             if (qs.length) {
-                Object.keys(command.args).forEach((key) => {
+                Object.keys(args).forEach((key) => {
                     context.writer.writeWarning(`Filtering logs by: ${key}=${command.args[key]}`);
                 });
             }
@@ -76,6 +101,7 @@ class CliLogsCommandProcessor {
                 if (firstLog) {
                     context.writer.writeln('');
                 }
+                buffer.push(log);
                 context.writer.writeln(`\x1b[33m${++index}\x1b[0m. ` +
                     (command.args['pattern']
                         ? highlightTextWithBg(log, new RegExp(command.args['pattern'], 'g'))
@@ -85,17 +111,25 @@ class CliLogsCommandProcessor {
             const subscription = context.onAbort.subscribe(() => {
                 this.hubConnection.stop();
                 context.writer.writeWarning('Disconnected from live logs');
+                if (command.args['file']) {
+                    const filename = `logs-${new Date().toISOString()}.txt`;
+                    context.writer.writeToFile(filename, buffer.join('\n'));
+                }
                 subscription.unsubscribe();
             });
         })
             .catch((err) => {
             console.error('Error starting SignalR connection:', err);
             context.writer.writeError('Failed to connect to live logs');
+            context.writer.writeError(err?.toString());
         });
     }
     writeDescription(context) {
         context.writer.writeln('Show live logs');
     }
+    excludeKeys(record, keysToExclude) {
+        return Object.fromEntries(Object.entries(record).filter(([key]) => !keysToExclude.includes(key)));
+    }
     isValidRegex(pattern) {
         try {
             new RegExp(pattern);

package/fesm2022/qodalis-cli-server-logs.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"qodalis-cli-server-logs.mjs","sources":["../../../projects/server-logs/src/lib/processors/cli-logs-command-processor.ts","../../../projects/server-logs/src/lib/cli-server-logs.module.ts","../../../projects/server-logs/src/public-api.ts","../../../projects/server-logs/src/qodalis-cli-server-logs.ts"],"sourcesContent":["import { Injectable } from '@angular/core';\nimport * as signalR from '@microsoft/signalr';\nimport {\n CliProcessCommand,\n DefaultLibraryAuthor,\n highlightTextWithBg,\n ICliCommandAuthor,\n ICliCommandParameterDescriptor,\n ICliCommandProcessor,\n ICliExecutionContext,\n toQueryString,\n} from '@qodalis/cli-core';\n\nconst levels = ['verbose', 'debug', 'information', 'warning', 'error', 'fatal'];\n\n@Injectable({\n providedIn: 'root',\n})\nexport class CliLogsCommandProcessor implements ICliCommandProcessor {\n command = 'logs';\n\n description?: string \| undefined = 'Show live logs';\n\n processors?: ICliCommandProcessor[] \| undefined = [];\n\n parameters?: ICliCommandParameterDescriptor[] \| undefined = [\n {\n name: 'pattern',\n type: 'string',\n description: 'The regex pattern to search for in the logs',\n required: false,\n validator: (value: string) => {\n const isValid = this.isValidRegex(value);\n return {\n valid: isValid,\n message: isValid\n ? undefined\n : 'Invalid regex pattern provided',\n };\n },\n },\n {\n name: 'level',\n type: 'string',\n description:\n 'The log level to filter by, e.g. ' + levels.join(', '),\n required: false,\n validator: (value: string) => {\n const isValid = levels.includes(value);\n\n return {\n valid: isValid,\n message: isValid\n ? undefined\n : 'Invalid log level provided, must be one of: ' +\n levels.join(', '),\n };\n },\n },\n ];\n\n author?: ICliCommandAuthor \| undefined = DefaultLibraryAuthor;\n\n private hubConnection!: signalR.HubConnection;\n\n constructor() {\n this.processors?.push({\n command: 'live',\n description: this.description,\n parameters: this.parameters,\n processCommand: this.processCommand.bind(this),\n writeDescription: this.writeDescription.bind(this),\n });\n }\n\n async processCommand(\n command: CliProcessCommand,\n context: ICliExecutionContext,\n ): Promise<void> {\n let qs = '?';\n if (Object.keys(command.args).length > 0) {\n qs += toQueryString(command.args);\n }\n\n this.hubConnection = new signalR.HubConnectionBuilder()\n .withUrl('/loghub' + qs)\n .build();\n\n await this.hubConnection\n .start()\n .then(() => {\n console.log('SignalR connection started');\n\n context.writer.writeWarning('Connected to live logs');\n if (qs.length) {\n Object.keys(command.args).forEach((key) => {\n context.writer.writeWarning(\n `Filtering logs by: ${key}=${command.args[key]}`,\n );\n });\n }\n\n let firstLog = true;\n let index = 0;\n\n this.hubConnection.on('log', (log: string) => {\n if (firstLog) {\n context.writer.writeln('');\n }\n\n context.writer.writeln(\n `\\x1b[33m${++index}\\x1b[0m. ` +\n (command.args['pattern']\n ? highlightTextWithBg(\n log,\n new RegExp(command.args['pattern'], 'g'),\n )\n : log),\n );\n firstLog = false;\n });\n\n const subscription = context.onAbort.subscribe(() => {\n this.hubConnection.stop();\n context.writer.writeWarning('Disconnected from live logs');\n\n subscription.unsubscribe();\n });\n })\n .catch((err) => {\n console.error('Error starting SignalR connection:', err);\n context.writer.writeError('Failed to connect to live logs');\n });\n }\n\n writeDescription(context: ICliExecutionContext): void {\n context.writer.writeln('Show live logs');\n }\n\n private isValidRegex(pattern: string): boolean {\n try {\n new RegExp(pattern);\n return true;\n } catch (e) {\n return false;\n }\n }\n}\n","import { NgModule } from '@angular/core';\nimport { resolveCommandProcessorProvider } from '@qodalis/angular-cli';\nimport { CliLogsCommandProcessor } from './processors/cli-logs-command-processor';\n\n@NgModule({\n declarations: [],\n imports: [],\n exports: [],\n providers: [resolveCommandProcessorProvider(CliLogsCommandProcessor)],\n})\nexport class CliServerLogsModule {}\n","/\n Public API Surface of server-logs\n /\n\nexport from './lib/cli-server-logs.module';\n","/*\n Generated bundle index. Do not edit.\n /\n\nexport from './public-api';\n"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"qodalis-cli-server-logs.mjs","sources":["../../../projects/server-logs/src/lib/processors/cli-logs-command-processor.ts","../../../projects/server-logs/src/lib/cli-server-logs.module.ts","../../../projects/server-logs/src/public-api.ts","../../../projects/server-logs/src/qodalis-cli-server-logs.ts"],"sourcesContent":["import { Injectable } from '@angular/core';\nimport * as signalR from '@microsoft/signalr';\nimport {\n CliProcessCommand,\n DefaultLibraryAuthor,\n highlightTextWithBg,\n ICliCommandAuthor,\n ICliCommandParameterDescriptor,\n ICliCommandProcessor,\n ICliExecutionContext,\n toQueryString,\n} from '@qodalis/cli-core';\n\nconst levels = ['verbose', 'debug', 'information', 'warning', 'error', 'fatal'];\n\n@Injectable({\n providedIn: 'root',\n})\nexport class CliLogsCommandProcessor implements ICliCommandProcessor {\n command = 'logs';\n\n description?: string \| undefined = 'Show live logs';\n\n processors?: ICliCommandProcessor[] \| undefined = [];\n\n parameters?: ICliCommandParameterDescriptor[] \| undefined = [\n {\n name: 'pattern',\n type: 'string',\n description: 'The regex pattern to search for in the logs',\n required: false,\n validator: (value: string) => {\n const isValid = this.isValidRegex(value);\n return {\n valid: isValid,\n message: isValid\n ? undefined\n : 'Invalid regex pattern provided',\n };\n },\n },\n {\n name: 'level',\n type: 'string',\n description:\n 'The log level to filter by, e.g. ' + levels.join(', '),\n required: false,\n validator: (value: string) => {\n const isValid = levels.includes(value);\n\n return {\n valid: isValid,\n message: isValid\n ? undefined\n : 'Invalid log level provided, must be one of: ' +\n levels.join(', '),\n };\n },\n },\n {\n name: 'server',\n type: 'string',\n description:\n 'The server to connect to, e.g. \"http://localhost:5000\"',\n required: false,\n },\n {\n name: 'hub',\n type: 'string',\n description:\n 'The hub to connect to, e.g. \"loghub\" (default) or \"loghub2\"',\n required: false,\n },\n {\n name: 'file',\n type: 'boolean',\n description: 'Export logs to a file',\n required: false,\n },\n ];\n\n author?: ICliCommandAuthor \| undefined = DefaultLibraryAuthor;\n\n private hubConnection!: signalR.HubConnection;\n\n constructor() {\n this.processors?.push({\n command: 'live',\n description: this.description,\n parameters: this.parameters,\n processCommand: this.processCommand.bind(this),\n writeDescription: this.writeDescription.bind(this),\n });\n }\n\n async processCommand(\n command: CliProcessCommand,\n context: ICliExecutionContext,\n ): Promise<void> {\n let qs = '?';\n\n const args = this.excludeKeys(command.args, ['server', 'hub', 'file']);\n\n if (Object.keys(args).length > 0) {\n qs += toQueryString(args);\n }\n\n const hub = command.args['hub'] \|\| 'loghub';\n\n let server = command.args['server'] \|\| '';\n server = server.replace(/\\/+$/, '');\n\n const url = `${server}/${hub}${qs}`;\n\n console.log('Connecting to:', url);\n\n this.hubConnection = new signalR.HubConnectionBuilder()\n .withUrl(url)\n .build();\n\n const buffer: string[] = [];\n\n await this.hubConnection\n .start()\n .then(() => {\n console.log('SignalR connection started');\n\n context.writer.writeWarning('Connected to live logs');\n if (qs.length) {\n Object.keys(args).forEach((key) => {\n context.writer.writeWarning(\n `Filtering logs by: ${key}=${command.args[key]}`,\n );\n });\n }\n\n let firstLog = true;\n let index = 0;\n\n this.hubConnection.on('log', (log: string) => {\n if (firstLog) {\n context.writer.writeln('');\n }\n\n buffer.push(log);\n\n context.writer.writeln(\n `\\x1b[33m${++index}\\x1b[0m. ` +\n (command.args['pattern']\n ? highlightTextWithBg(\n log,\n new RegExp(command.args['pattern'], 'g'),\n )\n : log),\n );\n firstLog = false;\n });\n\n const subscription = context.onAbort.subscribe(() => {\n this.hubConnection.stop();\n context.writer.writeWarning('Disconnected from live logs');\n\n if (command.args['file']) {\n const filename = `logs-${new Date().toISOString()}.txt`;\n context.writer.writeToFile(filename, buffer.join('\\n'));\n }\n\n subscription.unsubscribe();\n });\n })\n .catch((err) => {\n console.error('Error starting SignalR connection:', err);\n context.writer.writeError('Failed to connect to live logs');\n context.writer.writeError(err?.toString());\n });\n }\n\n writeDescription(context: ICliExecutionContext): void {\n context.writer.writeln('Show live logs');\n }\n\n private excludeKeys<T extends Record<string, any>>(\n record: T,\n keysToExclude: string[],\n ): Partial<T> {\n return Object.fromEntries(\n Object.entries(record).filter(\n ([key]) => !keysToExclude.includes(key),\n ),\n ) as Partial<T>;\n }\n\n private isValidRegex(pattern: string): boolean {\n try {\n new RegExp(pattern);\n return true;\n } catch (e) {\n return false;\n }\n }\n}\n","import { NgModule } from '@angular/core';\nimport { resolveCommandProcessorProvider } from '@qodalis/angular-cli';\nimport { CliLogsCommandProcessor } from './processors/cli-logs-command-processor';\n\n@NgModule({\n declarations: [],\n imports: [],\n exports: [],\n providers: [resolveCommandProcessorProvider(CliLogsCommandProcessor)],\n})\nexport class CliServerLogsModule {}\n","/\n Public API Surface of server-logs\n /\n\nexport from './lib/cli-server-logs.module';\n","/*\n Generated bundle index. Do not edit.\n /\n\nexport from './public-api';\n"],"names":[],"mappings":"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"}

package/lib/processors/cli-logs-command-processor.d.ts CHANGED Viewed

@@ -10,6 +10,7 @@ export declare class CliLogsCommandProcessor implements ICliCommandProcessor {
     constructor();
     processCommand(command: CliProcessCommand, context: ICliExecutionContext): Promise<void>;
     writeDescription(context: ICliExecutionContext): void;
+    private excludeKeys;
     private isValidRegex;
     static ɵfac: i0.ɵɵFactoryDeclaration<CliLogsCommandProcessor, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<CliLogsCommandProcessor>;

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@qodalis/cli-server-logs",
-  "version": "1.0.3",
-  "description": "An Angular CLI extension for generating and validating GUIDs.",
+  "version": "1.0.5",
+  "description": "An Angular CLI extension for server logs.",
   "author": "Nicolae Lupei, Qodalis Solutions",
   "license": "MIT",
   "repository": {
@@ -23,11 +23,19 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@qodalis/cli-core": "^0.0.3",
-    "@qodalis/angular-cli": "^1.0.11",
+    "@qodalis/cli-core": "^0.0.5",
+    "@qodalis/angular-cli": "^1.0.14",
     "@microsoft/signalr": "^8.0.7"
   },
   "sideEffects": false,
+  "cliDependencies": [
+    {
+      "name": "signalR",
+      "globalName": "signalR",
+      "version": "latest",
+      "url": "https://unpkg.com/@microsoft/signalr@8.0.7/dist/browser/signalr.js"
+    }
+  ],
   "module": "fesm2022/qodalis-cli-server-logs.mjs",
   "typings": "index.d.ts",
   "exports": {

package/umd/index.js CHANGED Viewed

@@ -1,7 +1,7 @@
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('@qodalis/cli-core'), require('@angular/core'), require('@microsoft/signalr')) :
     typeof define === 'function' && define.amd ? define(['@qodalis/cli-core', '@angular/core', '@microsoft/signalr'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.core, global.core, global.signalR));
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.cliCore, global.ngCore, global.signalR));
 })(this, (function (cliCore, core, signalR) { 'use strict';
     function _interopNamespaceDefault(e) {
@@ -90,6 +90,24 @@
                         };
                     },
                 },
+                {
+                    name: 'server',
+                    type: 'string',
+                    description: 'The server to connect to, e.g. "http://localhost:5000"',
+                    required: false,
+                },
+                {
+                    name: 'hub',
+                    type: 'string',
+                    description: 'The hub to connect to, e.g. "loghub" (default) or "loghub2"',
+                    required: false,
+                },
+                {
+                    name: 'file',
+                    type: 'boolean',
+                    description: 'Export logs to a file',
+                    required: false,
+                },
             ];
             this.author = cliCore.DefaultLibraryAuthor;
             this.processors?.push({
@@ -102,19 +120,26 @@
         }
         async processCommand(command, context) {
             let qs = '?';
-            if (Object.keys(command.args).length > 0) {
-                qs += cliCore.toQueryString(command.args);
+            const args = this.excludeKeys(command.args, ['server', 'hub', 'file']);
+            if (Object.keys(args).length > 0) {
+                qs += cliCore.toQueryString(args);
             }
+            const hub = command.args['hub'] || 'loghub';
+            let server = command.args['server'] || '';
+            server = server.replace(/\/+$/, '');
+            const url = `${server}/${hub}${qs}`;
+            console.log('Connecting to:', url);
             this.hubConnection = new signalR__namespace.HubConnectionBuilder()
-                .withUrl('/loghub' + qs)
+                .withUrl(url)
                 .build();
+            const buffer = [];
             await this.hubConnection
                 .start()
                 .then(() => {
                 console.log('SignalR connection started');
                 context.writer.writeWarning('Connected to live logs');
                 if (qs.length) {
-                    Object.keys(command.args).forEach((key) => {
+                    Object.keys(args).forEach((key) => {
                         context.writer.writeWarning(`Filtering logs by: ${key}=${command.args[key]}`);
                     });
                 }
@@ -124,6 +149,7 @@
                     if (firstLog) {
                         context.writer.writeln('');
                     }
+                    buffer.push(log);
                     context.writer.writeln(`\x1b[33m${++index}\x1b[0m. ` +
                         (command.args['pattern']
                             ? cliCore.highlightTextWithBg(log, new RegExp(command.args['pattern'], 'g'))
@@ -133,17 +159,25 @@
                 const subscription = context.onAbort.subscribe(() => {
                     this.hubConnection.stop();
                     context.writer.writeWarning('Disconnected from live logs');
+                    if (command.args['file']) {
+                        const filename = `logs-${new Date().toISOString()}.txt`;
+                        context.writer.writeToFile(filename, buffer.join('\n'));
+                    }
                     subscription.unsubscribe();
                 });
             })
                 .catch((err) => {
                 console.error('Error starting SignalR connection:', err);
                 context.writer.writeError('Failed to connect to live logs');
+                context.writer.writeError(err?.toString());
             });
         }
         writeDescription(context) {
             context.writer.writeln('Show live logs');
         }
+        excludeKeys(record, keysToExclude) {
+            return Object.fromEntries(Object.entries(record).filter(([key]) => !keysToExclude.includes(key)));
+        }
         isValidRegex(pattern) {
             try {
                 new RegExp(pattern);
@@ -160,17 +194,9 @@
         })
     ], CliLogsCommandProcessor);
-    const module = {
+    cliCore.bootUmdModule({
         name: '@qodalis/cli-server-logs',
         processors: [new CliLogsCommandProcessor()],
-        dependencies: [
-            {
-                name: 'signalR',
-                version: 'latest',
-                url: 'https://unpkg.com/@microsoft/signalr@8.0.7/dist/browser/signalr.js',
-            },
-        ],
-    };
-    cliCore.bootUmdModule(module);
+    });
 }));