@@ -80,7 +100,15 @@
Runtime Information
@@ -166,6 +194,20 @@
Runtime Information
diff --git a/neuron/nodes/buyer.js b/neuron/nodes/buyer.js
index 6664bbde10..5d4099ee2d 100644
--- a/neuron/nodes/buyer.js
+++ b/neuron/nodes/buyer.js
@@ -317,11 +317,41 @@ module.exports = function (RED) {
(async () => {
let loadedDeviceInfo = null;
+ let isDeviceReinstatement = false;
- const contextDevice = context.get('deviceInfo');
- if (contextDevice) {
- loadedDeviceInfo = contextDevice;
- console.log(`Node ${node.id}: Device loaded from context.`);
+ // Check if a device was loaded from the dropdown (device reinstatement)
+ if (config.loadedDeviceFilename && config.loadedDeviceFilename.trim() !== '') {
+ try {
+ const deviceManager = require('../lib/deviceManager');
+ loadedDeviceInfo = deviceManager.loadDeviceFile(config.loadedDeviceFilename);
+ isDeviceReinstatement = true;
+ console.log(`Node ${node.id}: Device reinstatement - loaded device from: ${config.loadedDeviceFilename}`);
+
+ // Rename the device file to match the new node ID if needed
+ if (config.loadedDeviceFilename !== `${node.id}.json`) {
+ console.log(`Node ${node.id}: Renaming device file from ${config.loadedDeviceFilename} to ${node.id}.json`);
+ deviceManager.renameDeviceFile(config.loadedDeviceFilename, node.id);
+ }
+
+ // Clear the loadedDeviceFilename to forget about the old file
+ // From now on, this node will use its own file (node.id.json)
+ config.loadedDeviceFilename = '';
+ console.log(`Node ${node.id}: Device reinstatement complete - now using standard deployment flow`);
+ } catch (err) {
+ // This is expected behavior - the device file may have been renamed in a previous deployment
+ console.log(`Node ${node.id}: Device file ${config.loadedDeviceFilename}.json not found (likely renamed in previous deployment). Proceeding with new device creation.`);
+ // Clear the failed filename and proceed with new device creation
+ config.loadedDeviceFilename = '';
+ }
+ }
+
+ // Fallback to existing logic for context and disk loading
+ if (!loadedDeviceInfo) {
+ const contextDevice = context.get('deviceInfo');
+ if (contextDevice) {
+ loadedDeviceInfo = contextDevice;
+ console.log(`Node ${node.id}: Device loaded from context.`);
+ }
}
if (!loadedDeviceInfo && fs.existsSync(deviceFile)) {
@@ -335,6 +365,7 @@ module.exports = function (RED) {
}
if (loadedDeviceInfo) {
+ // Update configuration fields while preserving existing Hedera account data
loadedDeviceInfo.sellerEvmAddress = config.sellerEvmAddress;
loadedDeviceInfo.description = config.description;
loadedDeviceInfo.deviceName = config.deviceName;
@@ -342,10 +373,29 @@ module.exports = function (RED) {
loadedDeviceInfo.serialNumber = config.serialNumber;
loadedDeviceInfo.deviceType = config.deviceType;
loadedDeviceInfo.price = config.price;
+
+ // Set smart contract from configuration
+ const contracts = {
+ "jetvision": process.env.JETVISION_CONTRACT_EVM,
+ "chat": process.env.CHAT_CONTRACT_EVM,
+ "challenges": process.env.CHALLENGES_CONTRACT_EVM,
+ };
+ loadedDeviceInfo.smartContract = contracts[config.smartContract.toLowerCase()];
+
node.deviceInfo = loadedDeviceInfo;
+ node.deviceInfo.nodeType = "buyer";
+ node.deviceInfo.nodeId = node.id;
+
+ // Save the updated device info
fs.writeFileSync(deviceFile, JSON.stringify(node.deviceInfo, null, 2), 'utf-8');
context.set('deviceInfo', node.deviceInfo);
- node.status({ fill: "green", shape: "dot", text: "Device loaded." });
+
+ if (isDeviceReinstatement) {
+ node.status({ fill: "green", shape: "dot", text: "Device reinstated." });
+ console.log(`Node ${node.id}: Device reinstatement completed - using existing Hedera account and topics`);
+ } else {
+ node.status({ fill: "green", shape: "dot", text: "Device loaded." });
+ }
}
if (!node.deviceInfo) {
@@ -1255,7 +1305,7 @@ module.exports = function (RED) {
RED.httpAdmin.get('/buyer/last-seen/:topicId', async function (req, res) {
const topicId = req.params.topicId;
- console.log(`[DEBUG] Last seen requested for topic: ${topicId}`);
+ // console.log(`[DEBUG] Last seen requested for topic: ${topicId}`);
try {
if (!hederaService) {
@@ -1274,7 +1324,7 @@ module.exports = function (RED) {
// Handle timestamp format: '1753899626.468846000'
// This is Unix timestamp in seconds with nanosecond precision
const timestampString = lastMessage.timestamp;
- console.log(`[DEBUG] Raw timestamp: ${timestampString}`);
+ // console.log(`[DEBUG] Raw timestamp: ${timestampString}`);
// Parse the timestamp string as a float (seconds.nanoseconds)
const timestampSeconds = parseFloat(timestampString);
@@ -1289,7 +1339,7 @@ module.exports = function (RED) {
const millisecondsAgo = now - lastSeenTime;
const secondsAgo = Math.floor(millisecondsAgo / 1000);
- console.log(`[DEBUG] Timestamp: ${timestampString}, LastSeenTime: ${lastSeenTime}ms, Now: ${now}ms, SecondsAgo: ${secondsAgo}`);
+ // console.log(`[DEBUG] Timestamp: ${timestampString}, LastSeenTime: ${lastSeenTime}ms, Now: ${now}ms, SecondsAgo: ${secondsAgo}`);
res.json({
success: true,
@@ -1402,4 +1452,167 @@ module.exports = function (RED) {
});
}
});
+
+ // ===== NEW DEVICE MANAGEMENT ENDPOINTS =====
+
+ // Import deviceManager for new endpoints
+ const deviceManager = require('../lib/deviceManager');
+
+ // Endpoint for Buyer Device List - Get eligible buyer devices for reinstatement
+ RED.httpAdmin.get('/buyer/devices/eligible', function (req, res) {
+ try {
+ // Get currently active node IDs to exclude from the list
+ const activeNodeIds = deviceManager.getActiveNodeIds(RED);
+
+ // Get eligible buyer devices
+ const eligibleDevices = deviceManager.listEligibleDevices('buyer', activeNodeIds);
+
+ console.log(`[BUYER DEVICES] Found ${eligibleDevices.length} eligible buyer devices (excluding ${activeNodeIds.length} active nodes)`);
+
+ res.json({
+ success: true,
+ devices: eligibleDevices,
+ activeNodeIds: activeNodeIds,
+ count: eligibleDevices.length
+ });
+
+ } catch (error) {
+ console.error('[BUYER DEVICES] Error fetching eligible buyer devices:', error);
+ res.status(500).json({
+ success: false,
+ error: `Failed to fetch eligible buyer devices: ${error.message}`
+ });
+ }
+ });
+
+ // Endpoint for Device File Content - Get complete device data by filename
+ RED.httpAdmin.get('/device/:filename', function (req, res) {
+ const filename = req.params.filename;
+
+ try {
+ const deviceData = deviceManager.loadDeviceFile(filename);
+
+ console.log(`[DEVICE LOAD] Successfully loaded device file: ${filename}.json`);
+
+ res.json({
+ success: true,
+ filename: filename,
+ data: deviceData
+ });
+
+ } catch (error) {
+ console.error(`[DEVICE LOAD] Error loading device file ${filename}:`, error);
+ res.status(500).json({
+ success: false,
+ error: `Failed to load device file: ${error.message}`
+ });
+ }
+ });
+
+ // Endpoint to get balance by account ID (efficient direct access)
+ RED.httpAdmin.get('/device/balance/by-account/:accountId', async function (req, res) {
+ const accountId = req.params.accountId;
+
+ try {
+ if (!hederaService) {
+ return res.status(500).json({
+ success: false,
+ error: 'Hedera service not initialized'
+ });
+ }
+
+ console.log(`[DEVICE BALANCE] Fetching balance for account ID: ${accountId}`);
+
+ // Get balance in tinybars directly using account ID
+ const balanceTinybars = await hederaService.getAccountBalanceTinybars(accountId);
+
+ // Convert to HBAR (1 HBAR = 100,000,000 tinybars)
+ const balanceHbar = (balanceTinybars / 100000000).toFixed(8);
+
+ console.log(`[DEVICE BALANCE] Balance for ${accountId}: ${balanceHbar} HBAR`);
+
+ res.json({
+ success: true,
+ balance: balanceHbar,
+ balanceTinybars: balanceTinybars.toString(),
+ accountId: accountId,
+ unit: 'HBAR'
+ });
+
+ } catch (error) {
+ console.error(`[DEVICE BALANCE] Error fetching balance for ${accountId}:`, error);
+ res.status(500).json({
+ success: false,
+ error: `Failed to fetch balance: ${error.message}`
+ });
+ }
+ });
+
+ // Endpoint to get balance by EVM address (fallback method)
+ RED.httpAdmin.get('/device/balance/:evmAddress', async function (req, res) {
+ const evmAddress = req.params.evmAddress;
+
+ try {
+ if (!hederaService) {
+ return res.status(500).json({
+ success: false,
+ error: 'Hedera service not initialized'
+ });
+ }
+
+ console.log(`[DEVICE BALANCE] Fetching balance for EVM address: ${evmAddress}`);
+
+ // Find the device file that contains this EVM address
+ const deviceManager = require('../lib/deviceManager');
+ const allFiles = deviceManager.listAllDeviceFiles();
+ let accountId = null;
+ let deviceData = null;
+
+ // Search through device files to find the one with matching EVM address
+ for (const filename of allFiles) {
+ try {
+ const data = deviceManager.loadDeviceFile(filename);
+ if (data.evmAddress && data.evmAddress.toLowerCase() === evmAddress.toLowerCase()) {
+ accountId = data.accountId;
+ deviceData = data;
+ break;
+ }
+ } catch (error) {
+ console.error(`[DEVICE BALANCE] Error loading device file ${filename}:`, error);
+ continue;
+ }
+ }
+
+ if (!accountId) {
+ return res.status(404).json({
+ success: false,
+ error: 'Device not found for EVM address'
+ });
+ }
+
+ // Get balance in tinybars
+ const balanceTinybars = await hederaService.getAccountBalanceTinybars(accountId);
+
+ // Convert to HBAR (1 HBAR = 100,000,000 tinybars)
+ const balanceHbar = (balanceTinybars / 100000000).toFixed(8);
+
+ console.log(`[DEVICE BALANCE] Balance for ${evmAddress} (${accountId}): ${balanceHbar} HBAR`);
+
+ res.json({
+ success: true,
+ balance: balanceHbar,
+ balanceTinybars: balanceTinybars.toString(),
+ accountId: accountId,
+ evmAddress: evmAddress,
+ unit: 'HBAR'
+ });
+
+ } catch (error) {
+ console.error(`[DEVICE BALANCE] Error fetching balance for ${evmAddress}:`, error);
+ res.status(500).json({
+ success: false,
+ error: `Failed to fetch balance: ${error.message}`
+ });
+ }
+ });
};
\ No newline at end of file
diff --git a/neuron/nodes/process-manager.js b/neuron/nodes/process-manager.js
index 10791da4d1..66e75cdc53 100644
--- a/neuron/nodes/process-manager.js
+++ b/neuron/nodes/process-manager.js
@@ -5,6 +5,23 @@ const WebSocket = require('ws');
const ProcessRegistry = require('./process-registry');
const PortManager = require('./port-manager');
+/**
+ * Helper function to ensure EVM address has '0x' prefix
+ */
+function formatEvmAddress(evmAddress) {
+ if (!evmAddress || evmAddress.trim() === '') {
+ return evmAddress;
+ }
+
+ const trimmedAddress = evmAddress.trim();
+ if (trimmedAddress.startsWith('0x')) {
+ // Remove any spaces after '0x' and return the clean address
+ return '0x' + trimmedAddress.substring(2).trim();
+ } else {
+ return '0x' + trimmedAddress;
+ }
+}
+
/**
* ProcessManager - Orchestrates Go process lifecycle management
* Handles process discovery, spawning, and persistence across redeploys
@@ -152,7 +169,8 @@ class ProcessManager {
// Wait for WebSocket to be ready
const isReady = await this.testWebSocketConnection(port, 60, nodeType); // Wait up to 60 seconds
if (isReady) {
- node.status({ fill: "green", shape: "dot", text: `Active on ${port}. EVM: ${deviceInfo.evmAddress}` });
+ const formattedEvmAddress = formatEvmAddress(deviceInfo.evmAddress);
+ node.status({ fill: "green", shape: "dot", text: `Active on ${port}. EVM: ${formattedEvmAddress}` });
console.log(`Go process for node ${node.id} is ready on port ${port}`);
} else {
throw new Error(`Go process for node ${node.id} failed to become ready on port ${port}`);
@@ -340,8 +358,8 @@ class ProcessManager {
const args = [
`--port=${port}`,
- // '--use-local-address',
- '--enable-upnp',
+ '--use-local-address',
+ // '--enable-upnp',
'--mode=peer',
`--buyer-or-seller=${nodeType}`,
nodeType === 'seller' ? '--list-of-buyers-source=env' : '--list-of-sellers-source=env',
@@ -710,43 +728,47 @@ class ProcessManager {
async testWebSocketConnection(port, maxRetries = 10, nodeType = 'buyer') {
const retryDelayMs = 1000;
const endpoint = nodeType === 'seller' ? '/seller/p2p' : '/buyer/p2p';
-
+
for (let attempt = 1; attempt <= maxRetries; attempt++) {
try {
+ console.log(`Attempting WebSocket connection to ws://localhost:${port}${endpoint} (attempt ${attempt}/${maxRetries})`);
const ws = new WebSocket(`ws://localhost:${port}${endpoint}`);
-
+
const result = await new Promise((resolve) => {
const timeout = setTimeout(() => {
+ console.log(`WebSocket connection timed out on port ${port}`);
ws.close();
resolve(false);
}, 2000);
-
+
ws.on('open', () => {
+ console.log(`WebSocket connection opened successfully on port ${port}`);
clearTimeout(timeout);
ws.close();
resolve(true);
});
-
- ws.on('error', () => {
+
+ ws.on('error', (error) => {
+ console.error(`WebSocket error on port ${port}:`, error.message);
clearTimeout(timeout);
resolve(false);
});
});
-
+
if (result) {
console.log(`WebSocket connection successful on port ${port} (attempt ${attempt})`);
return true;
}
} catch (error) {
- // Connection failed, continue to retry
+ console.error(`WebSocket connection attempt failed on port ${port} (attempt ${attempt}):`, error.message);
}
-
+
if (attempt < maxRetries) {
- console.log(`WebSocket connection failed on port ${port}, retrying in ${retryDelayMs}ms (attempt ${attempt}/${maxRetries})`);
+ console.log(`Retrying WebSocket connection to port ${port} in ${retryDelayMs}ms (attempt ${attempt + 1}/${maxRetries})`);
await new Promise(resolve => setTimeout(resolve, retryDelayMs));
}
}
-
+
console.log(`WebSocket connection failed on port ${port} after ${maxRetries} attempts`);
return false;
}
@@ -1111,4 +1133,4 @@ module.exports.killPid = async function(pid, signal = 'SIGTERM') {
module.exports.listProcesses = function() {
const manager = new ProcessManager();
return manager.listAllProcesses();
-};
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/neuron/nodes/seller.html b/neuron/nodes/seller.html
index f34224426f..346ece39f5 100644
--- a/neuron/nodes/seller.html
+++ b/neuron/nodes/seller.html
@@ -1,17 +1,11 @@