badmfck-api-server 4.0.3 → 4.0.5

package/dist/apiServer/APIService.d.ts

@@ -3,7 +3,7 @@ import { Application, Response } from 'express';
 import { BaseService, IBaseService } from './BaseService';
 import { IBaseEndpoint } from './BaseEndpoint';
 import { HTTPRequestVO, IError, TransferPacketVO } from './structures/Interfaces';
-import { Req } from "badmfck-signal";
+import Signal, { Req } from "badmfck-signal";
 import http from 'http';
 export interface IMonitorUser {
     login: string;
@@ -57,6 +57,7 @@ export declare const REQ_HTTP_SERVER: Req<void, {
 export declare const REQ_INTERNAL_CALL: Req<HTTPRequestVO, IError | any>;
 export declare const REQ_MONITOR_USERS: Req<void, IMonitorUser[]>;
 export declare const REQ_DOC_USERS: Req<void, IMonitorUser[]>;
+export declare const S_APP_STARTED: Signal<void>;
 export declare function Initializer(services: IBaseService[]): Promise<void>;
 export declare class APIService<TInterceptorResult = any, TInternalCallParams = any> extends BaseService {
     private version;

package/dist/apiServer/APIService.js

@@ -26,13 +26,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.APIService = exports.Initializer = exports.REQ_DOC_USERS = exports.REQ_MONITOR_USERS = exports.REQ_INTERNAL_CALL = exports.REQ_HTTP_SERVER = exports.REQ_HTTP_REQUESTS_COUNT = exports.REQ_HTTP_LOG = exports.getDefaultOptions = void 0;
+exports.APIService = exports.Initializer = exports.S_APP_STARTED = exports.REQ_DOC_USERS = exports.REQ_MONITOR_USERS = exports.REQ_INTERNAL_CALL = exports.REQ_HTTP_SERVER = exports.REQ_HTTP_REQUESTS_COUNT = exports.REQ_HTTP_LOG = exports.getDefaultOptions = void 0;
 const express_1 = __importDefault(require("express"));
 const BaseService_1 = require("./BaseService");
 const cors_1 = __importDefault(require("cors"));
 const BaseEndpoint_1 = require("./BaseEndpoint");
 const DefaultErrors_1 = __importStar(require("./structures/DefaultErrors"));
-const badmfck_signal_1 = require("badmfck-signal");
+const badmfck_signal_1 = __importStar(require("badmfck-signal"));
 const LogService_1 = require("./LogService");
 const Monitor_1 = require("./monitor/Monitor");
 const express_fileupload_1 = __importDefault(require("express-fileupload"));
@@ -79,6 +79,7 @@ exports.REQ_HTTP_SERVER = new badmfck_signal_1.Req(undefined, "REQ_HTTP_SERVER")
 exports.REQ_INTERNAL_CALL = new badmfck_signal_1.Req(undefined, "REQ_INTERNAL_CALL");
 exports.REQ_MONITOR_USERS = new badmfck_signal_1.Req(undefined, "REQ_MONITOR_USERS");
 exports.REQ_DOC_USERS = new badmfck_signal_1.Req(undefined, "REQ_DOC_USERS");
+exports.S_APP_STARTED = new badmfck_signal_1.default("S_APP_STARTED");
 const activeServices = [];
 async function Initializer(services) {
     services.push(new StatService_1.StatService());
@@ -87,13 +88,14 @@ async function Initializer(services) {
         activeServices.push(i.getName());
         MonitorService_1.S_STAT_REGISTRATE_SERVICE.invoke(i.getName());
     }
+    exports.S_APP_STARTED.invoke();
     for (let i of services) {
         i.applicationReady();
     }
 }
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
-    version = "4.0.2";
+    version = "4.0.5";
     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);
@@ -327,6 +335,8 @@ class Validator {
     static syncStructure(structure, node) {
         if (structure === null || typeof structure !== "object")
             return node;
+        if (structure && typeof structure === "object" && Object.keys(structure).length === 0)
+            return node;
         if (Array.isArray(structure)) {
             const tmpl = structure[0];
             if (!Array.isArray(node) && this.isPlainObject(node)) {

package/package.json

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