@verdaccio/server 6.0.0-6-next.47 → 6.0.0-6-next.49

package/CHANGELOG.md

@@ -1,5 +1,43 @@
 # @verdaccio/server
 
+## 6.0.0-6-next.49
+
+### Minor Changes
+
+- 45c03819: refactor: render html middleware
+
+### Patch Changes
+
+- Updated dependencies [45c03819]
+  - @verdaccio/api@6.0.0-6-next.43
+  - @verdaccio/config@6.0.0-6-next.60
+  - @verdaccio/middleware@6.0.0-6-next.39
+  - verdaccio-audit@11.0.0-6-next.23
+  - @verdaccio/store@6.0.0-6-next.40
+  - @verdaccio/web@6.0.0-6-next.47
+  - @verdaccio/auth@6.0.0-6-next.39
+  - @verdaccio/loaders@6.0.0-6-next.29
+  - @verdaccio/core@6.0.0-6-next.60
+  - @verdaccio/logger@6.0.0-6-next.28
+  - @verdaccio/utils@6.0.0-6-next.28
+
+## 6.0.0-6-next.48
+
+### Patch Changes
+
+- Updated dependencies [65f88b82]
+  - @verdaccio/logger@6.0.0-6-next.27
+  - @verdaccio/middleware@6.0.0-6-next.38
+  - @verdaccio/api@6.0.0-6-next.42
+  - @verdaccio/auth@6.0.0-6-next.38
+  - @verdaccio/loaders@6.0.0-6-next.28
+  - verdaccio-audit@11.0.0-6-next.22
+  - @verdaccio/store@6.0.0-6-next.39
+  - @verdaccio/web@6.0.0-6-next.46
+  - @verdaccio/core@6.0.0-6-next.59
+  - @verdaccio/config@6.0.0-6-next.59
+  - @verdaccio/utils@6.0.0-6-next.27
+
 ## 6.0.0-6-next.47
 
 ### Patch Changes

package/build/server.js

@@ -8,7 +8,6 @@ var _compression = _interopRequireDefault(require("compression"));
 var _cors = _interopRequireDefault(require("cors"));
 var _debug = _interopRequireDefault(require("debug"));
 var _express = _interopRequireDefault(require("express"));
-var _expressRateLimit = _interopRequireDefault(require("express-rate-limit"));
 var _lodash = _interopRequireDefault(require("lodash"));
 var _verdaccioAudit = _interopRequireDefault(require("verdaccio-audit"));
 var _api = _interopRequireDefault(require("@verdaccio/api"));
@@ -21,28 +20,23 @@ var _middleware = require("@verdaccio/middleware");
 var _store = require("@verdaccio/store");
 var _web = _interopRequireDefault(require("@verdaccio/web"));
 var _debug2 = _interopRequireDefault(require("./debug"));
