badmfck-api-server 4.0.3 → 4.0.4

package/dist/apiServer/APIService.js

@@ -93,7 +93,7 @@ async function Initializer(services) {
 }
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
-    version = "4.0.2";
+    version = "4.0.4";
     options;
     monitor = null;
     started = new Date();

package/dist/apiServer/external/MicroserviceClient.js

@@ -38,7 +38,6 @@ class MicroserviceClient extends BaseService_1.BaseService {
         const nonce = crypto_1.default.randomBytes(16).toString("hex");
         const headers = {
             "Content-Type": "application/json",
-            "x-microservice-id": this.options.id,
             "x-microservice-ts": ts,
             "x-microservice-nonce": nonce
         };

package/dist/apiServer/external/MicroserviceHost.js

@@ -69,12 +69,12 @@ class MicroserviceHost extends BaseService_1.BaseService {
         const key = crypto_1.default.pbkdf2Sync(secret, salt, 100, 32, "sha256");
         const iv = crypto_1.default.pbkdf2Sync(secret, salt, 100, 16, "sha256");
         const aad = Buffer.from(ts + "." + nonce + "." + this.options.id + "." + this.options.password, "utf8");
-        const tag = req.data.tag;
-        const encryptedData = req.data.enc;
+        const tag = Buffer.from(req.data.tag, "base64");
+        const enc = Buffer.from(req.data.enc, "base64");
         const decipher = crypto_1.default.createDecipheriv("aes-256-gcm", key, iv);
         decipher.setAAD(aad);
         decipher.setAuthTag(tag);
-        const decrypted = Buffer.concat([decipher.update(encryptedData), decipher.final()]);
+        const decrypted = Buffer.concat([decipher.update(enc), decipher.final()]);
         let request = null;
         try {
             request = JSON.parse(decrypted.toString("utf8"));

package/dist/apiServer/helper/Validator.js

@@ -108,6 +108,14 @@ class Validator {
                 foundKeys.push(i);
                 continue;
             }
+            if (typeof structure[i] === "object" && Array.isArray(structure[i]) && structure[i].length === 0) {
+                foundKeys.push(i);
+                continue;
+            }
+            if (typeof structure[i] === "object" && Object.keys(structure[i]).length === 0) {
+                foundKeys.push(i);
+                continue;
+            }
             let structureOptions = Validator.parseStructureOptions(i, structure);
             if (structureOptions.skip_validation) {
                 foundKeys.push(i);
@@ -372,6 +380,12 @@ class Validator {
             const has = Object.prototype.hasOwnProperty.call(src, k);
             const ov = has ? src[k] : undefined;
             const { optional, skip_validation, default: def } = this.parseStructureOptions(k, structure);
+            const ignore = skip_validation || (this.isPlainObject(sv) && Object.keys(sv).length === 0);
+            if (ignore) {
+                if (has)
+                    out[k] = ov;
+                continue;
+            }
             if (!has) {
                 if (sv && typeof sv === "object") {
                     out[k] = this.syncStructure(sv, this.clone(sv));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "badmfck-api-server",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "description": "Simple API http server based on express",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",