@constellation-network/node-pilot 0.0.11 → 0.0.12

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.12 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.12/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.12/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.12/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.12/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.12/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.12/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.12/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.12/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

@@ -22,21 +22,6 @@ 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) {
             const project = configStore.getActiveProject();
             for (const project of configStore.getRunningProjects()) {
@@ -60,6 +45,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/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

@@ -16,30 +16,29 @@ export const systemdService = {
         if (!fs.existsSync(projectFolder)) {
             clm.error(`Node Pilot services's folder not found: ${projectFolder}`);
         }
+        clm.preStep('Installing Node Pilot system services...');
         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'));
+            await shellService.runCommand(`sudo cp ${path.join(projectFolder, 'node-pilot-restarter.service')} ${restarterPath}`);
             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'));
+            await shellService.runCommand(`sudo cp ${path.join(projectFolder, 'node-pilot-updater.service')} ${updaterPath}`);
             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.');
+            await shellService.runCommand('sudo systemctl daemon-reload');
         }
+        await shellService.runCommand('sudo systemctl enable node-pilot-restarter.service');
+        await shellService.runCommand('sudo systemctl start node-pilot-restarter.service');
+        clm.postStep('\nNode Pilot restarter service started successfully.');
+        await shellService.runCommand('sudo systemctl enable node-pilot-updater.service');
+        await shellService.runCommand('sudo systemctl start node-pilot-updater.service');
+        clm.postStep('\nNode Pilot updater service started successfully.');
     }
 };

package/oclif.manifest.json

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

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.12",
   "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",