ismx-nexo-node-app 0.4.32 → 0.4.34

package/dist/js/business/BusinessThread.js

@@ -1,29 +1,44 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const Business_1 = __importDefault(require("./Business"));
 class BusinessThread extends Business_1.default {
-    constructor() {
+    constructor(runImmediately = false) {
         super();
+        this.runImmediately = runImmediately;
     }
     init() {
-        var _a, _b;
-        this.timeoutId = setTimeout(() => {
-            this.intervalId = setInterval(() => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.runImmediately)
+                try {
+                    yield this.run();
+                }
+                catch (err) {
+                    this.onError(err);
+                }
+            this.intervalId = setInterval(() => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    this.run();
+                    yield this.run();
                 }
                 catch (err) {
                     this.onError(err);
                 }
-            }, this.interval());
-        }, (_b = (_a = this.delay) === null || _a === void 0 ? void 0 : _a.call(this)) !== null && _b !== void 0 ? _b : 0);
+            }), this.interval());
+        });
     }
     terminate() {
         clearInterval(this.intervalId);
-        clearTimeout(this.timeoutId);
     }
     onError(err) { }
 }

package/dist/types/business/BusinessThread.d.ts

@@ -1,11 +1,11 @@
 import Business from "./Business";
 export default abstract class BusinessThread extends Business {
+    private runImmediately;
     private intervalId?;
-    private timeoutId?;
-    constructor();
-    init(): void;
+    protected constructor(runImmediately?: boolean);
+    init(): Promise<void>;
     terminate(): void;
-    abstract run(): void;
+    abstract run(): Promise<void>;
     abstract interval(): number;
     abstract delay?(): number;
     onError(err: Error): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ismx-nexo-node-app",
-  "version": "0.4.32",
+  "version": "0.4.34",
   "description": "",
   "scripts": {
     "build": "rm -rf ./dist && npx tsc",

package/src/main/node/business/BusinessThread.ts

@@ -2,28 +2,29 @@ import Business from "./Business";
 
 export default abstract class BusinessThread extends Business
 {
+	private runImmediately: boolean;
 	private intervalId?: NodeJS.Timeout;
-	private timeoutId?: NodeJS.Timeout;
 
-	constructor() {
+	protected constructor(runImmediately: boolean = false) {
 		super();
+		this.runImmediately = runImmediately;
 	}
 
-	init() {
-		this.timeoutId = setTimeout(() => {
-			this.intervalId = setInterval(() => {
-				try { this.run() }
-				catch (err) { this.onError(err as Error) }
-			}, this.interval());
-		}, this.delay?.() ?? 0);
+	async init() {
+
+		if (this.runImmediately)
+			try { await this.run() } catch (err) { this.onError(err as Error) }
+
+		this.intervalId = setInterval(async () => {
+			try { await this.run() } catch (err) { this.onError(err as Error) }
+		}, this.interval());
 	}
 
 	terminate() {
 		clearInterval(this.intervalId);
-		clearTimeout(this.timeoutId);
 	}
 
-	abstract run(): void
+	abstract run(): Promise<void>
 	abstract interval(): number
 	abstract delay?(): number
 	onError(err: Error) {}