npm - @clawlabz/clawnetwork - Versions diffs - 0.1.2 → 0.1.3 - Mend

@clawlabz/clawnetwork 0.1.2 → 0.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/index.ts +194 -12
package/package.json +1 -1

package/index.ts CHANGED Viewed

@@ -15,6 +15,7 @@ const DEFAULT_P2P_PORT = 9711
 const DEFAULT_NETWORK = 'mainnet'
 const DEFAULT_SYNC_MODE = 'light'
 const DEFAULT_HEALTH_CHECK_SECONDS = 30
+const MIN_NODE_VERSION = '0.4.19'
 const DEFAULT_UI_PORT = 19877
 const MAX_RESTART_ATTEMPTS = 3
@@ -227,6 +228,16 @@ function getBinaryVersion(binaryPath: string): string | null {
   } catch { return null }
 }
+function isVersionOlder(current: string, required: string): boolean {
+  const c = current.split('.').map(Number)
+  const r = required.split('.').map(Number)
+  for (let i = 0; i < 3; i++) {
+    if ((c[i] || 0) < (r[i] || 0)) return true
+    if ((c[i] || 0) > (r[i] || 0)) return false
+  }
+  return false
+}
 function detectPlatformTarget(): string {
   const platform = process.platform === 'darwin' ? 'macos' : process.platform === 'win32' ? 'windows' : 'linux'
   const arch = process.arch === 'arm64' ? 'aarch64' : 'x86_64'
@@ -908,6 +919,21 @@ function buildUiHtml(cfg: PluginConfig): string {
     .modal-input { width: 100%; box-sizing: border-box; background: var(--bg); border: 1px solid var(--border); border-radius: 6px; padding: 10px 12px; font-size: 14px; color: var(--text); font-family: var(--font-mono); outline: none; margin-top: 4px; }
     .modal-input:focus { border-color: var(--accent); }
     .modal-hint { font-size: 12px; color: var(--text-dim); margin-top: 6px; line-height: 1.5; }
+    .upgrade-banner { padding: 14px 16px; border-radius: var(--radius); margin-bottom: 16px; font-size: 13px; line-height: 1.6; display: flex; justify-content: space-between; align-items: center; gap: 12px; }
+    .upgrade-banner.recommended { background: rgba(255, 170, 0, 0.1); border: 1px solid rgba(255, 170, 0, 0.3); color: #ffaa00; }
+    .upgrade-banner.recommended .upgrade-text { flex: 1; }
+    .upgrade-banner.recommended .upgrade-actions { display: flex; gap: 8px; }
+    .upgrade-banner.required { background: rgba(255, 140, 0, 0.1); border: 1px solid rgba(255, 140, 0, 0.3); color: #ff8c3a; }
+    .upgrade-banner.required .upgrade-text { flex: 1; }
+    .upgrade-banner.required .upgrade-actions { display: flex; gap: 8px; }
+    .upgrade-banner.critical { background: rgba(239, 68, 68, 0.15); border: 1px solid rgba(239, 68, 68, 0.4); color: var(--danger); width: 100%; margin-left: calc(-20px - 1px); margin-right: calc(-20px - 1px); padding: 16px calc(20px + 1px); border-radius: 0; font-weight: 600; }
+    .upgrade-banner.critical .upgrade-text { flex: 1; }
+    .upgrade-banner.critical .upgrade-actions { display: flex; gap: 8px; }
+    .upgrade-btn { background: var(--accent); color: var(--bg); border: none; padding: 6px 12px; border-radius: 4px; font-size: 12px; cursor: pointer; font-weight: 600; transition: 0.2s; }
+    .upgrade-btn:hover { opacity: 0.85; }
+    .upgrade-dismiss { background: none; border: 1px solid currentColor; color: currentColor; padding: 4px 10px; border-radius: 4px; font-size: 12px; cursor: pointer; transition: 0.2s; }
+    .upgrade-dismiss:hover { opacity: 0.7; }
   </style>
 </head>
 <body>
@@ -923,6 +949,8 @@ function buildUiHtml(cfg: PluginConfig): string {
   <main class="container" style="padding-top:16px;padding-bottom:40px">
+    <div id="upgradeBanner" style="display:none" class="upgrade-banner"></div>
     <div class="panel">
       <div class="panel-title">Node</div>
       <div class="stats-grid" style="margin:0 0 4px">
@@ -944,8 +972,8 @@ function buildUiHtml(cfg: PluginConfig): string {
         </div>
       </div>
       <div class="node-controls">
-        <button class="btn primary" onclick="doAction('start')">&#x25B6; Start Node</button>
-        <button class="btn danger" onclick="doAction('stop')">&#x25A0; Stop Node</button>
+        <button class="btn primary" id="startBtn" onclick="doAction('start')">&#x25B6; Start Node</button>
+        <button class="btn danger" id="stopBtn" onclick="doAction('stop')">&#x25A0; Stop Node</button>
       </div>
     </div>
@@ -1267,10 +1295,11 @@ function buildUiHtml(cfg: PluginConfig): string {
     function renderStatus(s) {
       const statusEl = document.getElementById('statusValue');
       if (s.running) {
-        const dotClass = s.syncing ? 'syncing' : 'online';
-        const label = s.syncing ? 'Syncing' : 'Online';
+        let dotClass = 'online', label = 'Online';
+        if (s.syncing && s.peerless) { dotClass = 'syncing'; label = 'No Peers'; }
+        else if (s.syncing) { dotClass = 'syncing'; label = 'Syncing'; }
         statusEl.innerHTML = '<span class="status-dot ' + dotClass + '"></span>' + label;
-        statusEl.className = 'stat-value green';
+        statusEl.className = 'stat-value' + (s.syncing ? '' : ' green');
       } else {
         statusEl.innerHTML = '<span class="status-dot offline"></span>Offline';
         statusEl.className = 'stat-value danger';
@@ -1279,6 +1308,37 @@ function buildUiHtml(cfg: PluginConfig): string {
       document.getElementById('heightValue').textContent = s.blockHeight !== null ? s.blockHeight.toLocaleString() : '—';
       document.getElementById('peersValue').textContent = s.peerCount !== null ? s.peerCount : '—';
       document.getElementById('uptimeValue').textContent = s.uptimeFormatted || '—';
+      document.getElementById('startBtn').disabled = s.running;
+      document.getElementById('stopBtn').disabled = !s.running;
+      document.getElementById('startBtn').style.opacity = s.running ? '0.4' : '1';
+      document.getElementById('stopBtn').style.opacity = !s.running ? '0.4' : '1';
+      // Handle upgrade banner
+      const bannerEl = document.getElementById('upgradeBanner');
+      if (s.upgradeLevel && s.upgradeLevel !== 'up_to_date' && s.upgradeLevel !== 'unknown') {
+        bannerEl.style.display = '';
+        const recommended = s.upgradeLevel === 'recommended';
+        const required = s.upgradeLevel === 'required';
+        const critical = s.upgradeLevel === 'critical';
+        bannerEl.className = 'upgrade-banner ' + s.upgradeLevel;
+        let bannerHtml = '<div class="upgrade-text">';
+        if (critical) {
+          bannerHtml += '⚠ CRITICAL UPDATE REQUIRED — ' + (s.changelog || 'Security update required') + '. Node stopped for security.';
+        } else if (required) {
+          bannerHtml += 'Update recommended: v' + (s.latestVersion || '') + ' — ' + (s.changelog || 'Update available');
+        } else if (recommended) {
+          bannerHtml += 'Update available: v' + (s.latestVersion || '') + ' — ' + (s.changelog || 'New version available');
+        }
+        bannerHtml += '</div><div class="upgrade-actions">';
+        bannerHtml += '<button class="upgrade-btn" onclick="doAction(\'upgrade\')">Update Now</button>';
+        if (recommended) {
+          bannerHtml += '<button class="upgrade-dismiss" onclick="document.getElementById(\'upgradeBanner\').style.display=\'none\'">Dismiss</button>';
+        }
+        bannerHtml += '</div>';
+        bannerEl.innerHTML = bannerHtml;
+      } else {
+        bannerEl.style.display = 'none';
+      }
       // Wallet
       cachedAddress = s.walletAddress || '';
@@ -1313,11 +1373,21 @@ function buildUiHtml(cfg: PluginConfig): string {
       }
       // Node info
+      let versionStatusHtml = s.binaryVersion || '—';
+      if (s.upgradeLevel === 'up_to_date') {
+        versionStatusHtml = (s.binaryVersion || '—') + ' <span style="color:var(--green)">✓</span>';
+      } else if (s.upgradeLevel === 'recommended') {
+        versionStatusHtml = (s.binaryVersion || '—') + ' <span style="color:#ffaa00">→ ' + (s.latestVersion || '') + '</span>';
+      } else if (s.upgradeLevel === 'required') {
+        versionStatusHtml = (s.binaryVersion || '—') + ' <span style="color:#ff8c3a">⚠ Update recommended</span>';
+      } else if (s.upgradeLevel === 'critical') {
+        versionStatusHtml = (s.binaryVersion || '—') + ' <span style="color:var(--danger)">🔴 CRITICAL</span>';
+      }
       const rows = [
         ['Network', s.network],
         ['Sync Mode', s.syncMode],
         ['RPC URL', s.rpcUrl],
-        ['Binary Version', s.binaryVersion || '—'],
+        ['Binary Version', versionStatusHtml],
         ['Plugin Version', s.pluginVersion],
         ['PID', s.pid || '—'],
         ['Restart Count', s.restartCount],
@@ -1436,6 +1506,22 @@ async function handle(req, res) {
       let balance = '';
       let walletAddress = '';
       let agentName = '';
+      let upgradeLevel = 'unknown';
+      let latestVersion = '';
+      let releaseUrl = '';
+      let changelog = '';
+      let announcement = null;
+      // Fetch version info if available (Phase 1 endpoint)
+      try {
+        const v = await fetchJson('http://localhost:' + RPC_PORT + '/version');
+        if (v && v.upgrade_level) {
+          upgradeLevel = v.upgrade_level;
+          latestVersion = v.latest_version || '';
+          releaseUrl = v.release_url || '';
+          changelog = v.changelog || '';
+          announcement = v.announcement || null;
+        }
+      } catch {}
       try {
         const walletPath = path.join(os.homedir(), '.openclaw/workspace/clawnetwork/wallet.json');
         const w = JSON.parse(fs.readFileSync(walletPath, 'utf8'));
@@ -1446,7 +1532,7 @@ async function handle(req, res) {
         }
       } catch {}
       json(200, {
-        running: h.status === 'ok',
+        running: h.status === 'ok' || h.status === 'degraded',
         blockHeight: h.height,
         peerCount: h.peer_count,
         network: h.chain_id,
@@ -1457,11 +1543,12 @@ async function handle(req, res) {
         pluginVersion: '0.1.1',
         uptime: h.uptime_secs,
         uptimeFormatted: h.uptime_secs < 60 ? h.uptime_secs + 's' : h.uptime_secs < 3600 ? Math.floor(h.uptime_secs/60) + 'm' : Math.floor(h.uptime_secs/3600) + 'h ' + Math.floor((h.uptime_secs%3600)/60) + 'm',
-        restartCount: 0, dataDir: path.join(os.homedir(), '.clawnetwork'), balance, agentName, syncing: h.status === 'degraded',
+        restartCount: 0, dataDir: path.join(os.homedir(), '.clawnetwork'), balance, agentName, syncing: h.status === 'degraded', peerless: h.peer_count === 0, lastBlockAgeSecs: h.last_block_age_secs,
+        upgradeLevel, latestVersion, releaseUrl, changelog, announcement,
       });
     } catch {
         const walletAddr = (() => { try { return JSON.parse(fs.readFileSync(path.join(os.homedir(), '.openclaw/workspace/clawnetwork/wallet.json'), 'utf8')).address; } catch { return ''; } })();
-        json(200, { running: false, blockHeight: null, peerCount: null, walletAddress: walletAddr, network: 'mainnet', syncMode: 'light', rpcUrl: 'http://localhost:' + RPC_PORT, pluginVersion: '0.1.1', restartCount: 0, dataDir: path.join(os.homedir(), '.clawnetwork'), balance: '', agentName: '', syncing: false, uptimeFormatted: '—', pid: null });
+        json(200, { running: false, blockHeight: null, peerCount: null, walletAddress: walletAddr, network: 'mainnet', syncMode: 'light', rpcUrl: 'http://localhost:' + RPC_PORT, pluginVersion: '0.1.1', restartCount: 0, dataDir: path.join(os.homedir(), '.clawnetwork'), balance: '', agentName: '', syncing: false, uptimeFormatted: '—', pid: null, upgradeLevel: 'unknown', latestVersion: '', releaseUrl: '', changelog: '', announcement: null });
       }
     return;
   }
@@ -1583,8 +1670,21 @@ async function handle(req, res) {
     }
     if (a === 'start') {
       try {
-        // Check if already running
+        // Check if already running — try RPC health first (covers stale PID file)
         const pidFile = path.join(os.homedir(), '.openclaw/workspace/clawnetwork/node.pid');
+        try {
+          const h = await fetchJson('http://localhost:' + RPC_PORT + '/health');
+          if (h && (h.status === 'ok' || h.status === 'degraded')) {
+            try {
+              const { execSync } = require('child_process');
+              const pgrep = execSync("pgrep -f 'claw-node start'", { encoding: 'utf8', timeout: 3000 }).trim();
+              const livePid = parseInt(pgrep.split('\\n')[0], 10);
+              if (livePid > 0) fs.writeFileSync(pidFile, String(livePid));
+            } catch {}
+            json(200, { message: 'Node already running' }); return;
+          }
+        } catch {}
+        // Fallback: check PID file
         try {
           const pid = parseInt(fs.readFileSync(pidFile, 'utf8').trim(), 10);
           if (pid > 0) { try { process.kill(pid, 0); json(200, { message: 'Node already running', pid }); return; } catch {} }
@@ -1651,6 +1751,64 @@ async function handle(req, res) {
       json(200, { message: 'Use Stop then Start to restart the node' });
       return;
     }
+    if (a === 'upgrade') {
+      try {
+        // 1. Stop running node
+        const pidFile = path.join(os.homedir(), '.openclaw/workspace/clawnetwork/node.pid');
+        try {
+          const pid = parseInt(fs.readFileSync(pidFile, 'utf8').trim(), 10);
+          if (pid > 0) try { process.kill(pid, 'SIGTERM'); } catch {}
+        } catch {}
+        try { require('child_process').execFileSync('pkill', ['-f', 'claw-node start'], { timeout: 5000 }); } catch {}
+        // 2. Download latest binary
+        const binDir = path.join(os.homedir(), '.openclaw/bin');
+        const binName = process.platform === 'win32' ? 'claw-node.exe' : 'claw-node';
+        const target = process.platform === 'darwin'
+          ? (process.arch === 'arm64' ? 'macos-aarch64' : 'macos-x86_64')
+          : process.platform === 'win32' ? 'windows-x86_64' : 'linux-x86_64';
+        const ext = process.platform === 'win32' ? 'zip' : 'tar.gz';
+        // Fetch latest release tag
+        let version = 'latest';
+        try {
+          const res = await fetch('https://api.github.com/repos/clawlabz/claw-network/releases/latest');
+          if (res.ok) { const d = await res.json(); if (d.tag_name) version = d.tag_name; }
+        } catch {}
+        const baseUrl = version === 'latest'
+          ? 'https://github.com/clawlabz/claw-network/releases/latest/download'
+          : 'https://github.com/clawlabz/claw-network/releases/download/' + version;
+        const downloadUrl = baseUrl + '/claw-node-' + target + '.' + ext;
+        const tmpFile = path.join(os.tmpdir(), 'claw-node-upgrade-' + Date.now() + '.' + ext);
+        require('child_process').execFileSync('curl', ['-sSfL', '-o', tmpFile, downloadUrl], { timeout: 120000 });
+        // Ensure bin directory exists
+        if (!fs.existsSync(binDir)) { fs.mkdirSync(binDir, { recursive: true }); }
+        // Extract binary
+        if (ext === 'tar.gz') {
+          require('child_process').execFileSync('tar', ['xzf', tmpFile, '-C', binDir], { timeout: 30000 });
+        } else {
+          // Windows zip handling
+          const AdmZip = require('adm-zip');
+          const zip = new AdmZip(tmpFile);
+          zip.extractAllTo(binDir, true);
+        }
+        fs.chmodSync(path.join(binDir, binName), 0o755);
+        try { fs.unlinkSync(tmpFile); } catch {}
+        // 3. Get new version
+        let newVersion = 'unknown';
+        try {
+          newVersion = require('child_process').execFileSync(path.join(binDir, binName), ['--version'], { encoding: 'utf8', timeout: 5000 }).trim();
+        } catch {}
+        json(200, { message: 'Upgraded to ' + newVersion + '. Restart the node from Dashboard.', newVersion });
+      } catch (e) { json(500, { error: e.message }); }
+      return;
+    }
     json(400, { error: 'Unknown action: ' + a });
     return;
   }
@@ -1918,6 +2076,18 @@ export default function register(api: OpenClawApi) {
           out({ error: 'claw-node not found. Run: curl -sSf https://raw.githubusercontent.com/clawlabz/claw-network/main/claw-node/scripts/install.sh | bash' })
           return
         }
+      } else {
+        // Auto-upgrade if binary is older than required minimum
+        const currentVersion = getBinaryVersion(binary)
+        if (currentVersion && isVersionOlder(currentVersion, MIN_NODE_VERSION)) {
+          api.logger?.info?.(`[clawnetwork] claw-node ${currentVersion} is outdated (need >=${MIN_NODE_VERSION}), upgrading...`)
+          process.stdout.write(`Upgrading claw-node ${currentVersion} → ${MIN_NODE_VERSION}+...\n`)
+          try {
+            binary = await downloadBinary(api)
+          } catch (e: unknown) {
+            api.logger?.warn?.(`[clawnetwork] auto-upgrade failed: ${(e as Error).message}, continuing with ${currentVersion}`)
+          }
+        }
       }
       initNode(binary, cfg.network, api)
       startNodeProcess(binary, cfg, api)
@@ -2157,12 +2327,16 @@ export default function register(api: OpenClawApi) {
           // Check if already running (e.g. from a previous detached start)
           const state = isNodeRunning()
           if (state.running) {
-            api.logger?.info?.(`[clawnetwork] node already running (pid=${state.pid}), skipping auto-start`)
+            api.logger?.info?.(`[clawnetwork] node already running (pid=${state.pid}), skipping node start`)
             startHealthCheck(cfg, api)
+            // Still need to ensure heartbeat loop is running (may have been lost on gateway restart)
+            const wallet = ensureWallet(cfg.network, api)
+            await sleep(5_000)
+            await autoRegisterMiner(cfg, wallet, api)
             return
           }
-          // Step 1: Ensure binary
+          // Step 1: Ensure binary (auto-upgrade if outdated)
           let binary = findBinary()
           if (!binary) {
             if (cfg.autoDownload) {
@@ -2172,6 +2346,14 @@ export default function register(api: OpenClawApi) {
               api.logger?.error?.('[clawnetwork] claw-node not found and autoDownload is disabled')
               return
             }
+          } else if (cfg.autoDownload) {
+            const cv = getBinaryVersion(binary)
+            if (cv && isVersionOlder(cv, MIN_NODE_VERSION)) {
+              api.logger?.info?.(`[clawnetwork] claw-node ${cv} outdated (need >=${MIN_NODE_VERSION}), upgrading...`)
+              try { binary = await downloadBinary(api) } catch (e: unknown) {
+                api.logger?.warn?.(`[clawnetwork] auto-upgrade failed: ${(e as Error).message}`)
+              }
+            }
           }
           // Step 2: Init

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@clawlabz/clawnetwork",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Run a ClawNetwork blockchain node inside OpenClaw. Every agent is a blockchain node.",
   "type": "module",
   "license": "MIT",