@stemy/backend 2.9.8 → 3.0.0

package/fesm2015/stemy-backend.js

@@ -23,9 +23,8 @@ import sharp_ from 'sharp';
 import axios from 'axios';
 import { GridFSBucket } from 'mongodb';
 import dotenv from 'dotenv';
-import { Queue, Worker, Scheduler } from 'node-resque';
 import { validate, schedule } from 'node-cron';
-import ioredis from 'ioredis';
+import { socket } from 'zeromq';
 import socket_io_client from 'socket.io-client';
 import { createServer } from 'http';
 import express_, { static as static$1 } from 'express';
@@ -363,10 +362,14 @@ function writeFile(path, data) {
 function valueToPromise(value) {
     return value instanceof Promise ? value : Promise.resolve(value);
 }
-function promiseTimeout(timeout = 1000) {
-    return new Promise((resolve) => {
+function promiseTimeout(timeout = 1000, error = false) {
+    return new Promise((resolve, reject) => {
         setTimeout(() => {
-            resolve();
+            if (error) {
+                reject(`Timeout exceeded: ${timeout}ms`);
+                return;
+            }
+            resolve(`Timeout: ${timeout}ms`);
         }, timeout);
     });
 }
@@ -640,6 +643,66 @@ function runCommand(scriptPath, expectedCode = 0) {
             console.error(data.toString());
         });
     });
+}
+var ConsoleColor;
+(function (ConsoleColor) {
+    ConsoleColor["Reset"] = "\u001B[0m";
+    ConsoleColor["Bright"] = "\u001B[1m";
+    ConsoleColor["Dim"] = "\u001B[2m";
+    ConsoleColor["Underscore"] = "\u001B[4m";
+    ConsoleColor["Blink"] = "\u001B[5m";
+    ConsoleColor["Reverse"] = "\u001B[7m";
+    ConsoleColor["Hidden"] = "\u001B[8m";
+    ConsoleColor["FgBlack"] = "\u001B[30m";
+    ConsoleColor["FgRed"] = "\u001B[31m";
+    ConsoleColor["FgGreen"] = "\u001B[32m";
+    ConsoleColor["FgYellow"] = "\u001B[33m";
+    ConsoleColor["FgBlue"] = "\u001B[34m";
+    ConsoleColor["FgMagenta"] = "\u001B[35m";
+    ConsoleColor["FgCyan"] = "\u001B[36m";
+    ConsoleColor["FgWhite"] = "\u001B[37m";
+    ConsoleColor["BgBlack"] = "\u001B[40m";
+    ConsoleColor["BgRed"] = "\u001B[41m";
+    ConsoleColor["BgGreen"] = "\u001B[42m";
+    ConsoleColor["BgYellow"] = "\u001B[43m";
+    ConsoleColor["BgBlue"] = "\u001B[44m";
+    ConsoleColor["BgMagenta"] = "\u001B[45m";
+    ConsoleColor["BgCyan"] = "\u001B[46m";
+    ConsoleColor["BgWhite"] = "\u001B[47m";
+})(ConsoleColor || (ConsoleColor = {}));
+const defaultColors = {
+    keyColor: ConsoleColor.Dim,
+    numberColor: ConsoleColor.FgBlue,
+    stringColor: ConsoleColor.FgCyan,
+    trueColor: ConsoleColor.FgGreen,
+    falseColor: ConsoleColor.FgRed,
+    nullColor: ConsoleColor.BgMagenta
+};
+function jsonHighlight(input, colorOptions) {
+    const colors = Object.assign({}, defaultColors, colorOptions);
+    const json = (isString(input) ? input : JSON.stringify(input, null, 2)).replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>');
+    return json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+]?\d+)?)/g, (match) => {
+        let color = colors.numberColor;
+        if (/^"/.test(match)) {
+            if (/:$/.test(match)) {
+                color = colors.keyColor;
+            }
+            else {
+                color = colors.stringColor;
+                match = '"' + match.substr(1, match.length - 2) + '"';
+            }
+        }
+        else {
+            color = /true/.test(match)
+                ? colors.trueColor
+                : /false/.test(match)
+                    ? colors.falseColor
+                    : /null/.test(match)
+                        ? colors.nullColor
+                        : color;
+        }
+        return `${color}${match}${ConsoleColor.Reset}`;
+    });
 }
 
 var __decorate$x = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -1058,9 +1121,10 @@ class Asset extends BaseEntity {
             params = params || {};
             // Get default crop info
             const crop = Asset.toCropRegion(meta.crop);
-            // Return back the stream if there is no params and no default crop exists
-            if (Object.keys(params).length == 0 && !crop)
+            // Return the stream if there is no params and no default crop exists
+            if ((meta === null || meta === void 0 ? void 0 : meta.extension) === "svg" || (Object.keys(params).length == 0 && !crop)) {
                 return stream;
+            }
             // Parse params
             params.rotation = isNaN(params.rotation) ? 0 : Math.round(params.rotation / 90) * 90;
             params.canvasScaleX = isNaN(params.canvasScaleX) ? 1 : Number(params.canvasScaleX);
@@ -1075,51 +1139,43 @@ class Asset extends BaseEntity {
                 const cropBefore = Asset.toCropRegion(params.cropBefore || (params.crop ? meta.cropBefore : null));
                 const cropAfter = Asset.toCropRegion(params.cropAfter || (params.crop ? meta.cropAfter : null));
                 // Get metadata
-                const imgMeta = yield sharp$2(buffer).metadata();
-                let width = imgMeta.width;
-                let height = imgMeta.height;
+                let img = sharp$2(buffer);
+                let { width, height } = yield img.metadata();
                 // Crop before resize
                 if (cropBefore) {
-                    buffer = yield sharp$2(buffer)
-                        .extract(cropBefore)
-                        .toBuffer();
                     width = cropBefore.width;
                     height = cropBefore.height;
+                    img = img.extract(cropBefore);
                 }
                 else if (crop) {
-                    buffer = yield sharp$2(buffer)
-                        .extract(crop)
-                        .toBuffer();
                     width = crop.width;
                     height = crop.height;
+                    img = img.extract(crop);
                 }
                 // Resize canvas
-                if (params.canvasScaleX !== 1 || params.canvasScaleY !== 1) {
+                const canvasScaleX = (meta === null || meta === void 0 ? void 0 : meta.canvasScaleX) || 1;
+                const canvasScaleY = (meta === null || meta === void 0 ? void 0 : meta.canvasScaleY) || 1;
+                if (params.canvasScaleX !== canvasScaleX || params.canvasScaleY !== canvasScaleY) {
                     width = Math.round(width * params.canvasScaleX);
                     height = Math.round(height * params.canvasScaleY);
-                    buffer = yield sharp$2(buffer)
-                        .resize({ width, height, background: "#00000000", fit: "contain" })
-                        .toBuffer();
+                    img = img.resize({ width, height, background: "#00000000", fit: "contain" });
                 }
                 // Resize image
                 if (params.scaleX !== 1 || params.scaleY !== 1) {
                     width = Math.round(width * params.scaleX);
                     height = Math.round(height * params.scaleY);
-                    buffer = yield sharp$2(buffer)
-                        .resize({ width, height, background: "#00000000", fit: "fill" })
-                        .toBuffer();
+                    img = img.resize({ width, height, background: "#00000000", fit: "fill" });
                 }
                 // Crop after resize
                 if (cropAfter) {
-                    buffer = yield sharp$2(buffer)
-                        .extract(cropAfter)
-                        .toBuffer();
+                    img = img.extract(cropAfter);
                 }
                 // Rotate
                 if (params.rotation !== 0) {
-                    buffer = yield sharp$2(buffer).rotate(params.rotation).toBuffer();
+                    buffer = yield img.toBuffer();
+                    img = sharp$2(buffer).rotate(params.rotation);
                 }
-                return bufferToStream(buffer);
+                return bufferToStream(yield img.toBuffer());
             }
             catch (e) {
                 console.log("Asset image conversion error", e);
@@ -1499,15 +1555,15 @@ var __awaiter$o = (this && this.__awaiter) || function (thisArg, _arguments, P,
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const IORedis = ioredis;
 let JobManager = class JobManager {
     constructor(config, container, jobTypes) {
         this.config = config;
         this.container = container;
         this.jobTypes = jobTypes || [];
         this.jobs = this.jobTypes.reduce((res, jobType) => {
-            res[getConstructorName(jobType)] = {
-                perform: this.toPerformFunction(jobType)
+            res[getConstructorName(jobType)] = (jobParams) => {
+                const job = this.resolveJobInstance(jobType, jobParams);
+                return job.process();
             };
             return res;
         }, {});
@@ -1525,31 +1581,25 @@ let JobManager = class JobManager {
             return instance.process();
         });
     }
-    enqueueWithName(name, params = {}, que = "main") {
+    enqueueWithName(name, params = {}) {
         return __awaiter$o(this, void 0, void 0, function* () {
             const jobName = yield this.tryResolveFromName(name, params);
-            yield this.queue.enqueue(que, jobName, [params]);
+            return this.sendToWorkers(jobName, params);
         });
     }
-    enqueue(jobType, params = {}, que = "main") {
+    enqueue(jobType, params = {}) {
         return __awaiter$o(this, void 0, void 0, function* () {
             const jobName = yield this.tryResolveAndConnect(jobType, params);
-            yield this.queue.enqueue(que, jobName, [params]);
+            return this.sendToWorkers(jobName, params);
         });
     }
-    enqueueAt(timestamp, jobType, params = {}, que = "main") {
+    sendToWorkers(jobName, params) {
         return __awaiter$o(this, void 0, void 0, function* () {
-            const jobName = yield this.tryResolveAndConnect(jobType, params);
-            yield this.queue.enqueueAt(timestamp, que, jobName, [params]);
+            const publisher = yield this.scheduler;
+            yield publisher.send([jobName, JSON.stringify(params), new ObjectId().toHexString()]);
         });
     }
-    enqueueIn(time, jobType, params = {}, que = "main") {
-        return __awaiter$o(this, void 0, void 0, function* () {
-            const jobName = yield this.tryResolveAndConnect(jobType, params);
-            yield this.queue.enqueueIn(time, que, jobName, [params]);
-        });
-    }
-    schedule(minute, hour, dayOfMonth, month, dayOfWeek, jobType, params = {}, que = "main") {
+    schedule(minute, hour, dayOfMonth, month, dayOfWeek, jobType, params = {}) {
         const expression = [minute, hour, dayOfMonth, month, dayOfWeek].map(t => {
             if (isObject(t)) {
                 const range = t;
@@ -1566,19 +1616,38 @@ let JobManager = class JobManager {
             return null;
         }
         return schedule(expression, () => {
-            this.enqueue(jobType, params, que).catch(e => {
+            this.enqueue(jobType, params).catch(e => {
                 console.log(`Can't enqueue job: '${jobName}' because: ${e}`);
             });
         });
     }
     startProcessing() {
-        return __awaiter$o(this, void 0, void 0, function* () {
-            this.initialize();
-            yield this.worker.connect();
-            yield this.worker.start();
-            yield this.scheduler.connect();
-            yield this.scheduler.start();
-        });
+        const host = this.config.resolve("zmqRemoteHost");
+        this.worker = socket("pull");
+        this.worker.connect(host);
+        this.worker.on("message", (name, args, uniqueId) => __awaiter$o(this, void 0, void 0, function* () {
+            try {
+                const jobName = name.toString("utf8");
+                const jobParams = JSON.parse(args.toString("utf8"));
+                const timerId = uniqueId === null || uniqueId === void 0 ? void 0 : uniqueId.toString("utf8");
+                const jobNameLog = `\x1b[36m"${jobName}"\x1b[0m`;
+                const jobArgsLog = `\n${jsonHighlight(jobParams)}\n`;
+                console.time(timerId);
+                console.timeLog(timerId, `Started working on background job: ${jobNameLog} with args: ${jobArgsLog}`);
+                try {
+                    yield Promise.race([this.jobs[jobName](jobParams), promiseTimeout(15000, true)]);
+                    console.timeLog(timerId, `Finished working on background job: ${jobNameLog} with args: ${jobArgsLog}`);
+                }
+                catch (e) {
+                    console.timeLog(timerId, `Background job failed: ${jobNameLog} with args: ${jobArgsLog}${e.message}\n\n`);
+                }
+                console.timeEnd(timerId);
+            }
+            catch (e) {
+                console.log(`Failed to start job: ${e.message}`);
+            }
+        }));
+        console.log(`Waiting for jobs at: ${host}`);
     }
     tryResolve(jobType, params) {
         const jobName = getConstructorName(jobType);
@@ -1593,47 +1662,6 @@ let JobManager = class JobManager {
         }
         return jobName;
     }
-    initialize() {
-        if (this.queue)
-            return;
-        const config = this.config;
-        const options = { password: config.resolve("redisPassword") };
-        const sentinels = config.resolve("redisSentinels");
-        const redis = !sentinels
-            ? null
-            : new IORedis({
-                sentinels,
-                name: config.resolve("redisCluster"),
-            });
-        const connection = {
-            pkg: "ioredis",
-            host: config.resolve("redisHost"),
-            password: options.password,
-            port: config.resolve("redisPort"),
-            namespace: config.resolve("redisNamespace"),
-            redis,
-            options
-        };
-        const queues = config.resolve("workQueues");
-        this.queue = new Queue({ connection }, this.jobs);
-        this.worker = new Worker({ connection, queues }, this.jobs);
-        this.worker.on("job", (queue, job) => {
-            console.log(`working job ${queue} ${JSON.stringify(job)}`);
-        });
-        this.worker.on("reEnqueue", (queue, job, plugin) => {
-            console.log(`reEnqueue job (${plugin}) ${queue} ${JSON.stringify(job)}`);
-        });
-        this.worker.on("success", (queue, job, result, duration) => {
-            console.log(`job success ${queue} ${JSON.stringify(job)} >> ${result} (${duration}ms)`);
-        });
-        this.worker.on("failure", (queue, job, failure, duration) => {
-            console.log(`job failure ${queue} ${JSON.stringify(job)} >> ${failure} (${duration}ms)`);
-        });
-        this.worker.on("error", (error, queue, job) => {
-            console.log(`error ${queue} ${JSON.stringify(job)}  >> ${error}`);
-        });
-        this.scheduler = new Scheduler({ connection }, this.jobs);
-    }
     tryResolveFromName(jobName, params) {
         const jobType = this.jobTypes.find(type => {
             return getConstructorName(type) == jobName;
@@ -1645,10 +1673,14 @@ let JobManager = class JobManager {
     }
     tryResolveAndConnect(jobType, params) {
         return __awaiter$o(this, void 0, void 0, function* () {
-            this.initialize();
-            const jobName = this.tryResolve(jobType, params);
-            yield this.queue.connect();
-            return jobName;
+            this.scheduler = this.scheduler || new Promise((resolve) => __awaiter$o(this, void 0, void 0, function* () {
+                const port = this.config.resolve("zmqPort");
+                const publisher = socket("push");
+                yield publisher.bind(`tcp://0.0.0.0:${port}`);
+                console.log(`Publisher bound to port: ${port}`);
+                resolve(publisher);
+            }));
+            return this.tryResolve(jobType, params);
         });
     }
     resolveJobInstance(jobType, params) {
@@ -1659,12 +1691,6 @@ let JobManager = class JobManager {
         container.register(jobType, jobType);
         return container.resolve(jobType);
     }
-    toPerformFunction(jobType) {
-        return (jobParams) => {
-            const job = this.resolveJobInstance(jobType, jobParams);
-            return job.process();
-        };
-    }
 };
 JobManager = __decorate$s([
     injectable(),
@@ -2986,7 +3012,9 @@ let AssetsController = class AssetsController {
     getImageRotation(id, params, res, rotation = 0) {
         return __awaiter$7(this, void 0, void 0, function* () {
             const asset = yield this.getAsset("Image", id, params.lazy, res);
-            params.rotation = params.rotation || rotation;
+            if (rotation !== 0) {
+                params.rotation = params.rotation || rotation;
+            }
             return asset.downloadImage(params);
         });
     }
@@ -3797,20 +3825,8 @@ function createServices() {
         new Parameter("mongoPassword", null),
         new Parameter("nodeEnv", "development"),
         new Parameter("appPort", 80),
-        new Parameter("redisHost", "127.0.0.1"),
-        new Parameter("redisPort", 6379),
-        new Parameter("redisPassword", "123456"),
-        new Parameter("redisNamespace", "resque"),
-        new Parameter("redisCluster", "mymaster"),
-        new Parameter("redisSentinels", null, value => {
-            if (!value)
-                return null;
-            return value.split(", ").map(item => {
-                const values = item.split(":");
-                return { host: values[0], port: Number(values[1]) };
-            });
-        }),
-        new Parameter("workQueues", ["main"]),
+        new Parameter("zmqPort", 3000),
+        new Parameter("zmqRemoteHost", "tcp://127.0.0.1:3000"),
         new Parameter("isWorker", false),
         new Parameter("mainEndpoint", ""),
         new Parameter("idChars", "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"),
@@ -4016,5 +4032,5 @@ function setupBackend(config, providers, parent) {
  * Generated bundle index. Do not edit.
  */
 
-export { AssetProcessor, AssetResolver, Assets, AuthController, BackendProvider, Cache, CacheProcessor, Configuration, DI_CONTAINER, EXPRESS, EndpointProvider, ErrorHandlerMiddleware, FIXTURE, Fixtures, Gallery, GalleryCache, GalleryController, HTTP_SERVER, IdGenerator, IsFile, IsObjectId, JOB, JobManager, LanguageMiddleware, LazyAssetGenerator, LazyAssets, MailSender, MemoryCache, MongoConnector, PARAMETER, Parameter, Progresses, ResolveEntity, SOCKET_SERVER, TemplateRenderer, TranslationProvider, Translator, Type, UserManager, assign, broadcast, bufferToStream, convertValue, copy, copyStream, createServices, createTransformer, deleteFile, deleteFromBucket, filter, firstItem, getConstructorName, getExtension, getFileName, getFunctionParams, getType, getValue, groupBy, hydratePopulated, idToString, injectServices, isArray, isBoolean, isConstructor, isDate, isDefined, isFunction, isInterface, isNullOrUndefined, isObject, isPrimitive, isString, isType, lastItem, lcFirst, lookupPipelines, md5, mkdirRecursive, multiSubscription, observableFromFunction, padLeft, padRight, paginate, paginateAggregations, promiseTimeout, proxyFunction, proxyFunctions, rand, random, readAndDeleteFile, readFile, runCommand, setupBackend, streamToBuffer, ucFirst, valueToPromise, writeFile };
+export { AssetProcessor, AssetResolver, Assets, AuthController, BackendProvider, Cache, CacheProcessor, Configuration, ConsoleColor, DI_CONTAINER, EXPRESS, EndpointProvider, ErrorHandlerMiddleware, FIXTURE, Fixtures, Gallery, GalleryCache, GalleryController, HTTP_SERVER, IdGenerator, IsFile, IsObjectId, JOB, JobManager, LanguageMiddleware, LazyAssetGenerator, LazyAssets, MailSender, MemoryCache, MongoConnector, PARAMETER, Parameter, Progresses, ResolveEntity, SOCKET_SERVER, TemplateRenderer, TranslationProvider, Translator, Type, UserManager, assign, broadcast, bufferToStream, convertValue, copy, copyStream, createServices, createTransformer, deleteFile, deleteFromBucket, filter, firstItem, getConstructorName, getExtension, getFileName, getFunctionParams, getType, getValue, groupBy, hydratePopulated, idToString, injectServices, isArray, isBoolean, isConstructor, isDate, isDefined, isFunction, isInterface, isNullOrUndefined, isObject, isPrimitive, isString, isType, jsonHighlight, lastItem, lcFirst, lookupPipelines, md5, mkdirRecursive, multiSubscription, observableFromFunction, padLeft, padRight, paginate, paginateAggregations, promiseTimeout, proxyFunction, proxyFunctions, rand, random, readAndDeleteFile, readFile, runCommand, setupBackend, streamToBuffer, ucFirst, valueToPromise, writeFile };
 //# sourceMappingURL=stemy-backend.js.map