@nocobase/plugin-environment-variables 1.6.0-alpha.18 → 1.6.0-alpha.20

package/dist/externalVersion.js

@@ -9,12 +9,12 @@
 
 module.exports = {
   "@formily/react": "2.3.0",
-  "@nocobase/client": "1.6.0-alpha.18",
+  "@nocobase/client": "1.6.0-alpha.20",
   "react": "18.2.0",
-  "@nocobase/server": "1.6.0-alpha.18",
+  "@nocobase/server": "1.6.0-alpha.20",
   "@ant-design/icons": "5.2.6",
   "@formily/antd-v5": "1.1.9",
   "@formily/core": "2.3.0",
   "antd": "5.12.8",
-  "@nocobase/database": "1.6.0-alpha.18"
+  "@nocobase/database": "1.6.0-alpha.20"
 };

package/dist/server/plugin.d.ts

@@ -14,6 +14,10 @@ export declare class PluginEnvironmentVariablesServer extends Plugin {
     load(): Promise<void>;
     registerACL(): void;
     listEnvironmentVariables(): Promise<any>;
+    validateTexts(texts: Array<{
+        text: string;
+        secret: boolean;
+    }>): void;
     setEnvironmentVariablesByText(texts: Array<{
         text: string;
         secret: boolean;

package/dist/server/plugin.js

@@ -66,7 +66,39 @@ class PluginEnvironmentVariablesServer extends import_server.Plugin {
     });
     return items.map(({ name, type }) => ({ name, type }));
   }
+  validateTexts(texts) {
+    if (!Array.isArray(texts)) {
+      throw new Error("texts parameter must be an array");
+    }
+    for (const item of texts) {
+      if (!item || typeof item !== "object") {
+        throw new Error("Each item in texts must be an object");
+      }
+      if (typeof item.text !== "string" || !item.text.trim()) {
+        throw new Error("text property must be a non-empty string");
+      }
+      if (typeof item.secret !== "boolean") {
+        throw new Error("secret property must be a boolean");
+      }
+      const lines = item.text.split("\n").map((line) => line.trim()).filter((line) => line && !line.startsWith("#"));
+      for (const line of lines) {
+        const equalIndex = line.indexOf("=");
+        if (equalIndex === -1) {
+          throw new Error(`Invalid environment variable format: ${line}`);
+        }
+        const key = line.slice(0, equalIndex).trim();
+        const value = line.slice(equalIndex + 1).trim();
+        if (!key) {
+          throw new Error(`Environment variable name cannot be empty`);
+        }
+        if (!value) {
+          throw new Error(`Environment variable "${key}" must have a value`);
+        }
+      }
+    }
+  }
   async setEnvironmentVariablesByText(texts) {
+    this.validateTexts(texts);
     const repository = this.db.getRepository("environmentVariables");
     for (const { text, secret } of texts) {
       const lines = text.split("\n").map((line) => line.trim()).filter((line) => line && !line.startsWith("#"));
@@ -78,10 +110,13 @@ class PluginEnvironmentVariablesServer extends import_server.Plugin {
         }
         const key = line.slice(0, equalIndex).trim();
         const value = line.slice(equalIndex + 1).trim();
-        if (!key || !value) {
-          this.app.log.warn(`Empty key or value found: ${line}`);
+        if (!key) {
+          this.app.log.warn(`Empty key found: ${line}`);
           continue;
         }
+        if (!value) {
+          throw new Error(`Empty value is not allowed for key: ${key}`);
+        }
         await repository.create({
           values: {
             name: key,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-environment-variables",
-  "version": "1.6.0-alpha.18",
+  "version": "1.6.0-alpha.20",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "1.x",
@@ -14,5 +14,5 @@
   "keywords": [
     "System management"
   ],
-  "gitHead": "db361bebe9ed4a5ca19fc14183fe4576443568ef"
+  "gitHead": "c127664eb2b900edd5c18c9344046cd663a06c3b"
 }