-var _utils = require("./utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const debug = (0, _debug.default)('verdaccio:server');
 const defineAPI = async function (config, storage) {
   const auth = new _auth.Auth(config);
   await auth.init();
   const app = (0, _express.default)();
-  const limiter = new _expressRateLimit.default(config.serverSettings.rateLimit);
   // run in production mode by default, just in case
   // it shouldn't make any difference anyway
   app.set('env', process.env.NODE_ENV || 'production');
   app.use((0, _cors.default)());
-  app.use(limiter);
+  app.use((0, _middleware.rateLimit)(config.serverSettings.rateLimit));
   const errorReportingMiddlewareWrap = (0, _middleware.errorReportingMiddleware)(_logger.logger);
 
   // Router setup
   app.use((0, _middleware.log)(_logger.logger));
   app.use(errorReportingMiddlewareWrap);
-  app.use(function (req, res, next) {
-    res.setHeader('x-powered-by', (0, _utils.getUserAgent)(config.user_agent));
-    next();
-  });
+  app.use((0, _middleware.userAgent)(config));
   app.use((0, _compression.default)());
   app.get('/favicon.ico', function (req, res, next) {
     req.url = '/-/static/favicon.png';

package/build/server.js.map

@@ -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","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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"}
+{"version":3,"file":"server.js","names":["debug","buildDebug","defineAPI","config","storage","auth","Auth","init","app","express","set","process","env","NODE_ENV","use","cors","rateLimit","serverSettings","errorReportingMiddlewareWrap","errorReportingMiddleware","logger","log","userAgent","compression","get","req","res","next","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 { 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, rateLimit, userAgent } 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';\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  // 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(rateLimit(config.serverSettings.rateLimit));\n\n  const errorReportingMiddlewareWrap = errorReportingMiddleware(logger);\n\n  // Router setup\n  app.use(log(logger));\n  app.use(errorReportingMiddlewareWrap);\n  app.use(userAgent(config));\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

@@ -1,6 +1,6 @@
 {
   "name": "@verdaccio/server",
-  "version": "6.0.0-6-next.47",
+  "version": "6.0.0-6-next.49",
   "description": "server logic",
   "main": "./build/index.js",
   "types": "build/index.d.ts",
@@ -30,27 +30,26 @@
     "npm": ">=6"
   },
   "dependencies": {
-    "@verdaccio/api": "6.0.0-6-next.41",
-    "@verdaccio/auth": "6.0.0-6-next.37",
-    "@verdaccio/core": "6.0.0-6-next.58",
-    "@verdaccio/config": "6.0.0-6-next.58",
-    "@verdaccio/loaders": "6.0.0-6-next.27",
-    "@verdaccio/logger": "6.0.0-6-next.26",
-    "@verdaccio/middleware": "6.0.0-6-next.37",
-    "@verdaccio/store": "6.0.0-6-next.38",
-    "@verdaccio/utils": "6.0.0-6-next.26",
-    "@verdaccio/web": "6.0.0-6-next.45",
-    "verdaccio-audit": "11.0.0-6-next.21",
+    "@verdaccio/api": "6.0.0-6-next.43",
+    "@verdaccio/auth": "6.0.0-6-next.39",
+    "@verdaccio/core": "6.0.0-6-next.60",
+    "@verdaccio/config": "6.0.0-6-next.60",
+    "@verdaccio/loaders": "6.0.0-6-next.29",
+    "@verdaccio/logger": "6.0.0-6-next.28",
+    "@verdaccio/middleware": "6.0.0-6-next.39",
+    "@verdaccio/store": "6.0.0-6-next.40",
+    "@verdaccio/utils": "6.0.0-6-next.28",
+    "@verdaccio/web": "6.0.0-6-next.47",
+    "verdaccio-audit": "11.0.0-6-next.23",
     "compression": "1.7.4",
     "cors": "2.8.5",
     "debug": "4.3.4",
     "express": "4.18.2",
-    "express-rate-limit": "5.5.1",
     "lodash": "4.17.21"
   },
   "devDependencies": {
     "@types/node": "16.18.10",
-    "@verdaccio/proxy": "6.0.0-6-next.36",
+    "@verdaccio/proxy": "6.0.0-6-next.38",
     "@verdaccio/test-helper": "2.0.0-6-next.7",
     "http-errors": "1.8.1"
   },

package/src/server.ts

@@ -2,7 +2,6 @@ import compression from 'compression';
 import cors from 'cors';
 import buildDebug from 'debug';
 import express from 'express';
-import RateLimit from 'express-rate-limit';
 import { HttpError } from 'http-errors';
 import _ from 'lodash';
 import AuditMiddleware from 'verdaccio-audit';
@@ -13,7 +12,7 @@ import { Config as AppConfig } from '@verdaccio/config';
 import { API_ERROR, HTTP_STATUS, errorUtils, pluginUtils } from '@verdaccio/core';
 import { asyncLoadPlugin } from '@verdaccio/loaders';
 import { logger } from '@verdaccio/logger';
-import { errorReportingMiddleware, final, log } from '@verdaccio/middleware';
+import { errorReportingMiddleware, final, log, rateLimit, userAgent } from '@verdaccio/middleware';
 import { Storage } from '@verdaccio/store';
 import { ConfigYaml } from '@verdaccio/types';
 import { Config as IConfig } from '@verdaccio/types';
@@ -21,7 +20,6 @@ import webMiddleware from '@verdaccio/web';
 
 import { $NextFunctionVer, $RequestExtend, $ResponseExtend } from '../types/custom';
 import hookDebug from './debug';
-import { getUserAgent } from './utils';
 
 const debug = buildDebug('verdaccio:server');
 
@@ -29,23 +27,18 @@ const defineAPI = async function (config: IConfig, storage: Storage): Promise<an
   const auth: Auth = new Auth(config);
   await auth.init();
   const app = express();
-  const limiter = new RateLimit(config.serverSettings.rateLimit);
   // run in production mode by default, just in case
   // it shouldn't make any difference anyway
   app.set('env', process.env.NODE_ENV || 'production');
   app.use(cors());
-  app.use(limiter);
+  app.use(rateLimit(config.serverSettings.rateLimit));
 
   const errorReportingMiddlewareWrap = errorReportingMiddleware(logger);
 
   // Router setup
   app.use(log(logger));
   app.use(errorReportingMiddlewareWrap);
-  app.use(function (req: $RequestExtend, res: $ResponseExtend, next: $NextFunctionVer): void {
-    res.setHeader('x-powered-by', getUserAgent(config.user_agent));
-    next();
-  });
-
+  app.use(userAgent(config));
   app.use(compression());
 
   app.get(

package/test/server.spec.ts

@@ -55,15 +55,15 @@ test('should contains etag', async () => {
   expect(typeof etag === 'string').toBeTruthy();
 });
 
-test('should contains powered by header', async () => {
+test('should be hidden by default', async () => {
   const app = await initializeServer('conf.yaml');
   const response = await supertest(app)
     .get('/')
     .expect(HEADER_TYPE.CONTENT_TYPE, HEADERS.TEXT_HTML_UTF8)
     .expect(HTTP_STATUS.OK);
   const powered = response.get('x-powered-by');
-  expect(powered).toMatch('verdaccio/6');
-});
+  expect(powered).toMatch('hidden');
+}, 40000);
 
 test('should not contains powered header', async () => {
   const app = await initializeServer('powered-disabled.yaml');

package/build/utils.d.ts

@@ -1 +0,0 @@
-export declare function getUserAgent(userAgent: string): string;

package/build/utils.js

@@ -1,16 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getUserAgent = getUserAgent;
-const pkgVersion = require('../package.json').version;
-function getUserAgent(userAgent) {
-  if (typeof userAgent === 'string') {
-    return userAgent;
-  } else if (userAgent === false) {
-    return 'hidden';
-  }
-  return `verdaccio/${pkgVersion}`;
-}
-//# sourceMappingURL=utils.js.map

package/build/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","names":["pkgVersion","require","version","getUserAgent","userAgent"],"sources":["../src/utils.ts"],"sourcesContent":["const pkgVersion = require('../package.json').version;\n\nexport function getUserAgent(userAgent: string): string {\n  if (typeof userAgent === 'string') {\n    return userAgent;\n  } else if (userAgent === false) {\n    return 'hidden';\n  }\n\n  return `verdaccio/${pkgVersion}`;\n}\n"],"mappings":";;;;;;AAAA,MAAMA,UAAU,GAAGC,OAAO,CAAC,iBAAiB,CAAC,CAACC,OAAO;AAE9C,SAASC,YAAY,CAACC,SAAiB,EAAU;EACtD,IAAI,OAAOA,SAAS,KAAK,QAAQ,EAAE;IACjC,OAAOA,SAAS;EAClB,CAAC,MAAM,IAAIA,SAAS,KAAK,KAAK,EAAE;IAC9B,OAAO,QAAQ;EACjB;EAEA,OAAQ,aAAYJ,UAAW,EAAC;AAClC"}

package/src/utils.ts

@@ -1,11 +0,0 @@
-const pkgVersion = require('../package.json').version;
-
-export function getUserAgent(userAgent: string): string {
-  if (typeof userAgent === 'string') {
-    return userAgent;
-  } else if (userAgent === false) {
-    return 'hidden';
-  }
-
-  return `verdaccio/${pkgVersion}`;
-}