Merge branch 'dev' into 4153-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Pau 2022-10-24 06:02:20 +00:00
commit 25e934a591
12 changed files with 364 additions and 182 deletions

View File

@ -17,18 +17,11 @@ module.exports = Self => {
}); });
Self.deleteTrashFiles = async options => { Self.deleteTrashFiles = async options => {
let tx;
const myOptions = {}; const myOptions = {};
if (typeof options == 'object') if (typeof options == 'object')
Object.assign(myOptions, options); Object.assign(myOptions, options);
if (!myOptions.transaction) {
tx = await Self.beginTransaction({});
myOptions.transaction = tx;
}
try {
if (process.env.NODE_ENV == 'test') if (process.env.NODE_ENV == 'test')
throw new UserError(`Action not allowed on the test environment`); throw new UserError(`Action not allowed on the test environment`);
@ -63,15 +56,11 @@ module.exports = Self => {
const dstFolder = path.join(dmsContainer.client.root, pathHash); const dstFolder = path.join(dmsContainer.client.root, pathHash);
try { try {
await fs.rmdir(dstFolder); await fs.rmdir(dstFolder);
} catch (err) {} } catch (err) {
continue;
}
await dms.destroy(myOptions); await dms.destroy(myOptions);
} }
if (tx) await tx.commit();
} catch (e) {
if (tx) await tx.rollback();
throw e;
}
}; };
}; };

View File

@ -6,9 +6,9 @@ module.exports = Self => {
accepts: [ accepts: [
{ {
arg: 'id', arg: 'id',
type: 'number', type: 'string',
required: true, required: true,
description: 'The client id', description: 'The route id',
http: {source: 'path'} http: {source: 'path'}
}, },
{ {

View File

@ -39,10 +39,7 @@ export default class Controller extends Section {
routes.push(route.id); routes.push(route.id);
const routesId = routes.join(','); const routesId = routes.join(',');
this.vnReport.show('driver-route', { this.vnReport.show(`Routes/${routesId}/driver-route-pdf`);
authorization: this.vnToken.token,
routeId: routesId
});
} }
openClonationDialog() { openClonationDialog() {

View File

@ -49,14 +49,12 @@ describe('Component vnRouteIndex', () => {
const data = controller.$.model.data; const data = controller.$.model.data;
data[0].checked = true; data[0].checked = true;
data[2].checked = true; data[2].checked = true;
const expectedParams = {
authorization: null, const routeIds = '1,3';
routeId: '1,3'
};
controller.showRouteReport(); controller.showRouteReport();
expect(controller.vnReport.show).toHaveBeenCalledWith('driver-route', expectedParams); expect(controller.vnReport.show).toHaveBeenCalledWith(`Routes/${routeIds}/driver-route-pdf`);
}); });
}); });

View File

@ -1,54 +0,0 @@
const express = require('express');
const path = require('path');
const fs = require('fs');
const templatesPath = path.resolve(__dirname, './templates');
const componentsPath = path.resolve(__dirname, './core/components');
module.exports = async app => {
global.appPath = __dirname;
process.env.OPENSSL_CONF = '/etc/ssl/';
// Extended locale intl polyfill
const IntlPolyfill = require('intl');
Intl.NumberFormat = IntlPolyfill.NumberFormat;
Intl.DateTimeFormat = IntlPolyfill.DateTimeFormat;
// Init database instance
require('./core/database').init();
// Init SMTP Instance
require('./core/smtp').init();
require('./core/mixins');
require('./core/filters');
require('./core/directives');
// Init router
require('./core/router')(app);
/**
* Serve component static files
*/
const componentsDir = fs.readdirSync(componentsPath);
componentsDir.forEach(componentName => {
const componentDir = path.join(componentsPath, '/', componentName);
const assetsDir = `${componentDir}/assets`;
app.use(`/api/${componentName}/assets`, express.static(assetsDir));
});
/**
* Serve static files
*/
const templatesDir = fs.readdirSync(templatesPath);
templatesDir.forEach(directory => {
const templateTypeDir = path.join(templatesPath, '/', directory);
const templates = fs.readdirSync(templateTypeDir);
templates.forEach(templateName => {
const templateDir = path.join(templatesPath, '/', directory, '/', templateName);
const assetsDir = `${templateDir}/assets`;
app.use(`/api/${templateName}/assets`, express.static(assetsDir));
});
});
};

42
print/core/cluster.js Normal file
View File

@ -0,0 +1,42 @@
const {Cluster} = require('puppeteer-cluster');
const log4js = require('log4js');
const {cpus} = require('os');
module.exports = {
init() {
if (!this.pool) {
Cluster.launch({
concurrency: Cluster.CONCURRENCY_CONTEXT,
maxConcurrency: cpus().length,
puppeteerOptions: {
args: [
'--no-sandbox',
'--disable-setuid-sandbox',
'--no-zygote'
]
}
})
.then(cluster => {
this.pool = cluster;
log4js.configure({
appenders: {
out: {type: 'stdout'}
},
categories: {default: {appenders: ['out'], level: 'info'}},
});
const logger = log4js.getLogger();
cluster.on('taskerror', (err, data, willRetry) => {
if (willRetry)
logger.warn(`[Print] => ${err.message}\nThis job will be retried`);
else
logger.error(`[Print] => ${err.message}`);
});
cluster.on('queue', () => logger.info('Printing task initialized by pool'));
});
}
}
};

