@constellation-network/node-pilot 0.12.6-devnet → 0.13.0-omegatest.2

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.12.6-devnet darwin-arm64 node-v22.15.0
+@constellation-network/node-pilot/0.13.0-omegatest.2 darwin-arm64 node-v22.15.0
 $ cpilot --help [COMMAND]
 USAGE
   $ cpilot COMMAND
@@ -47,6 +47,7 @@ If no command is entered, node-pilot will automatically perform a series of chec
 * [`cpilot restart [LAYER]`](#cpilot-restart-layer)
 * [`cpilot shutdown`](#cpilot-shutdown)
 * [`cpilot status`](#cpilot-status)
+* [`cpilot uninstall`](#cpilot-uninstall)
 
 ## `cpilot clean [LAYER]`
 
@@ -71,7 +72,7 @@ EXAMPLES
   $ cpilot clean
 ```
 
-_See code: [src/commands/clean.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.12.6-devnet/src/commands/clean.ts)_
+_See code: [src/commands/clean.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.13.0-omegatest.2/src/commands/clean.ts)_
 
 ## `cpilot config`
 
@@ -88,7 +89,7 @@ EXAMPLES
   $ cpilot config
 ```
 
-_See code: [src/commands/config.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.12.6-devnet/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.13.0-omegatest.2/src/commands/config.ts)_
 
 ## `cpilot config get [NAME]`
 
@@ -112,7 +113,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.12.6-devnet/src/commands/config/get.ts)_
+_See code: [src/commands/config/get.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.13.0-omegatest.2/src/commands/config/get.ts)_
 
 ## `cpilot config set NAME VALUE`
 
@@ -135,7 +136,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.12.6-devnet/src/commands/config/set.ts)_
+_See code: [src/commands/config/set.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.13.0-omegatest.2/src/commands/config/set.ts)_
 
 ## `cpilot help [COMMAND]`
 
@@ -172,7 +173,7 @@ EXAMPLES
   $ cpilot info
 ```
 
-_See code: [src/commands/info.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.12.6-devnet/src/commands/info.ts)_
+_See code: [src/commands/info.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.13.0-omegatest.2/src/commands/info.ts)_
 
 ## `cpilot logs LAYER`
 
@@ -198,7 +199,7 @@ EXAMPLES
   $ cpilot logs
 ```
 
-_See code: [src/commands/logs.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.12.6-devnet/src/commands/logs.ts)_
+_See code: [src/commands/logs.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.13.0-omegatest.2/src/commands/logs.ts)_
 
 ## `cpilot restart [LAYER]`
 
@@ -226,7 +227,7 @@ EXAMPLES
   $ cpilot restart
 ```
 
-_See code: [src/commands/restart.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.12.6-devnet/src/commands/restart.ts)_
+_See code: [src/commands/restart.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.13.0-omegatest.2/src/commands/restart.ts)_
 
 ## `cpilot shutdown`
 
@@ -243,7 +244,7 @@ EXAMPLES
   $ cpilot shutdown
 ```
 
-_See code: [src/commands/shutdown.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.12.6-devnet/src/commands/shutdown.ts)_
+_See code: [src/commands/shutdown.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.13.0-omegatest.2/src/commands/shutdown.ts)_
 
 ## `cpilot status`
 
@@ -257,5 +258,22 @@ DESCRIPTION
   Display node status and configuration settings
 ```
 
-_See code: [src/commands/status.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.12.6-devnet/src/commands/status.ts)_
+_See code: [src/commands/status.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.13.0-omegatest.2/src/commands/status.ts)_
+
+## `cpilot uninstall`
+
+Uninstall Node Pilot
+
+```
+USAGE
+  $ cpilot uninstall
+
+DESCRIPTION
+  Uninstall Node Pilot
+
+EXAMPLES
+  $ cpilot uninstall
+```
+
+_See code: [src/commands/uninstall.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.13.0-omegatest.2/src/commands/uninstall.ts)_
 <!-- commandsstop -->

package/dist/checks/check-dependencies.js

@@ -1,5 +1,4 @@
 import fs from "node:fs";
-import os from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import shell from "shelljs";
@@ -31,12 +30,13 @@ export const checkDependencies = async () => {
             clm.echo('');
             process.exit(0);
         }
-        const isACLInstalled = await shellService.checkCommandAvailable('setfacl');
-        if (!isACLInstalled && os.platform() === 'linux') {
-            clm.step('ACL is required and needs to be installed.');
-            await promptHelper.doYouWishToContinue();
-            await installDependencies(pilotDir);
-        }
+        // const isACLInstalled = await shellService.checkCommandAvailable('setfacl');
+        //
+        // if (!isACLInstalled && os.platform() === 'linux') {
+        //     clm.step('ACL is required and needs to be installed.');
+        //     await promptHelper.doYouWishToContinue();
+        //     await installDependencies(pilotDir);
+        // }
     }
 };
 async function installDependencies(pilotDir) {

package/dist/checks/check-initial-setup.d.ts

@@ -1,3 +1,5 @@
 export declare const checkInitialSetup: {
+    checkExistingUsers(): Promise<void>;
     firstTimeRun(): Promise<void>;
+    getExistingInstallations(): Promise<string[]>;
 };

package/dist/checks/check-initial-setup.js

@@ -1,14 +1,28 @@
 import chalk from "chalk";
+import fs from "node:fs";
+import os from "node:os";
+import { clm } from "../clm.js";
 import { configStore } from "../config-store.js";
+import { shellService } from "../services/shell-service.js";
 import { systemdService } from "../services/systemd-service.js";
 import { checkDependencies } from "./check-dependencies.js";
 import { checkHardware } from "./check-hardware.js";
+import path from "node:path";
 export const checkInitialSetup = {
+    async checkExistingUsers() {
+        const usersWithPilot = await this.getExistingInstallations();
+        if (usersWithPilot.length > 0) {
+            clm.warn(`There are other users that have Node Pilot installed.\n    ${usersWithPilot.join('\n    ')}`);
+            clm.warn('To uninstall for another user, login as the user and run "cpilot uninstall".');
+            clm.error('Node Pilot can only be installed for one user at a time.\n');
+        }
+    },
     async firstTimeRun() {
         if (configStore.getSystemInfo() !== null) {
             return;
         }
         await checkDependencies();
+        await this.checkExistingUsers();
         console.log(chalk.whiteBright("\n ****************************************"));
         console.log("          " + chalk.whiteBright("CONSTELLATION NETWORK") + "        ");
         console.log("               " + chalk.whiteBright("NODE PILOT") + "              ");
@@ -16,4 +30,36 @@ export const checkInitialSetup = {
         await checkHardware.systemRequirements();
         await systemdService.install();
     },
+    async getExistingInstallations() {
+        const platform = os.platform();
+        const isLinux = platform === 'linux';
+        const homeFolder = isLinux ? '/home' : '/Users';
+        if (!fs.existsSync(homeFolder)) {
+            clm.warn(`Home folder path does not exist: ${homeFolder}`);
+            return [];
+        }
+        const whoami = await shellService.runCommandWithOutput('whoami');
+        const userFolders = fs.readdirSync(homeFolder).filter(file => fs.lstatSync(path.join(homeFolder, file)).isDirectory());
+        const usersWithPilot = [];
+        for (const folder of userFolders) {
+            const dirPath = path.join(homeFolder, folder, '.node-pilot');
+            // eslint-disable-next-line no-await-in-loop
+            const exists = await shellService.runCommandWithOutput(`sudo test -d "${dirPath}" && echo 1 || echo 0`);
+            if (exists === '1')
+                usersWithPilot.push(folder);
+        }
+        let rootUserHasPilot = false;
+        if (isLinux) {
+            const dirPath = path.join('/root', '.node-pilot');
+            const exists = await shellService.runCommandWithOutput(`sudo test -d "${dirPath}" && echo 1 || echo 0`);
+            if (exists === '1') {
+                usersWithPilot.push('root');
+                rootUserHasPilot = true;
+            }
+        }
+        console.log(`Current user: ${whoami}`);
+        console.log(`Users with Node Pilot installed: ${usersWithPilot.join(', ')}`);
+        console.log(`Root user has Node Pilot installed: ${rootUserHasPilot}`);
+        return usersWithPilot;
+    }
 };

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

@@ -1,6 +1,7 @@
 import semver from "semver";
 export declare const checkNodePilot: {
     checkDiscordRegistration(): Promise<void>;
+    checkMultipleUsers(): Promise<void>;
     checkVersion(): Promise<void>;
     compareVersions(): Promise<{
         currentVer: undefined;

package/dist/checks/check-pilot.js

@@ -9,6 +9,7 @@ import { promptHelper } from "../helpers/prompt-helper.js";
 import { dockerService } from "../services/docker-service.js";
 import { nodeService } from "../services/node-service.js";
 import { shellService } from "../services/shell-service.js";
+import { checkInitialSetup } from "./check-initial-setup.js";
 const REGISTRY_URL = 'https://registry.npmjs.org/';
 export const checkNodePilot = {
     async checkDiscordRegistration() {
@@ -18,6 +19,17 @@ export const checkNodePilot = {
         await this.promptDiscordRegistration();
         configStore.setProjectFlag('discordChecked', true);
     },
+    async checkMultipleUsers() {
+        if (configStore.hasProjectFlag('multipleUsersChecked')) {
+            return;
+        }
+        const usersWithPilot = await checkInitialSetup.getExistingInstallations();
+        if (usersWithPilot.length > 1) {
+            clm.warn(`Multiple users have Node Pilot installed.\n    ${usersWithPilot.join('\n    ')}`);
+            clm.error('Login and run "cpilot uninstall" to remove the extra installation(s).');
+        }
+        configStore.setProjectFlag('multipleUsersChecked', true);
+    },
     async checkVersion() {
         const { currentVer, latestVer } = await this.compareVersions();
         if (!latestVer || !currentVer || latestVer.compare(currentVer) === 0)

package/dist/checks/check-project.js

@@ -10,28 +10,11 @@ import { clusterService } from "../services/cluster-service.js";
 import { dockerService } from "../services/docker-service.js";
 import { shellService } from "../services/shell-service.js";
 import { checkNetwork } from "./check-network.js";
-/*
- *  -Xms12g \
-  -Xmx12g \
-  -XX:+UseZGC \
-  -XX:+ZGenerational \
-  -XX:ZAllocationSpikeTolerance=5 \
-  -XX:ZCollectionInterval=10 \
-  -XX:ConcGCThreads=4 \
-  -XX:ParallelGCThreads=8 \
-  -XX:+UseStringDeduplication \
-  --add-opens=java.base/java.lang.invoke=ALL-UNNAMED \
-  --add-opens=java.base/java.util=ALL-UNNAMED \
-  --add-opens=java.base/java.security=ALL-UNNAMED \
-  -XX:+HeapDumpOnOutOfMemoryError \
-  -XX:HeapDumpPath=./heap_dumps/ \
-  -XX:+ExitOnOutOfMemoryError
- */
 function getJavaMemoryOptions(network, mem) {
     if (network === 'testnet') {
         const linuxOpt = (os.platform() === 'linux') ? ' -XX:+UseZGC -XX:+ZGenerational -XX:ZAllocationSpikeTolerance=5 -XX:ZCollectionInterval=10' : '';
         // return `-Xms${mem}g -Xmx${mem}g -XX:+UnlockExperimentalVMOptions${linuxOpt} -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./heap_dumps/ -XX:+ExitOnOutOfMemoryError`;
-        return `-Xms${mem}g -Xmx${mem}g${linuxOpt} -XXConveyGCThreads=4 -XXParallelGCThreads=8 -XX:+UseStringDeduplication --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED`;
+        return `-Xms${mem}g -Xmx${mem}g${linuxOpt} -XX:+UseStringDeduplication --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED`;
     }
     return `-Xms1024M -Xmx${mem}g -Xss256K`;
 }

package/dist/commands/config.js

@@ -25,7 +25,7 @@ export default class Config extends Command {
                 { name: 'Java Memory', value: 'javaMemory' },
                 { name: 'Key File', value: 'keyFile' },
                 { name: 'Layers To Run', value: 'layersToRun' },
-                { name: `Network`, value: 'network' },
+                { name: `Hypergraph Network`, value: 'network' },
             ],
             message: 'What would you like to change?:',
         });

package/dist/commands/status.js

@@ -2,15 +2,12 @@ import { Command } from '@oclif/core';
 import { checkInitialSetup } from "../checks/check-initial-setup.js";
 import { checkLayers } from "../checks/check-layers.js";
 import { checkNetwork } from "../checks/check-network.js";
-import { checkNodeCtl } from "../checks/check-node-ctl.js";
 import { checkNodePilot } from "../checks/check-pilot.js";
 import { checkProject } from "../checks/check-project.js";
 import { checkWallet } from "../checks/check-wallet.js";
 import { keyFileHelper } from "../helpers/key-file-helper.js";
 import { migrationService } from "../services/migration-service.js";
 export default class Status extends Command {
-    // eslint-disable-next-line no-warning-comments
-    // TODO add -f flag to continuously monitor status
     static description = 'Display node status and configuration settings';
     async run() {
         await checkInstallationAndConfigurationStatus();
@@ -19,6 +16,7 @@ export default class Status extends Command {
 export async function checkInstallationAndConfigurationStatus() {
     migrationService.runMigrations();
     await checkInitialSetup.firstTimeRun();
+    await checkNodePilot.checkMultipleUsers();
     await checkProject.projectInstallation();
     await checkProject.checkJavaMemory();
     await checkNetwork.checkExternalIpAddress();
@@ -26,7 +24,6 @@ export async function checkInstallationAndConfigurationStatus() {
     await checkNodePilot.checkDiscordRegistration();
     await checkNodePilot.checkVersion();
     await checkProject.releaseVersion();
-    await checkNodeCtl.check4Migration();
     await keyFileHelper.promptIfNoKeyFile();
     await checkNetwork.checkSeedList();
     await checkNetwork.checkForExistingNodeIdInCluster();

package/dist/commands/uninstall.d.ts

@@ -0,0 +1,6 @@
+import { Command } from '@oclif/core';
+export default class Uninstall extends Command {
+    static description: string;
+    static examples: string[];
+    run(): Promise<void>;
+}

package/dist/commands/uninstall.js

@@ -0,0 +1,22 @@
+import { Command } from '@oclif/core';
+import os from "node:os";
+import { clm } from "../clm.js";
+import { promptHelper } from "../helpers/prompt-helper.js";
+import { shellService } from "../services/shell-service.js";
+import { systemdService } from "../services/systemd-service.js";
+export default class Uninstall extends Command {
+    static description = 'Uninstall Node Pilot';
+    static examples = [
+        '<%= config.bin %> <%= command.id %>',
+    ];
+    async run() {
+        clm.warn('You are about to uninstall Node Pilot. This will remove all the data and logs from your validator node.');
+        await promptHelper.doYouWishToContinue();
+        clm.preStep('Uninstalling Node Pilot...');
+        await systemdService.uninstall();
+        const homeDir = os.homedir();
+        const nodePilotDir = `${homeDir}/.node-pilot`;
+        await shellService.runCommand(`sudo rm -rf ${nodePilotDir}`);
+        console.log("Node Pilot uninstalled successfully.");
+    }
+}

package/dist/helpers/project-helper.js

@@ -87,14 +87,15 @@ export const projectHelper = {
     },
     async installHypergraph() {
         await this.installEmbedded('hypergraph');
-        const { projectDir } = configStore.getProjectInfo();
-        const { platform } = configStore.getSystemInfo();
         this.prepareDataFolder();
-        if (platform === 'linux') {
-            const layerDir = path.join(projectDir, 'gl0');
-            // set permission for group "docker" on the layer folder and any subfolders created later
-            await shellService.runCommand(`sudo setfacl -Rm g:docker:rwX -dm g:docker:rwX ${layerDir}`);
-        }
+        // const {projectDir} = configStore.getProjectInfo();
+        // const {platform} = configStore.getSystemInfo();
+        //
+        // if (platform === 'linux') {
+        //     const layerDir = path.join(projectDir,'gl0');
+        //     // set permission for group "docker" on the layer folder and any subfolders created later
+        //     await shellService.runCommand(`sudo setfacl -Rm g:docker:rwX -dm g:docker:rwX ${layerDir}`)
+        // }
         this.importEnvFiles();
     },
     async installProject(name, projectFolder) {

package/dist/services/migration-service.js

@@ -2,14 +2,10 @@ import semver from "semver";
 import packageJson from '../../package.json' with { type: 'json' };
 import { clm } from "../clm.js";
 import { configStore } from "../config-store.js";
-import shell from "shelljs";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import { projectHelper } from "../helpers/project-helper.js";
 export const migrationService = {
     runMigrations() {
         const migrations = {
-            '0.12.3': m0123,
+            '0.12.5': m0125,
             // add more migrations as needed
         };
         const { version = '0.0.0' } = configStore.getProjectInfo();
@@ -24,6 +20,7 @@ export const migrationService = {
         const migrationVersions = Object.keys(migrations)
             .filter(v => semver.gt(v, version) && semver.lte(v, currentVersion.version))
             .sort(semver.compare);
+        // TODO shutdown node if migration is in progress
         if (migrationVersions.length > 0) {
             clm.preStep(`Migration versions to run: ${migrationVersions}`);
             for (const version of migrationVersions) {
@@ -33,18 +30,20 @@ export const migrationService = {
         configStore.setProjectInfo({ version: currentVersion.toString() });
     }
 };
-function m0123() {
-    clm.step('Running migration 0.12.3...');
+function m0125() {
+    clm.step('Running migration 0.12.5...');
     configStore.setProjectFlag('javaMemoryChecked', false);
-    projectHelper.upgradeHypergraph();
-    installJava21();
-}
-function installJava21() {
-    const pilotDir = path.resolve(path.dirname(fileURLToPath(import.meta.url)), `../..`);
-    clm.debug(`Running install-java-21.sh from ${pilotDir}`);
-    const result = shell.exec('bash install-java-21.sh', { cwd: pilotDir });
-    if (result.code > 0) {
-        console.log(result.stderr);
-        clm.error(`Failed to install dependencies. Please try again after resolving any errors.`);
-    }
+    // projectHelper.upgradeHypergraph();
+    // installJava21();
 }
+// function installJava21() {
+//     const pilotDir = path.resolve(path.dirname(fileURLToPath(import.meta.url)), `../..`);
+//     clm.debug(`Running install-java-21.sh from ${pilotDir}`);
+//
+//     const result = shell.exec('bash install-java-21.sh', {cwd: pilotDir});
+//
+//     if (result.code > 0) {
+//         console.log(result.stderr);
+//         clm.error(`Failed to install dependencies. Please try again after resolving any errors.`);
+//     }
+// }

package/dist/services/node-service.d.ts

@@ -3,9 +3,6 @@ export declare const nodeService: {
     getNodeInfo(layer: "first" | TessellationLayer): Promise<NodeInfo>;
     getSnapshotHash(ipAddr: string, ordinal: number): Promise<string>;
     getStatusInfo(layer: TessellationLayer): Promise<TessellationLayer>;
-    isPortExposed(port: number): Promise<boolean>;
-    isPortInUse(port: number): Promise<boolean>;
-    isPortOpen(port: number): Promise<boolean>;
     joinCluster(layer: TessellationLayer): Promise<void>;
     leaveCluster(layer: TessellationLayer): Promise<boolean>;
     leaveClusterAllLayers(): Promise<boolean>;

package/dist/services/node-service.js

@@ -31,18 +31,20 @@ export const nodeService = {
     async getStatusInfo(layer) {
         return layer;
     },
-    async isPortExposed(port) {
-        const command = configStore.getSystemInfo().platform === 'linux' ? `ss -tuln | grep 0.0.0.0:${port}` : `netstat -an | grep '*.${port}'`;
-        return shellService.runCommandWithOutput(command).then(o => o.length > 0);
-    },
-    async isPortInUse(port) {
-        clm.preStep('Making a sudo call to check if a port is in use...');
-        return shellService.runCommandWithOutput(`sudo lsof -i :${port}`).then(Boolean).catch(() => false);
-    },
-    async isPortOpen(port) {
-        const command = configStore.getSystemInfo().platform === 'linux' ? `ss -tuln | grep :${port}` : `netstat -an | grep '.${port}'`;
-        return shellService.runCommandWithOutput(command).then(o => o.length > 0);
-    },
+    // async isPortExposed(port: number) {
+    //     const command = configStore.getSystemInfo().platform === 'linux' ? `ss -tuln | grep 0.0.0.0:${port}` : `netstat -an | grep '*.${port}'`;
+    //     return shellService.runCommandWithOutput(command).then(o => o.length > 0);
+    // },
+    //
+    // async isPortInUse(port: number) {
+    //     clm.preStep('Making a sudo call to check if a port is in use...');
+    //     return shellService.runCommandWithOutput(`sudo lsof -i :${port}`).then(Boolean).catch(() => false);
+    // },
+    //
+    // async isPortOpen(port: number) {
+    //     const command = configStore.getSystemInfo().platform === 'linux' ? `ss -tuln | grep :${port}` : `netstat -an | grep '.${port}'`;
+    //     return shellService.runCommandWithOutput(command).then(o => o.length > 0);
+    // },
     async joinCluster(layer) {
         const { state } = await this.getNodeInfo(layer);
         if (state !== "ReadyToJoin") {

package/dist/services/shell-service.js

@@ -46,13 +46,15 @@ export const shellService = {
         const result = shell.exec(command, { env: nodeEnv, silent });
         clm.debug(`END ${command}. Exit code: ${result.code}`);
         if (result.code > 0) {
-            throw new Error(`Failed running command: ${result.stderr}`);
+            throw new Error(`Failed running command. Exited with error message:\n${result.stderr}`);
         }
         return result;
     },
     async runCommandWithOutput(command, env) {
         const result = await this.runCommand(command, env, true);
-        return result.stdout.trim();
+        const output = result.stdout.trim();
+        clm.debug(`Command Output: "${output}"`);
+        return output;
     },
     async runProjectCommand(command, env, silent = false) {
         const { projectDir } = configStore.getProjectInfo();

package/dist/services/systemd-service.d.ts

@@ -1,3 +1,4 @@
 export declare const systemdService: {
     install(): Promise<void>;
+    uninstall(): Promise<void>;
 };

package/dist/services/systemd-service.js

@@ -1,22 +1,35 @@
 import fs from "node:fs";
+import os from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { clm } from "../clm.js";
-import { configStore } from "../config-store.js";
 import { shellService } from "./shell-service.js";
 export const systemdService = {
     async install() {
-        const { platform } = configStore.getSystemInfo();
+        const platform = os.platform();
         if (platform !== 'linux') {
             clm.warn('Node Pilot services can only be installed on Linux systems. Skipping systemd service installation.\n');
             return;
         }
-        const installServicesScript = path.resolve(path.dirname(fileURLToPath(import.meta.url)), `../../scripts/install_services.sh`);
-        if (!fs.existsSync(installServicesScript)) {
-            clm.error(`Node Pilot install system services script not found: ${installServicesScript}`);
+        const scriptFile = path.resolve(path.dirname(fileURLToPath(import.meta.url)), `../../scripts/install_services.sh`);
+        if (!fs.existsSync(scriptFile)) {
+            clm.error(`Node Pilot install system services script not found: ${scriptFile}`);
         }
         clm.preStep('Installing Node Pilot system services...');
-        await shellService.runCommand(installServicesScript);
+        await shellService.runCommand(scriptFile);
         clm.postStep('\nNode Pilot system service started successfully.');
+    },
+    async uninstall() {
+        const platform = os.platform();
+        if (platform !== 'linux') {
+            clm.warn('Node Pilot services can only be installed on Linux systems. Skipping systemd service uninstallation.\n');
+        }
+        const scriptFile = path.resolve(path.dirname(fileURLToPath(import.meta.url)), `../../scripts/uninstall_services.sh`);
+        if (!fs.existsSync(scriptFile)) {
+            clm.error(`Node Pilot uninstall system services script not found: ${scriptFile}`);
+        }
+        clm.preStep('Uninstalling Node Pilot system services...');
+        await shellService.runCommand(scriptFile);
+        clm.postStep('\nNode Pilot system service uninstalled successfully.');
     }
 };

package/install-dependencies.sh

@@ -67,5 +67,5 @@ check_docker() {
 
 # Run all checks
 echo "🔍 Checking and installing required dependencies..."
-check_acl
+# check_acl
 check_docker

package/oclif.manifest.json

@@ -272,6 +272,29 @@
         "test.js"
       ]
     },
+    "uninstall": {
+      "aliases": [],
+      "args": {},
+      "description": "Uninstall Node Pilot",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>"
+      ],
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "uninstall",
+      "pluginAlias": "@constellation-network/node-pilot",
+      "pluginName": "@constellation-network/node-pilot",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "uninstall.js"
+      ]
+    },
     "config:get": {
       "aliases": [],
       "args": {
@@ -340,5 +363,5 @@
       ]
     }
   },
-  "version": "0.12.6-devnet"
+  "version": "0.13.0-omegatest.2"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@constellation-network/node-pilot",
   "description": "An easy deployment and monitoring tool for Constellation nodes.",
-  "version": "0.12.6-devnet",
+  "version": "0.13.0-omegatest.2",
   "author": "Frank Fox",
   "bin": {
     "cpilot": "bin/run.js"
@@ -21,7 +21,7 @@
     "version": "oclif readme && git add README.md",
     "start": "./bin/dev.js",
     "debug": "DEBUG=true ./bin/dev.js",
-    "pub": "npm publish --access public --tag devnet"
+    "pub": "npm publish --access public --tag omegatest"
   },
   "types": "dist/index.d.ts",
   "engines": {

package/projects/hypergraph/Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:22.04
 
-RUN apt update && apt install -y openjdk-11-jre
+RUN apt update && apt install -y openjdk-21-jre
 
 RUN apt install -y curl jq wget
 
@@ -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.26"
+RUN npm install -g "@constellation-network/node-pilot-health-check@0.0.27"
 
 # Add entrypoint
 COPY ./entrypoint.sh /app/entrypoint.sh

package/projects/hypergraph/docker-compose.yml

@@ -8,7 +8,7 @@ services:
 #    volumes:
 #      - /var/run/docker.sock:/var/run/docker.sock
   gl0:
-    image: constellationnetwork/tessellation${CL_DOCKER_CORE_REPO:-}:${DOCKER_IMAGE_VERSION:-latest}
+    image: constellationnetwork/tessellation${CL_DOCKER_CORE_REPO:-}:${DOCKER_IMAGE_VERSION:-test}
     networks:
       - tessellation-network
     restart: unless-stopped
@@ -26,14 +26,14 @@ services:
       test: ["CMD", "cpilotHC"]
 #      test: ["CMD", "/health-check/bin/run.sh"]
       interval: 15s
-      retries: 1
+      retries: 3
       timeout: 15s
       start_period: 60s
     profiles: ["gl0"]
 #    labels:
 #      autoheal: "true"
   gl1:
-    image: constellationnetwork/tessellation${CL_DOCKER_CORE_REPO:-}:${DOCKER_IMAGE_VERSION:-latest}
+    image: constellationnetwork/tessellation${CL_DOCKER_CORE_REPO:-}:${DOCKER_IMAGE_VERSION:-test}
     restart: unless-stopped
     networks:
       - tessellation-network
@@ -50,7 +50,7 @@ services:
       test: ["CMD", "cpilotHC"]
 #      test: ["CMD", "/health-check/bin/run.sh"]
       interval: 15s
-      retries: 1
+      retries: 3
       timeout: 15s
       start_period: 60s
     profiles: ["gl1"]

package/scripts/install_services.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+set -Eeuo pipefail
+IFS=$'\n\t'
 
 # Find cpilot in PATH
 CPILOT=$(command -v cpilot)
@@ -16,7 +18,7 @@ if [ "$CURRENT_USER" = "root" ]; then
   UNIT_TARGET="multi-user.target"
 else
   IS_ROOT=false
-  HOME_DIR=$(eval echo ~$CURRENT_USER)
+  HOME_DIR=$(eval echo ~"$CURRENT_USER")
   WORKING_DIR="$HOME_DIR/.config/systemd/user"
   UNIT_TARGET="default.target"
 fi
@@ -24,10 +26,14 @@ fi
 BIN_DIRECTORY="$HOME_DIR/.node-pilot/scripts"
 
 mkdir -p "$BIN_DIRECTORY"
-
-# Create working directory if it doesn't exist
 mkdir -p "$WORKING_DIR"
 
+# Only check the first service file for existence
+if [ -f "$WORKING_DIR/restart-unhealthy.service" ]; then
+  echo "restart-unhealthy.service already exists in $WORKING_DIR. Skipping installation."
+  exit 0
+fi
+
 # Create restart-unhealthy.service
 cat << EOF > "$WORKING_DIR/restart-unhealthy.service"
 [Unit]
@@ -61,7 +67,6 @@ cat << EOF > "$BIN_DIRECTORY/restart-unhealthy.sh"
 #!/usr/bin/env bash
 docker ps -q -f health=unhealthy | xargs --no-run-if-empty docker restart
 EOF
-
 chmod +x "$BIN_DIRECTORY/restart-unhealthy.sh"
 
 # Create node-pilot-autostart.service
@@ -116,4 +121,4 @@ else
   loginctl enable-linger "$CURRENT_USER"
 fi
 #systemctl --user status node-pilot-update.service
-#  systemctl --user status restart-unhealthy
+#  systemctl --user status restart-unhealthy

package/scripts/uninstall_services.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+# Uninstall Node Pilot systemctl services and timers
+
+CURRENT_USER=$(id -un)
+if [ "$CURRENT_USER" = "root" ]; then
+  IS_ROOT=true
+  WORKING_DIR="/etc/systemd/system"
+else
+  IS_ROOT=false
+  HOME_DIR=$(eval echo ~$CURRENT_USER)
+  WORKING_DIR="$HOME_DIR/.config/systemd/user"
+fi
+
+SERVICES=(restart-unhealthy.timer restart-unhealthy.service node-pilot-autostart.service node-pilot-update.service)
+
+if [ "$IS_ROOT" = true ]; then
+  for SERVICE in "${SERVICES[@]}"; do
+    systemctl stop "$SERVICE" 2>/dev/null
+    systemctl disable "$SERVICE" 2>/dev/null
+    rm -f "$WORKING_DIR/$SERVICE"
+    echo "$SERVICE uninstalled."
+  done
+  systemctl daemon-reload
+else
+  for SERVICE in "${SERVICES[@]}"; do
+    systemctl --user stop "$SERVICE" 2>/dev/null
+    systemctl --user disable "$SERVICE" 2>/dev/null
+    rm -f "$WORKING_DIR/$SERVICE"
+    echo "$SERVICE uninstalled ($CURRENT_USER)."
+  done
+  systemctl --user daemon-reload
+  # Optionally disable linger (uncomment if needed)
+  loginctl disable-linger "$CURRENT_USER"
+fi
+
+echo "Node Pilot services and timers have been uninstalled."

package/dist/checks/check-node-ctl.d.ts

@@ -1,5 +0,0 @@
-export declare const checkNodeCtl: {
-    check4Migration(): Promise<void>;
-    importKeyInfo(cnPath: string): Promise<void>;
-    promptForKeyFile(pilotKeyPath: string): Promise<void>;
-};

package/dist/checks/check-node-ctl.js

@@ -1,88 +0,0 @@
-import { input, password } from "@inquirer/prompts";
-import chalk from "chalk";
-import fs from "node:fs";
-import path from "node:path";
-import yaml from "yaml";
-import { clm } from "../clm.js";
-import { configStore } from "../config-store.js";
-import { keyFileHelper } from "../helpers/key-file-helper.js";
-import { promptHelper } from "../helpers/prompt-helper.js";
-import { dockerService } from "../services/docker-service.js";
-import { nodeService } from "../services/node-service.js";
-import { shellService } from "../services/shell-service.js";
-export const checkNodeCtl = {
-    async check4Migration() {
-        if (configStore.hasProjectFlag('nodeCtlChecked')) {
-            return;
-        }
-        const { name } = configStore.getProjectInfo();
-        if (name.toLowerCase() !== 'hypergraph') {
-            configStore.setProjectFlag('nodeCtlChecked', true);
-            return;
-        }
-        const hasNodeAdminUser = fs.existsSync('/home/nodeadmin');
-        if (hasNodeAdminUser) {
-            const isDockerRunning = await dockerService.isRunning();
-            const isPortOpen = await nodeService.isPortInUse(9000);
-            clm.step(chalk.bold('NODECTL has been detected.'));
-            if (!isDockerRunning && isPortOpen) {
-                clm.error('Please shutdown any Nodes being managed by NODECTL before proceeding.');
-            }
-            const cnPath = path.resolve('/var/tessellation/nodectl/cn-config.yaml');
-            if (fs.existsSync(cnPath)) {
-                const answer = await input({
-                    default: 'y',
-                    message: 'Would you like to import key file from nodectl? (y/n): '
-                });
-                if (answer.toLowerCase() === 'y') {
-                    await this.importKeyInfo(cnPath);
-                }
-            }
-        }
-        configStore.setProjectFlag('nodeCtlChecked', true);
-    },
-    async importKeyInfo(cnPath) {
-        clm.step('Importing key file from nodectl...');
-        try {
-            clm.preStep('Making a sudo call to read the nodectl config file...');
-            await shellService.runCommand(`sudo chmod +r ${cnPath}`);
-            const doc = yaml.parse(fs.readFileSync(cnPath, 'utf8'));
-            // console.log(JSON.stringify(doc,null,2));
-            // eslint-disable-next-line camelcase
-            const { key_location, key_name } = doc.nodectl.global_p12;
-            const nodeCtlKeyPath = path.resolve(key_location, key_name);
-            clm.debug(`Found key file path in nodectl config file: ${nodeCtlKeyPath}`);
-            clm.step('Key file found at ' + chalk.cyan(nodeCtlKeyPath));
-            clm.preStep('Importing key file...');
-            const { projectDir } = configStore.getProjectInfo();
-            const pilotKeyPath = path.join(projectDir, 'key.p12');
-            // copy file to home directory, change owner to current user, and make it readable by all
-            clm.preStep('Making a sudo call to copy the key file...');
-            await shellService.runCommand(`sudo cp ${nodeCtlKeyPath} ${pilotKeyPath}; sudo chown $(whoami) ${pilotKeyPath}; chmod +r ${pilotKeyPath}`);
-            await this.promptForKeyFile(pilotKeyPath);
-        }
-        catch (error) {
-            console.error(error);
-            clm.warn('Failed to import key information from nodectl. You will need to import it manually.');
-            await promptHelper.doYouWishToContinue();
-        }
-    },
-    async promptForKeyFile(pilotKeyPath) {
-        // prompt for password
-        const keyPassword = await password({ message: 'Enter the key file password:' });
-        const keyAlias = await input({ message: 'Enter the key file alias:' });
-        configStore.setEnvInfo({ CL_KEYALIAS: keyAlias, CL_KEYSTORE: pilotKeyPath, CL_PASSWORD: keyPassword });
-        try {
-            const dagAddress = await keyFileHelper.getAddress();
-            const nodeId = await keyFileHelper.getId();
-            configStore.setProjectInfo({ dagAddress, nodeId });
-        }
-        catch {
-            clm.warn('Failed to unlock the key file. Please check your key file information and try again.');
-            fs.rmSync(pilotKeyPath);
-            await this.promptForKeyFile(pilotKeyPath);
-            return;
-        }
-        clm.postStep('Key file imported successfully.\n');
-    }
-};