plugin-cluster-manager 1.1.11 → 1.1.15
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.
- package/client-v2.d.ts +2 -0
- package/client-v2.js +1 -0
- package/dist/client/index.js +1 -1
- package/dist/client-v2/914.c0bce51908fd81d7.js +10 -0
- package/dist/client-v2/index.js +10 -0
- package/dist/externalVersion.js +6 -5
- package/dist/locale/en-US.json +138 -124
- package/dist/locale/vi-VN.json +139 -125
- package/dist/locale/zh-CN.json +140 -125
- package/dist/server/actions/cluster-nodes.js +2 -6
- package/dist/server/actions/doctor.js +1 -5
- package/dist/server/actions/orchestrator.js +37 -0
- package/dist/server/actions/queue-mappings.js +107 -0
- package/dist/server/collections/worker-queue-mappings.js +106 -0
- package/dist/server/orchestrator/PackageManager.js +1 -8
- package/dist/server/orchestrator/docker-adapter.js +49 -27
- package/dist/server/plugin.js +10 -8
- package/dist/server/queue-scanner.js +141 -0
- package/dist/server/utils/node.js +30 -2
- package/package.json +46 -42
- package/src/client/AclCacheManager.tsx +292 -287
- package/src/client/CacheMonitor.tsx +2 -2
- package/src/client/ClusterManagerLayout.tsx +6 -0
- package/src/client/ClusterNodes.tsx +11 -4
- package/src/client/ContainerOrchestrator.tsx +186 -104
- package/src/client/Doctor.tsx +2 -2
- package/src/client/EventQueueMonitor.tsx +2 -2
- package/src/client/LockMonitor.tsx +2 -2
- package/src/client/NginxCacheManager.tsx +2 -2
- package/src/client/PackageInstaller.tsx +2 -2
- package/src/client/PluginOperations.tsx +2 -2
- package/src/client/QueueAssignment.tsx +355 -0
- package/src/client/RedisMonitor.tsx +3 -3
- package/src/client/TaskManager.tsx +194 -187
- package/src/client/WorkflowExecutions.tsx +243 -238
- package/src/client/utils.ts +1 -1
- package/src/client-v2/plugin.tsx +24 -0
- package/src/locale/en-US.json +138 -124
- package/src/locale/vi-VN.json +139 -125
- package/src/locale/zh-CN.json +140 -125
- package/src/server/actions/cluster-nodes.ts +4 -7
- package/src/server/actions/doctor.ts +11 -9
- package/src/server/actions/orchestrator.ts +54 -2
- package/src/server/actions/queue-mappings.ts +94 -0
- package/src/server/adapters/redis-node-registry.ts +126 -131
- package/src/server/collections/worker-queue-mappings.ts +85 -0
- package/src/server/orchestrator/PackageManager.ts +2 -10
- package/src/server/orchestrator/docker-adapter.ts +74 -37
- package/src/server/plugin.ts +15 -12
- package/src/server/queue-scanner.ts +154 -0
- package/src/server/utils/node.ts +48 -0
- package/dist/client/AclCacheManager.d.ts +0 -2
- package/dist/client/CacheMonitor.d.ts +0 -2
- package/dist/client/ClusterManagerLayout.d.ts +0 -2
- package/dist/client/ClusterNodes.d.ts +0 -2
- package/dist/client/ContainerOrchestrator.d.ts +0 -2
- package/dist/client/Doctor.d.ts +0 -2
- package/dist/client/EventQueueMonitor.d.ts +0 -2
- package/dist/client/LockMonitor.d.ts +0 -2
- package/dist/client/NginxCacheManager.d.ts +0 -2
- package/dist/client/PackageInstaller.d.ts +0 -2
- package/dist/client/PluginOperations.d.ts +0 -2
- package/dist/client/RedisMonitor.d.ts +0 -2
- package/dist/client/TaskManager.d.ts +0 -2
- package/dist/client/WorkflowExecutions.d.ts +0 -2
- package/dist/client/index.d.ts +0 -5
- package/dist/client/utils/clientSafeCache.d.ts +0 -3
- package/dist/client/utils/requestDedupInterceptor.d.ts +0 -2
- package/dist/client/utils.d.ts +0 -12
- package/dist/index.d.ts +0 -2
- package/dist/server/actions/acl-cache.d.ts +0 -53
- package/dist/server/actions/cache-monitor.d.ts +0 -33
- package/dist/server/actions/cluster-nodes.d.ts +0 -64
- package/dist/server/actions/doctor.d.ts +0 -82
- package/dist/server/actions/event-queue-monitor.d.ts +0 -13
- package/dist/server/actions/lock-monitor.d.ts +0 -19
- package/dist/server/actions/orchestrator.d.ts +0 -58
- package/dist/server/actions/package-manager.d.ts +0 -6
- package/dist/server/actions/plugin-operations.d.ts +0 -6
- package/dist/server/actions/redis-monitor.d.ts +0 -12
- package/dist/server/actions/tasks.d.ts +0 -7
- package/dist/server/actions/workflow-executions.d.ts +0 -7
- package/dist/server/adapters/redis-lock-adapter.d.ts +0 -15
- package/dist/server/adapters/redis-node-registry.d.ts +0 -12
- package/dist/server/adapters/redis-pubsub-adapter.d.ts +0 -16
- package/dist/server/collections/app.d.ts +0 -8
- package/dist/server/collections/cluster-manager-acl-cache.d.ts +0 -22
- package/dist/server/collections/cluster-manager-cache-mgr.d.ts +0 -22
- package/dist/server/collections/cluster-manager-cluster.d.ts +0 -22
- package/dist/server/collections/cluster-manager-doctor-runs.d.ts +0 -3
- package/dist/server/collections/cluster-manager-doctor.d.ts +0 -18
- package/dist/server/collections/cluster-manager-lock.d.ts +0 -22
- package/dist/server/collections/cluster-manager-plugins.d.ts +0 -18
- package/dist/server/collections/cluster-manager-queue.d.ts +0 -22
- package/dist/server/collections/cluster-manager-redis.d.ts +0 -22
- package/dist/server/collections/cluster-manager-workflow.d.ts +0 -22
- package/dist/server/collections/cluster-manager.d.ts +0 -22
- package/dist/server/collections/orchestrator-settings.d.ts +0 -59
- package/dist/server/collections/orchestrator-stacks.d.ts +0 -102
- package/dist/server/collections/worker-orchestrator.d.ts +0 -22
- package/dist/server/collections/worker-packages-configs.d.ts +0 -3
- package/dist/server/collections/worker-packages.d.ts +0 -22
- package/dist/server/hooks/cacheInvalidationHooks.d.ts +0 -1
- package/dist/server/middlewares/listMetaCacheMiddleware.d.ts +0 -2
- package/dist/server/orchestrator/PackageManager.d.ts +0 -39
- package/dist/server/orchestrator/docker-adapter.d.ts +0 -41
- package/dist/server/orchestrator/index.d.ts +0 -4
- package/dist/server/orchestrator/k8s-adapter.d.ts +0 -50
- package/dist/server/orchestrator/leader-election.d.ts +0 -48
- package/dist/server/orchestrator/types.d.ts +0 -84
- package/dist/server/plugin.d.ts +0 -26
- package/dist/server/utils/node.d.ts +0 -6
- package/dist/server/utils/redis.d.ts +0 -29
- package/dist/server/utils/versionManager.d.ts +0 -10
- package/dist/shared/packages.d.ts +0 -23
- /package/{dist/server/index.d.ts → src/client-v2/index.tsx} +0 -0
|
@@ -1,187 +1,194 @@
|
|
|
1
|
-
import React, { useEffect, useState, useCallback } from 'react';
|
|
2
|
-
import { Table, Tag, Button, Progress, Space, Popconfirm, message, Select, Dropdown } from 'antd';
|
|
3
|
-
import { ReloadOutlined, StopOutlined, RedoOutlined } from '@ant-design/icons';
|
|
4
|
-
import {
|
|
5
|
-
import dayjs from 'dayjs';
|
|
6
|
-
|
|
7
|
-
const STATUS_MAP: Record<number | string, { label: string; color: string }> = {
|
|
8
|
-
null: { label: 'Pending', color: 'default' },
|
|
9
|
-
0: { label: 'Running', color: 'processing' },
|
|
10
|
-
1: { label: 'Succeeded', color: 'success' },
|
|
11
|
-
'-1': { label: 'Failed', color: 'error' },
|
|
12
|
-
'-2': { label: 'Canceled', color: 'warning' },
|
|
13
|
-
};
|
|
14
|
-
|
|
15
|
-
export function TaskManager() {
|
|
16
|
-
const api =
|
|
17
|
-
const [data, setData] = useState<any[]>([]);
|
|
18
|
-
const [loading, setLoading] = useState(false);
|
|
19
|
-
const [pagination, setPagination] = useState({ current: 1, pageSize: 20, total: 0 });
|
|
20
|
-
const [statusFilter, setStatusFilter] = useState<string | undefined>(undefined);
|
|
21
|
-
|
|
22
|
-
const fetchData = useCallback(
|
|
23
|
-
async (page = pagination.current, pageSize = pagination.pageSize) => {
|
|
24
|
-
setLoading(true);
|
|
25
|
-
try {
|
|
26
|
-
const res = await api.request({
|
|
27
|
-
url: 'clusterManager:list',
|
|
28
|
-
params: { page, pageSize, statusFilter: statusFilter === undefined ? '' : statusFilter },
|
|
29
|
-
});
|
|
30
|
-
const body = res.data;
|
|
31
|
-
const rows = Array.isArray(body?.data?.data)
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
fetchData();
|
|
55
|
-
};
|
|
56
|
-
|
|
57
|
-
const
|
|
58
|
-
await api.request({ url: `clusterManager:
|
|
59
|
-
message.success('Task
|
|
60
|
-
fetchData();
|
|
61
|
-
};
|
|
62
|
-
|
|
63
|
-
const
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
const
|
|
80
|
-
{
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
{
|
|
87
|
-
title: '
|
|
88
|
-
dataIndex: '
|
|
89
|
-
width:
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
},
|
|
116
|
-
{
|
|
117
|
-
title: '
|
|
118
|
-
|
|
119
|
-
width:
|
|
120
|
-
render: (
|
|
121
|
-
},
|
|
122
|
-
{
|
|
123
|
-
title: '
|
|
124
|
-
|
|
125
|
-
width:
|
|
126
|
-
render: (
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
1
|
+
import React, { useEffect, useState, useCallback } from 'react';
|
|
2
|
+
import { Table, Tag, Button, Progress, Space, Popconfirm, message, Select, Dropdown } from 'antd';
|
|
3
|
+
import { ReloadOutlined, StopOutlined, RedoOutlined } from '@ant-design/icons';
|
|
4
|
+
import { useApp } from '@nocobase/client-v2';
|
|
5
|
+
import dayjs from 'dayjs';
|
|
6
|
+
|
|
7
|
+
const STATUS_MAP: Record<number | string, { label: string; color: string }> = {
|
|
8
|
+
null: { label: 'Pending', color: 'default' },
|
|
9
|
+
0: { label: 'Running', color: 'processing' },
|
|
10
|
+
1: { label: 'Succeeded', color: 'success' },
|
|
11
|
+
'-1': { label: 'Failed', color: 'error' },
|
|
12
|
+
'-2': { label: 'Canceled', color: 'warning' },
|
|
13
|
+
};
|
|
14
|
+
|
|
15
|
+
export function TaskManager() {
|
|
16
|
+
const api = useApp().apiClient;
|
|
17
|
+
const [data, setData] = useState<any[]>([]);
|
|
18
|
+
const [loading, setLoading] = useState(false);
|
|
19
|
+
const [pagination, setPagination] = useState({ current: 1, pageSize: 20, total: 0 });
|
|
20
|
+
const [statusFilter, setStatusFilter] = useState<string | undefined>(undefined);
|
|
21
|
+
|
|
22
|
+
const fetchData = useCallback(
|
|
23
|
+
async (page = pagination.current, pageSize = pagination.pageSize) => {
|
|
24
|
+
setLoading(true);
|
|
25
|
+
try {
|
|
26
|
+
const res = await api.request({
|
|
27
|
+
url: 'clusterManager:list',
|
|
28
|
+
params: { page, pageSize, statusFilter: statusFilter === undefined ? '' : statusFilter },
|
|
29
|
+
});
|
|
30
|
+
const body = res.data;
|
|
31
|
+
const rows = Array.isArray(body?.data?.data)
|
|
32
|
+
? body.data.data
|
|
33
|
+
: Array.isArray(body?.data)
|
|
34
|
+
? body.data
|
|
35
|
+
: Array.isArray(body)
|
|
36
|
+
? body
|
|
37
|
+
: [];
|
|
38
|
+
setData(rows);
|
|
39
|
+
setPagination((prev) => ({
|
|
40
|
+
...prev,
|
|
41
|
+
current: body.meta?.page || page,
|
|
42
|
+
total: body.meta?.count || 0,
|
|
43
|
+
}));
|
|
44
|
+
} catch (err) {
|
|
45
|
+
message.error('Failed to load tasks');
|
|
46
|
+
} finally {
|
|
47
|
+
setLoading(false);
|
|
48
|
+
}
|
|
49
|
+
},
|
|
50
|
+
[api, pagination.current, pagination.pageSize, statusFilter],
|
|
51
|
+
);
|
|
52
|
+
|
|
53
|
+
useEffect(() => {
|
|
54
|
+
fetchData();
|
|
55
|
+
}, [statusFilter]);
|
|
56
|
+
|
|
57
|
+
const handleCancel = async (id: string) => {
|
|
58
|
+
await api.request({ url: `clusterManager:cancel`, params: { filterByTk: id } });
|
|
59
|
+
message.success('Task canceled');
|
|
60
|
+
fetchData();
|
|
61
|
+
};
|
|
62
|
+
|
|
63
|
+
const handleRetry = async (id: string) => {
|
|
64
|
+
await api.request({ url: `clusterManager:retry`, params: { filterByTk: id } });
|
|
65
|
+
message.success('Task re-queued');
|
|
66
|
+
fetchData();
|
|
67
|
+
};
|
|
68
|
+
|
|
69
|
+
const handlePurge = async (days: number) => {
|
|
70
|
+
try {
|
|
71
|
+
const res = await api.request({ url: `clusterManager:purge`, method: 'post', data: { days } });
|
|
72
|
+
message.success(`Purged ${res?.data?.deletedCount || 0} tasks`);
|
|
73
|
+
fetchData();
|
|
74
|
+
} catch {
|
|
75
|
+
message.error('Failed to purge tasks');
|
|
76
|
+
}
|
|
77
|
+
};
|
|
78
|
+
|
|
79
|
+
const purgeItems = [
|
|
80
|
+
{ key: '7', label: 'Older than 7 days', onClick: () => handlePurge(7) },
|
|
81
|
+
{ key: '30', label: 'Older than 30 days', onClick: () => handlePurge(30) },
|
|
82
|
+
{ key: '0', label: 'All completed/failed', danger: true, onClick: () => handlePurge(0) },
|
|
83
|
+
];
|
|
84
|
+
|
|
85
|
+
const columns = [
|
|
86
|
+
{
|
|
87
|
+
title: 'Title',
|
|
88
|
+
dataIndex: 'title',
|
|
89
|
+
width: 200,
|
|
90
|
+
ellipsis: true,
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
title: 'Type',
|
|
94
|
+
dataIndex: 'type',
|
|
95
|
+
width: 120,
|
|
96
|
+
},
|
|
97
|
+
{
|
|
98
|
+
title: 'Status',
|
|
99
|
+
dataIndex: 'status',
|
|
100
|
+
width: 100,
|
|
101
|
+
render: (val: number | null) => {
|
|
102
|
+
const s = STATUS_MAP[String(val)] || { label: String(val), color: 'default' };
|
|
103
|
+
return <Tag color={s.color}>{s.label}</Tag>;
|
|
104
|
+
},
|
|
105
|
+
},
|
|
106
|
+
{
|
|
107
|
+
title: 'Progress',
|
|
108
|
+
key: 'progress',
|
|
109
|
+
width: 150,
|
|
110
|
+
render: (_: any, record: any) => {
|
|
111
|
+
if (record.status !== 0 || !record.progressTotal) return '-';
|
|
112
|
+
const pct = Math.round((record.progressCurrent / record.progressTotal) * 100);
|
|
113
|
+
return <Progress percent={pct} size="small" />;
|
|
114
|
+
},
|
|
115
|
+
},
|
|
116
|
+
{
|
|
117
|
+
title: 'User',
|
|
118
|
+
key: 'user',
|
|
119
|
+
width: 120,
|
|
120
|
+
render: (_: any, record: any) => record.createdBy?.nickname || '-',
|
|
121
|
+
},
|
|
122
|
+
{
|
|
123
|
+
title: 'Created',
|
|
124
|
+
dataIndex: 'createdAt',
|
|
125
|
+
width: 160,
|
|
126
|
+
render: (val: string) => (val ? dayjs(val).format('YYYY-MM-DD HH:mm:ss') : '-'),
|
|
127
|
+
},
|
|
128
|
+
{
|
|
129
|
+
title: 'Duration',
|
|
130
|
+
key: 'duration',
|
|
131
|
+
width: 100,
|
|
132
|
+
render: (_: any, record: any) => {
|
|
133
|
+
if (!record.startedAt) return '-';
|
|
134
|
+
const end = record.doneAt || new Date().toISOString();
|
|
135
|
+
const sec = dayjs(end).diff(dayjs(record.startedAt), 'second');
|
|
136
|
+
return sec < 60 ? `${sec}s` : `${Math.floor(sec / 60)}m ${sec % 60}s`;
|
|
137
|
+
},
|
|
138
|
+
},
|
|
139
|
+
{
|
|
140
|
+
title: 'Actions',
|
|
141
|
+
key: 'actions',
|
|
142
|
+
width: 120,
|
|
143
|
+
render: (_: any, record: any) => (
|
|
144
|
+
<Space>
|
|
145
|
+
{(record.status === 0 || record.status === null) && (
|
|
146
|
+
<Popconfirm title="Cancel this task?" onConfirm={() => handleCancel(record.id)}>
|
|
147
|
+
<Button type="link" size="small" icon={<StopOutlined />} danger />
|
|
148
|
+
</Popconfirm>
|
|
149
|
+
)}
|
|
150
|
+
{(record.status === -1 || record.status === -2) && (
|
|
151
|
+
<Popconfirm title="Retry this task?" onConfirm={() => handleRetry(record.id)}>
|
|
152
|
+
<Button type="link" size="small" icon={<RedoOutlined />} />
|
|
153
|
+
</Popconfirm>
|
|
154
|
+
)}
|
|
155
|
+
</Space>
|
|
156
|
+
),
|
|
157
|
+
},
|
|
158
|
+
];
|
|
159
|
+
|
|
160
|
+
return (
|
|
161
|
+
<div>
|
|
162
|
+
<Space style={{ marginBottom: 16 }}>
|
|
163
|
+
<Select
|
|
164
|
+
placeholder="Filter by status"
|
|
165
|
+
allowClear
|
|
166
|
+
style={{ width: 160 }}
|
|
167
|
+
value={statusFilter}
|
|
168
|
+
onChange={setStatusFilter}
|
|
169
|
+
options={Object.entries(STATUS_MAP).map(([k, v]) => ({ value: k, label: v.label }))}
|
|
170
|
+
/>
|
|
171
|
+
<Button icon={<ReloadOutlined />} onClick={() => fetchData()}>
|
|
172
|
+
Refresh
|
|
173
|
+
</Button>
|
|
174
|
+
<Dropdown menu={{ items: purgeItems }} trigger={['click']}>
|
|
175
|
+
<Button danger>Purge Tasks</Button>
|
|
176
|
+
</Dropdown>
|
|
177
|
+
</Space>
|
|
178
|
+
<Table
|
|
179
|
+
rowKey="id"
|
|
180
|
+
columns={columns}
|
|
181
|
+
dataSource={data}
|
|
182
|
+
loading={loading}
|
|
183
|
+
size="small"
|
|
184
|
+
scroll={{ x: 'max-content' }}
|
|
185
|
+
pagination={{
|
|
186
|
+
...pagination,
|
|
187
|
+
showSizeChanger: true,
|
|
188
|
+
showTotal: (total) => `Total ${total}`,
|
|
189
|
+
onChange: (page, pageSize) => fetchData(page, pageSize),
|
|
190
|
+
}}
|
|
191
|
+
/>
|
|
192
|
+
</div>
|
|
193
|
+
);
|
|
194
|
+
}
|