plugin-cluster-manager 1.0.13 → 1.1.5

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')}>

package/src/client/PackageInstaller.tsx

@@ -194,7 +194,7 @@ export const PackageInstaller: React.FC = () => {
         size="small"
         style={{ marginBottom: 16 }}
         extra={
-          <Button icon={<ReloadOutlined />} size="small" onClick={loadConfig} loading={loading}>
+          <Button icon={<ReloadOutlined />} size="small" onClick={() => loadConfig(false)} loading={loading}>
             {t('Refresh')}
           </Button>
         }

package/src/server/actions/orchestrator.ts

@@ -251,4 +251,24 @@ export const orchestratorActions = {
     }
     await next();
   },
+
+  /**
+   * GET /workerOrchestrator:networks
+   * List available networks (if supported by adapter)
+   */
+  async networks(ctx: Context, next: () => Promise<void>) {
+    const adapter = getAdapter(ctx);
+    if (!adapter.listNetworks) {
+      ctx.body = { data: [] };
+    } else {
+      try {
+        const networks = await adapter.listNetworks();
+        ctx.body = { data: networks };
+      } catch (err: any) {
+        ctx.app.logger.warn(`Failed to list networks: ${err.message}`);
+        ctx.body = { data: [] };
+      }
+    }
+    await next();
+  },
 };

package/src/server/collections/app.ts

@@ -0,0 +1,7 @@
+export default {
+  name: 'app',
+  autoCreate: false,
+  dumpRules: 'skip',
+  model: 'Collection',
+  fields: [],
+};

package/src/server/collections/cluster-manager-acl-cache.ts

@@ -0,0 +1,23 @@
+/**
+ * DUMMY COLLECTION
+ * This collection is created to prevent NocoBase workflow/ACL from throwing the error:
+ * '[Workflow pre-action]: collection "clusterManagerAclCache" not found'
+ * 
+ * Since 'clusterManagerAclCache' is registered as a resourcer in plugin.ts, NocoBase 
+ * implicitly looks for a collection with the same name.
+ * We set dumpRules: 'skip' and avoid timestamps to ensure this collection 
+ * is completely ignored during backups/migrations and doesn't pollute the actual DB.
+ */
+export default {
+  name: 'clusterManagerAclCache',
+  dumpRules: 'skip',
+  autoGenId: true,
+  createdAt: false,
+  updatedAt: false,
+  fields: [
+    {
+      name: 'name',
+      type: 'string',
+    },
+  ],
+};

package/src/server/collections/cluster-manager-cache-mgr.ts

@@ -0,0 +1,23 @@
+/**
+ * DUMMY COLLECTION
+ * This collection is created to prevent NocoBase workflow/ACL from throwing the error:
+ * '[Workflow pre-action]: collection "clusterManagerCacheMgr" not found'
+ * 
+ * Since 'clusterManagerCacheMgr' is registered as a resourcer in plugin.ts, NocoBase 
+ * implicitly looks for a collection with the same name.
+ * We set dumpRules: 'skip' and avoid timestamps to ensure this collection 
+ * is completely ignored during backups/migrations and doesn't pollute the actual DB.
+ */
+export default {
+  name: 'clusterManagerCacheMgr',
+  dumpRules: 'skip',
+  autoGenId: true,
+  createdAt: false,
+  updatedAt: false,
+  fields: [
+    {
+      name: 'name',
+      type: 'string',
+    },
+  ],
+};

package/src/server/collections/cluster-manager-cluster.ts

@@ -0,0 +1,23 @@
+/**
+ * DUMMY COLLECTION
+ * This collection is created to prevent NocoBase workflow/ACL from throwing the error:
+ * '[Workflow pre-action]: collection "clusterManagerCluster" not found'
+ * 
+ * Since 'clusterManagerCluster' is registered as a resourcer in plugin.ts, NocoBase 
+ * implicitly looks for a collection with the same name.
+ * We set dumpRules: 'skip' and avoid timestamps to ensure this collection 
+ * is completely ignored during backups/migrations and doesn't pollute the actual DB.
+ */
+export default {
+  name: 'clusterManagerCluster',
+  dumpRules: 'skip',
+  autoGenId: true,
+  createdAt: false,
+  updatedAt: false,
+  fields: [
+    {
+      name: 'name',
+      type: 'string',
+    },
+  ],
+};

package/src/server/collections/cluster-manager-lock.ts

@@ -0,0 +1,23 @@
+/**
+ * DUMMY COLLECTION
+ * This collection is created to prevent NocoBase workflow/ACL from throwing the error:
+ * '[Workflow pre-action]: collection "clusterManagerLock" not found'
+ * 
+ * Since 'clusterManagerLock' is registered as a resourcer in plugin.ts, NocoBase 
+ * implicitly looks for a collection with the same name.
+ * We set dumpRules: 'skip' and avoid timestamps to ensure this collection 
+ * is completely ignored during backups/migrations and doesn't pollute the actual DB.
+ */
+export default {
+  name: 'clusterManagerLock',
+  dumpRules: 'skip',
+  autoGenId: true,
+  createdAt: false,
+  updatedAt: false,
+  fields: [
+    {
+      name: 'name',
+      type: 'string',
+    },
+  ],
+};

