plugin-cluster-manager 1.0.12 → 1.1.0

package/dist/externalVersion.js

@@ -1,11 +1,20 @@
+/**
+ * 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.
+ */
+
 module.exports = {
   "react": "18.2.0",
   "antd": "5.24.2",
   "@ant-design/icons": "5.6.1",
-  "@nocobase/client": "2.0.46",
+  "@nocobase/client": "2.0.47",
   "dayjs": "1.11.13",
-  "@nocobase/server": "2.0.46",
-  "@nocobase/actions": "2.0.46",
-  "@nocobase/lock-manager": "2.0.46",
-  "@nocobase/database": "2.0.46"
+  "@nocobase/server": "2.0.47",
+  "@nocobase/actions": "2.0.47",
+  "@nocobase/lock-manager": "2.0.47",
+  "@nocobase/database": "2.0.47"
 };

package/dist/index.js

@@ -1,3 +1,12 @@
+/**
+ * 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 __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/dist/server/actions/acl-cache.js

@@ -1,3 +1,12 @@
+/**
+ * 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;

package/dist/server/actions/cache-monitor.js

@@ -1,3 +1,12 @@
+/**
+ * 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;

package/dist/server/actions/cluster-nodes.js

@@ -1,3 +1,12 @@
+/**
+ * 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 __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/dist/server/actions/event-queue-monitor.js

@@ -1,3 +1,12 @@
+/**
+ * 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;

package/dist/server/actions/lock-monitor.js

@@ -1,3 +1,12 @@
+/**
+ * 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;

package/dist/server/actions/orchestrator.js

@@ -1,3 +1,12 @@
+/**
+ * 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;

package/dist/server/actions/package-manager.js

@@ -1,3 +1,12 @@
+/**
+ * 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;

package/dist/server/actions/redis-monitor.js

@@ -1,3 +1,12 @@
+/**
+ * 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;

package/dist/server/actions/tasks.js

@@ -1,3 +1,12 @@
+/**
+ * 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;

package/dist/server/actions/workflow-executions.js

@@ -1,3 +1,12 @@
+/**
+ * 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;

package/dist/server/adapters/redis-lock-adapter.js

@@ -1,3 +1,12 @@
+/**
+ * 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;

package/dist/server/adapters/redis-node-registry.js

@@ -1,3 +1,12 @@
+/**
+ * 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 __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/dist/server/adapters/redis-pubsub-adapter.js

@@ -1,3 +1,12 @@
+/**
+ * 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;

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

@@ -1,3 +1,12 @@
+/**
+ * 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;

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

@@ -1,3 +1,12 @@
+/**
+ * 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;

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

@@ -1,3 +1,12 @@
+/**
+ * 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;

package/dist/server/index.js

@@ -1,3 +1,12 @@
+/**
+ * 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 __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/dist/server/orchestrator/PackageManager.js

@@ -1,3 +1,12 @@
+/**
+ * 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 __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -34,7 +43,7 @@ var import_child_process = require("child_process");
 var import_redis = require("../utils/redis");
 var import_fs = require("fs");
 var import_path = __toESM(require("path"));
-const SAFE_PKG_RE = /^[a-zA-Z0-9_\-\.@\/]+$/;
+const SAFE_PKG_RE = /^[a-zA-Z0-9_\-\.@\/\[\]]+$/;
 const INSTALL_CHANNEL = "cluster-manager.install-packages";
 function sanitizePkg(name) {
   if (typeof name !== "string") {

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

@@ -1,3 +1,12 @@
+/**
+ * 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;
@@ -91,7 +100,7 @@ class DockerAdapter {
     }
   }
   async scale(stack, replicas) {
-    var _a;
+    var _a, _b, _c, _d;
     const current = await this.listContainers(stack);
     const running = current.filter((c) => c.status === "running");
     const diff = replicas - running.length;
@@ -102,36 +111,77 @@ class DockerAdapter {
       containersRemoved: []
     };
     if (diff > 0) {
+      let targetNetworks = stack.networks && stack.networks.length > 0 ? stack.networks : [];
+      let targetNetworkMode = stack.networkMode;
+      let targetEnvVars = this.buildEnvArray(stack.envVars);
+      let targetVolumes = stack.volumes || [];
+      try {
+        const os = require("os");
+        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 ((_b = myInfo == null ? void 0 : myInfo.Config) == null ? void 0 : _b.Env) {
+          const envDict = {};
+          myInfo.Config.Env.forEach((e) => {
+            const idx = e.indexOf("=");
+            if (idx !== -1) {
+              envDict[e.substring(0, idx)] = e.substring(idx + 1);
+            }
+          });
+          Object.assign(envDict, stack.envVars || {});
+          targetEnvVars = Object.entries(envDict).map(([k, v]) => `${k}=${v}`);
+        }
+        if ((_c = myInfo == null ? void 0 : myInfo.HostConfig) == null ? void 0 : _c.Binds) {
+          const inheritedBinds = myInfo.HostConfig.Binds;
+          targetVolumes = Array.from(/* @__PURE__ */ new Set([...inheritedBinds, ...targetVolumes]));
+        }
+      } catch (e) {
+      }
       for (let i = 0; i < diff; i++) {
         const suffix = `${Date.now()}-${Math.random().toString(36).substring(2, 6)}`;
         const containerName = `${stack.name}-${suffix}`;
         const createOpts = {
           Image: stack.image,
           name: containerName,
-          Env: this.buildEnvArray(stack.envVars),
+          Env: targetEnvVars,
           Labels: {
             [LABEL_STACK]: stack.name,
             [LABEL_MANAGED]: "true",
             ...this.workerLabels
           },
           HostConfig: {
-            Binds: stack.volumes || [],
+            Binds: targetVolumes,
             RestartPolicy: { Name: stack.restartPolicy || "unless-stopped" }
           }
         };
         if (stack.command) {
           createOpts.Cmd = ["/bin/sh", "-c", stack.command];
         }
-        if ((_a = stack.resourceLimits) == null ? void 0 : _a.memory) {
+        if ((_d = stack.resourceLimits) == null ? void 0 : _d.memory) {
           createOpts.HostConfig.Memory = this.parseMemory(stack.resourceLimits.memory);
         }
-        if (stack.networkMode) {
-          createOpts.HostConfig.NetworkMode = stack.networkMode;
-        } else if (stack.networks && stack.networks.length > 0) {
-          createOpts.HostConfig.NetworkMode = stack.networks[0];
+        if (targetNetworkMode) {
+          createOpts.HostConfig.NetworkMode = targetNetworkMode;
+        } else if (targetNetworks.length > 0) {
+          createOpts.HostConfig.NetworkMode = targetNetworks[0];
         }
         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++) {
+            try {
+              const net = this.docker.getNetwork(targetNetworks[i2]);
+              await net.connect({ Container: container.id });
+            } catch (err) {
+              console.warn(`[DockerAdapter] Failed to connect container ${container.id} to network ${targetNetworks[i2]}: ${err.message}`);
+            }
+          }
+        }
         await container.start();
         result.containersCreated.push(container.id.substring(0, 12));
       }

