@constellation-network/node-pilot 0.18.0-intnet → 0.18.1-intnet

package/dist/services/cluster-service.js

@@ -30,7 +30,22 @@ export const clusterService = {
         spinner.stop();
     },
     async getClusterInfo(layer) {
-        return this.makeClusterRequestGet('cluster/info', layer);
+        return this.makeClusterRequestGet('cluster/info', layer)
+            .then(cInfo => {
+            if (!isClusterReady(cInfo)) {
+                return this.makeClusterRequestGet('cluster/info', layer, '?sticky=true')
+                    .then(cInfo => {
+                    if (!isClusterReady(cInfo)) {
+                        if (cInfo.length > 0) {
+                            clm.warn(`Found ${cInfo.length} nodes in the cluster, but none are READY.`);
+                        }
+                        throw new Error(`Network is not connectable.`);
+                    }
+                    return cInfo;
+                });
+            }
+            return cInfo;
+        });
     },
     async getClusterNodeInfo(layer) {
         return this.makeClusterRequestGet('node/info', layer);
@@ -56,12 +71,12 @@ export const clusterService = {
     async getSourceNodeOrdinalHash(layer, ordinal) {
         return this.makeSourceNodeRequest(`global-snapshots/${ordinal}/hash`, layer);
     },
-    async makeClusterRequestGet(path, layer) {
+    async makeClusterRequestGet(path, layer, params = '') {
         layer = layer || this.getLayer0();
         const { type } = configStore.getNetworkInfo();
         const envLayerInfo = configStore.getEnvLayerInfo(type, layer);
         if (envLayerInfo.CL_LB) {
-            return fetch(`${envLayerInfo.CL_LB}/${path}`)
+            return fetch(`${envLayerInfo.CL_LB}/${path}${params}`)
                 .then(res => {
                 if (res.ok) {
                     return res.json();
@@ -90,18 +105,24 @@ export const clusterService = {
         })
             .then(res => res.json());
     },
+    async makeRandomSourceNodeRequest(path, layer) {
+        return this.makeClusterRequestGet(path, layer, '?source_node=true&sticky=false');
+    },
     async makeSourceNodeRequest(path, layer) {
         const { type } = configStore.getNetworkInfo();
-        const { CL_PUBLIC_HTTP_PORT } = configStore.getEnvLayerInfo(type, layer);
+        const { CL_SOURCE_HTTP_PORT } = configStore.getEnvLayerInfo(type, layer);
         const { CL_L0_PEER_HTTP_HOST } = configStore.getEnvNetworkInfo(type);
-        clm.debug(`http://${CL_L0_PEER_HTTP_HOST}:${CL_PUBLIC_HTTP_PORT}/${path}`);
-        return fetch(`http://${CL_L0_PEER_HTTP_HOST}:${CL_PUBLIC_HTTP_PORT}/${path}`)
+        clm.debug(`http://${CL_L0_PEER_HTTP_HOST}:${CL_SOURCE_HTTP_PORT}/${path}`);
+        return fetch(`http://${CL_L0_PEER_HTTP_HOST}:${CL_SOURCE_HTTP_PORT}/${path}`)
             .then(res => res.json())
             .catch(() => {
-            throw new Error(`Unable to connect to source node at http://${CL_L0_PEER_HTTP_HOST}:${CL_PUBLIC_HTTP_PORT}/${path}`);
+            throw new Error(`Unable to connect to source node at http://${CL_L0_PEER_HTTP_HOST}:${CL_SOURCE_HTTP_PORT}/${path}`);
         });
     },
     async postNodeParams(body, layer) {
         return this.makeClusterRequestPost(`node-params`, body, layer);
     }
 };
+function isClusterReady(info) {
+    return info.some(node => node.state === 'Ready');
+}

package/dist/services/docker-service.js

@@ -1,6 +1,7 @@
 import ora from "ora";
 import { clm } from "../clm.js";
 import { configStore } from "../config-store.js";
+import { pilotManager } from "../helpers/pilot-manager.js";
 import { projectHelper } from "../helpers/project-helper.js";
 import { shellService } from "./shell-service.js";
 export const dockerService = {
@@ -32,7 +33,7 @@ export const dockerService = {
         if (await this.isRunning()) {
             await this.dockerDown();
         }
-        configStore.setProjectStatusToRunning(true);
+        pilotManager.setProjectStatusToRunning(true);
         await run('up -d');
     },
     async dockerStartLayers(layers) {
@@ -43,7 +44,7 @@ export const dockerService = {
         if (await this.isRunning()) {
             await this.dockerDown();
         }
-        configStore.setProjectStatusToRunning(true);
+        pilotManager.setProjectStatusToRunning(true);
         await projectHelper.generateLayerEnvFiles();
         await run('up -d');
     },

package/dist/services/node-service.js

@@ -1,6 +1,7 @@
 import chalk from "chalk";
 import { clm } from "../clm.js";
 import { configStore } from "../config-store.js";
+import { pilotManager } from "../helpers/pilot-manager.js";
 import { clusterService } from "./cluster-service.js";
 import { shellService } from "./shell-service.js";
 export const nodeService = {
@@ -32,7 +33,7 @@ export const nodeService = {
         return layer;
     },
     async isPortExposed(port) {
-        const command = configStore.getSystemInfo().platform === 'linux' ? `ss -tuln | grep 0.0.0.0:${port}` : `netstat -an | grep '*.${port}'`;
+        const command = pilotManager.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) {
@@ -40,7 +41,7 @@ export const nodeService = {
         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}'`;
+        const command = pilotManager.getSystemInfo().platform === 'linux' ? `ss -tuln | grep :${port}` : `netstat -an | grep '.${port}'`;
         return shellService.runCommandWithOutput(command).then(o => o.length > 0);
     },
     async joinCluster(layer) {

package/oclif.manifest.json

@@ -155,6 +155,47 @@
         "logs.js"
       ]
     },
+    "project": {
+      "aliases": [],
+      "args": {},
+      "description": "Create a new project, list all projects or change active project",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>"
+      ],
+      "flags": {
+        "create": {
+          "char": "c",
+          "description": "create a new project with the given name",
+          "name": "create",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "delete": {
+          "char": "d",
+          "description": "delete a project with the given name. WARNING: this will remove all data and logs associated with the project. Use with caution.",
+          "name": "delete",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hidden": true,
+      "hiddenAliases": [],
+      "id": "project",
+      "pluginAlias": "@constellation-network/node-pilot",
+      "pluginName": "@constellation-network/node-pilot",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "project.js"
+      ]
+    },
     "restart": {
       "aliases": [],
       "args": {
@@ -168,18 +209,6 @@
         "<%= config.bin %> <%= command.id %>"
       ],
       "flags": {
-        "project": {
-          "char": "p",
-          "description": "Specify the project name to use",
-          "helpGroup": "GLOBAL",
-          "name": "project",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "hypergraph"
-          ],
-          "type": "option"
-        },
         "autostart": {
           "description": "restart each running project if it has been stopped",
           "name": "autostart",
@@ -363,5 +392,5 @@
       ]
     }
   },
-  "version": "0.18.0-intnet"
+  "version": "0.18.1-intnet"
 }

package/package.json

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

package/projects/hypergraph/docker-compose.yml

@@ -15,8 +15,10 @@ services:
     env_file:
       - gl0.env
     ports:
-      - "9000:9000"  # Public HTTP
-      - "9001:9001"  # P2P HTTP
+#      - "9000:9000"  # Public HTTP
+#      - "9001:9001"  # P2P HTTP
+      - "${CL_GL0_PUBLIC_PORT:-9000}:${CL_GL0_PUBLIC_PORT:-9000}"  # Public HTTP
+      - "${CL_GL0_P2P_PORT:-9001}:${CL_GL0_P2P_PORT:-9001}"  # P2P HTTP
     volumes:
       - ./gl0/data:/app/data
       - ./gl0/logs:/app/logs
@@ -40,8 +42,10 @@ services:
     env_file:
       - gl1.env
     ports:
-      - "9010:9010"  # Public HTTP
-      - "9011:9011"  # P2P HTTP
+#      - "9010:9010"  # Public HTTP
+#      - "9011:9011"  # P2P HTTP
+      - "${CL_GL1_PUBLIC_PORT:-9010}:${CL_GL1_PUBLIC_PORT:-9010}"  # Public HTTP
+      - "${CL_GL1_P2P_PORT:-9011}:${CL_GL1_P2P_PORT:-9011}"  # P2P HTTP
     volumes:
       - ./gl1/data:/app/data
       - ./gl1/logs:/app/logs

package/projects/hypergraph/networks/integrationnet/gl0.env

@@ -1,4 +1,5 @@
 CL_LB=https://l0-lb-integrationnet.constellationnetwork.io
 CL_PUBLIC_HTTP_PORT=9000
 CL_P2P_HTTP_PORT=9001
-CL_CLI_HTTP_PORT=9002
+CL_CLI_HTTP_PORT=9002
+CL_SOURCE_HTTP_PORT=9000

package/projects/hypergraph/networks/integrationnet/gl1.env

@@ -1,4 +1,5 @@
 CL_LB=https://l1-lb-integrationnet.constellationnetwork.io
-CL_PUBLIC_HTTP_PORT=9010
-CL_P2P_HTTP_PORT=9011
-CL_CLI_HTTP_PORT=9012
+CL_PUBLIC_HTTP_PORT=9100
+CL_P2P_HTTP_PORT=9101
+CL_CLI_HTTP_PORT=9102
+CL_SOURCE_HTTP_PORT=9010

package/projects/hypergraph/networks/mainnet/gl0.env

@@ -1,4 +1,5 @@
 CL_LB=https://l0-lb-mainnet.constellationnetwork.io
 CL_PUBLIC_HTTP_PORT=9000
 CL_P2P_HTTP_PORT=9001
-CL_CLI_HTTP_PORT=9002
+CL_CLI_HTTP_PORT=9002
+CL_SOURCE_HTTP_PORT=9000

package/projects/hypergraph/networks/mainnet/gl1.env

@@ -1,4 +1,5 @@
 CL_LB=https://l1-lb-mainnet.constellationnetwork.io
 CL_PUBLIC_HTTP_PORT=9010
 CL_P2P_HTTP_PORT=9011
-CL_CLI_HTTP_PORT=9012
+CL_CLI_HTTP_PORT=9012
+CL_SOURCE_HTTP_PORT=9010

package/projects/hypergraph/networks/testnet/gl0.env

@@ -2,4 +2,5 @@ CL_LB=https://l0-lb-testnet.constellationnetwork.io
 CL_PUBLIC_HTTP_PORT=9000
 CL_P2P_HTTP_PORT=9001
 CL_CLI_HTTP_PORT=9002
+CL_SOURCE_HTTP_PORT=9000
 

package/projects/hypergraph/networks/testnet/gl1.env

@@ -2,3 +2,4 @@ CL_LB=https://l1-lb-testnet.constellationnetwork.io
 CL_PUBLIC_HTTP_PORT=9010
 CL_P2P_HTTP_PORT=9011
 CL_CLI_HTTP_PORT=9012
+CL_SOURCE_HTTP_PORT=9010

package/projects/hypergraph/scripts/install-dependencies.sh

@@ -54,8 +54,8 @@ check_java() {
     Darwin)
       if command -v brew >/dev/null 2>&1; then
         echo "Installing Java 21 using Homebrew..."
-        brew untap adoptopenjdk/openjdk
-        brew install --cask temurin21
+#        if brew tap | grep -q '^adoptopenjdk/openjdk$'; then brew untap adoptopenjdk/openjdk; fi
+        brew install --cask temurin@21
       else
         echo "⚠️ Homebrew not found. Please install Java 21 manually."
         return 1