package/src/server/collections/cluster-manager-queue.ts

@@ -0,0 +1,23 @@
+/**
+ * DUMMY COLLECTION
+ * This collection is created to prevent NocoBase workflow/ACL from throwing the error:
+ * '[Workflow pre-action]: collection "clusterManagerQueue" not found'
+ * 
+ * Since 'clusterManagerQueue' is registered as a resourcer in plugin.ts, NocoBase 
+ * implicitly looks for a collection with the same name.
+ * We set dumpRules: 'skip' and avoid timestamps to ensure this collection 
+ * is completely ignored during backups/migrations and doesn't pollute the actual DB.
+ */
+export default {
+  name: 'clusterManagerQueue',
+  dumpRules: 'skip',
+  autoGenId: true,
+  createdAt: false,
+  updatedAt: false,
+  fields: [
+    {
+      name: 'name',
+      type: 'string',
+    },
+  ],
+};

package/src/server/collections/cluster-manager-redis.ts

@@ -0,0 +1,23 @@
+/**
+ * DUMMY COLLECTION
+ * This collection is created to prevent NocoBase workflow/ACL from throwing the error:
+ * '[Workflow pre-action]: collection "clusterManagerRedis" not found'
+ * 
+ * Since 'clusterManagerRedis' is registered as a resourcer in plugin.ts, NocoBase 
+ * implicitly looks for a collection with the same name.
+ * We set dumpRules: 'skip' and avoid timestamps to ensure this collection 
+ * is completely ignored during backups/migrations and doesn't pollute the actual DB.
+ */
+export default {
+  name: 'clusterManagerRedis',
+  dumpRules: 'skip',
+  autoGenId: true,
+  createdAt: false,
+  updatedAt: false,
+  fields: [
+    {
+      name: 'name',
+      type: 'string',
+    },
+  ],
+};

package/src/server/collections/cluster-manager-workflow.ts

@@ -0,0 +1,23 @@
+/**
+ * DUMMY COLLECTION
+ * This collection is created to prevent NocoBase workflow/ACL from throwing the error:
+ * '[Workflow pre-action]: collection "clusterManagerWorkflow" not found'
+ * 
+ * Since 'clusterManagerWorkflow' is registered as a resourcer in plugin.ts, NocoBase 
+ * implicitly looks for a collection with the same name.
+ * We set dumpRules: 'skip' and avoid timestamps to ensure this collection 
+ * is completely ignored during backups/migrations and doesn't pollute the actual DB.
+ */
+export default {
+  name: 'clusterManagerWorkflow',
+  dumpRules: 'skip',
+  autoGenId: true,
+  createdAt: false,
+  updatedAt: false,
+  fields: [
+    {
+      name: 'name',
+      type: 'string',
+    },
+  ],
+};

package/src/server/collections/cluster-manager.ts

@@ -0,0 +1,23 @@
+/**
+ * DUMMY COLLECTION
+ * This collection is created to prevent NocoBase workflow/ACL from throwing the error:
+ * '[Workflow pre-action]: collection "clusterManager" not found'
+ * 
+ * Since 'clusterManager' is registered as a resourcer in plugin.ts, NocoBase 
+ * implicitly looks for a collection with the same name.
+ * We set dumpRules: 'skip' and avoid timestamps to ensure this collection 
+ * is completely ignored during backups/migrations and doesn't pollute the actual DB.
+ */
+export default {
+  name: 'clusterManager',
+  dumpRules: 'skip',
+  autoGenId: true,
+  createdAt: false,
+  updatedAt: false,
+  fields: [
+    {
+      name: 'name',
+      type: 'string',
+    },
+  ],
+};

package/src/server/collections/worker-orchestrator.ts

@@ -0,0 +1,23 @@
+/**
+ * DUMMY COLLECTION
+ * This collection is created to prevent NocoBase workflow/ACL from throwing the error:
+ * '[Workflow pre-action]: collection "workerOrchestrator" not found'
+ * 
+ * Since 'workerOrchestrator' is registered as a resourcer in plugin.ts, NocoBase 
+ * implicitly looks for a collection with the same name.
+ * We set dumpRules: 'skip' and avoid timestamps to ensure this collection 
+ * is completely ignored during backups/migrations and doesn't pollute the actual DB.
+ */
+export default {
+  name: 'workerOrchestrator',
+  dumpRules: 'skip',
+  autoGenId: true,
+  createdAt: false,
+  updatedAt: false,
+  fields: [
+    {
+      name: 'name',
+      type: 'string',
+    },
+  ],
+};

package/src/server/collections/worker-packages.ts

