badmfck-api-server 4.1.11 → 4.1.13

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.11";
+    version = "4.1.13";
     options;
     monitor = null;
     started = new Date();
@@ -456,14 +456,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 +483,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 +492,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 +538,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 +552,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/dist/apiServer/db/MysqlAdapter.js

@@ -552,8 +552,10 @@ class MysqlAdapter {
             }
             if (trx && !error.isDuplicateError)
                 this.storeTransactionAsProblem(trx, "error:" + error.errno);
-            if (request.throwable)
-                throw { ...DefaultErrors_1.default.DB_ERROR, details: error.message, stack: error };
+            if (request.throwable) {
+                const base = error.isDuplicateError ? DefaultErrors_1.default.DB_DUPLICATE_ERROR : DefaultErrors_1.default.DB_ERROR;
+                throw { ...base, details: error.message, stack: error };
+            }
             return {
                 data: null,
                 error: error,

package/dist/apiServer/structures/DefaultErrors.d.ts

@@ -12,6 +12,7 @@ declare class DefaultErrors {
     static TIMEOUT: IError;
     static METHOD_NOT_ALLOWED: IError;
     static DB_ERROR: IError;
+    static DB_DUPLICATE_ERROR: IError;
     static FORBIDDEN: IError;
     static NOT_FOUND: IError;
     static INTERNAL_SERVER_ERROR: IError;

package/dist/apiServer/structures/DefaultErrors.js

@@ -15,6 +15,7 @@ class DefaultErrors {
     static TIMEOUT = { code: 9, message: "Timeout", httpStatus: 408 };
     static METHOD_NOT_ALLOWED = { code: 10, message: "Method not allowed", httpStatus: 405 };
     static DB_ERROR = { code: 11, message: "DB error", httpStatus: 500 };
+    static DB_DUPLICATE_ERROR = { code: 28, message: "DB duplicate entry", httpStatus: 409 };
     static FORBIDDEN = { code: 12, message: "Forbidden", httpStatus: 403 };
     static NOT_FOUND = { code: 13, message: "Not found", httpStatus: 404 };
     static INTERNAL_SERVER_ERROR = { code: 14, message: "Internal server error.", httpStatus: 500 };

package/package.json

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