plugin-cluster-manager 1.1.0 → 1.1.6

package/dist/server/collections/cluster-manager-lock.js

@@ -0,0 +1,44 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var cluster_manager_lock_exports = {};
+__export(cluster_manager_lock_exports, {
+  default: () => cluster_manager_lock_default
+});
+module.exports = __toCommonJS(cluster_manager_lock_exports);
+var cluster_manager_lock_default = {
+  name: "clusterManagerLock",
+  dumpRules: "skip",
+  autoGenId: true,
+  createdAt: false,
+  updatedAt: false,
+  fields: [
+    {
+      name: "name",
+      type: "string"
+    }
+  ]
+};

package/dist/server/collections/cluster-manager-plugins.js

@@ -0,0 +1,44 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var cluster_manager_plugins_exports = {};
+__export(cluster_manager_plugins_exports, {
+  default: () => cluster_manager_plugins_default
+});
+module.exports = __toCommonJS(cluster_manager_plugins_exports);
+var cluster_manager_plugins_default = {
+  name: "clusterManagerPlugins",
+  dumpRules: "skip",
+  autoGenId: true,
+  createdAt: false,
+  updatedAt: false,
+  fields: [
+    {
+      name: "name",
+      type: "string"
+    }
+  ]
+};

package/dist/server/collections/cluster-manager-queue.js

@@ -0,0 +1,44 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var cluster_manager_queue_exports = {};
+__export(cluster_manager_queue_exports, {
+  default: () => cluster_manager_queue_default
+});
+module.exports = __toCommonJS(cluster_manager_queue_exports);
+var cluster_manager_queue_default = {
+  name: "clusterManagerQueue",
+  dumpRules: "skip",
+  autoGenId: true,
+  createdAt: false,
+  updatedAt: false,
+  fields: [
+    {
+      name: "name",
+      type: "string"
+    }
+  ]
+};

package/dist/server/collections/cluster-manager-redis.js

@@ -0,0 +1,44 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var cluster_manager_redis_exports = {};
+__export(cluster_manager_redis_exports, {
+  default: () => cluster_manager_redis_default
+});
+module.exports = __toCommonJS(cluster_manager_redis_exports);
+var cluster_manager_redis_default = {
+  name: "clusterManagerRedis",
+  dumpRules: "skip",
+  autoGenId: true,
+  createdAt: false,
+  updatedAt: false,
+  fields: [
+    {
+      name: "name",
+      type: "string"
+    }
+  ]
+};

package/dist/server/collections/cluster-manager-workflow.js

@@ -0,0 +1,44 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var cluster_manager_workflow_exports = {};
+__export(cluster_manager_workflow_exports, {
+  default: () => cluster_manager_workflow_default
+});
+module.exports = __toCommonJS(cluster_manager_workflow_exports);
+var cluster_manager_workflow_default = {
+  name: "clusterManagerWorkflow",
+  dumpRules: "skip",
+  autoGenId: true,
+  createdAt: false,
+  updatedAt: false,
+  fields: [
+    {
+      name: "name",
+      type: "string"
+    }
+  ]
+};

package/dist/server/collections/cluster-manager.js

@@ -0,0 +1,44 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var cluster_manager_exports = {};
+__export(cluster_manager_exports, {
+  default: () => cluster_manager_default
+});
+module.exports = __toCommonJS(cluster_manager_exports);
+var cluster_manager_default = {
+  name: "clusterManager",
+  dumpRules: "skip",
+  autoGenId: true,
+  createdAt: false,
+  updatedAt: false,
+  fields: [
+    {
+      name: "name",
+      type: "string"
+    }
+  ]
+};

package/dist/server/collections/worker-orchestrator.js

@@ -0,0 +1,44 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var worker_orchestrator_exports = {};
+__export(worker_orchestrator_exports, {
+  default: () => worker_orchestrator_default
+});
+module.exports = __toCommonJS(worker_orchestrator_exports);
+var worker_orchestrator_default = {
+  name: "workerOrchestrator",
+  dumpRules: "skip",
+  autoGenId: true,
+  createdAt: false,
+  updatedAt: false,
+  fields: [
+    {
+      name: "name",
+      type: "string"
+    }
+  ]
+};

package/dist/server/collections/worker-packages.js

@@ -0,0 +1,44 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var worker_packages_exports = {};
+__export(worker_packages_exports, {
+  default: () => worker_packages_default
+});
+module.exports = __toCommonJS(worker_packages_exports);
+var worker_packages_default = {
+  name: "workerPackages",
+  dumpRules: "skip",
+  autoGenId: true,
+  createdAt: false,
+  updatedAt: false,
+  fields: [
+    {
+      name: "name",
+      type: "string"
+    }
+  ]
+};

package/dist/server/orchestrator/docker-adapter.js

