Merge pull request #5 from ZEXSM/bugfix/use-array

fix use array. fix check chipher marker
ZEXSM · Jul 4, 2021 · 5af2e08 · 5af2e08
2 parents d2984a7 + a66a3bd
commit 5af2e08
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -85,6 +85,20 @@ yarn add node-scc-config
                             return;
                         }
 
+                        const keyArrayMatch = key.match(/^(\S+)\[\d+\]$/);
+
+                        if (keyArrayMatch) {
+                            const [, keyArray] = keyArrayMatch;
+
+                            if (!obj[keyArray]) {
+                                obj[keyArray] = [value];
+                            } else {
+                                obj[keyArray].push(value);
+                            }
+
+                            return;
+                        }
+
                         if (keys.length === 0) {
                             obj[key] = value;
                             return;

diff --git a/example/response.json b/example/response.json
@@ -13,7 +13,10 @@
                 "options.service.url": "http://app-service/endpoint",
                 "options.service.login": "tech",
                 "options.service.password": "{cipher}5eec033b24bc736fcbdbe1cf496149fbd1db16fd096264326e9c18f80d85b742",
-                "testOptions.url": "http://app-service/endpoint-test"
+                "testOptions.url": "http://app-service/endpoint-test",
+                "options.service.whitelist[0]": 4441,
+                "options.service.whitelist[1]": 4442,
+                "options.service.whitelist[2]": 4443
             }
         },
         {
@@ -23,7 +26,11 @@
                 "options.service.url": "http://app-service/endpoint",
                 "options.service.login": "defaultTech",
                 "options.service.password": "{cipher}5eec033b24bc736fcbdbe1cf496149fbd1db16fd096264326e9c18f80d85b742",
-                "testOptions.url": "http://app-service/endpoint-test"
+                "testOptions.url": "http://app-service/endpoint-test",
+                "options.service.whitelist[0]": 3331,
+                "options.service.whitelist[1]": 3332,
+                "options.service.whitelist[2]": 3333,
+                "options.service.whitelist[3]": 3334
             }
         }
     ]

diff --git a/example/server.ts b/example/server.ts
@@ -2,7 +2,7 @@ import express from "express";
 import nock from "nock";
 
 import { SpringCloudConfigClient } from "../src";
-import { getConfiguration, TConfiguration } from "../src/configuration";
+import { getConfiguration } from "../src/configuration";
 import { ServiceDecryptor } from "../src/decryptors";
 
 const app = express();

diff --git a/src/configuration/configuration-store.ts b/src/configuration/configuration-store.ts
@@ -91,7 +91,7 @@ class ConfigurationStore<T> implements IConfigurationStore {
         }
 
         if (this.decryptor) {
-            source = await this.decriptSource(source);
+            source = await this.decryptSource(source);
         }
 
         let sourceObj: Record<string, any> = {};
@@ -101,7 +101,7 @@ class ConfigurationStore<T> implements IConfigurationStore {
         } else {
             for (const [key, value] of Object.entries(source)) {
                 const keys = key.split('.');
-                this.createSourceObject(keys, sourceObj, value);
+                this.toDeepSource(keys, sourceObj, value);
             }
         }
 
@@ -112,13 +112,27 @@ class ConfigurationStore<T> implements IConfigurationStore {
         return JSON.parse(process.env[this.storeKey] || '{}') || {};
     }
 
-    private createSourceObject(keys: string[], obj: Record<string, any>, value: string) {
+    private toDeepSource(keys: string[], obj: Record<string, any>, value: string) {
         const key = keys.shift();
 
         if (!key) {
             return;
         }
 
+        const keyArrayMatch = key.match(/^(\S+)\[\d+\]$/);
+
+        if (keyArrayMatch) {
+            const [, keyArray] = keyArrayMatch;
+
+            if (!obj[keyArray]) {
+                obj[keyArray] = [value];
+            } else {
+                obj[keyArray].push(value);
+            }
+
+            return;
+        }
+
         if (keys.length === 0) {
             obj[key] = value;
             return;
@@ -128,12 +142,15 @@ class ConfigurationStore<T> implements IConfigurationStore {
             obj[key] = {};
         }
 
-        this.createSourceObject(keys, obj[key], value);
+        this.toDeepSource(keys, obj[key], value);
     }
 
-    private async decriptSource(source: Record<string, any>): Promise<Record<string, any>> {
+    private async decryptSource(source: Record<string, any>): Promise<Record<string, any>> {
         for (const key of Object.keys(source)) {
-            if (source[key]?.startsWith(this.chipherMarker)) {
+            if (source[key]
+                && typeof source[key] === 'string'
+                && source[key].startsWith(this.chipherMarker)) {
+
                 const data = source[key].replace(this.chipherMarker, '');
 
                 const decriyptingData = await this.decryptor!.decrypt(data);