fix docker package reinstalls
Signed-off-by: si458 <simonsmith5521@gmail.com>
si458 committed
Jun 2, 2025 at 16:05 UTC
62020e1cde520ab282178ba7263282ffb088b39a
3 files changed
+72
-4
meshcentral.js
+1
-1
@@ -4305,7 +4305,7 @@ function mainStart() {
4305
if (config.settings.acebase != null) { modules.push('acebase@1.29.5'); } // Add AceBase, official driver.
4306
if (config.settings.sqlite3 != null) { modules.push('sqlite3@5.1.7'); } // Add sqlite3, official driver.
4307
if (config.settings.vault != null) { modules.push('node-vault@0.10.2'); } // Add official HashiCorp's Vault module.
4308
- if (config.settings.plugins != null) { modules.push('semver@7.7.1'); } // Required for version compat testing and update checks
4308
+ if ((config.settings.plugins != null) && (config.settings.plugins != false) && ((typeof config.settings.plugins != 'object') || (config.settings.plugins.enabled != false))) { modules.push('semver@7.7.1'); } // Required for version compat testing and update checks
4309
if ((config.settings.plugins != null) && (config.settings.plugins.proxy != null)) { modules.push('https-proxy-agent@7.0.2'); } // Required for HTTP/HTTPS proxy support
4310
else if (config.settings.xmongodb != null) { modules.push('mongojs@3.1.0'); } // Add MongoJS, old driver.
4311
if (nodemailer || ((config.smtp != null) && (config.smtp.name != 'console')) || (config.sendmail != null)) { modules.push('nodemailer@6.9.16'); } // Add SMTP support
package-lock.json
+69
-2
@@ -1,12 +1,12 @@
1
{
2
"name": "meshcentral",
3
- "version": "1.1.44",
3
+ "version": "1.1.45",
4
"lockfileVersion": 3,
5
"requires": true,
6
"packages": {
7
"": {
8
"name": "meshcentral",
9
- "version": "1.1.44",
9
+ "version": "1.1.45",
10
"license": "Apache-2.0",
11
"dependencies": {
12
"@seald-io/nedb": "4.0.4",
@@ -22,6 +22,7 @@
22
"minimist": "1.2.8",
23
"multiparty": "4.2.3",
24
"node-forge": "1.3.1",
25
+ "otplib": "^12.0.1",
26
"ua-client-hints-js": "0.1.2",
27
"ua-parser-js": "1.0.40",
28
"ws": "8.18.0",
@@ -51,6 +52,53 @@
52
"node": ">=12"
53
}
54
},
55
+ "node_modules/@otplib/core": {
56
+ "version": "12.0.1",
57
+ "resolved": "https://registry.npmjs.org/@otplib/core/-/core-12.0.1.tgz",
58
+ "integrity": "sha512-4sGntwbA/AC+SbPhbsziRiD+jNDdIzsZ3JUyfZwjtKyc/wufl1pnSIaG4Uqx8ymPagujub0o92kgBnB89cuAMA==",
59
+ "license": "MIT"
60
+ },
61
+ "node_modules/@otplib/plugin-crypto": {
62
+ "version": "12.0.1",
63
+ "resolved": "https://registry.npmjs.org/@otplib/plugin-crypto/-/plugin-crypto-12.0.1.tgz",
64
+ "integrity": "sha512-qPuhN3QrT7ZZLcLCyKOSNhuijUi9G5guMRVrxq63r9YNOxxQjPm59gVxLM+7xGnHnM6cimY57tuKsjK7y9LM1g==",
65
+ "license": "MIT",
66
+ "dependencies": {
67
+ "@otplib/core": "^12.0.1"
68
+ }
69
+ },
70
+ "node_modules/@otplib/plugin-thirty-two": {
71
+ "version": "12.0.1",
72
+ "resolved": "https://registry.npmjs.org/@otplib/plugin-thirty-two/-/plugin-thirty-two-12.0.1.tgz",
73
+ "integrity": "sha512-MtT+uqRso909UkbrrYpJ6XFjj9D+x2Py7KjTO9JDPhL0bJUYVu5kFP4TFZW4NFAywrAtFRxOVY261u0qwb93gA==",
74
+ "license": "MIT",
75
+ "dependencies": {
76
+ "@otplib/core": "^12.0.1",
77
+ "thirty-two": "^1.0.2"
78
+ }
79
+ },
80
+ "node_modules/@otplib/preset-default": {
81
+ "version": "12.0.1",
82
+ "resolved": "https://registry.npmjs.org/@otplib/preset-default/-/preset-default-12.0.1.tgz",
83
+ "integrity": "sha512-xf1v9oOJRyXfluBhMdpOkr+bsE+Irt+0D5uHtvg6x1eosfmHCsCC6ej/m7FXiWqdo0+ZUI6xSKDhJwc8yfiOPQ==",
84
+ "license": "MIT",
85
+ "dependencies": {
86
+ "@otplib/core": "^12.0.1",
87
+ "@otplib/plugin-crypto": "^12.0.1",
88
+ "@otplib/plugin-thirty-two": "^12.0.1"
89
+ }
90
+ },
91
+ "node_modules/@otplib/preset-v11": {
92
+ "version": "12.0.1",
93
+ "resolved": "https://registry.npmjs.org/@otplib/preset-v11/-/preset-v11-12.0.1.tgz",
94
+ "integrity": "sha512-9hSetMI7ECqbFiKICrNa4w70deTUfArtwXykPUvSHWOdzOlfa9ajglu7mNCntlvxycTiOAXkQGwjQCzzDEMRMg==",
95
+ "license": "MIT",
96
+ "dependencies": {
97
+ "@otplib/core": "^12.0.1",
98
+ "@otplib/plugin-crypto": "^12.0.1",
99
+ "@otplib/plugin-thirty-two": "^12.0.1"
100
+ }
101
+ },
102
"node_modules/@pkgjs/parseargs": {
103
"version": "0.11.0",
104
"resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -1578,6 +1626,17 @@
1626
"node": ">= 0.8"
1627
}
1628
},
1629
+ "node_modules/otplib": {
1630
+ "version": "12.0.1",
1631
+ "resolved": "https://registry.npmjs.org/otplib/-/otplib-12.0.1.tgz",
1632
+ "integrity": "sha512-xDGvUOQjop7RDgxTQ+o4pOol0/3xSZzawTiPKRrHnQWAy0WjhNs/5HdIDJCrqC4MBynmjXgULc6YfioaxZeFgg==",
1633
+ "license": "MIT",
1634
+ "dependencies": {
1635
+ "@otplib/core": "^12.0.1",
1636
+ "@otplib/preset-default": "^12.0.1",
1637
+ "@otplib/preset-v11": "^12.0.1"
1638
+ }
1639
+ },
1640
"node_modules/package-json-from-dist": {
1641
"version": "1.0.1",
1642
"resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
@@ -2133,6 +2192,14 @@
2192
"b4a": "^1.6.4"
2193
}
2194
},
2195
+ "node_modules/thirty-two": {
2196
+ "version": "1.0.2",
2197
+ "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz",
2198
+ "integrity": "sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA==",
2199
+ "engines": {
2200
+ "node": ">=0.2.6"
2201
+ }
2202
+ },
2203
"node_modules/toidentifier": {
2204
"version": "1.0.1",
2205
"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
package.json
+2
-1
@@ -50,8 +50,9 @@
50
"minimist": "1.2.8",
51
"multiparty": "4.2.3",
52
"node-forge": "1.3.1",
53
- "ua-parser-js": "1.0.40",
53
+ "otplib": "12.0.1",
54
"ua-client-hints-js": "0.1.2",
55
+ "ua-parser-js": "1.0.40",
56
"ws": "8.18.0",
57
"yauzl": "2.10.0"
58
},