@clawlabz/clawnetwork 0.1.17 → 0.1.19

package/index.ts

@@ -7,7 +7,7 @@ declare function setInterval(fn: () => void, ms: number): unknown
 declare function clearInterval(id: unknown): void
 declare function fetch(url: string, init?: Record<string, unknown>): Promise<{ status: number; ok: boolean; text: () => Promise<string>; json: () => Promise<unknown> }>
 
-const VERSION = '0.1.17'
+const VERSION = '0.1.19'
 const PLUGIN_ID = 'clawnetwork'
 const GITHUB_REPO = 'clawlabz/claw-network'
 const DEFAULT_RPC_PORT = 9710
@@ -1466,12 +1466,12 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 
-// OPENCLAW_BASE_DIR and PLUGIN_VERSION are injected by startUiServer()
-// If not injected (standalone), use fallbacks
-if (typeof OPENCLAW_BASE_DIR === 'undefined') { var OPENCLAW_BASE_DIR = path.join(os.homedir(), '.openclaw'); }
-if (typeof PLUGIN_VERSION === 'undefined') { var PLUGIN_VERSION = 'unknown'; }
-const OC_WORKSPACE = path.join(OPENCLAW_BASE_DIR, 'workspace', 'clawnetwork');
-const OC_BIN_DIR = path.join(OPENCLAW_BASE_DIR, 'bin');
+// OPENCLAW_BASE_DIR and PLUGIN_VERSION are injected as const by startUiServer() prepend.
+// Use global lookup to avoid const/var redeclaration conflict.
+const _BASE = (typeof OPENCLAW_BASE_DIR !== 'undefined') ? OPENCLAW_BASE_DIR : path.join(os.homedir(), '.openclaw');
+const _PVER = (typeof PLUGIN_VERSION !== 'undefined') ? PLUGIN_VERSION : 'unknown';
+const OC_WORKSPACE = path.join(_BASE, 'workspace', 'clawnetwork');
+const OC_BIN_DIR = path.join(_BASE, 'bin');
 const OC_WALLET_PATH = path.join(OC_WORKSPACE, 'wallet.json');
 const OC_PID_FILE = path.join(OC_WORKSPACE, 'node.pid');
 const OC_CONFIG_PATH = path.join(OC_WORKSPACE, 'config.json');
@@ -1481,7 +1481,7 @@ const OC_LOG_PATH_DEFAULT = path.join(OC_WORKSPACE, 'node.log');
 const PORT = parseInt(process.argv[2] || '19877', 10);
 const RPC_PORT = parseInt(process.argv[3] || '9710', 10);
 const LOG_PATH = process.argv[4] || OC_LOG_PATH_DEFAULT;
-const PORT_FILE = path.join(OPENCLAW_BASE_DIR, 'clawnetwork-ui-port');
+const PORT_FILE = path.join(_BASE, 'clawnetwork-ui-port');
 const MAX_RETRIES = 10;
 
 async function fetchJson(url) {
@@ -1583,7 +1583,7 @@ async function handle(req, res) {
         rpcUrl: 'http://localhost:' + RPC_PORT,
         walletAddress,
         binaryVersion: h.version,
-        pluginVersion: PLUGIN_VERSION,
+        pluginVersion: _PVER,
         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', peerless: h.peer_count === 0, lastBlockAgeSecs: h.last_block_age_secs,
@@ -1591,7 +1591,7 @@ async function handle(req, res) {
       });
     } catch {
         const walletAddr = (() => { try { return JSON.parse(fs.readFileSync(OC_WALLET_PATH, 'utf8')).address; } catch { return ''; } })();
-        json(200, { running: false, blockHeight: null, peerCount: null, walletAddress: walletAddr, network: 'mainnet', syncMode: 'light', rpcUrl: 'http://localhost:' + RPC_PORT, pluginVersion: PLUGIN_VERSION, restartCount: 0, dataDir: path.join(os.homedir(), '.clawnetwork'), balance: '', agentName: '', syncing: false, uptimeFormatted: '—', pid: null, upgradeLevel: 'unknown', latestVersion: '', releaseUrl: '', changelog: '', announcement: null });
+        json(200, { running: false, blockHeight: null, peerCount: null, walletAddress: walletAddr, network: 'mainnet', syncMode: 'light', rpcUrl: 'http://localhost:' + RPC_PORT, pluginVersion: _PVER, restartCount: 0, dataDir: path.join(os.homedir(), '.clawnetwork'), balance: '', agentName: '', syncing: false, uptimeFormatted: '—', pid: null, upgradeLevel: 'unknown', latestVersion: '', releaseUrl: '', changelog: '', announcement: null });
       }
     return;
   }
