Skip to content

Commit

Permalink
update packages
Browse files Browse the repository at this point in the history
Signed-off-by: si458 <[email protected]>
  • Loading branch information
si458 committed Oct 17, 2024
1 parent cfe9345 commit ac27034
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 28 deletions.
6 changes: 3 additions & 3 deletions dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"body-parser": "1.20.3",
"cbor": "5.2.0",
"compression": "1.7.4",
"cookie-session": "2.0.0",
"cookie-session": "2.1.0",
"express": "4.21.1",
"express-handlebars": "7.1.3",
"express-ws": "5.0.2",
"ipcheck": "0.1.0",
"minimist": "1.2.8",
"multiparty": "4.2.3",
"node-forge": "1.3.1",
"ua-parser-js": "1.0.37",
"ws": "8.17.1",
"ua-parser-js": "1.0.39",
"ws": "8.18.0",
"yauzl": "2.10.0"
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ RUN cd meshcentral && npm install && npm install nedb

# NOTE: ALL MODULES MUST HAVE A VERSION NUMBER AND THE VERSION MUST MATCH THAT USED IN meshcentral.js mainStart()
RUN if ! [ -z "$INCLUDE_MONGODBTOOLS" ]; then cd meshcentral && npm install [email protected] [email protected]; fi
RUN if ! [ -z "$PREINSTALL_LIBS" ] && [ "$PREINSTALL_LIBS" == "true" ]; then cd meshcentral && npm install ssh2@1.15.0 [email protected] [email protected].8 image-size@1.0.2 [email protected] [email protected] [email protected]; fi
RUN if ! [ -z "$PREINSTALL_LIBS" ] && [ "$PREINSTALL_LIBS" == "true" ]; then cd meshcentral && npm install ssh2@1.16.0 [email protected] [email protected].15 image-size@1.1.1 [email protected] [email protected] [email protected]; fi

EXPOSE 80 443 4433

Expand Down
10 changes: 5 additions & 5 deletions meshcentral.js
Original file line number Diff line number Diff line change
Expand Up @@ -4207,14 +4207,14 @@ function mainStart() {

// Build the list of required modules
// NOTE: ALL MODULES MUST HAVE A VERSION NUMBER AND THE VERSION MUST MATCH THAT USED IN Dockerfile
var modules = ['[email protected]', '[email protected]', '[email protected]', '[email protected]', 'cookie-session@2.0.0', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '@yetzt/nedb', '[email protected]', '[email protected].37', 'ws@8.17.1', '[email protected]'];
var modules = ['[email protected]', '[email protected]', '[email protected]', '[email protected]', 'cookie-session@2.1.0', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '@yetzt/nedb', '[email protected]', '[email protected].39', 'ws@8.18.0', '[email protected]'];
if (require('os').platform() == 'win32') { modules.push('[email protected]'); modules.push('[email protected]'); if (sspi == true) { modules.push('[email protected]'); } } // Add Windows modules
if (ldap == true) { modules.push('[email protected]'); }
if (ssh == true) { modules.push('ssh2@1.15.0'); }
if (ssh == true) { modules.push('ssh2@1.16.0'); }
if (passport != null) { modules.push(...passport); }
if (captcha == true) { modules.push('[email protected]'); }

if (sessionRecording == true) { modules.push('image-size@1.0.2'); } // Need to get the remote desktop JPEG sizes to index the recodring file.
if (sessionRecording == true) { modules.push('image-size@1.1.1'); } // Need to get the remote desktop JPEG sizes to index the recodring file.
if (config.letsencrypt != null) { modules.push('[email protected]'); } // Add acme-client module. We need to force v4.2.4 or higher since olver versions using SHA-1 which is no longer supported by Let's Encrypt.
if (config.settings.mqtt != null) { modules.push('[email protected]'); } // Add MQTT Modules
if (config.settings.mysql != null) { modules.push('[email protected]'); } // Add MySQL.
Expand All @@ -4228,7 +4228,7 @@ function mainStart() {
if (config.settings.plugins != null) { modules.push('[email protected]'); } // Required for version compat testing and update checks
if ((config.settings.plugins != null) && (config.settings.plugins.proxy != null)) { modules.push('[email protected]'); } // Required for HTTP/HTTPS proxy support
else if (config.settings.xmongodb != null) { modules.push('[email protected]'); } // Add MongoJS, old driver.
if (nodemailer || ((config.smtp != null) && (config.smtp.name != 'console')) || (config.sendmail != null)) { modules.push('[email protected].8'); } // Add SMTP support
if (nodemailer || ((config.smtp != null) && (config.smtp.name != 'console')) || (config.sendmail != null)) { modules.push('[email protected].15'); } // Add SMTP support
if (sendgrid || (config.sendgrid != null)) { modules.push('@sendgrid/mail'); } // Add SendGrid support
if ((args.translate || args.dev) && (Number(process.version.match(/^v(\d+\.\d+)/)[1]) >= 16)) { modules.push('[email protected]'); modules.push('[email protected]'); modules.push('[email protected]'); } // Translation support
if (typeof config.settings.crowdsec == 'object') { modules.push('@crowdsec/[email protected]'); } // Add CrowdSec bounser module (https://www.npmjs.com/package/@crowdsec/express-bouncer)
Expand Down Expand Up @@ -4257,7 +4257,7 @@ function mainStart() {
}

// Desktop multiplexor support
if (config.settings.desktopmultiplex === true) { modules.push('image-size@1.0.2'); }
if (config.settings.desktopmultiplex === true) { modules.push('image-size@1.1.1'); }

// SMS support
if (config.sms != null) {
Expand Down
35 changes: 19 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@
"body-parser": "1.20.3",
"cbor": "5.2.0",
"compression": "1.7.4",
"cookie-session": "2.0.0",
"cookie-session": "2.1.0",
"express": "4.21.1",
"express-handlebars": "7.1.3",
"express-ws": "5.0.2",
"ipcheck": "0.1.0",
"minimist": "1.2.8",
"multiparty": "4.2.3",
"node-forge": "1.3.1",
"ua-parser-js": "1.0.37",
"ws": "8.17.1",
"ua-parser-js": "1.0.39",
"ws": "8.18.0",
"yauzl": "2.10.0"
},
"engines": {
Expand Down

0 comments on commit ac27034

Please sign in to comment.