@constellation-network/node-pilot 0.0.11 → 0.0.13

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.0.11 darwin-arm64 node-v22.15.0
+@constellation-network/node-pilot/0.0.13 darwin-arm64 node-v22.15.0
 $ cpilot --help [COMMAND]
 USAGE
   $ cpilot COMMAND
@@ -62,7 +62,7 @@ EXAMPLES
   $ cpilot config
 ```
 
-_See code: [src/commands/config.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.11/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.13/src/commands/config.ts)_
 
 ## `cpilot config get [NAME]`
 
@@ -86,7 +86,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.0.11/src/commands/config/get.ts)_
+_See code: [src/commands/config/get.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.13/src/commands/config/get.ts)_
 
 ## `cpilot config set NAME VALUE`
 
@@ -109,7 +109,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.0.11/src/commands/config/set.ts)_
+_See code: [src/commands/config/set.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.13/src/commands/config/set.ts)_
 
 ## `cpilot help [COMMAND]`
 
@@ -146,7 +146,7 @@ EXAMPLES
   $ cpilot info
 ```
 
-_See code: [src/commands/info.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.11/src/commands/info.ts)_
+_See code: [src/commands/info.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.13/src/commands/info.ts)_
 
 ## `cpilot logs LAYER`
 
@@ -170,7 +170,7 @@ EXAMPLES
   $ cpilot logs
 ```
 
-_See code: [src/commands/logs.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.11/src/commands/logs.ts)_
+_See code: [src/commands/logs.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.13/src/commands/logs.ts)_
 
 ## `cpilot restart [LAYER]`
 
@@ -198,7 +198,7 @@ EXAMPLES
   $ cpilot restart
 ```
 
-_See code: [src/commands/restart.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.11/src/commands/restart.ts)_
+_See code: [src/commands/restart.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.13/src/commands/restart.ts)_
 
 ## `cpilot shutdown`
 
@@ -215,7 +215,7 @@ EXAMPLES
   $ cpilot shutdown
 ```
 
-_See code: [src/commands/shutdown.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.11/src/commands/shutdown.ts)_
+_See code: [src/commands/shutdown.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.13/src/commands/shutdown.ts)_
 
 ## `cpilot status`
 
@@ -229,5 +229,5 @@ DESCRIPTION
   Display node status and configuration settings
 ```
 
-_See code: [src/commands/status.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.11/src/commands/status.ts)_
+_See code: [src/commands/status.ts](https://github.com/Constellation-Labs/node-pilot/blob/v0.0.13/src/commands/status.ts)_
 <!-- commandsstop -->

package/dist/checks/check-hardware.js

@@ -45,6 +45,6 @@ export const checkHardware = {
             clm.warn("System recommendations not met. The validator node may not function properly.\n");
             await promptHelper.doYouWishToContinue('n');
         }
-        configStore.setSystemInfo({ cores: numOfCores, disk: totalSpaceGB, memory: totalMemoryGB, platform: os.platform() });
+        configStore.setSystemInfo({ cores: numOfCores, disk: totalSpaceGB, memory: totalMemoryGB, platform: os.platform(), user: os.userInfo().username });
     }
 };

package/dist/commands/logs.js

@@ -28,7 +28,7 @@ export default class Logs extends Command {
             tailFlag = ' -f';
         }
         const { projectDir } = configStore.getProjectInfo();
-        const logPath = path.join(projectDir, 'app-data', `${args.layer}-logs`, 'app.log');
+        const logPath = path.join(projectDir, args.layer, 'logs', 'app.log');
         await shellService.runCommand(`tail ${tailFlag} ${logPath}`).catch(() => 1);
     }
 }

package/dist/commands/restart.js

@@ -4,6 +4,7 @@ import { checkProject } from "../checks/check-project.js";
 import { clm } from "../clm.js";
 import { configStore } from "../config-store.js";
 import { configHelper } from "../helpers/config-helper.js";