View File

@ -1,5 +1,4 @@
const mysql = require('mysql2'); const mysql = require('mysql2');
const config = require('./config.js');
const fs = require('fs-extra'); const fs = require('fs-extra');
module.exports = { module.exports = {

View File

@ -2,7 +2,7 @@ const fs = require('fs');
const path = require('path'); const path = require('path');
const config = require('./config'); const config = require('./config');
const Component = require('./component'); const Component = require('./component');
const puppeteer = require('puppeteer'); const Cluster = require('./cluster');
if (!process.env.OPENSSL_CONF) if (!process.env.OPENSSL_CONF)
process.env.OPENSSL_CONF = '/etc/ssl/'; process.env.OPENSSL_CONF = '/etc/ssl/';
@ -32,17 +32,8 @@ class Report extends Component {
if (fs.existsSync(fullPath)) if (fs.existsSync(fullPath))
options = require(optionsPath); options = require(optionsPath);
const browser = await puppeteer.launch({ return new Promise(resolve => {
headless: true, Cluster.pool.queue({}, async({page}) => {
args: [
'--no-sandbox',
'--disable-setuid-sandbox',
'--single-process',
'--no-zygote'
]
});
const page = (await browser.pages())[0];
await page.emulateMediaType('screen'); await page.emulateMediaType('screen');
await page.setContent(template); await page.setContent(template);
@ -60,11 +51,11 @@ class Report extends Component {
options.headerTemplate = '\n'; options.headerTemplate = '\n';
options.footerTemplate = footer; options.footerTemplate = footer;
const buffer = await page.pdf(options); const stream = await page.pdf(options);
await browser.close(); resolve(stream);
});
return buffer; });
} }
/** /**

View File

@ -11,6 +11,7 @@ module.exports = {
require('./core/database').init(app.dataSources); require('./core/database').init(app.dataSources);
require('./core/smtp').init(); require('./core/smtp').init();
require('./core/cluster').init();
require('./core/mixins'); require('./core/mixins');
require('./core/filters'); require('./core/filters');

290
print/package-lock.json generated
View File

@ -14,9 +14,10 @@
"js-yaml": "^3.13.1", "js-yaml": "^3.13.1",
"jsonexport": "^3.2.0", "jsonexport": "^3.2.0",
"juice": "^5.2.0", "juice": "^5.2.0",
"log4js": "^6.7.0",
"mysql2": "^1.7.0", "mysql2": "^1.7.0",
"nodemailer": "^4.7.0", "nodemailer": "^4.7.0",
"puppeteer": "^18.0.5", "puppeteer-cluster": "^0.23.0",
"qrcode": "^1.4.2", "qrcode": "^1.4.2",
"strftime": "^0.10.0", "strftime": "^0.10.0",
"vue": "^2.6.10", "vue": "^2.6.10",
@ -37,12 +38,14 @@
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "18.8.2", "version": "18.8.2",
"license": "MIT", "license": "MIT",
"optional": true "optional": true,
"peer": true
}, },
"node_modules/@types/yauzl": { "node_modules/@types/yauzl": {
"version": "2.10.0", "version": "2.10.0",
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"peer": true,
"dependencies": { "dependencies": {
"@types/node": "*" "@types/node": "*"
} }
@ -58,6 +61,7 @@
"node_modules/agent-base": { "node_modules/agent-base": {
"version": "6.0.2", "version": "6.0.2",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"debug": "4" "debug": "4"
}, },
@ -138,7 +142,8 @@
}, },
"node_modules/balanced-match": { "node_modules/balanced-match": {
"version": "1.0.2", "version": "1.0.2",
"license": "MIT" "license": "MIT",
"peer": true
}, },
"node_modules/base64-js": { "node_modules/base64-js": {
"version": "1.5.1", "version": "1.5.1",
@ -156,7 +161,8 @@
"url": "https://feross.org/support" "url": "https://feross.org/support"
} }
], ],
"license": "MIT" "license": "MIT",
"peer": true
}, },
"node_modules/bcrypt-pbkdf": { "node_modules/bcrypt-pbkdf": {
"version": "1.0.2", "version": "1.0.2",
@ -168,6 +174,7 @@
"node_modules/bl": { "node_modules/bl": {
"version": "4.1.0", "version": "4.1.0",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"buffer": "^5.5.0", "buffer": "^5.5.0",
"inherits": "^2.0.4", "inherits": "^2.0.4",
@ -181,6 +188,7 @@
"node_modules/brace-expansion": { "node_modules/brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
@ -203,6 +211,7 @@
} }
], ],
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"base64-js": "^1.3.1", "base64-js": "^1.3.1",
"ieee754": "^1.1.13" "ieee754": "^1.1.13"
@ -211,6 +220,7 @@
"node_modules/buffer-crc32": { "node_modules/buffer-crc32": {
"version": "0.2.13", "version": "0.2.13",
"license": "MIT", "license": "MIT",
"peer": true,
"engines": { "engines": {
"node": "*" "node": "*"
} }
@ -265,7 +275,8 @@
}, },
"node_modules/chownr": { "node_modules/chownr": {
"version": "1.1.4", "version": "1.1.4",
"license": "ISC" "license": "ISC",
"peer": true
}, },
"node_modules/cliui": { "node_modules/cliui": {
"version": "6.0.0", "version": "6.0.0",
@ -303,7 +314,8 @@
}, },
"node_modules/concat-map": { "node_modules/concat-map": {
"version": "0.0.1", "version": "0.0.1",
"license": "MIT" "license": "MIT",
"peer": true
}, },
"node_modules/core-util-is": { "node_modules/core-util-is": {
"version": "1.0.2", "version": "1.0.2",
@ -312,6 +324,7 @@
"node_modules/cross-fetch": { "node_modules/cross-fetch": {
"version": "3.1.5", "version": "3.1.5",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"node-fetch": "2.6.7" "node-fetch": "2.6.7"
} }
@ -372,6 +385,14 @@
"node": ">= 4" "node": ">= 4"
} }
}, },
"node_modules/date-format": {
"version": "4.0.14",
"resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
"integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==",
"engines": {
"node": ">=4.0"
}
},
"node_modules/debug": { "node_modules/debug": {
"version": "4.3.4", "version": "4.3.4",
"license": "MIT", "license": "MIT",
@ -417,7 +438,8 @@
}, },
"node_modules/devtools-protocol": { "node_modules/devtools-protocol": {
"version": "0.0.1045489", "version": "0.0.1045489",
"license": "BSD-3-Clause" "license": "BSD-3-Clause",
"peer": true
}, },
"node_modules/dijkstrajs": { "node_modules/dijkstrajs": {
"version": "1.0.2", "version": "1.0.2",
@ -468,6 +490,7 @@
"node_modules/end-of-stream": { "node_modules/end-of-stream": {
"version": "1.4.4", "version": "1.4.4",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"once": "^1.4.0" "once": "^1.4.0"
} }
@ -501,6 +524,7 @@
"node_modules/extract-zip": { "node_modules/extract-zip": {
"version": "2.0.1", "version": "2.0.1",
"license": "BSD-2-Clause", "license": "BSD-2-Clause",
"peer": true,
"dependencies": { "dependencies": {
"debug": "^4.1.1", "debug": "^4.1.1",
"get-stream": "^5.1.0", "get-stream": "^5.1.0",
@ -534,6 +558,7 @@
"node_modules/fd-slicer": { "node_modules/fd-slicer": {
"version": "1.1.0", "version": "1.1.0",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"pend": "~1.2.0" "pend": "~1.2.0"
} }
@ -549,6 +574,11 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/flatted": {
"version": "3.2.7",
"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
"integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
},
"node_modules/forever-agent": { "node_modules/forever-agent": {
"version": "0.6.1", "version": "0.6.1",
"license": "Apache-2.0", "license": "Apache-2.0",
@ -570,7 +600,8 @@
}, },
"node_modules/fs-constants": { "node_modules/fs-constants": {
"version": "1.0.0", "version": "1.0.0",
"license": "MIT" "license": "MIT",
"peer": true
}, },
"node_modules/fs-extra": { "node_modules/fs-extra": {
"version": "7.0.1", "version": "7.0.1",
@ -586,7 +617,8 @@
}, },
"node_modules/fs.realpath": { "node_modules/fs.realpath": {
"version": "1.0.0", "version": "1.0.0",
"license": "ISC" "license": "ISC",
"peer": true
}, },
"node_modules/function-bind": { "node_modules/function-bind": {
"version": "1.1.1", "version": "1.1.1",
@ -609,6 +641,7 @@
"node_modules/get-stream": { "node_modules/get-stream": {
"version": "5.2.0", "version": "5.2.0",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"pump": "^3.0.0" "pump": "^3.0.0"
}, },
@ -629,6 +662,7 @@
"node_modules/glob": { "node_modules/glob": {
"version": "7.2.3", "version": "7.2.3",
"license": "ISC", "license": "ISC",
"peer": true,
"dependencies": { "dependencies": {
"fs.realpath": "^1.0.0", "fs.realpath": "^1.0.0",
"inflight": "^1.0.4", "inflight": "^1.0.4",
@ -723,6 +757,7 @@
"node_modules/https-proxy-agent": { "node_modules/https-proxy-agent": {
"version": "5.0.1", "version": "5.0.1",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"agent-base": "6", "agent-base": "6",
"debug": "4" "debug": "4"
@ -757,7 +792,8 @@
"url": "https://feross.org/support" "url": "https://feross.org/support"
} }
], ],
"license": "BSD-3-Clause" "license": "BSD-3-Clause",
"peer": true
}, },
"node_modules/image-size": { "node_modules/image-size": {
"version": "0.7.5", "version": "0.7.5",
@ -772,6 +808,7 @@
"node_modules/inflight": { "node_modules/inflight": {
"version": "1.0.6", "version": "1.0.6",
"license": "ISC", "license": "ISC",
"peer": true,
"dependencies": { "dependencies": {
"once": "^1.3.0", "once": "^1.3.0",
"wrappy": "1" "wrappy": "1"
@ -976,6 +1013,21 @@
"version": "4.5.0", "version": "4.5.0",
"license": "MIT" "license": "MIT"
}, },
"node_modules/log4js": {
"version": "6.7.0",
"resolved": "https://registry.npmjs.org/log4js/-/log4js-6.7.0.tgz",
"integrity": "sha512-KA0W9ffgNBLDj6fZCq/lRbgR6ABAodRIDHrZnS48vOtfKa4PzWImb0Md1lmGCdO3n3sbCm/n1/WmrNlZ8kCI3Q==",
"dependencies": {
"date-format": "^4.0.14",
"debug": "^4.3.4",
"flatted": "^3.2.7",
"rfdc": "^1.3.0",
"streamroller": "^3.1.3"
},
"engines": {
"node": ">=8.0"
}
},
"node_modules/long": { "node_modules/long": {
"version": "4.0.0", "version": "4.0.0",
"license": "Apache-2.0" "license": "Apache-2.0"
@ -1021,6 +1073,7 @@
"node_modules/minimatch": { "node_modules/minimatch": {
"version": "3.1.2", "version": "3.1.2",
"license": "ISC", "license": "ISC",
"peer": true,
"dependencies": { "dependencies": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
}, },
@ -1030,7 +1083,8 @@
}, },
"node_modules/mkdirp-classic": { "node_modules/mkdirp-classic": {
"version": "0.5.3", "version": "0.5.3",
"license": "MIT" "license": "MIT",
"peer": true
}, },
"node_modules/ms": { "node_modules/ms": {
"version": "2.1.2", "version": "2.1.2",
@ -1092,6 +1146,7 @@
"node_modules/node-fetch": { "node_modules/node-fetch": {
"version": "2.6.7", "version": "2.6.7",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"whatwg-url": "^5.0.0" "whatwg-url": "^5.0.0"
}, },
@ -1131,6 +1186,7 @@
"node_modules/once": { "node_modules/once": {
"version": "1.4.0", "version": "1.4.0",
"license": "ISC", "license": "ISC",
"peer": true,
"dependencies": { "dependencies": {
"wrappy": "1" "wrappy": "1"
} }
@ -1175,6 +1231,7 @@
"node_modules/path-is-absolute": { "node_modules/path-is-absolute": {
"version": "1.0.1", "version": "1.0.1",
"license": "MIT", "license": "MIT",
"peer": true,
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=0.10.0"
} }
@ -1192,7 +1249,8 @@
}, },
"node_modules/pend": { "node_modules/pend": {
"version": "1.2.0", "version": "1.2.0",
"license": "MIT" "license": "MIT",
"peer": true
}, },
"node_modules/performance-now": { "node_modules/performance-now": {
"version": "2.1.0", "version": "2.1.0",
@ -1234,13 +1292,15 @@
"node_modules/progress": { "node_modules/progress": {
"version": "2.0.3", "version": "2.0.3",
"license": "MIT", "license": "MIT",
"peer": true,
"engines": { "engines": {
"node": ">=0.4.0" "node": ">=0.4.0"
} }
}, },
"node_modules/proxy-from-env": { "node_modules/proxy-from-env": {
"version": "1.1.0", "version": "1.1.0",
"license": "MIT" "license": "MIT",
"peer": true
}, },
"node_modules/pseudomap": { "node_modules/pseudomap": {
"version": "1.0.2", "version": "1.0.2",
@ -1253,6 +1313,7 @@
"node_modules/pump": { "node_modules/pump": {
"version": "3.0.0", "version": "3.0.0",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"end-of-stream": "^1.1.0", "end-of-stream": "^1.1.0",
"once": "^1.3.1" "once": "^1.3.1"
@ -1269,6 +1330,7 @@
"version": "18.2.0", "version": "18.2.0",
"hasInstallScript": true, "hasInstallScript": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"peer": true,
"dependencies": { "dependencies": {
"https-proxy-agent": "5.0.1", "https-proxy-agent": "5.0.1",
"progress": "2.0.3", "progress": "2.0.3",
@ -1279,9 +1341,21 @@
"node": ">=14.1.0" "node": ">=14.1.0"
} }
}, },
"node_modules/puppeteer-cluster": {
"version": "0.23.0",
"resolved": "https://registry.npmjs.org/puppeteer-cluster/-/puppeteer-cluster-0.23.0.tgz",
"integrity": "sha512-108terIWDzPrQopmoYSPd5yDoy3FGJ2dNnoGMkGYPs6xtkdhgaECwpfZkzaRToMQPZibUOz0/dSSGgPEdXEhkQ==",
"dependencies": {
"debug": "^4.3.3"
},
"peerDependencies": {
"puppeteer": ">=1.5.0"
}
},
"node_modules/puppeteer-core": { "node_modules/puppeteer-core": {
"version": "18.2.0", "version": "18.2.0",
"license": "Apache-2.0", "license": "Apache-2.0",
"peer": true,
"dependencies": { "dependencies": {
"cross-fetch": "3.1.5", "cross-fetch": "3.1.5",
"debug": "4.3.4", "debug": "4.3.4",
@ -1396,9 +1470,15 @@
"url": "https://github.com/sponsors/ljharb" "url": "https://github.com/sponsors/ljharb"
} }
}, },
"node_modules/rfdc": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
"integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="
},
"node_modules/rimraf": { "node_modules/rimraf": {
"version": "3.0.2", "version": "3.0.2",
"license": "ISC", "license": "ISC",
"peer": true,
"dependencies": { "dependencies": {
"glob": "^7.1.3" "glob": "^7.1.3"
}, },
@ -1524,6 +1604,32 @@
"node": ">=0.10.0" "node": ">=0.10.0"
} }
}, },
"node_modules/streamroller": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.3.tgz",
"integrity": "sha512-CphIJyFx2SALGHeINanjFRKQ4l7x2c+rXYJ4BMq0gd+ZK0gi4VT8b+eHe2wi58x4UayBAKx4xtHpXT/ea1cz8w==",
"dependencies": {
"date-format": "^4.0.14",
"debug": "^4.3.4",
"fs-extra": "^8.1.0"
},
"engines": {
"node": ">=8.0"
}
},
"node_modules/streamroller/node_modules/fs-extra": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
"dependencies": {
"graceful-fs": "^4.2.0",
"jsonfile": "^4.0.0",
"universalify": "^0.1.0"
},
"engines": {
"node": ">=6 <7 || >=8"
}
},
"node_modules/strftime": { "node_modules/strftime": {
"version": "0.10.1", "version": "0.10.1",
"license": "MIT", "license": "MIT",
@ -1583,6 +1689,7 @@
"node_modules/tar-fs": { "node_modules/tar-fs": {
"version": "2.1.1", "version": "2.1.1",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"chownr": "^1.1.1", "chownr": "^1.1.1",
"mkdirp-classic": "^0.5.2", "mkdirp-classic": "^0.5.2",
@ -1593,6 +1700,7 @@
"node_modules/tar-stream": { "node_modules/tar-stream": {
"version": "2.2.0", "version": "2.2.0",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"bl": "^4.0.3", "bl": "^4.0.3",
"end-of-stream": "^1.4.1", "end-of-stream": "^1.4.1",
@ -1606,7 +1714,8 @@
}, },
"node_modules/through": { "node_modules/through": {
"version": "2.3.8", "version": "2.3.8",
"license": "MIT" "license": "MIT",
"peer": true
}, },
"node_modules/tough-cookie": { "node_modules/tough-cookie": {
"version": "2.5.0", "version": "2.5.0",
@ -1621,7 +1730,8 @@
}, },
"node_modules/tr46": { "node_modules/tr46": {
"version": "0.0.3", "version": "0.0.3",
"license": "MIT" "license": "MIT",
"peer": true
}, },
"node_modules/tunnel-agent": { "node_modules/tunnel-agent": {
"version": "0.6.0", "version": "0.6.0",
@ -1640,6 +1750,7 @@
"node_modules/unbzip2-stream": { "node_modules/unbzip2-stream": {
"version": "1.4.3", "version": "1.4.3",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"buffer": "^5.2.1", "buffer": "^5.2.1",
"through": "^2.3.8" "through": "^2.3.8"
@ -1891,11 +2002,13 @@
}, },
"node_modules/webidl-conversions": { "node_modules/webidl-conversions": {
"version": "3.0.1", "version": "3.0.1",
"license": "BSD-2-Clause" "license": "BSD-2-Clause",
"peer": true
}, },
"node_modules/whatwg-url": { "node_modules/whatwg-url": {
"version": "5.0.0", "version": "5.0.0",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"tr46": "~0.0.3", "tr46": "~0.0.3",
"webidl-conversions": "^3.0.0" "webidl-conversions": "^3.0.0"
@ -1956,11 +2069,13 @@
}, },
"node_modules/wrappy": { "node_modules/wrappy": {
"version": "1.0.2", "version": "1.0.2",
"license": "ISC" "license": "ISC",
"peer": true
}, },
"node_modules/ws": { "node_modules/ws": {
"version": "8.9.0", "version": "8.9.0",
"license": "MIT", "license": "MIT",
"peer": true,
"engines": { "engines": {
"node": ">=10.0.0" "node": ">=10.0.0"
}, },
@ -2026,6 +2141,7 @@
"node_modules/yauzl": { "node_modules/yauzl": {
"version": "2.10.0", "version": "2.10.0",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"buffer-crc32": "~0.2.3", "buffer-crc32": "~0.2.3",
"fd-slicer": "~1.1.0" "fd-slicer": "~1.1.0"
@ -2038,11 +2154,13 @@
}, },
"@types/node": { "@types/node": {
"version": "18.8.2", "version": "18.8.2",
"optional": true "optional": true,
"peer": true
}, },
"@types/yauzl": { "@types/yauzl": {
"version": "2.10.0", "version": "2.10.0",
"optional": true, "optional": true,
"peer": true,
"requires": { "requires": {
"@types/node": "*" "@types/node": "*"
} }
@ -2057,6 +2175,7 @@
}, },
"agent-base": { "agent-base": {
"version": "6.0.2", "version": "6.0.2",
"peer": true,
"requires": { "requires": {
"debug": "4" "debug": "4"
} }
@ -2107,10 +2226,12 @@
"version": "1.11.0" "version": "1.11.0"
}, },
"balanced-match": { "balanced-match": {
"version": "1.0.2" "version": "1.0.2",
"peer": true
}, },
"base64-js": { "base64-js": {
"version": "1.5.1" "version": "1.5.1",
"peer": true
}, },
"bcrypt-pbkdf": { "bcrypt-pbkdf": {
"version": "1.0.2", "version": "1.0.2",
@ -2120,6 +2241,7 @@
}, },
"bl": { "bl": {
"version": "4.1.0", "version": "4.1.0",
"peer": true,
"requires": { "requires": {
"buffer": "^5.5.0", "buffer": "^5.5.0",
"inherits": "^2.0.4", "inherits": "^2.0.4",
@ -2131,6 +2253,7 @@
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"peer": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
@ -2138,13 +2261,15 @@
}, },
"buffer": { "buffer": {
"version": "5.7.1", "version": "5.7.1",
"peer": true,
"requires": { "requires": {
"base64-js": "^1.3.1", "base64-js": "^1.3.1",
"ieee754": "^1.1.13" "ieee754": "^1.1.13"
} }
}, },
"buffer-crc32": { "buffer-crc32": {
"version": "0.2.13" "version": "0.2.13",
"peer": true
}, },
"camelcase": { "camelcase": {
"version": "5.3.1" "version": "5.3.1"
@ -2182,7 +2307,8 @@
} }
}, },
"chownr": { "chownr": {
"version": "1.1.4" "version": "1.1.4",
"peer": true
}, },
"cliui": { "cliui": {
"version": "6.0.0", "version": "6.0.0",
@ -2211,13 +2337,15 @@
"version": "2.20.3" "version": "2.20.3"
}, },
"concat-map": { "concat-map": {
"version": "0.0.1" "version": "0.0.1",
"peer": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2" "version": "1.0.2"
}, },
"cross-fetch": { "cross-fetch": {
"version": "3.1.5", "version": "3.1.5",
"peer": true,
"requires": { "requires": {
"node-fetch": "2.6.7" "node-fetch": "2.6.7"
} }
@ -2260,6 +2388,11 @@
"mimer": "^1.0.0" "mimer": "^1.0.0"
} }
}, },
"date-format": {
"version": "4.0.14",
"resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
"integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg=="
},
"debug": { "debug": {
"version": "4.3.4", "version": "4.3.4",
"requires": { "requires": {
@ -2279,7 +2412,8 @@
"version": "1.5.1" "version": "1.5.1"
}, },
"devtools-protocol": { "devtools-protocol": {
"version": "0.0.1045489" "version": "0.0.1045489",
"peer": true
}, },
"dijkstrajs": { "dijkstrajs": {
"version": "1.0.2" "version": "1.0.2"
@ -2322,6 +2456,7 @@
}, },
"end-of-stream": { "end-of-stream": {
"version": "1.4.4", "version": "1.4.4",
"peer": true,
"requires": { "requires": {
"once": "^1.4.0" "once": "^1.4.0"
} }
@ -2340,6 +2475,7 @@
}, },
"extract-zip": { "extract-zip": {
"version": "2.0.1", "version": "2.0.1",
"peer": true,
"requires": { "requires": {
"@types/yauzl": "^2.9.1", "@types/yauzl": "^2.9.1",
"debug": "^4.1.1", "debug": "^4.1.1",
@ -2358,6 +2494,7 @@
}, },
"fd-slicer": { "fd-slicer": {
"version": "1.1.0", "version": "1.1.0",
"peer": true,
"requires": { "requires": {
"pend": "~1.2.0" "pend": "~1.2.0"
} }
@ -2369,6 +2506,11 @@
"path-exists": "^4.0.0" "path-exists": "^4.0.0"
} }
}, },
"flatted": {
"version": "3.2.7",
"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
"integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
},
"forever-agent": { "forever-agent": {
"version": "0.6.1" "version": "0.6.1"
}, },
@ -2381,7 +2523,8 @@
} }
}, },
"fs-constants": { "fs-constants": {
"version": "1.0.0" "version": "1.0.0",
"peer": true
}, },
"fs-extra": { "fs-extra": {
"version": "7.0.1", "version": "7.0.1",
@ -2392,7 +2535,8 @@
} }
}, },
"fs.realpath": { "fs.realpath": {
"version": "1.0.0" "version": "1.0.0",
"peer": true
}, },
"function-bind": { "function-bind": {
"version": "1.1.1" "version": "1.1.1"
@ -2408,6 +2552,7 @@
}, },
"get-stream": { "get-stream": {
"version": "5.2.0", "version": "5.2.0",
"peer": true,
"requires": { "requires": {
"pump": "^3.0.0" "pump": "^3.0.0"
} }
@ -2420,6 +2565,7 @@
}, },
"glob": { "glob": {
"version": "7.2.3", "version": "7.2.3",
"peer": true,
"requires": { "requires": {
"fs.realpath": "^1.0.0", "fs.realpath": "^1.0.0",
"inflight": "^1.0.4", "inflight": "^1.0.4",
@ -2478,6 +2624,7 @@
}, },
"https-proxy-agent": { "https-proxy-agent": {
"version": "5.0.1", "version": "5.0.1",
"peer": true,
"requires": { "requires": {
"agent-base": "6", "agent-base": "6",
"debug": "4" "debug": "4"
@ -2490,13 +2637,15 @@
} }
}, },
"ieee754": { "ieee754": {
"version": "1.2.1" "version": "1.2.1",
"peer": true
}, },
"image-size": { "image-size": {
"version": "0.7.5" "version": "0.7.5"
}, },
"inflight": { "inflight": {
"version": "1.0.6", "version": "1.0.6",
"peer": true,
"requires": { "requires": {
"once": "^1.3.0", "once": "^1.3.0",
"wrappy": "1" "wrappy": "1"
@ -2642,6 +2791,18 @@
"lodash.uniq": { "lodash.uniq": {
"version": "4.5.0" "version": "4.5.0"
}, },
"log4js": {
"version": "6.7.0",
"resolved": "https://registry.npmjs.org/log4js/-/log4js-6.7.0.tgz",
"integrity": "sha512-KA0W9ffgNBLDj6fZCq/lRbgR6ABAodRIDHrZnS48vOtfKa4PzWImb0Md1lmGCdO3n3sbCm/n1/WmrNlZ8kCI3Q==",
"requires": {
"date-format": "^4.0.14",
"debug": "^4.3.4",
"flatted": "^3.2.7",
"rfdc": "^1.3.0",
"streamroller": "^3.1.3"
}
},
"long": { "long": {
"version": "4.0.0" "version": "4.0.0"
}, },
@ -2668,12 +2829,14 @@
}, },
"minimatch": { "minimatch": {
"version": "3.1.2", "version": "3.1.2",
"peer": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
}, },
"mkdirp-classic": { "mkdirp-classic": {
"version": "0.5.3" "version": "0.5.3",
"peer": true
}, },
"ms": { "ms": {
"version": "2.1.2" "version": "2.1.2"
@ -2717,6 +2880,7 @@
}, },
"node-fetch": { "node-fetch": {
"version": "2.6.7", "version": "2.6.7",
"peer": true,
"requires": { "requires": {
"whatwg-url": "^5.0.0" "whatwg-url": "^5.0.0"
} }
@ -2735,6 +2899,7 @@
}, },
"once": { "once": {
"version": "1.4.0", "version": "1.4.0",
"peer": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
@ -2758,7 +2923,8 @@
"version": "4.0.0" "version": "4.0.0"
}, },
"path-is-absolute": { "path-is-absolute": {
"version": "1.0.1" "version": "1.0.1",
"peer": true
}, },
"path-key": { "path-key": {
"version": "2.0.1" "version": "2.0.1"
@ -2767,7 +2933,8 @@
"version": "1.0.7" "version": "1.0.7"
}, },
"pend": { "pend": {
"version": "1.2.0" "version": "1.2.0",
"peer": true
}, },
"performance-now": { "performance-now": {
"version": "2.1.0" "version": "2.1.0"
@ -2787,10 +2954,12 @@
} }
}, },
"progress": { "progress": {
"version": "2.0.3" "version": "2.0.3",
"peer": true
}, },
"proxy-from-env": { "proxy-from-env": {
"version": "1.1.0" "version": "1.1.0",
"peer": true
}, },
"pseudomap": { "pseudomap": {
"version": "1.0.2" "version": "1.0.2"
@ -2800,6 +2969,7 @@
}, },
"pump": { "pump": {
"version": "3.0.0", "version": "3.0.0",
"peer": true,
"requires": { "requires": {
"end-of-stream": "^1.1.0", "end-of-stream": "^1.1.0",
"once": "^1.3.1" "once": "^1.3.1"
@ -2810,6 +2980,7 @@
}, },
"puppeteer": { "puppeteer": {
"version": "18.2.0", "version": "18.2.0",
"peer": true,
"requires": { "requires": {
"https-proxy-agent": "5.0.1", "https-proxy-agent": "5.0.1",
"progress": "2.0.3", "progress": "2.0.3",
@ -2817,8 +2988,17 @@
"puppeteer-core": "18.2.0" "puppeteer-core": "18.2.0"
} }
}, },
"puppeteer-cluster": {
"version": "0.23.0",
"resolved": "https://registry.npmjs.org/puppeteer-cluster/-/puppeteer-cluster-0.23.0.tgz",
"integrity": "sha512-108terIWDzPrQopmoYSPd5yDoy3FGJ2dNnoGMkGYPs6xtkdhgaECwpfZkzaRToMQPZibUOz0/dSSGgPEdXEhkQ==",
"requires": {
"debug": "^4.3.3"
}
},
"puppeteer-core": { "puppeteer-core": {
"version": "18.2.0", "version": "18.2.0",
"peer": true,
"requires": { "requires": {
"cross-fetch": "3.1.5", "cross-fetch": "3.1.5",
"debug": "4.3.4", "debug": "4.3.4",
@ -2897,8 +3077,14 @@
"supports-preserve-symlinks-flag": "^1.0.0" "supports-preserve-symlinks-flag": "^1.0.0"
} }
}, },
"rfdc": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
"integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="
},
"rimraf": { "rimraf": {
"version": "3.0.2", "version": "3.0.2",
"peer": true,
"requires": { "requires": {
"glob": "^7.1.3" "glob": "^7.1.3"
} }
@ -2962,6 +3148,28 @@
"tweetnacl": "~0.14.0" "tweetnacl": "~0.14.0"
} }
}, },
"streamroller": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.3.tgz",
"integrity": "sha512-CphIJyFx2SALGHeINanjFRKQ4l7x2c+rXYJ4BMq0gd+ZK0gi4VT8b+eHe2wi58x4UayBAKx4xtHpXT/ea1cz8w==",
"requires": {
"date-format": "^4.0.14",
"debug": "^4.3.4",
"fs-extra": "^8.1.0"
},
"dependencies": {
"fs-extra": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
"requires": {
"graceful-fs": "^4.2.0",
"jsonfile": "^4.0.0",
"universalify": "^0.1.0"
}
}
}
},
"strftime": { "strftime": {
"version": "0.10.1" "version": "0.10.1"
}, },
@ -2996,6 +3204,7 @@
}, },
"tar-fs": { "tar-fs": {
"version": "2.1.1", "version": "2.1.1",
"peer": true,
"requires": { "requires": {
"chownr": "^1.1.1", "chownr": "^1.1.1",
"mkdirp-classic": "^0.5.2", "mkdirp-classic": "^0.5.2",
@ -3005,6 +3214,7 @@
}, },
"tar-stream": { "tar-stream": {
"version": "2.2.0", "version": "2.2.0",
"peer": true,
"requires": { "requires": {
"bl": "^4.0.3", "bl": "^4.0.3",
"end-of-stream": "^1.4.1", "end-of-stream": "^1.4.1",
@ -3014,7 +3224,8 @@
} }
}, },
"through": { "through": {
"version": "2.3.8" "version": "2.3.8",
"peer": true
}, },
"tough-cookie": { "tough-cookie": {
"version": "2.5.0", "version": "2.5.0",
@ -3024,7 +3235,8 @@
} }
}, },
"tr46": { "tr46": {
"version": "0.0.3" "version": "0.0.3",
"peer": true
}, },
"tunnel-agent": { "tunnel-agent": {
"version": "0.6.0", "version": "0.6.0",
@ -3037,6 +3249,7 @@
}, },
"unbzip2-stream": { "unbzip2-stream": {
"version": "1.4.3", "version": "1.4.3",
"peer": true,
"requires": { "requires": {
"buffer": "^5.2.1", "buffer": "^5.2.1",
"through": "^2.3.8" "through": "^2.3.8"
@ -3197,10 +3410,12 @@
} }
}, },
"webidl-conversions": { "webidl-conversions": {
"version": "3.0.1" "version": "3.0.1",
"peer": true
}, },
"whatwg-url": { "whatwg-url": {
"version": "5.0.0", "version": "5.0.0",
"peer": true,
"requires": { "requires": {
"tr46": "~0.0.3", "tr46": "~0.0.3",
"webidl-conversions": "^3.0.0" "webidl-conversions": "^3.0.0"
@ -3241,10 +3456,12 @@
} }
}, },
"wrappy": { "wrappy": {
"version": "1.0.2" "version": "1.0.2",
"peer": true
}, },
"ws": { "ws": {
"version": "8.9.0", "version": "8.9.0",
"peer": true,
"requires": {} "requires": {}
}, },
"xtend": { "xtend": {
@ -3281,6 +3498,7 @@
}, },
"yauzl": { "yauzl": {
"version": "2.10.0", "version": "2.10.0",
"peer": true,
"requires": { "requires": {
"buffer-crc32": "~0.2.3", "buffer-crc32": "~0.2.3",
"fd-slicer": "~1.1.0" "fd-slicer": "~1.1.0"

View File

@ -18,9 +18,10 @@
"js-yaml": "^3.13.1", "js-yaml": "^3.13.1",
"jsonexport": "^3.2.0", "jsonexport": "^3.2.0",
"juice": "^5.2.0", "juice": "^5.2.0",
"log4js": "^6.7.0",
"mysql2": "^1.7.0", "mysql2": "^1.7.0",
"nodemailer": "^4.7.0", "nodemailer": "^4.7.0",
"puppeteer": "^18.0.5", "puppeteer-cluster": "^0.23.0",
"qrcode": "^1.4.2", "qrcode": "^1.4.2",
"strftime": "^0.10.0", "strftime": "^0.10.0",
"vue": "^2.6.10", "vue": "^2.6.10",