badmfck-api-server 4.1.12 → 4.1.14

package/dist/apiServer/APIService.js

@@ -98,7 +98,7 @@ async function Initializer(services) {
 }
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
-    version = "4.1.12";
+    version = "4.1.14";
     options;
     monitor = null;
     started = new Date();
@@ -331,6 +331,10 @@ class APIService extends BaseService_1.BaseService {
                                     respond({ error: { ...DefaultErrors_1.default.DB_ERROR, details: e.message } });
                                     return;
                                 }
+                                if (DefaultErrors_1.ErrorUtils.isError(e)) {
+                                    respond({ error: e });
+                                    return;
+                                }
                                 respond({ error: { code: 10002, message: "Internal server error!", stack: stack, details: details }, data: null, httpStatus: 500 });
                                 return;
                             }
@@ -456,14 +460,16 @@ class APIService extends BaseService_1.BaseService {
             nextLogID = 0;
     }
     async sendResponse(ref, res, data, requestTime, endpoint, req) {
+        const ignoreHttpLogging = data.ignoreHttpLogging ?? false;
+        delete data.ignoreHttpLogging;
         if (data.blockResponse) {
-            if (!data.ignoreHttpLogging)
+            if (!ignoreHttpLogging)
                 (0, LogService_1.logAPI)("Response blocked");
-            if (req && !data.ignoreHttpLogging)
+            if (req && !ignoreHttpLogging)
                 this.addNetlog(data, req, requestTime, 0);
             return;
         }
-        if (!data.ignoreHttpLogging)
+        if (!ignoreHttpLogging)
             MonitorService_1.S_STAT_REGISTRATE_REQUEST.invoke({ ...data, endpoint: data.endpoint ?? endpoint });
         if (this.options.postproducer) {
             try {
@@ -481,7 +487,7 @@ class APIService extends BaseService_1.BaseService {
         if (this.options.appVersion)
             data.version = this.options.appVersion;
         if (res.socket?.destroyed || res.writableEnded || res.headersSent || (res.destroyed !== undefined && res.destroyed)) {
-            if (!data.ignoreHttpLogging)
+            if (!ignoreHttpLogging)
                 (0, LogService_1.logAPI)("Connection already closed, can't send response for: " + data.endpoint);
         }
         else {
@@ -490,7 +496,7 @@ class APIService extends BaseService_1.BaseService {
                     const normalizedFile = process.platform === "win32" ? data.file : data.file.replaceAll("\\", "/");
                     const filePath = path_1.default.isAbsolute(normalizedFile) ? normalizedFile : path_1.default.resolve(normalizedFile);
                     const onSendFileError = (err) => {
-                        if (!data.ignoreHttpLogging)
+                        if (!ignoreHttpLogging)
                             (0, LogService_1.logError)("Can't send file: " + filePath);
                         if (!res.headersSent && !res.writableEnded) {
                             res.status(500).send({ error: DefaultErrors_1.default.CANT_SEND_FILE, data: null });
@@ -536,12 +542,12 @@ class APIService extends BaseService_1.BaseService {
                         res.statusCode = data.httpStatus ?? 200;
                     if (data.rawResponse) {
                         res.send(data.data);
-                        if (!data.ignoreHttpLogging)
+                        if (!ignoreHttpLogging)
                             (0, LogService_1.logAPI)(this.checkDataLength(data));
                     }
                     else {
                         res.send(data);
-                        if (!data.ignoreHttpLogging)
+                        if (!ignoreHttpLogging)
                             (0, LogService_1.logAPI)(this.checkDataLength(data));
                     }
                 }
@@ -550,7 +556,7 @@ class APIService extends BaseService_1.BaseService {
                 console.error(e);
             }
         }
-        if (req && !data.ignoreHttpLogging)
+        if (req && !ignoreHttpLogging)
             this.addNetlog(data, req, requestTime, 0);
     }
     checkDataLength(data, result, lvl) {

package/package.json

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