@constellation-network/node-pilot 0.2.0 → 0.3.0

package/README.md

@@ -21,7 +21,7 @@ $ npm install -g @constellation-network/node-pilot
 $ cpilot COMMAND
 running command...
 $ cpilot (--version|-v)
-@constellation-network/node-pilot/0.2.0 darwin-arm64 node-v22.15.0
+@constellation-network/node-pilot/0.3.0 darwin-arm64 node-v22.15.0
 $ cpilot --help [COMMAND]
 USAGE
   $ cpilot COMMAND
@@ -37,7 +37,7 @@ If no command is entered, node-pilot will automatically perform a series of chec
 
 # Commands
 <!-- commands -->
-* [`cpilot clean LAYER`](#cpilot-clean-layer)
+* [`cpilot clean [LAYER]`](#cpilot-clean-layer)
 * [`cpilot config`](#cpilot-config)
 * [`cpilot config get [NAME]`](#cpilot-config-get-name)
 * [`cpilot config set NAME VALUE`](#cpilot-config-set-name-value)
@@ -48,21 +48,21 @@ If no command is entered, node-pilot will automatically perform a series of chec
 * [`cpilot shutdown`](#cpilot-shutdown)
 * [`cpilot status`](#cpilot-status)
 
-## `cpilot clean LAYER`
+## `cpilot clean [LAYER]`
 
 Remove data and/or logs from a validator node
 
 ```
 USAGE
-  $ cpilot clean LAYER [-a] [-d] [-l]
+  $ cpilot clean [LAYER] [-d] [-j] [-l]
 
 ARGUMENTS
   LAYER  network layer to clean. e.g. gl0
 
 FLAGS
-  -a, --all   remove all data and logs
-  -d, --data  remove data
-  -l, --logs  remove logs
+  -d, --data  remove only data
+  -j, --jars  remove only jars
+  -l, --logs  remove only logs
 
 DESCRIPTION
   Remove data and/or logs from a validator node
@@ -71,7 +71,7 @@ EXAMPLES
   $ cpilot clean
 ```
 
-_See code: [src/commands/clean.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.2.0/src/commands/clean.ts)_
+_See code: [src/commands/clean.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.3.0/src/commands/clean.ts)_
 
 ## `cpilot config`
 
@@ -88,7 +88,7 @@ EXAMPLES
   $ cpilot config
 ```
 
-_See code: [src/commands/config.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.2.0/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.3.0/src/commands/config.ts)_
 
 ## `cpilot config get [NAME]`
 
@@ -112,7 +112,7 @@ EXAMPLES
   $ cpilot config get gl0:CL_PUBLIC_HTTP_PORT
 ```
 
-_See code: [src/commands/config/get.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.2.0/src/commands/config/get.ts)_
+_See code: [src/commands/config/get.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.3.0/src/commands/config/get.ts)_
 
 ## `cpilot config set NAME VALUE`
 
@@ -135,7 +135,7 @@ EXAMPLES
   $ cpilot config set gl0:CL_PUBLIC_HTTP_PORT 9000
 ```
 
-_See code: [src/commands/config/set.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.2.0/src/commands/config/set.ts)_
+_See code: [src/commands/config/set.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.3.0/src/commands/config/set.ts)_
 
 ## `cpilot help [COMMAND]`
 
@@ -172,7 +172,7 @@ EXAMPLES
   $ cpilot info
 ```
 
-_See code: [src/commands/info.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.2.0/src/commands/info.ts)_
+_See code: [src/commands/info.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.3.0/src/commands/info.ts)_
 
 ## `cpilot logs LAYER`
 
@@ -198,7 +198,7 @@ EXAMPLES
   $ cpilot logs
 ```
 
-_See code: [src/commands/logs.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.2.0/src/commands/logs.ts)_
+_See code: [src/commands/logs.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.3.0/src/commands/logs.ts)_
 
 ## `cpilot restart [LAYER]`
 
@@ -226,7 +226,7 @@ EXAMPLES
   $ cpilot restart
 ```
 
-_See code: [src/commands/restart.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.2.0/src/commands/restart.ts)_
+_See code: [src/commands/restart.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.3.0/src/commands/restart.ts)_
 
 ## `cpilot shutdown`
 
@@ -246,7 +246,7 @@ EXAMPLES
   $ cpilot shutdown
 ```
 
-_See code: [src/commands/shutdown.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.2.0/src/commands/shutdown.ts)_
+_See code: [src/commands/shutdown.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.3.0/src/commands/shutdown.ts)_
 
 ## `cpilot status`
 
@@ -260,5 +260,5 @@ DESCRIPTION
   Display node status and configuration settings
 ```
 
-_See code: [src/commands/status.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.2.0/src/commands/status.ts)_
+_See code: [src/commands/status.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.3.0/src/commands/status.ts)_
 <!-- commandsstop -->

package/dist/checks/check-pilot.d.ts

@@ -1,5 +1,6 @@
 export declare const checkNodePilot: {
     checkDiscordRegistration(): Promise<void>;
     checkVersion(): Promise<void>;
+    isDiscordAlertsEnabled(): any;
     promptDiscordRegistration(): Promise<void>;
 };

package/dist/checks/check-pilot.js

@@ -36,12 +36,12 @@ export const checkNodePilot = {
         if (os.platform() !== 'linux')
             return;
         const hasMajorMinorChange = latestVer.major !== currentVer.major || latestVer.minor !== currentVer.minor;
+        const dockerIsRunning = await dockerService.isRunning();
         if (hasMajorMinorChange) {
-            const dockerIsRunning = await dockerService.isRunning();
             if (dockerIsRunning) {
                 clm.warn('This update requires the Node to shutdown before proceeding.');
             }
-            if (await promptHelper.confirmPrompt('Do you wish to upgrade now?')) {
+            if (await promptHelper.confirmPrompt('Do you wish to update now?')) {
                 if (dockerIsRunning) {
                     await dockerService.dockerDown();
                 }
@@ -52,8 +52,13 @@ export const checkNodePilot = {
             }
         }
         else {
-            clm.preStep('This update includes a minor change. There is no need to restart your Node.');
-            if (!await promptHelper.confirmPrompt('Do you wish to upgrade now?')) {
+            if (dockerIsRunning) {
+                clm.preStep('This update includes a minor change. Your Node will remain up and running during the update.');
+            }
+            else {
+                clm.preStep('This update includes a minor change.');
+            }
+            if (!await promptHelper.confirmPrompt('Do you wish to update now?')) {
                 clm.postStep('Skipping update...');
                 return;
             }
@@ -67,6 +72,11 @@ export const checkNodePilot = {
         clm.postStep('Update completed. Run cpilot again to use the latest version');
         process.exit(0);
     },
+    isDiscordAlertsEnabled() {
+        const hcStorage = getHcStorage();
+        const user = hcStorage.getItem('user');
+        return user && user.webHookEnabled;
+    },
     async promptDiscordRegistration() {
         const hcStorage = getHcStorage();
         const join = await promptHelper.confirmPrompt('Do you want to enable Discord notifications for your node?:');

package/dist/commands/clean.d.ts

@@ -1,13 +1,13 @@
 import { Command } from '@oclif/core';
 export default class Clean extends Command {
     static args: {
-        layer: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+        layer: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     static description: string;
     static examples: string[];
     static flags: {
-        all: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         data: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        jars: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         logs: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;

package/dist/commands/clean.js

@@ -7,40 +7,50 @@ import { dockerService } from "../services/docker-service.js";
 import { shellService } from "../services/shell-service.js";
 export default class Clean extends Command {
     static args = {
-        layer: Args.string({ description: 'network layer to clean. e.g. gl0', required: true }),
+        layer: Args.string({ description: 'network layer to clean. e.g. gl0', required: false }),
     };
     static description = 'Remove data and/or logs from a validator node';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
     ];
     static flags = {
-        all: Flags.boolean({ char: 'a', description: 'remove all data and logs' }),
-        data: Flags.boolean({ char: 'd', description: 'remove data' }),
-        logs: Flags.boolean({ char: 'l', description: 'remove logs' })
+        data: Flags.boolean({ char: 'd', description: 'remove only data' }),
+        jars: Flags.boolean({ char: 'j', description: 'remove only jars' }),
+        logs: Flags.boolean({ char: 'l', description: 'remove only logs' })
     };
     async run() {
         const { args, flags } = await this.parse(Clean);
         const { layersToRun } = configStore.getProjectInfo();
-        if (!layersToRun.includes(args.layer)) {
+        if (args.layer && !layersToRun.includes(args.layer)) {
             this.error(`Invalid layer: ${args.layer}. Available layers: ${layersToRun.join(',')}`);
         }
-        const deleteLogs = flags.logs || flags.all;
-        const deleteData = flags.data || flags.all;
-        if (!deleteLogs && !deleteData) {
-            this.error('At least one of --data or --logs must be specified.');
-        }
+        const layers = args.layer ? [args.layer] : layersToRun;
+        const deleteAll = !flags.data && !flags.logs && !flags.jars;
+        const deleteLogs = flags.logs || deleteAll;
+        const deleteData = flags.data || deleteAll;
+        const deleteJars = flags.jars || deleteAll;
         if (await dockerService.isRunning()) {
             clm.preStep('The validator node must be stopped first.');
             await promptHelper.doYouWishToContinue();
             await dockerService.dockerDown();
         }
-        if (deleteData) {
-            await shellService.runProjectCommand(`sudo rm -rf ${args.layer}/data`);
-            projectHelper.prepareDataFolder();
-            configStore.setProjectFlag('discordChecked', false);
-        }
-        if (deleteLogs) {
-            await shellService.runProjectCommand(`sudo rm -rf ${args.layer}/logs`);
+        for (const layer of layers) {
+            if (deleteData) {
+                // eslint-disable-next-line no-await-in-loop
+                await shellService.runProjectCommand(`sudo rm -rf ${layer}/data`);
+                if (layer === 'gl0') {
+                    projectHelper.prepareDataFolder();
+                    configStore.setProjectFlag('discordChecked', false);
+                }
+            }
+            if (deleteLogs) {
+                // eslint-disable-next-line no-await-in-loop
+                await shellService.runProjectCommand(`sudo rm -rf ${layer}/logs`);
+            }
+            if (deleteJars) {
+                // eslint-disable-next-line no-await-in-loop
+                await shellService.runProjectCommand(`sudo rm -rf ${layer}/dist`);
+            }
         }
     }
 }

package/dist/commands/info.js

@@ -1,6 +1,7 @@
 import { Command } from '@oclif/core';
 import { configStore } from "../config-store.js";
 import { configHelper } from "../helpers/config-helper.js";
+import { checkNodePilot } from "../checks/check-pilot.js";
 export default class Info extends Command {
     static description = 'Display general info about the validator node';
     static examples = [
@@ -28,6 +29,8 @@ export default class Info extends Command {
         // Project Directory
         configHelper.showEnvInfo('Project Directory', projectInfo.projectDir);
         // Fast Forward
-        configHelper.showEnvInfo('Fast Forward Enabled', (projectInfo.fastForward === undefined || Boolean(projectInfo.fastForward)).toString());
+        // configHelper.showEnvInfo('Fast Forward Enabled', (projectInfo.fastForward === undefined || Boolean(projectInfo.fastForward)).toString());
+        // Discord alerts
+        configHelper.showEnvInfo('Discord Alerts Enabled', checkNodePilot.isDiscordAlertsEnabled());
     }
 }

package/dist/helpers/status-table.js

@@ -19,7 +19,7 @@ export class StatusTable {
         });
         const table = new StatusTable();
         const cols = process.stdout.columns;
-        console.log(String('Colspan: ' + cols));
+        // console.log(String('Colspan: ' + cols));
         if (cols > 120) {
             table.monitorWide();
         }
@@ -94,7 +94,7 @@ export class StatusTable {
                 tables.push({ error: errorMsg, label, row1: [row1], row2: [row2] });
             }
             this.renderNarrow(tables);
-            process.stdout.write("\n   * press any key to cancel");
+            process.stdout.write("\n   * press any key to stop monitoring");
             // eslint-disable-next-line no-await-in-loop
             await sleep(1);
         }
@@ -141,7 +141,7 @@ export class StatusTable {
                 // projects.push({ error: errorMsg, label, row1, row2 });
             }
             this.renderWide({ error: errorMsg, label: '', row1: rows, row2: [] });
-            process.stdout.write("\n   * press any key to cancel");
+            process.stdout.write("\n   * press any key to stop monitoring");
             // eslint-disable-next-line no-await-in-loop
             await sleep(1);
         }

package/oclif.manifest.json

@@ -6,7 +6,7 @@
         "layer": {
           "description": "network layer to clean. e.g. gl0",
           "name": "layer",
-          "required": true
+          "required": false
         }
       },
       "description": "Remove data and/or logs from a validator node",
@@ -14,23 +14,23 @@
         "<%= config.bin %> <%= command.id %>"
       ],
       "flags": {
-        "all": {
-          "char": "a",
-          "description": "remove all data and logs",
-          "name": "all",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "data": {
           "char": "d",
-          "description": "remove data",
+          "description": "remove only data",
           "name": "data",
           "allowNo": false,
           "type": "boolean"
         },
+        "jars": {
+          "char": "j",
+          "description": "remove only jars",
+          "name": "jars",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "logs": {
           "char": "l",
-          "description": "remove logs",
+          "description": "remove only logs",
           "name": "logs",
           "allowNo": false,
           "type": "boolean"
@@ -349,5 +349,5 @@
       ]
     }
   },
-  "version": "0.2.0"
+  "version": "0.3.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@constellation-network/node-pilot",
   "description": "An easy deployment and monitoring tool for Constellation nodes.",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "author": "Frank Fox",
   "bin": {
     "cpilot": "bin/run.js"

package/projects/hypergraph/Dockerfile

@@ -39,7 +39,7 @@ COPY dist/gl0.jar /app/jars/gl0.jar
 #COPY ./health-check /health-check
 #RUN chmod +x /health-check/bin/run.sh
 #RUN chmod +x /health-check/bin/hydrate.sh
-RUN npm install -g "@constellation-network/node-pilot-health-check@0.0.16"
+RUN npm install -g "@constellation-network/node-pilot-health-check@0.0.17"
 
 # Add entrypoint
 COPY ./entrypoint.sh /app/entrypoint.sh

package/projects/hypergraph/docker-compose.yml

@@ -20,8 +20,8 @@ services:
     volumes:
       - ./gl0/data:/app/data
       - ./gl0/logs:/app/logs
+      - ./seedlist:/app/seedlist
       - ./key.p12:/app/key.p12:ro
-      - ./seedlist:/app/seedlist:ro
     healthcheck:
       test: ["CMD", "cpilotHC"]
 #      test: ["CMD", "/health-check/bin/run.sh"]