@@ -120,10 +120,10 @@ class DockerAdapter {
         const myContainerId = os.hostname();
         const myContainer = this.docker.getContainer(myContainerId);
         const myInfo = await myContainer.inspect();
-        if (!targetNetworkMode && targetNetworks.length === 0) {
-          if ((_a = myInfo == null ? void 0 : myInfo.NetworkSettings) == null ? void 0 : _a.Networks) {
-            targetNetworks = Object.keys(myInfo.NetworkSettings.Networks);
-          }
+        if ((_a = myInfo == null ? void 0 : myInfo.NetworkSettings) == null ? void 0 : _a.Networks) {
+          const inheritedNetworks = Object.keys(myInfo.NetworkSettings.Networks);
+          targetNetworks = Array.from(/* @__PURE__ */ new Set([...inheritedNetworks, ...targetNetworks]));
+          console.log("[DockerAdapter] Inherited networks:", targetNetworks);
         }
         if ((_b = myInfo == null ? void 0 : myInfo.Config) == null ? void 0 : _b.Env) {
           const envDict = {};
@@ -141,6 +141,11 @@ class DockerAdapter {
           targetVolumes = Array.from(/* @__PURE__ */ new Set([...inheritedBinds, ...targetVolumes]));
         }
       } catch (e) {
+        console.error("[DockerAdapter] Failed to inherit container config:", e.message);
+      }
+      const hasLoggerBase = targetEnvVars.some((e) => e.startsWith("LOGGER_BASE_PATH="));
+      if (!hasLoggerBase) {
+        targetEnvVars.push(`LOGGER_BASE_PATH=/app/nocobase/storage/logs/${stack.name}`);
       }
       for (let i = 0; i < diff; i++) {
         const suffix = `${Date.now()}-${Math.random().toString(36).substring(2, 6)}`;
@@ -172,8 +177,9 @@ class DockerAdapter {
         }
         createOpts.HostConfig.SecurityOpt = ["no-new-privileges:true"];
         const container = await this.docker.createContainer(createOpts);
-        if (!targetNetworkMode && targetNetworks.length > 1) {
-          for (let i2 = 1; i2 < targetNetworks.length; i2++) {
+        if (targetNetworks.length > 0) {
+          const startIndex = targetNetworkMode ? 0 : 1;
+          for (let i2 = startIndex; i2 < targetNetworks.length; i2++) {
             try {
               const net = this.docker.getNetwork(targetNetworks[i2]);
               await net.connect({ Container: container.id });
@@ -254,6 +260,13 @@ class DockerAdapter {
     });
     return this.demuxDockerLogs(logBuffer);
   }
+  async listNetworks() {
+    const networks = await this.docker.listNetworks();
+    return networks.map((n) => ({
+      id: n.Id,
+      name: n.Name
+    }));
+  }
   // ─── Private helpers ───
   mapState(state) {
     switch (state) {

package/dist/server/plugin.js

@@ -57,6 +57,7 @@ var import_redis_pubsub_adapter = require("./adapters/redis-pubsub-adapter");
 var import_redis_node_registry = require("./adapters/redis-node-registry");
 var import_redis_lock_adapter = require("./adapters/redis-lock-adapter");
 var import_orchestrator = require("./actions/orchestrator");
+var import_plugin_operations = require("./actions/plugin-operations");
 var import_docker_adapter = require("./orchestrator/docker-adapter");
 var import_k8s_adapter = require("./orchestrator/k8s-adapter");
 var import_leader_election = require("./orchestrator/leader-election");
@@ -67,7 +68,7 @@ class PluginClusterManagerServer extends import_server.Plugin {
   orchestrator = null;
   leaderElection = null;
   async beforeLoad() {
-    this.db.import({ directory: import_path.default.resolve(__dirname, "collections") });
+    await this.db.import({ directory: import_path.default.resolve(__dirname, "collections") });
   }
   async load() {
     this.nodeRegistry = new import_redis_node_registry.RedisNodeRegistry(this.app);
@@ -247,6 +248,10 @@ class PluginClusterManagerServer extends import_server.Plugin {
       name: "workerPackages",
       actions: import_package_manager.packageManagerActions
     });
+    this.app.resourcer.define({
+      name: "clusterManagerPlugins",
+      actions: import_plugin_operations.pluginOperationsActions
+    });
     const aclCacheMiddleware = (0, import_acl_cache.createAclCacheMiddleware)(this.app);
     this.app.acl.use(aclCacheMiddleware, {
       tag: "aclCache",
@@ -277,7 +282,8 @@ class PluginClusterManagerServer extends import_server.Plugin {
         "clusterManagerCacheMgr:*",
         "workerOrchestrator:*",
         "orchestratorStacks:*",
-        "workerPackages:*"
+        "workerPackages:*",
+        "clusterManagerPlugins:*"
       ]
     });
     await this.initOrchestrator();
@@ -354,7 +360,7 @@ class PluginClusterManagerServer extends import_server.Plugin {
             k8sNamespace: "nocobase"
           });
         } else {
-          this.app.logger.info("[Orchestrator] No adapter configured \u2014 configurable via Worker Monitor UI");
+          this.app.logger.info("[Orchestrator] No adapter configured \u2014 configurable via Cluster Manager UI");
         }
       }
     } catch (err) {

package/package.json

@@ -3,10 +3,13 @@
   "displayName": "Cluster Manager",
   "displayName.zh-CN": "Cluster Manager",
   "description": "Cluster node tracking, task orchestration, worker management, and package distribution",
-  "version": "1.1.0",
+  "version": "1.1.6",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
-  "keywords": ["Monitoring", "DevOps"],
+  "keywords": [
+    "Monitoring",
+    "DevOps"
+  ],
   "files": [
     "dist",
     "src",
@@ -31,7 +34,9 @@
     "uuid": "^9.0.1"
   },
   "nocobase": {
-    "supportedVersions": ["2.x"],
+    "supportedVersions": [
+      "2.x"
+    ],
     "editionLevel": 0
   }
-}
+}

package/src/client/ClusterManagerLayout.tsx

@@ -4,9 +4,10 @@ import { TaskManager } from './TaskManager';
 import { WorkflowExecutions } from './WorkflowExecutions';
 import { ClusterNodes } from './ClusterNodes';
 import { CacheMonitor } from './CacheMonitor';
-import { ContainerOrchestrator } from './ContainerOrchestrator';
-import { PackageInstaller } from './PackageInstaller';
-import { useT } from './utils';
+import { ContainerOrchestrator } from './ContainerOrchestrator';
+import { PackageInstaller } from './PackageInstaller';
+import { PluginOperations } from './PluginOperations';
+import { useT } from './utils';
 
 export function ClusterManagerLayout() {
   const t = useT();
@@ -40,13 +41,18 @@ export function ClusterManagerLayout() {
             label: t('Container Orchestrator'),
             children: <ContainerOrchestrator />,
           },
-          {
-            key: 'packages',
-            label: t('Packages'),
-            children: <PackageInstaller />,
-          },
-        ]}
-      />
+          {
+            key: 'packages',
+            label: t('Packages'),
+            children: <PackageInstaller />,
+          },
+          {
+            key: 'plugins',
+            label: t('Plugins'),
+            children: <PluginOperations />,
+          },
+        ]}
+      />
     </div>
   );
 }