@@ -0,0 +1,23 @@
+/**
+ * DUMMY COLLECTION
+ * This collection is created to prevent NocoBase workflow/ACL from throwing the error:
+ * '[Workflow pre-action]: collection "workerPackages" not found'
+ * 
+ * Since 'workerPackages' is registered as a resourcer in plugin.ts, NocoBase 
+ * implicitly looks for a collection with the same name.
+ * We set dumpRules: 'skip' and avoid timestamps to ensure this collection 
+ * is completely ignored during backups/migrations and doesn't pollute the actual DB.
+ */
+export default {
+  name: 'workerPackages',
+  dumpRules: 'skip',
+  autoGenId: true,
+  createdAt: false,
+  updatedAt: false,
+  fields: [
+    {
+      name: 'name',
+      type: 'string',
+    },
+  ],
+};

package/src/server/orchestrator/PackageManager.ts

@@ -4,8 +4,8 @@ import { promises as fsp } from 'fs';
 import path from 'path';
 import Application from '@nocobase/server';
 
-/** Allow only safe package name characters: letters, digits, dash, underscore, dot, @, / */
-const SAFE_PKG_RE = /^[a-zA-Z0-9_\-\.@\/]+$/;
+/** Allow only safe package name characters: letters, digits, dash, underscore, dot, @, /, [, ] */
+const SAFE_PKG_RE = /^[a-zA-Z0-9_\-\.@\/\[\]]+$/;
 const INSTALL_CHANNEL = 'cluster-manager.install-packages';
 
 type TargetRole = 'app' | 'worker' | 'sandbox' | 'all';

package/src/server/orchestrator/docker-adapter.ts

@@ -116,11 +116,11 @@ export class DockerAdapter implements IOrchestratorAdapter {
         const myContainer = this.docker.getContainer(myContainerId);
         const myInfo = await myContainer.inspect();
         
-        // Inherit Networks if none specified
-        if (!targetNetworkMode && targetNetworks.length === 0) {
-          if (myInfo?.NetworkSettings?.Networks) {
-            targetNetworks = Object.keys(myInfo.NetworkSettings.Networks);
-          }
+        // Always inherit Networks so worker can communicate with main app
+        if (myInfo?.NetworkSettings?.Networks) {
+          const inheritedNetworks = Object.keys(myInfo.NetworkSettings.Networks);
+          targetNetworks = Array.from(new Set([...inheritedNetworks, ...targetNetworks]));
+          console.log('[DockerAdapter] Inherited networks:', targetNetworks);
         }
         
         // Inherit Environment Variables and merge with stack.envVars
@@ -134,16 +134,23 @@ export class DockerAdapter implements IOrchestratorAdapter {
            });
            // Overwrite with explicitly defined env vars
            Object.assign(envDict, stack.envVars || {});
+           
            targetEnvVars = Object.entries(envDict).map(([k, v]) => `${k}=${v}`);
         }
-
         // Inherit Volumes (Binds)
         if (myInfo?.HostConfig?.Binds) {
           const inheritedBinds = myInfo.HostConfig.Binds as string[];
           targetVolumes = Array.from(new Set([...inheritedBinds, ...targetVolumes]));
         }
-      } catch (e) {
+      } catch (e: any) {
         // Ignore error if not running in a container or cannot inspect
+        console.error('[DockerAdapter] Failed to inherit container config:', e.message);
+      }
+
+      // Automatically separate logs for workers to prevent log interleaving with the main app
+      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++) {
@@ -185,8 +192,9 @@ export class DockerAdapter implements IOrchestratorAdapter {
         const container = await this.docker.createContainer(createOpts);
         
         // Connect to additional networks before starting
-        if (!targetNetworkMode && targetNetworks.length > 1) {
-          for (let i = 1; i < targetNetworks.length; i++) {
+        if (targetNetworks.length > 0) {
+          const startIndex = targetNetworkMode ? 0 : 1;
+          for (let i = startIndex; i < targetNetworks.length; i++) {
             try {
               const net = this.docker.getNetwork(targetNetworks[i]);
               await net.connect({ Container: container.id });
@@ -284,6 +292,14 @@ export class DockerAdapter implements IOrchestratorAdapter {
     return this.demuxDockerLogs(logBuffer);
   }
 
+  async listNetworks(): Promise<{ id: string; name: string }[]> {
+    const networks = await this.docker.listNetworks();
+    return networks.map((n: any) => ({
+      id: n.Id,
+      name: n.Name,
+    }));
+  }
+
   // ─── Private helpers ───
 
   private mapState(state: string): ContainerInfo['status'] {

package/src/server/orchestrator/types.ts

@@ -92,4 +92,7 @@ export interface IOrchestratorAdapter {
 
   /** Get tail logs from a container */
   getLogs(containerId: string, tail?: number): Promise<string>;
+
+  /** List available networks (if supported by adapter) */
+  listNetworks?(): Promise<{ id: string; name: string }[]>;
 }

package/src/server/plugin.ts

@@ -28,7 +28,7 @@ export class PluginClusterManagerServer extends Plugin {
   public leaderElection: LeaderElection | null = null;
 
   async beforeLoad() {
-    this.db.import({ directory: path.resolve(__dirname, 'collections') });
+    await this.db.import({ directory: path.resolve(__dirname, 'collections') });
   }
 
   async load() {