plugin-cluster-manager 1.1.13 → 1.1.15

package/src/client/ContainerOrchestrator.tsx

@@ -36,7 +36,7 @@ import {
   PlusOutlined,
   EditOutlined,
 } from '@ant-design/icons';
-import { useAPIClient } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 import { useT } from './utils';
 
 const { Text, Title } = Typography;
@@ -212,7 +212,7 @@ function formValuesToStack(values: any) {
 
 export function ContainerOrchestrator() {
   const t = useT();
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const [loading, setLoading] = useState(false);
   const [stacks, setStacks] = useState<StackInfo[]>([]);
   const [containers, setContainers] = useState<Record<number, ContainerInfo[]>>({});

package/src/client/Doctor.tsx

@@ -23,7 +23,7 @@ import {
   StopOutlined,
   WarningOutlined,
 } from '@ant-design/icons';
-import { useAPIClient } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 import { useT } from './utils';
 
 const { Text } = Typography;
@@ -147,7 +147,7 @@ function countMissingPackages(packages?: { apt?: string[]; npm?: string[]; pytho
 
 export function Doctor() {
   const t = useT();
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const [loading, setLoading] = useState(false);
   const [starting, setStarting] = useState(false);
   const [stopping, setStopping] = useState(false);

package/src/client/EventQueueMonitor.tsx

@@ -8,12 +8,12 @@ import {
   ApiOutlined,
   DatabaseOutlined,
 } from '@ant-design/icons';
-import { useAPIClient } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 import { useT } from './utils';
 
 export function EventQueueMonitor() {
   const t = useT();
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const [loading, setLoading] = useState(false);
   const [stats, setStats] = useState<any>(null);
   const [autoRefresh, setAutoRefresh] = useState<number | null>(null);

package/src/client/LockMonitor.tsx

@@ -5,12 +5,12 @@ import {
   LockOutlined,
   UnlockOutlined,
 } from '@ant-design/icons';
-import { useAPIClient } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 import { useT } from './utils';
 
 export function LockMonitor() {
   const t = useT();
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const [loading, setLoading] = useState(false);
   const [info, setInfo] = useState<any>(null);
   const [locks, setLocks] = useState<any[]>([]);

package/src/client/NginxCacheManager.tsx

@@ -22,7 +22,7 @@ import {
   CloseCircleOutlined,
   SendOutlined,
 } from '@ant-design/icons';
-import { useAPIClient } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 import { useT } from './utils';
 
 const { TextArea } = Input;
@@ -30,7 +30,7 @@ const { Title, Text } = Typography;
 
 export function NginxCacheManager() {
   const t = useT();
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const [loading, setLoading] = useState(false);
   const [clearing, setClearing] = useState(false);
   const [status, setStatus] = useState<any>(null);

package/src/client/PackageInstaller.tsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useCallback, useRef } from 'react';
 import { Card, Form, Input, Button, Alert, Progress, Tag, Typography, Space, Divider, message, Select } from 'antd';
 import { CloudServerOutlined, SafetyOutlined, ReloadOutlined } from '@ant-design/icons';
-import { useAPIClient } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 import { useT } from './utils';
 import {
   DEFAULT_WORKER_PACKAGES,
@@ -37,7 +37,7 @@ function renderPackageTags(packages: string[], color?: string) {
 
 export const PackageInstaller: React.FC = () => {
   const t = useT();
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
   const [saving, setSaving] = useState(false);

package/src/client/PluginOperations.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { Alert, Button, Input, Popconfirm, Space, Spin, Table, Tag, Typography, message } from 'antd';
 import { DeleteOutlined, ExclamationCircleOutlined, ReloadOutlined, StopOutlined } from '@ant-design/icons';
-import { useAPIClient } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 import { useT } from './utils';
 
 interface PluginRecord {
@@ -22,7 +22,7 @@ function getErrorMessage(err: any, fallback: string) {
 
 export function PluginOperations() {
   const t = useT();
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const [loading, setLoading] = useState(false);
   const [actionKey, setActionKey] = useState<string | null>(null);
   const [search, setSearch] = useState('');

package/src/client/QueueAssignment.tsx

@@ -24,7 +24,7 @@ import {
   CloseCircleOutlined,
   MinusCircleOutlined,
 } from '@ant-design/icons';
-import { useAPIClient } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 import { useT } from './utils';
 
 const { Text } = Typography;
@@ -54,7 +54,7 @@ interface StackInfo {
 
 export function QueueAssignment() {
   const t = useT();
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const [loading, setLoading] = useState(false);
   const [scanning, setScanning] = useState(false);
   const [discovered, setDiscovered] = useState<DiscoveredQueue[]>([]);

package/src/client/RedisMonitor.tsx

@@ -7,7 +7,7 @@ import {
   ThunderboltOutlined,
   FieldTimeOutlined,
 } from '@ant-design/icons';
-import { useAPIClient } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 import { formatBytes, formatUptime } from './utils';
 
 const { Text } = Typography;
@@ -40,7 +40,7 @@ interface RedisInfo {
 
 
 export function RedisMonitor() {
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const [info, setInfo] = useState<RedisInfo | null>(null);
   const [channels, setChannels] = useState<Record<string, number>>({});
   const [totalChannels, setTotalChannels] = useState(0);
@@ -306,7 +306,7 @@ export function RedisMonitor() {
 }
 
 function SyncMessagesSection() {
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const [data, setData] = useState<any>(null);
 
   useEffect(() => {

package/src/client/TaskManager.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState, useCallback } from 'react';
 import { Table, Tag, Button, Progress, Space, Popconfirm, message, Select, Dropdown } from 'antd';
 import { ReloadOutlined, StopOutlined, RedoOutlined } from '@ant-design/icons';
-import { useAPIClient } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 import dayjs from 'dayjs';
 
 const STATUS_MAP: Record<number | string, { label: string; color: string }> = {
@@ -13,7 +13,7 @@ const STATUS_MAP: Record<number | string, { label: string; color: string }> = {
 };
 
 export function TaskManager() {
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const [data, setData] = useState<any[]>([]);
   const [loading, setLoading] = useState(false);
   const [pagination, setPagination] = useState({ current: 1, pageSize: 20, total: 0 });

package/src/client/WorkflowExecutions.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState, useCallback } from 'react';
 import { Table, Tag, Button, Space, Popconfirm, message, Select, Dropdown } from 'antd';
 import { ReloadOutlined, StopOutlined, UnorderedListOutlined } from '@ant-design/icons';
-import { useAPIClient } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 import dayjs from 'dayjs';
 
 const EXEC_STATUS: Record<string, { label: string; color: string }> = {
@@ -26,7 +26,7 @@ const JOB_STATUS: Record<string, { label: string; color: string }> = {
 };
 
 export function WorkflowExecutions() {
-  const api = useAPIClient();
+  const api = useApp().apiClient;
   const [data, setData] = useState<any[]>([]);
   const [loading, setLoading] = useState(false);
   const [pagination, setPagination] = useState({ current: 1, pageSize: 20, total: 0 });

package/src/client/utils.ts

@@ -1,5 +1,5 @@
 import { useCallback } from 'react';
-import { useApp } from '@nocobase/client';
+import { useApp } from '@nocobase/client-v2';
 
 const namespace = 'cluster-manager';
 

package/src/server/actions/cluster-nodes.ts

@@ -17,6 +17,7 @@ interface ClusterNodeRecord {
   hostname?: string;
   appVersion?: string;
   workerMode?: string;
+  appRole?: string;
   isSandbox?: boolean;
   status?: string;
   url?: string | null;
@@ -162,7 +163,7 @@ function getErrorMessage(error: unknown) {
 }
 
 function getNodeRole(node: ClusterNodeRecord): 'app' | 'worker' | 'sandbox' {
-  return getNodeRoleFrom({ workerMode: node.workerMode, isSandbox: node.isSandbox });
+  return getNodeRoleFrom({ workerMode: node.workerMode, appRole: node.appRole, isSandbox: node.isSandbox });
 }
 
 function getReferenceVersion(nodes: ClusterNodeRecord[]) {

package/src/server/actions/doctor.ts

@@ -83,6 +83,7 @@ interface DoctorNodeRecord {
   hostname?: string;
   appVersion?: string;
   workerMode?: string;
+  appRole?: string;
   isSandbox?: boolean;
   status?: string;
   lastHeartbeatAt?: number;
@@ -281,8 +282,12 @@ function countPackages(packages: NormalizedPackages) {
   return packages.apt.length + packages.npm.length + packages.python.length;
 }
 
-function getNodeRole(node: { workerMode?: string; isSandbox?: boolean }): 'app' | 'worker' | 'sandbox' {
-  return getNodeRoleFrom({ workerMode: node.workerMode, isSandbox: node.isSandbox });
+function getNodeRole(node: {
+  workerMode?: string;
+  appRole?: string;
+  isSandbox?: boolean;
+}): 'app' | 'worker' | 'sandbox' {
+  return getNodeRoleFrom({ workerMode: node.workerMode, appRole: node.appRole, isSandbox: node.isSandbox });
 }
 
 function getSafeEnv() {
@@ -535,11 +540,12 @@ export async function collectLocalDoctorSnapshot(
   options: DoctorSnapshotOptions = {},
 ): Promise<DoctorNodeSnapshot> {
   const workerMode = process.env.WORKER_MODE || 'main';
+  const appRole = process.env.APP_ROLE;
   const node = {
     hostname: os.hostname(),
     pid: process.pid,
     workerMode,
-    role: getNodeRole({ workerMode, isSandbox: process.env.SKILL_HUB_SANDBOX === 'true' }),
+    role: getNodeRole({ workerMode, appRole, isSandbox: process.env.SKILL_HUB_SANDBOX === 'true' }),
     appVersion: process.env.NOCOBASE_VERSION || process.version,
     nodeVersion: process.version,
     platform: process.platform,
@@ -769,7 +775,7 @@ async function collectNodeSnapshots(
             hostname: node.hostname || 'unknown',
             pid: Number(node.pid || 0),
             workerMode,
-            role: getNodeRole({ workerMode, isSandbox: node.isSandbox }),
+            role: getNodeRole({ workerMode, appRole: node.appRole, isSandbox: node.isSandbox }),
             appVersion: node.appVersion || '',
             nodeVersion: '',
             platform: '',

package/src/server/adapters/redis-node-registry.ts

@@ -1,131 +1,126 @@
-import os from 'os';
-import { scanKeys, getRedisClient } from '../utils/redis';
-import { getLocalNodeId } from '../utils/node';
-
-export class RedisNodeRegistry {
-  private timer: NodeJS.Timeout | null = null;
-  private readonly ttlSecs = 30; // 30 seconds TTL
-  private readonly intervalMs = 10000; // Heartbeat every 10 seconds
-  private readonly keyPrefix = 'cluster-manager:nodes:';
-
-  constructor(private app: any) {}
-
-  public start() {
-    if (this.timer) {
-      clearInterval(this.timer);
-    }
-    
-    // Initial heartbeat
-    this.heartbeat();
-
-    // Loop
-    this.timer = setInterval(() => {
-      this.heartbeat();
-    }, this.intervalMs);
-  }
-
-  public stop() {
-    if (this.timer) {
-      clearInterval(this.timer);
-      this.timer = null;
-    }
-  }
-
-  private async heartbeat() {
-    const redis = getRedisClient(this.app);
-    if (!redis) return;
-
-    // Unique identifier combining hostname, port, pid, mode, and appName to handle multiple workers on the same host
-    const port = process.env.APP_PORT || 'unknown';
-    const mode = process.env.WORKER_MODE || 'main';
-    const appName = process.env.APP_NAME || this.app.name || 'main';
-    const nodeId = getLocalNodeId(this.app);
-    const key = `${this.keyPrefix}${nodeId}`;
-
-    // Collect process-level metrics so any node can read another node's full info from Redis
-    const mem = process.memoryUsage();
-
-    const metadata = {
-      id: nodeId,
-      name: `${appName} (${os.hostname()})`,
-      hostname: os.hostname(),
-      appVersion: process.env.NOCOBASE_VERSION || process.version,
-      workerMode: mode,
-      isSandbox: process.env.SKILL_HUB_SANDBOX === 'true',
-      pid: process.pid,
-      url: process.env.APP_PUBLIC_URL || null,
-      available: true,
-      lastHeartbeatAt: Date.now(),
-      status: 'online', // Implicitly online since it just reported
-      // Full node details (replicated from the `current` action shape)
-      // so that any node can serve the "current" endpoint for the APP node
-      nodeDetails: {
-        node: {
-          hostname: os.hostname(),
-          pid: process.pid,
-          nodeVersion: process.version,
-          platform: process.platform,
-          arch: process.arch,
-          uptime: process.uptime(),
-          workerMode: mode,
-          appPort: port,
-          clusterMode: process.env.CLUSTER_MODE || '',
-        },
-        memory: {
-          rss: mem.rss,
-          heapUsed: mem.heapUsed,
-          heapTotal: mem.heapTotal,
-          external: mem.external,
-          arrayBuffers: mem.arrayBuffers || 0,
-        },
-        os: {
-          totalMemory: os.totalmem(),
-          freeMemory: os.freemem(),
-          cpuCount: os.cpus().length,
-          loadAvg: os.loadavg(),
-        },
-      },
-    };
-
-    try {
-      await redis.sendCommand([
-        'SET',
-        key,
-        JSON.stringify(metadata),
-        'EX',
-        this.ttlSecs.toString(),
-      ]);
-    } catch (err: any) {
-      this.app.logger.error(`[RedisNodeRegistry] Heartbeat failed: ${err.message}`);
-    }
-  }
-
-  public async getNodes(): Promise<any[]> {
-    const redis = getRedisClient(this.app);
-    if (!redis) return [];
-
-    try {
-      const rawKeys = await scanKeys(redis, `${this.keyPrefix}*`);
-      if (rawKeys.length === 0) return [];
-
-      const values = await redis.sendCommand(['MGET', ...rawKeys]);
-      
-      const nodes: any[] = [];
-      if (Array.isArray(values)) {
-        for (const val of values) {
-          if (val) {
-            try {
-              nodes.push(JSON.parse(val));
-            } catch (e) {
-              // bad JSON, ignore
-            }
-          }
-        }
-      }
-      return nodes;
-    } catch (err: any) {
-      this.app.logger.error(`[RedisNodeRegistry] Error fetching nodes: ${err.message}`);
-      return [];
-    }
-  }
-}
+import os from 'os';
+import { scanKeys, getRedisClient } from '../utils/redis';
+import { getLocalNodeId } from '../utils/node';
+
+export class RedisNodeRegistry {
+  private timer: NodeJS.Timeout | null = null;
+  private readonly ttlSecs = 30; // 30 seconds TTL
+  private readonly intervalMs = 10000; // Heartbeat every 10 seconds
+  private readonly keyPrefix = 'cluster-manager:nodes:';
+
+  constructor(private app: any) {}
+
+  public start() {
+    if (this.timer) {
+      clearInterval(this.timer);
+    }
+
+    // Initial heartbeat
+    this.heartbeat();
+
+    // Loop
+    this.timer = setInterval(() => {
+      this.heartbeat();
+    }, this.intervalMs);
+  }
+
+  public stop() {
+    if (this.timer) {
+      clearInterval(this.timer);
+      this.timer = null;
+    }
+  }
+
+  private async heartbeat() {
+    const redis = getRedisClient(this.app);
+    if (!redis) return;
+
+    // Unique identifier combining hostname, port, pid, mode, and appName to handle multiple workers on the same host
+    const port = process.env.APP_PORT || 'unknown';
+    const mode = process.env.WORKER_MODE || 'main';
+    const appName = process.env.APP_NAME || this.app.name || 'main';
+    const nodeId = getLocalNodeId(this.app);
+    const key = `${this.keyPrefix}${nodeId}`;
+
+    // Collect process-level metrics so any node can read another node's full info from Redis
+    const mem = process.memoryUsage();
+
+    const metadata = {
+      id: nodeId,
+      name: `${appName} (${os.hostname()})`,
+      hostname: os.hostname(),
+      appVersion: process.env.NOCOBASE_VERSION || process.version,
+      workerMode: mode,
+      appRole: process.env.APP_ROLE,
+      isSandbox: process.env.SKILL_HUB_SANDBOX === 'true',
+      pid: process.pid,
+      url: process.env.APP_PUBLIC_URL || null,
+      available: true,
+      lastHeartbeatAt: Date.now(),
+      status: 'online', // Implicitly online since it just reported
+      // Full node details (replicated from the `current` action shape)
+      // so that any node can serve the "current" endpoint for the APP node
+      nodeDetails: {
+        node: {
+          hostname: os.hostname(),
+          pid: process.pid,
+          nodeVersion: process.version,
+          platform: process.platform,
+          arch: process.arch,
+          uptime: process.uptime(),
+          workerMode: mode,
+          appPort: port,
+          clusterMode: process.env.CLUSTER_MODE || '',
+        },
+        memory: {
+          rss: mem.rss,
+          heapUsed: mem.heapUsed,
+          heapTotal: mem.heapTotal,
+          external: mem.external,
+          arrayBuffers: mem.arrayBuffers || 0,
+        },
+        os: {
+          totalMemory: os.totalmem(),
+          freeMemory: os.freemem(),
+          cpuCount: os.cpus().length,
+          loadAvg: os.loadavg(),
+        },
+      },
+    };
+
+    try {
+      await redis.sendCommand(['SET', key, JSON.stringify(metadata), 'EX', this.ttlSecs.toString()]);
+    } catch (err: any) {
+      this.app.logger.error(`[RedisNodeRegistry] Heartbeat failed: ${err.message}`);
+    }
+  }
+
+  public async getNodes(): Promise<any[]> {
+    const redis = getRedisClient(this.app);
+    if (!redis) return [];
+
+    try {
+      const rawKeys = await scanKeys(redis, `${this.keyPrefix}*`);
+      if (rawKeys.length === 0) return [];
+
+      const values = await redis.sendCommand(['MGET', ...rawKeys]);
+
+      const nodes: any[] = [];
+      if (Array.isArray(values)) {
+        for (const val of values) {
+          if (val) {
+            try {
+              nodes.push(JSON.parse(val));
+            } catch (e) {
+              // bad JSON, ignore
+            }
+          }
+        }
+      }
+      return nodes;
+    } catch (err: any) {
+      this.app.logger.error(`[RedisNodeRegistry] Error fetching nodes: ${err.message}`);
+      return [];
+    }
+  }
+}

package/src/server/plugin.ts

@@ -57,11 +57,12 @@ export class PluginClusterManagerServer extends Plugin {
     (this.app as any).on('afterStart', () => {
       this.nodeRegistry?.start();
 
-      // Automatically install packages on boot for worker nodes
+      // Automatically install packages on boot for worker / sandbox nodes
       const isWorker =
         isWorkerMode(process.env.WORKER_MODE) ||
         process.env.APP_ROLE === 'worker' ||
-        process.env.APP_ROLE === 'sandbox';
+        process.env.APP_ROLE === 'sandbox' ||
+        process.env.SKILL_HUB_SANDBOX === 'true';
       if (isWorker) {
         setTimeout(async () => {
           try {