@mashroom/mashroom
Advanced tools
Comparing version 2.4.4 to 2.4.5
@@ -11,3 +11,3 @@ "use strict"; | ||
constructor(loggerFactory) { | ||
this.logger = loggerFactory('mashroom.plugins.loader'); | ||
this._logger = loggerFactory('mashroom.plugins.loader'); | ||
} | ||
@@ -37,6 +37,6 @@ generateMinimumConfig(plugin) { | ||
} | ||
this.logger.info('Registering Admin UI integration:', plugin.name); | ||
this._logger.info('Registering Admin UI integration:', plugin.name); | ||
} | ||
async unload(plugin) { | ||
this.logger.info('Unregistering Admin UI integration:', plugin.name); | ||
this._logger.info('Unregistering Admin UI integration:', plugin.name); | ||
} | ||
@@ -43,0 +43,0 @@ get name() { |
@@ -28,3 +28,2 @@ "use strict"; | ||
this._logger = loggerFactory('mashroom.plugins.scanner'); | ||
this._serverRootFolder = config.serverRootFolder; | ||
this._externalPluginConfigFileNames = config.externalPluginConfigFileNames; | ||
@@ -31,0 +30,0 @@ this._pluginPackageFolders = config.pluginPackageFolders.filter(folder => { |
@@ -29,3 +29,3 @@ #!/usr/bin/env node | ||
const logger = loggerFactory('server'); | ||
server.start(); | ||
await server.start(); | ||
if (process.platform === 'win32') { | ||
@@ -52,3 +52,3 @@ // eslint-disable-next-line @typescript-eslint/no-var-requires | ||
} else { | ||
stopServer(server, logger); | ||
await stopServer(server, logger); | ||
} | ||
@@ -55,0 +55,0 @@ }); |
@@ -9,3 +9,2 @@ "use strict"; | ||
var _https = _interopRequireDefault(require("https")); | ||
var _spdy = _interopRequireDefault(require("spdy")); | ||
var _tls_utils = require("@mashroom/mashroom-utils/lib/tls_utils"); | ||
@@ -35,5 +34,3 @@ var _index_route = _interopRequireDefault(require("./routes/index_route")); | ||
`); | ||
return Promise.all([this._startHttpServer(), this._startHttpsServer()]).then(() => { | ||
return; | ||
}); | ||
await Promise.all([this._startHttpServer(), this._startHttpsServer()]); | ||
} | ||
@@ -83,3 +80,12 @@ async stop() { | ||
if (this._config.enableHttp2) { | ||
httpsServer = _spdy.default.createServer({ | ||
// FIXME: spdy is no longer maintained and stopped working with Node.js 15 | ||
this._logger.warn('HTTP/2 support only works properly with Node.js <= 14 at the moment!'); | ||
let spdy; | ||
try { | ||
spdy = require('spdy'); | ||
} catch (e) { | ||
this._logger.error('For HTTP/2 you need to install spdy as peer dependency!', e); | ||
process.exit(1); | ||
} | ||
httpsServer = spdy.createServer({ | ||
...fixedTlsOptions, | ||
@@ -86,0 +92,0 @@ spdy: { |
@@ -7,3 +7,3 @@ { | ||
"license": "MIT", | ||
"version": "2.4.4", | ||
"version": "2.4.5", | ||
"main": "dist", | ||
@@ -21,3 +21,3 @@ "files": [ | ||
"dependencies": { | ||
"@mashroom/mashroom-utils": "2.4.4", | ||
"@mashroom/mashroom-utils": "2.4.5", | ||
"@types/express": "^4.17.17", | ||
@@ -30,8 +30,16 @@ "anymatch": "^3.1.3", | ||
"lucy-dirsum": "^0.1.1", | ||
"minimist": "^1.2.8", | ||
"minimist": "^1.2.8" | ||
}, | ||
"peerDependencies": { | ||
"spdy": "^4.0.2" | ||
}, | ||
"peerDependenciesMeta": { | ||
"spdy": { | ||
"optional": true | ||
} | ||
}, | ||
"devDependencies": { | ||
"@types/fs-extra": "^11.0.1", | ||
"@types/spdy": "^3.4.5" | ||
"@types/spdy": "^3.4.5", | ||
"spdy": "^4.0.2" | ||
}, | ||
@@ -38,0 +46,0 @@ "jest": { |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
199247
5223
3
+ Added@mashroom/mashroom-utils@2.4.5(transitive)
- Removedspdy@^4.0.2
- Removed@mashroom/mashroom-utils@2.4.4(transitive)