badmfck-api-server 1.6.0 → 1.6.3

package/dist/apiServer/APIService.js

@@ -47,7 +47,7 @@ async function Initializer(services) {
 exports.Initializer = Initializer;
 class APIService extends BaseService_1.BaseService {
     static nextLogID = 0;
-    version = "1.6.0";
+    version = "1.6.2";
     options;
     monitor;
     monitorIndexFile;
@@ -252,9 +252,9 @@ class APIService extends BaseService_1.BaseService {
             log.time = data.responseTime;
         if (res.destroyed || res.closed) {
             if (log)
-                log.error = "Connection already closed, can't send response";
+                log.error = "Connection already closed, can't send response for: " + data.endpoint;
             if (this.options.onError)
-                this.options.onError("Connection already closed, can't send response", data);
+                this.options.onError("Connection already closed, can't send response: " + data.endpoint, data);
             if (this.monitor)
                 this.monitor.registrateError(data.endpoint);
         }

package/dist/apiServer/MysqlService.d.ts

@@ -1,6 +1,7 @@
 import { FieldInfo, MysqlError, Pool, PoolConnection } from "mysql";
 import { BaseService } from "./BaseService";
-import { Req } from "badmfck-signal";
+import Signal, { Req } from "badmfck-signal";
+export declare const S_MYSQL_STARTED: Signal<void>;
 export declare const REQ_MYSQL_QUERY: Req<MySqlQuery | MySqlQuery[], MysqlResult[]>;
 export declare const executeQuery: (query: MySqlQuery | MySqlQuery[]) => Promise<MysqlResult[]>;
 export interface MysqlServiceOptions {

package/dist/apiServer/MysqlService.js

@@ -1,14 +1,38 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlService = exports.executeQuery = exports.REQ_MYSQL_QUERY = void 0;
+exports.MysqlService = exports.executeQuery = exports.REQ_MYSQL_QUERY = exports.S_MYSQL_STARTED = void 0;
 const mysql_1 = __importDefault(require("mysql"));
 const BaseService_1 = require("./BaseService");
-const badmfck_signal_1 = require("badmfck-signal");
+const badmfck_signal_1 = __importStar(require("badmfck-signal"));
 const crypto_1 = require("crypto");
 const LogService_1 = require("./LogService");
+exports.S_MYSQL_STARTED = new badmfck_signal_1.default();
 exports.REQ_MYSQL_QUERY = new badmfck_signal_1.Req("REQ_MYSQL_QUERY");
 const executeQuery = async (query) => { return await exports.REQ_MYSQL_QUERY.request(query); };
 exports.executeQuery = executeQuery;
@@ -60,6 +84,7 @@ class MysqlService extends BaseService_1.BaseService {
         else {
             this.serviceStarted = true;
             (0, LogService_1.logInfo)("${MysqlService.js}", "Mysql Service started!");
+            exports.S_MYSQL_STARTED.invoke();
         }
     }
     async onApplicationReady() { }

package/dist/apiServer/helper/DataProvider.d.ts

@@ -0,0 +1,16 @@
+export declare class DataProvider<T> {
+    private static nextID;
+    private name?;
+    private busy;
+    private lastRequestTime;
+    private cacheTime;
+    private data;
+    private callbacks;
+    private wasError;
+    private executor;
+    constructor(executor: () => Promise<{
+        data: T | null | undefined;
+        error?: boolean;
+    }>, cacheTime?: number, name?: string);
+    getData(): Promise<T | null | undefined>;
+}

package/dist/apiServer/helper/DataProvider.js

@@ -0,0 +1,47 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataProvider = void 0;
+const badmfck_signal_1 = __importDefault(require("badmfck-signal"));
+class DataProvider {
+    static nextID = 1;
+    name;
+    busy = false;
+    lastRequestTime = 0;
+    cacheTime = 1000 * 60 * 5;
+    data;
+    callbacks = new badmfck_signal_1.default();
+    wasError = false;
+    executor;
+    constructor(executor, cacheTime, name) {
+        this.executor = executor;
+        if (cacheTime !== undefined)
+            this.cacheTime = +cacheTime;
+        if (isNaN(this.cacheTime))
+            this.cacheTime = 0;
+        if (!this.name)
+            this.name = "DataProvider " + (DataProvider.nextID++);
+    }
+    async getData() {
+        if (this.busy)
+            return new Promise((resolve, reject) => this.callbacks.subscribe((d) => resolve(d)));
+        if (this.lastRequestTime > 0 && !this.wasError) {
+            const diff = (+new Date()) - this.lastRequestTime;
+            if (diff < this.cacheTime)
+                return this.data;
+        }
+        this.busy = true;
+        this.wasError = false;
+        const res = await this.executor();
+        this.busy = false;
+        this.wasError = res.error ?? false;
+        this.data = res.data;
+        this.lastRequestTime = +new Date();
+        this.callbacks.invoke(this.data);
+        this.callbacks.removeAll();
+        return this.data;
+    }
+}
+exports.DataProvider = DataProvider;

package/package.json

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