@aiassesstech/mighty-mark 0.5.5 → 0.5.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiassesstech/mighty-mark",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "description": "System Health Sentinel for AI Assess Tech Fleet — autonomous monitoring, watchdog recovery, and fleet infrastructure oversight.",
   "type": "module",
   "main": "dist/index.js",

package/src/scripts/fleet-bus-diagnostics.sh

@@ -337,78 +337,99 @@ echo ""
 # 6. Fleet-Bus Transport Test (requires --live)
 ###############################################################################
 if $LIVE_TEST; then
-  echo "=== 6. Live Transport Test (fleet/ping) ==="
-
-  GW_PORT=$(python3 -c "
-import json
-with open('$OPENCLAW_HOME/openclaw.json') as f:
-    cfg = json.load(f)
-print(cfg.get('gateway', {}).get('port', 18789))
-" 2>/dev/null || echo "18789")
-
-  GW_TOKEN=$(python3 -c "
-import json
-with open('$OPENCLAW_HOME/openclaw.json') as f:
-    cfg = json.load(f)
-print(cfg.get('gateway', {}).get('auth', {}).get('token', ''))
-" 2>/dev/null || echo "")
+  echo "=== 6. Live Transport Test (fleet/ping via callGateway) ==="
+
+  LIVE_SCRIPT=$(mktemp /tmp/fleet-live-ping-XXXXXX.mjs)
+  cat > "$LIVE_SCRIPT" << 'NODESCRIPT'
+import { existsSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { randomBytes } from 'node:crypto';
+
+async function resolveCallGateway() {
+  const mainScript = process.argv[1] ?? '';
+  const home = process.env.HOME ?? '/root';
+  const packageNames = ['clawdbot', 'openclaw'];
+  const globalRoots = [
+    '/usr/lib/node_modules',
+    '/usr/local/lib/node_modules',
+    join(home, '.local', 'lib', 'node_modules'),
+  ];
+  const paths = globalRoots.flatMap(root =>
+    packageNames.map(pkg => join(root, pkg, 'dist', 'gateway', 'call.js'))
+  );
+  for (const p of paths) {
+    if (!existsSync(p)) continue;
+    try {
+      const mod = await import(`file://${p}`);
+      if (typeof mod.callGateway === 'function') return mod.callGateway;
+    } catch {}
+  }
+  return null;
+}
 
-  GW_URL="http://127.0.0.1:${GW_PORT}"
+try {
+  const callGateway = await resolveCallGateway();
+  if (!callGateway) {
+    console.log('RESULT:FAIL:callGateway not resolved — gateway/call.js not found');
+    process.exit(0);
+  }
+
+  const msg = {
+    id: `fm-diag-${Date.now()}-${randomBytes(4).toString('hex')}`,
+    from: 'mighty-mark',
+    to: 'jessie',
+    method: 'fleet/ping',
+    params: { source: 'diagnostics', timestamp: new Date().toISOString() },
+    timestamp: new Date().toISOString(),
+    nonce: randomBytes(8).toString('hex'),
+    version: '1.0',
+  };
+
+  const serialized = '%%FLEET%%' + JSON.stringify(msg);
+  const start = Date.now();
+
+  const result = await callGateway({
+    method: 'agent',
+    params: {
+      agentId: 'jessie',
+      message: serialized,
+      deliver: false,
+      timeoutSeconds: 15,
+      label: 'fleet:fleet/ping',
+    },
+    timeoutMs: 20000,
+    mode: 'backend',
+    clientName: 'fleet-bus-diagnostics',
+    clientDisplayName: 'Fleet Diagnostics',
+  });
+
+  const duration = Date.now() - start;
+  const hasResponse = result && (typeof result === 'object' || typeof result === 'string');
+
+  if (hasResponse) {
+    const summary = typeof result === 'string' ? result.slice(0, 100) : JSON.stringify(result).slice(0, 100);
+    console.log(`RESULT:PASS:fleet/ping delivered to jessie (${duration}ms) — response: ${summary}`);
+  } else {
+    console.log(`RESULT:PASS:fleet/ping accepted by gateway (${duration}ms) — fire-and-forget`);
+  }
+} catch (err) {
+  console.log(`RESULT:FAIL:${err.message?.slice(0, 150) || 'unknown error'}`);
+}
+process.exit(0);
+NODESCRIPT
 
-  if [ -z "$GW_TOKEN" ]; then
-    check "Gateway token" "WARN" "no auth token found — live test may fail"
-  fi
+  LIVE_RESULT=$(node "$LIVE_SCRIPT" 2>/dev/null || echo "RESULT:FAIL:node execution failed")
+  rm -f "$LIVE_SCRIPT"
 
-  echo "  Gateway: $GW_URL"
-  echo ""
+  LIVE_STATUS=$(echo "$LIVE_RESULT" | grep '^RESULT:' | head -1 | cut -d: -f2)
+  LIVE_DETAIL=$(echo "$LIVE_RESULT" | grep '^RESULT:' | head -1 | cut -d: -f3-)
 
-  PING_MSG=$(python3 -c "
-import json, time, secrets
-msg = {
-    'id': f'fm-diag-{int(time.time())}-{secrets.token_hex(4)}',
-    'from': 'mighty-mark',
-    'to': 'jessie',
-    'method': 'fleet/ping',
-    'params': {'source': 'diagnostics', 'timestamp': '$(date -u +%Y-%m-%dT%H:%M:%SZ)'},
-    'timestamp': '$(date -u +%Y-%m-%dT%H:%M:%SZ)',
-    'nonce': secrets.token_hex(8),
-    'version': '1.0'
-}
-print('%%FLEET%%' + json.dumps(msg))
-")
-
-  RESPONSE=$(curl -s -w "\n%{http_code}" \
-    -X POST "$GW_URL/api/v1/agent" \
-    -H "Content-Type: application/json" \
-    -H "Authorization: Bearer $GW_TOKEN" \
-    -d "$(python3 -c "
-import json
-print(json.dumps({
-    'agentId': 'jessie',
-    'message': '''$PING_MSG''',
-    'deliver': False,
-    'timeoutSeconds': 10,
-    'label': 'fleet:fleet/ping'
-}))
-")" 2>/dev/null || echo -e "\n000")
-
-  HTTP_CODE=$(echo "$RESPONSE" | tail -1)
-  BODY=$(echo "$RESPONSE" | head -n -1)
-
-  if [ "$HTTP_CODE" = "200" ]; then
-    check "Live ping (Mark → Jessie)" "PASS" "HTTP 200 — gateway accepted fleet/ping"
-    if $VERBOSE; then
-      echo "    Response: $(echo "$BODY" | head -c 200)"
-    fi
-  elif [ "$HTTP_CODE" = "401" ] || [ "$HTTP_CODE" = "403" ]; then
-    check "Live ping (Mark → Jessie)" "FAIL" "HTTP $HTTP_CODE — auth rejected (check gateway token)"
-  elif [ "$HTTP_CODE" = "000" ]; then
-    check "Live ping (Mark → Jessie)" "FAIL" "connection refused — is the gateway running?"
+  if [ "$LIVE_STATUS" = "PASS" ]; then
+    check "Live ping (Mark → Jessie)" "PASS" "$LIVE_DETAIL"
+  elif [ "$LIVE_STATUS" = "FAIL" ]; then
+    check "Live ping (Mark → Jessie)" "FAIL" "$LIVE_DETAIL"
   else
-    check "Live ping (Mark → Jessie)" "WARN" "HTTP $HTTP_CODE — unexpected response"
-    if $VERBOSE; then
-      echo "    Response: $(echo "$BODY" | head -c 200)"
-    fi
+    check "Live ping (Mark → Jessie)" "WARN" "unexpected result: $LIVE_RESULT"
   fi
   echo ""
 fi