@stemy/backend 3.1.3 → 3.1.6

package/bundles/stemy-backend.umd.js

@@ -2413,18 +2413,21 @@
             this.container = container;
             this.jobTypes = jobTypes || [];
             this.jobs = this.jobTypes.reduce(function (res, jobType) {
-                res[getConstructorName(jobType)] = function (jobParams) {
-                    var job = _this.resolveJobInstance(jobType, jobParams);
-                    return job.process(_this.messageBridge);
+                var jobName = getConstructorName(jobType);
+                res[jobName] = function (jobParams, uniqueId) {
+                    var job = _this.resolveJobInstance(jobType, jobParams, uniqueId);
+                    var messageBridge = {
+                        sendMessage: function (message, params) {
+                            params.uniqueId = uniqueId;
+                            _this.workerPush.send([message, JSON.stringify(params)]);
+                        }
+                    };
+                    messageBridge.sendMessage("job-started", { name: jobName });
+                    return job.process(messageBridge);
                 };
                 return res;
             }, {});
             this.messages = new rxjs.Subject();
-            this.messageBridge = {
-                sendMessage: function (message, params) {
-                    _this.workerPush.send([message, JSON.stringify(params)]);
-                }
-            };
             this.processing = false;
             this.maxTimeout = this.config.resolve("jobTimeout");
         }
@@ -2517,32 +2520,31 @@
                         case 2:
                             _a.sent();
                             console.log("Worker consumer connected to: " + pullHost);
-                            this.workerPull.on("message", function (name, args, uniqueId) { return __awaiter$o(_this, void 0, void 0, function () {
-                                var jobName, jobParams, timerId, e_1, e_2;
+                            this.workerPull.on("message", function (name, args, uniqId) { return __awaiter$o(_this, void 0, void 0, function () {
+                                var jobName, jobParams, uniqueId, e_1, e_2;
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0:
                                             _a.trys.push([0, 5, , 6]);
                                             jobName = name.toString("utf8");
                                             jobParams = JSON.parse(args.toString("utf8"));
-                                            timerId = uniqueId === null || uniqueId === void 0 ? void 0 : uniqueId.toString("utf8");
-                                            console.time(timerId);
-                                            console.timeLog(timerId, "Started working on background job: " + colorize(jobName, exports.ConsoleColor.FgCyan) + " with args: \n" + jsonHighlight(jobParams) + "\n\n");
-                                            this.messageBridge.sendMessage("job-started", { name: jobName });
+                                            uniqueId = uniqId === null || uniqId === void 0 ? void 0 : uniqId.toString("utf8");
+                                            console.time(uniqueId);
+                                            console.timeLog(uniqueId, "Started working on background job: " + colorize(jobName, exports.ConsoleColor.FgCyan) + " with args: \n" + jsonHighlight(jobParams) + "\n\n");
                                             _a.label = 1;
                                         case 1:
                                             _a.trys.push([1, 3, , 4]);
-                                            return [4 /*yield*/, Promise.race([this.jobs[jobName](jobParams), promiseTimeout(this.maxTimeout, true)])];
+                                            return [4 /*yield*/, Promise.race([this.jobs[jobName](jobParams, uniqueId), promiseTimeout(this.maxTimeout, true)])];
                                         case 2:
                                             _a.sent();
-                                            console.timeLog(timerId, "Finished working on background job: " + colorize(jobName, exports.ConsoleColor.FgCyan) + "\n\n");
+                                            console.timeLog(uniqueId, "Finished working on background job: " + colorize(jobName, exports.ConsoleColor.FgCyan) + "\n\n");
                                             return [3 /*break*/, 4];
                                         case 3:
                                             e_1 = _a.sent();
-                                            console.timeLog(timerId, "Background job failed: " + colorize(jobName, exports.ConsoleColor.FgRed) + "\n" + e_1 + "\n\n");
+                                            console.timeLog(uniqueId, "Background job failed: " + colorize(jobName, exports.ConsoleColor.FgRed) + "\n" + e_1 + "\n\n");
                                             return [3 /*break*/, 4];
                                         case 4:
-                                            console.timeEnd(timerId);
+                                            console.timeEnd(uniqueId);
                                             return [3 /*break*/, 6];
                                         case 5:
                                             e_2 = _a.sent();
@@ -2594,33 +2596,40 @@
                 this.apiPull.on("message", function (name, args) {
                     var message = name.toString("utf8");
                     var params = JSON.parse((args === null || args === void 0 ? void 0 : args.toString("utf8")) || "{}");
-                    console.log("Received a message from worker: \"" + colorize(message, exports.ConsoleColor.FgCyan) + "\" with args: " + jsonHighlight(params) + "\n\n");
+                    var paramTypes = Object.keys(params).reduce(function (res, key) {
+                        res[key] = getType(params[key]);
+                        return res;
+                    }, {});
+                    console.log("Received a message from worker: \"" + colorize(message, exports.ConsoleColor.FgCyan) + "\" with args: " + jsonHighlight(paramTypes) + "\n\n");
                     _this.messages.next({ message: message, params: params });
                 });
                 console.log("API consumer bound to port: " + backPort);
             }
             return this.tryResolve(jobType, params);
         };
-        JobManager.prototype.resolveJobInstance = function (jobType, params) {
+        JobManager.prototype.resolveJobInstance = function (jobType, params, uniqueId) {
+            if (uniqueId === void 0) { uniqueId = ""; }
             var container = this.container.createChildContainer();
             Object.keys(params).map(function (name) {
                 container.register(name, { useValue: params[name] });
             });
+            container.register("uniqueId", { useValue: uniqueId });
             container.register(jobType, jobType);
             return container.resolve(jobType);
         };
         JobManager.prototype.sendToWorkers = function (jobName, params) {
             return __awaiter$o(this, void 0, void 0, function () {
-                var publisher;
+                var publisher, uniqueId;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0: return [4 /*yield*/, this.apiPush];
                         case 1:
                             publisher = _a.sent();
-                            return [4 /*yield*/, publisher.send([jobName, JSON.stringify(params), new bson.ObjectId().toHexString()])];
+                            uniqueId = new bson.ObjectId().toHexString();
+                            return [4 /*yield*/, publisher.send([jobName, JSON.stringify(params), uniqueId])];
                         case 2:
                             _a.sent();
-                            return [2 /*return*/];
+                            return [2 /*return*/, uniqueId];
                     }
                 });
             });