package/src/client/ContainerOrchestrator.tsx

@@ -146,6 +146,7 @@ function stackToFormValues(stack?: StackInfo | null) {
       k8sEnvFrom: jsonText(DEFAULT_K8S_ENV_FROM, []),
       k8sVolumeMounts: jsonText(DEFAULT_K8S_VOLUME_MOUNTS, []),
       k8sVolumes: jsonText(DEFAULT_K8S_VOLUMES, []),
+      networkMode: '',
     };
   }
 
@@ -196,6 +197,19 @@ export function ContainerOrchestrator() {
   });
   const [settingsForm] = Form.useForm();
   const [stackForm] = Form.useForm();
+  const [dockerNetworks, setDockerNetworks] = useState<{id: string, name: string}[]>([]);
+
+  // Fetch Docker networks
+  const fetchNetworks = useCallback(async () => {
+    try {
+      const res = await api.request({ url: '/workerOrchestrator:networks' });
+      let networks = res.data?.data || res.data;
+      if (!Array.isArray(networks)) networks = [];
+      setDockerNetworks(networks);
+    } catch {
+      setDockerNetworks([]);
+    }
+  }, [api]);
 
   // Ping the orchestrator adapter
   const fetchPing = useCallback(async () => {
@@ -268,6 +282,7 @@ export function ContainerOrchestrator() {
   const openStackModal = (stack?: StackInfo) => {
     setStackModal({ visible: true, stack: stack || null });
     stackForm.setFieldsValue(stackToFormValues(stack));
+    fetchNetworks();
   };
 
   const closeStackModal = () => {
@@ -774,18 +789,38 @@ export function ContainerOrchestrator() {
             </Col>
           </Row>
 
-          {/* Row 4: Container name | Namespace */}
+          {/* Row 4: Container name | Namespace | Network Mode */}
           <Row gutter={12}>
-            <Col span={12}>
+            <Col span={8}>
               <Form.Item name="k8sContainerName" label={t('Container name')}>
                 <Input placeholder="worker" />
               </Form.Item>
             </Col>
-            <Col span={12}>
+            <Col span={8}>
               <Form.Item name="namespace" label={t('Namespace')}>
                 <Input placeholder="nocobase" />
               </Form.Item>
             </Col>
+            <Col span={8}>
+              <Form.Item noStyle shouldUpdate={(prev, curr) => prev.adapter !== curr.adapter}>
+                {() => {
+                  if (stackForm.getFieldValue('adapter') === 'docker') {
+                    return (
+                      <Form.Item name="networkMode" label={t('Docker Network')} extra={t('Main network. Workers also inherit app networks.')}>
+                        <Select allowClear placeholder={t('Default (bridge)')}>
+                          <Select.Option value="bridge">bridge</Select.Option>
+                          <Select.Option value="host">host</Select.Option>
+                          {(Array.isArray(dockerNetworks) ? dockerNetworks : []).map(n => (
+                            <Select.Option key={n.id} value={n.name}>{n.name}</Select.Option>
+                          ))}
+                        </Select>
+                      </Form.Item>
+                    );
+                  }
+                  return null;
+                }}
+              </Form.Item>
+            </Col>
           </Row>
 
           <Form.Item name="command" label={t('Command')}>