@resolveio/server-lib 9.0.32 → 9.0.34

package/methods/pdf.js

@@ -1,53 +1,14 @@
-"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 __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadPDFMethods = void 0;
-var fs = require('fs');
-var bent = require("bent");
-var simpl_schema_1 = require("simpl-schema");
-var file_collection_1 = require("../collections/file.collection");
-var mongo_manager_1 = require("../managers/mongo.manager");
-var pdfCnt = 0;
-function loadPDFMethods(methodManager) {
+let fs = require('fs');
+import * as bent from 'bent';
+import SimpleSchema from 'simpl-schema';
+import { Files } from '../collections/file.collection';
+import { objectIdHexString } from '../managers/mongo.manager';
+let pdfCnt = 0;
+export function loadPDFMethods(methodManager) {
     methodManager.methods({
         generatePDF: {
             skipQueue: true,
-            check: new simpl_schema_1.default({
+            check: new SimpleSchema({
                 html: {
                     type: String
                 },
@@ -75,26 +36,21 @@ function loadPDFMethods(methodManager) {
                     optional: true
                 }
             }),
-            function: function (html, fileName, orientation, fontSize, upload, uploadFileOrder, uploadFileType) {
-                if (orientation === void 0) { orientation = 'portrait'; }
-                if (fontSize === void 0) { fontSize = '8px'; }
-                if (upload === void 0) { upload = false; }
-                if (uploadFileOrder === void 0) { uploadFileOrder = -1; }
-                if (uploadFileType === void 0) { uploadFileType = ''; }
-                var that = this;
-                return new Promise(function (resolve, reject) {
-                    var phantom = require('phantom');
-                    var phInstance = null;
-                    phantom.create().then(function (instance) {
+            function: function (html, fileName, orientation = 'portrait', fontSize = '8px', upload = false, uploadFileOrder = -1, uploadFileType = '') {
+                let that = this;
+                return new Promise((resolve, reject) => {
+                    let phantom = require('phantom');
+                    let phInstance = null;
+                    phantom.create().then(instance => {
                         phInstance = instance;
                         return instance.createPage();
-                    }).then(function (page) {
-                        var requestsArray = [];
-                        page.on('onResourceRequested', function (requestData, networkRequest) {
+                    }).then(page => {
+                        let requestsArray = [];
+                        page.on('onResourceRequested', (requestData, networkRequest) => {
                             requestsArray.push(requestData.id);
                         });
-                        page.on('onResourceReceived', function (response) {
-                            var index = requestsArray.indexOf(response.id);
+                        page.on('onResourceReceived', (response) => {
+                            let index = requestsArray.indexOf(response.id);
                             requestsArray.splice(index, 1);
                         });
                         page.property('paperSize', {
@@ -103,30 +59,131 @@ function loadPDFMethods(methodManager) {
                             orientation: orientation,
                             footer: {
                                 height: '1cm',
-                                contents: phInstance.callback(function (pageNum, numPages) {
+                                contents: phInstance.callback((pageNum, numPages) => {
                                     return '<span style=\'float:right; font-size: 12px;\'>Page ' + pageNum + ' of ' + numPages + '</span>';
                                 })
                             }
                         });
-                        page.property('content', "\n\t\t\t\t\t\t<head>\n\t\t\t\t\t\t\t<style>\n\t\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif', serif;\n\t\t\t\t\t\t\t\t\tfont-style: normal;\n\t\t\t\t\t\t\t\t\tfont-weight: normal;\n\t\t\t\t\t\t\t\t\tsrc: url(\"/usr/share/fonts/dejavu/DejaVuSerif.ttf\");\n\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif', serif;\n\t\t\t\t\t\t\t\t\tfont-style: normal;\n\t\t\t\t\t\t\t\t\tfont-weight: bold;\n\t\t\t\t\t\t\t\t\tsrc: url(\"/usr/share/fonts/dejavu/DejaVuSerif-Bold.ttf\");\n\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif', serif;\n\t\t\t\t\t\t\t\t\tfont-style: italic;\n\t\t\t\t\t\t\t\t\tfont-weight: normal;\n\t\t\t\t\t\t\t\t\tsrc: url(\"/usr/share/fonts/dejavu/DejaVuSerif-Italic.ttf\");\n\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t@font-face {\n\t\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif', serif;\n\t\t\t\t\t\t\t\t\tfont-style: italic;\n\t\t\t\t\t\t\t\t\tfont-weight: bold;\n\t\t\t\t\t\t\t\t\tsrc: url(\"/usr/share/fonts/dejavu/DejaVuSerif-BoldItalic.ttf\");\n\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\tbody {\n\t\t\t\t\t\t\t\t\tfont-family: 'Dejavu Serif', serif;\n\t\t\t\t\t\t\t\t\tfont-size:  " + (fontSize ? fontSize : '8px') + ";\n\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t.row {\n\t\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t\t\tdisplay: flex;\n\t\t\t\t\t\t\t\t\tflex-wrap: wrap;\n\t\t\t\t\t\t\t\t\t-webkit-flex-wrap: wrap;\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t.page-break {\n\t\t\t\t\t\t\t\t\tpage-break-before: always !important;\n\t\t\t\t\t\t\t\t\tmargin-bottom: 1px;\n\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t.cell {\n\t\t\t\t\t\t\t\t\tbox-sizing: border-box;\n\t\t\t\t\t\t\t\t\tpadding : 2px;\n\t\t\t\t\t\t\t\t\t-webkit-flex: 1;\n\t\t\t\t\t\t\t\t\tword-wrap: break-word;\n\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t.cell-no-padding {\n\t\t\t\t\t\t\t\t\tbox-sizing: border-box;\n\t\t\t\t\t\t\t\t\t-webkit-flex: 1;\n\t\t\t\t\t\t\t\t\tword-wrap: break-word;\n\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t.centered {\n\t\t\t\t\t\t\t\t\t-webkit-justify-content: center;\n\t\t\t\t\t\t\t\t\t-webkit-align-items: center;\n\t\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t\t\ttext-align: center;\n\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t.centered-left {\n\t\t\t\t\t\t\t\t\t-webkit-align-items: center;\n\t\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t\t\t-webkit-justify-content: flex-start;\n\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t.centered-right {\n\t\t\t\t\t\t\t\t\t-webkit-justify-content: flex-end;\n\t\t\t\t\t\t\t\t\t-webkit-align-items: center;\n\t\t\t\t\t\t\t\t\tdisplay: -webkit-flex;\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t.box {\n\t\t\t\t\t\t\t\t\tborder: 1px solid black;\n\t\t\t\t\t\t\t\t\tmargin: -1px 0px 0px -1px;\n\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\t.boxNoBorder {\n\t\t\t\t\t\t\t\t\tmargin: -1px 0px 0px -1px;\n\t\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t\tpre {\n\t\t\t\t\t\t\t\t\twhite-space: pre-wrap;       /* css-3 */\n\t\t\t\t\t\t\t\t\twhite-space: -moz-pre-wrap;  /* Mozilla, since 1999 */\n\t\t\t\t\t\t\t\t\twhite-space: -pre-wrap;      /* Opera 4-6 */\n\t\t\t\t\t\t\t\t\twhite-space: -o-pre-wrap;    /* Opera 7 */\n\t\t\t\t\t\t\t\t\tword-wrap: break-word;       /* Internet Explorer 5.5+ */\n\t\t\t\t\t\t\t\t\tfont-size: 12px;\n\t\t\t\t\t\t\t\t\tfont-family: Open Sans; \n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t</style>\n\t\t\t\t\t\t</head>\n\t\t\t\t\t\t<body>\n\t\t\t\t\t" + html.replace(new RegExp('flex-basis:', 'g'), '-webkit-flex-basis:').replace(new RegExp('flex:', 'g'), '-webkit-flex:') + '</body>');
-                        var tmpFileName = (pdfCnt++) + '-' + fileName.replace(new RegExp(/\W/g), '');
-                        var interval = setInterval(function () {
+                        page.property('content', `
+						<head>
+							<style>
+								@font-face {
+									font-family: 'Dejavu Serif', serif;
+									font-style: normal;
+									font-weight: normal;
+									src: url("/usr/share/fonts/dejavu/DejaVuSerif.ttf");
+								}
+
+								@font-face {
+									font-family: 'Dejavu Serif', serif;
+									font-style: normal;
+									font-weight: bold;
+									src: url("/usr/share/fonts/dejavu/DejaVuSerif-Bold.ttf");
+								}
+
+								@font-face {
+									font-family: 'Dejavu Serif', serif;
+									font-style: italic;
+									font-weight: normal;
+									src: url("/usr/share/fonts/dejavu/DejaVuSerif-Italic.ttf");
+								}
+
+								@font-face {
+									font-family: 'Dejavu Serif', serif;
+									font-style: italic;
+									font-weight: bold;
+									src: url("/usr/share/fonts/dejavu/DejaVuSerif-BoldItalic.ttf");
+								}
+
+								body {
+									font-family: 'Dejavu Serif', serif;
+									font-size:  ` + (fontSize ? fontSize : '8px') + `;
+								}
+
+								.row {
+									display: -webkit-flex;
+									display: flex;
+									flex-wrap: wrap;
+									-webkit-flex-wrap: wrap;
+								}
+						
+								.page-break {
+									page-break-before: always !important;
+									margin-bottom: 1px;
+								}
+
+								.cell {
+									box-sizing: border-box;
+									padding : 2px;
+									-webkit-flex: 1;
+									word-wrap: break-word;
+								}
+
+								.cell-no-padding {
+									box-sizing: border-box;
+									-webkit-flex: 1;
+									word-wrap: break-word;
+								}
+
+								.centered {
+									-webkit-justify-content: center;
+									-webkit-align-items: center;
+									display: -webkit-flex;
+									text-align: center;
+								}
+
+								.centered-left {
+									-webkit-align-items: center;
+									display: -webkit-flex;
+									-webkit-justify-content: flex-start;
+								}
+
+								.centered-right {
+									-webkit-justify-content: flex-end;
+									-webkit-align-items: center;
+									display: -webkit-flex;
+								}
+								
+								.box {
+									border: 1px solid black;
+									margin: -1px 0px 0px -1px;
+								}
+
+								.boxNoBorder {
+									margin: -1px 0px 0px -1px;
+								}
+
+								pre {
+									white-space: pre-wrap;       /* css-3 */
+									white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+									white-space: -pre-wrap;      /* Opera 4-6 */
+									white-space: -o-pre-wrap;    /* Opera 7 */
+									word-wrap: break-word;       /* Internet Explorer 5.5+ */
+									font-size: 12px;
+									font-family: Open Sans; 
+								}
+							</style>
+						</head>
+						<body>
+					` + html.replace(new RegExp('flex-basis:', 'g'), '-webkit-flex-basis:').replace(new RegExp('flex:', 'g'), '-webkit-flex:') + '</body>');
+                        let tmpFileName = (pdfCnt++) + '-' + fileName.replace(new RegExp(/\W/g), '');
+                        let interval = setInterval(() => {
                             if (requestsArray.length === 0) {
                                 clearInterval(interval);
                                 page.render(tmpFileName, {
                                     format: 'pdf',
                                     quality: '100'
-                                }).then(function () {
+                                }).then(() => {
                                     if (fs.existsSync(tmpFileName)) {
-                                        fs.readFile(tmpFileName, function (errRead, data) {
+                                        fs.readFile(tmpFileName, (errRead, data) => {
                                             if (!errRead) {
                                                 fs.unlinkSync(tmpFileName);
                                                 if (!upload) {
                                                     resolve('data:application/pdf;base64,' + Buffer.from(data).toString('base64'));
                                                 }
                                                 else {
-                                                    var fileData = 'data:application/pdf;base64,' + Buffer.from(data).toString('base64');
-                                                    that.callMethodInternal.call(that, 'uploadFileAndSave', fileName, fileData, (4 * Math.ceil(fileData.length / 3)), uploadFileOrder, uploadFileType, false, function (err, res) {
+                                                    let fileData = 'data:application/pdf;base64,' + Buffer.from(data).toString('base64');
+                                                    that.callMethodInternal.call(that, 'uploadFileAndSave', fileName, fileData, (4 * Math.ceil(fileData.length / 3)), uploadFileOrder, uploadFileType, false, (err, res) => {
                                                         if (err) {
                                                             reject(err);
                                                         }
@@ -146,13 +203,13 @@ function loadPDFMethods(methodManager) {
                                         reject('No tmp file');
                                         console.log('No tmp file ', tmpFileName);
                                     }
-                                }, function (err) {
+                                }, err => {
                                     console.log(err);
                                 });
                             }
                         }, 1000);
                     })
-                        .catch(function (error) {
+                        .catch(error => {
                         reject(error);
                         phInstance.exit();
                     });
@@ -161,7 +218,7 @@ function loadPDFMethods(methodManager) {
         },
         compressBase64AndUploadPDF: {
             skipQueue: true,
-            check: new simpl_schema_1.default({
+            check: new SimpleSchema({
                 id_file: {
                     type: String
                 },
@@ -176,58 +233,45 @@ function loadPDFMethods(methodManager) {
                 }
             }),
             function: function (id_file, fileName, filePath, fileContent) {
-                var _this = this;
-                return new Promise(function (resolve, reject) {
-                    _this.callMethodInternal('getCCProcessURL').then(function (resCC) { return __awaiter(_this, void 0, void 0, function () {
-                        var request, body, error_1;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    request = bent('https:' + resCC.url, 'POST', 'json', 200);
-                                    _a.label = 1;
-                                case 1:
-                                    _a.trys.push([1, 3, , 4]);
-                                    return [4 /*yield*/, request('', {
-                                            mode: 'compress',
-                                            input: 'base64',
-                                            file: fileContent,
-                                            filename: fileName,
-                                            outputformat: 'pdf',
-                                            wait: true,
-                                            output: {
-                                                's3': {
-                                                    'accesskeyid': this.serverConfig['AWSACCESSKEYID'],
-                                                    'secretaccesskey': this.serverConfig['AWSSECRETACCESSKEY'],
-                                                    'region': this.serverConfig['AWSREGION'],
-                                                    'bucket': this.serverConfig['AWSBUCKET'],
-                                                    'path': filePath
-                                                }
-                                            }
-                                        })];
-                                case 2:
-                                    body = _a.sent();
-                                    if (body.output.size) {
-                                        file_collection_1.Files.updateOne({ _id: id_file }, { $set: { size: body.output.size } });
-                                        resolve();
+                return new Promise((resolve, reject) => {
+                    this.callMethodInternal('getCCProcessURL').then(async (resCC) => {
+                        const request = bent('https:' + resCC.url, 'POST', 'json', 200);
+                        try {
+                            let body = await request('', {
+                                mode: 'compress',
+                                input: 'base64',
+                                file: fileContent,
+                                filename: fileName,
+                                outputformat: 'pdf',
+                                wait: true,
+                                output: {
+                                    's3': {
+                                        'accesskeyid': this.serverConfig['AWSACCESSKEYID'],
+                                        'secretaccesskey': this.serverConfig['AWSSECRETACCESSKEY'],
+                                        'region': this.serverConfig['AWSREGION'],
+                                        'bucket': this.serverConfig['AWSBUCKET'],
+                                        'path': filePath
                                     }
-                                    else {
-                                        reject('Compressed file has no size, compress failed');
-                                    }
-                                    return [3 /*break*/, 4];
-                                case 3:
-                                    error_1 = _a.sent();
-                                    reject(error_1);
-                                    return [3 /*break*/, 4];
-                                case 4: return [2 /*return*/];
+                                }
+                            });
+                            if (body.output.size) {
+                                Files.updateOne({ _id: id_file }, { $set: { size: body.output.size } });
+                                resolve();
                             }
-                        });
-                    }); }, function (errCC) { return reject(errCC); });
+                            else {
+                                reject('Compressed file has no size, compress failed');
+                            }
+                        }
+                        catch (error) {
+                            reject(error);
+                        }
+                    }, errCC => reject(errCC));
                 });
             }
         },
         compressPDFOnS3: {
             skipQueue: true,
-            check: new simpl_schema_1.default({
+            check: new SimpleSchema({
                 id_file: {
                     type: String
                 },
@@ -239,65 +283,52 @@ function loadPDFMethods(methodManager) {
                 }
             }),
             function: function (id_file, fileName, filePath) {
-                var _this = this;
-                return new Promise(function (resolve, reject) {
-                    _this.callMethodInternal('getCCProcessURL').then(function (resCC) { return __awaiter(_this, void 0, void 0, function () {
-                        var request, body, error_2;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    request = bent('https:' + resCC.url, 'POST', 'json', 200);
-                                    _a.label = 1;
-                                case 1:
-                                    _a.trys.push([1, 3, , 4]);
-                                    return [4 /*yield*/, request('', {
-                                            mode: 'compress',
-                                            input: {
-                                                's3': {
-                                                    'accesskeyid': this.serverConfig['AWSACCESSKEYID'],
-                                                    'secretaccesskey': this.serverConfig['AWSSECRETACCESSKEY'],
-                                                    'region': this.serverConfig['AWSREGION'],
-                                                    'bucket': this.serverConfig['AWSBUCKET']
-                                                }
-                                            },
-                                            file: filePath,
-                                            filename: fileName,
-                                            outputformat: 'pdf',
-                                            wait: true,
-                                            output: {
-                                                's3': {
-                                                    'accesskeyid': this.serverConfig['AWSACCESSKEYID'],
-                                                    'secretaccesskey': this.serverConfig['AWSSECRETACCESSKEY'],
-                                                    'region': this.serverConfig['AWSREGION'],
-                                                    'bucket': this.serverConfig['AWSBUCKET'],
-                                                    'path': filePath
-                                                }
-                                            }
-                                        })];
-                                case 2:
-                                    body = _a.sent();
-                                    if (body.output.size) {
-                                        file_collection_1.Files.updateOne({ _id: id_file }, { $set: { size: body.output.size } });
-                                        resolve();
+                return new Promise((resolve, reject) => {
+                    this.callMethodInternal('getCCProcessURL').then(async (resCC) => {
+                        const request = bent('https:' + resCC.url, 'POST', 'json', 200);
+                        try {
+                            let body = await request('', {
+                                mode: 'compress',
+                                input: {
+                                    's3': {
+                                        'accesskeyid': this.serverConfig['AWSACCESSKEYID'],
+                                        'secretaccesskey': this.serverConfig['AWSSECRETACCESSKEY'],
+                                        'region': this.serverConfig['AWSREGION'],
+                                        'bucket': this.serverConfig['AWSBUCKET']
                                     }
-                                    else {
-                                        reject('Compressed file has no size, compress failed');
+                                },
+                                file: filePath,
+                                filename: fileName,
+                                outputformat: 'pdf',
+                                wait: true,
+                                output: {
+                                    's3': {
+                                        'accesskeyid': this.serverConfig['AWSACCESSKEYID'],
+                                        'secretaccesskey': this.serverConfig['AWSSECRETACCESSKEY'],
+                                        'region': this.serverConfig['AWSREGION'],
+                                        'bucket': this.serverConfig['AWSBUCKET'],
+                                        'path': filePath
                                     }
-                                    return [3 /*break*/, 4];
-                                case 3:
-                                    error_2 = _a.sent();
-                                    reject(error_2);
-                                    return [3 /*break*/, 4];
-                                case 4: return [2 /*return*/];
+                                }
+                            });
+                            if (body.output.size) {
+                                Files.updateOne({ _id: id_file }, { $set: { size: body.output.size } });
+                                resolve();
                             }
-                        });
-                    }); }, function (errCC) { return reject(errCC); });
+                            else {
+                                reject('Compressed file has no size, compress failed');
+                            }
+                        }
+                        catch (error) {
+                            reject(error);
+                        }
+                    }, errCC => reject(errCC));
                 });
             }
         },
         mergePDF: {
             skipQueue: true,
-            check: new simpl_schema_1.default({
+            check: new SimpleSchema({
                 fileKeys: {
                     type: Array
                 },
@@ -313,21 +344,20 @@ function loadPDFMethods(methodManager) {
                 }
             }),
             function: function (fileKeys, fileName, fileType) {
-                var _this = this;
-                return new Promise(function (resolve, reject) {
-                    var mergeFileName = 'uploads/' + Date.now() + '-' + (pdfCnt++) + '-' + fileName;
-                    _this.callMethodInternal('createCloudConvertJob', fileKeys, ['merge', 'optimize'], mergeFileName, fileName).then(function (resCCJob) {
-                        var resFile = {
-                            _id: mongo_manager_1.objectIdHexString(),
+                return new Promise((resolve, reject) => {
+                    let mergeFileName = 'uploads/' + Date.now() + '-' + (pdfCnt++) + '-' + fileName;
+                    this.callMethodInternal('createCloudConvertJob', fileKeys, ['merge', 'optimize'], mergeFileName, fileName).then(resCCJob => {
+                        let resFile = {
+                            _id: objectIdHexString(),
                             __v: 0,
                             name: fileName,
-                            size: resCCJob.data.tasks.filter(function (a) { return a.name === 'task-2'; })[0].result.files[0].size,
+                            size: resCCJob.data.tasks.filter(a => a.name === 'task-2')[0].result.files[0].size,
                             key: mergeFileName,
                             type: fileType ? fileType : '',
                             order: -1
                         };
                         if (resFile.size) {
-                            _this.callMethodInternal('insertDocument', 'files', resFile, function (errUpFile, resUpFile) {
+                            this.callMethodInternal('insertDocument', 'files', resFile, (errUpFile, resUpFile) => {
                                 if (resUpFile) {
                                     resFile.status = 'Uploaded';
                                     resolve(resFile);
@@ -340,13 +370,13 @@ function loadPDFMethods(methodManager) {
                         else {
                             reject('Merged file has no size, merge failed');
                         }
-                    }, function () { });
+                    }, () => { });
                 });
             }
         },
         mergePDFV1: {
             skipQueue: true,
-            check: new simpl_schema_1.default({
+            check: new SimpleSchema({
                 fileKeys: {
                     type: Array
                 },
@@ -362,95 +392,81 @@ function loadPDFMethods(methodManager) {
                 }
             }),
             function: function (fileKeys, fileName, fileType) {
-                var _this = this;
-                return new Promise(function (resolve, reject) {
-                    _this.callMethodInternal.call(_this, 'getCCProcessURL').then(function (resCC) { return __awaiter(_this, void 0, void 0, function () {
-                        var mergeFileName, request, body, resFile_1, error_3;
-                        var _this = this;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    mergeFileName = 'uploads/' + Date.now() + '-' + (pdfCnt++) + '-' + fileName;
-                                    request = bent('https:' + resCC.url, 'POST', 'json', 200);
-                                    _a.label = 1;
-                                case 1:
-                                    _a.trys.push([1, 3, , 4]);
-                                    return [4 /*yield*/, request('', {
-                                            mode: 'combine',
-                                            input: {
-                                                s3: {
-                                                    'accesskeyid': this.serverConfig['AWSACCESSKEYID'],
-                                                    'secretaccesskey': this.serverConfig['AWSSECRETACCESSKEY'],
-                                                    'region': this.serverConfig['AWSREGION'],
-                                                    'bucket': this.serverConfig['AWSBUCKET']
-                                                }
-                                            },
-                                            files: fileKeys,
-                                            outputformat: 'pdf',
-                                            wait: true,
-                                            output: {
-                                                's3': {
-                                                    'accesskeyid': this.serverConfig['AWSACCESSKEYID'],
-                                                    'secretaccesskey': this.serverConfig['AWSSECRETACCESSKEY'],
-                                                    'region': this.serverConfig['AWSREGION'],
-                                                    'bucket': this.serverConfig['AWSBUCKET'],
-                                                    'path': mergeFileName
-                                                }
-                                            },
-                                            converteroptions: {
-                                                'resize': '612x792',
-                                                'resizemode': 'scale',
-                                                'resizeenlarge': null,
-                                                'grayscale': null,
-                                                'auto_orient': null,
-                                                'strip_metatags': false,
-                                                'density': 72,
-                                                'rotate': null,
-                                                'command': null
-                                            }
-                                        })];
-                                case 2:
-                                    body = _a.sent();
-                                    resFile_1 = {
-                                        _id: mongo_manager_1.objectIdHexString(),
-                                        __v: 0,
-                                        name: fileName,
-                                        size: body.output.size,
-                                        key: mergeFileName,
-                                        type: fileType ? fileType : '',
-                                        order: -1
-                                    };
-                                    if (body.output.size) {
-                                        this.callMethodInternal('insertDocument', 'files', resFile_1, function (errUpFile, resUpFile) {
-                                            if (resUpFile) {
-                                                resFile_1.status = 'Uploaded';
-                                                _this.callMethodInternal('compressPDFOnS3', resFile_1._id, fileName, mergeFileName, function (errCompress, resCompress) {
-                                                    resolve(resFile_1);
-                                                });
-                                            }
-                                            else {
-                                                reject(errUpFile);
-                                            }
+                return new Promise((resolve, reject) => {
+                    this.callMethodInternal.call(this, 'getCCProcessURL').then(async (resCC) => {
+                        let mergeFileName = 'uploads/' + Date.now() + '-' + (pdfCnt++) + '-' + fileName;
+                        const request = bent('https:' + resCC.url, 'POST', 'json', 200);
+                        try {
+                            let body = await request('', {
+                                mode: 'combine',
+                                input: {
+                                    s3: {
+                                        'accesskeyid': this.serverConfig['AWSACCESSKEYID'],
+                                        'secretaccesskey': this.serverConfig['AWSSECRETACCESSKEY'],
+                                        'region': this.serverConfig['AWSREGION'],
+                                        'bucket': this.serverConfig['AWSBUCKET']
+                                    }
+                                },
+                                files: fileKeys,
+                                outputformat: 'pdf',
+                                wait: true,
+                                output: {
+                                    's3': {
+                                        'accesskeyid': this.serverConfig['AWSACCESSKEYID'],
+                                        'secretaccesskey': this.serverConfig['AWSSECRETACCESSKEY'],
+                                        'region': this.serverConfig['AWSREGION'],
+                                        'bucket': this.serverConfig['AWSBUCKET'],
+                                        'path': mergeFileName
+                                    }
+                                },
+                                converteroptions: {
+                                    'resize': '612x792',
+                                    'resizemode': 'scale',
+                                    'resizeenlarge': null,
+                                    'grayscale': null,
+                                    'auto_orient': null,
+                                    'strip_metatags': false,
+                                    'density': 72,
+                                    'rotate': null,
+                                    'command': null
+                                }
+                            });
+                            let resFile = {
+                                _id: objectIdHexString(),
+                                __v: 0,
+                                name: fileName,
+                                size: body.output.size,
+                                key: mergeFileName,
+                                type: fileType ? fileType : '',
+                                order: -1
+                            };
+                            if (body.output.size) {
+                                this.callMethodInternal('insertDocument', 'files', resFile, (errUpFile, resUpFile) => {
+                                    if (resUpFile) {
+                                        resFile.status = 'Uploaded';
+                                        this.callMethodInternal('compressPDFOnS3', resFile._id, fileName, mergeFileName, (errCompress, resCompress) => {
+                                            resolve(resFile);
                                         });
                                     }
                                     else {
-                                        reject('Merged file has no size, merge failed');
+                                        reject(errUpFile);
                                     }
-                                    return [3 /*break*/, 4];
-                                case 3:
-                                    error_3 = _a.sent();
-                                    reject(error_3);
-                                    return [3 /*break*/, 4];
-                                case 4: return [2 /*return*/];
+                                });
                             }
-                        });
-                    }); }, function (errCC) { return reject(errCC); });
+                            else {
+                                reject('Merged file has no size, merge failed');
+                            }
+                        }
+                        catch (error) {
+                            reject(error);
+                        }
+                    }, errCC => reject(errCC));
                 });
             }
         },
         mergePDFNoUpload: {
             skipQueue: true,
-            check: new simpl_schema_1.default({
+            check: new SimpleSchema({
                 fileKeys: {
                     type: Array
                 },
@@ -466,91 +482,76 @@ function loadPDFMethods(methodManager) {
                 }
             }),
             function: function (fileKeys, fileName, fileType) {
-                var _this = this;
-                return new Promise(function (resolve, reject) {
-                    _this.callMethodInternal('getCCProcessURL').then(function (resCC) { return __awaiter(_this, void 0, void 0, function () {
-                        var mergeFileName, request, body, resFile_2, error_4;
-                        var _this = this;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    mergeFileName = 'uploads/' + Date.now() + '-' + (pdfCnt++) + '-' + fileName;
-                                    request = bent('https:' + resCC.url, 'POST', 'json', 200);
-                                    _a.label = 1;
-                                case 1:
-                                    _a.trys.push([1, 3, , 4]);
-                                    return [4 /*yield*/, request('', {
-                                            mode: 'combine',
-                                            input: {
-                                                s3: {
-                                                    'accesskeyid': this.serverConfig['AWSACCESSKEYID'],
-                                                    'secretaccesskey': this.serverConfig['AWSSECRETACCESSKEY'],
-                                                    'region': this.serverConfig['AWSREGION'],
-                                                    'bucket': this.serverConfig['AWSBUCKET']
-                                                }
-                                            },
-                                            files: fileKeys,
-                                            outputformat: 'pdf',
-                                            wait: true,
-                                            output: {
-                                                's3': {
-                                                    'accesskeyid': this.serverConfig['AWSACCESSKEYID'],
-                                                    'secretaccesskey': this.serverConfig['AWSSECRETACCESSKEY'],
-                                                    'region': this.serverConfig['AWSREGION'],
-                                                    'bucket': this.serverConfig['AWSBUCKET'],
-                                                    'path': mergeFileName
-                                                }
-                                            },
-                                            converteroptions: {
-                                                'resize': '612x792',
-                                                'resizemode': 'scale',
-                                                'resizeenlarge': null,
-                                                'grayscale': null,
-                                                'auto_orient': null,
-                                                'strip_metatags': false,
-                                                'density': 72,
-                                                'rotate': null,
-                                                'command': null
-                                            },
-                                        })];
-                                case 2:
-                                    body = _a.sent();
-                                    resFile_2 = {
-                                        _id: mongo_manager_1.objectIdHexString(),
-                                        __v: 0,
-                                        name: fileName,
-                                        size: body.output.size,
-                                        key: mergeFileName,
-                                        type: fileType ? fileType : '',
-                                        order: -1
-                                    };
-                                    this.callMethodInternal('insertDocument', 'files', resFile_2, function (errUpFile, resUpFile) {
-                                        if (resUpFile) {
-                                            resFile_2.status = 'Uploaded';
-                                            resolve(resFile_2);
-                                            var that_1 = _this;
-                                            setTimeout(function () {
-                                                that_1.callMethodInternal.call(that_1, 'deleteFile', mergeFileName);
-                                            }, 60000);
-                                        }
-                                        else {
-                                            reject(errUpFile);
-                                        }
-                                    });
-                                    return [3 /*break*/, 4];
-                                case 3:
-                                    error_4 = _a.sent();
-                                    reject(error_4);
-                                    return [3 /*break*/, 4];
-                                case 4: return [2 /*return*/];
-                            }
-                        });
-                    }); }, function (errCC) { return reject(errCC); });
+                return new Promise((resolve, reject) => {
+                    this.callMethodInternal('getCCProcessURL').then(async (resCC) => {
+                        let mergeFileName = 'uploads/' + Date.now() + '-' + (pdfCnt++) + '-' + fileName;
+                        const request = bent('https:' + resCC.url, 'POST', 'json', 200);
+                        try {
+                            let body = await request('', {
+                                mode: 'combine',
+                                input: {
+                                    s3: {
+                                        'accesskeyid': this.serverConfig['AWSACCESSKEYID'],
+                                        'secretaccesskey': this.serverConfig['AWSSECRETACCESSKEY'],
+                                        'region': this.serverConfig['AWSREGION'],
+                                        'bucket': this.serverConfig['AWSBUCKET']
+                                    }
+                                },
+                                files: fileKeys,
+                                outputformat: 'pdf',
+                                wait: true,
+                                output: {
+                                    's3': {
+                                        'accesskeyid': this.serverConfig['AWSACCESSKEYID'],
+                                        'secretaccesskey': this.serverConfig['AWSSECRETACCESSKEY'],
+                                        'region': this.serverConfig['AWSREGION'],
+                                        'bucket': this.serverConfig['AWSBUCKET'],
+                                        'path': mergeFileName
+                                    }
+                                },
+                                converteroptions: {
+                                    'resize': '612x792',
+                                    'resizemode': 'scale',
+                                    'resizeenlarge': null,
+                                    'grayscale': null,
+                                    'auto_orient': null,
+                                    'strip_metatags': false,
+                                    'density': 72,
+                                    'rotate': null,
+                                    'command': null
+                                },
+                            });
+                            let resFile = {
+                                _id: objectIdHexString(),
+                                __v: 0,
+                                name: fileName,
+                                size: body.output.size,
+                                key: mergeFileName,
+                                type: fileType ? fileType : '',
+                                order: -1
+                            };
+                            this.callMethodInternal('insertDocument', 'files', resFile, (errUpFile, resUpFile) => {
+                                if (resUpFile) {
+                                    resFile.status = 'Uploaded';
+                                    resolve(resFile);
+                                    let that = this;
+                                    setTimeout(() => {
+                                        that.callMethodInternal.call(that, 'deleteFile', mergeFileName);
+                                    }, 60000);
+                                }
+                                else {
+                                    reject(errUpFile);
+                                }
+                            });
+                        }
+                        catch (error) {
+                            reject(error);
+                        }
+                    }, errCC => reject(errCC));
                 });
             }
         },
     });
 }
-exports.loadPDFMethods = loadPDFMethods;
 
 //# sourceMappingURL=pdf.js.map