+import { serviceLog } from "../helpers/service-log.js";
 import { dockerService } from "../services/docker-service.js";
 import { nodeService } from "../services/node-service.js";
 export default class Restart extends BaseCommand {
@@ -22,27 +23,16 @@ export default class Restart extends BaseCommand {
         const { args, flags } = await this.parse(Restart);
         this.checkProject(flags);
         configHelper.assertProject('No project found. ');
-        if (!await dockerService.isRunning()) {
-            this.error('The validator node is not running.');
-        }
-        if (args && args.layer) {
-            const { layersToRun } = configStore.getProjectInfo();
-            const layer = args.layer;
-            if (!layersToRun.includes(layer)) {
-                this.error(`Invalid layer: ${layer}. Available layers: ${layersToRun.join(',')}`);
-            }
-            await nodeService.leaveCluster(layer);
-            await nodeService.pollForLayersState([layer], 'Offline');
-            clm.preStep(`Restarting ${layer.toUpperCase()}...`);
-            await dockerService.dockerRestart(layer);
-            return;
-        }
         if (flags.update) {
+            serviceLog.log('Executing "cpilot restart --update" at ' + new Date().toLocaleString('en-US', { timeZone: 'America/Los_Angeles' }));
             const project = configStore.getActiveProject();
-            for (const project of configStore.getRunningProjects()) {
+            const activeProjects = configStore.getRunningProjects();
+            serviceLog.log(`    Active projects: ${activeProjects.join(', ')}...`);
+            for (const project of activeProjects) {
                 configStore.setActiveProject(project);
                 // eslint-disable-next-line no-await-in-loop
                 if (await checkProject.hasVersionChanged()) {
+                    serviceLog.log('    ' + project + ' version has changed. Restarting...');
                     // eslint-disable-next-line no-await-in-loop
                     await this.restart();
                 }
@@ -51,8 +41,12 @@ export default class Restart extends BaseCommand {
             return;
         }
         if (flags.autostart) {
+            serviceLog.log('Executing "cpilot restart --autostart" at ' + new Date().toLocaleString('en-US', { timeZone: 'America/Los_Angeles' }));
             const project = configStore.getActiveProject();
-            for (const project of configStore.getRunningProjects()) {
+            const activeProjects = configStore.getRunningProjects();
+            serviceLog.log(`    Active projects: ${activeProjects.join(', ')}...`);
+            for (const project of activeProjects) {
+                serviceLog.log('    ' + project + ' is restarting...');
                 configStore.setActiveProject(project);
                 // eslint-disable-next-line no-await-in-loop
                 await this.restart();
@@ -60,6 +54,21 @@ export default class Restart extends BaseCommand {
             configStore.setActiveProject(project);
             return;
         }
+        if (!await dockerService.isRunning()) {
+            this.error('The validator node is not running.');
+        }
+        if (args && args.layer) {
+            const { layersToRun } = configStore.getProjectInfo();
+            const layer = args.layer;
+            if (!layersToRun.includes(layer)) {
+                this.error(`Invalid layer: ${layer}. Available layers: ${layersToRun.join(',')}`);
+            }
+            await nodeService.leaveCluster(layer);
+            await nodeService.pollForLayersState([layer], 'Offline');
+            clm.preStep(`Restarting ${layer.toUpperCase()}...`);
+            await dockerService.dockerRestart(layer);
+            return;
+        }
         await this.restart();
     }
     async restart() {

package/dist/config-store.d.ts

@@ -104,6 +104,7 @@ export type SystemInfo = {
     isDockerInstalled: boolean;
     memory: string;
     platform: string;
+    user: string;
 };
 export type NetworkType = 'integrationnet' | 'mainnet' | 'testnet';
 export type ProjectInfo = {

package/dist/helpers/project-helper.js

@@ -63,8 +63,8 @@ export const projectHelper = {
     async installHypergraph() {
         await this.installEmbedded('hypergraph');
         const { projectDir } = configStore.getProjectInfo();
-        // Create app-data folders for fast forward feature before Docker does
-        const gl0DataDir = path.join(projectDir, 'app-data', 'gl0-data');
+        // Create gl0 folders for fast forward feature before Docker does
+        const gl0DataDir = path.join(projectDir, 'gl0', 'data');
         fs.mkdirSync(path.join(gl0DataDir, 'incremental_snapshot'), { recursive: true });
         fs.mkdirSync(path.join(gl0DataDir, 'snapshot_info'));
         fs.mkdirSync(path.join(gl0DataDir, 'tmp'));

package/dist/helpers/service-log.d.ts

@@ -0,0 +1,3 @@
+export declare const serviceLog: {
+    log(s: string): void;
+};

package/dist/helpers/service-log.js

@@ -0,0 +1,10 @@
+import fs from "node:fs";
+import path from "node:path";
+import { configStore } from "../config-store.js";
+export const serviceLog = {
+    log(s) {
+        const appDir = configStore.getAppDir();
+        const logFile = path.join(appDir, 'logs', 'service.log');
+        fs.appendFileSync(logFile, s + '\n');
+    },
+};

package/dist/services/archiver-service.js

@@ -15,7 +15,7 @@ const remoteIndexMap = {
 export const archiverService = {
     async checkLogsForMissingSnapshots() {
         const { projectDir } = configStore.getProjectInfo();
-        const dataDir = path.join(projectDir, 'app-data', 'gl0-logs', 'app.log');
+        const dataDir = path.join(projectDir, 'gl0', 'logs', 'app.log');
         const result = await shellService.runCommandWithOutput(`grep -i 'Global snapshot not found for ordinal' ${dataDir}`).catch(() => '');
         let oldestOrdinal = Number.MAX_SAFE_INTEGER;
         for (const line of result.split('\n')) {
@@ -46,7 +46,7 @@ export const archiverService = {
     },
     getDownloadedSnapshotRange() {
         const { projectDir } = configStore.getProjectInfo();
-        const dataDir = path.join(projectDir, 'app-data', 'gl0-data', 'incremental_snapshot', 'ordinal');
+        const dataDir = path.join(projectDir, 'gl0', 'data', 'incremental_snapshot', 'ordinal');
         const result = { chunkOrdinal: 0, endOrdinal: 0, startOrdinal: 0 };
         if (!fs.existsSync(dataDir)) {
             return result;
@@ -90,7 +90,7 @@ export const archiverService = {
             clm.preStep('Archive is not in the optimal range, but proceeding with available data.');
         }
         const { projectDir } = configStore.getProjectInfo();
-        const dataDir = path.join(projectDir, 'app-data', 'gl0-data');
+        const dataDir = path.join(projectDir, 'gl0', 'data');
         fs.mkdirSync(dataDir, { recursive: true });
         clm.preStep(`Downloading latest snapshot archive ${chalk.yellow(remoteArchiveStartOrdinal)}-${chalk.yellow(remoteArchiveEndOrdinal)}; distance from cluster: ${chalk.yellow(archiveDistance)}\nCurrent oldest local ordinal: ${chalk.yellow(localStartOrdinal)}, Latest cluster ordinal: ${chalk.yellow(clusterOrdinal)}`);
         // await shellService.runCommand(`curl -L ${url} -o ${dataDir}/snapshot.tar.gz`);

package/dist/services/fastforward-service.js

@@ -15,8 +15,8 @@ export class FastforwardService {
         const { projectDir } = configStore.getProjectInfo();
         const { type } = configStore.getNetworkInfo();
         this.network = type;
-        this.tmpDir = path.join(projectDir, 'app-data', 'tmp');
-        this.dataDir = path.join(projectDir, 'app-data', 'gl0-data'); // gl0
+        this.tmpDir = path.join(projectDir, 'gl0', 'tmp');
+        this.dataDir = path.join(projectDir, 'gl0', 'data');
         fs.mkdirSync(this.tmpDir, { recursive: true });
         fs.mkdirSync(this.dataDir, { recursive: true });
         const env = configStore.getEnvNetworkInfo(type);
@@ -25,7 +25,15 @@ export class FastforwardService {
     }
     static async synctoLatestSnapshot() {
         const ffs = new FastforwardService();
-        await ffs.runFastForwardSnapshot();
+        await ffs.runFastForwardSnapshot().catch(() => {
+            const { projectDir } = configStore.getProjectInfo();
+            const dataDir = path.join(projectDir, 'gl0', 'data', 'incremental_snapshot', 'ordinal');
+            if (fs.existsSync(dataDir) && fs.readdirSync(dataDir).length > 0) {
+                clm.warn('Failed to fast forward to latest snapshot. Skipping...');
+                return;
+            }
+            clm.error('Failed to fast forward to latest snapshot. Please try again later.');
+        });
     }
     async runFastForwardSnapshot() {
         const [ordinal, snapshotIncremental, snapshotInfo] = await this.fetchLatestSnapshot();
@@ -82,6 +90,10 @@ export class FastforwardService {
         fs.mkdirSync(hashDir, { recursive: true });
         fs.mkdirSync(ordinalDir, { recursive: true });
         const destOrdinalFile = path.join(ordinalDir, ordinal);
+        if (fs.existsSync(destOrdinalFile)) {
+            clm.warn(`Snapshot ${destOrdinalFile} already exists. Skipping...`);
+            return;
+        }
         fs.copyFileSync(ordinalFile, destOrdinalFile);
         const hashFile = path.join(hashDir, hash);
         fs.linkSync(destOrdinalFile, hashFile);

package/dist/services/systemd-service.js

@@ -4,7 +4,6 @@ import { fileURLToPath } from "node:url";
 import { clm } from "../clm.js";
 import { configStore } from "../config-store.js";
 import { shellService } from "./shell-service.js";
-const INSTALL_PATH = '/etc/systemd/system/';
 export const systemdService = {
     async install() {
         const { platform } = configStore.getSystemInfo();
@@ -12,34 +11,12 @@ export const systemdService = {
             clm.warn('Node Pilot services can only be installed on Linux systems. Skipping systemd service installation.\n');
             return;
         }
-        const projectFolder = path.resolve(path.dirname(fileURLToPath(import.meta.url)), `../../scripts/services`);
-        if (!fs.existsSync(projectFolder)) {
-            clm.error(`Node Pilot services's folder not found: ${projectFolder}`);
-        }
-        const restarterPath = path.join(INSTALL_PATH, 'node-pilot-restarter.service');
-        const updaterPath = path.join(INSTALL_PATH, 'node-pilot-updater.service');
-        let restarterInstalled = false;
-        let updaterInstalled = false;
-        if (!fs.existsSync(restarterPath)) {
-            fs.cpSync(path.join(projectFolder, 'node-pilot-restarter.service'), path.join(INSTALL_PATH, 'node-pilot-restarter.service'));
-            clm.step('Node Pilot restarter service installed successfully.');
-            restarterInstalled = true;
-        }
-        if (!fs.existsSync(updaterPath)) {
-            fs.cpSync(path.join(projectFolder, 'node-pilot-updater.service'), path.join(INSTALL_PATH, 'node-pilot-updater.service'));
-            clm.step('Node Pilot updater service installed successfully.');
-            updaterInstalled = true;
-        }
-        if (restarterInstalled || updaterInstalled) {
-            await shellService.runCommand('systemctl daemon-reload');
-        }
-        if (restarterInstalled) {
-            await shellService.runCommand('systemctl enable node-pilot-restarter.service');
-            clm.step('Node Pilot restarter service enabled successfully.');
-        }
-        if (updaterInstalled) {
-            await shellService.runCommand('systemctl enable node-pilot-updater.service');
-            clm.step('Node Pilot updater service enabled successfully.');
+        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}`);
         }
+        clm.preStep('Installing Node Pilot system services...');
+        await shellService.runCommand(installServicesScript);
+        clm.postStep('\nNode Pilot system service started successfully.');
     }
 };

package/oclif.manifest.json

@@ -276,5 +276,5 @@
       ]
     }
   },
-  "version": "0.0.11"
+  "version": "0.0.13"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@constellation-network/node-pilot",
   "description": "An easy deployment and monitoring tool for Constellation nodes.",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "author": "Frank Fox",
   "bin": {
     "cpilot": "bin/run.js"
@@ -16,7 +16,7 @@
     "lint": "eslint",
     "postpack": "shx rm -f oclif.manifest.json",
     "posttest": "yarn lint",
-    "prepack": "oclif manifest && oclif readme",
+    "prepack": "npm run build && oclif manifest && oclif readme",
     "test": "mocha --forbid-only \"test/**/*.test.ts\"",
     "version": "oclif readme && git add README.md",
     "start": "./bin/dev.js",

package/scripts/install_services.sh

@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+
+CPILOT=$(command -v cpilot)
+if [ -z "$CPILOT" ]; then
+  echo "cpilot command not found. Please ensure Node Pilot is installed and accessible in your PATH."
+  exit 1
+fi
+
+WORKING_DIR=/home/$USER/.config/systemd/user
+
+mkdir -p $WORKING_DIR
+
+cat << EOF > $WORKING_DIR/restart-unhealthy.service
+[Unit]
+Description=Restart unhealthy docker containers
+After=docker.service
+Wants=docker.service
+
+[Service]
+ExecStartPre=/bin/sleep 300
+ExecStart=$WORKING_DIR/restart-unhealthy.sh
+Restart=always
+RestartSec=60s
+EOF
+
+cat << EOF > $WORKING_DIR/restart-unhealthy.sh
+#!/usr/bin/env bash
+docker ps -q -f health=unhealthy | xargs --no-run-if-empty docker restart
+EOF
+
+chmod +x $WORKING_DIR/restart-unhealthy.sh
+
+cat << EOF > $WORKING_DIR/node-pilot-autostart.service
+[Unit]
+Description=Constellation Network Node Auto Restart Service
+After=default.target
+
+[Service]
+ExecStart=$CPILOT restart --autostart
+
+[Install]
+WantedBy=default.target
+EOF
+
+cat << EOF > $WORKING_DIR/node-pilot-update.service
+[Unit]
+Description=Constellation Node Pilot Updater Service
+After=default.target
+
+[Service]
+ExecStartPre=/bin/sleep 300
+ExecStart=$CPILOT restart --update
+Restart=always
+RestartSec=5m
+
+[Install]
+WantedBy=default.target
+EOF
+
+systemctl --user daemon-reload
+
+systemctl --user enable restart-unhealthy.service
+systemctl --user enable node-pilot-autostart.service
+systemctl --user enable node-pilot-update.service
+
+systemctl --user start restart-unhealthy.service
+systemctl --user start node-pilot-autostart.service
+systemctl --user start node-pilot-update.service
+
+loginctl enable-linger $USER

package/scripts/autoheal.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# This script monitors Docker containers and restarts any that are unhealthy.
-
-unhealthy_containers=$(docker ps -q --filter health=unhealthy)
-if [ -n "$unhealthy_containers" ]; then
-  echo "Restarting unhealthy containers: $unhealthy_containers"
-  docker restart $unhealthy_containers
-fi

package/scripts/restart_logger.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-echo "Executing \"cpilot restart --autostart\" at $(date "+%b %d %H:%M:%S")" >> ~/.node-pilot/logs/service.log

package/scripts/services/io.constellationnetwork.nodepilot.Updater.plist

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>Label</key>
-    <string>io.constellationnetwork.nodepilot.Updater</string>
-    <key>ProgramArguments</key>
-    <array>
-        <string>~/.node-pilot/scripts/updater.sh</string>
-    </array>
-    <key>StartInterval</key>
-    <integer>300</integer>
-    <key>RunAtLoad</key>
-    <boolean>true</boolean>
-</dict>
-</plist>

package/scripts/services/node-pilot-autoheal.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=Constellation node pilot docker container auto heal service
-After=multi-user.target
-
-[Service]
-Type=simple
-ExecStart=%h/.node-pilot/scripts/autoheal.sh
-Restart=always
-RestartSec=15s
-
-[Install]
-WantedBy=multi-user.target

package/scripts/services/node-pilot-restarter.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=Constellation Network node auto_restart service
-After=multi-user.target
-
-[Service]
-Type=simple
-User=ubuntu
-ExecStartPre=%h/.node-pilot/scripts/restart_logger.sh
-ExecStart=cpilot restart --autostart
-
-[Install]
-WantedBy=multi-user.target

package/scripts/services/node-pilot-updater.service

@@ -1,14 +0,0 @@
-[Unit]
-Description=Constellation Node Pilot Updater Service
-After=multi-user.target
-
-[Service]
-Type=simple
-User=ubuntu
-ExecStartPre=%h/.node-pilot/scripts/update_logger.sh
-ExecStart=cpilot restart --update
-Restart=always
-RestartSec=5m
-
-[Install]
-WantedBy=multi-user.target

package/scripts/update_logger.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-echo "Executing \"cpilot restart --update\" at $(date "+%b %d %H:%M:%S")" >> ~/.node-pilot/logs/service.log