@stemy/backend 3.1.1 → 3.1.4

package/bundles/stemy-backend.umd.js

@@ -33,7 +33,7 @@
     var Handlebars__namespace = /*#__PURE__*/_interopNamespace(Handlebars);
     var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
 
-    /*! *****************************************************************************
+    /******************************************************************************
     Copyright (c) Microsoft Corporation.
 
     Permission to use, copy, modify, and/or distribute this software for any
@@ -195,7 +195,11 @@
     var __createBinding = Object.create ? (function (o, m, k, k2) {
         if (k2 === undefined)
             k2 = k;
-        Object.defineProperty(o, k2, { enumerable: true, get: function () { return m[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;
@@ -349,6 +353,11 @@
         if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver))
             throw new TypeError("Cannot write private member to an object whose class did not declare it");
         return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+    }
+    function __classPrivateFieldIn(state, receiver) {
+        if (receiver === null || (typeof receiver !== "object" && typeof receiver !== "function"))
+            throw new TypeError("Cannot use 'in' operator on non-object");
+        return typeof state === "function" ? receiver === state : state.has(receiver);
     }
 
     var __awaiter$w = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -455,6 +464,22 @@
     function lastItem(value) {
         return value[value.length - 1];
     }
+    function regroup(value, comparator) {
+        var result = [];
+        if (!isArray(value) || value.length == 0)
+            return result;
+        value = Array.from(value);
+        result.push([value.shift()]);
+        value.forEach(function (item) {
+            var group = result.find(function (g) { return g.some(function (a) { return comparator(a, item); }); });
+            if (group) {
+                group.push(item);
+                return;
+            }
+            result.push([item]);
+        });
+        return result;
+    }
     function getValue(obj, key, defaultValue, treeFallback) {
         if (treeFallback === void 0) { treeFallback = false; }
         key = key || "";
@@ -1099,7 +1124,6 @@
         falseColor: exports.ConsoleColor.FgRed,
         nullColor: exports.ConsoleColor.BgMagenta
     };
-    var MAX_TIMEOUT = 120000;
     function colorize(input, color) {
         return "" + color + input + exports.ConsoleColor.Reset;
     }
@@ -2389,19 +2413,23 @@
             this.container = container;
             this.jobTypes = jobTypes || [];
             this.jobs = this.jobTypes.reduce(function (res, jobType) {
-                res[getConstructorName(jobType)] = function (jobParams) {
+                var jobName = getConstructorName(jobType);
+                res[jobName] = function (jobParams, uniqueId) {
                     var job = _this.resolveJobInstance(jobType, jobParams);
-                    return job.process(_this.messageBridge);
+                    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");
         }
         JobManager.prototype.on = function (message, cb) {
             return this.messages
@@ -2492,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(MAX_TIMEOUT, 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();
@@ -2586,16 +2613,17 @@
         };
         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];
                     }
                 });
             });
@@ -3166,7 +3194,7 @@
                                 isFinished = progress.percent >= 100;
                             }
                             if (!!isFinished) return [3 /*break*/, 4];
-                            if (waitTime >= MAX_TIMEOUT) {
+                            if (waitTime >= this.jobMan.maxTimeout) {
                                 throw new Error("Progress with id: " + id + " probably never will be finished!");
                             }
                             return [4 /*yield*/, promiseTimeout(delay)];
@@ -5912,7 +5940,7 @@
             new Parameter("mongoDb", "node-backend"),
             new Parameter("mongoUser", null),
             new Parameter("mongoPassword", null),
-            new Parameter("nodeEnv", "development"),
+            new Parameter("nodeEnv", "production"),
             new Parameter("appPort", 80),
             new Parameter("zmqPort", 3000),
             new Parameter("zmqBackPort", 3100),
@@ -5924,6 +5952,7 @@
             new Parameter("idPrefix", "ID-"),
             new Parameter("idParts", [4, 4]),
             new Parameter("jsonLimit", "250mb"),
+            new Parameter("jobTimeout", 5 * 60 * 1000),
             new Parameter("cacheCollection", "cache"),
         ];
         // Convert parameters to providers
@@ -5999,12 +6028,13 @@
                         });
                         restOptions = config.restOptions || {};
                         restOptions.defaultErrorHandler = false;
-                        restOptions.cors = {
+                        restOptions.cors = Object.assign({
                             credentials: true,
+                            exposedHeaders: ["content-disposition"],
                             origin: function (origin, callback) {
                                 callback(null, true);
                             }
-                        };
+                        }, restOptions.cors || {});
                         restOptions.routePrefix = config.routePrefix || "/api";
                         restOptions.routePrefix = restOptions.routePrefix == "/" ? "" : restOptions.routePrefix;
                         restOptions.middlewares = [exports.ErrorHandlerMiddleware, ContainerMiddleware, exports.LanguageMiddleware, RequestStartedMiddleware, RequestEndedMiddleware]
@@ -6225,6 +6255,7 @@
     exports.random = random;
     exports.readAndDeleteFile = readAndDeleteFile;
     exports.readFile = readFile;
+    exports.regroup = regroup;
     exports.runCommand = runCommand;
     exports.setupBackend = setupBackend;
     exports.streamToBuffer = streamToBuffer;