@verdaccio/server 6.0.0-6-next.44 → 6.0.0-6-next.46
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +35 -0
- package/build/server.js +4 -3
- package/build/server.js.map +1 -1
- package/package.json +14 -14
- package/src/server.ts +5 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,40 @@
|
|
|
1
1
|
# @verdaccio/server
|
|
2
2
|
|
|
3
|
+
## 6.0.0-6-next.46
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 9943e2b1: fix: extract logger from middleware
|
|
8
|
+
- Updated dependencies [9943e2b1]
|
|
9
|
+
- @verdaccio/middleware@6.0.0-6-next.36
|
|
10
|
+
- @verdaccio/api@6.0.0-6-next.40
|
|
11
|
+
- @verdaccio/web@6.0.0-6-next.44
|
|
12
|
+
- @verdaccio/store@6.0.0-6-next.37
|
|
13
|
+
- @verdaccio/core@6.0.0-6-next.57
|
|
14
|
+
- @verdaccio/config@6.0.0-6-next.57
|
|
15
|
+
- @verdaccio/auth@6.0.0-6-next.36
|
|
16
|
+
- @verdaccio/loaders@6.0.0-6-next.26
|
|
17
|
+
- @verdaccio/logger@6.0.0-6-next.25
|
|
18
|
+
- verdaccio-audit@11.0.0-6-next.20
|
|
19
|
+
- @verdaccio/utils@6.0.0-6-next.25
|
|
20
|
+
|
|
21
|
+
## 6.0.0-6-next.45
|
|
22
|
+
|
|
23
|
+
### Patch Changes
|
|
24
|
+
|
|
25
|
+
- Updated dependencies [a1986e09]
|
|
26
|
+
- @verdaccio/api@6.0.0-6-next.39
|
|
27
|
+
- @verdaccio/middleware@6.0.0-6-next.35
|
|
28
|
+
- @verdaccio/utils@6.0.0-6-next.24
|
|
29
|
+
- @verdaccio/web@6.0.0-6-next.43
|
|
30
|
+
- @verdaccio/auth@6.0.0-6-next.35
|
|
31
|
+
- @verdaccio/config@6.0.0-6-next.56
|
|
32
|
+
- @verdaccio/store@6.0.0-6-next.36
|
|
33
|
+
- verdaccio-audit@11.0.0-6-next.19
|
|
34
|
+
- @verdaccio/loaders@6.0.0-6-next.25
|
|
35
|
+
- @verdaccio/core@6.0.0-6-next.56
|
|
36
|
+
- @verdaccio/logger@6.0.0-6-next.24
|
|
37
|
+
|
|
3
38
|
## 6.0.0-6-next.44
|
|
4
39
|
|
|
5
40
|
### Patch Changes
|
package/build/server.js
CHANGED
|
@@ -34,10 +34,11 @@ const defineAPI = async function (config, storage) {
|
|
|
34
34
|
app.set('env', process.env.NODE_ENV || 'production');
|
|
35
35
|
app.use((0, _cors.default)());
|
|
36
36
|
app.use(limiter);
|
|
37
|
+
const errorReportingMiddlewareWrap = (0, _middleware.errorReportingMiddleware)(_logger.logger);
|
|
37
38
|
|
|
38
39
|
// Router setup
|
|
39
|
-
app.use(_middleware.log);
|
|
40
|
-
app.use(
|
|
40
|
+
app.use((0, _middleware.log)(_logger.logger));
|
|
41
|
+
app.use(errorReportingMiddlewareWrap);
|
|
41
42
|
app.use(function (req, res, next) {
|
|
42
43
|
res.setHeader('x-powered-by', (0, _utils.getUserAgent)(config.user_agent));
|
|
43
44
|
next();
|
|
@@ -98,7 +99,7 @@ const defineAPI = async function (config, storage) {
|
|
|
98
99
|
if (_lodash.default.isFunction(res.locals.report_error) === false) {
|
|
99
100
|
// in case of very early error this middleware may not be loaded before error is generated
|
|
100
101
|
// fixing that
|
|
101
|
-
(
|
|
102
|
+
errorReportingMiddlewareWrap(req, res, _lodash.default.noop);
|
|
102
103
|
}
|
|
103
104
|
res.locals.report_error(err);
|
|
104
105
|
} else {
|
package/build/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","names":["debug","buildDebug","defineAPI","config","storage","auth","Auth","init","app","express","limiter","RateLimit","serverSettings","rateLimit","set","process","env","NODE_ENV","use","cors","
|
|
1
|
+
{"version":3,"file":"server.js","names":["debug","buildDebug","defineAPI","config","storage","auth","Auth","init","app","express","limiter","RateLimit","serverSettings","rateLimit","set","process","env","NODE_ENV","use","cors","errorReportingMiddlewareWrap","errorReportingMiddleware","logger","log","req","res","next","setHeader","getUserAgent","user_agent","compression","get","url","_debug","hookDebug","configPath","plugins","asyncLoadPlugin","middlewares","plugin","register_middlewares","length","info","push","AuditMiddleware","enabled","strict_ssl","forEach","apiEndpoint","_","webMiddleware","errorUtils","getNotFound","API_ERROR","WEB_DISABLED","err","isError","code","statusCode","HTTP_STATUS","NOT_MODIFIED","isFunction","locals","report_error","noop","final","startServer","configHash","AppConfig","Storage","error","msg","Error"],"sources":["../src/server.ts"],"sourcesContent":["import compression from 'compression';\nimport cors from 'cors';\nimport buildDebug from 'debug';\nimport express from 'express';\nimport RateLimit from 'express-rate-limit';\nimport { HttpError } from 'http-errors';\nimport _ from 'lodash';\nimport AuditMiddleware from 'verdaccio-audit';\n\nimport apiEndpoint from '@verdaccio/api';\nimport { Auth } from '@verdaccio/auth';\nimport { Config as AppConfig } from '@verdaccio/config';\nimport { API_ERROR, HTTP_STATUS, errorUtils, pluginUtils } from '@verdaccio/core';\nimport { asyncLoadPlugin } from '@verdaccio/loaders';\nimport { logger } from '@verdaccio/logger';\nimport { errorReportingMiddleware, final, log } from '@verdaccio/middleware';\nimport { Storage } from '@verdaccio/store';\nimport { ConfigYaml } from '@verdaccio/types';\nimport { Config as IConfig } from '@verdaccio/types';\nimport webMiddleware from '@verdaccio/web';\n\nimport { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../types/custom';\nimport hookDebug from './debug';\nimport { getUserAgent } from './utils';\n\nconst debug = buildDebug('verdaccio:server');\n\nconst defineAPI = async function (config: IConfig, storage: Storage): Promise<any> {\n const auth: Auth = new Auth(config);\n await auth.init();\n const app = express();\n const limiter = new RateLimit(config.serverSettings.rateLimit);\n // run in production mode by default, just in case\n // it shouldn't make any difference anyway\n app.set('env', process.env.NODE_ENV || 'production');\n app.use(cors());\n app.use(limiter);\n\n const errorReportingMiddlewareWrap = errorReportingMiddleware(logger);\n\n // Router setup\n app.use(log(logger));\n app.use(errorReportingMiddlewareWrap);\n app.use(function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer): void {\n res.setHeader('x-powered-by', getUserAgent(config.user_agent));\n next();\n });\n\n app.use(compression());\n\n app.get(\n '/favicon.ico',\n function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer): void {\n req.url = '/-/static/favicon.png';\n next();\n }\n );\n\n // Hook for tests only\n if (config._debug) {\n hookDebug(app, config.configPath);\n }\n\n const plugins: pluginUtils.ExpressMiddleware<IConfig, {}, Auth>[] = await asyncLoadPlugin(\n config.middlewares,\n {\n config,\n logger,\n },\n function (plugin) {\n return typeof plugin.register_middlewares !== 'undefined';\n }\n );\n\n if (plugins.length === 0) {\n logger.info('none middleware plugins has been defined, adding audit middleware by default');\n // @ts-ignore\n plugins.push(new AuditMiddleware({ enabled: true, strict_ssl: true }, { config, logger }));\n }\n\n plugins.forEach((plugin: pluginUtils.ExpressMiddleware<IConfig, {}, Auth>) => {\n plugin.register_middlewares(app, auth, storage);\n });\n\n // For npm request\n // @ts-ignore\n app.use(apiEndpoint(config, auth, storage));\n\n // For WebUI & WebUI API\n if (_.get(config, 'web.enable', true)) {\n app.use(await webMiddleware(config, auth, storage));\n } else {\n app.get('/', function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer) {\n next(errorUtils.getNotFound(API_ERROR.WEB_DISABLED));\n });\n }\n\n // Catch 404\n app.get('/*', function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer) {\n next(errorUtils.getNotFound('resource not found'));\n });\n\n app.use(function (\n err: HttpError,\n req: $RequestExtend,\n res: $ResponseExtend,\n next: $NextFunctionVer\n ) {\n if (_.isError(err)) {\n if (err.code === 'ECONNABORT' && res.statusCode === HTTP_STATUS.NOT_MODIFIED) {\n return next();\n }\n if (_.isFunction(res.locals.report_error) === false) {\n // in case of very early error this middleware may not be loaded before error is generated\n // fixing that\n errorReportingMiddlewareWrap(req, res, _.noop);\n }\n res.locals.report_error(err);\n } else {\n // Fall to Middleware.final\n return next(err);\n }\n });\n\n app.use(final);\n\n return app;\n};\n\nexport default (async function startServer(configHash: ConfigYaml): Promise<any> {\n debug('start server');\n const config: IConfig = new AppConfig({ ...configHash } as any);\n // register middleware plugins\n debug('loaded filter plugin');\n // @ts-ignore\n const storage: Storage = new Storage(config);\n try {\n // waits until init calls have been initialized\n debug('storage init start');\n await storage.init(config);\n debug('storage init end');\n } catch (err: any) {\n logger.error({ error: err.msg }, 'storage has failed: @{error}');\n throw new Error(err);\n }\n return await defineAPI(config, storage);\n});\n"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@verdaccio/server",
|
|
3
|
-
"version": "6.0.0-6-next.
|
|
3
|
+
"version": "6.0.0-6-next.46",
|
|
4
4
|
"description": "server logic",
|
|
5
5
|
"main": "./build/index.js",
|
|
6
6
|
"types": "build/index.d.ts",
|
|
@@ -30,17 +30,17 @@
|
|
|
30
30
|
"npm": ">=6"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@verdaccio/api": "6.0.0-6-next.
|
|
34
|
-
"@verdaccio/auth": "6.0.0-6-next.
|
|
35
|
-
"@verdaccio/core": "6.0.0-6-next.
|
|
36
|
-
"@verdaccio/config": "6.0.0-6-next.
|
|
37
|
-
"@verdaccio/loaders": "6.0.0-6-next.
|
|
38
|
-
"@verdaccio/logger": "6.0.0-6-next.
|
|
39
|
-
"@verdaccio/middleware": "6.0.0-6-next.
|
|
40
|
-
"@verdaccio/store": "6.0.0-6-next.
|
|
41
|
-
"@verdaccio/utils": "6.0.0-6-next.
|
|
42
|
-
"@verdaccio/web": "6.0.0-6-next.
|
|
43
|
-
"verdaccio-audit": "11.0.0-6-next.
|
|
33
|
+
"@verdaccio/api": "6.0.0-6-next.40",
|
|
34
|
+
"@verdaccio/auth": "6.0.0-6-next.36",
|
|
35
|
+
"@verdaccio/core": "6.0.0-6-next.57",
|
|
36
|
+
"@verdaccio/config": "6.0.0-6-next.57",
|
|
37
|
+
"@verdaccio/loaders": "6.0.0-6-next.26",
|
|
38
|
+
"@verdaccio/logger": "6.0.0-6-next.25",
|
|
39
|
+
"@verdaccio/middleware": "6.0.0-6-next.36",
|
|
40
|
+
"@verdaccio/store": "6.0.0-6-next.37",
|
|
41
|
+
"@verdaccio/utils": "6.0.0-6-next.25",
|
|
42
|
+
"@verdaccio/web": "6.0.0-6-next.44",
|
|
43
|
+
"verdaccio-audit": "11.0.0-6-next.20",
|
|
44
44
|
"compression": "1.7.4",
|
|
45
45
|
"cors": "2.8.5",
|
|
46
46
|
"debug": "4.3.4",
|
|
@@ -50,8 +50,8 @@
|
|
|
50
50
|
},
|
|
51
51
|
"devDependencies": {
|
|
52
52
|
"@types/node": "16.18.10",
|
|
53
|
-
"@verdaccio/proxy": "6.0.0-6-next.
|
|
54
|
-
"@verdaccio/test-helper": "2.0.0-6-next.
|
|
53
|
+
"@verdaccio/proxy": "6.0.0-6-next.35",
|
|
54
|
+
"@verdaccio/test-helper": "2.0.0-6-next.7",
|
|
55
55
|
"http-errors": "1.8.1"
|
|
56
56
|
},
|
|
57
57
|
"funding": {
|
package/src/server.ts
CHANGED
|
@@ -36,9 +36,11 @@ const defineAPI = async function (config: IConfig, storage: Storage): Promise<an
|
|
|
36
36
|
app.use(cors());
|
|
37
37
|
app.use(limiter);
|
|
38
38
|
|
|
39
|
+
const errorReportingMiddlewareWrap = errorReportingMiddleware(logger);
|
|
40
|
+
|
|
39
41
|
// Router setup
|
|
40
|
-
app.use(log);
|
|
41
|
-
app.use(
|
|
42
|
+
app.use(log(logger));
|
|
43
|
+
app.use(errorReportingMiddlewareWrap);
|
|
42
44
|
app.use(function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer): void {
|
|
43
45
|
res.setHeader('x-powered-by', getUserAgent(config.user_agent));
|
|
44
46
|
next();
|
|
@@ -111,7 +113,7 @@ const defineAPI = async function (config: IConfig, storage: Storage): Promise<an
|
|
|
111
113
|
if (_.isFunction(res.locals.report_error) === false) {
|
|
112
114
|
// in case of very early error this middleware may not be loaded before error is generated
|
|
113
115
|
// fixing that
|
|
114
|
-
|
|
116
|
+
errorReportingMiddlewareWrap(req, res, _.noop);
|
|
115
117
|
}
|
|
116
118
|
res.locals.report_error(err);
|
|
117
119
|
} else {
|