package/dist/server/orchestrator/index.js

@@ -1,3 +1,12 @@
+/**
+ * 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;

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

@@ -1,3 +1,12 @@
+/**
+ * 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;

package/dist/server/orchestrator/leader-election.js

@@ -1,3 +1,12 @@
+/**
+ * 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 __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/dist/server/orchestrator/types.js

@@ -1,3 +1,12 @@
+/**
+ * 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;

package/dist/server/plugin.js

@@ -1,3 +1,12 @@
+/**
+ * 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 __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/dist/server/utils/node.js

@@ -1,3 +1,12 @@
+/**
+ * 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 __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/dist/server/utils/redis.js

@@ -1,3 +1,12 @@
+/**
+ * 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;

package/dist/shared/packages.js

@@ -1,3 +1,12 @@
+/**
+ * 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;

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "Cluster Manager",
   "displayName.zh-CN": "Cluster Manager",
   "description": "Cluster node tracking, task orchestration, worker management, and package distribution",
-  "version": "1.0.12",
+  "version": "1.1.0",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "keywords": ["Monitoring", "DevOps"],
@@ -21,7 +21,9 @@
     "@nocobase/database": "2.x"
   },
   "dependencies": {
-    "@nocobase/lock-manager": "2.x",
+    "@nocobase/lock-manager": "2.x"
+  },
+  "devDependencies": {
     "@kubernetes/client-node": "^0.22.3",
     "dockerode": "^3.3.5",
     "redis": "^5.10.0",

package/src/client/ContainerOrchestrator.tsx

@@ -47,9 +47,9 @@ if [ ! -f /app/nocobase/package.json ]; then
   touch /app/nocobase/node_modules/@nocobase/app/dist/client/index.html
 fi
 echo "Applying license hotfix..."
-cd /app/nocobase && node /hotfix-license.js
+cd /app/nocobase && echo "module.exports={getEnvAsync:async()=>({sys:'mock',osVer:'mock',db:{id:'mock'}}),getInstanceIdWithPublicKeyAsync:async()=>'mock',getInstanceIdAsync:async()=>'mock',instanceIdDecrypt:()=>'mock',createKeyPair:()=>({publicKey:'mock',privateKey:'mock'}),encryptWithPublicKey:()=>'mock',encrypt:()=>'mock',decryptWithPrivateKey:()=>'mock',createSignature:()=>'mock',verifySignature:()=>true,keyEncrypt:()=>'mock',keyDecrypt:()=>JSON.stringify({licenseKey:{domain:'*'}})}" > node_modules/@nocobase/license-kit/index.js
 cd /app/nocobase && yarn nocobase postinstall
-PRIMARY_URL="http://app-primary:13000/api/app:getInfo"
+PRIMARY_URL="http://app-1:13000/api/app:getInfo"
 MAX_WAIT=900
 WAITED=0
 while [ $WAITED -lt $MAX_WAIT ]; do
@@ -59,7 +59,7 @@ while [ $WAITED -lt $MAX_WAIT ]; do
     break
   fi
   sleep 5
-  WAITED=$(($WAITED + 5))
+  WAITED=$((WAITED + 5))
 done
 exec yarn --cwd /app/nocobase start`;
 

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/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';