badmfck-api-server 4.0.80 → 4.0.82

package/dist/apiServer/APIService.js

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

package/dist/apiServer/TimeframeService.d.ts

@@ -11,16 +11,18 @@ export interface ITimeframeTask<T = any> {
     executed: number;
     retries?: number;
     maxRetries?: number;
+    processing?: boolean;
 }
 export declare class TimeframeService extends BaseService {
     TICK_INTERVAL_MS: number;
     RETRY_DELAY_MS: number;
     GRACE_WINDOW_MS: number;
     tasks: ITimeframeTask<any>[];
-    intervalId: any;
+    private intervalId;
     static wait(ms: number): Promise<void>;
     constructor();
     init(): Promise<void>;
-    finishService(): Promise<void>;
     loop(): Promise<void>;
+    private runTask;
+    finishService(): Promise<void>;
 }

package/dist/apiServer/TimeframeService.js

@@ -43,55 +43,78 @@ class TimeframeService extends BaseService_1.BaseService {
     }
     async init() {
         exports.REQ_TIMEFRAME_TASK_ADD.listener = async (req) => {
-            (0, LogService_1.logInfo)("Add tack " + req.name);
-            this.tasks.push(req);
+            (0, LogService_1.logInfo)("Add task " + req.name);
+            this.tasks.push({
+                ...req,
+                executed: 0,
+                retries: 0,
+                processing: false
+            });
         };
         this.intervalId = setInterval(() => {
-            this.loop();
+            this.loop().catch(console.error);
         }, this.TICK_INTERVAL_MS);
     }
-    async finishService() {
-        clearInterval(this.intervalId);
-    }
     async loop() {
         const now = Date.now();
         for (let i = 0; i < this.tasks.length; i++) {
             const task = this.tasks[i];
             if (!task)
                 continue;
-            if (now >= task.start && (!task.executed || task.executed < task.start)) {
+            if (task.repeat && !task.processing && now > (task.start + this.GRACE_WINDOW_MS)) {
+                const diff = now - task.start;
+                const missedIntervals = Math.ceil(diff / task.repeat);
+                task.start += missedIntervals * task.repeat;
+                (0, LogService_1.logInfo)(`Task ${task.name} skipped and rescheduled to ${new Date(task.start).toLocaleTimeString()}`);
+                continue;
+            }
+            const isReady = now >= task.start;
+            const isNotExecutedYet = !task.executed || task.executed < task.start;
+            if (isReady && isNotExecutedYet && !task.processing) {
                 if (now - task.start <= this.GRACE_WINDOW_MS) {
-                    try {
-                        (0, LogService_1.logInfo)("Execute task ", task.name);
-                        if (task.callback.length > 0 && task.params)
-                            task.callback(task.params);
-                        else
-                            task.callback();
-                        task.executed = Date.now();
-                        task.retries = 0;
-                        (0, LogService_1.logInfo)("Executed task ", task.name);
-                        if (task.repeat) {
-                            task.start += task.repeat;
-                        }
-                        else {
-                            this.tasks.splice(i, 1);
-                            i--;
-                        }
-                    }
-                    catch (e) {
-                        task.retries = (task.retries || 0) + 1;
-                        if (task.retries > (task.maxRetries ?? 0)) {
-                            console.warn(`Task ${task.name} failed too many times`);
-                            this.tasks.splice(i, 1);
-                            i--;
-                        }
-                        else {
-                            task.start = now + 10_000;
-                        }
-                    }
+                    this.runTask(task);
+                }
+                else if (!task.repeat) {
+                    (0, LogService_1.logInfo)(`One-off task ${task.name} missed grace window. Dropping.`);
+                    task.executed = now;
+                    this.tasks = this.tasks.filter(t => t !== task);
                 }
             }
         }
     }
+    async runTask(task) {
+        task.processing = true;
+        try {
+            (0, LogService_1.logInfo)("Execute task ", task.name);
+            await task.callback(task.params);
+            task.executed = Date.now();
+            task.retries = 0;
+            (0, LogService_1.logInfo)("Executed task ", task.name);
+            if (task.repeat) {
+                task.start += task.repeat;
+            }
+            else {
+                this.tasks = this.tasks.filter(t => t !== task);
+            }
+            exports.S_TIMEFRAME_TASK_EXECUTED.invoke(task);
+        }
+        catch (e) {
+            console.error(`Task ${task.name} error:`, e);
+            task.retries = (task.retries || 0) + 1;
+            if (task.retries > (task.maxRetries ?? 0)) {
+                console.warn(`Task ${task.name} failed too many times. Dropping.`);
+                this.tasks = this.tasks.filter(t => t !== task);
+            }
+            else {
+                task.start = Date.now() + this.RETRY_DELAY_MS;
+            }
+        }
+        finally {
+            task.processing = false;
+        }
+    }
+    async finishService() {
+        clearInterval(this.intervalId);
+    }
 }
 exports.TimeframeService = TimeframeService;

package/dist/apiServer/helper/Validator.js

@@ -157,6 +157,8 @@ class Validator {
                 let num = parseInt(object[i]);
                 if (object[i].includes("."))
                     num = parseFloat(object[i]);
+                if (isNaN(num))
+                    num = structureOptions.default !== undefined ? structureOptions.default : NaN;
                 if (isNaN(num))
                     errors.push("wrong value for field '" + parentPath + i + "', expected number got " + object[i]);
                 else
@@ -209,6 +211,10 @@ class Validator {
                 structureOptions.values = structure['$__' + i + "_values"];
             if (Array.isArray(structureOptions.values) && structureOptions.values.length) {
                 if (!structureOptions.values.includes(object[i])) {
+                    if (structureOptions.default && structureOptions.values.includes(structureOptions.default)) {
+                        object[i] = structureOptions.default;
+                        continue;
+                    }
                     let caseValue = null;
                     for (let i of structureOptions.values) {
                         if (i === null || i === undefined)

package/package.json

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