@@ -2422,40 +2422,52 @@ export default function register(api: OpenClawApi) {
           if (state.running) {
             api.logger?.info?.(`[clawnetwork] node already running (pid=${state.pid})`)
 
-            // Check if a newer binary is available on GitHub — if so, download + restart
-            if (cfg.autoDownload) {
+            // Check if local binary is newer than the running process — restart if so.
+            // Also check GitHub for even newer versions and download if available.
+            try {
+              const binary = findBinary()
+              const localBinaryVersion = binary ? getBinaryVersion(binary) : null
+
+              // Get the RUNNING process version from health endpoint (not the file version)
+              let runningProcessVersion: string | null = null
               try {
-                const binary = findBinary()
-                const runningVersion = binary ? getBinaryVersion(binary) : null
-                if (runningVersion) {
-                  // Fetch latest version from GitHub
-                  let latestVersion: string | null = null
-                  try {
-                    const res = await fetch(`https://api.github.com/repos/${GITHUB_REPO}/releases/latest`)
-                    if (res.ok) {
-                      const data = await res.json() as Record<string, unknown>
-                      if (typeof data.tag_name === 'string') latestVersion = data.tag_name.replace(/^v/, '')
-                    }
-                  } catch { /* network error, skip */ }
-
-                  if (latestVersion && isVersionOlder(runningVersion, latestVersion)) {
-                    api.logger?.info?.(`[clawnetwork] node ${runningVersion} → ${latestVersion} available, upgrading...`)
-                    stopNode(api)
-                    await sleep(3_000)
-                    try {
-                      const newBinary = await downloadBinary(api)
-                      initNode(newBinary, cfg.network, api)
-                      startNodeProcess(newBinary, cfg, api)
-                      api.logger?.info?.(`[clawnetwork] node upgraded to ${latestVersion} and restarted`)
-                    } catch (e: unknown) {
-                      api.logger?.warn?.(`[clawnetwork] auto-upgrade failed: ${(e as Error).message}, restarting old binary`)
-                      startNodeProcess(binary, cfg, api)
+                const health = await fetch(`http://localhost:${cfg.rpcPort}/health`)
+                if (health.ok) {
+                  const hd = await health.json() as Record<string, unknown>
+                  if (typeof hd.version === 'string') runningProcessVersion = hd.version.replace(/^v/, '')
+                }
+              } catch { /* health endpoint not ready */ }
+
+              // Step A: If GitHub has a newer binary than what's on disk, download it first
+              if (cfg.autoDownload && localBinaryVersion) {
+                try {
+                  const res = await fetch(`https://api.github.com/repos/${GITHUB_REPO}/releases/latest`)
+                  if (res.ok) {
+                    const data = await res.json() as Record<string, unknown>
+                    const latestVersion = typeof data.tag_name === 'string' ? data.tag_name.replace(/^v/, '') : null
+                    if (latestVersion && isVersionOlder(localBinaryVersion, latestVersion)) {
+                      api.logger?.info?.(`[clawnetwork] downloading newer binary: ${localBinaryVersion} → ${latestVersion}`)
+                      try { await downloadBinary(api) } catch (e: unknown) {
+                        api.logger?.warn?.(`[clawnetwork] download failed: ${(e as Error).message}`)
+                      }
                     }
                   }
-                }
-              } catch (e: unknown) {
-                api.logger?.warn?.(`[clawnetwork] upgrade check failed: ${(e as Error).message}`)
+                } catch { /* network error, skip */ }
+              }
+
+              // Step B: If the local binary is newer than the running process, restart with it
+              const finalBinary = findBinary()
+              const finalBinaryVersion = finalBinary ? getBinaryVersion(finalBinary) : null
+              if (finalBinaryVersion && runningProcessVersion && isVersionOlder(runningProcessVersion, finalBinaryVersion)) {
+                api.logger?.info?.(`[clawnetwork] running node ${runningProcessVersion} is outdated, restarting with ${finalBinaryVersion}...`)
+                stopNode(api)
+                await sleep(3_000)
+                initNode(finalBinary, cfg.network, api)
+                startNodeProcess(finalBinary, cfg, api)
+                api.logger?.info?.(`[clawnetwork] node upgraded to ${finalBinaryVersion}`)
               }
+            } catch (e: unknown) {
+              api.logger?.warn?.(`[clawnetwork] upgrade check failed: ${(e as Error).message}`)
             }
 
             startHealthCheck(cfg, api)

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "clawnetwork",
   "name": "ClawNetwork Node",
   "description": "Run a ClawNetwork blockchain node inside OpenClaw. Every agent is a node.",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/package.json

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