@herodevs/cli 2.0.0-beta.2 → 2.0.0-beta.4

package/README.md

@@ -10,6 +10,14 @@ The HeroDevs CLI
 * [@herodevs/cli](#herodevscli)
 <!-- tocstop -->
 
+## Installation Instructions
+
+1. Install node v20 or higher: [Download Node](https://nodejs.org/en/download)
+1. Install the CLI using one of the following methods:
+   - Globally: Refer to the [Usage](#usage) instructions on installing the CLI globally
+   - Npx:`npx @herodevs/cli@beta <commands>`
+1. Refer to the [Commands](#commands) section for a list of commands
+
 ## TERMS
 
 Use of this CLI is governed by the [HeroDevs End of Life Dataset Terms of Service and Data Policy](https://docs.herodevs.com/legal/end-of-life-dataset-terms).
@@ -30,7 +38,7 @@ $ npm install -g @herodevs/cli
 $ hd COMMAND
 running command...
 $ hd (--version)
-@herodevs/cli/2.0.0-beta.2 linux-x64 node-v22.15.0
+@herodevs/cli/2.0.0-beta.4 linux-x64 node-v22.16.0
 $ hd --help [COMMAND]
 USAGE
   $ hd COMMAND
@@ -64,7 +72,7 @@ DESCRIPTION
   Display help for hd.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.28/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.29/src/commands/help.ts)_
 
 ## `hd report committers`
 
@@ -77,7 +85,7 @@ USAGE
 FLAGS
   -c, --csv             Output in CSV format
   -m, --months=<value>  [default: 12] The number of months of git history to review
-  -s, --save            Save the committers report as eol.committers.<output>
+  -s, --save            Save the committers report as herodevs.committers.<output>
 
 GLOBAL FLAGS
   --json  Format output as json.
@@ -95,7 +103,7 @@ EXAMPLES
   $ hd report committers --csv
 ```
 
-_See code: [src/commands/report/committers.ts](https://github.com/herodevs/cli/blob/v2.0.0-beta.2/src/commands/report/committers.ts)_
+_See code: [src/commands/report/committers.ts](https://github.com/herodevs/cli/blob/v2.0.0-beta.4/src/commands/report/committers.ts)_
 
 ## `hd report purls`
 
@@ -109,7 +117,7 @@ FLAGS
   -c, --csv           Save output in CSV format (only applies when using --save)
   -d, --dir=<value>   The directory to scan in order to create a cyclonedx sbom
   -f, --file=<value>  The file path of an existing cyclonedx sbom to scan for EOL
-  -s, --save          Save the list of purls as eol.purls.<output>
+  -s, --save          Save the list of purls as herodevs.purls.<output>
 
 GLOBAL FLAGS
   --json  Format output as json.
@@ -129,7 +137,7 @@ EXAMPLES
   $ hd report purls --save --csv
 ```
 
-_See code: [src/commands/report/purls.ts](https://github.com/herodevs/cli/blob/v2.0.0-beta.2/src/commands/report/purls.ts)_
+_See code: [src/commands/report/purls.ts](https://github.com/herodevs/cli/blob/v2.0.0-beta.4/src/commands/report/purls.ts)_
 
 ## `hd scan eol`
 
@@ -137,15 +145,13 @@ Scan a given sbom for EOL data
 
 ```
 USAGE
-  $ hd scan eol [--json] [-f <value>] [-p <value>] [-d <value>] [-s] [-a] [-t]
+  $ hd scan eol [--json] [-f <value>] [-p <value>] [-d <value>] [-s]
 
 FLAGS
-  -a, --all            Show all components (default is EOL and SUPPORTED only)
   -d, --dir=<value>    The directory to scan in order to create a cyclonedx sbom
   -f, --file=<value>   The file path of an existing cyclonedx sbom to scan for EOL
   -p, --purls=<value>  The file path of a list of purls to scan for EOL
-  -s, --save           Save the generated report as eol.report.json in the scanned directory
-  -t, --table          Display the results in a table
+  -s, --save           Save the generated report as herodevs.report.json in the scanned directory
 
 GLOBAL FLAGS
   --json  Format output as json.
@@ -163,7 +169,7 @@ EXAMPLES
   $ hd scan eol -a --dir=./my-project
 ```
 
-_See code: [src/commands/scan/eol.ts](https://github.com/herodevs/cli/blob/v2.0.0-beta.2/src/commands/scan/eol.ts)_
+_See code: [src/commands/scan/eol.ts](https://github.com/herodevs/cli/blob/v2.0.0-beta.4/src/commands/scan/eol.ts)_
 
 ## `hd scan sbom`
 
@@ -177,7 +183,7 @@ FLAGS
   -b, --background    Run the scan in the background
   -d, --dir=<value>   The directory to scan in order to create a cyclonedx sbom
   -f, --file=<value>  The file path of an existing cyclonedx sbom to scan for EOL
-  -s, --save          Save the generated SBOM as eol.sbom.json in the scanned directory
+  -s, --save          Save the generated SBOM as herodevs.sbom.json in the scanned directory
 
 GLOBAL FLAGS
   --json  Format output as json.
@@ -191,7 +197,7 @@ EXAMPLES
   $ hd scan sbom --file=path/to/sbom.json
 ```
 
-_See code: [src/commands/scan/sbom.ts](https://github.com/herodevs/cli/blob/v2.0.0-beta.2/src/commands/scan/sbom.ts)_
+_See code: [src/commands/scan/sbom.ts](https://github.com/herodevs/cli/blob/v2.0.0-beta.4/src/commands/scan/sbom.ts)_
 
 ## `hd update [CHANNEL]`
 
@@ -229,5 +235,5 @@ EXAMPLES
     $ hd update --available
 ```
 
-_See code: [@oclif/plugin-update](https://github.com/oclif/plugin-update/blob/v4.6.39/src/commands/update.ts)_
+_See code: [@oclif/plugin-update](https://github.com/oclif/plugin-update/blob/v4.6.45/src/commands/update.ts)_
 <!-- commandsstop -->

package/bin/dev.js

@@ -1,8 +1,5 @@
 #!/usr/bin/env node
 
-process.env.GRAPHQL_HOST = 'https://api.dev.nes.herodevs.com';
-process.env.EOL_REPORT_URL = 'https://eol-report-card.stage.apps.herodevs.io/reports';
-
 import main from './main.js';
 
 try {

package/bin/main.js

@@ -7,9 +7,9 @@ async function main(isProduction = false) {
     strict: false, // Don't validate flags
   });
 
-  // If no arguments at all, default to scan:eol -t
+  // If no arguments at all, default to scan:eol
   if (positionals.length === 0) {
-    process.argv.splice(2, 0, 'scan:eol', '-t');
+    process.argv.splice(2, 0, 'scan:eol');
   }
   // If only flags are provided, set scan:eol as the command for those flags
   else if (positionals.length === 1 && positionals[0].startsWith('-')) {

package/dist/api/nes/nes.client.d.ts

@@ -16,6 +16,7 @@ export declare class NesApolloClient implements NesClient {
     query<T, V extends Record<string, unknown> | undefined>(query: apollo.DocumentNode, variables?: V): Promise<apollo.ApolloQueryResult<T>>;
 }
 export declare const batchSubmitPurls: (purls: string[], options?: ScanInputOptions, batchSize?: number) => Promise<ScanResult>;
+export declare const dedupeAndEncodePurls: (purls: string[]) => string[];
 export declare const createBatches: (items: string[], batchSize: number) => string[][];
 export declare const processBatch: ({ batch, index, totalPages, scanOptions, previousScanId, }: ProcessBatchOptions) => Promise<InsightsEolScanResult>;
 export declare const processBatches: (batches: string[][], scanOptions: ScanInputOptions) => Promise<InsightsEolScanResult[]>;

package/dist/api/nes/nes.client.js

@@ -1,3 +1,4 @@
+import { PackageURL } from 'packageurl-js';
 import { ApolloClient } from "../../api/client.js";
 import { config } from "../../config/constants.js";
 import { debugLogger } from "../../service/log.svc.js";
@@ -25,12 +26,14 @@ function submitScan(purls, options) {
     const host = config.graphqlHost;
     const path = config.graphqlPath;
     const url = host + path;
+    debugLogger('Submitting scan to %s', url);
     const client = new NesApolloClient(url);
     return client.scan.purls(purls, options);
 }
 export const batchSubmitPurls = async (purls, options = DEFAULT_SCAN_INPUT_OPTIONS, batchSize = DEFAULT_SCAN_BATCH_SIZE) => {
     try {
-        const batches = createBatches(purls, batchSize);
+        const dedupedAndEncodedPurls = dedupeAndEncodePurls(purls);
+        const batches = createBatches(dedupedAndEncodedPurls, batchSize);
         debugLogger('Processing %d batches', batches.length);
         if (batches.length === 0) {
             return {
@@ -39,6 +42,7 @@ export const batchSubmitPurls = async (purls, options = DEFAULT_SCAN_INPUT_OPTIO
                 success: true,
                 warnings: [],
                 scanId: undefined,
+                createdOn: undefined,
             };
         }
         const results = await processBatches(batches, options);
@@ -49,6 +53,22 @@ export const batchSubmitPurls = async (purls, options = DEFAULT_SCAN_INPUT_OPTIO
         throw new Error(`Failed to process purls: ${error instanceof Error ? error.message : String(error)}`);
     }
 };
+export const dedupeAndEncodePurls = (purls) => {
+    const dedupedAndEncodedPurls = new Set();
+    for (const purl of purls) {
+        try {
+            // The PackageURL.fromString method encodes each part of the purl
+            const encodedPurl = PackageURL.fromString(purl).toString();
+            if (!dedupedAndEncodedPurls.has(encodedPurl)) {
+                dedupedAndEncodedPurls.add(encodedPurl);
+            }
+        }
+        catch (error) {
+            debugLogger('Error encoding purl: %s', error);
+        }
+    }
+    return Array.from(dedupedAndEncodedPurls);
+};
 export const createBatches = (items, batchSize) => {
     const numberOfBatches = Math.ceil(items.length / batchSize);
     return Array.from({ length: numberOfBatches }, (_, index) => {

package/dist/api/queries/nes/sbom.js

@@ -15,10 +15,14 @@ export const M_SCAN = {
                 status
                 vulnCount
               }
+              remediation {
+                id
+              }
             }
             diagnostics
             message
             scanId
+            createdOn
             success
             warnings {
               purl

package/dist/api/types/hd-cli.types.d.ts

@@ -8,13 +8,13 @@ export interface ScanInputOptions {
 }
 export declare const DEFAULT_SCAN_BATCH_SIZE = 1000;
 export declare const DEFAULT_SCAN_INPUT_OPTIONS: ScanInputOptions;
-export type ScanResultComponentsMap = Map<string, InsightsEolScanComponent>;
 export type ScanInput = {
     components: string[];
     options: ScanInputOptions;
 };
 export interface ScanResult {
-    components: ScanResultComponentsMap;
+    components: Map<string, InsightsEolScanComponent>;
+    createdOn?: string;
     diagnostics?: Record<string, unknown>;
     message: string;
     success: boolean;

package/dist/api/types/nes.types.d.ts

@@ -22,6 +22,7 @@ export interface ScanResponse {
  */
 export interface InsightsEolScanResult {
     scanId?: string;
+    createdOn: string;
     success: boolean;
     message: string;
     components: InsightsEolScanComponent[];
@@ -37,10 +38,14 @@ export interface InsightsEolScanComponentInfo {
     status: ComponentStatus;
     daysEol: number | null;
     vulnCount: number | null;
+    nesAvailable?: boolean;
 }
 export interface InsightsEolScanComponent {
     info: InsightsEolScanComponentInfo;
     purl: string;
+    remediation?: {
+        id: string;
+    } | null;
 }
 export interface ScanWarning {
     purl: string;
@@ -50,4 +55,4 @@ export interface ScanWarning {
     diagnostics?: Record<string, unknown>;
 }
 export type ComponentStatus = (typeof VALID_STATUSES)[number];
-export declare const VALID_STATUSES: readonly ["UNKNOWN", "OK", "EOL", "SUPPORTED"];
+export declare const VALID_STATUSES: readonly ["UNKNOWN", "OK", "EOL", "EOL_UPCOMING"];

package/dist/api/types/nes.types.js

@@ -1 +1 @@
-export const VALID_STATUSES = ['UNKNOWN', 'OK', 'EOL', 'SUPPORTED'];
+export const VALID_STATUSES = ['UNKNOWN', 'OK', 'EOL', 'EOL_UPCOMING'];

package/dist/commands/report/committers.js

@@ -2,6 +2,7 @@ import { spawnSync } from 'node:child_process';
 import { Command, Flags } from '@oclif/core';
 import fs from 'node:fs';
 import path from 'node:path';
+import { filenamePrefix } from "../../config/constants.js";
 import { calculateOverallStats, formatAsCsv, formatAsText, groupCommitsByMonth, parseGitLogOutput, } from "../../service/committers.svc.js";
 import { getErrorMessage, isErrnoException } from "../../service/error.svc.js";
 export default class Committers extends Command {
@@ -26,7 +27,7 @@ export default class Committers extends Command {
         }),
         save: Flags.boolean({
             char: 's',
-            description: 'Save the committers report as eol.committers.<output>',
+            description: `Save the committers report as ${filenamePrefix}.committers.<output>`,
             default: false,
         }),
     };
@@ -46,7 +47,7 @@ export default class Committers extends Command {
                 // JSON mode
                 if (save) {
                     try {
-                        fs.writeFileSync(path.resolve('eol.committers.json'), JSON.stringify(reportData, null, 2));
+                        fs.writeFileSync(path.resolve(`${filenamePrefix}.committers.json`), JSON.stringify(reportData, null, 2));
                         this.log('Report written to json');
                     }
                     catch (error) {
@@ -61,7 +62,7 @@ export default class Committers extends Command {
                 const csvOutput = formatAsCsv(reportData);
                 if (save) {
                     try {
-                        fs.writeFileSync(path.resolve('eol.committers.csv'), csvOutput);
+                        fs.writeFileSync(path.resolve(`${filenamePrefix}.committers.csv`), csvOutput);
                         this.log('Report written to csv');
                     }
                     catch (error) {
@@ -75,7 +76,7 @@ export default class Committers extends Command {
             }
             if (save) {
                 try {
-                    fs.writeFileSync(path.resolve('eol.committers.txt'), textOutput);
+                    fs.writeFileSync(path.resolve(`${filenamePrefix}.committers.txt`), textOutput);
                     this.log('Report written to txt');
                 }
                 catch (error) {

package/dist/commands/report/purls.js

@@ -1,6 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { Command, Flags, ux } from '@oclif/core';
+import { filenamePrefix } from "../../config/constants.js";
 import { getErrorMessage, isErrnoException } from "../../service/error.svc.js";
 import { extractPurls, getPurlOutput } from "../../service/purls.svc.js";
 import ScanSbom from "../scan/sbom.js";
@@ -26,7 +27,7 @@ export default class ReportPurls extends Command {
         save: Flags.boolean({
             char: 's',
             default: false,
-            description: 'Save the list of purls as eol.purls.<output>',
+            description: `Save the list of purls as ${filenamePrefix}.purls.<output>`,
         }),
         csv: Flags.boolean({
             char: 'c',
@@ -50,7 +51,7 @@ export default class ReportPurls extends Command {
             if (save) {
                 try {
                     const outputFile = csv && !this.jsonEnabled() ? 'csv' : 'json';
-                    const outputPath = path.join(_dirFlag || process.cwd(), `eol.purls.${outputFile}`);
+                    const outputPath = path.join(_dirFlag || process.cwd(), `${filenamePrefix}.purls.${outputFile}`);
                     const purlOutput = getPurlOutput(purls, outputFile);
                     fs.writeFileSync(outputPath, purlOutput);
                     this.log('Purls saved to %s', outputPath);

package/dist/commands/scan/eol.d.ts

@@ -1,5 +1,5 @@
 import { Command } from '@oclif/core';
-import type { InsightsEolScanComponent } from '../../api/types/nes.types.ts';
+import type { ComponentStatus, InsightsEolScanComponent } from '../../api/types/nes.types.ts';
 export default class ScanEol extends Command {
     static description: string;
     static enableJsonFlag: boolean;
@@ -9,23 +9,16 @@ export default class ScanEol extends Command {
         purls: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         dir: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         save: import("@oclif/core/interfaces").BooleanFlag<boolean>;
-        all: import("@oclif/core/interfaces").BooleanFlag<boolean>;
-        table: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<{
         components: InsightsEolScanComponent[];
+        createdOn: string;
     }>;
     private getScan;
     private getPurlsFromFile;
     private printWebReportUrl;
     private scanSbom;
-    private getFilteredComponents;
     private saveReport;
     private displayResults;
-    private displayResultsInTable;
-    private displayTable;
-    private displayNoComponentsMessage;
-    private logLine;
-    private displayStatusSection;
-    private logLegend;
 }
+export declare function countComponentsByStatus(components: InsightsEolScanComponent[]): Record<ComponentStatus | 'NES_AVAILABLE', number>;

package/dist/commands/scan/eol.js

@@ -1,11 +1,11 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { Command, Flags, ux } from '@oclif/core';
+import terminalLink from 'terminal-link';
 import { batchSubmitPurls } from "../../api/nes/nes.client.js";
-import { config } from "../../config/constants.js";
+import { config, filenamePrefix } from "../../config/constants.js";
 import { getErrorMessage, isErrnoException } from "../../service/error.svc.js";
 import { extractPurls, parsePurlsFile } from "../../service/purls.svc.js";
-import { createStatusDisplay, createTableForStatus, groupComponentsByStatus } from "../../ui/eol.ui.js";
 import { INDICATORS, SCAN_ID_KEY, STATUS_COLORS } from "../../ui/shared.ui.js";
 import ScanSbom from "./sbom.js";
 export default class ScanEol extends Command {
@@ -33,40 +33,27 @@ export default class ScanEol extends Command {
         save: Flags.boolean({
             char: 's',
             default: false,
-            description: 'Save the generated report as eol.report.json in the scanned directory',
-        }),
-        all: Flags.boolean({
-            char: 'a',
-            description: 'Show all components (default is EOL and SUPPORTED only)',
-            default: false,
-        }),
-        table: Flags.boolean({
-            char: 't',
-            description: 'Display the results in a table',
-            default: false,
+            description: `Save the generated report as ${filenamePrefix}.report.json in the scanned directory`,
         }),
     };
     async run() {
         const { flags } = await this.parse(ScanEol);
         const scan = await this.getScan(flags, this.config);
-        ux.action.stop('\nScan completed');
-        const components = this.getFilteredComponents(scan, flags.all);
+        const components = Array.from(scan.components.values());
+        ux.action.stop();
         if (flags.save) {
-            await this.saveReport(components);
+            await this.saveReport(components, scan.createdOn);
         }
         if (!this.jsonEnabled()) {
-            if (flags.table) {
-                this.log(`${scan.components.size} components scanned`);
-                this.displayResultsInTable(scan, flags.all);
-            }
-            else {
-                this.displayResults(scan, flags.all);
-            }
+            this.displayResults(components);
             if (scan.scanId) {
                 this.printWebReportUrl(scan.scanId);
             }
+            this.log('* Use --json to output the report payload');
+            this.log(`* Use --save to save the report to ${filenamePrefix}.report.json`);
+            this.log('* Use --help for more commands or options');
         }
-        return { components };
+        return { components, createdOn: scan.createdOn ?? '' };
     }
     async getScan(flags, config) {
         if (flags.purls) {
@@ -87,11 +74,11 @@ export default class ScanEol extends Command {
         }
     }
     printWebReportUrl(scanId) {
-        this.logLine();
+        this.log(ux.colorize('bold', '-'.repeat(40)));
         const id = scanId.split(SCAN_ID_KEY)[1];
         const reportCardUrl = config.eolReportUrl;
-        const url = ux.colorize('blue', `${reportCardUrl}/${id}`);
-        this.log(`🌐 View your free EOL report at: ${ux.colorize('blue', url)}`);
+        const url = ux.colorize('blue', terminalLink(new URL(reportCardUrl).hostname, `${reportCardUrl}/${id}`, { fallback: (_, url) => url }));
+        this.log(`🌐 View your full EOL report at: ${url}\n`);
     }
     async scanSbom(sbom) {
         let scan;
@@ -108,92 +95,59 @@ export default class ScanEol extends Command {
         catch (error) {
             this.error(`Failed to submit scan to NES from sbom. ${getErrorMessage(error)}`);
         }
-        if (scan.components.size === 0) {
-            this.warn('No components found in scan');
-        }
         return scan;
     }
-    getFilteredComponents(scan, all) {
-        return Array.from(scan.components.values()).filter((component) => all || ['EOL', 'SUPPORTED'].includes(component.info.status));
-    }
-    async saveReport(components) {
+    async saveReport(components, createdOn) {
         const { flags } = await this.parse(ScanEol);
-        const reportPath = path.join(flags.dir || process.cwd(), 'eol.report.json');
+        const reportPath = path.join(flags.dir || process.cwd(), `${filenamePrefix}.report.json`);
         try {
-            fs.writeFileSync(reportPath, JSON.stringify({ components }, null, 2));
-            this.log('Report saved to eol.report.json');
+            fs.writeFileSync(reportPath, JSON.stringify({ components, createdOn }, null, 2));
+            this.log(`Report saved to ${filenamePrefix}.report.json`);
         }
         catch (error) {
             if (!isErrnoException(error)) {
                 this.error(`Failed to save report: ${getErrorMessage(error)}`);
             }
-            switch (error.code) {
-                case 'EACCES':
-                    this.error('Permission denied. Unable to save report to eol.report.json');
-                    break;
-                case 'ENOSPC':
-                    this.error('No space left on device. Unable to save report to eol.report.json');
-                    break;
-                default:
-                    this.error(`Failed to save report: ${getErrorMessage(error)}`);
+            if (error.code === 'EACCES') {
+                this.error(`Permission denied. Unable to save report to ${filenamePrefix}.report.json`);
             }
-        }
-    }
-    displayResults(scan, all) {
-        const { UNKNOWN, OK, SUPPORTED, EOL } = createStatusDisplay(scan.components, all);
-        if (!UNKNOWN.length && !OK.length && !SUPPORTED.length && !EOL.length) {
-            this.displayNoComponentsMessage(all);
-            return;
-        }
-        this.log(ux.colorize('bold', 'Here are the results of the scan:'));
-        this.logLine();
-        // Display sections in order of increasing severity
-        for (const components of [UNKNOWN, OK, SUPPORTED, EOL]) {
-            this.displayStatusSection(components);
-        }
-        this.logLegend();
-    }
-    displayResultsInTable(scan, all) {
-        const grouped = groupComponentsByStatus(scan.components);
-        const statuses = ['SUPPORTED', 'EOL'];
-        if (all) {
-            statuses.unshift('UNKNOWN', 'OK');
-        }
-        for (const status of statuses) {
-            const components = grouped[status];
-            if (components.length > 0) {
-                const table = createTableForStatus(grouped, status);
-                this.displayTable(table, components.length, status);
+            else if (error.code === 'ENOSPC') {
+                this.error(`No space left on device. Unable to save report to ${filenamePrefix}.report.json`);
+            }
+            else {
+                this.error(`Failed to save report: ${getErrorMessage(error)}`);
             }
         }
-        this.logLegend();
-    }
-    displayTable(table, count, status) {
-        this.log(ux.colorize(STATUS_COLORS[status], `${INDICATORS[status]} ${count} ${status} Component(s):`));
-        this.log(ux.colorize(STATUS_COLORS[status], table));
     }
-    displayNoComponentsMessage(all) {
-        if (!all) {
-            this.log(ux.colorize('yellow', 'No End-of-Life or Supported components found in scan.'));
-            this.log(ux.colorize('yellow', 'Use --all flag to view all components.'));
-        }
-        else {
+    displayResults(components) {
+        const { UNKNOWN, OK, EOL_UPCOMING, EOL, NES_AVAILABLE } = countComponentsByStatus(components);
+        if (!UNKNOWN && !OK && !EOL_UPCOMING && !EOL) {
             this.log(ux.colorize('yellow', 'No components found in scan.'));
+            return;
         }
+        this.log(ux.colorize('bold', 'Scan results:'));
+        this.log(ux.colorize('bold', '-'.repeat(40)));
+        this.log(ux.colorize('bold', `${components.length.toLocaleString()} total packages scanned`));
+        this.log(ux.colorize(STATUS_COLORS.EOL, `${INDICATORS.EOL} ${EOL.toLocaleString().padEnd(5)} End-of-Life (EOL)`));
+        this.log(ux.colorize(STATUS_COLORS.EOL_UPCOMING, `${INDICATORS.EOL_UPCOMING}${EOL_UPCOMING.toLocaleString().padEnd(5)} EOL Upcoming`));
+        this.log(ux.colorize(STATUS_COLORS.OK, `${INDICATORS.OK} ${OK.toLocaleString().padEnd(5)} OK`));
+        this.log(ux.colorize(STATUS_COLORS.UNKNOWN, `${INDICATORS.UNKNOWN} ${UNKNOWN.toLocaleString().padEnd(5)} Unknown Status`));
+        this.log(ux.colorize(STATUS_COLORS.UNKNOWN, `${INDICATORS.UNKNOWN} ${NES_AVAILABLE.toLocaleString().padEnd(5)} HeroDevs NES Remediation${NES_AVAILABLE !== 1 ? 's' : ''} Available`));
     }
-    logLine() {
-        this.log(ux.colorize('bold', '-'.repeat(50)));
-    }
-    displayStatusSection(components) {
-        if (components.length > 0) {
-            this.log(components.join('\n'));
-            this.logLine();
+}
+export function countComponentsByStatus(components) {
+    const grouped = {
+        UNKNOWN: 0,
+        OK: 0,
+        EOL_UPCOMING: 0,
+        EOL: 0,
+        NES_AVAILABLE: 0,
+    };
+    for (const component of components) {
+        grouped[component.info.status]++;
+        if (component.info.nesAvailable) {
+            grouped.NES_AVAILABLE++;
         }
     }
-    logLegend() {
-        this.log(ux.colorize(STATUS_COLORS.UNKNOWN, `${INDICATORS.UNKNOWN} = No Known Issues`));
-        this.log(ux.colorize(STATUS_COLORS.OK, `${INDICATORS.OK} = OK`));
-        this.log(ux.colorize(STATUS_COLORS.SUPPORTED, `${INDICATORS.SUPPORTED}= Supported: End-of-Life (EOL) is scheduled`));
-        this.log(ux.colorize(STATUS_COLORS.EOL, `${INDICATORS.EOL} = End of Life (EOL)`));
-    }
+    return grouped;
 }

package/dist/commands/scan/sbom.js

@@ -2,6 +2,7 @@ import { spawn } from 'node:child_process';
 import fs from 'node:fs';
 import { join, resolve } from 'node:path';
 import { Command, Flags, ux } from '@oclif/core';
+import { filenamePrefix } from "../../config/constants.js";
 import { createSbom, validateIsCycloneDxSbom } from "../../service/eol/eol.svc.js";
 import { getErrorMessage } from "../../service/error.svc.js";
 export default class ScanSbom extends Command {
@@ -23,7 +24,7 @@ export default class ScanSbom extends Command {
         save: Flags.boolean({
             char: 's',
             default: false,
-            description: 'Save the generated SBOM as eol.sbom.json in the scanned directory',
+            description: `Save the generated SBOM as ${filenamePrefix}.sbom.json in the scanned directory`,
         }),
         background: Flags.boolean({
             char: 'b',
@@ -41,15 +42,13 @@ export default class ScanSbom extends Command {
         return sbom;
     }
     static getSbomArgs(flags) {
-        const { dir, file, save, json, background } = flags ?? {};
-        const sbomArgs = [];
+        const { dir, file, background } = flags ?? {};
+        const sbomArgs = ['--json'];
         if (file)
             sbomArgs.push('--file', file);
         if (dir)
             sbomArgs.push('--dir', dir);
         // if (save) sbomArgs.push('--save'); // only save if sbom command is used directly with -s flag
-        if (json)
-            sbomArgs.push('--json');
         if (background)
             sbomArgs.push('--background');
         return sbomArgs;
@@ -69,18 +68,24 @@ export default class ScanSbom extends Command {
         const path = dir || process.cwd();
         if (file) {
             sbom = this._getSbomFromFile(file);
+            ux.action.stop();
         }
         else if (background) {
             this._getSbomInBackground(path);
-            this.log(`The scan is running in the background. The file will be saved at ${path}/eol.sbom.json`);
+            this.log(`The scan is running in the background. The file will be saved at ${path}/${filenamePrefix}.sbom.json`);
+            ux.action.stop();
             return;
         }
         else {
             sbom = await this._getSbomFromScan(path);
+            ux.action.stop();
             if (save) {
                 this._saveSbom(path, sbom);
             }
         }
+        if (!save) {
+            this.log(JSON.stringify(sbom, null, 2));
+        }
         return sbom;
     }
     async _getSbomFromScan(_dirFlag) {
@@ -146,7 +151,7 @@ export default class ScanSbom extends Command {
     }
     _saveSbom(dir, sbom) {
         try {
-            const outputPath = join(dir, 'eol.sbom.json');
+            const outputPath = join(dir, `${filenamePrefix}.sbom.json`);
             fs.writeFileSync(outputPath, JSON.stringify(sbom, null, 2));
             if (!this.jsonEnabled()) {
                 this.log(`SBOM saved to ${outputPath}`);

package/dist/config/constants.d.ts

@@ -7,3 +7,4 @@ export declare const config: {
     graphqlPath: string;
     showVulnCount: boolean;
 };
+export declare const filenamePrefix = "herodevs";

package/dist/config/constants.js

@@ -7,3 +7,4 @@ export const config = {
     graphqlPath: process.env.GRAPHQL_PATH || GRAPHQL_PATH,
     showVulnCount: true,
 };
+export const filenamePrefix = 'herodevs';

package/dist/service/eol/eol.svc.d.ts

@@ -1,4 +1,3 @@
-import type { PackageURL } from 'packageurl-js';
 import { type Sbom } from './cdx.svc.ts';
 export interface CdxGenOptions {
     projectType?: string[];
@@ -11,4 +10,3 @@ export type CdxCreator = (dir: string, opts: CdxGenOptions) => Promise<{
 }>;
 export declare function createSbom(directory: string, opts?: ScanOptions): Promise<any>;
 export declare function validateIsCycloneDxSbom(sbom: unknown): asserts sbom is Sbom;
-export declare function resolvePurlPackageName(purl: PackageURL): string;

package/dist/service/eol/eol.svc.js

@@ -23,27 +23,3 @@ export function validateIsCycloneDxSbom(sbom) {
         throw new Error('Invalid SBOM: missing or invalid components array');
     }
 }
-const purlPackageNameRules = {
-    npm: (p) => (p.namespace ? `${p.namespace}/${p.name}` : p.name),
-    maven: (p) => (p.namespace ? `${p.namespace}:${p.name}` : p.name),
-    pypi: (p) => p.name.toLowerCase(),
-    nuget: (p) => p.name,
-    gem: (p) => p.name,
-    composer: (p) => (p.namespace ? `${p.namespace}/${p.name}` : p.name),
-    golang: (p) => (p.namespace ? `${p.namespace}/${p.name}` : p.name),
-    cargo: (p) => p.name,
-    conan: (p) => (p.namespace ? `${p.namespace}/${p.name}` : p.name),
-    github: (p) => (p.namespace ? `${p.namespace}/${p.name}` : p.name),
-    bitbucket: (p) => (p.namespace ? `${p.namespace}/${p.name}` : p.name),
-    docker: (p) => (p.namespace ? `${p.namespace}/${p.name}` : p.name),
-};
-function isKnownEcosystemType(type) {
-    return type in purlPackageNameRules;
-}
-export function resolvePurlPackageName(purl) {
-    if (!isKnownEcosystemType(purl.type)) {
-        debugLogger(`Unsupported package type: ${purl.type}, falling back to name only`);
-        return purl.name;
-    }
-    return purlPackageNameRules[purl.type](purl);
-}

package/dist/service/eol/sbom.worker.js

@@ -1,6 +1,7 @@
 import { writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { createBom } from '@cyclonedx/cdxgen';
+import { filenamePrefix } from "../../config/constants.js";
 import { SBOM_DEFAULT__OPTIONS } from "./cdx.svc.js";
 process.on('uncaughtException', (err) => {
     console.error('Uncaught exception:', err.message);
@@ -15,7 +16,7 @@ try {
     const options = JSON.parse(process.argv[2]);
     const { path, opts } = options;
     const { bomJson } = await createBom(path, { ...SBOM_DEFAULT__OPTIONS, ...opts });
-    const outputPath = join(path, 'eol.sbom.json');
+    const outputPath = join(path, `${filenamePrefix}.sbom.json`);
     writeFileSync(outputPath, JSON.stringify(bomJson, null, 2));
     process.exit(0);
 }

package/dist/service/nes/nes.svc.js

@@ -3,7 +3,15 @@ import { debugLogger } from "../log.svc.js";
 export const buildScanResult = (scan) => {
     const components = new Map();
     for (const c of scan.components) {
-        components.set(c.purl, c);
+        const status = c.info.status;
+        components.set(c.purl, {
+            info: {
+                ...c.info,
+                nesAvailable: c.remediation !== null,
+                status: status === 'SUPPORTED' ? 'EOL_UPCOMING' : status,
+            },
+            purl: c.purl,
+        });
     }
     return {
         components,
@@ -11,6 +19,7 @@ export const buildScanResult = (scan) => {
         success: true,
         warnings: scan.warnings || [],
         scanId: scan.scanId,
+        createdOn: scan.createdOn,
     };
 };
 export const SbomScanner = (client) => async (purls, options) => {

package/dist/service/purls.svc.d.ts

@@ -17,7 +17,7 @@ export declare function getPurlOutput(purls: string[], output: string): string;
 export declare function extractPurls(sbom: Sbom): string[];
 /**
  * Parse a purls file in either JSON or text format, including the format of
- * eol.purls.json - { purls: [ 'pkg:npm/express@4.18.2', 'pkg:npm/react@18.3.1' ] }
+ * herodevs.purls.json - { purls: [ 'pkg:npm/express@4.18.2', 'pkg:npm/react@18.3.1' ] }
  * or a text file with one purl per line.
  */
 export declare function parsePurlsFile(purlsFileString: string): string[];

package/dist/service/purls.svc.js

@@ -62,7 +62,7 @@ export function extractPurls(sbom) {
 }
 /**
  * Parse a purls file in either JSON or text format, including the format of
- * eol.purls.json - { purls: [ 'pkg:npm/express@4.18.2', 'pkg:npm/react@18.3.1' ] }
+ * herodevs.purls.json - { purls: [ 'pkg:npm/express@4.18.2', 'pkg:npm/react@18.3.1' ] }
  * or a text file with one purl per line.
  */
 export function parsePurlsFile(purlsFileString) {

package/dist/ui/shared.ui.d.ts

@@ -1,6 +1,4 @@
 import type { ComponentStatus } from '../api/types/nes.types.ts';
 export declare const STATUS_COLORS: Record<ComponentStatus, string>;
 export declare const INDICATORS: Record<ComponentStatus, string>;
-export declare const MAX_PURL_LENGTH = 60;
-export declare const MAX_TABLE_COLUMN_WIDTH = 30;
 export declare const SCAN_ID_KEY = "eol-scan-v1-";

package/dist/ui/shared.ui.js

@@ -3,14 +3,12 @@ export const STATUS_COLORS = {
     EOL: 'red',
     UNKNOWN: 'default',
     OK: 'green',
-    SUPPORTED: 'yellow',
+    EOL_UPCOMING: 'yellow',
 };
 export const INDICATORS = {
     EOL: ux.colorize(STATUS_COLORS.EOL, '✗'),
     UNKNOWN: ux.colorize(STATUS_COLORS.UNKNOWN, '•'),
     OK: ux.colorize(STATUS_COLORS.OK, '✔'),
-    SUPPORTED: ux.colorize(STATUS_COLORS.SUPPORTED, '⚡'),
+    EOL_UPCOMING: ux.colorize(STATUS_COLORS.EOL_UPCOMING, '⚡'),
 };
-export const MAX_PURL_LENGTH = 60;
-export const MAX_TABLE_COLUMN_WIDTH = 30;
 export const SCAN_ID_KEY = 'eol-scan-v1-';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herodevs/cli",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "author": "HeroDevs, Inc",
   "bin": {
     "hd": "./bin/run.js"
@@ -17,7 +17,7 @@
     "ci": "biome ci",
     "ci:fix": "biome check --write",
     "clean": "shx rm -rf dist && npm run clean:files && shx rm -rf node_modules",
-    "clean:files": "shx rm -f eol.**.csv eol.**.json eol.**.text",
+    "clean:files": "shx rm -f herodevs.**.csv herodevs.**.json herodevs.**.txt",
     "dev": "npm run build && ./bin/dev.js",
     "dev:debug": "npm run build && DEBUG=oclif:* ./bin/dev.js",
     "format": "biome format --write",
@@ -37,28 +37,28 @@
   ],
   "dependencies": {
     "@apollo/client": "^3.13.8",
-    "@cyclonedx/cdxgen": "^11.2.7",
-    "@oclif/core": "^4",
-    "@oclif/plugin-help": "^6",
-    "@oclif/plugin-update": "^4",
-    "@oclif/table": "^0.4.7",
+    "@cyclonedx/cdxgen": "^11.4.1",
+    "@oclif/core": "^4.4.0",
+    "@oclif/plugin-help": "^6.2.29",
+    "@oclif/plugin-update": "^4.6.45",
     "graphql": "^16.11.0",
     "packageurl-js": "^2.0.1",
+    "terminal-link": "^4.0.0",
     "update-notifier": "^7.3.1"
   },
   "devDependencies": {
-    "@biomejs/biome": "^1.8.3",
-    "@oclif/test": "^4",
+    "@biomejs/biome": "^1.9.4",
+    "@oclif/test": "^4.1.13",
     "@types/inquirer": "^9.0.8",
-    "@types/node": "^22",
+    "@types/node": "^22.15.32",
     "@types/sinon": "^17.0.4",
     "@types/update-notifier": "^6.0.8",
     "globstar": "^1.0.0",
-    "oclif": "^4",
+    "oclif": "^4.20.1",
     "shx": "^0.4.0",
     "sinon": "^20.0.0",
-    "ts-node": "^10",
-    "tsx": "^4.19.4",
+    "ts-node": "^10.9.2",
+    "tsx": "^4.20.3",
     "typescript": "^5.8.3"
   },
   "engines": {

package/dist/ui/date.ui.d.ts

@@ -1 +0,0 @@
-export declare function parseMomentToSimpleDate(momentDate: string | Date | number | null): string;

package/dist/ui/date.ui.js

@@ -1,15 +0,0 @@
-export function parseMomentToSimpleDate(momentDate) {
-    // Only return empty string for null
-    if (momentDate === null)
-        return '';
-    try {
-        const dateObj = new Date(momentDate);
-        if (Number.isNaN(dateObj.getTime())) {
-            throw new Error('Invalid date');
-        }
-        return dateObj.toISOString().split('T')[0];
-    }
-    catch {
-        throw new Error('Invalid date');
-    }
-}

package/dist/ui/eol.ui.d.ts

@@ -1,15 +0,0 @@
-import type { ScanResultComponentsMap } from '../api/types/hd-cli.types.ts';
-import type { ComponentStatus, InsightsEolScanComponent } from '../api/types/nes.types.ts';
-export declare function truncateString(purl: string, maxLength: number): string;
-export declare function colorizeStatus(status: ComponentStatus): string;
-export declare function createStatusDisplay(components: ScanResultComponentsMap, all: boolean): Record<ComponentStatus, string[]>;
-export declare function createTableForStatus(grouped: Record<ComponentStatus, InsightsEolScanComponent[]>, status: ComponentStatus): string;
-export declare function convertComponentToTableRow(component: InsightsEolScanComponent): {
-    name: string;
-    version: string;
-    eol: string;
-    daysEol: number | null;
-    type: string;
-    vulnCount: number | null;
-};
-export declare function groupComponentsByStatus(components: ScanResultComponentsMap): Record<ComponentStatus, InsightsEolScanComponent[]>;

package/dist/ui/eol.ui.js

@@ -1,134 +0,0 @@
-import { ux } from '@oclif/core';
-import { makeTable } from '@oclif/table';
-import { PackageURL } from 'packageurl-js';
-import { config } from "../config/constants.js";
-import { resolvePurlPackageName } from "../service/eol/eol.svc.js";
-import { parseMomentToSimpleDate } from "./date.ui.js";
-import { INDICATORS, MAX_PURL_LENGTH, MAX_TABLE_COLUMN_WIDTH, STATUS_COLORS } from "./shared.ui.js";
-export function truncateString(purl, maxLength) {
-    const ellipses = '...';
-    return purl.length > maxLength ? `${purl.slice(0, maxLength - ellipses.length)}${ellipses}` : purl;
-}
-export function colorizeStatus(status) {
-    return ux.colorize(STATUS_COLORS[status], status);
-}
-function formatSimpleComponent(purl, status) {
-    const color = STATUS_COLORS[status];
-    return `  ${INDICATORS[status]} ${ux.colorize(color, truncateString(purl, MAX_PURL_LENGTH))}`;
-}
-function getDaysEolString(daysEol) {
-    if (daysEol === null) {
-        return '';
-    }
-    if (daysEol <= 0) {
-        return `${Math.abs(daysEol) + 1} days from now`;
-    }
-    if (daysEol > 0) {
-        return 'today';
-    }
-    return `${daysEol} days ago`;
-}
-function formatDetailedComponent(purl, info) {
-    const { status, eolAt, daysEol, vulnCount } = info;
-    const simpleComponent = formatSimpleComponent(purl, status);
-    const eolAtString = parseMomentToSimpleDate(eolAt);
-    const daysEolString = getDaysEolString(daysEol);
-    const eolString = [`${simpleComponent}`, `    ⮑  EOL Date: ${eolAtString} (${daysEolString})`];
-    if (config.showVulnCount) {
-        eolString.push(`    ⮑  # of Vulns: ${vulnCount ?? ''}`);
-    }
-    const output = eolString.filter(Boolean).join('\n');
-    return output;
-}
-export function createStatusDisplay(components, all) {
-    const statusOutput = {
-        UNKNOWN: [],
-        OK: [],
-        SUPPORTED: [],
-        EOL: [],
-    };
-    // Single loop to separate and format components
-    for (const [purl, component] of components.entries()) {
-        const { status } = component.info;
-        if (all) {
-            if (status === 'UNKNOWN' || status === 'OK') {
-                statusOutput[status].push(formatSimpleComponent(purl, status));
-            }
-        }
-        if (status === 'SUPPORTED' || status === 'EOL') {
-            statusOutput[status].push(formatDetailedComponent(purl, component.info));
-        }
-    }
-    return statusOutput;
-}
-export function createTableForStatus(grouped, status) {
-    const data = grouped[status].map((component) => convertComponentToTableRow(component));
-    if (status === 'EOL' || status === 'SUPPORTED') {
-        if (config.showVulnCount) {
-            return makeTable({
-                data,
-                columns: [
-                    { key: 'name', name: 'NAME', width: MAX_TABLE_COLUMN_WIDTH },
-                    { key: 'version', name: 'VERSION', width: 10 },
-                    { key: 'eol', name: 'EOL', width: 12 },
-                    { key: 'daysEol', name: 'DAYS EOL', width: 10 },
-                    { key: 'type', name: 'TYPE', width: 12 },
-                    { key: 'vulnCount', name: '# OF VULNS', width: 12 },
-                ],
-            });
-        }
-        return makeTable({
-            data,
-            columns: [
-                { key: 'name', name: 'NAME', width: MAX_TABLE_COLUMN_WIDTH },
-                { key: 'version', name: 'VERSION', width: 10 },
-                { key: 'eol', name: 'EOL', width: 12 },
-                { key: 'daysEol', name: 'DAYS EOL', width: 10 },
-                { key: 'type', name: 'TYPE', width: 12 },
-            ],
-        });
-    }
-    if (config.showVulnCount) {
-        return makeTable({
-            data,
-            columns: [
-                { key: 'name', name: 'NAME', width: MAX_TABLE_COLUMN_WIDTH },
-                { key: 'version', name: 'VERSION', width: 10 },
-                { key: 'type', name: 'TYPE', width: 12 },
-                { key: 'vulnCount', name: '# OF VULNS', width: 12 },
-            ],
-        });
-    }
-    return makeTable({
-        data,
-        columns: [
-            { key: 'name', name: 'NAME', width: MAX_TABLE_COLUMN_WIDTH },
-            { key: 'version', name: 'VERSION', width: 10 },
-            { key: 'type', name: 'TYPE', width: 12 },
-        ],
-    });
-}
-export function convertComponentToTableRow(component) {
-    const purlParts = PackageURL.fromString(component.purl);
-    const { eolAt, daysEol, vulnCount } = component.info;
-    return {
-        name: resolvePurlPackageName(purlParts),
-        version: purlParts.version ?? '',
-        eol: parseMomentToSimpleDate(eolAt),
-        daysEol: daysEol,
-        type: purlParts.type,
-        vulnCount: vulnCount,
-    };
-}
-export function groupComponentsByStatus(components) {
-    const grouped = {
-        UNKNOWN: [],
-        OK: [],
-        SUPPORTED: [],
-        EOL: [],
-    };
-    for (const component of components.values()) {
-        grouped[component.info.status].push(component);
-    }
-    return grouped;
-}